From: Scott Garman <sgarman@zenlinux.com>
To: openembedded-devel@lists.openembedded.org
Cc: Scott Garman <sgarman@zenlinux.com>
Subject: [PATCH] libnids: Upgrade to 1.24
Date: Fri, 9 Apr 2010 20:13:04 -0700 [thread overview]
Message-ID: <1270869184-9526-1-git-send-email-sgarman@zenlinux.com> (raw)
* Addresses CVE-2010-0751
* Use new-style checksums
Signed-off-by: Scott Garman <sgarman@zenlinux.com>
---
conf/checksums.ini | 8 ---
recipes/libnids/libnids-1.18/configure.patch | 60 --------------------------
recipes/libnids/libnids-1.24/configure.patch | 60 ++++++++++++++++++++++++++
recipes/libnids/libnids_1.18.bb | 24 ----------
recipes/libnids/libnids_1.24.bb | 26 +++++++++++
5 files changed, 86 insertions(+), 92 deletions(-)
delete mode 100644 recipes/libnids/libnids-1.18/configure.patch
create mode 100644 recipes/libnids/libnids-1.24/configure.patch
delete mode 100644 recipes/libnids/libnids_1.18.bb
create mode 100644 recipes/libnids/libnids_1.24.bb
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 50546a4..800e244 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -15998,14 +15998,6 @@ sha256=c2ae0a07d863536261b8a0562f3f77aa224fa1f413d85d824a765d00e37c5de4
md5=055e3eedf735ee1257fd4bb9ce86d04e
sha256=adf3612367456328609c65ecc39c9bb08c0fef84cebbd1a3b5fcfe5e9614ac82
-[http://downloads.sourceforge.net/libnids/libnids-1.18.tar.gz]
-md5=9ee6dcdfac97bae6fe611aa27d2594a5
-sha256=b0275c914197a53c6ccf631eac756fd37ec6f2d8f09f15757061495cf9be0fcd
-
-[http://heanet.dl.sourceforge.net/libnids/libnids-1.18.tar.gz]
-md5=9ee6dcdfac97bae6fe611aa27d2594a5
-sha256=b0275c914197a53c6ccf631eac756fd37ec6f2d8f09f15757061495cf9be0fcd
-
[http://people.suug.ch/~tgr/libnl/files/libnl-0.5.0.tar.gz]
md5=c58ec5032f393f569ef7f489436651b3
sha256=89a6b5086987460ddd9b24723f35a3a951ccf2886cabe26bef89b8c53528fec5
diff --git a/recipes/libnids/libnids-1.18/configure.patch b/recipes/libnids/libnids-1.18/configure.patch
deleted file mode 100644
index 332675b..0000000
--- a/recipes/libnids/libnids-1.18/configure.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- tmp/base/libnids-1.18-r0/libnids-1.18/configure.in Tue Oct 14 18:40:00 2003
-+++ libnids-1.18/configure.in Wed Nov 5 16:01:27 2003
-@@ -65,12 +65,15 @@
- ;;
- *)
- AC_MSG_RESULT($withval)
-- if test -f $withval/pcap.h -a -f $withval/libpcap.a; then
-- owd=`pwd`
-- if cd $withval; then withval=`pwd`; cd $owd; fi
-- PCAP_CFLAGS="-I$withval -I$withval/bpf"
-- PCAPLIB="-L$withval -lpcap"
-- else
-+ for i in $withval $withval/include $withval/lib $withval/include/pcap; do
-+ if test -f $i/pcap.h; then
-+ PCAP_CFLAGS="-I$i -I$i/bpf"
-+ fi
-+ if test -f $i/libpcap.a; then
-+ PCAPLIB="-L$i -lpcap"
-+ fi
-+ done
-+ if test -z "$PCAP_CFLAGS" -o -z "$PCAPLIB"; then
- AC_ERROR(pcap.h or libpcap.a not found in $withval)
- fi
- ;;
-@@ -127,20 +130,22 @@
- ;;
- *)
- AC_MSG_RESULT($withval)
-- if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a -a -f $withval/libnet-config ; then
-- owd=`pwd`
-- if cd $withval; then withval=`pwd`; cd $owd; fi
-- LNET_CFLAGS="-I$withval/include `$withval/libnet-config --defines`"
-- LNETLIB="-L$withval/lib -lnet"
-- elif test -f $withval/include/libnet.h -a -f $withval/src/libnet.a; then
-- owd=`pwd`
-- if cd $withval; then withval=`pwd`; cd $owd; fi
-- LNET_CFLAGS="-I$withval/include"
-- LNETLIB="-L$withval/src -lnet"
-- else
-- echo "A working combination of libnet.h, libnet.a and libnet-config not found in $withval; get libnet from www.packetfactory.net/projects/libnet and reinstall"
-- AC_ERROR(libnet)
-+ LNETC="`which libnet-config 2>/dev/null`"
-+ for i in $withval $withval/include $withval/lib $withval/bin; do
-+ if test -f $i/libnet-config; then
-+ LNETC"=$i/libnet-config"
-+ fi
-+ if test -f $i/libnet.h; then
-+ LNET_CFLAGS="-I$i"
-+ fi
-+ if test -f $i/libnet.a; then
-+ LNETLIB="-L$i -lnet"
-+ fi
-+ done
-+ if test -z "$LNET_CFLAGS" -o -z "$LNETLIB" -o -z "$LNETC"; then
-+ AC_ERROR([libnet not found in $withval])
- fi
-+ LNET_CFLAGS="$LNET_CFLAGS `$LNETC --defines`"
- ;;
- esac ],
- [ if test "x"$LIBNET_VER = "x"-1 ; then
diff --git a/recipes/libnids/libnids-1.24/configure.patch b/recipes/libnids/libnids-1.24/configure.patch
new file mode 100644
index 0000000..332675b
--- /dev/null
+++ b/recipes/libnids/libnids-1.24/configure.patch
@@ -0,0 +1,60 @@
+--- tmp/base/libnids-1.18-r0/libnids-1.18/configure.in Tue Oct 14 18:40:00 2003
++++ libnids-1.18/configure.in Wed Nov 5 16:01:27 2003
+@@ -65,12 +65,15 @@
+ ;;
+ *)
+ AC_MSG_RESULT($withval)
+- if test -f $withval/pcap.h -a -f $withval/libpcap.a; then
+- owd=`pwd`
+- if cd $withval; then withval=`pwd`; cd $owd; fi
+- PCAP_CFLAGS="-I$withval -I$withval/bpf"
+- PCAPLIB="-L$withval -lpcap"
+- else
++ for i in $withval $withval/include $withval/lib $withval/include/pcap; do
++ if test -f $i/pcap.h; then
++ PCAP_CFLAGS="-I$i -I$i/bpf"
++ fi
++ if test -f $i/libpcap.a; then
++ PCAPLIB="-L$i -lpcap"
++ fi
++ done
++ if test -z "$PCAP_CFLAGS" -o -z "$PCAPLIB"; then
+ AC_ERROR(pcap.h or libpcap.a not found in $withval)
+ fi
+ ;;
+@@ -127,20 +130,22 @@
+ ;;
+ *)
+ AC_MSG_RESULT($withval)
+- if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a -a -f $withval/libnet-config ; then
+- owd=`pwd`
+- if cd $withval; then withval=`pwd`; cd $owd; fi
+- LNET_CFLAGS="-I$withval/include `$withval/libnet-config --defines`"
+- LNETLIB="-L$withval/lib -lnet"
+- elif test -f $withval/include/libnet.h -a -f $withval/src/libnet.a; then
+- owd=`pwd`
+- if cd $withval; then withval=`pwd`; cd $owd; fi
+- LNET_CFLAGS="-I$withval/include"
+- LNETLIB="-L$withval/src -lnet"
+- else
+- echo "A working combination of libnet.h, libnet.a and libnet-config not found in $withval; get libnet from www.packetfactory.net/projects/libnet and reinstall"
+- AC_ERROR(libnet)
++ LNETC="`which libnet-config 2>/dev/null`"
++ for i in $withval $withval/include $withval/lib $withval/bin; do
++ if test -f $i/libnet-config; then
++ LNETC"=$i/libnet-config"
++ fi
++ if test -f $i/libnet.h; then
++ LNET_CFLAGS="-I$i"
++ fi
++ if test -f $i/libnet.a; then
++ LNETLIB="-L$i -lnet"
++ fi
++ done
++ if test -z "$LNET_CFLAGS" -o -z "$LNETLIB" -o -z "$LNETC"; then
++ AC_ERROR([libnet not found in $withval])
+ fi
++ LNET_CFLAGS="$LNET_CFLAGS `$LNETC --defines`"
+ ;;
+ esac ],
+ [ if test "x"$LIBNET_VER = "x"-1 ; then
diff --git a/recipes/libnids/libnids_1.18.bb b/recipes/libnids/libnids_1.18.bb
deleted file mode 100644
index cf88745..0000000
--- a/recipes/libnids/libnids_1.18.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Libnids performs assembly of TCP segments \
-into TCP streams, IP defragmentation, and TCP port \
-scan detection."
-LICENSE = "GPL"
-SECTION = "libs"
-DEPENDS = "libnet-1.0 libpcap"
-PR = "r1"
-
-SRC_URI = "\
- ${SOURCEFORGE_MIRROR}/libnids/libnids-${PV}.tar.gz \
- file://configure.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "\
- --with-libpcap=${STAGING_LIBDIR}/.. \
- --with-libnet=${STAGING_LIBDIR}/.. \
-"
-EXTRA_OEMAKE = "'install_prefix=${D}'"
-
-do_stage () {
- install -m 0644 ${S}/src/nids.h ${STAGING_INCDIR}/
- oe_libinstall -a -C src libnids ${STAGING_LIBDIR}
-}
diff --git a/recipes/libnids/libnids_1.24.bb b/recipes/libnids/libnids_1.24.bb
new file mode 100644
index 0000000..09702a9
--- /dev/null
+++ b/recipes/libnids/libnids_1.24.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Libnids performs assembly of TCP segments \
+into TCP streams, IP defragmentation, and TCP port \
+scan detection."
+LICENSE = "GPL"
+SECTION = "libs"
+DEPENDS = "libnet-1.0 libpcap"
+PR = "r0"
+
+SRC_URI = "\
+ ${SOURCEFORGE_MIRROR}/libnids/libnids-${PV}.tar.gz;name=libnids \
+ file://configure.patch;patch=1"
+SRC_URI[libnids.md5sum] = "72d37c79c85615ffe158aa524d649610"
+SRC_URI[libnids.sha256sum] = "314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359"
+
+inherit autotools
+
+EXTRA_OECONF = "\
+ --with-libpcap=${STAGING_LIBDIR}/.. \
+ --with-libnet=${STAGING_LIBDIR}/.. \
+"
+EXTRA_OEMAKE = "'install_prefix=${D}'"
+
+do_stage () {
+ install -m 0644 ${S}/src/nids.h ${STAGING_INCDIR}/
+ oe_libinstall -a -C src libnids ${STAGING_LIBDIR}
+}
--
1.6.3.3
next reply other threads:[~2010-04-10 3:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-10 3:13 Scott Garman [this message]
2010-04-10 3:33 ` [PATCH] libnids: Upgrade to 1.24 Scott Garman
-- strict thread matches above, loose matches on Subject: below --
2010-04-10 5:20 Scott Garman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1270869184-9526-1-git-send-email-sgarman@zenlinux.com \
--to=sgarman@zenlinux.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.