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

[Thomas Bächler]

    Date: Saturday, August 13, 2011 @ 13:34:29
  Author: thomas
Revision: 135441

openvpn: upstream update, fix FS#24797, FS#19376

Modified:
  openvpn/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-13 13:28:32 UTC (rev 135440)
+++ PKGBUILD	2011-08-13 17:34:29 UTC (rev 135441)
@@ -2,21 +2,21 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 
 pkgname=openvpn
-pkgver=2.2.0
+pkgver=2.2.1
 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')
+depends=('openssl' 'lzo2' 'iproute2')
 license=('custom')
 backup=(usr/share/openvpn/easy-rsa/vars
-        usr/share/openvpn/easy-rsa/openssl.cnf
+        usr/share/openvpn/easy-rsa/openssl-1.0.0.cnf
         etc/conf.d/openvpn-tapdev)
 source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz
         openvpn.rc
         openvpn-tapdev.rc
         openvpn-tapdev.conf)
-md5sums=('4f440603eac45fec7be218b87d570834'
+md5sums=('500bee5449b29906150569aaf2eb2730'
          'a3809b9727f0c2af2d0770f5c7442db2'
          'd2c48e970088d679dd3c2afd914ff731'
          '722f483c9e3ce2ec66d3301aaf7cf3d5')
@@ -24,7 +24,11 @@
 build() {
   cd $srcdir/$pkgname-$pkgver
   # Build openvpn
-  CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure --prefix=/usr --enable-password-save --mandir=/usr/share/man
+  CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \
+    --prefix=/usr \
+    --enable-password-save \
+    --mandir=/usr/share/man \
+    --enable-iproute2
   make
 
   # Build plugins
@@ -50,10 +54,15 @@
   for plug in auth-pam down-root; do
     cd $srcdir/$pkgname-$pkgver/plugin/$plug
     install -D -m755 openvpn-$plug.so $pkgdir/usr/lib/openvpn/openvpn-$plug.so
+    cd -
   done
+  # Install contrib
+  install -d -m755 $pkgdir/usr/share/openvpn/contrib
+  cp -r contrib $pkgdir/usr/share/openvpn
   # Install easy-rsa
   cd $srcdir/$pkgname-$pkgver
   make -C easy-rsa/2.0 install DESTDIR=$pkgdir PREFIX=usr/share/openvpn/easy-rsa
+  rm -f ${pkgdir}/usr/share/openvpn/easy-rsa/openssl-0.9.?.cnf
   # Install rc scripts
   install -D -m755 $srcdir/openvpn.rc $pkgdir/etc/rc.d/openvpn
   install -D -m755 $srcdir/openvpn-tapdev.rc $pkgdir/etc/rc.d/openvpn-tapdev