Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre/abslibre

1 files changed, 25 insertions, 16 deletions

diff --git a/pcr/strongswan/PKGBUILD b/pcr/strongswan/PKGBUILD
index 9d9942fa1..ce2d93518 100644
--- a/pcr/strongswan/PKGBUILD
+++ b/pcr/strongswan/PKGBUILD
@@ -1,35 +1,46 @@
-# Contributor (Arch): nikicat <develniks at gmail dot com>
-# Contributor (Arch): danilo <gezuru at gmail dot com>
-# Contributor (Arch): Jason Begley <jayray at digitalgoat dot com>
-# Contributor (Arch): Ray Kohler <ataraxia937 at gmail dot com>
-# Contributor (Arch): Daniel Riedemann <daniel.riedemann [at] googlemail [dot] com>
-# Contributor (Arch): 458italia <svenskaparadox [at] gmail dot com>
-# Maintainer (Arch): dkorzhevin <dkorzhevin at gmail dot com>
+# Contributor: nikicat <develniks at gmail dot com>
+# Contributor: danilo <gezuru at gmail dot com>
+# Contributor: Jason Begley <jayray at digitalgoat dot com>
+# Contributor: Ray Kohler <ataraxia937 at gmail dot com>
+# Contributor: Daniel Riedemann <daniel.riedemann [at] googlemail [dot] com>
+# Contributor: 458italia <svenskaparadox [at] gmail dot com>
+# Contributor: Thermi <noel [at] familie-kuntze dot com>
+# Maintainer: dkorzhevin <dkorzhevin at gmail dot com>
 
 pkgname=strongswan
-pkgver=5.1.0
-pkgrel=2
-pkgdesc="open source IPsec implementation"
+pkgver=5.2.2
+pkgrel=1
+pkgdesc="IPsec-based VPN Solution"
 url='http://www.strongswan.org'
 license=("GPL")
 arch=('i686' 'x86_64' 'mips64el')
 depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite')
+makedepends=('ldns' 'unbound' 'networkmanager' 'libnm-glib')
+optdepends=('unbound: dns resolver plugin'
+            'networkmanager: nm backend')
 conflicts=('openswan')
 options=(!libtool)
 backup=(etc/ipsec.conf etc/strongswan.conf)
-source=(http://download.strongswan.org/${pkgname}-${pkgver}.tar.bz2 strongswan.rc::https://gist.github.com/raw/3106703/96d2ce9683f1e33ef14c679880ddc298e9673508/strongswan.rc)
+source=(http://download.strongswan.org/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('7ee1a33060b2bde35be0f6d78a1d26d0'
+         'SKIP')
+validpgpkeys=('948F158A4E76A27BF3D07532DF42C170B34DBA77')
 changelog='CHANGELOG'
-md5sums=('c1cd0a3ba9960f590cae28c8470800e8'
-         'cf815adef48a1ffee34517380c731277')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+   export systemd_daemon_CFLAGS="-I/usr/include" \
+          systemd_daemon_LIBS="-L/usr/lib -lsystemd"
+   export systemd_journal_CFLAGS="-I/usr/include" \
+          systemd_journal_LIBS="-L/usr/lib -lsystemd"
 
   ./configure --prefix=/usr \
         --sbindir=/usr/bin \
         --sysconfdir=/etc \
         --libexecdir=/usr/lib \
+        --disable-static \
         --with-ipsecdir=/usr/lib/strongswan \
+        --with-systemdsystemunitdir=/usr/lib/systemd/system \
         --enable-sqlite \
         --enable-openssl --enable-curl \
         --enable-sql --enable-attr-sql \
@@ -38,9 +49,7 @@ build() {
         --enable-eap-simaka-reauth --enable-eap-identity --enable-eap-md5 \
         --enable-eap-gtc --enable-eap-aka --enable-eap-aka-3gpp2 \
         --enable-eap-mschapv2 --enable-eap-radius --enable-xauth-eap \
-        --enable-ha \
-        --disable-mysql --disable-ldap \
-        --enable-cmd
+        --enable-ha --enable-systemd --enable-nm
 
   make
 }