musl-cdefs.patch 3.69 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136
--- 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;
--- 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
--- 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
--- 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
--- 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
--- 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
137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156
--- 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>