aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-11-20 08:47:16 +0200
committerTimo Teräs <timo.teras@iki.fi>2013-11-20 08:47:16 +0200
commit08998f1ba2677f3eb8a9fc6d4a9397e1513fdf14 (patch)
tree33d1d21a2b715e950bd2541b37476e079991f64b /testing
parentfa093a9c66491c26b278acb7fea7b8dfacb18ab8 (diff)
downloadaports-08998f1ba2677f3eb8a9fc6d4a9397e1513fdf14.tar.bz2
aports-08998f1ba2677f3eb8a9fc6d4a9397e1513fdf14.tar.xz
testing/strongswan: upgrade to 5.1.1
also refresh configuration
Diffstat (limited to 'testing')
-rw-r--r--testing/strongswan/APKBUILD55
-rw-r--r--testing/strongswan/adns.patch10
2 files changed, 37 insertions, 28 deletions
diff --git a/testing/strongswan/APKBUILD b/testing/strongswan/APKBUILD
index b90a3e2185..d875d562a3 100644
--- a/testing/strongswan/APKBUILD
+++ b/testing/strongswan/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Jesse Young <jlyo@jlyo.org>
# Maintainer:
pkgname=strongswan
-pkgver=4.6.1
+pkgver=5.1.1
pkgrel=0
pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
url="http://www.strongswan.org/"
@@ -12,7 +12,8 @@ depends_dev="sqlite-dev openssl-dev curl-dev gmp-dev"
makedepends="$depends_dev"
install=""
subpackages="$pkgname-doc"
-source="http://download.strongswan.org/$pkgname-$pkgver.tar.bz2 adns.patch strongswan.initd"
+source="http://download.strongswan.org/$pkgname-$pkgver.tar.bz2
+ strongswan.initd"
_builddir="$srcdir/$pkgname-$pkgver"
prepare() {
@@ -27,36 +28,51 @@ prepare() {
build() {
cd "$_builddir"
+
+ # notes about configuration:
+ # - try to keep options in ./configure --help order
+ # - apk depends on openssl, so we use that
+ # - opnssl provides ciphers, randomness, etc
+ # -> disable all redundant in-tree copies
+
./configure --prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib \
--with-ipsecdir=/usr/lib/strongswan \
- --enable-pluto \
- --enable-sqlite \
- --enable-smartcard \
- --enable-cisco-quirks \
- --enable-openssl \
--enable-curl \
- --enable-sql \
- --enable-attr-sql \
- --enable-farp \
- --enable-dhcp \
+ --disable-ldap \
+ --disable-aes \
+ --disable-des \
+ --disable-rc2 \
+ --disable-md5 \
+ --disable-sha1 \
+ --disable-sha2 \
+ --enable-gmp \
+ --disable-hmac \
+ --disable-mysql \
+ --enable-sqlite \
--enable-eap-sim \
--enable-eap-sim-file \
+ --enable-eap-aka \
+ --enable-eap-aka-3gpp2 \
--enable-eap-simaka-pseudonym \
--enable-eap-simaka-reauth \
--enable-eap-identity \
--enable-eap-md5 \
--disable-eap-gtc \
- --enable-eap-aka \
- --enable-eap-aka-3gpp2 \
--enable-eap-mschapv2 \
--enable-eap-radius \
+ --enable-xauth-eap \
+ --enable-farp \
+ --enable-attr-sql \
+ --enable-dhcp \
+ --enable-openssl \
+ --enable-unity \
--enable-ha \
- --disable-mysql \
- --disable-ldap \
+ --enable-cmd \
+ --enable-shared \
--disable-static \
- --enable-shared || return 1
+ || return 1
make || return 1
}
@@ -69,6 +85,9 @@ package() {
rm "$pkgdir"/usr/lib/ipsec/*.la || return 1
}
-md5sums="85a28a12ed6f286a5bc9117e3a9386bb strongswan-4.6.1.tar.bz2
-8f02d0e582ac9ac60c28e465b626481d adns.patch
+md5sums="e3af3d493d22286be3cd794533a8966a strongswan-5.1.1.tar.bz2
fb9822512d02f521af8812db22a5175e strongswan.initd"
+sha256sums="fbf2a668221fc4a36a34bdeac2dfeda25b96f572d551df022585177953622406 strongswan-5.1.1.tar.bz2
+e4add8941d545930bba43d7d3af302bc436d7c0264a2796480226567e2b12e54 strongswan.initd"
+sha512sums="77b5f51e2e8d2c87c97984ddaf271f6c30ec418e3564bb131a9be6393e9aeb838e53fe90e0f271d8714c05975c655bba0762349f04984aa9b176f6b08c2c966f strongswan-5.1.1.tar.bz2
+2f2936865e494a9454329867acfb71ca323f90dec526a97f7d0c18422deb54205f81f9f592ed6c3b474fe5e954ebcb90eed0311e52fa3a86a982d80ba9a45be8 strongswan.initd"
diff --git a/testing/strongswan/adns.patch b/testing/strongswan/adns.patch
deleted file mode 100644
index 52c1852d0e..0000000000
--- a/testing/strongswan/adns.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/pluto/adns.c
-+++ b/src/pluto/adns.c
-@@ -179,7 +179,7 @@
- res_query(dname, class, type, answer, anslen)
- # define res_nclose(statp) res_close()
-
--static struct __res_state *statp = &_res;
-+#define statp (&(_res))
-
- #else /* !OLD_RESOLVER */