OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libpcap?expand=0&rev=4

libpcap-0.9.5-config.diff

@@ -1,6 +1,6 @@
 --- configure.in
 +++ configure.in
-@@ -55,7 +55,7 @@
+@@ -56,7 +56,7 @@
  AC_CHECK_FUNCS(vsnprintf snprintf,,
  	[needsnprintf=yes])
  if test $needsnprintf = yes; then

libpcap-0.9.5-nonvoid.diff

@@ -8,7 +8,7 @@
  }
  #endif /*INET6*/
  
-@@ -5296,6 +5297,7 @@
+@@ -5295,6 +5296,7 @@
  	}
  	bpf_error("ethernet address used in non-ether expression");
  	/* NOTREACHED */
@@ -16,7 +16,7 @@
  }
  
  void
-@@ -5725,6 +5727,7 @@
+@@ -5724,6 +5726,7 @@
  	}
  	bpf_error("too many registers needed to evaluate expression");
  	/* NOTREACHED */
@@ -24,7 +24,7 @@
  }
  
  /*
-@@ -6315,6 +6318,7 @@
+@@ -6314,6 +6317,7 @@
  	}
  	bpf_error("ARCnet address used in non-arc expression");
  	/* NOTREACHED */

libpcap-0.9.5-shared.diff

@@ -1,20 +1,21 @@
 --- Makefile.in
 +++ Makefile.in
-@@ -37,6 +37,13 @@
+@@ -37,6 +37,14 @@
  srcdir = @srcdir@
  VPATH = @srcdir@
  
 +###
 +# pcaplib version
-+MAJOR = 0
-+MINOR = 9.3
-+VERSION = $(MAJOR).$(MINOR)
-+export MAJOR MINOR VERSION
++VERSION = @PACKAGE_VERSION@
++MAJOR    = $(shell echo $(VERSION)|cut -d. -f1)
++MINOR    = $(shell echo $(VERSION)|cut -d. -f2)
++REVISION = $(shell echo $(VERSION)|cut -d. -f3)
++export MAJOR MINOR REVISION VERSION
 +
  #
  # You shouldn't need to edit anything below.
  #
-@@ -95,31 +102,22 @@
+@@ -95,31 +103,22 @@
  TAGFILES = \
  	$(SRC) $(HDR) $(TAGHDR)
  
@@ -53,8 +54,12 @@
  
  
  scanner.c: $(srcdir)/scanner.l
-@@ -173,8 +171,11 @@
- install: libpcap.a 
+@@ -170,11 +169,14 @@
+ bpf_filter.o: bpf_filter.c
+ 	$(CC) $(CFLAGS) -c bpf_filter.c
+ 
+-install: libpcap.a 
++install: $(all)
  	[ -d $(DESTDIR)$(libdir) ] || \
  	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
 -	$(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
@@ -66,7 +71,7 @@
  	[ -d $(DESTDIR)$(includedir) ] || \
  	    (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
  	$(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h
-@@ -196,6 +197,7 @@
+@@ -196,6 +198,7 @@
  
  uninstall:
  	rm -f $(DESTDIR)$(libdir)/libpcap.a
@@ -74,3 +79,15 @@
  	rm -f $(DESTDIR)$(includedir)/pcap.h
  	rm -f $(DESTDIR)$(includedir)/pcap-bpf.h
  	rm -f $(DESTDIR)$(includedir)/pcap-namedb.h
+--- configure.in
++++ configure.in
+@@ -8,7 +8,8 @@
+ 
+ AC_REVISION($Revision: 1.120.2.8 $)
+ AC_PREREQ(2.50)
+-AC_INIT(pcap.c)
++AC_INIT([libpcap], [0.9.5])
++AC_CONFIG_SRCDIR([pcap.c])
+ 
+ AC_CANONICAL_SYSTEM
+ 

libpcap.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May  2 16:40:08 CEST 2007 - pth@suse.de
+
+- Use correct version for naming the shared library (#270226)
+
 -------------------------------------------------------------------
 Thu Mar 29 11:33:50 CEST 2007 - rguenther@suse.de
 

libpcap.spec

@@ -13,7 +13,7 @@
 Name:           libpcap
 BuildRequires:  bison flex
 Version:        0.9.5
-Release:        11
+Release:        16
 Autoreqprov:    on
 Group:          System/Libraries
 License:        BSD License and BSD-like
@@ -58,19 +58,20 @@ Authors:
 
 %build
 %{suse_update_config -f}
-aclocal --force
-libtoolize --force
-autoconf --force
-autoheader --force
-CFLAGS="$RPM_OPT_FLAGS -fpic" CXXFLAGS="$RPM_OPT_FLAGS -fpic" \
-	./configure \
+#aclocal --force
+#libtoolize --force
+#autoconf --force
+#autoheader --force
+autoreconf -fi
+export CFLAGS="$RPM_OPT_FLAGS -fpic" CXXFLAGS="$RPM_OPT_FLAGS -fpic"
+./configure \
 	--prefix=%{_prefix} \
 	--sysconfdir=%{_sysconfdir} \
 	--libdir=%{_libdir} \
 	--infodir=%{_infodir} \
 	--mandir=%{_mandir} \
 	--enable-ipv6
-make
+make VERSION=%{version}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -86,6 +87,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Wed May 02 2007 - pth@suse.de
+- Use correct version for naming the shared library (#270226)
 * Thu Mar 29 2007 - rguenther@suse.de
 - add flex and bison BuildRequires
 * Tue Jan 16 2007 - prusnak@suse.cz