diff --git a/.cvsignore b/.cvsignore index a25a22f..596b8c7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libpcap-0.9.5.tar.gz +libpcap-0.9.7.tar.gz diff --git a/libpcap-0.9.7-shared.patch b/libpcap-0.9.7-shared.patch new file mode 100644 index 0000000..0745d00 --- /dev/null +++ b/libpcap-0.9.7-shared.patch @@ -0,0 +1,42 @@ +--- libpcap-0.9.7/Makefile.in.shared 2007-07-24 04:35:15.000000000 +0200 ++++ libpcap-0.9.7/Makefile.in 2007-07-24 14:52:43.000000000 +0200 +@@ -22,6 +22,7 @@ + # + # Various configurable paths (remember to edit Makefile.in, not Makefile) + # ++VERSION := $(shell cat VERSION) + + # Top level hierarchy + prefix = @prefix@ +@@ -97,9 +98,14 @@ TAGHDR = \ + TAGFILES = \ + $(SRC) $(HDR) $(TAGHDR) + +-CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c + +-all: libpcap.a ++ ++CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so.$(VERSION) ++ ++all: libpcap.a libpcap.so.$(VERSION) ++ ++libpcap.so.$(VERSION): $(OBJ) ++ gcc -shared -Wl,-soname -Wl,libpcap.so.$(SOVERSION) -o libpcap.so.$(VERSION) $(OBJ) + + libpcap.a: $(OBJ) + @rm -f $@ +@@ -172,10 +178,13 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt + bpf_filter.o: bpf_filter.c + $(CC) $(CFLAGS) -c bpf_filter.c + +-install: libpcap.a ++install: libpcap.a libpcap.so.$(VERSION) + [ -d $(DESTDIR)$(libdir) ] || \ + (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) + $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a ++ $(INSTALL_PROGRAM) libpcap.so.$(VERSION) $(DESTDIR)$(libdir)/libpcap.so.$(VERSION) ++ ln -sf libpcap.so.$(VERSION) $(DESTDIR)$(libdir)/libpcap.so.$(SOVERSION) ++ ln -sf libpcap.so.$(SOVERSION) $(DESTDIR)$(libdir)/libpcap.so + $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a + [ -d $(DESTDIR)$(includedir) ] || \ + (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) diff --git a/libpcap-shared.patch b/libpcap-shared.patch deleted file mode 100644 index d0394f3..0000000 --- a/libpcap-shared.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- libpcap-0.9.5/Makefile.in.shared 2003-12-15 02:35:03.000000000 +0100 -+++ libpcap-0.9.5/Makefile.in 2006-11-28 12:01:14.000000000 +0100 -@@ -22,6 +22,7 @@ - # - # Various configurable paths (remember to edit Makefile.in, not Makefile) - # -+VERSION := $(shell cat VERSION) - - # Top level hierarchy - prefix = @prefix@ -@@ -49,7 +50,7 @@ - DYEXT = @DYEXT@ - - # Standard CFLAGS --CFLAGS = $(CCOPT) $(INCLS) $(DEFS) -+CFLAGS = $(CCOPT) $(INCLS) $(DEFS) -fPIC -DPIC - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -95,9 +96,14 @@ - TAGFILES = \ - $(SRC) $(HDR) $(TAGHDR) - --CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c - --all: libpcap.a -+ -+CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so.$(VERSION) -+ -+all: libpcap.a libpcap.so.$(VERSION) -+ -+libpcap.so.$(VERSION): $(OBJ) -+ gcc -shared -Wl,-soname -Wl,libpcap.so.$(SOVERSION) -o libpcap.so.$(VERSION) $(OBJ) - - libpcap.a: $(OBJ) - @rm -f $@ -@@ -170,10 +176,13 @@ - bpf_filter.o: bpf_filter.c - $(CC) $(CFLAGS) -c bpf_filter.c - --install: libpcap.a -+install: libpcap.a libpcap.so.$(VERSION) - [ -d $(DESTDIR)$(libdir) ] || \ - (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) - $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a -+ $(INSTALL_PROGRAM) libpcap.so.$(VERSION) $(DESTDIR)$(libdir)/libpcap.so.$(VERSION) -+ ln -sf libpcap.so.$(VERSION) $(DESTDIR)$(libdir)/libpcap.so.$(SOVERSION) -+ ln -sf libpcap.so.$(SOVERSION) $(DESTDIR)$(libdir)/libpcap.so - $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a - [ -d $(DESTDIR)$(includedir) ] || \ - (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) diff --git a/libpcap.spec b/libpcap.spec index 0b8f31f..f71e8b4 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -2,7 +2,7 @@ Name: libpcap Epoch: 14 -Version: 0.9.5 +Version: 0.9.7 Release: 1%{?dist} Summary: A system-independent interface for user-level packet capture Group: Development/Libraries @@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz Patch1: libpcap-man.patch -Patch2: libpcap-shared.patch +Patch2: libpcap-0.9.7-shared.patch Patch3: libpcap-s390.patch Patch4: libpcap-0.8.3-ppp.patch @@ -55,7 +55,7 @@ resources needed for developing libpcap applications. %patch4 -p0 -b .ppp %build -export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" +export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)" %configure --enable-ipv6 make SOVERSION=%{pcap_sover} @@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/pcap.3* %changelog +* Tue Jul 31 2007 Miroslav Lichvar 14:0.9.7-1 +- update to 0.9.7 + * Tue Nov 28 2006 Miroslav Lichvar 14:0.9.5-1 - split from tcpdump package (#193657) - update to 0.9.5 diff --git a/sources b/sources index ca60679..ad262e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0626ad59004fe5767ddd2ce743a2271 libpcap-0.9.5.tar.gz +77bc1f1de0de8488c7cb28e4753b9603 libpcap-0.9.7.tar.gz