rpms/ngrep/devel ngrep-system-pcre.patch, 1.1, 1.2 ngrep.spec, 1.5, 1.6 sources, 1.2, 1.3

Wed Nov 29 16:46:04 UTC 2006

Author: jima

Update of /cvs/extras/rpms/ngrep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5901

Modified Files:
	ngrep-system-pcre.patch ngrep.spec sources 
Log Message:

* Wed Nov 29 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.45-1
- Upgrade to 1.45
- Enable IPv6 support
- Rebuild due to libpcap upgrade


ngrep-system-pcre.patch:

Index: ngrep-system-pcre.patch
===================================================================
RCS file: /cvs/extras/rpms/ngrep/devel/ngrep-system-pcre.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- ngrep-system-pcre.patch	25 Aug 2005 08:11:02 -0000	1.1
+++ ngrep-system-pcre.patch	29 Nov 2006 16:45:34 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Naru ngrep-1.43.orig/configure.in ngrep-1.43/configure.in
---- ngrep-1.43.orig/configure.in	2005-02-24 06:25:20.000000000 +0200
-+++ ngrep-1.43/configure.in	2005-02-24 20:48:38.486652640 +0200
+diff -urN ngrep-1.45/configure.in ngrep-1.45-patched/configure.in
+--- ngrep-1.45/configure.in	2006-11-14 21:43:56.000000000 -0600
++++ ngrep-1.45-patched/configure.in	2006-11-29 10:34:48.000000000 -0600
 @@ -28,8 +28,8 @@
  dnl
  
@@ -12,33 +12,42 @@
  
  
  dnl
-@@ -114,7 +114,7 @@
+@@ -130,8 +130,8 @@
    echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...' 
    echo 
  
--  ( cd pcre-5.0; ./configure && make libtool chartables.c )
-+  dnl ( cd pcre-5.0; ./configure && make libtool chartables.c )
- 
-   REGEX_TARGET='pcre'
-   REGEX_OBJS='pcre.o study.o'
-diff -Naru ngrep-1.43.orig/Makefile.in ngrep-1.43/Makefile.in
---- ngrep-1.43.orig/Makefile.in	2005-02-24 01:15:12.000000000 +0200
-+++ ngrep-1.43/Makefile.in	2005-02-24 20:46:56.868138920 +0200
-@@ -38,8 +38,8 @@
+-  REGEX_DIR='pcre-5.0'
+-  REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
++#  REGEX_DIR='pcre-5.0'
++#  REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
+   USE_PCRE="1"
+ 
+ else
+@@ -146,7 +146,7 @@
+ 
+ fi
+ 
+-( cd $REGEX_DIR && ./configure )
++#( cd $REGEX_DIR && ./configure )
+ 
+ AC_SUBST(REGEX_DIR)
+ AC_SUBST(REGEX_OBJS)
+diff -urN ngrep-1.45/Makefile.in ngrep-1.45-patched/Makefile.in
+--- ngrep-1.45/Makefile.in	2006-11-28 07:35:37.000000000 -0600
++++ ngrep-1.45-patched/Makefile.in	2006-11-29 08:20:32.000000000 -0600
+@@ -38,7 +38,7 @@
  
  all: $(TARGET) 
  
--$(TARGET): $(REGEX_TARGET) $(OBJS) 
--	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
+-$(TARGET): $(REGEX_OBJS) $(OBJS) 
 +$(TARGET): $(OBJS) 
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(LIBS) 
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
  
- debug: $(REGEX_TARGET) $(OBJS)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -g -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
-diff -Naru ngrep-1.43.orig/ngrep.c ngrep-1.43/ngrep.c
---- ngrep-1.43.orig/ngrep.c	2005-02-20 07:52:42.000000000 +0200
-+++ ngrep-1.43/ngrep.c	2005-02-24 20:47:17.740672140 +0200
-@@ -79,7 +79,7 @@
+ debug: $(REGEX_OBJS) $(OBJS)
+diff -urN ngrep-1.45/ngrep.c ngrep-1.45-patched/ngrep.c
+--- ngrep-1.45/ngrep.c	2006-11-28 07:38:43.000000000 -0600
++++ ngrep-1.45-patched/ngrep.c	2006-11-29 08:10:48.000000000 -0600
+@@ -92,7 +92,7 @@
  #endif
  
  #if USE_PCRE


Index: ngrep.spec
===================================================================
RCS file: /cvs/extras/rpms/ngrep/devel/ngrep.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ngrep.spec	4 Oct 2006 19:53:01 -0000	1.5
+++ ngrep.spec	29 Nov 2006 16:45:34 -0000	1.6
@@ -4,14 +4,14 @@
 Name:				ngrep
 Summary:			Network layer grep tool
 
-Version:			1.44
-Release:			7%{?dist}
+Version:			1.45
+Release:			1%{?dist}
 
 Group:				Applications/Internet
 License:			BSD-like
 URL:				http://ngrep.sourceforge.net/
 
-Source0:			http://download.sourceforge.net/ngrep/%{name}-%{version}-1.tar.bz2
+Source0:			http://download.sourceforge.net/ngrep/%{name}-%{version}.tar.bz2
 Source1:			%{name}-README.fedora
 Patch0:				%{name}-system-pcre.patch
 
@@ -39,7 +39,7 @@
 %build
 export EXTRA_INCLUDES=$(pcre-config --cflags)
 export EXTRA_LIBS=$(pcre-config --libs)
-%configure --enable-pcre
+%configure --enable-pcre --enable-ipv6
 make %{?_smp_mflags} STRIPFLAG=
 
 %install
@@ -56,6 +56,11 @@
 %{_mandir}/man8/ngrep.8*
 
 %changelog
+* Wed Nov 29 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.45-1
+- Upgrade to 1.45
+- Enable IPv6 support
+- Rebuild due to libpcap upgrade
+
 * Wed Oct 04 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.44-7
 - Bump-n-build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ngrep/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2005 08:11:02 -0000	1.2
+++ sources	29 Nov 2006 16:45:34 -0000	1.3
@@ -1 +1 @@
-c8aed4d0fac077cc09524b3c7d623974  ngrep-1.44-1.tar.bz2
+bc8150331601f3b869549c94866b4f1c  ngrep-1.45.tar.bz2


