main/strongswan: security upgrade to 5.1.3

fixes CVE-2014-2338 along with multiple bug fixes
author: Timo Teräs <timo.teras@iki.fi> 2014-04-15 21:43:12 +0300
committer: Timo Teräs <timo.teras@iki.fi> 2014-04-15 21:43:12 +0300
commit: 2e402688d156334e2ffe4986f3f3210457d52aa6 (patch)
tree: f9ada433e57ef7b9e7f7b9006358b65329061879
parent: 4c21cf9569ba36420aed58c1213eb886c3e563b4 (diff)
download: alpine_aports-2e402688d156334e2ffe4986f3f3210457d52aa6.tar.bz2
alpine_aports-2e402688d156334e2ffe4986f3f3210457d52aa6.tar.xz
alpine_aports-2e402688d156334e2ffe4986f3f3210457d52aa6.zip
2 files changed, 5 insertions, 33 deletions
diff --git a/main/strongswan/APKBUILD b/main/strongswan/APKBUILD
index 7788fcc7ef..910b01e4e0 100644
--- a/main/strongswan/APKBUILD
+++ b/main/strongswan/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Jesse Young <jlyo@jlyo.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=strongswan
-pkgver=5.1.1
+pkgver=5.1.3
-pkgrel=3
+pkgrel=0
 pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
 url="http://www.strongswan.org/"
 arch="all"
@@ -13,7 +13,6 @@ makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-doc"
 source="http://download.strongswan.org/$pkgname-$pkgver.tar.bz2
-        pki-Increase-MAX_COMMANDS-to-cover-all-currently-available-commands.patch
        strongswan.initd"
 _builddir="$srcdir/$pkgname-$pkgver"
