diff options
-rw-r--r-- | main/ipsec-tools/APKBUILD | 12 | ||||
-rw-r--r-- | main/ipsec-tools/fix-yywrap.patch | 23 |
2 files changed, 31 insertions, 4 deletions
diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD index 82bbfb0166..cf6fcd75e7 100644 --- a/main/ipsec-tools/APKBUILD +++ b/main/ipsec-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ipsec-tools pkgver=0.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="User-space IPsec tools for various IPsec implementations" url="http://ipsec-tools.sourceforge.net/" arch="all" @@ -18,6 +18,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 75-racoonctl-rcvbuf.patch 90-dead-on-initial-contact.patch musl-cdefs.patch + fix-yywrap.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -71,7 +72,8 @@ f97205eea3dc68d2437a2ad8720f4520 50-reverse-connect.patch 94773c94233e14cdce0fa02ff780a43e 70-defer-isakmp-ident-handling.patch 2d5d24c4a3684a38584f88720f71c7d6 75-racoonctl-rcvbuf.patch 1d0d8ef21c65138d40f902502412da9c 90-dead-on-initial-contact.patch -88717d561b52a30a6598d3d02e6df20a musl-cdefs.patch" +88717d561b52a30a6598d3d02e6df20a musl-cdefs.patch +de8e67611ae61b9138d5f59af334d894 fix-yywrap.patch" sha256sums="5e702549103d4cffb73d5bcd3a9b4cb75c398e7988f2421b2901cc0e15915785 ipsec-tools-0.8.2.tar.gz 07d6736958444f4473325f74857682232e048c201ac2154dc39be5f9e413e377 racoon.initd b97aecfe8c7263487934801a588426693e1c441a77144374d7d8f84af4ce83f5 racoon.confd @@ -80,7 +82,8 @@ ac505943c53fe26ef67b1f2e5543de785f0e6cbb8279f3045cb1b0e324baea0a 20-grekey-supp bad8fc8d4e5c50295d4e2f5e9c1cfcb6f5d018b801e0618ccf9d6ecbf6b3ab06 70-defer-isakmp-ident-handling.patch c07a9569ef19199e13c1d2f7b761c3354edf81b928194ac6e8cf911586f7cd25 75-racoonctl-rcvbuf.patch 8ea20cc244f9a8d0b819e773a4e5dd12c70639aa7f0fb78c797a394cf4ad72f2 90-dead-on-initial-contact.patch -39a04a52e89bdf541b94cb5728e9f0957bb5bfc68a8d6a1552bfd04c5ac6fc61 musl-cdefs.patch" +39a04a52e89bdf541b94cb5728e9f0957bb5bfc68a8d6a1552bfd04c5ac6fc61 musl-cdefs.patch +40f0c50fc55316e58bb3c0dd9a0b26ea19576e354f53b0098a9e441c0ec268c8 fix-yywrap.patch" sha512sums="6cf4f1da7b461127e75f87fba8349f46b879f8bca179ae1cb27b2e011045753460c5edddbe8ba5892d6a28a021a0a01a9ff9fdb0f5da451519859570d748b9f2 ipsec-tools-0.8.2.tar.gz d821245731c370c12a63ef1fdf65ae1e4d9aceb390d7bd0bf191fa19c3522fea70882cf43cf550eb0b5603fefc47602acf3c8b898f82cffcf3eaacb73f500436 racoon.initd 61c285e63a21e4162efa058d91cc061ad0a8387a7e6f654151f31bac757cdd250247c1be6776e1f04edea223dfb56d015285459ab5bbfd6218bfe3e51b861576 racoon.confd @@ -89,4 +92,5 @@ d821245731c370c12a63ef1fdf65ae1e4d9aceb390d7bd0bf191fa19c3522fea70882cf43cf550eb 00ea3fb4b2ac91a550aaaffe53a29cc22f37f713052e2c5aee1bada6bcbc55b55ebe577f3df1ab09b314e99a45fd322152c2858263173cff17ff17993007b042 70-defer-isakmp-ident-handling.patch b65fbb7b8af6863f6dcb0b1cf5a6c856deb62a50f2b19455740340c4c453f5800335bc3b89509de06fc9bc21aa8db16f9eff579aa10b0762bb649ab891a06bfb 75-racoonctl-rcvbuf.patch 9719f7854ff5d37cb927fc6dd23241ade2c031ae7f3eaf14b41613c3f2139c7a237c739cc1df50a954b349f1c75e0992302cce6a7a551c139f4b9c5fcd376b1b 90-dead-on-initial-contact.patch -3794055d05883ea4c0cb4822248373c2e1e37e871ef8cd9ede07ad3d212422342e9ebefb4684e312793f0c509b9e35c0ad7c6453baadc33fbd5fc01e5fc96de9 musl-cdefs.patch" +3794055d05883ea4c0cb4822248373c2e1e37e871ef8cd9ede07ad3d212422342e9ebefb4684e312793f0c509b9e35c0ad7c6453baadc33fbd5fc01e5fc96de9 musl-cdefs.patch +568e64288e4c15fc0b1221ce9fa2e88c234e36d5c1e366b8c52b39171aa319d99843817c1d3c0b8517b638474289e4a113220903f319806a6365115585feffc0 fix-yywrap.patch" diff --git a/main/ipsec-tools/fix-yywrap.patch b/main/ipsec-tools/fix-yywrap.patch new file mode 100644 index 0000000000..0a9ff37492 --- /dev/null +++ b/main/ipsec-tools/fix-yywrap.patch @@ -0,0 +1,23 @@ +--- ipsec-tools-0.8.2.orig/src/racoon/cftoken.l 2014-04-15 14:47:11.000000000 -0300 ++++ ipsec-tools-0.8.2/src/racoon/cftoken.l 2014-04-15 18:49:14.589422339 -0300 +@@ -110,6 +110,8 @@ + static int yy_first_time = 1; + %} + ++%option noyywrap ++ + /* common seciton */ + nl \n + ws [ \t]+ +diff -ru ipsec-tools-0.8.2.orig/src/setkey/token.l ipsec-tools-0.8.2/src/setkey/token.l +--- ipsec-tools-0.8.2.orig/src/setkey/token.l 2012-08-23 14:10:46.000000000 -0300 ++++ ipsec-tools-0.8.2/src/setkey/token.l 2014-04-15 18:48:11.023100041 -0300 +@@ -111,7 +111,7 @@ + + %s S_PL S_AUTHALG S_ENCALG + +-%option noinput nounput ++%option noinput nounput noyywrap + %% + + |