summaryrefslogtreecommitdiffstats
path: root/package/ngrep/0003-fix-disable-tcpkill.patch
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2018-11-04 13:14:26 +0100
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-11-04 21:31:47 +0100
commit54eeb08d6498e54cc77e212e4f9873b579f76638 (patch)
tree4e116405665b6c5930bc46679a8fc1454059af4d /package/ngrep/0003-fix-disable-tcpkill.patch
parent8b575ffd1b9d0635be5de5a7848d354b53babb49 (diff)
downloadbuildroot-54eeb08d6498e54cc77e212e4f9873b579f76638.tar.gz
buildroot-54eeb08d6498e54cc77e212e4f9873b579f76638.zip
package/ngrep: bump to version 1.47
- Switch site from sourceforge to github as there is no new releases on sourceforge and http://ngrep.sourceforge.net/ is redirected to https://github.com/jpr5/ngrep/ - Remove first patch, not needed since version 1.46 and https://github.com/jpr5/ngrep/commit/997c9d81d34d3a6646e6c5e363645015e644b3de as this commit added the support for system pcre - Remove second patch, not needed since version 1.46 and https://github.com/jpr5/ngrep/commit/2d8fd9ac7ef1ac6947f738f6005e7b533654f331 - Remove third patch and LIBS=-lpcap -lpcre, not needed since 1.46 and https://github.com/jpr5/ngrep/commit/cca6e3121f2d80dd32a5a33dead9495fe40eed70 - LICENSE.txt has been renamed to LICENSE since version 1.47 and https://github.com/jpr5/ngrep/commit/3cb4c580a9de4afe11c2c17b0f354b59b74ae974 - Add an upstream patch to fix --enable-pcre: keep pcre as a mandatory dependency as this is the current behavior in version 1.45. PCRE will made optional in an other patch - Remove --with-pcre which is not recognized anymore - Add two other patches to fix --disable-tcpkill - Add hash for license file Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/ngrep/0003-fix-disable-tcpkill.patch')
-rw-r--r--package/ngrep/0003-fix-disable-tcpkill.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/package/ngrep/0003-fix-disable-tcpkill.patch b/package/ngrep/0003-fix-disable-tcpkill.patch
new file mode 100644
index 0000000000..1264fd7e3b
--- /dev/null
+++ b/package/ngrep/0003-fix-disable-tcpkill.patch
@@ -0,0 +1,39 @@
+From e8522284ef326bd9f222e04c4a970ffafa56fba6 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sat, 3 Nov 2018 23:23:36 +0100
+Subject: [PATCH] fix --disable-tcpkill
+
+If the user uses --disable-tcpkill, build can fail if libnet is not
+found on the system.
+
+To fix this, move AC_CHECK_LIB to found libnet outside AC_ARG_ENABLE
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/jpr5/ngrep/pull/15]
+---
+ configure.in | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index dbef39b..7c3dd43 100644
+--- a/configure.in
++++ b/configure.in
+@@ -173,13 +173,11 @@ dnl
+
+ AC_ARG_ENABLE(tcpkill,
+ [ --enable-tcpkill enable connection killing support (default off)],
+-[
+- AC_CHECK_LIB(net, libnet_init,,echo !!! error: tcpkill feature enabled but no libnet found; exit)
+- use_tcpkill="$enableval"
+-],
++[ use_tcpkill="$enableval" ],
+ [ use_tcpkill="no" ])
+
+ if test $use_tcpkill = yes; then
++ AC_CHECK_LIB(net, libnet_init,,echo !!! error: tcpkill feature enabled but no libnet found; exit)
+ USE_TCPKILL="1"
+ EXTRA_OBJS="$EXTRA_OBJS tcpkill.o"
+ EXTRA_DEFINES="$EXTRA_DEFINES $(libnet-config --defines)"
+--
+2.17.1
+
OpenPOWER on IntegriCloud