diff options
3 files changed, 19 insertions, 63 deletions
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 deleted file mode 100644 index 4f9d5a4315..0000000000 --- a/meta-oe/recipes-connectivity/libnet/libnet-1.1.6/fix-endianess-test.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | Use autoconf's endian check instead of the locally defined check | ||
| 2 | so that we can determine the endianess without having to compile | ||
| 3 | a program. | ||
| 4 | |||
| 5 | Idea from http://www.security-lists.org/lists/libnet/2003/03/00001.html | ||
| 6 | |||
| 7 | Also remove the old test from aclocal.m4. | ||
| 8 | |||
| 9 | Rebased for libnet-1.1.6 | ||
| 10 | |||
| 11 | diff --git a/configure.in b/configure.in | ||
| 12 | index e54c688..e2e768e 100644 | ||
| 13 | --- a/configure.in | ||
| 14 | +++ b/configure.in | ||
| 15 | @@ -4,6 +4,7 @@ dnl All rights reserved. | ||
| 16 | dnl | ||
| 17 | dnl Process this file with autoconf to produce a configure script. | ||
| 18 | |||
| 19 | +AC_PREREQ(2.52) | ||
| 20 | AC_INIT(libnet, 1.1.6) | ||
| 21 | AC_MSG_RESULT(beginning autoconfiguration process for libnet-${PACKAGE_VERSION} ...) | ||
| 22 | AC_CANONICAL_SYSTEM | ||
| 23 | @@ -38,7 +39,16 @@ dnl | ||
| 24 | dnl And some custom things | ||
| 25 | dnl | ||
| 26 | |||
| 27 | -AC_LIBNET_ENDIAN_CHECK | ||
| 28 | +AC_C_BIGENDIAN([ | ||
| 29 | + AC_DEFINE(LIBNET_BIG_ENDIAN) | ||
| 30 | + ENDIANESS="LIBNET_BIG_ENDIAN" | ||
| 31 | + LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_BIG_ENDIAN" | ||
| 32 | +],[ | ||
| 33 | + AC_DEFINE(LIBNET_LIL_ENDIAN) | ||
| 34 | + ENDIANESS="LIBNET_LIL_ENDIAN" | ||
| 35 | + LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_LIL_ENDIAN" | ||
| 36 | +], AC_MSG_WARN(cannot detect endianess. try setting ac_cv_c_bigendian to yes or no)) | ||
| 37 | + | ||
| 38 | dnl AC_LBL_LIBRARY_NET | ||
| 39 | |||
| 40 | AC_SUBST(ENDIANESS) | ||
diff --git a/meta-oe/recipes-connectivity/libnet/libnet_1.1.6.bb b/meta-oe/recipes-connectivity/libnet/libnet_1.1.6.bb deleted file mode 100644 index 0db074b1d3..0000000000 --- a/meta-oe/recipes-connectivity/libnet/libnet_1.1.6.bb +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | SUMMARY = "A packet dissection and creation library" | ||
| 2 | # libnet at packetfactory.net is dead | ||
| 3 | HOMEPAGE = "https://github.com/sam-github/libnet" | ||
| 4 | SECTION = "libs" | ||
| 5 | LICENSE = "BSD" | ||
| 6 | LIC_FILES_CHKSUM = "file://doc/COPYING;md5=fb43d5727b2d3d1238545f75ce456ec3" | ||
| 7 | DEPENDS = "libpcap" | ||
| 8 | # There are major API changes beween libnet v1.0 and libnet v1.1 | ||
| 9 | PROVIDES = "libnet-1.1" | ||
| 10 | |||
| 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/libnet-dev/${BPN}-${PV}.tar.gz \ | ||
| 12 | file://fix-endianess-test.patch" | ||
| 13 | |||
| 14 | SRC_URI[md5sum] = "710296fe424a49344e5fcc0d09e53317" | ||
| 15 | SRC_URI[sha256sum] = "d392bb5825c4b6b672fc93a0268433c86dc964e1500c279dc6d0711ea6ec467a" | ||
| 16 | |||
| 17 | S = "${WORKDIR}/${BPN}-${PV}" | ||
| 18 | |||
| 19 | inherit autotools binconfig | ||
| 20 | |||
| 21 | do_configure_prepend() { | ||
| 22 | rm -f aclocal.m4 Makefile.am ltmain.sh | ||
| 23 | } | ||
diff --git a/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb b/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb new file mode 100644 index 0000000000..a558e8096c --- /dev/null +++ b/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | SUMMARY = "A packet dissection and creation library" | ||
| 2 | # libnet at packetfactory.net is dead | ||
| 3 | HOMEPAGE = "https://github.com/sam-github/libnet" | ||
| 4 | SECTION = "libs" | ||
| 5 | LICENSE = "BSD" | ||
| 6 | LIC_FILES_CHKSUM = "file://doc/COPYING;md5=3ec839e00408b484d33b472a86b7c266" | ||
| 7 | DEPENDS = "libpcap" | ||
| 8 | # There are major API changes beween libnet v1.0 and libnet v1.1 | ||
| 9 | PROVIDES = "libnet-1.2rc2" | ||
| 10 | |||
| 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/libnet-dev/${BPN}-${PV}.tar.gz" | ||
| 12 | |||
| 13 | SRC_URI[md5sum] = "f051e6e5bdecddb90f77c701c2ca1804" | ||
| 14 | SRC_URI[sha256sum] = "72c380785ad44183005e654b47cc12485ee0228d7fa6b0a87109ff7614be4a63" | ||
| 15 | |||
| 16 | S = "${WORKDIR}/${BPN}-${PV}" | ||
| 17 | |||
| 18 | inherit autotools binconfig | ||
| 19 | |||
