From 73076f984041f0a3b667b8f816f8b9bbf998bb32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Fri, 21 Mar 2014 06:19:11 +0000 Subject: main/ipsec-tools: fix musl build --- main/ipsec-tools/APKBUILD | 8 ++++---- main/ipsec-tools/musl-cdefs.patch | 40 +++++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD index 4ce59f4cd..82bbfb016 100644 --- a/main/ipsec-tools/APKBUILD +++ b/main/ipsec-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=ipsec-tools pkgver=0.8.2 -pkgrel=0 +pkgrel=1 pkgdesc="User-space IPsec tools for various IPsec implementations" url="http://ipsec-tools.sourceforge.net/" arch="all" @@ -71,7 +71,7 @@ f97205eea3dc68d2437a2ad8720f4520 50-reverse-connect.patch 94773c94233e14cdce0fa02ff780a43e 70-defer-isakmp-ident-handling.patch 2d5d24c4a3684a38584f88720f71c7d6 75-racoonctl-rcvbuf.patch 1d0d8ef21c65138d40f902502412da9c 90-dead-on-initial-contact.patch -2c415f8a8a0ffdc985c8162324d92677 musl-cdefs.patch" +88717d561b52a30a6598d3d02e6df20a musl-cdefs.patch" sha256sums="5e702549103d4cffb73d5bcd3a9b4cb75c398e7988f2421b2901cc0e15915785 ipsec-tools-0.8.2.tar.gz 07d6736958444f4473325f74857682232e048c201ac2154dc39be5f9e413e377 racoon.initd b97aecfe8c7263487934801a588426693e1c441a77144374d7d8f84af4ce83f5 racoon.confd @@ -80,7 +80,7 @@ ac505943c53fe26ef67b1f2e5543de785f0e6cbb8279f3045cb1b0e324baea0a 20-grekey-supp bad8fc8d4e5c50295d4e2f5e9c1cfcb6f5d018b801e0618ccf9d6ecbf6b3ab06 70-defer-isakmp-ident-handling.patch c07a9569ef19199e13c1d2f7b761c3354edf81b928194ac6e8cf911586f7cd25 75-racoonctl-rcvbuf.patch 8ea20cc244f9a8d0b819e773a4e5dd12c70639aa7f0fb78c797a394cf4ad72f2 90-dead-on-initial-contact.patch -df70ae2e83cf6da053739e01157b72f5b4ce1e9e4fbe3d0daac26e6cefee67b4 musl-cdefs.patch" +39a04a52e89bdf541b94cb5728e9f0957bb5bfc68a8d6a1552bfd04c5ac6fc61 musl-cdefs.patch" sha512sums="6cf4f1da7b461127e75f87fba8349f46b879f8bca179ae1cb27b2e011045753460c5edddbe8ba5892d6a28a021a0a01a9ff9fdb0f5da451519859570d748b9f2 ipsec-tools-0.8.2.tar.gz d821245731c370c12a63ef1fdf65ae1e4d9aceb390d7bd0bf191fa19c3522fea70882cf43cf550eb0b5603fefc47602acf3c8b898f82cffcf3eaacb73f500436 racoon.initd 61c285e63a21e4162efa058d91cc061ad0a8387a7e6f654151f31bac757cdd250247c1be6776e1f04edea223dfb56d015285459ab5bbfd6218bfe3e51b861576 racoon.confd @@ -89,4 +89,4 @@ d821245731c370c12a63ef1fdf65ae1e4d9aceb390d7bd0bf191fa19c3522fea70882cf43cf550eb 00ea3fb4b2ac91a550aaaffe53a29cc22f37f713052e2c5aee1bada6bcbc55b55ebe577f3df1ab09b314e99a45fd322152c2858263173cff17ff17993007b042 70-defer-isakmp-ident-handling.patch b65fbb7b8af6863f6dcb0b1cf5a6c856deb62a50f2b19455740340c4c453f5800335bc3b89509de06fc9bc21aa8db16f9eff579aa10b0762bb649ab891a06bfb 75-racoonctl-rcvbuf.patch 9719f7854ff5d37cb927fc6dd23241ade2c031ae7f3eaf14b41613c3f2139c7a237c739cc1df50a954b349f1c75e0992302cce6a7a551c139f4b9c5fcd376b1b 90-dead-on-initial-contact.patch -5560ba0147886f29b44cfd86d9b0e0424f9b50fa2ad080286224731b89c612b78c161729c907d53c8ccc0538315740f0c2f02a8fe1b957fb6af0e293a9f87f64 musl-cdefs.patch" +3794055d05883ea4c0cb4822248373c2e1e37e871ef8cd9ede07ad3d212422342e9ebefb4684e312793f0c509b9e35c0ad7c6453baadc33fbd5fc01e5fc96de9 musl-cdefs.patch" diff --git a/main/ipsec-tools/musl-cdefs.patch b/main/ipsec-tools/musl-cdefs.patch index f9374c152..234433f61 100644 --- a/main/ipsec-tools/musl-cdefs.patch +++ b/main/ipsec-tools/musl-cdefs.patch @@ -44,8 +44,6 @@ struct log { int head; int siz; -Only in ipsec-tools-0.8.1: src/racoon/logger.o -Only in ipsec-tools-0.8.1: src/racoon/main.o --- ipsec-tools-0.8.1.orig/src/racoon/misc.h +++ ipsec-tools-0.8.1/src/racoon/misc.h @@ -34,6 +34,8 @@ @@ -57,8 +55,6 @@ Only in ipsec-tools-0.8.1: src/racoon/main.o #define BIT2STR(b) bit2str(b, sizeof(b)<<3) #ifdef HAVE_FUNC_MACRO -Only in ipsec-tools-0.8.1: src/racoon/misc.o -Only in ipsec-tools-0.8.1: src/racoon/misc_noplog.o --- ipsec-tools-0.8.1.orig/src/racoon/missing/crypto/sha2/sha2.h +++ ipsec-tools-0.8.1/src/racoon/missing/crypto/sha2/sha2.h @@ -40,6 +40,8 @@ @@ -70,7 +66,6 @@ Only in ipsec-tools-0.8.1: src/racoon/misc_noplog.o #ifdef __cplusplus extern "C" { #endif -Only in ipsec-tools-0.8.1: src/racoon/nattraversal.o --- ipsec-tools-0.8.1.orig/src/racoon/netdb_dnssec.h +++ ipsec-tools-0.8.1/src/racoon/netdb_dnssec.h @@ -34,6 +34,8 @@ @@ -82,8 +77,6 @@ Only in ipsec-tools-0.8.1: src/racoon/nattraversal.o #ifndef T_CERT #define T_CERT 37 /* defined by RFC2538 section 2 */ #endif -Only in ipsec-tools-0.8.1: src/racoon/oakley.o -Only in ipsec-tools-0.8.1: src/racoon/pfkey.o --- ipsec-tools-0.8.1.orig/src/racoon/plog.h +++ ipsec-tools-0.8.1/src/racoon/plog.h @@ -34,6 +34,7 @@ @@ -94,19 +87,6 @@ Only in ipsec-tools-0.8.1: src/racoon/pfkey.o #ifdef HAVE_STDARG_H #include #else -Only in ipsec-tools-0.8.1: src/racoon/plog.o -Only in ipsec-tools-0.8.1: src/racoon/policy.o -Only in ipsec-tools-0.8.1: src/racoon/privsep.o -Only in ipsec-tools-0.8.1: src/racoon/proposal.o -Only in ipsec-tools-0.8.1: src/racoon/prsa_par.o -Only in ipsec-tools-0.8.1: src/racoon/prsa_tok.o -Only in ipsec-tools-0.8.1: src/racoon/remoteconf.o -Only in ipsec-tools-0.8.1: src/racoon/rsalist.o -Only in ipsec-tools-0.8.1: src/racoon/safefile.o -Only in ipsec-tools-0.8.1: src/racoon/sainfo.o -Only in ipsec-tools-0.8.1: src/racoon/schedule.o -Only in ipsec-tools-0.8.1: src/racoon/session.o -Only in ipsec-tools-0.8.1: src/racoon/sockmisc.o --- ipsec-tools-0.8.1.orig/src/racoon/str2val.h +++ ipsec-tools-0.8.1/src/racoon/str2val.h @@ -34,6 +34,8 @@ @@ -154,3 +134,23 @@ Only in ipsec-tools-0.8.1: src/racoon/sockmisc.o GETNEXTNUM(sa_args.seq, strtoul); #undef GETNEXTNUM +--- ipsec-tools-0.8.2.orig/src/setkey/setkey.c ++++ ipsec-tools-0.8.2/src/setkey/setkey.c +@@ -40,7 +40,6 @@ + #include + #include + #include +-#include + #include + #include + #include +--- ipsec-tools-0.8.2.orig/src/racoon/pfkey.c ++++ ipsec-tools-0.8.2/src/racoon/pfkey.c +@@ -59,7 +59,6 @@ + #include + #include + #include +-#include + + #include + #include -- cgit v1.2.3