[arch-commits] Commit in openvpn/repos (14 files)
Thomas Bächler
thomas at nymeria.archlinux.org
Sat Nov 16 09:28:42 UTC 2013
Date: Saturday, November 16, 2013 @ 10:28:42
Author: thomas
Revision: 199780
db-move: moved openvpn from [testing] to [core] (i686, x86_64)
Added:
openvpn/repos/core-i686/PKGBUILD
(from rev 199779, openvpn/repos/testing-i686/PKGBUILD)
openvpn/repos/core-i686/openvpn.install
(from rev 199779, openvpn/repos/testing-i686/openvpn.install)
openvpn/repos/core-i686/openvpn at .service
(from rev 199779, openvpn/repos/testing-i686/openvpn at .service)
openvpn/repos/core-x86_64/PKGBUILD
(from rev 199779, openvpn/repos/testing-x86_64/PKGBUILD)
openvpn/repos/core-x86_64/openvpn.install
(from rev 199779, openvpn/repos/testing-x86_64/openvpn.install)
openvpn/repos/core-x86_64/openvpn at .service
(from rev 199779, openvpn/repos/testing-x86_64/openvpn at .service)
Deleted:
openvpn/repos/core-i686/PKGBUILD
openvpn/repos/core-i686/openvpn-2.3.0-fix-systemd-ask-password-path.patch
openvpn/repos/core-i686/openvpn at .service
openvpn/repos/core-x86_64/PKGBUILD
openvpn/repos/core-x86_64/openvpn-2.3.0-fix-systemd-ask-password-path.patch
openvpn/repos/core-x86_64/openvpn at .service
openvpn/repos/testing-i686/
openvpn/repos/testing-x86_64/
---------------------------------------------------------------+
/PKGBUILD | 98 ++++++++++
/openvpn at .service | 18 +
core-i686/PKGBUILD | 65 ------
core-i686/openvpn-2.3.0-fix-systemd-ask-password-path.patch | 11 -
core-i686/openvpn.install | 8
core-i686/openvpn at .service | 10 -
core-x86_64/PKGBUILD | 65 ------
core-x86_64/openvpn-2.3.0-fix-systemd-ask-password-path.patch | 11 -
core-x86_64/openvpn.install | 8
core-x86_64/openvpn at .service | 10 -
10 files changed, 132 insertions(+), 172 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2013-11-16 07:41:56 UTC (rev 199779)
+++ core-i686/PKGBUILD 2013-11-16 09:28:42 UTC (rev 199780)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-
-pkgname=openvpn
-pkgver=2.3.2
-pkgrel=1
-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=('06e5f93dbf13f2c19647ca15ffc23ac1'
- 'SKIP'
- 'fbf818b6e1f212e77b9ce0e6d92584a1'
- 'SKIP'
- '57ef7353ba2c28c04dfc387c3ca77a4f'
- 'e1bd1523e38745e948c710db1a330bb1')
-
-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/core-i686/PKGBUILD (from rev 199779, openvpn/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2013-11-16 09:28:42 UTC (rev 199780)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=openvpn
+pkgver=2.3.2
+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')
+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
+ openvpn at .service)
+md5sums=('06e5f93dbf13f2c19647ca15ffc23ac1'
+ 'SKIP'
+ '71fab8d1c2aa3a1f2609e259eaaf88b3')
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+ 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
+}
+
+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 -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 systemd service
+ install -D -m644 "${srcdir}"/openvpn at .service "${pkgdir}"/usr/lib/systemd/system/openvpn at .service
+}
Deleted: core-i686/openvpn-2.3.0-fix-systemd-ask-password-path.patch
===================================================================
--- core-i686/openvpn-2.3.0-fix-systemd-ask-password-path.patch 2013-11-16 07:41:56 UTC (rev 199779)
+++ core-i686/openvpn-2.3.0-fix-systemd-ask-password-path.patch 2013-11-16 09:28:42 UTC (rev 199780)
@@ -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) {
Copied: openvpn/repos/core-i686/openvpn.install (from rev 199779, openvpn/repos/testing-i686/openvpn.install)
===================================================================
--- core-i686/openvpn.install (rev 0)
+++ core-i686/openvpn.install 2013-11-16 09:28:42 UTC (rev 199780)
@@ -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
+}
Deleted: core-i686/openvpn at .service
===================================================================
--- core-i686/openvpn at .service 2013-11-16 07:41:56 UTC (rev 199779)
+++ core-i686/openvpn at .service 2013-11-16 09:28:42 UTC (rev 199780)
@@ -1,10 +0,0 @@
-[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/core-i686/openvpn at .service (from rev 199779, openvpn/repos/testing-i686/openvpn at .service)
===================================================================
--- core-i686/openvpn at .service (rev 0)
+++ core-i686/openvpn at .service 2013-11-16 09:28:42 UTC (rev 199780)
@@ -0,0 +1,9 @@
+[Unit]
+Description=OpenVPN connection to %i
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/openvpn --cd /etc/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i
+
+[Install]
+WantedBy=multi-user.target
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2013-11-16 07:41:56 UTC (rev 199779)
+++ core-x86_64/PKGBUILD 2013-11-16 09:28:42 UTC (rev 199780)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-
-pkgname=openvpn
-pkgver=2.3.2
-pkgrel=1
-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=('06e5f93dbf13f2c19647ca15ffc23ac1'
- 'SKIP'
- 'fbf818b6e1f212e77b9ce0e6d92584a1'
- 'SKIP'
- '57ef7353ba2c28c04dfc387c3ca77a4f'
- 'e1bd1523e38745e948c710db1a330bb1')
-
-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/core-x86_64/PKGBUILD (from rev 199779, openvpn/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2013-11-16 09:28:42 UTC (rev 199780)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=openvpn
+pkgver=2.3.2
+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')
+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
+ openvpn at .service)
+md5sums=('06e5f93dbf13f2c19647ca15ffc23ac1'
+ 'SKIP'
+ '71fab8d1c2aa3a1f2609e259eaaf88b3')
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+ 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
+}
+
+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 -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 systemd service
+ install -D -m644 "${srcdir}"/openvpn at .service "${pkgdir}"/usr/lib/systemd/system/openvpn at .service
+}
Deleted: core-x86_64/openvpn-2.3.0-fix-systemd-ask-password-path.patch
===================================================================
--- core-x86_64/openvpn-2.3.0-fix-systemd-ask-password-path.patch 2013-11-16 07:41:56 UTC (rev 199779)
+++ core-x86_64/openvpn-2.3.0-fix-systemd-ask-password-path.patch 2013-11-16 09:28:42 UTC (rev 199780)
@@ -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) {
Copied: openvpn/repos/core-x86_64/openvpn.install (from rev 199779, openvpn/repos/testing-x86_64/openvpn.install)
===================================================================
--- core-x86_64/openvpn.install (rev 0)
+++ core-x86_64/openvpn.install 2013-11-16 09:28:42 UTC (rev 199780)
@@ -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
+}
Deleted: core-x86_64/openvpn at .service
===================================================================
--- core-x86_64/openvpn at .service 2013-11-16 07:41:56 UTC (rev 199779)
+++ core-x86_64/openvpn at .service 2013-11-16 09:28:42 UTC (rev 199780)
@@ -1,10 +0,0 @@
-[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/core-x86_64/openvpn at .service (from rev 199779, openvpn/repos/testing-x86_64/openvpn at .service)
===================================================================
--- core-x86_64/openvpn at .service (rev 0)
+++ core-x86_64/openvpn at .service 2013-11-16 09:28:42 UTC (rev 199780)
@@ -0,0 +1,9 @@
+[Unit]
+Description=OpenVPN connection to %i
+
+[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