mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-27 21:26:36 +00:00
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 and997c9d81d3as this commit added the support for system pcre - Remove second patch, not needed since version 1.46 and2d8fd9ac7e- Remove third patch and LIBS=-lpcap -lpcre, not needed since 1.46 andcca6e3121f- LICENSE.txt has been renamed to LICENSE since version 1.47 and3cb4c580a9- 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>
This commit is contained in:
Fabrice Fontaine
Thomas Petazzoni
parent
8b575ffd1b
commit
54eeb08d64
@ -0,0 +1,25 @@
|
|||||||
|
From b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe Mon Sep 17 00:00:00 2001
|
||||||
|
From: Romain Francoise <romain@rfr.io>
|
||||||
|
Date: Mon, 1 Jan 2018 18:00:34 +0100
|
||||||
|
Subject: [PATCH] Fix typo in configure.in when testing for use_pcre
|
||||||
|
|
||||||
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||||
|
[Retrieved from:
|
||||||
|
https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe]
|
||||||
|
---
|
||||||
|
configure.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/configure.in b/configure.in
|
||||||
|
index cff37e9..06c050a 100644
|
||||||
|
--- a/configure.in
|
||||||
|
+++ b/configure.in
|
||||||
|
@@ -146,7 +146,7 @@ AC_ARG_ENABLE(pcre,
|
||||||
|
[ use_pcre="$enableval" ],
|
||||||
|
[ use_pcre="no" ])
|
||||||
|
|
||||||
|
-if test use_pcre = yes; then
|
||||||
|
+if test $use_pcre = yes; then
|
||||||
|
USE_PCRE="1"
|
||||||
|
EXTRA_LIBS="$EXTRA_LIBS -lpcre"
|
||||||
|
else
|
||||||
@ -1,23 +0,0 @@
|
|||||||
ngrep: don't include regex objects since we're using pcre
|
|
||||||
|
|
||||||
Signed-off-by: Wade Berrier <wberrier@gmail.com>
|
|
||||||
|
|
||||||
--- ngrep-1.45/Makefile.in.orig 2006-11-28 06:35:37.000000000 -0700
|
|
||||||
+++ ngrep-1.45/Makefile.in 2011-06-29 14:05:27.000000000 -0600
|
|
||||||
@@ -32,13 +32,13 @@
|
|
||||||
|
|
||||||
INSTALL = ./install-sh
|
|
||||||
|
|
||||||
-REGEX_DIR=@REGEX_DIR@
|
|
||||||
-REGEX_OBJS=@REGEX_OBJS@
|
|
||||||
+REGEX_DIR=
|
|
||||||
+REGEX_OBJS=
|
|
||||||
|
|
||||||
|
|
||||||
all: $(TARGET)
|
|
||||||
|
|
||||||
-$(TARGET): $(REGEX_OBJS) $(OBJS)
|
|
||||||
+$(TARGET): $(OBJS)
|
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS)
|
|
||||||
|
|
||||||
debug: $(REGEX_OBJS) $(OBJS)
|
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
From 0a51c8bc62c7b49b8d67a360daa6b1957256f4f5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Romain Francoise <romain@rfr.io>
|
||||||
|
Date: Mon, 1 Jan 2018 18:01:13 +0100
|
||||||
|
Subject: [PATCH] Check for libnet_init in configure.in
|
||||||
|
|
||||||
|
libnet_init_packet was the old libnet 1.0 function which is now long
|
||||||
|
deprecated.
|
||||||
|
|
||||||
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||||
|
[Retrieved from:
|
||||||
|
https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5]
|
||||||
|
---
|
||||||
|
configure.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/configure.in b/configure.in
|
||||||
|
index 06c050a..dbef39b 100644
|
||||||
|
--- a/configure.in
|
||||||
|
+++ b/configure.in
|
||||||
|
@@ -174,7 +174,7 @@ dnl
|
||||||
|
AC_ARG_ENABLE(tcpkill,
|
||||||
|
[ --enable-tcpkill enable connection killing support (default off)],
|
||||||
|
[
|
||||||
|
- AC_CHECK_LIB(net, libnet_init_packet,,echo !!! error: tcpkill feature enabled but no libnet found; exit)
|
||||||
|
+ AC_CHECK_LIB(net, libnet_init,,echo !!! error: tcpkill feature enabled but no libnet found; exit)
|
||||||
|
use_tcpkill="$enableval"
|
||||||
|
],
|
||||||
|
[ use_tcpkill="no" ])
|
||||||
@ -1,16 +0,0 @@
|
|||||||
ngrep: don't use versioned header
|
|
||||||
|
|
||||||
Signed-off-by: Wade Berrier <wberrier@gmail.com>
|
|
||||||
|
|
||||||
diff -ur ngrep-1.45/ngrep.c ngrep-1.45.mod/ngrep.c
|
|
||||||
--- ngrep-1.45/ngrep.c Tue Nov 28 15:38:43 2006
|
|
||||||
+++ ngrep-1.45.mod/ngrep.c Sat May 19 10:21:27 2007
|
|
||||||
@@ -92,7 +92,7 @@
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if USE_PCRE
|
|
||||||
-#include "pcre-5.0/pcre.h"
|
|
||||||
+#include "pcre.h"
|
|
||||||
#else
|
|
||||||
#include "regex-0.12/regex.h"
|
|
||||||
#endif
|
|
||||||
39
package/ngrep/0003-fix-disable-tcpkill.patch
Normal file
39
package/ngrep/0003-fix-disable-tcpkill.patch
Normal file
@ -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
|
||||||
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
ngrep: fix static link with pcre
|
|
||||||
|
|
||||||
Libraries must be placed after object files.
|
|
||||||
|
|
||||||
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
|
|
||||||
---
|
|
||||||
Makefile.in | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile.in b/Makefile.in
|
|
||||||
index 2ae4506..761d7d9 100644
|
|
||||||
--- a/Makefile.in
|
|
||||||
+++ b/Makefile.in
|
|
||||||
@@ -11,7 +11,7 @@ CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@
|
|
||||||
INCLUDES=-I@srcdir@ @PCAP_INCLUDE@ @EXTRA_INCLUDES@
|
|
||||||
|
|
||||||
LDFLAGS=@LDFLAGS@ @PCAP_LINK@
|
|
||||||
-LIBS=-lpcap @EXTRA_LIBS@
|
|
||||||
+LIBS=@LIBS@ @EXTRA_LIBS@
|
|
||||||
|
|
||||||
STRIPFLAG=@STRIPFLAG@
|
|
||||||
|
|
||||||
--
|
|
||||||
1.8.1.4
|
|
||||||
|
|
||||||
@ -5,4 +5,4 @@ config BR2_PACKAGE_NGREP
|
|||||||
help
|
help
|
||||||
Network grep.
|
Network grep.
|
||||||
|
|
||||||
http://ngrep.sourceforge.net/
|
https://github.com/jpr5/ngrep/
|
||||||
|
|||||||
@ -1,2 +1,3 @@
|
|||||||
# Locally computed:
|
# Locally computed:
|
||||||
sha256 aea6dd337da8781847c75b3b5b876e4de9c58520e0d77310679a979fc6402fa7 ngrep-1.45.tar.bz2
|
sha256 dc4dbe20991cc36bac5e97e99475e2a1522fd88c59ee2e08f813432c04c5fff3 ngrep-1_47.tar.gz
|
||||||
|
sha256 d46e593e048e0b9fc803561ed4c283f37a2d5447e4dcfa10cad29b394c2b8b9e LICENSE
|
||||||
|
|||||||
@ -4,25 +4,24 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
NGREP_VERSION = 1.45
|
NGREP_VERSION = 1_47
|
||||||
NGREP_SOURCE = ngrep-$(NGREP_VERSION).tar.bz2
|
NGREP_SITE = $(call github,jpr5,ngrep,V$(NGREP_VERSION))
|
||||||
NGREP_SITE = http://downloads.sourceforge.net/project/ngrep/ngrep/$(NGREP_VERSION)
|
|
||||||
NGREP_LICENSE = BSD-4-Clause-like
|
NGREP_LICENSE = BSD-4-Clause-like
|
||||||
NGREP_LICENSE_FILES = LICENSE.txt
|
NGREP_LICENSE_FILES = LICENSE
|
||||||
NGREP_INSTALL_STAGING = YES
|
NGREP_INSTALL_STAGING = YES
|
||||||
|
# We're patching configure.in
|
||||||
|
NGREP_AUTORECONF = YES
|
||||||
|
|
||||||
NGREP_LIBS = -lpcap -lpcre
|
|
||||||
ifeq ($(BR2_STATIC_LIBS),y)
|
ifeq ($(BR2_STATIC_LIBS),y)
|
||||||
NGREP_LIBS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`
|
NGREP_CONF_ENV += LIBS="$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs"
|
||||||
endif
|
endif
|
||||||
NGREP_CONF_ENV += LIBS+="$(NGREP_LIBS)"
|
|
||||||
|
|
||||||
NGREP_CONF_OPTS = \
|
NGREP_CONF_OPTS = \
|
||||||
--with-pcap-includes=$(STAGING_DIR)/usr/include/pcap \
|
--with-pcap-includes=$(STAGING_DIR)/usr/include/pcap \
|
||||||
--enable-pcre \
|
--enable-pcre \
|
||||||
--with-pcre=$(STAGING_DIR)/usr \
|
|
||||||
--disable-dropprivs \
|
--disable-dropprivs \
|
||||||
--disable-pcap-restart
|
--disable-pcap-restart \
|
||||||
|
--disable-tcpkill
|
||||||
|
|
||||||
NGREP_DEPENDENCIES = libpcap pcre
|
NGREP_DEPENDENCIES = libpcap pcre
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user