From 73076f984041f0a3b667b8f816f8b9bbf998bb32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Fri, 21 Mar 2014 06:19:11 +0000
Subject: main/ipsec-tools: fix musl build

---
 main/ipsec-tools/musl-cdefs.patch | 40 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'main/ipsec-tools/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 <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 @@
@@ -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 <sys/socket.h>
+ #include <sys/time.h>
+ #include <sys/stat.h>
+-#include <sys/sysctl.h>
+ #include <err.h>
+ #include <netinet/in.h>
+ #include <net/pfkeyv2.h>
+--- ipsec-tools-0.8.2.orig/src/racoon/pfkey.c
++++ ipsec-tools-0.8.2/src/racoon/pfkey.c
+@@ -59,7 +59,6 @@
+ #include <sys/param.h>
+ #include <sys/socket.h>
+ #include <sys/queue.h>
+-#include <sys/sysctl.h>
+ 
+ #include <net/route.h>
+ #include <net/pfkeyv2.h>
-- 
cgit v1.2.3