[arch-commits] Commit in openvpn/trunk (3 files)

[Thomas Bächler]

    Date: Saturday, February 9, 2013 @ 16:02:25
  Author: thomas
Revision: 177816

upgpkg: openvpn 2.3.0-2: fix FS#33588 and FS#33054 

Added:
  openvpn/trunk/openvpn-2.3.0-fix-systemd-ask-password-path.patch
Modified:
  openvpn/trunk/PKGBUILD
  openvpn/trunk/openvpn at .service

---------------------------------------------------+
 PKGBUILD                                          |    9 ++++++---
 openvpn-2.3.0-fix-systemd-ask-password-path.patch |   11 +++++++++++
 openvpn at .service                                  |    2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-09 14:53:43 UTC (rev 177815)
+++ PKGBUILD	2013-02-09 15:02:25 UTC (rev 177816)
@@ -3,7 +3,7 @@
 
 pkgname=openvpn
 pkgver=2.3.0
-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"
@@ -16,16 +16,19 @@
         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
-        openvpn at .service)
+        openvpn at .service
+        openvpn-2.3.0-fix-systemd-ask-password-path.patch)
 md5sums=('56cffde5d5320e0b1ec364d3e486aca9'
          '3f67e2fa605800a964dbbcfca644d283'
          'fbf818b6e1f212e77b9ce0e6d92584a1'
          '46df49b85f9850fec287e311279bdbef'
-         '44047df812a3fcd57a7e36a61732a9b9')
+         '0846aa59d0b123d61030890f9a4135ae'
+         'e1bd1523e38745e948c710db1a330bb1')
 options=(!libtool)
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  patch -p0 -i $srcdir/openvpn-2.3.0-fix-systemd-ask-password-path.patch
   # Build openvpn
   CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \
     --prefix=/usr \

Added: openvpn-2.3.0-fix-systemd-ask-password-path.patch
===================================================================
--- openvpn-2.3.0-fix-systemd-ask-password-path.patch	                        (rev 0)
+++ openvpn-2.3.0-fix-systemd-ask-password-path.patch	2013-02-09 15:02:25 UTC (rev 177816)
@@ -0,0 +1,11 @@
+--- 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) {

Modified: openvpn at .service
===================================================================
--- openvpn at .service	2013-02-09 14:53:43 UTC (rev 177815)
+++ openvpn at .service	2013-02-09 15:02:25 UTC (rev 177816)
@@ -4,7 +4,7 @@
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i --cd /etc/openvpn
+ExecStart=/usr/sbin/openvpn --cd /etc/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i
 
 [Install]
 WantedBy=multi-user.target