@@ -90,12 +89,9 @@ package() {
        rm "$pkgdir"/usr/lib/ipsec/*.la || return 1
 }
-md5sums="e3af3d493d22286be3cd794533a8966a  strongswan-5.1.1.tar.bz2
+md5sums="1d1c108775242743cd8699215b2918c3  strongswan-5.1.3.tar.bz2
-1fbaa72ce6bcb065d3f13502f1eba855  pki-Increase-MAX_COMMANDS-to-cover-all-currently-available-commands.patch
 fb9822512d02f521af8812db22a5175e  strongswan.initd"
-sha256sums="fbf2a668221fc4a36a34bdeac2dfeda25b96f572d551df022585177953622406  strongswan-5.1.1.tar.bz2
+sha256sums="84e46d5ce801e1b874e2bfba8d21dbd78b432e23b7fb1f4f2d637359e7a183a8  strongswan-5.1.3.tar.bz2
-7f7601707c3d53e8a0a2df71dbf692366491f18851713f24c057b3e0366fd4e6  pki-Increase-MAX_COMMANDS-to-cover-all-currently-available-commands.patch
 e4add8941d545930bba43d7d3af302bc436d7c0264a2796480226567e2b12e54  strongswan.initd"
-sha512sums="77b5f51e2e8d2c87c97984ddaf271f6c30ec418e3564bb131a9be6393e9aeb838e53fe90e0f271d8714c05975c655bba0762349f04984aa9b176f6b08c2c966f  strongswan-5.1.1.tar.bz2
+sha512sums="05f4afbf778de54c593692a8117a5fae05c0539cdb7545bc53657deb32d09bec7e0aef07d509dc682af15d57adf569242715447bc1a87785c1f80a21076cb8cb  strongswan-5.1.3.tar.bz2
-2f3c0427504f96827fb331099ba39690b0e72e0b145bd566bccd69d660631b0c3972e6a0f3315596e52a70f29767f54bc3225ccd2f23b8c6699fd557d09a3a49  pki-Increase-MAX_COMMANDS-to-cover-all-currently-available-commands.patch
 2f2936865e494a9454329867acfb71ca323f90dec526a97f7d0c18422deb54205f81f9f592ed6c3b474fe5e954ebcb90eed0311e52fa3a86a982d80ba9a45be8  strongswan.initd"
diff --git a/main/strongswan/pki-Increase-MAX_COMMANDS-to-cover-all-currently-available-commands.patch b/main/strongswan/pki-Increase-MAX_COMMANDS-to-cover-all-currently-available-commands.patch
deleted file mode 100644
index da6ffe18de..0000000000
--- a/main/strongswan/pki-Increase-MAX_COMMANDS-to-cover-all-currently-available-commands.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 079e6c2b04faa8cd09478662a255cc87acfaede1
-Author: Tobias Brunner <tobias@strongswan.org>
-Date:   Wed Dec 11 17:24:03 2013 +0100
-    pki: Increase MAX_COMMANDS to cover all currently available commands
-    
-    Fixes #452.
-diff --git a/src/pki/command.h b/src/pki/command.h
-index 1a884fb..3e66a1a 100644
--- a/src/pki/command.h
-+++ b/src/pki/command.h
-@@ -22,9 +22,9 @@
- #define COMMAND_H_
- 
- /**
- * Maximum number of commands.
-+ * Maximum number of commands (+1).
-  */
-#define MAX_COMMANDS 10
-+#define MAX_COMMANDS 11
- 
- /**
-  * Maximum number of options in a command (+1)
author	Timo Teräs <timo.teras@iki.fi>	2014-04-15 21:43:12 +0300
committer	Timo Teräs <timo.teras@iki.fi>	2014-04-15 21:43:12 +0300
commit	2e402688d156334e2ffe4986f3f3210457d52aa6 (patch)
tree	f9ada433e57ef7b9e7f7b9006358b65329061879
parent	4c21cf9569ba36420aed58c1213eb886c3e563b4 (diff)
download	alpine_aports-2e402688d156334e2ffe4986f3f3210457d52aa6.tar.bz2 alpine_aports-2e402688d156334e2ffe4986f3f3210457d52aa6.tar.xz alpine_aports-2e402688d156334e2ffe4986f3f3210457d52aa6.zip

diff --git a/main/strongswan/APKBUILD b/main/strongswan/APKBUILD index 7788fcc7ef..910b01e4e0 100644 --- a/main/strongswan/APKBUILD +++ b/main/strongswan/APKBUILD
@@ -1,8 +1,8 @@
1	# Contributor: Jesse Young <jlyo@jlyo.org>	1	# Contributor: Jesse Young <jlyo@jlyo.org>
2	# Maintainer: Natanael Copa <ncopa@alpinelinux.org>	2	# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
3	pkgname=strongswan	3	pkgname=strongswan
4	pkgver=5.1.1	4	pkgver=5.1.3
5	pkgrel=3	5	pkgrel=0
6	pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"	6	pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
7	url="http://www.strongswan.org/"	7	url="http://www.strongswan.org/"
8	arch="all"	8	arch="all"
@@ -13,7 +13,6 @@ makedepends="$depends_dev"
13	install=""	13	install=""
14	subpackages="$pkgname-doc"	14	subpackages="$pkgname-doc"
15	source="http://download.strongswan.org/$pkgname-$pkgver.tar.bz2	15	source="http://download.strongswan.org/$pkgname-$pkgver.tar.bz2
16	pki-Increase-MAX_COMMANDS-to-cover-all-currently-available-commands.patch
17	strongswan.initd"	16	strongswan.initd"
18		17
19	_builddir="$srcdir/$pkgname-$pkgver"	18	_builddir="$srcdir/$pkgname-$pkgver"
@@ -90,12 +89,9 @@ package() {
90	rm "$pkgdir"/usr/lib/ipsec/*.la \|\| return 1	89	rm "$pkgdir"/usr/lib/ipsec/*.la \|\| return 1
91	}	90	}
92		91
93	md5sums="e3af3d493d22286be3cd794533a8966a strongswan-5.1.1.tar.bz2	92	md5sums="1d1c108775242743cd8699215b2918c3 strongswan-5.1.3.tar.bz2
94	1fbaa72ce6bcb065d3f13502f1eba855 pki-Increase-MAX_COMMANDS-to-cover-all-currently-available-commands.patch
95	fb9822512d02f521af8812db22a5175e strongswan.initd"	93	fb9822512d02f521af8812db22a5175e strongswan.initd"
96	sha256sums="fbf2a668221fc4a36a34bdeac2dfeda25b96f572d551df022585177953622406 strongswan-5.1.1.tar.bz2	94	sha256sums="84e46d5ce801e1b874e2bfba8d21dbd78b432e23b7fb1f4f2d637359e7a183a8 strongswan-5.1.3.tar.bz2
97	7f7601707c3d53e8a0a2df71dbf692366491f18851713f24c057b3e0366fd4e6 pki-Increase-MAX_COMMANDS-to-cover-all-currently-available-commands.patch
98	e4add8941d545930bba43d7d3af302bc436d7c0264a2796480226567e2b12e54 strongswan.initd"	95	e4add8941d545930bba43d7d3af302bc436d7c0264a2796480226567e2b12e54 strongswan.initd"
99	sha512sums="77b5f51e2e8d2c87c97984ddaf271f6c30ec418e3564bb131a9be6393e9aeb838e53fe90e0f271d8714c05975c655bba0762349f04984aa9b176f6b08c2c966f strongswan-5.1.1.tar.bz2	96	sha512sums="05f4afbf778de54c593692a8117a5fae05c0539cdb7545bc53657deb32d09bec7e0aef07d509dc682af15d57adf569242715447bc1a87785c1f80a21076cb8cb strongswan-5.1.3.tar.bz2
100	2f3c0427504f96827fb331099ba39690b0e72e0b145bd566bccd69d660631b0c3972e6a0f3315596e52a70f29767f54bc3225ccd2f23b8c6699fd557d09a3a49 pki-Increase-MAX_COMMANDS-to-cover-all-currently-available-commands.patch
101	2f2936865e494a9454329867acfb71ca323f90dec526a97f7d0c18422deb54205f81f9f592ed6c3b474fe5e954ebcb90eed0311e52fa3a86a982d80ba9a45be8 strongswan.initd"	97	2f2936865e494a9454329867acfb71ca323f90dec526a97f7d0c18422deb54205f81f9f592ed6c3b474fe5e954ebcb90eed0311e52fa3a86a982d80ba9a45be8 strongswan.initd"


diff --git a/main/strongswan/pki-Increase-MAX_COMMANDS-to-cover-all-currently-available-commands.patch b/main/strongswan/pki-Increase-MAX_COMMANDS-to-cover-all-currently-available-commands.patch deleted file mode 100644 index da6ffe18de..0000000000 --- a/main/strongswan/pki-Increase-MAX_COMMANDS-to-cover-all-currently-available-commands.patch +++ /dev/null
@@ -1,24 +0,0 @@
1	commit 079e6c2b04faa8cd09478662a255cc87acfaede1
2	Author: Tobias Brunner <tobias@strongswan.org>
3	Date: Wed Dec 11 17:24:03 2013 +0100
4
5	pki: Increase MAX_COMMANDS to cover all currently available commands
6
7	Fixes #452.
8
9	diff --git a/src/pki/command.h b/src/pki/command.h
10	index 1a884fb..3e66a1a 100644
11	--- a/src/pki/command.h
12	+++ b/src/pki/command.h
13	@@ -22,9 +22,9 @@
14	#define COMMAND_H_
15
16	/**
17	- * Maximum number of commands.
18	+ * Maximum number of commands (+1).
19	*/
20	-#define MAX_COMMANDS 10
21	+#define MAX_COMMANDS 11
22
23	/**
24	* Maximum number of options in a command (+1)