From 4136f35d5bcdd4e386ea8f105540c64e2cff0cf7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 13 Jun 2013 02:04:00 -0700 Subject: ipsec-tools: Upgrade to 0.8.1 and fix build with gcc 4.8 Signed-off-by: Khem Raj Signed-off-by: Joe MacDonald --- .../ipsec-tools/files/ipsec-tools-install.patch | 18 -------- .../recipes-support/ipsec-tools/ipsec-tools.inc | 51 --------------------- .../0001-Fix-warning-with-gcc-4.8.patch | 35 +++++++++++++++ .../ipsec-tools/ipsec-tools_0.7.2.bb | 7 --- .../ipsec-tools/ipsec-tools_0.8.1.bb | 52 ++++++++++++++++++++++ 5 files changed, 87 insertions(+), 76 deletions(-) delete mode 100644 meta-networking/recipes-support/ipsec-tools/files/ipsec-tools-install.patch delete mode 100644 meta-networking/recipes-support/ipsec-tools/ipsec-tools.inc create mode 100644 meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-warning-with-gcc-4.8.patch delete mode 100644 meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb create mode 100644 meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb (limited to 'meta-networking/recipes-support/ipsec-tools') diff --git a/meta-networking/recipes-support/ipsec-tools/files/ipsec-tools-install.patch b/meta-networking/recipes-support/ipsec-tools/files/ipsec-tools-install.patch deleted file mode 100644 index 85035b1105..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/files/ipsec-tools-install.patch +++ /dev/null @@ -1,18 +0,0 @@ -Avoid attempting to install vmbuf.h twice - -Upstream-Status: Accepted - -Taken from pld-linux.org: -http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipsec-tools/ipsec-tools-install.patch - ---- ipsec-tools-0.7.2/src/racoon/Makefile.am~ 2008-07-23 13:48:40.000000000 +0200 -+++ ipsec-tools-0.7.2/src/racoon/Makefile.am 2009-07-04 01:43:48.148433975 +0200 -@@ -3,7 +3,7 @@ - sbin_PROGRAMS = racoon racoonctl plainrsa-gen - noinst_PROGRAMS = eaytest - include_racoon_HEADERS = racoonctl.h var.h vmbuf.h misc.h gcmalloc.h admin.h \ -- schedule.h sockmisc.h vmbuf.h isakmp_var.h isakmp.h isakmp_xauth.h \ -+ schedule.h sockmisc.h isakmp_var.h isakmp.h isakmp_xauth.h \ - isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h - lib_LTLIBRARIES = libracoon.la - diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools.inc b/meta-networking/recipes-support/ipsec-tools/ipsec-tools.inc deleted file mode 100644 index 264b49a538..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools.inc +++ /dev/null @@ -1,51 +0,0 @@ -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" - -SRC_URI = "${SOURCEFORGE_MIRROR}/ipsec-tools/ipsec-tools-${PV}.tar.bz2;name=ipsec-tools-${PV}" - -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//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= 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 \ - --disable-security-context" - -# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530527 -CFLAGS += "-fno-strict-aliasing" - -# 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/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-warning-with-gcc-4.8.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-warning-with-gcc-4.8.patch new file mode 100644 index 0000000000..569b545758 --- /dev/null +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-warning-with-gcc-4.8.patch @@ -0,0 +1,35 @@ +From fc230d5ded73fe4049aa586eacbe4098aeff912f Mon Sep 17 00:00:00 2001 +From: Paul Barker +Date: Wed, 12 Jun 2013 17:39:06 +0100 +Subject: [PATCH] Fix warning with gcc 4.8. + +The line "memset(pair, 0, sizeof(pair));" was causing the following warning: + + error: argument to 'sizeof' in 'memset' call is the same expression as + the destination; did you mean to dereference + +Compiling with -Werror (as specified in configure.ac) was causing this warning +to become an error. The line itself is not needed as memory is allocated via +calloc which performs zero initialization. Therefore, the line is removed to fix +the warning and does not need replacing anything. +--- + src/racoon/ipsec_doi.c | 1 - + 1 file changed, 1 deletion(-) + +Upstream-Status: Submitted + +diff --git a/src/racoon/ipsec_doi.c b/src/racoon/ipsec_doi.c +index 2b48d49..4e9d3a8 100644 +--- a/src/racoon/ipsec_doi.c ++++ b/src/racoon/ipsec_doi.c +@@ -1183,7 +1183,6 @@ get_proppair_and_doi_sit(sa, mode, doitype, sittype) + "failed to get buffer.\n"); + goto bad; + } +- memset(pair, 0, sizeof(pair)); + + bp = (caddr_t)(sab + 1); + tlen = sa->l - sizeof(*sab); +-- +1.8.3 + diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb deleted file mode 100644 index 255246e399..0000000000 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ipsec-tools.inc - -LIC_FILES_CHKSUM = "file://src/libipsec/pfkey.c;beginline=6;endline=31;md5=bc9b7ff40beff19fe6bc6aef26bd2b24" - -SRC_URI += "file://ipsec-tools-install.patch" -SRC_URI[ipsec-tools-0.7.2.md5sum] = "72861f005746ee27984b2ee715ecc629" -SRC_URI[ipsec-tools-0.7.2.sha256sum] = "08722ff6c62de3e042fef337454f03622a79053108d6dcc686c9c854f9f9e031" diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb new file mode 100644 index 0000000000..ef753c0965 --- /dev/null +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb @@ -0,0 +1,52 @@ +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" +LIC_FILES_CHKSUM = "file://src/libipsec/pfkey.c;beginline=6;endline=31;md5=bc9b7ff40beff19fe6bc6aef26bd2b24" + +DEPENDS = "virtual/kernel openssl readline flex" + +SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ipsec-tools-${PV}.tar.bz2 \ + file://0001-Fix-warning-with-gcc-4.8.patch \ + " +SRC_URI[md5sum] = "d38b39f291ba2962387c3232e7335dd8" +SRC_URI[sha256sum] = "fa4a95bb36842f001b84c4e7a1bb727e3ee06147edbc830a881d63abe8153dd4" + +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//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= 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 \ + --disable-security-context" + +# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530527 +CFLAGS += "-fno-strict-aliasing" -- cgit 1.2.3-korg