[arch-commits] Commit in openvpn/repos (8 files)
Pierre Schmitz
pierre at nymeria.archlinux.org
Fri May 31 08:12:08 UTC 2013
Date: Friday, May 31, 2013 @ 10:12:07
Author: pierre
Revision: 186796
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
openvpn/repos/staging-i686/
openvpn/repos/staging-i686/PKGBUILD
(from rev 186795, openvpn/trunk/PKGBUILD)
openvpn/repos/staging-i686/openvpn-2.3.0-fix-systemd-ask-password-path.patch
(from rev 186795, openvpn/trunk/openvpn-2.3.0-fix-systemd-ask-password-path.patch)
openvpn/repos/staging-i686/openvpn at .service
(from rev 186795, openvpn/trunk/openvpn at .service)
openvpn/repos/staging-x86_64/
openvpn/repos/staging-x86_64/PKGBUILD
(from rev 186795, openvpn/trunk/PKGBUILD)
openvpn/repos/staging-x86_64/openvpn-2.3.0-fix-systemd-ask-password-path.patch
(from rev 186795, openvpn/trunk/openvpn-2.3.0-fix-systemd-ask-password-path.patch)
openvpn/repos/staging-x86_64/openvpn at .service
(from rev 186795, openvpn/trunk/openvpn at .service)
------------------------------------------------------------------+
staging-i686/PKGBUILD | 66 ++++++++++
staging-i686/openvpn-2.3.0-fix-systemd-ask-password-path.patch | 11 +
staging-i686/openvpn at .service | 10 +
staging-x86_64/PKGBUILD | 66 ++++++++++
staging-x86_64/openvpn-2.3.0-fix-systemd-ask-password-path.patch | 11 +
staging-x86_64/openvpn at .service | 10 +
6 files changed, 174 insertions(+)
Copied: openvpn/repos/staging-i686/PKGBUILD (from rev 186795, openvpn/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-05-31 08:12:07 UTC (rev 186796)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=openvpn
+pkgver=2.3.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"
+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)
+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
+ openvpn at .service
+ openvpn-2.3.0-fix-systemd-ask-password-path.patch)
+md5sums=('57a3b64597fc37b7842a3fde354d8bbe'
+ 'SKIP'
+ 'fbf818b6e1f212e77b9ce0e6d92584a1'
+ 'SKIP'
+ '57ef7353ba2c28c04dfc387c3ca77a4f'
+ '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 \
+ --sbindir=/usr/bin \
+ --enable-password-save \
+ --mandir=/usr/share/man \
+ --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
+ # Install 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 license
+ install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+ # 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/openvpn at .service $pkgdir/usr/lib/systemd/system/openvpn at .service
+}
Copied: openvpn/repos/staging-i686/openvpn-2.3.0-fix-systemd-ask-password-path.patch (from rev 186795, openvpn/trunk/openvpn-2.3.0-fix-systemd-ask-password-path.patch)
===================================================================
--- staging-i686/openvpn-2.3.0-fix-systemd-ask-password-path.patch (rev 0)
+++ staging-i686/openvpn-2.3.0-fix-systemd-ask-password-path.patch 2013-05-31 08:12:07 UTC (rev 186796)
@@ -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) {
Copied: openvpn/repos/staging-i686/openvpn at .service (from rev 186795, openvpn/trunk/openvpn at .service)
===================================================================
--- staging-i686/openvpn at .service (rev 0)
+++ staging-i686/openvpn at .service 2013-05-31 08:12:07 UTC (rev 186796)
@@ -0,0 +1,10 @@
+[Unit]
+Description=OpenVPN connection to %i
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/openvpn --cd /etc/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i
+
+[Install]
+WantedBy=multi-user.target
Copied: openvpn/repos/staging-x86_64/PKGBUILD (from rev 186795, openvpn/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-05-31 08:12:07 UTC (rev 186796)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=openvpn
+pkgver=2.3.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"
+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)
+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
+ openvpn at .service
+ openvpn-2.3.0-fix-systemd-ask-password-path.patch)
+md5sums=('57a3b64597fc37b7842a3fde354d8bbe'
+ 'SKIP'
+ 'fbf818b6e1f212e77b9ce0e6d92584a1'
+ 'SKIP'
+ '57ef7353ba2c28c04dfc387c3ca77a4f'
+ '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 \
+ --sbindir=/usr/bin \
+ --enable-password-save \
+ --mandir=/usr/share/man \
+ --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
+ # Install 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 license
+ install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+ # 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/openvpn at .service $pkgdir/usr/lib/systemd/system/openvpn at .service
+}
Copied: openvpn/repos/staging-x86_64/openvpn-2.3.0-fix-systemd-ask-password-path.patch (from rev 186795, openvpn/trunk/openvpn-2.3.0-fix-systemd-ask-password-path.patch)
===================================================================
--- staging-x86_64/openvpn-2.3.0-fix-systemd-ask-password-path.patch (rev 0)
+++ staging-x86_64/openvpn-2.3.0-fix-systemd-ask-password-path.patch 2013-05-31 08:12:07 UTC (rev 186796)
@@ -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) {
Copied: openvpn/repos/staging-x86_64/openvpn at .service (from rev 186795, openvpn/trunk/openvpn at .service)
===================================================================
--- staging-x86_64/openvpn at .service (rev 0)
+++ staging-x86_64/openvpn at .service 2013-05-31 08:12:07 UTC (rev 186796)
@@ -0,0 +1,10 @@
+[Unit]
+Description=OpenVPN connection to %i
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/openvpn --cd /etc/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list