rpms/ngrep/devel ngrep-README.fedora, NONE, 1.1 ngrep-system-pcre.patch, NONE, 1.1 ngrep.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Oliver Falk (oliver)
fedora-extras-commits at redhat.com
Thu Aug 25 08:11:14 UTC 2005
Author: oliver
Update of /cvs/extras/rpms/ngrep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17780/devel
Modified Files:
.cvsignore sources
Added Files:
ngrep-README.fedora ngrep-system-pcre.patch ngrep.spec
Log Message:
auto-import ngrep-1.44-3 on branch devel from ngrep-1.44-3.src.rpm
--- NEW FILE ngrep-README.fedora ---
This version of ngrep has been modified to dynamically link with the
system PCRE library instead of using the one bundled with the ngrep
distribution.
ngrep-system-pcre.patch:
--- NEW FILE ngrep-system-pcre.patch ---
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
@@ -28,8 +28,8 @@
dnl
EXTRA_DEFINES=""
-EXTRA_INCLUDES=""
-EXTRA_LIBS=""
+EXTRA_INCLUDES="$EXTRA_INCLUDES"
+EXTRA_LIBS="$EXTRA_LIBS"
dnl
@@ -114,7 +114,7 @@
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 @@
all: $(TARGET)
-$(TARGET): $(REGEX_TARGET) $(OBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS)
+$(TARGET): $(OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(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 @@
#endif
#if USE_PCRE
-#include "pcre-5.0/pcre.h"
+#include "pcre.h"
#else
#include "regex-0.12/regex.h"
#endif
--- NEW FILE ngrep.spec ---
# Note: building with PCRE instead of GNU regex because of license
# incompatibilities (this one's basically a BSD with advertising clause).
Name: ngrep
Summary: Network layer grep tool
Version: 1.44
Release: 3%{?dist}
Group: Applications/Internet
License: BSD-like
URL: http://ngrep.sourceforge.net/
Source0: http://download.sourceforge.net/ngrep/%{name}-%{version}-1.tar.bz2
Source1: %{name}-README.fedora
Patch0: %{name}-system-pcre.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf >= 2.57
BuildRequires: pcre-devel
BuildRequires: libpcap
%description
ngrep strives to provide most of GNU grep's common features, applying them
to the network layer. ngrep is a pcap-aware tool that will allow you to
specify extended regular or hexadecimal expressions to match against data
payloads of packets. It currently recognizes TCP, UDP, ICMP, IGMP and Raw
protocols across Ethernet, PPP, SLIP, FDDI, Token Ring, 802.11 and null
interfaces, and understands bpf filter logic in the same fashion as more
common packet sniffing tools, such as tcpdump and snoop.
%prep
%setup -q
%patch0 -p1
autoconf
install -pm 644 %{SOURCE1} ./README.fedora
%build
export EXTRA_INCLUDES=$(pcre-config --cflags)
export EXTRA_LIBS=$(pcre-config --libs)
%configure --enable-pcre
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT BINDIR_INSTALL=%{_sbindir}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc doc/CHANGES.txt doc/CREDITS.txt doc/README.txt LICENSE.txt README.fedora
%{_sbindir}/ngrep
%{_mandir}/man8/ngrep.8*
%changelog
* Wed Aug 24 2005 Oliver Falk <oliver at linux-kernel.at> - 1.44-3
- Bugs from #166481
* Mon Aug 22 2005 Oliver Falk <oliver at linux-kernel.at> - 1.44-2
- Bug #165963
- Merge with package from Ville
See also https://www.redhat.com/archives/fedora-extras-list/2005-July/msg01009.html
* Thu Aug 11 2005 Oliver Falk <oliver at linux-kernel.at> - 1.44-1
- Initial build for Fedora Extras
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ngrep/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 25 Aug 2005 08:09:07 -0000 1.1
+++ .cvsignore 25 Aug 2005 08:11:02 -0000 1.2
@@ -0,0 +1 @@
+ngrep-1.44-1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ngrep/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 25 Aug 2005 08:09:07 -0000 1.1
+++ sources 25 Aug 2005 08:11:02 -0000 1.2
@@ -0,0 +1 @@
+c8aed4d0fac077cc09524b3c7d623974 ngrep-1.44-1.tar.bz2
More information about the scm-commits
mailing list