main/ipsec-tools: fix musl build

2 files changed, 184 insertions, 2 deletions

diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD
index 17109a385a..04d8ccca63 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.1
-pkgrel=2
+pkgrel=3
 pkgdesc="User-space IPsec tools for various IPsec implementations"
 url="http://ipsec-tools.sourceforge.net/"
 arch="all"
@@ -20,6 +20,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	70-defer-isakmp-ident-handling.patch
 	75-racoonctl-rcvbuf.patch
 	90-dead-on-initial-contact.patch
+	musl-cdefs.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -75,4 +76,29 @@ a6efed1359bde30ea3652fdbe76d89c0  20-grekey-support.patch
 f97205eea3dc68d2437a2ad8720f4520  50-reverse-connect.patch
 94773c94233e14cdce0fa02ff780a43e  70-defer-isakmp-ident-handling.patch
 2d5d24c4a3684a38584f88720f71c7d6  75-racoonctl-rcvbuf.patch
-1d0d8ef21c65138d40f902502412da9c  90-dead-on-initial-contact.patch"
+1d0d8ef21c65138d40f902502412da9c  90-dead-on-initial-contact.patch
+2c415f8a8a0ffdc985c8162324d92677  musl-cdefs.patch"
+sha256sums="f31d927ad94fc4117855dfeb6f79a05c336811578b37ad6173b11f66e5c7272f  ipsec-tools-0.8.1.tar.gz
+07d6736958444f4473325f74857682232e048c201ac2154dc39be5f9e413e377  racoon.initd
+b97aecfe8c7263487934801a588426693e1c441a77144374d7d8f84af4ce83f5  racoon.confd
+7ba0e60ba892b01f1852ac8230b92526fffec4c0164f35eb7da8e1a01c1c9182  01-fix-deletion-notification.patch
+32aa7eac936f17f9f9101a724ff6580a3d806e60244e768f750a3a83e4688f55  02-fix-xauth-double-free-on-reload.patch
+b41bf700ea35f28b62d7c11477ec882fa924ba6bb7a679a7c308d21eabb1b440  03-fix-sport-selection.patch
+ac505943c53fe26ef67b1f2e5543de785f0e6cbb8279f3045cb1b0e324baea0a  20-grekey-support.patch
+04fa15dbce53099e59b03e8fa1dab2da42b82743b1d88aaafc34b6bdfefc170c  50-reverse-connect.patch
+bad8fc8d4e5c50295d4e2f5e9c1cfcb6f5d018b801e0618ccf9d6ecbf6b3ab06  70-defer-isakmp-ident-handling.patch
+c07a9569ef19199e13c1d2f7b761c3354edf81b928194ac6e8cf911586f7cd25  75-racoonctl-rcvbuf.patch
+8ea20cc244f9a8d0b819e773a4e5dd12c70639aa7f0fb78c797a394cf4ad72f2  90-dead-on-initial-contact.patch
+df70ae2e83cf6da053739e01157b72f5b4ce1e9e4fbe3d0daac26e6cefee67b4  musl-cdefs.patch"
+sha512sums="80506f34d97712c5220ad566d9c461c9788b2179ae172579f05def72c5e40cd787dafe601a494e452878a5efa3fdf3c61d3ef9c0800fb708cfcdf8510f3f2374  ipsec-tools-0.8.1.tar.gz
+d821245731c370c12a63ef1fdf65ae1e4d9aceb390d7bd0bf191fa19c3522fea70882cf43cf550eb0b5603fefc47602acf3c8b898f82cffcf3eaacb73f500436  racoon.initd
+61c285e63a21e4162efa058d91cc061ad0a8387a7e6f654151f31bac757cdd250247c1be6776e1f04edea223dfb56d015285459ab5bbfd6218bfe3e51b861576  racoon.confd
+09a7d951f77c97c2e17028060fd012e4493b6e93242ce53d0ff0af6f1be208e65057ccf9c45c8b5e22e0fe1367b0d461d411d0700b65ad1f08004f9f988cda9c  01-fix-deletion-notification.patch
+6feaa039ccdbe1a1d021e251512ce4b8daa69f18857e5fee9f8a59a4b3c838c5cc2cb0d2946e7cbc61e8f37102e4747bf801b79babaf17b943a9b60967a9c0af  02-fix-xauth-double-free-on-reload.patch
+81003f4143ed384f8563df0c3afb5a9b8dfafc7e80964c9b3a5ad1f0a58a500129c635e0cf93481028b6e87b8f024f0fe55ad4cb3bb90a180bcf121f85b28ae8  03-fix-sport-selection.patch
+22b79d5906dd4c5e740655303fe88fbdc2596cfbd057347cc303f8cfdd22f83fe61098613127d78030e3098335be83f46fe6d4dd5c2ebc8dd93ed94b7904812c  20-grekey-support.patch
+2e111e0388a5e94ffa87483eac8c0b38fff1ba44d79c3db7438b3d03010db6334861acffecf044ebd3953f062230b528c34a05d38cf6831f5ebece0a307fb776  50-reverse-connect.patch
+00ea3fb4b2ac91a550aaaffe53a29cc22f37f713052e2c5aee1bada6bcbc55b55ebe577f3df1ab09b314e99a45fd322152c2858263173cff17ff17993007b042  70-defer-isakmp-ident-handling.patch
+b65fbb7b8af6863f6dcb0b1cf5a6c856deb62a50f2b19455740340c4c453f5800335bc3b89509de06fc9bc21aa8db16f9eff579aa10b0762bb649ab891a06bfb  75-racoonctl-rcvbuf.patch
+9719f7854ff5d37cb927fc6dd23241ade2c031ae7f3eaf14b41613c3f2139c7a237c739cc1df50a954b349f1c75e0992302cce6a7a551c139f4b9c5fcd376b1b  90-dead-on-initial-contact.patch
+5560ba0147886f29b44cfd86d9b0e0424f9b50fa2ad080286224731b89c612b78c161729c907d53c8ccc0538315740f0c2f02a8fe1b957fb6af0e293a9f87f64  musl-cdefs.patch"
diff --git a/main/ipsec-tools/musl-cdefs.patch b/main/ipsec-tools/musl-cdefs.patch
new file mode 100644
index 0000000000..f9374c1524
--- /dev/null
+++ b/main/ipsec-tools/musl-cdefs.patch
@@ -0,0 +1,156 @@
+--- ipsec-tools-0.8.1.orig/src/libipsec/ipsec_strerror.h
++++ ipsec-tools-0.8.1/src/libipsec/ipsec_strerror.h
+@@ -34,6 +34,8 @@
+ #ifndef _IPSEC_STRERROR_H
+ #define _IPSEC_STRERROR_H
+ 
++#include <sys/cdefs.h>
++
+ extern int __ipsec_errcode;
+ extern void __ipsec_set_strerror __P((const char *));
+ 
+--- ipsec-tools-0.8.1.orig/src/libipsec/libpfkey.h
++++ ipsec-tools-0.8.1/src/libipsec/libpfkey.h
+@@ -34,6 +34,8 @@
+ #ifndef _LIBPFKEY_H
+ #define _LIBPFKEY_H
+ 
++#include <sys/cdefs.h>
++
+ #ifndef KAME_LIBPFKEY_H
+ #define KAME_LIBPFKEY_H
+ 
+--- ipsec-tools-0.8.1.orig/src/racoon/cftoken.l
++++ ipsec-tools-0.8.1/src/racoon/cftoken.l
+@@ -77,6 +77,10 @@
+ 
+ #include "cfparse.h"
+ 
++#ifndef GLOB_TILDE
++#define GLOB_TILDE 0
++#endif
++
+ int yyerrorcount = 0;
+ 
+ #if defined(YIPS_DEBUG)
+--- ipsec-tools-0.8.1.orig/src/racoon/logger.h
++++ ipsec-tools-0.8.1/src/racoon/logger.h
+@@ -34,6 +34,8 @@
+ #ifndef _LOGGER_H
+ #define _LOGGER_H
+ 
++#include <sys/cdefs.h>
++
+ 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 @@
+ #ifndef _MISC_H
+ #define _MISC_H
+ 
++#include <sys/cdefs.h>
++
+ #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 @@
+ #ifndef __SHA2_H__
+ #define __SHA2_H__
+ 
++#include <sys/cdefs.h>
++
+ #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 @@
+ #ifndef _NETDB_DNSSEC_H
+ #define _NETDB_DNSSEC_H
+ 
++#include <sys/cdefs.h>
++
+ #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 @@
+ #ifndef _PLOG_H
+ #define _PLOG_H
+ 
++#include <sys/cdefs.h>
+ #ifdef HAVE_STDARG_H
+ #include <stdarg.h>
+ #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 @@
+ #ifndef _STR2VAL_H
+ #define _STR2VAL_H
+ 
++#include <sys/cdefs.h>
++
+ extern caddr_t val2str __P((const char *, size_t));
+ extern char *str2val __P((const char *, int, size_t *));
+ 
+--- ipsec-tools-0.8.1.orig/src/racoon/vmbuf.h
++++ ipsec-tools-0.8.1/src/racoon/vmbuf.h
+@@ -34,6 +34,8 @@
+ #ifndef _VMBUF_H
+ #define _VMBUF_H
+ 
++#include <sys/cdefs.h>
++
+ /*
+  *	bp      v
+  *	v       v
+--- ipsec-tools-0.8.1.orig/src/setkey/extern.h
++++ ipsec-tools-0.8.1/src/setkey/extern.h
+@@ -1,6 +1,6 @@
+ /*	$NetBSD: extern.h,v 1.5 2009/03/06 11:45:03 tteras Exp $	*/
+ 
+-
++#include <sys/cdefs.h>
+ 
+ void parse_init __P((void));
+ int parse __P((FILE **));
+--- ipsec-tools-0.8.1.orig/src/racoon/backupsa.c
++++ ipsec-tools-0.8.1/src/racoon/backupsa.c
+@@ -276,9 +276,9 @@
+ 		GETNEXTNUM(sa_args.a_keylen, strtoul);
+ 		GETNEXTNUM(sa_args.flags, strtoul);
+ 		GETNEXTNUM(sa_args.l_alloc, strtoul);
+-		GETNEXTNUM(sa_args.l_bytes, strtouq);
+-		GETNEXTNUM(sa_args.l_addtime, strtouq);
+-		GETNEXTNUM(sa_args.l_usetime, strtouq);
++		GETNEXTNUM(sa_args.l_bytes, strtoull);
++		GETNEXTNUM(sa_args.l_addtime, strtoull);
++		GETNEXTNUM(sa_args.l_usetime, strtoull);
+ 		GETNEXTNUM(sa_args.seq, strtoul);
+ 
+ #undef GETNEXTNUM