strongswan-5.5.1-1: updating version

2 files changed, 46 insertions, 16 deletions

diff --git a/pcr/strongswan/PKGBUILD b/pcr/strongswan/PKGBUILD
index f876d5e8f..a9483eef1 100644
--- a/pcr/strongswan/PKGBUILD
+++ b/pcr/strongswan/PKGBUILD
@@ -10,21 +10,24 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=strongswan
-pkgver=5.3.5
-pkgrel=1.2
+pkgver=5.5.1
+pkgrel=1
 pkgdesc="open source IPsec implementation"
 url='http://www.strongswan.org'
 license=("GPL")
 arch=('i686' 'x86_64')
-depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite' 'systemd')
+# If you want networkmanager support, add a makedepend and depend for libnm-glib
+depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite' 'libcap' 'libsystemd' 'pam')
+makedepends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite' 'libcap' 'libsystemd' 'systemd' 'pam')
 conflicts=('openswan')
 options=(!libtool)
 backup=(
-	etc/ipsec.conf 
-	etc/swanctl/swanctl.conf
-	etc/strongswan.conf 
-	etc/strongswan.d/{charon-logging.conf,charon.conf,pki.conf,pool.conf,scepclient.conf,starter.conf,swanctl.conf}
-	etc/strongswan.d/charon/{aesni.conf,attr-sql.conf,attr.conf,cmac.conf,connmark.conf,\
+    etc/ipsec.conf
+    etc/ipsec.secrets
+    etc/swanctl/swanctl.conf
+    etc/strongswan.conf
+    etc/strongswan.d/{charon-logging.conf,charon.conf,pki.conf,pool.conf,scepclient.conf,starter.conf,swanctl.conf}
+    etc/strongswan.d/charon/{aesni.conf,attr-sql.conf,attr.conf,cmac.conf,connmark.conf,\
 constraints.conf,curl.conf,des.conf,dhcp.conf,dnskey.conf,eap-aka-3gpp2.conf,eap-aka.conf,\
 eap-gtc.conf,eap-identity.conf,eap-md5.conf,eap-mschapv2.conf,eap-radius.conf,eap-sim-file.conf,\
 eap-sim.conf,eap-simaka-pseudonym.conf,eap-simaka-reauth.conf,eap-tls.conf,ext-auth.conf,farp.conf,\
@@ -34,18 +37,27 @@ revocation.conf,sha1.conf,sha2.conf,socket-default.conf,sql.conf,sqlite.conf,ssh
 vici.conf,x509.conf,xauth-eap.conf,xauth-generic.conf,xcbc.conf,chapoly.conf,unity.conf}
 )
 
-source=("https://download.strongswan.org/strongswan-${pkgver}.tar.bz2")
+source=("https://download.strongswan.org/strongswan-${pkgver}.tar.bz2"
+    "configure_ac.patch"
+    )
 
 # md5 is broken. We use sha256 now. Alternatively, we could check the signature of the file, but that
 # doesn't yield any more security and just increases the work users initially have to invest.
-sha256sums=('2c84b663da652b1ff180a1a73c24a3d7b9fc4b9b8ba6bd07f94a1e33092e6350')
-
+sha256sums=('720b301991f77bdedd8d551a956f52e2d11686a0ec18e832094f86cf2b842ab7'
+            '003750d77fa501075f1fdb6f55926dc544407c5dd26e2fd8d5eb4917ddf0b3f7')
+            
 # We don't build libipsec because it would get loaded before kernel-netlink and netkey, which
 # would case processing to be handled in user space. Also, the plugin is experimental. If you need it,
 # add --enable-libipsec and --enable-kernel-libipsec
+prepare()
+{
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    patch -p1 -l < "${srcdir}/configure_ac.patch"
+    autoreconf
+}
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
         --sbindir=/usr/bin \
@@ -61,10 +73,12 @@ build() {
         --enable-eap-gtc --enable-eap-aka --enable-eap-aka-3gpp2 \
         --enable-eap-mschapv2 --enable-eap-radius --enable-xauth-eap \
         --enable-ha --enable-vici --enable-swanctl --enable-systemd --enable-ext-auth \
-        --disable-mysql --disable-ldap -enable-cmd --enable-forecast --enable-connmark \
-	--enable-aesni --enable-eap-ttls --enable-radattr --enable-xauth-pam --enable-xauth-noauth \
-	--enable-eap-dynamic --enable-eap-peap --enable-eap-tls --enable-chapoly --enable-unity 
-#	--enable-ruby-gems --enable-python-eggs
+        --disable-mysql --disable-ldap --enable-cmd --enable-forecast --enable-connmark \
+        --enable-aesni --enable-eap-ttls --enable-radattr --enable-xauth-pam --enable-xauth-noauth \
+        --enable-eap-dynamic --enable-eap-peap --enable-eap-tls --enable-chapoly --enable-unity \
+        --with-capabilities=libcap
+# if you want networkmanager support, add --enable-nm
+#       --enable-ruby-gems --enable-python-eggs
   make
 }
 
diff --git a/pcr/strongswan/configure_ac.patch b/pcr/strongswan/configure_ac.patch
new file mode 100644
index 000000000..529952063
--- /dev/null
+++ b/pcr/strongswan/configure_ac.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac      2016-03-22 09:36:03.000000000 +0100
++++ b/configure.ac      2016-03-26 18:35:44.697586161 +0100
+@@ -946,10 +946,10 @@
+        PKG_CHECK_MODULES(systemd, [libsystemd >= 209],
+                [AC_SUBST(systemd_CFLAGS)
+                 AC_SUBST(systemd_LIBS)],
+-               [PKG_CHECK_MODULES(systemd_daemon, [libsystemd-daemon])
++               [PKG_CHECK_MODULES(systemd_daemon, [libsystemd])
+                 AC_SUBST(systemd_daemon_CFLAGS)
+                 AC_SUBST(systemd_daemon_LIBS)
+-                PKG_CHECK_MODULES(systemd_journal, [libsystemd-journal])
++                PKG_CHECK_MODULES(systemd_journal, [libsystemd])
+                 AC_SUBST(systemd_journal_CFLAGS)
+                 AC_SUBST(systemd_journal_LIBS)]
+        )
+