From b4f90f6ad84c6e786af14044c8885cff10000946 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Tue, 5 Nov 2019 12:45:08 +0100 Subject: [PATCH] Update to 2.4.8 (for Win10 and later) --- WAPT/control | 18 ++++++++++++------ openvpn-install-2.4.7-I603.exe | 3 --- openvpn-install-2.4.8-I602-Win10.exe | 3 +++ openvpn.p7b | Bin 3489 -> 4204 bytes setup.py | 34 ++++++++++++++++++++++++---------- 5 files changed, 39 insertions(+), 19 deletions(-) delete mode 100644 openvpn-install-2.4.7-I603.exe create mode 100644 openvpn-install-2.4.8-I602-Win10.exe diff --git a/WAPT/control b/WAPT/control index 7b17d95..e9794c3 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,8 +1,10 @@ package : fws-openvpn -version : 2.4.7-3 +version : 2.4.8-5 architecture : all section : base priority : optional +name : +categories : maintainer : Daniel Berteaud description : OpenVPN client depends : @@ -10,7 +12,7 @@ conflicts : maturity : PROD locale : all target_os : windows -min_os_version : 6.0 +min_os_version : 10.0 max_os_version : min_wapt_version : 1.5 sources : @@ -25,8 +27,12 @@ editor : OpenVPN keywords : vpn licence : GNU GPL homepage : https://openvpn.net -package_uuid : +package_uuid : 0a37aad1-b02f-4457-802d-b68d8582e34b +valid_from : +valid_until : +forced_install_on : signer : Daniel Berteaud -signer_fingerprint: -signature_date : -signed_attributes : \ No newline at end of file +signer_fingerprint: 3c9415559e2dedbc4390e3faa2c28d3b67265baa5b35902d2764d9e41c3b3f0a +signature : w4srYS3STCOJOVKB2a40YfsEu1ZqfsyNp0D9GhvdZiwAuJCqxyiiVedLoRTAHaW6TBuNmuJsxChXIyxNO0xYL0By03THa3cJcyJ2YgXctezW7aDXR6GJfvPy+VAEkHq/ZL8DnW7AHKz7RRdd63sCfJQK29WIGp21dbmzpZ8y6+JLLrIx6MZa9JfLDve/LNwv/i9B58SkXinqqNDFBwaFgJR1XTAXBuxyRmFqNrq4z3SzdQLtFIWvPNkmJIyBznYLCClqgsCtKmL06tYiulTZg2CrkUrEs499gZLqah+TuWxf2KBictI6GzgazAGg1xCqjM1sH449u2iwk1yGdh/qZQ== +signature_date : 2019-11-05T12:44:35.294000 +signed_attributes : package,version,architecture,section,priority,name,categories,maintainer,description,depends,conflicts,maturity,locale,target_os,min_os_version,max_os_version,min_wapt_version,sources,installed_size,impacted_process,description_fr,description_pl,description_de,description_es,audit_schedule,editor,keywords,licence,homepage,package_uuid,valid_from,valid_until,forced_install_on,signer,signer_fingerprint,signature_date,signed_attributes \ No newline at end of file diff --git a/openvpn-install-2.4.7-I603.exe b/openvpn-install-2.4.7-I603.exe deleted file mode 100644 index c082f89..0000000 --- a/openvpn-install-2.4.7-I603.exe +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0237be0be0156f869f38fb2f38842e3ab5df46c79b914eba580de3031c116651 -size 3984992 diff --git a/openvpn-install-2.4.8-I602-Win10.exe b/openvpn-install-2.4.8-I602-Win10.exe new file mode 100644 index 0000000..2358140 --- /dev/null +++ b/openvpn-install-2.4.8-I602-Win10.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8f861de1519c680c4e506b4e08b4d80db7c385a4ccc2fcc56e2278d41c1cabe +size 4335648 diff --git a/openvpn.p7b b/openvpn.p7b index b20be095fe4fa082a90466e093b9ef9e12c63ada..9539eb27183843798958bfbccfb15365a658a0fc 100644 GIT binary patch literal 4204 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 Version(current_version): print('Updating Package from %s to %s' % (current_version, latest_version)) - if not isfile('openvpn-install-%s-I603.exe' % latest_version): - url = 'https://swupdate.openvpn.org/community/releases/openvpn-install-%s-I603.exe' % latest_version - print('downloading %s' % url) - wget(url, os.getcwd()) - for file in glob.glob('*.exe'): - if file != 'openvpn-install-%s-I603.exe' % latest_version: - print('Removing %s' % file) - remove_file(file) + # Win7 Would be possible, but has a problem installing the tap driver, even when the cert is added to the trust store + # Just maintain the package for Win10 and later. Win7 is EOL in 2020 anyway + for os_version in ['Win10']: + build = re.search('openvpn\-install\-%s\-(I\d+)\-%s\.exe' % (latest_version, os_version), page).group(1) + if not isfile('openvpn\-install-%s-%s.exe' % (latest_version, build)): + url = 'https://swupdate.openvpn.org/community/releases/openvpn-install-%s-%s-%s.exe' % (latest_version, build, os_version) + print('downloading %s' % url) + wget(url, os.getcwd()) + for file in glob.glob('*%s.exe' % os_version): + if file != 'openvpn-install-%s-%s-%s.exe' % (latest_version, build, os_version): + print('Removing %s' % file) + remove_file(file) + pe.version = latest_version + '-0' + pe.maturity = 'PREPROD' pe.save_control_to_wapt(os.getcwd()) print('Package updated to %s' % latest_version) else: