From a66ade95a92570b4fc0d9aa5a888557de1235aac Mon Sep 17 00:00:00 2001
From: Timothy Sutton <tim@synthist.net>
Date: Sun, 6 Nov 2022 20:40:59 -0500
Subject: [PATCH 1/3] Bump 7-zip version to 2201

---
 brigadier | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/brigadier b/brigadier
index 46b40bb..7eaa61a 100755
--- a/brigadier
+++ b/brigadier
@@ -18,7 +18,7 @@ from xml.dom import minidom
 
 SUCATALOG_URL = 'https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog'
 # 7-Zip MSI (15.14)
-SEVENZIP_URL = 'http://www.7-zip.org/a/7z1514-x64.msi'
+SEVENZIP_URL = 'https://www.7-zip.org/a/7z2201-x64.msi'
 
 def status(msg):
     print "%s\n" % msg

From 62ed4c71a60bc0c20fd9e8620065aa9da3e92da4 Mon Sep 17 00:00:00 2001
From: Timothy Sutton <tim@synthist.net>
Date: Mon, 7 Nov 2022 08:30:23 -0500
Subject: [PATCH 2/3] Add --version option

- bump version to 0.2.5
- update Windows build script with reference to newer PyInstaller
---
 VERSION              | 2 +-
 brigadier            | 7 +++++++
 build_windows_exe.py | 9 ++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index abd4105..3a4036f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.4
+0.2.5
diff --git a/brigadier b/brigadier
index 7eaa61a..14b9605 100755
--- a/brigadier
+++ b/brigadier
@@ -16,6 +16,7 @@ from pprint import pprint
 from urllib import urlretrieve
 from xml.dom import minidom
 
+VERSION = '0.2.5'
 SUCATALOG_URL = 'https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog'
 # 7-Zip MSI (15.14)
 SEVENZIP_URL = 'https://www.7-zip.org/a/7z2201-x64.msi'
@@ -131,8 +132,14 @@ product, ie. 'BootCamp-041-1234'. Uses the current directory if this option is o
         help="Specify an exact product ID to download (ie. '031-0787'), currently useful only for cases \
 where a model has multiple BootCamp ESDs available and is not downloading the desired version \
 according to the post date.")
+    o.add_option('-V', '--version', action="store_true",
+        help="Output the version of brigadier.")
 
     opts, args = o.parse_args()
+    if opts.version:
+        print VERSION
+        sys.exit(0)
+
     if opts.install:
         if platform.system() == 'Darwin':
             sys.exit("Installing Boot Camp can only be done on Windows!")
diff --git a/build_windows_exe.py b/build_windows_exe.py
index 884b535..e061bdc 100644
--- a/build_windows_exe.py
+++ b/build_windows_exe.py
@@ -6,6 +6,13 @@
 # Requires:
 # - Python 2.7 for Windows (http://www.python.org/getit)
 # - pywin32 (http://sourceforge.net/projects/pywin32)
+#
+# Note (2022-11-07): This script needs to be overhauled to instead
+# just use a virtualenv. PyInstaller 3.6 needs pywin32-ctypes, and
+# also to pass a .spec file into pyinstaller, so that the exe contains
+# more metadata and version info. As-is the script doesn't currently
+# work, and I've just bumped the PyInstaller version to 3.6 as a reminder
+# that this is the last version that is still compatible with Python 2.7.
 
 import urllib
 import os
@@ -14,7 +21,7 @@
 import shutil
 import hashlib
 
-PYINSTALLER_URL = 'https://pypi.python.org/packages/source/P/PyInstaller/PyInstaller-2.1.zip'
+PYINSTALLER_URL = 'https://github.com/pyinstaller/pyinstaller/archive/refs/tags/v3.6.zip'
 PYINST_ZIPFILE = os.path.join(os.getcwd(), 'pyinstaller.zip')
 NAME = 'brigadier'
 

From d1361f706c063ce17d4d5b618cde3cafa99c06ee Mon Sep 17 00:00:00 2001
From: Timothy Sutton <tim@synthist.net>
Date: Mon, 7 Nov 2022 08:33:24 -0500
Subject: [PATCH 3/3] Update CHANGELIST

---
 CHANGELIST | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELIST b/CHANGELIST
index b1766ba..3d6e732 100644
--- a/CHANGELIST
+++ b/CHANGELIST
@@ -1,3 +1,10 @@
+### 0.2.5 (November 7, 2022)
+- update 7-Zip to 22.01
+- add '-V/--version' option to output the tool version
+- update precompiled Windows exe to the last Python 2.7 distribution and
+  compatible PyInstaller (3.6) version, resolving issues with TLS version
+  support
+
 ### 0.2.4 (March 24, 2016)
 - remove dependency on dmg2iso, as current 7-Zip versions seem to reliably
   extract all the contents of WindowsSupport.dmg files