diff options
Diffstat (limited to 'package/ipsec-tools')
12 files changed, 0 insertions, 411 deletions
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile deleted file mode 100644 index c109ac377..000000000 --- a/package/ipsec-tools/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= ipsec-tools -PKG_VERSION:= 0.8.2 -PKG_RELEASE:= 2 -PKG_HASH:= 8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d -PKG_DESCR:= ipsec management tools -PKG_SECTION:= net/security -PKG_DEPENDS:= libressl -PKG_BUILDDEP:= flex libressl -PKG_KDEPENDS:= net-key -PKG_URL:= http://ipsec-tools.sourceforge.net/ -PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=ipsec-tools/) - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 - -PKG_FLAVOURS_IPSEC_TOOLS:= WITH_IPV6 -PKGFD_WITH_IPV6:= enable ipv6 support - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,IPSEC_TOOLS,ipsec-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -CONFIGURE_ARGS+= --with-kernel-headers="$(LINUX_DIR)/include" \ - --with-openssl="$(STAGING_TARGET_DIR)/usr" \ - --without-readline \ - --disable-security-context \ - --without-libradius \ - --without-libpam - -ifneq ($(ADK_PACKAGE_IPSEC_TOOLS_WITH_IPV6),) -CONFIGURE_ARGS+= --enable-ipv6 -else -CONFIGURE_ARGS+= --disable-ipv6 -endif - -ipsec-tools-install: - $(INSTALL_DIR) $(IDIR_IPSEC_TOOLS)/etc - $(INSTALL_DIR) $(IDIR_IPSEC_TOOLS)/usr/lib - $(INSTALL_DIR) $(IDIR_IPSEC_TOOLS)/usr/sbin - $(INSTALL_DATA) $(WRKBUILD)/src/racoon/samples/racoon.conf \ - $(IDIR_IPSEC_TOOLS)/etc - $(CP) $(WRKINST)/usr/lib/lib{racoon,ipsec}.so.* \ - $(IDIR_IPSEC_TOOLS)/usr/lib - $(INSTALL_BIN) $(WRKINST)/usr/sbin/{racoon,racoonctl,setkey,plainrsa-gen} \ - $(IDIR_IPSEC_TOOLS)/usr/sbin - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/ipsec-tools/files/ipsec-tools.conffiles b/package/ipsec-tools/files/ipsec-tools.conffiles deleted file mode 100644 index 434045463..000000000 --- a/package/ipsec-tools/files/ipsec-tools.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/racoon.conf diff --git a/package/ipsec-tools/patches/patch-configure b/package/ipsec-tools/patches/patch-configure deleted file mode 100644 index 17cc8c958..000000000 --- a/package/ipsec-tools/patches/patch-configure +++ /dev/null @@ -1,67 +0,0 @@ ---- 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; } - - - --CFLAGS_ADD="$CFLAGS_ADD -Wall -Werror -Wno-unused" -+CFLAGS_ADD="$CFLAGS_ADD -Wall -Wno-unused" - - case $host in - *netbsd*) -@@ -11977,8 +11977,8 @@ else - fi - - -- as_ac_Header=`$as_echo "ac_cv_header_$KERNEL_INCLUDE/linux/pfkeyv2.h" | $as_tr_sh` --ac_fn_c_check_header_mongrel "$LINENO" "$KERNEL_INCLUDE/linux/pfkeyv2.h" "$as_ac_Header" "$ac_includes_default" -+ as_ac_Header=`$as_echo "ac_cv_header_$KERNEL_INCLUDE/uapi/linux/pfkeyv2.h" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$KERNEL_INCLUDE/uapi/linux/pfkeyv2.h" "$as_ac_Header" "$ac_includes_default" - if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - - else -@@ -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 --CFLAGS="$CFLAGS -Wall -Werror" -+CFLAGS="$CFLAGS -Wall" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -14090,7 +14090,7 @@ $as_echo "#define HAVE_LIBLDAP /**/" >>c - LIBS="$LIBS -L$libldap_dir/lib -R$libldap_dir/lib -lldap" - - saved_CFLAGS=$CFLAGS -- CFLAGS="$CFLAGS -Wall -Werror" -+ CFLAGS="$CFLAGS -Wall" - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -14203,7 +14203,7 @@ $as_echo "#define HAVE_GSSAPI /**/" >>co - - # Check if iconv 2nd argument needs const - saved_CFLAGS=$CFLAGS -- CFLAGS="$CFLAGS -Wall -Werror" -+ CFLAGS="$CFLAGS -Wall" - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD" - ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" -@@ -14604,7 +14604,7 @@ linux*) - # Linux kernel NAT-T check - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include <linux/pfkeyv2.h> -+#include <uapi/linux/pfkeyv2.h> - #ifdef SADB_X_EXT_NAT_T_TYPE - yes - #endif -@@ -14791,7 +14791,7 @@ linux*) - # Linux kernel Security Context check - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include <linux/pfkeyv2.h> -+#include <uapi/linux/pfkeyv2.h> - #ifdef SADB_X_EXT_SEC_CTX - yes - #endif diff --git a/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in b/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in deleted file mode 100644 index 0833b4c1d..000000000 --- a/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in +++ /dev/null @@ -1,24 +0,0 @@ ---- 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 - --DISTCLEANFILES = .includes linux -+DISTCLEANFILES = linux - all: all-am - - .SUFFIXES: -@@ -441,11 +441,7 @@ uninstall-am: - tags-am uninstall uninstall-am - - --.includes: ${top_builddir}/config.status -- ln -snf $(KERNEL_INCLUDE)/linux -- touch .includes -- --all: .includes -+all: - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/package/ipsec-tools/patches/patch-src_racoon_algorithm_c b/package/ipsec-tools/patches/patch-src_racoon_algorithm_c deleted file mode 100644 index 82a3d057b..000000000 --- a/package/ipsec-tools/patches/patch-src_racoon_algorithm_c +++ /dev/null @@ -1,43 +0,0 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/algorithm.c 2006-10-06 14:02:27.000000000 +0200 -+++ ipsec-tools-0.8.0/src/racoon/algorithm.c 2011-03-31 13:22:28.381818558 +0200 -@@ -111,9 +111,11 @@ static struct enc_algorithm oakley_encde - eay_idea_encrypt, eay_idea_decrypt, - eay_idea_weakkey, eay_idea_keylen, }, - #endif -+#ifndef OPENSSL_NO_BF - { "blowfish", algtype_blowfish, OAKLEY_ATTR_ENC_ALG_BLOWFISH, 8, - eay_bf_encrypt, eay_bf_decrypt, - eay_bf_weakkey, eay_bf_keylen, }, -+#endif - #ifdef HAVE_OPENSSL_RC5_H - { "rc5", algtype_rc5, OAKLEY_ATTR_ENC_ALG_RC5, 8, - eay_rc5_encrypt, eay_rc5_decrypt, -@@ -122,9 +124,11 @@ static struct enc_algorithm oakley_encde - { "3des", algtype_3des, OAKLEY_ATTR_ENC_ALG_3DES, 8, - eay_3des_encrypt, eay_3des_decrypt, - eay_3des_weakkey, eay_3des_keylen, }, -+#ifndef OPENSSL_NO_CAST - { "cast", algtype_cast128, OAKLEY_ATTR_ENC_ALG_CAST, 8, - eay_cast_encrypt, eay_cast_decrypt, - eay_cast_weakkey, eay_cast_keylen, }, -+#endif - { "aes", algtype_aes, OAKLEY_ATTR_ENC_ALG_AES, 16, - eay_aes_encrypt, eay_aes_decrypt, - eay_aes_weakkey, eay_aes_keylen, }, -@@ -150,12 +154,16 @@ static struct enc_algorithm ipsec_encdef - NULL, NULL, - NULL, eay_rc5_keylen, }, - #endif -+#ifndef OPENSSL_NO_CAST - { "cast", algtype_cast128, IPSECDOI_ESP_CAST, 8, - NULL, NULL, - NULL, eay_cast_keylen, }, -+#endif -+#ifndef OPENSSL_NO_CAST - { "blowfish", algtype_blowfish, IPSECDOI_ESP_BLOWFISH, 8, - NULL, NULL, - NULL, eay_bf_keylen, }, -+#endif - { "des-iv32", algtype_des_iv32, IPSECDOI_ESP_DES_IV32, 8, - NULL, NULL, - NULL, eay_des_keylen, }, diff --git a/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c b/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c deleted file mode 100644 index 4e2d8907d..000000000 --- a/package/ipsec-tools/patches/patch-src_racoon_crypto_openssl_c +++ /dev/null @@ -1,47 +0,0 @@ ---- 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> - #endif -+#ifndef OPENSSL_NO_BF - #include <openssl/blowfish.h> -+#endif -+#ifndef OPENSSL_NO_CAST - #include <openssl/cast.h> -+#endif - #include <openssl/err.h> - #ifdef HAVE_OPENSSL_RC5_H - #include <openssl/rc5.h> -@@ -1292,6 +1296,7 @@ eay_idea_keylen(len) - } - #endif - -+#ifndef OPENSSL_NO_BF - /* - * BLOWFISH-CBC - */ -@@ -1326,6 +1331,7 @@ eay_bf_keylen(len) - return -1; - return len; - } -+#endif - - #ifdef HAVE_OPENSSL_RC5_H - /* -@@ -1437,6 +1443,7 @@ eay_3des_keylen(len) - return 192; - } - -+#ifndef OPENSSL_NO_CAST - /* - * CAST-CBC - */ -@@ -1471,6 +1478,7 @@ eay_cast_keylen(len) - return -1; - return len; - } -+#endif - - /* - * AES(RIJNDAEL)-CBC diff --git a/package/ipsec-tools/patches/patch-src_racoon_eaytest_c b/package/ipsec-tools/patches/patch-src_racoon_eaytest_c deleted file mode 100644 index 86a5ff77e..000000000 --- a/package/ipsec-tools/patches/patch-src_racoon_eaytest_c +++ /dev/null @@ -1,26 +0,0 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/eaytest.c 2010-01-18 00:02:48.000000000 +0100 -+++ ipsec-tools-0.8.0/src/racoon/eaytest.c 2011-03-31 13:23:53.361808366 +0200 -@@ -684,19 +684,23 @@ ciphertest(ac, av) - eay_aes_encrypt, eay_aes_decrypt) < 0) - return -1; - -+#ifndef OPENSSL_NO_BF - if (ciphertest_1 ("BLOWFISH", - &data, 8, - &key, key.l, - &iv0, 8, - eay_bf_encrypt, eay_bf_decrypt) < 0) - return -1; -+#endif - -+#ifndef OPENSSL_NO_CAST - if (ciphertest_1 ("CAST", - &data, 8, - &key, key.l, - &iv0, 8, - eay_cast_encrypt, eay_cast_decrypt) < 0) - return -1; -+#endif - - #ifdef HAVE_OPENSSL_IDEA_H - if (ciphertest_1 ("IDEA", diff --git a/package/ipsec-tools/patches/patch-src_racoon_isakmp_c b/package/ipsec-tools/patches/patch-src_racoon_isakmp_c deleted file mode 100644 index fdf5356fc..000000000 --- a/package/ipsec-tools/patches/patch-src_racoon_isakmp_c +++ /dev/null @@ -1,21 +0,0 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/isakmp.c 2011-03-15 14:20:14.000000000 +0100 -+++ ipsec-tools-0.8.0/src/racoon/isakmp.c 2011-08-24 18:48:47.887978959 +0200 -@@ -33,6 +33,10 @@ - - #include "config.h" - -+#ifndef __packed -+#define __packed __attribute__((packed)) -+#endif -+ - #include <sys/types.h> - #include <sys/param.h> - #include <sys/socket.h> -@@ -130,6 +134,7 @@ - # define SOL_UDP IPPROTO_UDP - # endif /* __NetBSD__ / __FreeBSD__ */ - -+ - static int nostate1 __P((struct ph1handle *, vchar_t *)); - static int nostate2 __P((struct ph2handle *, vchar_t *)); - diff --git a/package/ipsec-tools/patches/patch-src_racoon_isakmp_xauth_c b/package/ipsec-tools/patches/patch-src_racoon_isakmp_xauth_c deleted file mode 100644 index 2db130da8..000000000 --- a/package/ipsec-tools/patches/patch-src_racoon_isakmp_xauth_c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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; -- bzero(reply, sizeof(*reply) * msg_count); -+ memset(reply, 0, sizeof(*reply) * msg_count); - - for (i = 0; i < msg_count; i++) { - switch (msg[i]->msg_style) { diff --git a/package/ipsec-tools/patches/patch-src_racoon_pfkey_c b/package/ipsec-tools/patches/patch-src_racoon_pfkey_c deleted file mode 100644 index d0c416d83..000000000 --- a/package/ipsec-tools/patches/patch-src_racoon_pfkey_c +++ /dev/null @@ -1,17 +0,0 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/pfkey.c 2011-03-15 14:20:14.000000000 +0100 -+++ ipsec-tools-0.8.0/src/racoon/pfkey.c 2011-03-31 13:24:03.781819000 +0200 -@@ -3855,12 +3855,12 @@ addnewsp(mhp, local, remote) - struct sockaddr *paddr; - - paddr = (struct sockaddr *)(xisr + 1); -- bcopy(paddr, &(*p_isr)->saidx.src, -+ memcpy(&(*p_isr)->saidx.src, paddr, - sysdep_sa_len(paddr)); - - paddr = (struct sockaddr *)((caddr_t)paddr - + sysdep_sa_len(paddr)); -- bcopy(paddr, &(*p_isr)->saidx.dst, -+ memcpy(&(*p_isr)->saidx.dst, paddr, - sysdep_sa_len(paddr)); - } - diff --git a/package/ipsec-tools/patches/patch-src_racoon_privsep_c b/package/ipsec-tools/patches/patch-src_racoon_privsep_c deleted file mode 100644 index d06825722..000000000 --- a/package/ipsec-tools/patches/patch-src_racoon_privsep_c +++ /dev/null @@ -1,92 +0,0 @@ ---- 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; - } -- bzero(reply, sizeof(*reply)); -+ memset(reply, 0, sizeof(*reply)); - reply->hdr.ac_cmd = combuf->hdr.ac_cmd; - reply->hdr.ac_len = sizeof(*reply); - -@@ -466,7 +466,7 @@ privsep_init(void) - strerror(errno)); - goto out; - } -- bzero(envp, (envc + 1) * sizeof(char *)); -+ memset(envp, 0, (envc + 1) * sizeof(char *)); - - - /* -@@ -912,7 +912,7 @@ privsep_eay_get_pkcs1privkey(path) - "Cannot allocate memory: %s\n", strerror(errno)); - return NULL; - } -- bzero(msg, len); -+ memset(msg, 0, len); - msg->hdr.ac_cmd = PRIVSEP_EAY_GET_PKCS1PRIVKEY; - msg->hdr.ac_len = len; - msg->bufs.buflen[0] = len - sizeof(*msg); -@@ -962,7 +962,7 @@ privsep_script_exec(script, name, envp) - return -1; - } - -- bzero(msg, sizeof(*msg)); -+ memset(msg, 0, sizeof(*msg)); - msg->hdr.ac_cmd = PRIVSEP_SCRIPT_EXEC; - msg->hdr.ac_len = sizeof(*msg); - -@@ -1071,7 +1071,7 @@ privsep_getpsk(str, keylen) - "Cannot allocate memory: %s\n", strerror(errno)); - return NULL; - } -- bzero(msg, len); -+ memset(msg, 0, len); - msg->hdr.ac_cmd = PRIVSEP_GETPSK; - msg->hdr.ac_len = len; - -@@ -1343,7 +1343,7 @@ privsep_xauth_login_system(usr, pwd) - "Cannot allocate memory: %s\n", strerror(errno)); - return -1; - } -- bzero(msg, len); -+ memset(msg, 0, len); - msg->hdr.ac_cmd = PRIVSEP_XAUTH_LOGIN_SYSTEM; - msg->hdr.ac_len = len; - -@@ -1398,7 +1398,7 @@ privsep_accounting_system(port, raddr, u - "Cannot allocate memory: %s\n", strerror(errno)); - return -1; - } -- bzero(msg, len); -+ memset(msg, 0, len); - msg->hdr.ac_cmd = PRIVSEP_ACCOUNTING_SYSTEM; - msg->hdr.ac_len = len; - msg->bufs.buflen[0] = sizeof(port); -@@ -1652,7 +1652,7 @@ privsep_accounting_pam(port, inout) - "Cannot allocate memory: %s\n", strerror(errno)); - return -1; - } -- bzero(msg, len); -+ memset(msg, 0, len); - msg->hdr.ac_cmd = PRIVSEP_ACCOUNTING_PAM; - msg->hdr.ac_len = len; - msg->bufs.buflen[0] = sizeof(port); -@@ -1714,7 +1714,7 @@ privsep_xauth_login_pam(port, raddr, usr - "Cannot allocate memory: %s\n", strerror(errno)); - return -1; - } -- bzero(msg, len); -+ memset(msg, 0, len); - msg->hdr.ac_cmd = PRIVSEP_XAUTH_LOGIN_PAM; - msg->hdr.ac_len = len; - msg->bufs.buflen[0] = sizeof(port); -@@ -1779,7 +1779,7 @@ privsep_cleanup_pam(port) - "Cannot allocate memory: %s\n", strerror(errno)); - return; - } -- bzero(msg, len); -+ memset(msg, 0, len); - msg->hdr.ac_cmd = PRIVSEP_CLEANUP_PAM; - msg->hdr.ac_len = len; - msg->bufs.buflen[0] = sizeof(port); diff --git a/package/ipsec-tools/patches/patch-src_racoon_racoonctl_c b/package/ipsec-tools/patches/patch-src_racoon_racoonctl_c deleted file mode 100644 index 3b998fe24..000000000 --- a/package/ipsec-tools/patches/patch-src_racoon_racoonctl_c +++ /dev/null @@ -1,11 +0,0 @@ ---- ipsec-tools-0.8.0.orig/src/racoon/racoonctl.c 2010-11-12 10:08:26.000000000 +0100 -+++ ipsec-tools-0.8.0/src/racoon/racoonctl.c 2011-03-31 13:24:13.201808233 +0200 -@@ -693,7 +693,7 @@ f_vpnc(ac, av) - errx(1, "cannot read source address"); - - /* We get "ip[port]" strip the port */ -- if ((idx = index(srcaddr, '[')) == NULL) -+ if ((idx = strchr(srcaddr, '[')) == NULL) - errx(1, "unexpected source address format"); - *idx = '\0'; - |