diff options
Diffstat (limited to 'packages/ipsec-tools')
| -rw-r--r-- | packages/ipsec-tools/files/cross.patch | 75 | ||||
| -rw-r--r-- | packages/ipsec-tools/files/gcc-4.2.patch | 47 | ||||
| -rw-r--r-- | packages/ipsec-tools/files/racoon-search-missing.patch (renamed from packages/ipsec-tools/ipsec-tools-0.6.6/racoon-search-missing.patch) | 0 | ||||
| -rw-r--r-- | packages/ipsec-tools/ipsec-tools-0.6.6/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/ipsec-tools/ipsec-tools.inc | 65 | ||||
| -rw-r--r-- | packages/ipsec-tools/ipsec-tools_0.4+0.5-rc1.bb | 6 | ||||
| -rw-r--r-- | packages/ipsec-tools/ipsec-tools_0.4+0.5-rc2.bb | 6 | ||||
| -rw-r--r-- | packages/ipsec-tools/ipsec-tools_0.6.6.bb | 48 | ||||
| -rw-r--r-- | packages/ipsec-tools/ipsec-tools_0.6.7.bb | 3 |
9 files changed, 94 insertions, 156 deletions
diff --git a/packages/ipsec-tools/files/cross.patch b/packages/ipsec-tools/files/cross.patch deleted file mode 100644 index a0e7b1da27..0000000000 --- a/packages/ipsec-tools/files/cross.patch +++ /dev/null @@ -1,75 +0,0 @@ -Index: ipsec-tools-0.5-rc1/acracoon.m4 -=================================================================== ---- ipsec-tools-0.5-rc1.orig/acracoon.m4 2004-09-21 10:35:23.000000000 -0400 -+++ ipsec-tools-0.5-rc1/acracoon.m4 2005-02-03 13:56:02.144689256 -0500 -@@ -92,6 +92,8 @@ - - AC_DEFUN([RACOON_CHECK_BUGGY_GETADDRINFO], [ - AC_MSG_CHECKING(getaddrinfo bug) -+ AC_CACHE_CHECK([for a buggy getaddrinfo], -+ racoon_cv_bug_getaddrinfo,[ - saved_CFLAGS=$CFLAGS - CFLAGS="-Wall -O2" - AC_TRY_RUN([ -@@ -182,12 +184,10 @@ - exit(1); - } - ], -- AC_MSG_RESULT(good) -- buggygetaddrinfo=no, -- AC_MSG_RESULT(buggy) -- buggygetaddrinfo=yes, -- AC_MSG_RESULT(buggy) -- buggygetaddrinfo=yes) -+ racoon_cv_bug_getaddrinfo=no, -+ racoon_cv_bug_getaddrinfo=yes, -+ racoon_cv_bug_getaddrinfo=yes) - CFLAGS=$saved_CFLAGS - unset saved_CFLAGS -+ ]) - ]) -Index: ipsec-tools-0.5-rc1/configure.ac -=================================================================== ---- ipsec-tools-0.5-rc1.orig/configure.ac 2005-01-04 09:20:57.000000000 -0500 -+++ ipsec-tools-0.5-rc1/configure.ac 2005-02-03 14:02:34.935975904 -0500 -@@ -16,6 +16,9 @@ - AC_PROG_LIBTOOL - AC_PROG_YACC - AM_PROG_LEX -+ac_save_LIBS="$LIBS" -+AC_CHECK_LIB(fl, yywrap, LEXLIB="-lfl") -+LIBS="$ac_save_LIBS" - AC_SUBST(LEXLIB) - AC_PROG_EGREP - -@@ -57,10 +60,12 @@ - AC_SUBST(CONFIGURE_AMFLAGS) ], - [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ]) - -+ if test "$cross_compiling" = no; then - AC_CHECK_FILE($KERNEL_INCLUDE/linux/pfkeyv2.h, , - [ AC_CHECK_FILE(/usr/src/linux/include/linux/pfkeyv2.h, - KERNEL_INCLUDE=/usr/src/linux/include , - [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) -+ fi - AC_SUBST(KERNEL_INCLUDE) - # We need the configure script to run with correct kernel headers. - # However we don't want to point to kernel source tree in compile time, -@@ -176,7 +181,7 @@ - AC_MSG_CHECKING(sha2 support) - AC_DEFINE([WITH_SHA2], [], [SHA2 support]) - AC_CHECK_HEADER(openssl/sha2.h, [], [ -- CPPFLAGS_ADD="$CPPFLAGS_ADD -I./\${top_srcdir}/src/racoon/missing" -+ CPPFLAGS_ADD="$CPPFLAGS_ADD -I\${top_srcdir}/src/racoon/missing" - AC_LIBOBJ([sha2]) - CRYPTOBJS="$CRYPTOBJS sha2.o"]) - AC_SUBST(CRYPTOBJS) -@@ -339,7 +344,7 @@ - fi - - RACOON_CHECK_BUGGY_GETADDRINFO --if test "$buggygetaddrinfo" = "yes"; then -+if test "$racoon_cv_bug_getaddrinfo" = "yes"; then - AC_MSG_ERROR([Broken getaddrinfo() is no longer supported. Aborting.]) - fi - diff --git a/packages/ipsec-tools/files/gcc-4.2.patch b/packages/ipsec-tools/files/gcc-4.2.patch new file mode 100644 index 0000000000..573f242e65 --- /dev/null +++ b/packages/ipsec-tools/files/gcc-4.2.patch @@ -0,0 +1,47 @@ +Index: ipsec-tools-0.6.7/src/racoon/var.h +=================================================================== +--- ipsec-tools-0.6.7.orig/src/racoon/var.h 2004-11-21 03:16:59.000000000 +1100 ++++ ipsec-tools-0.6.7/src/racoon/var.h 2007-06-06 12:21:41.000000000 +1000 +@@ -76,9 +76,9 @@ + do { \ + if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), (z), sizeof(z), \ + NIFLAGS) != 0) { \ +- if (y) \ ++ if (y != NULL) \ + strncpy((y), "(invalid)", sizeof(y)); \ +- if (z) \ ++ if (z != NULL) \ + strncpy((z), "(invalid)", sizeof(z)); \ + } \ + } while (0); +@@ -87,7 +87,7 @@ + do { \ + if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), NULL, 0, \ + NIFLAGS) != 0) { \ +- if (y) \ ++ if (y != NULL) \ + strncpy((y), "(invalid)", sizeof(y)); \ + } \ + } while (0); +Index: ipsec-tools-0.6.7/src/racoon/eaytest.c +=================================================================== +--- ipsec-tools-0.6.7.orig/src/racoon/eaytest.c 2005-06-29 08:38:02.000000000 +1000 ++++ ipsec-tools-0.6.7/src/racoon/eaytest.c 2007-06-06 12:22:59.000000000 +1000 +@@ -311,7 +311,7 @@ + + printf("exact match: succeed.\n"); + +- if (dnstr_w1) { ++ if (dnstr_w1 != NULL) { + asn1dn = eay_str2asn1dn(dnstr_w1, strlen(dnstr_w1)); + if (asn1dn == NULL || asn1dn->l == asn1dn0.l) + errx(1, "asn1dn length wrong for wildcard 1\n"); +@@ -321,7 +321,7 @@ + printf("wildcard 1 match: succeed.\n"); + } + +- if (dnstr_w1) { ++ if (dnstr_w1 != NULL) { + asn1dn = eay_str2asn1dn(dnstr_w2, strlen(dnstr_w2)); + if (asn1dn == NULL || asn1dn->l == asn1dn0.l) + errx(1, "asn1dn length wrong for wildcard 2\n"); diff --git a/packages/ipsec-tools/ipsec-tools-0.6.6/racoon-search-missing.patch b/packages/ipsec-tools/files/racoon-search-missing.patch index eebcb87017..eebcb87017 100644 --- a/packages/ipsec-tools/ipsec-tools-0.6.6/racoon-search-missing.patch +++ b/packages/ipsec-tools/files/racoon-search-missing.patch diff --git a/packages/ipsec-tools/ipsec-tools-0.6.6/.mtn2git_empty b/packages/ipsec-tools/ipsec-tools-0.6.6/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/ipsec-tools/ipsec-tools-0.6.6/.mtn2git_empty +++ /dev/null diff --git a/packages/ipsec-tools/ipsec-tools.inc b/packages/ipsec-tools/ipsec-tools.inc index a6fa2efb28..ed265f12ed 100644 --- a/packages/ipsec-tools/ipsec-tools.inc +++ b/packages/ipsec-tools/ipsec-tools.inc @@ -1,30 +1,49 @@ DESCRIPTION = "IPsec-Tools is a port of KAME's IPsec utilities to the \ Linux-2.6 IPsec implementation." -DEPENDS = "virtual/kernel openssl readline flex" -LICENSE = "BSD" +HOMEPAGE = "http://ipsec-tools.sourceforge.net/" SECTION = "console/network" -PR = "r1" +LICENSE = "BSD" +DEPENDS = "virtual/kernel openssl readline flex" + +SRC_URI = "${SOURCEFORGE_MIRROR}/ipsec-tools/ipsec-tools-${PV}.tar.bz2 \ + file://racoon-search-missing.patch;patch=1 \ + file://gcc-4.2.patch;patch=1" inherit autotools -# --enable-adminport enable admin port -# --enable-gssapi enable GSS-API authentication -# --enable-hybrid enable hybrid, both mode-cfg and xauth support -# --enable-frag enable IKE fragmentation payload support -# --enable-stats enable statistics logging function -# --enable-dpd enable dead peer detection -# --enable-samode-unspec enable to use unspecified a mode of SA -# --disable-ipv6 disable ipv6 support -# --enable-natt enable NAT-Traversal (yes/no/kernel) -# -# --with-kernel-headers=/lib/modules/<uname>/build/include -# where your Linux Kernel headers are installed -# --with-readline support readline input (yes by default) -# --with-openssl=DIR specify OpenSSL directory -# --with-libradius=DIR specify libradius path (like/usr/pkg) -EXTRA_OECONF = "--with-kernel-headers=${STAGING_KERNEL_DIR} \ - --with-readline \ - --with-openssl=${STAGING_LIBDIR}/.. \ - --without-libradius \ - --without-gssapi" +# Options: +# --enable-adminport enable admin port +# --enable-rc5 enable RC5 encryption (patented) +# --enable-idea enable IDEA encryption (patented) +# --enable-gssapi enable GSS-API authentication +# --enable-hybrid enable hybrid, both mode-cfg and xauth support +# --enable-frag enable IKE fragmentation payload support +# --enable-stats enable statistics logging function +# --enable-dpd enable dead peer detection +# --enable-samode-unspec enable to use unspecified a mode of SA +# --disable-ipv6 disable ipv6 support +# --enable-natt enable NAT-Traversal (yes/no/kernel) +# --enable-natt-versions=list list of supported NAT-T versions delimited by coma. +# --with-kernel-headers=/lib/modules/<uname>/build/include +# where your Linux Kernel headers are installed +# --with-readline support readline input (yes by default) +# --with-flex use directiory (default: no) +# --with-flexlib=<LIB> specify flex library. +# --with-openssl=DIR specify OpenSSL directory +# --with-libradius=DIR specify libradius path (like/usr/pkg) +# --with-libpam=DIR specify libpam path (like/usr/pkg) +# +# Note: if you give it the actual kernel headers it won't build, it actually +# needs to point at the linux-libc-headers version of the kernel headers. +# +EXTRA_OECONF = "--with-kernel-headers=${STAGING_INCDIR} \ + --with-readline \ + --with-openssl=${STAGING_LIBDIR}/.. \ + --without-libradius \ + --without-gssapi \ + --without-libpam" + +# Sometimes it attempts to use y.tab.c before it is actually +# generated. Note that the failure case is very rare, but it does +# happen. PARALLEL_MAKE = "" diff --git a/packages/ipsec-tools/ipsec-tools_0.4+0.5-rc1.bb b/packages/ipsec-tools/ipsec-tools_0.4+0.5-rc1.bb deleted file mode 100644 index d4b33335df..0000000000 --- a/packages/ipsec-tools/ipsec-tools_0.4+0.5-rc1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ipsec-tools.inc - -BV = "${@bb.data.getVar('PV', d, 1).split('+')[1]}" -SRC_URI = "${SOURCEFORGE_MIRROR}/ipsec-tools/ipsec-tools-${BV}.tar.bz2 \ - file://cross.patch;patch=1" -S = "${WORKDIR}/ipsec-tools-${BV}" diff --git a/packages/ipsec-tools/ipsec-tools_0.4+0.5-rc2.bb b/packages/ipsec-tools/ipsec-tools_0.4+0.5-rc2.bb deleted file mode 100644 index 5fed6c1764..0000000000 --- a/packages/ipsec-tools/ipsec-tools_0.4+0.5-rc2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ipsec-tools.inc - -BV = "${@bb.data.getVar('PV', d, 1).split('+')[1].replace('-','')}" -SRC_URI = "${SOURCEFORGE_MIRROR}/ipsec-tools/ipsec-tools-${BV}.tar.bz2 \ - file://cross.patch;patch=1" -S = "${WORKDIR}/ipsec-tools-${BV}" diff --git a/packages/ipsec-tools/ipsec-tools_0.6.6.bb b/packages/ipsec-tools/ipsec-tools_0.6.6.bb index 9b0676aece..1ccc60c18d 100644 --- a/packages/ipsec-tools/ipsec-tools_0.6.6.bb +++ b/packages/ipsec-tools/ipsec-tools_0.6.6.bb @@ -1,47 +1,3 @@ -DESCRIPTION = "IPsec-Tools is a port of KAME's IPsec utilities to the \ -Linux-2.6 IPsec implementation." -HOMEPAGE = "http://ipsec-tools.sourceforge.net/" -SECTION = "console/network" -LICENSE = "BSD" -DEPENDS = "virtual/kernel openssl readline flex" +PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/ipsec-tools/ipsec-tools-${PV}.tar.bz2 \ - file://racoon-search-missing.patch;patch=1" - -inherit autotools - -# Options: -# --enable-adminport enable admin port -# --enable-rc5 enable RC5 encryption (patented) -# --enable-idea enable IDEA encryption (patented) -# --enable-gssapi enable GSS-API authentication -# --enable-hybrid enable hybrid, both mode-cfg and xauth support -# --enable-frag enable IKE fragmentation payload support -# --enable-stats enable statistics logging function -# --enable-dpd enable dead peer detection -# --enable-samode-unspec enable to use unspecified a mode of SA -# --disable-ipv6 disable ipv6 support -# --enable-natt enable NAT-Traversal (yes/no/kernel) -# --enable-natt-versions=list list of supported NAT-T versions delimited by coma. -# --with-kernel-headers=/lib/modules/<uname>/build/include -# where your Linux Kernel headers are installed -# --with-readline support readline input (yes by default) -# --with-flex use directiory (default: no) -# --with-flexlib=<LIB> specify flex library. -# --with-openssl=DIR specify OpenSSL directory -# --with-libradius=DIR specify libradius path (like/usr/pkg) -# --with-libpam=DIR specify libpam path (like/usr/pkg) -# -# Note: if you give it the actual kernel headers it won't build, it actually -# needs to point at the linux-libc-headers version of the kernel headers. -# -EXTRA_OECONF = "--with-kernel-headers=${STAGING_INCDIR} \ - --with-readline \ - --with-openssl=${STAGING_LIBDIR}/.. \ - --without-libradius \ - --without-gssapi \ - --without-libpam" - -# Sometimes it attempts to use y.tab.c before it is generated. Note -# that the failure case is very rare, but it does happen. -PARALLEL_MAKE = "" +require ipsec-tools.inc diff --git a/packages/ipsec-tools/ipsec-tools_0.6.7.bb b/packages/ipsec-tools/ipsec-tools_0.6.7.bb new file mode 100644 index 0000000000..3f23b198c1 --- /dev/null +++ b/packages/ipsec-tools/ipsec-tools_0.6.7.bb @@ -0,0 +1,3 @@ +PR = "r0" + +require ipsec-tools.inc |