new package: ngrep
PATCH 1/1 new package: ngrep
--- package/Config.in | 1 + package/ngrep/Config.in | 8 +++++++ package/ngrep/ngrep-1.45-make-objs.patch | 19 ++++++++++++++++++ package/ngrep/ngrep-1.45-pcre-header.patch | 12 +++++++++++ package/ngrep/ngrep.mk | 29 ++++++++++++++++++++++++++++ 5 files changed, 69 insertions(+), 0 deletions(-) create mode 100644 package/ngrep/Config.in create mode 100644 package/ngrep/ngrep-1.45-make-objs.patch create mode 100644 package/ngrep/ngrep-1.45-pcre-header.patch create mode 100644 package/ngrep/ngrep.mk
package/Config.in +1 -0
@@ -421,6 +421,7 @@ source "package/netsnmp/Config.in" source "package/netstat-nat/Config.in" source "package/nfs-utils/Config.in" source "package/ngircd/Config.in" +source "package/ngrep/Config.in" source "package/ntp/Config.in" source "package/nuttcp/Config.in" source "package/olsr/Config.in"
package/ngrep/Config.in new file +8 -0
@@ -0,0 +1,8 @@ +config BR2_PACKAGE_NGREP + bool "ngrep" + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_PCRE + help + Network grep. + + http://ngrep.sourceforge.net/
package/ngrep/ngrep-1.45-make-objs.patch new file +19 -0
@@ -0,0 +1,19 @@ +--- 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)
package/ngrep/ngrep-1.45-pcre-header.patch new file +12 -0
@@ -0,0 +1,12 @@ +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
package/ngrep/ngrep.mk new file +29 -0
@@ -0,0 +1,29 @@ +############################################################# +# +# ngrep +# +############################################################# + +NGREP_VERSION:=1.45 +NGREP_SOURCE:=ngrep-$(NGREP_VERSION).tar.bz2 +NGREP_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ngrep/ngrep/$(NGREP_VERSION) +# no install-strip/install-exec +NGREP_INSTALL_TARGET_OPT= DESTDIR="$(TARGET_DIR)" install +NGREP_CONF_ENV:=LDFLAGS="-lpcre" +NGREP_CONF_OPT:= \ + --with-pcap-includes=$(STAGING_DIR)/usr/include \ + --enable-pcre \ + --with-pcre=$(STAGING_DIR)/usr \ + --disable-dropprivs + +ifeq ($(BR2_INET_IPV6),y) +NGREP_CONF_OPT += --enable-ipv6 +endif + +NGREP_DEPENDENCIES:=libpcap pcre + +$(eval $(call AUTOTARGETS,package,ngrep)) + +$(NGREP_HOOK_POST_INSTALL): $(NGREP_TARGET_INSTALL_TARGET) + $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/bin/ngrep + touch $@
Signature · 1 line
1.7.0.4
PATCH 1/1 new package: ngrep
Hello Wade,
Thanks for this patch. A few comments below.
Le Wed, 29 Jun 2011 19:18:42 -0600,
Wade Berrier <[email protected]> a ?crit :
package/ngrep/ngrep-1.45-make-objs.patch
Quoted 5 lines
package/ngrep/ngrep-1.45-make-objs.patch new file +0
-0
All patches applied to packages should have a header with a description detailing what the patch is doing/fixing + a Signed-off-by line.
package/ngrep/ngrep-1.45-pcre-header.patch
Quoted 5 lines
package/ngrep/ngrep-1.45-pcre-header.patch new file +0
-0
Same here.
package/ngrep/ngrep-1.45-pcre-header.patch
Quoted 3 lines
package/ngrep/ngrep-1.45-pcre-header.patch new file +3
-0+NGREP_VERSION:=1.45 +NGREP_SOURCE:=ngrep-$(NGREP_VERSION).tar.bz2 +NGREP_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ngrep/ngrep/$(NGREP_VERSION)
We mostly don't use := but simply = for variable definitions in packages.
package/ngrep/ngrep-1.45-pcre-header.patch
Quoted 2 lines
package/ngrep/ngrep-1.45-pcre-header.patch new file +2
-0+# no install-strip/install-exec +NGREP_INSTALL_TARGET_OPT= DESTDIR="$(TARGET_DIR)" install
Not needed, this is now the default in current versions of Buildroot.
Quoted 1 line
+NGREP_CONF_ENV:=LDFLAGS="-lpcre"
This will override the initial value LDFLAGS="$(TARGET_LDFLAGS)". Is it really needed ? If the configure script detects pcre, then it should already append -lpcre.
package/ngrep/ngrep-1.45-pcre-header.patch
Quoted 3 lines
+$(NGREP_HOOK_POST_INSTALL): $(NGREP_TARGET_INSTALL_TARGET)
package/ngrep/ngrep-1.45-pcre-header.patch new file +2
-0+ $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/bin/ngrep + touch $@
This is no longer a valid way of writing post install hooks, and moreover, stripping the binaries is no longer needed, as this is already done globally. You can simply remove those three lines.
Regards,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com