Date: Wednesday, November 13, 2013 @ 20:03:42 Author: thomas Revision: 199501
upgpkg: openvpn 2.3.2-2: Remove easy-rsa and remove weird ordering from systemd service Added: openvpn/trunk/openvpn.install Modified: openvpn/trunk/PKGBUILD openvpn/trunk/[email protected] Deleted: openvpn/trunk/openvpn-2.3.0-fix-systemd-ask-password-path.patch ---------------------------------------------------+ PKGBUILD | 48 ++++++-------------- openvpn-2.3.0-fix-systemd-ask-password-path.patch | 11 ---- openvpn.install | 8 +++ [email protected] | 1 4 files changed, 24 insertions(+), 44 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-13 18:21:58 UTC (rev 199500) +++ PKGBUILD 2013-11-13 19:03:42 UTC (rev 199501) @@ -3,7 +3,7 @@ pkgname=openvpn pkgver=2.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)" arch=(i686 x86_64) url="http://openvpn.net/index.php/open-source.html"; @@ -10,25 +10,16 @@ depends=('openssl' 'lzo2' 'iproute2') makedepends=('systemd') license=('custom') -backup=(usr/share/openvpn/easy-rsa/vars - usr/share/openvpn/easy-rsa/openssl-1.0.0.cnf) +install=openvpn.install source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz.asc - http://build.openvpn.net/downloads/releases/easy-rsa-2.2.0_master.tar.gz - http://build.openvpn.net/downloads/releases/easy-rsa-2.2.0_master.tar.gz.asc - [email protected] - openvpn-2.3.0-fix-systemd-ask-password-path.patch) + [email protected]) md5sums=('06e5f93dbf13f2c19647ca15ffc23ac1' 'SKIP' - 'fbf818b6e1f212e77b9ce0e6d92584a1' - 'SKIP' - '57ef7353ba2c28c04dfc387c3ca77a4f' - 'e1bd1523e38745e948c710db1a330bb1') + '71fab8d1c2aa3a1f2609e259eaaf88b3') build() { - cd $srcdir/$pkgname-$pkgver - patch -p0 -i $srcdir/openvpn-2.3.0-fix-systemd-ask-password-path.patch - # Build openvpn + cd "${srcdir}"/$pkgname-$pkgver CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ @@ -37,29 +28,22 @@ --enable-iproute2 \ --enable-systemd make - # Build easy-rsa - cd $srcdir/easy-rsa-2.2.0_master - ./configure --prefix=/usr --with-easyrsadir=/usr/share/openvpn/easy-rsa - make } package() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver # Install openvpn - make DESTDIR=$pkgdir install - install -d -m755 $pkgdir/etc/openvpn + make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}"/etc/openvpn # Install examples - install -d -m755 $pkgdir/usr/share/openvpn - cp -r sample/sample-config-files $pkgdir/usr/share/openvpn/examples + install -d -m755 "${pkgdir}"/usr/share/openvpn + cp -r sample/sample-config-files "${pkgdir}"/usr/share/openvpn/examples # Install license - install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + install -d -m755 "${pkgdir}"/usr/share/licenses/${pkgname}/ + ln -sf /usr/share/doc/${pkgname}/{COPYING,COPYRIGHT.GPL} "${pkgdir}"/usr/share/licenses/${pkgname}/ # Install contrib - install -d -m755 $pkgdir/usr/share/openvpn/contrib - cp -r contrib $pkgdir/usr/share/openvpn - # Install easy-rsa - cd $srcdir/easy-rsa-2.2.0_master - make install DESTDIR=$pkgdir - rm -f ${pkgdir}/usr/share/openvpn/easy-rsa/openssl-0.9.?.cnf - # Install rc scripts - install -D -m644 $srcdir/[email protected] $pkgdir/usr/lib/systemd/system/[email protected] + install -d -m755 "${pkgdir}"/usr/share/openvpn/contrib + cp -r contrib "${pkgdir}"/usr/share/openvpn + # Install systemd service + install -D -m644 "${srcdir}"/[email protected] "${pkgdir}"/usr/lib/systemd/system/[email protected] } Deleted: openvpn-2.3.0-fix-systemd-ask-password-path.patch =================================================================== --- openvpn-2.3.0-fix-systemd-ask-password-path.patch 2013-11-13 18:21:58 UTC (rev 199500) +++ openvpn-2.3.0-fix-systemd-ask-password-path.patch 2013-11-13 19:03:42 UTC (rev 199501) @@ -1,11 +0,0 @@ ---- src/openvpn/console.c.orig 2013-01-30 09:42:57.480257300 +0100 -+++ src/openvpn/console.c 2013-01-30 09:43:07.446179811 +0100 -@@ -162,7 +162,7 @@ get_console_input_systemd (const char *p - struct argv argv; - - argv_init (&argv); -- argv_printf (&argv, "/bin/systemd-ask-password"); -+ argv_printf (&argv, "/usr/bin/systemd-ask-password"); - argv_printf_cat (&argv, "%s", prompt); - - if ((std_out = openvpn_popen (&argv, NULL)) < 0) { Added: openvpn.install =================================================================== --- openvpn.install (rev 0) +++ openvpn.install 2013-11-13 19:03:42 UTC (rev 199501) @@ -0,0 +1,8 @@ +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + if [ $(vercmp 2.3.2-1 $2) -ge 0 ]; then + echo ">>> easy-rsa has moved into its own package. Run:" + echo ">>> # pacman -S easy-rsa" + fi +} Modified: [email protected] =================================================================== --- [email protected] 2013-11-13 18:21:58 UTC (rev 199500) +++ [email protected] 2013-11-13 19:03:42 UTC (rev 199501) @@ -1,6 +1,5 @@ [Unit] Description=OpenVPN connection to %i -After=network.target [Service] Type=forking
