From 42caea1d67c320c3e2b6622fe3b4de49763095e6 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Fri, 11 Apr 2014 11:34:02 +0800 Subject: libnet: update version to 1.1.6 Changes: - use doc/COPYING instead of README as the license file - use BPN instead of PN to fix multilib build - rebase the fix-endianess-test.patch Signed-off-by: Jackie Huang Signed-off-by: Martin Jansa --- .../libnet/libnet-1.1.5/fix-endianess-test.patch | 38 -------------------- .../libnet/libnet-1.1.6/fix-endianess-test.patch | 40 ++++++++++++++++++++++ .../recipes-connectivity/libnet/libnet_1.1.5.bb | 23 ------------- .../recipes-connectivity/libnet/libnet_1.1.6.bb | 23 +++++++++++++ 4 files changed, 63 insertions(+), 61 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/libnet/libnet-1.1.5/fix-endianess-test.patch create mode 100644 meta-oe/recipes-connectivity/libnet/libnet-1.1.6/fix-endianess-test.patch delete mode 100644 meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb create mode 100644 meta-oe/recipes-connectivity/libnet/libnet_1.1.6.bb diff --git a/meta-oe/recipes-connectivity/libnet/libnet-1.1.5/fix-endianess-test.patch b/meta-oe/recipes-connectivity/libnet/libnet-1.1.5/fix-endianess-test.patch deleted file mode 100644 index 4d8697d5f9..0000000000 --- a/meta-oe/recipes-connectivity/libnet/libnet-1.1.5/fix-endianess-test.patch +++ /dev/null @@ -1,38 +0,0 @@ -Use autoconf's endian check instead of the locally defined check -so that we can determine the endianess without having to compile -a program. - -Idea from http://www.security-lists.org/lists/libnet/2003/03/00001.html - -Also remove the old test from aclocal.m4. - -Rebased for libnet-1.1.5 on 2011/04/19. - ---- a/configure.in 2010-11-03 00:59:21.000000000 +0100 -+++ b/configure.in 2011-04-19 17:08:47.087712604 +0200 -@@ -6,6 +6,7 @@ - dnl - dnl Process this file with autoconf to produce a configure script. - -+AC_PREREQ(2.52) - AC_INIT(libnet, 1.1.5) - AC_MSG_RESULT(beginning autoconfiguration process for libnet-${PACKAGE_VERSION} ...) - AC_CANONICAL_SYSTEM -@@ -39,7 +40,16 @@ - dnl And some custom things - dnl - --AC_LIBNET_ENDIAN_CHECK -+AC_C_BIGENDIAN([ -+ AC_DEFINE(LIBNET_BIG_ENDIAN) -+ ENDIANESS="LIBNET_BIG_ENDIAN" -+ LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_BIG_ENDIAN" -+],[ -+ AC_DEFINE(LIBNET_LIL_ENDIAN) -+ ENDIANESS="LIBNET_LIL_ENDIAN" -+ LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_LIL_ENDIAN" -+], AC_MSG_WARN(cannot detect endianess. try setting ac_cv_c_bigendian to yes or no)) -+ - dnl AC_LBL_LIBRARY_NET - - AC_SUBST(ENDIANESS) diff --git a/meta-oe/recipes-connectivity/libnet/libnet-1.1.6/fix-endianess-test.patch b/meta-oe/recipes-connectivity/libnet/libnet-1.1.6/fix-endianess-test.patch new file mode 100644 index 0000000000..4f9d5a4315 --- /dev/null +++ b/meta-oe/recipes-connectivity/libnet/libnet-1.1.6/fix-endianess-test.patch @@ -0,0 +1,40 @@ +Use autoconf's endian check instead of the locally defined check +so that we can determine the endianess without having to compile +a program. + +Idea from http://www.security-lists.org/lists/libnet/2003/03/00001.html + +Also remove the old test from aclocal.m4. + +Rebased for libnet-1.1.6 + +diff --git a/configure.in b/configure.in +index e54c688..e2e768e 100644 +--- a/configure.in ++++ b/configure.in +@@ -4,6 +4,7 @@ dnl All rights reserved. + dnl + dnl Process this file with autoconf to produce a configure script. + ++AC_PREREQ(2.52) + AC_INIT(libnet, 1.1.6) + AC_MSG_RESULT(beginning autoconfiguration process for libnet-${PACKAGE_VERSION} ...) + AC_CANONICAL_SYSTEM +@@ -38,7 +39,16 @@ dnl + dnl And some custom things + dnl + +-AC_LIBNET_ENDIAN_CHECK ++AC_C_BIGENDIAN([ ++ AC_DEFINE(LIBNET_BIG_ENDIAN) ++ ENDIANESS="LIBNET_BIG_ENDIAN" ++ LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_BIG_ENDIAN" ++],[ ++ AC_DEFINE(LIBNET_LIL_ENDIAN) ++ ENDIANESS="LIBNET_LIL_ENDIAN" ++ LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_LIL_ENDIAN" ++], AC_MSG_WARN(cannot detect endianess. try setting ac_cv_c_bigendian to yes or no)) ++ + dnl AC_LBL_LIBRARY_NET + + AC_SUBST(ENDIANESS) diff --git a/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb b/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb deleted file mode 100644 index 76959fed98..0000000000 --- a/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "A packet dissection and creation library" -# libnet at packetfactory.net is dead -HOMEPAGE = "https://github.com/sam-github/libnet" -SECTION = "libs" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://README;md5=533bea47338d490e86744c6a0c5692e7" -DEPENDS = "libpcap" -# There are major API changes beween libnet v1.0 and libnet v1.1 -PROVIDES = "libnet-1.1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libnet-dev/${PN}-${PV}.tar.gz \ - file://fix-endianess-test.patch" - -SRC_URI[md5sum] = "a9bc1d75a610efcfee200d3e28d8eb8f" -SRC_URI[sha256sum] = "75588f8d1232e1df34eccf2dba5e66be197b345a07fae80d8275db994496a20d" - -S = "${WORKDIR}/${PN}-${PV}" - -inherit autotools binconfig - -do_configure_prepend() { - rm -f aclocal.m4 Makefile.am ltmain.sh -} diff --git a/meta-oe/recipes-connectivity/libnet/libnet_1.1.6.bb b/meta-oe/recipes-connectivity/libnet/libnet_1.1.6.bb new file mode 100644 index 0000000000..0db074b1d3 --- /dev/null +++ b/meta-oe/recipes-connectivity/libnet/libnet_1.1.6.bb @@ -0,0 +1,23 @@ +SUMMARY = "A packet dissection and creation library" +# libnet at packetfactory.net is dead +HOMEPAGE = "https://github.com/sam-github/libnet" +SECTION = "libs" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=fb43d5727b2d3d1238545f75ce456ec3" +DEPENDS = "libpcap" +# There are major API changes beween libnet v1.0 and libnet v1.1 +PROVIDES = "libnet-1.1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libnet-dev/${BPN}-${PV}.tar.gz \ + file://fix-endianess-test.patch" + +SRC_URI[md5sum] = "710296fe424a49344e5fcc0d09e53317" +SRC_URI[sha256sum] = "d392bb5825c4b6b672fc93a0268433c86dc964e1500c279dc6d0711ea6ec467a" + +S = "${WORKDIR}/${BPN}-${PV}" + +inherit autotools binconfig + +do_configure_prepend() { + rm -f aclocal.m4 Makefile.am ltmain.sh +} -- cgit v1.2.3-54-g00ecf