diff options
Diffstat (limited to 'package/ipsec-tools/patches')
5 files changed, 36 insertions, 36 deletions
diff --git a/package/ipsec-tools/patches/patch-configure b/package/ipsec-tools/patches/patch-configure index 71ea329fe..17cc8c958 100644 --- a/package/ipsec-tools/patches/patch-configure +++ b/package/ipsec-tools/patches/patch-configure @@ -1,6 +1,6 @@ ---- ipsec-tools-0.8.0.orig/configure 2011-03-18 14:27:41.000000000 +0100 -+++ ipsec-tools-0.8.0/configure 2013-07-17 14:30:31.000000000 +0200 -@@ -11535,7 +11535,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } +--- ipsec-tools-0.8.2.orig/configure 2014-02-27 09:50:41.000000000 +0100 ++++ ipsec-tools-0.8.2/configure 2015-03-19 17:44:43.000000000 +0100 +@@ -11885,7 +11885,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } @@ -9,7 +9,7 @@ case $host in *netbsd*) -@@ -11627,8 +11627,8 @@ else +@@ -11977,8 +11977,8 @@ else fi @@ -20,7 +20,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : else -@@ -12286,7 +12286,7 @@ $as_echo "$as_me: WARNING: Using a gener +@@ -12637,7 +12637,7 @@ $as_echo "$as_me: WARNING: Using a gener { $as_echo "$as_me:${as_lineno-$LINENO}: checking if printf accepts %z" >&5 $as_echo_n "checking if printf accepts %z... " >&6; } saved_CFLAGS=$CFLAGS @@ -29,7 +29,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -13739,7 +13739,7 @@ $as_echo "#define HAVE_LIBLDAP /**/" >>c +@@ -14090,7 +14090,7 @@ $as_echo "#define HAVE_LIBLDAP /**/" >>c LIBS="$LIBS -L$libldap_dir/lib -R$libldap_dir/lib -lldap" saved_CFLAGS=$CFLAGS @@ -38,7 +38,7 @@ saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD" cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -13852,7 +13852,7 @@ $as_echo "#define HAVE_GSSAPI /**/" >>co +@@ -14203,7 +14203,7 @@ $as_echo "#define HAVE_GSSAPI /**/" >>co # Check if iconv 2nd argument needs const saved_CFLAGS=$CFLAGS @@ -47,7 +47,7 @@ saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD" ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" -@@ -14253,7 +14253,7 @@ linux*) +@@ -14604,7 +14604,7 @@ linux*) # Linux kernel NAT-T check cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -56,7 +56,7 @@ #ifdef SADB_X_EXT_NAT_T_TYPE yes #endif -@@ -14440,7 +14440,7 @@ linux*) +@@ -14791,7 +14791,7 @@ linux*) # Linux kernel Security Context check cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in b/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in index f594f5d92..0833b4c1d 100644 --- a/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in +++ b/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in @@ -1,6 +1,6 @@ ---- ipsec-tools-0.8.0.orig/src/include-glibc/Makefile.in 2011-03-18 14:27:40.000000000 +0100 -+++ ipsec-tools-0.8.0/src/include-glibc/Makefile.in 2013-07-17 14:35:36.000000000 +0200 -@@ -183,7 +183,7 @@ EXTRA_DIST = \ +--- ipsec-tools-0.8.2.orig/src/include-glibc/Makefile.in 2014-02-27 09:50:39.000000000 +0100 ++++ ipsec-tools-0.8.2/src/include-glibc/Makefile.in 2015-03-19 17:52:53.000000000 +0100 +@@ -248,7 +248,7 @@ EXTRA_DIST = \ netinet/ipsec.h \ sys/queue.h @@ -9,12 +9,12 @@ all: all-am .SUFFIXES: -@@ -370,11 +370,7 @@ uninstall-am: - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am +@@ -441,11 +441,7 @@ uninstall-am: + tags-am uninstall uninstall-am -.includes: ${top_builddir}/config.status -- ln -sf $(KERNEL_INCLUDE)/linux +- ln -snf $(KERNEL_INCLUDE)/linux - touch .includes - -all: .includes diff --git a/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c b/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c index cc10bca3b..4e2d8907d 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c +++ b/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c @@ -1,5 +1,5 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/crypto_openssl.c 2010-10-20 15:40:02.000000000 +0200 -+++ ipsec-tools-0.8.0/src/racoon/crypto_openssl.c 2011-03-31 13:22:18.821818767 +0200 +--- ipsec-tools-0.8.2.orig/src/racoon/crypto_openssl.c 2012-12-24 15:50:39.000000000 +0100 ++++ ipsec-tools-0.8.2/src/racoon/crypto_openssl.c 2015-03-19 17:44:43.000000000 +0100 @@ -63,8 +63,12 @@ #ifdef HAVE_OPENSSL_ENGINE_H #include <openssl/engine.h> @@ -13,7 +13,7 @@ #include <openssl/err.h> #ifdef HAVE_OPENSSL_RC5_H #include <openssl/rc5.h> -@@ -1405,6 +1409,7 @@ eay_idea_keylen(len) +@@ -1292,6 +1296,7 @@ eay_idea_keylen(len) } #endif @@ -21,7 +21,7 @@ /* * BLOWFISH-CBC */ -@@ -1439,6 +1444,7 @@ eay_bf_keylen(len) +@@ -1326,6 +1331,7 @@ eay_bf_keylen(len) return -1; return len; } @@ -29,7 +29,7 @@ #ifdef HAVE_OPENSSL_RC5_H /* -@@ -1550,6 +1556,7 @@ eay_3des_keylen(len) +@@ -1437,6 +1443,7 @@ eay_3des_keylen(len) return 192; } @@ -37,7 +37,7 @@ /* * CAST-CBC */ -@@ -1584,6 +1591,7 @@ eay_cast_keylen(len) +@@ -1471,6 +1478,7 @@ eay_cast_keylen(len) return -1; return len; } diff --git a/package/ipsec-tools/patches/patch-src_racoon_isakmp_xauth_c b/package/ipsec-tools/patches/patch-src_racoon_isakmp_xauth_c index 63825a34d..2db130da8 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_isakmp_xauth_c +++ b/package/ipsec-tools/patches/patch-src_racoon_isakmp_xauth_c @@ -1,6 +1,6 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/isakmp_xauth.c 2011-03-14 16:50:36.000000000 +0100 -+++ ipsec-tools-0.8.0/src/racoon/isakmp_xauth.c 2011-03-31 13:23:58.351808486 +0200 -@@ -655,7 +655,7 @@ PAM_conv(msg_count, msg, rsp, dontcare) +--- ipsec-tools-0.8.2.orig/src/racoon/isakmp_xauth.c 2013-02-05 07:23:42.000000000 +0100 ++++ ipsec-tools-0.8.2/src/racoon/isakmp_xauth.c 2015-03-19 17:44:43.000000000 +0100 +@@ -659,7 +659,7 @@ PAM_conv(msg_count, msg, rsp, dontcare) if ((reply = racoon_malloc(sizeof(*reply) * msg_count)) == NULL) return PAM_CONV_ERR; diff --git a/package/ipsec-tools/patches/patch-src_racoon_privsep_c b/package/ipsec-tools/patches/patch-src_racoon_privsep_c index ec4cf4591..d06825722 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_privsep_c +++ b/package/ipsec-tools/patches/patch-src_racoon_privsep_c @@ -1,6 +1,6 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/privsep.c 2011-03-06 09:28:10.000000000 +0100 -+++ ipsec-tools-0.8.0/src/racoon/privsep.c 2013-07-17 14:18:50.000000000 +0200 -@@ -359,7 +359,7 @@ privsep_init(void) +--- ipsec-tools-0.8.2.orig/src/racoon/privsep.c 2012-08-23 13:10:45.000000000 +0200 ++++ ipsec-tools-0.8.2/src/racoon/privsep.c 2015-03-19 17:44:43.000000000 +0100 +@@ -368,7 +368,7 @@ privsep_init(void) strerror(errno)); goto out; } @@ -9,7 +9,7 @@ reply->hdr.ac_cmd = combuf->hdr.ac_cmd; reply->hdr.ac_len = sizeof(*reply); -@@ -457,7 +457,7 @@ privsep_init(void) +@@ -466,7 +466,7 @@ privsep_init(void) strerror(errno)); goto out; } @@ -18,7 +18,7 @@ /* -@@ -903,7 +903,7 @@ privsep_eay_get_pkcs1privkey(path) +@@ -912,7 +912,7 @@ privsep_eay_get_pkcs1privkey(path) "Cannot allocate memory: %s\n", strerror(errno)); return NULL; } @@ -27,7 +27,7 @@ msg->hdr.ac_cmd = PRIVSEP_EAY_GET_PKCS1PRIVKEY; msg->hdr.ac_len = len; msg->bufs.buflen[0] = len - sizeof(*msg); -@@ -953,7 +953,7 @@ privsep_script_exec(script, name, envp) +@@ -962,7 +962,7 @@ privsep_script_exec(script, name, envp) return -1; } @@ -36,7 +36,7 @@ msg->hdr.ac_cmd = PRIVSEP_SCRIPT_EXEC; msg->hdr.ac_len = sizeof(*msg); -@@ -1062,7 +1062,7 @@ privsep_getpsk(str, keylen) +@@ -1071,7 +1071,7 @@ privsep_getpsk(str, keylen) "Cannot allocate memory: %s\n", strerror(errno)); return NULL; } @@ -45,7 +45,7 @@ msg->hdr.ac_cmd = PRIVSEP_GETPSK; msg->hdr.ac_len = len; -@@ -1334,7 +1334,7 @@ privsep_xauth_login_system(usr, pwd) +@@ -1343,7 +1343,7 @@ privsep_xauth_login_system(usr, pwd) "Cannot allocate memory: %s\n", strerror(errno)); return -1; } @@ -54,7 +54,7 @@ msg->hdr.ac_cmd = PRIVSEP_XAUTH_LOGIN_SYSTEM; msg->hdr.ac_len = len; -@@ -1389,7 +1389,7 @@ privsep_accounting_system(port, raddr, u +@@ -1398,7 +1398,7 @@ privsep_accounting_system(port, raddr, u "Cannot allocate memory: %s\n", strerror(errno)); return -1; } @@ -63,7 +63,7 @@ msg->hdr.ac_cmd = PRIVSEP_ACCOUNTING_SYSTEM; msg->hdr.ac_len = len; msg->bufs.buflen[0] = sizeof(port); -@@ -1643,7 +1643,7 @@ privsep_accounting_pam(port, inout) +@@ -1652,7 +1652,7 @@ privsep_accounting_pam(port, inout) "Cannot allocate memory: %s\n", strerror(errno)); return -1; } @@ -72,7 +72,7 @@ msg->hdr.ac_cmd = PRIVSEP_ACCOUNTING_PAM; msg->hdr.ac_len = len; msg->bufs.buflen[0] = sizeof(port); -@@ -1705,7 +1705,7 @@ privsep_xauth_login_pam(port, raddr, usr +@@ -1714,7 +1714,7 @@ privsep_xauth_login_pam(port, raddr, usr "Cannot allocate memory: %s\n", strerror(errno)); return -1; } @@ -81,7 +81,7 @@ msg->hdr.ac_cmd = PRIVSEP_XAUTH_LOGIN_PAM; msg->hdr.ac_len = len; msg->bufs.buflen[0] = sizeof(port); -@@ -1770,7 +1770,7 @@ privsep_cleanup_pam(port) +@@ -1779,7 +1779,7 @@ privsep_cleanup_pam(port) "Cannot allocate memory: %s\n", strerror(errno)); return; } |