Make package mirror vanilla Arch Linux OpenVPN more closely.

- Update PKGBUILD to look as close as possible to the vanilla Arch
OpenVPN.
- Add additional packaging files.
- This includes the patch to run as an unprivileged user.

1 files changed, 42 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 486829fbca5a..a3d5a4c1738e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,58 +2,80 @@
 # Contributer: Christian Hesse <mail@eworm.de>
 
 pkgname=openvpn-mbedtls
+_tag='0071e180470e6d3a830da7b96df4ea8e510d2987' # git rev-parse v${pkgver}
 _pkgname=openvpn
 crypto_library=mbedtls
 pkgver=2.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc='An easy-to-use, robust and highly configurable VPN (Virtual Private Network), linked against the mbedtls library for crypto support.'
 arch=('x86_64' 'armv7h' 'aarch64')
 url='https://openvpn.net/index.php/open-source.html'
-depends=('lzo' 'iproute2' 'systemd-libs' "${crypto_library}")
+depends=('lzo' 'lz4' 'iproute2' 'systemd-libs' "${crypto_library}")
 optdepends=('easy-rsa: easy CA and certificate handling'
             'pam: authenticate via PAM')
-makedepends=('git' 'systemd' 'cmocka')
+makedepends=('git' 'systemd' 'cmocka' 'python-docutils')
+install=openvpn.install
+validpgpkeys=('F554A3687412CFFEBDEFE0A312F5F7B42F2B01E7'  # OpenVPN - Security Mailing List <security@openvpn.net>
+              'B62E6A2B4E56570B7BDC6BE01D829EFECA562812') # Gert Doering <gert@v6.de>
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
 license=('custom')
-source=("https://swupdate.openvpn.org/community/releases/${_pkgname}-${pkgver}.tar.xz"{,.asc})
-sha256sums=("fb6a9943c603a1951ca13e9267653f8dd650c02f84bccd2b9d20f06a4c9c9a7e"
-            "SKIP")
-validpgpkeys=('F554A3687412CFFEBDEFE0A312F5F7B42F2B01E7')
+source=("git+https://github.com/OpenVPN/openvpn.git#tag=${_tag}?signed"
+        '0001-unprivileged.patch'
+        'sysusers.conf'
+        'tmpfiles.conf')
+sha256sums=('SKIP'
+            '8e7d292514f30729bc37d6681789b1bfdf87a992a3aa77e2a28b8da9cd8d4bfe'
+            '3646b865ac67783fafc6652589cfe2a3105ecef06f3907f33de5135815f6a621'
+            'b1436f953a4f1be7083711d11928a9924993f940ff56ff92d288d6100df673fc')
+
+prepare() {
+  cd "${srcdir}"/${_pkgname}
+
+  # https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19302.html
+  sed -i '/^CONFIGURE_DEFINES=/s/set/env/g' configure.ac
+
+  # start with unprivileged user and keep granted privileges
+  patch -Np1 < ../0001-unprivileged.patch
+
+  autoreconf --force --install
+}
 
 build() {
-  cd "${srcdir}"/${_pkgname}-${pkgver}
+  mkdir "${srcdir}"/build
+  cd "${srcdir}"/build
 
-  CONFIG_SHELL=/bin/bash "${srcdir}"/${_pkgname}-${pkgver}/configure \
-    CONFIG_SHELL=/bin/bash \
+  "${srcdir}"/openvpn/configure \
     --prefix=/usr \
     --sbindir=/usr/bin \
-    --enable-iproute2 \
     --with-crypto-library=${crypto_library} \
+    --enable-iproute2 \
     --enable-plugins \
     --enable-systemd
   make
 }
 
 check() {
-  cd "${srcdir}"/${_pkgname}-${pkgver}
+  cd "${srcdir}"/build
+
   make check
 }
 
 package() {
-  cd "${srcdir}"/${_pkgname}-${pkgver}
+  cd "${srcdir}"/build
 
   # Install openvpn
   make DESTDIR="${pkgdir}" install
 
-  # Create empty configuration directories
-  install -d -m0750 -g 90 "${pkgdir}"/etc/openvpn/{client,server}
+  # Install sysusers and tmpfiles files
+  install -D -m0644 ../sysusers.conf "${pkgdir}"/usr/lib/sysusers.d/openvpn.conf
+  install -D -m0644 ../tmpfiles.conf "${pkgdir}"/usr/lib/tmpfiles.d/openvpn.conf
 
   # Install license
   install -d -m0755 "${pkgdir}"/usr/share/licenses/openvpn/
   ln -sf /usr/share/doc/openvpn/{COPYING,COPYRIGHT.GPL} "${pkgdir}"/usr/share/licenses/openvpn/
 
-  cd "${srcdir}"/${_pkgname}-${pkgver}
+  cd "${srcdir}"/${_pkgname}
 
   # Install examples
   install -d -m0755 "${pkgdir}"/usr/share/openvpn
@@ -62,8 +84,10 @@ package() {
   # Install contrib
   for FILE in $(find contrib -type f); do
     case "$(file --brief --mime-type --no-sandbox "${FILE}")" in
-      "text/x-shellscript") install -D -m0755 "${FILE}" "${pkgdir}/usr/share/openvpn/${FILE}" ;;
-      *) install -D -m0644 "${FILE}" "${pkgdir}/usr/share/openvpn/${FILE}" ;;
+      "text/x-shellscript")
+        install -D -m0755 "${FILE}" "${pkgdir}/usr/share/openvpn/${FILE}" ;;
+      *)
+        install -D -m0644 "${FILE}" "${pkgdir}/usr/share/openvpn/${FILE}" ;;
     esac
   done
 }