Browse Source

Update to 2.4.8 (for Win10 and later)

master
Daniel Berteaud 2 years ago
parent
commit
b4f90f6ad8
  1. 18
      WAPT/control
  2. BIN
      openvpn-install-2.4.7-I603.exe
  3. BIN
      openvpn-install-2.4.8-I602-Win10.exe
  4. BIN
      openvpn.p7b
  5. 34
      setup.py

18
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 <daniel@firewall-services.com>
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 :
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

BIN
openvpn-install-2.4.7-I603.exe (Stored with Git LFS)

size 3984992

BIN
openvpn-install-2.4.8-I602-Win10.exe (Stored with Git LFS)

size 4335648

BIN
openvpn.p7b

34
setup.py

@ -13,13 +13,21 @@ if isfile(makepath(programfiles32,'wapt','private','symetric.txt')) and isfile(m
variables.update(yaml.safe_load(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read())))
def install():
import re
version = control['version'].split('-',1)[0]
print('Register OpenVPN as a trusted publisher')
run(r'certutil.exe -addstore trustedpublisher openvpn.p7b')
run(r'certutil.exe -f -addstore trustedpublisher openvpn.p7b')
print('Installing OpenVPN client')
install_exe_if_needed('openvpn-install-%s-I603.exe' % version,'/S',key='OpenVPN',min_version='%s-I602' % version,killbefore=['openvpn','openvpn-gui'])
os_version = 'Win10'
# We need to identify the build
for file in glob.glob('openvpn-install-%s-I*-%s.exe' % (version, os_version)):
build = re.search('openvpn\-install\-%s\-(I\d+)\-%s\.exe' % (version, os_version), file).group(1)
install_exe_if_needed('openvpn-install-%s-%s-%s.exe' % (version, build, os_version), '/S', key='OpenVPN', min_version='%s-%s-%s' % (version, build, os_version), killbefore=['openvpn','openvpn-gui'])
uninstallkey.append('TAP-Windows')
if 'openvpn_config' in variables:
@ -37,15 +45,21 @@ def update_package():
current_version = control['version'].split('-',1)[0]
if Version(latest_version) > 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:

Loading…
Cancel
Save