[oe-commits] org.oe.dev ipsec-tools: Add 0.6.7, removed all 0.4 versions and fixed for
lenehan commit
openembedded-commits at lists.openembedded.org
Wed Jun 6 02:41:25 UTC 2007
ipsec-tools: Add 0.6.7, removed all 0.4 versions and fixed for
building with gcc 4.2.
Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 60acb481a3d901c94a918e816dbd0c8e06fdebee
ViewMTN: http://monotone.openembedded.org/revision.psp?id=60acb481a3d901c94a918e816dbd0c8e06fdebee
Files:
1
packages/ipsec-tools/files/cross.patch
packages/ipsec-tools/ipsec-tools-0.6.6
packages/ipsec-tools/ipsec-tools_0.4+0.5-rc1.bb
packages/ipsec-tools/ipsec-tools_0.4+0.5-rc2.bb
packages/ipsec-tools/ipsec-tools-0.6.6/racoon-search-missing.patch
packages/ipsec-tools/files/racoon-search-missing.patch
packages/ipsec-tools/ipsec-tools_0.6.6.bb
packages/ipsec-tools/ipsec-tools_0.6.7.bb
packages/ipsec-tools/files/gcc-4.2.patch
packages/ipsec-tools/ipsec-tools.inc
Diffs:
#
# mt diff -rcc77b9d135248dc8b58b6894e8ed95dcbd474752 -r60acb481a3d901c94a918e816dbd0c8e06fdebee
#
#
#
# delete "packages/ipsec-tools/files/cross.patch"
#
# delete "packages/ipsec-tools/ipsec-tools-0.6.6"
#
# delete "packages/ipsec-tools/ipsec-tools_0.4+0.5-rc1.bb"
#
# delete "packages/ipsec-tools/ipsec-tools_0.4+0.5-rc2.bb"
#
# rename "packages/ipsec-tools/ipsec-tools-0.6.6/racoon-search-missing.patch"
# to "packages/ipsec-tools/files/racoon-search-missing.patch"
#
# rename "packages/ipsec-tools/ipsec-tools_0.6.6.bb"
# to "packages/ipsec-tools/ipsec-tools_0.6.7.bb"
#
# add_file "packages/ipsec-tools/files/gcc-4.2.patch"
# content [f80b1e140d5e89749123ec4531af240c3af82fb1]
#
# add_file "packages/ipsec-tools/ipsec-tools_0.6.6.bb"
# content [48da8ee729e68915ecc9b378276c13ea2e1f944b]
#
# patch "packages/ipsec-tools/ipsec-tools.inc"
# from [1e259858865f859ff314a8ca7dc00b962643d2a9]
# to [9e10126d40ca7facb38fafd03aee471e69474171]
#
# patch "packages/ipsec-tools/ipsec-tools_0.6.7.bb"
# from [0fcdaa4bd8e92d356e6329a64c0b88592091fdbe]
# to [4b9d362831cdf1a848077c9aa9b4a1f206e0a0f8]
#
============================================================
--- packages/ipsec-tools/files/gcc-4.2.patch f80b1e140d5e89749123ec4531af240c3af82fb1
+++ packages/ipsec-tools/files/gcc-4.2.patch f80b1e140d5e89749123ec4531af240c3af82fb1
@@ -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");
============================================================
--- packages/ipsec-tools/ipsec-tools_0.6.6.bb 48da8ee729e68915ecc9b378276c13ea2e1f944b
+++ packages/ipsec-tools/ipsec-tools_0.6.6.bb 48da8ee729e68915ecc9b378276c13ea2e1f944b
@@ -0,0 +1,3 @@
+PR = "r1"
+
+require ipsec-tools.inc
============================================================
--- packages/ipsec-tools/ipsec-tools.inc 1e259858865f859ff314a8ca7dc00b962643d2a9
+++ packages/ipsec-tools/ipsec-tools.inc 9e10126d40ca7facb38fafd03aee471e69474171
@@ -1,30 +1,49 @@ Linux-2.6 IPsec implementation."
DESCRIPTION = "IPsec-Tools is a port of KAME's IPsec utilities to the \
Linux-2.6 IPsec implementation."
-DEPENDS = "virtual/kernel openssl readline flex"
+HOMEPAGE = "http://ipsec-tools.sourceforge.net/"
+SECTION = "console/network"
LICENSE = "BSD"
-SECTION = "console/network"
-PR = "r1"
+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 = ""
============================================================
--- packages/ipsec-tools/ipsec-tools_0.6.6.bb 0fcdaa4bd8e92d356e6329a64c0b88592091fdbe
+++ packages/ipsec-tools/ipsec-tools_0.6.7.bb 4b9d362831cdf1a848077c9aa9b4a1f206e0a0f8
@@ -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 = "r0"
+require ipsec-tools.inc
-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 = ""
More information about the Openembedded-commits
mailing list