update to 2.4.8

2 files changed, 15 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4aca462e093b..39800355a50d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = openvpn-openssl-1.0
 	pkgdesc = An easy-to-use, robust and highly configurable VPN (Virtual Private Network) (build against openssl-1.0)
-	pkgver = 2.4.7
-	pkgrel = 2
-	url = http://openvpn.net/index.php/open-source.html
+	pkgver = 2.4.8
+	pkgrel = 1
+	url = https://openvpn.net/index.php/open-source.html
 	arch = i686
 	arch = x86_64
 	license = custom
@@ -17,7 +17,7 @@ pkgbase = openvpn-openssl-1.0
 	optdepends = pam: authenticate via PAM
 	provides = openvpn
 	conflicts = openvpn
-	source = git+git://github.com/OpenVPN/openvpn.git#tag=v2.4.7
+	source = git+https://github.com/OpenVPN/openvpn.git#tag=v2.4.8
 	sha256sums = SKIP
 
 pkgname = openvpn-openssl-1.0
diff --git a/PKGBUILD b/PKGBUILD
index 31ff9e0d8eaf..bca7c1f7d312 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
 
 pkgname=openvpn-openssl-1.0
 _pkgname=openvpn
-pkgver=2.4.7
-pkgrel=2
+pkgver=2.4.8
+pkgrel=1
 pkgdesc='An easy-to-use, robust and highly configurable VPN (Virtual Private Network) (build against openssl-1.0)'
 arch=('i686' 'x86_64')
-url='http://openvpn.net/index.php/open-source.html'
+url='https://openvpn.net/index.php/open-source.html'
 depends=('openssl-1.0' 'lzo' 'iproute2' 'systemd-libs' 'pkcs11-helper')
 conflicts=('openvpn')
 provides=('openvpn')
@@ -15,22 +15,27 @@ optdepends=('easy-rsa: easy CA and certificate handling'
             'pam: authenticate via PAM')
 makedepends=('git' 'systemd')
 license=('custom')
-source=("git+git://github.com/OpenVPN/openvpn.git#tag=v${pkgver}")
+source=("git+https://github.com/OpenVPN/openvpn.git#tag=v${pkgver}")
 sha256sums=('SKIP')
 
 prepare() {
   cd "${srcdir}"/${_pkgname}
 
-  autoreconf -i
+  autoreconf --force --install
 }
 
 build() {
   mkdir "${srcdir}"/build
   cd "${srcdir}"/build
 
+  # for reproducibility we force bash for build system:
+  # https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19302.html
+  # https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Defining-Variables.html
+
   export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
 
-  "${srcdir}"/${_pkgname}/configure \
+  CONFIG_SHELL=/bin/bash "${srcdir}"/${_pkgname}/configure \
+    CONFIG_SHELL=/bin/bash \
     --prefix=/usr \
     --sbindir=/usr/bin \
     --enable-iproute2 \