rpms/libpcap/devel libpcap-multilib.patch, NONE, 1.1 libpcap-oldsoname.patch, NONE, 1.1 libpcap-oneshot.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 libpcap-man.patch, 1.1, 1.2 libpcap-s390.patch, 1.1, 1.2 libpcap.spec, 1.9, 1.10 sources, 1.5, 1.6 libpcap-0.9.7-shared.patch, 1.2, NONE

Wed Jul 22 16:39:29 UTC 2009

Author: mlichvar

Update of /cvs/pkgs/rpms/libpcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3332

Modified Files:
	.cvsignore libpcap-man.patch libpcap-s390.patch libpcap.spec 
	sources 
Added Files:
	libpcap-multilib.patch libpcap-oldsoname.patch 
	libpcap-oneshot.patch 
Removed Files:
	libpcap-0.9.7-shared.patch 
Log Message:
- update to 1.0.0, git snapshot 20090716git6de2de


libpcap-multilib.patch:
 pcap-config.in |   26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

--- NEW FILE libpcap-multilib.patch ---
diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in
--- libpcap/pcap-config.in.multilib	2009-07-03 06:01:12.000000000 +0200
+++ libpcap/pcap-config.in	2009-07-09 15:55:48.000000000 +0200
@@ -29,16 +29,6 @@ do
 	esac
 	shift
 done
-if [ "@V_RPATH_OPT@" != "" ]
-then
-	#
-	# If libdir isn't /usr/lib, add it to the run-time linker path.
-	#
-	if [ "@libdir@" != "/usr/lib" ]
-	then
-		RPATH=@V_RPATH_OPT@@libdir@
-	fi
-fi
 if [ "$static" = 1 ]
 then
 	#
@@ -47,16 +37,16 @@ then
 	#
 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
 	then
-		echo "-I at includedir@ -L at libdir@ -lpcap @LIBS@"
+		echo "-lpcap @LIBS@"
 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
 	then
-		echo "-I at includedir@ -L at libdir@ @LIBS@"
+		echo "@LIBS@"
 	elif [ "$show_cflags" = 1 ]
 	then
-		echo "-I at includedir@"
+		echo ""
 	elif [ "$show_libs" = 1 ]
 	then
-		echo "-L at libdir@ -lpcap @LIBS@"
+		echo "-lpcap @LIBS@"
 	elif [ "$show_additional_libs" = 1 ]
 	then
 		echo "@LIBS@"
@@ -68,15 +58,15 @@ else
 	#
 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
 	then
-		echo "-I at includedir@ -L at libdir@ $RPATH -lpcap"
+		echo "-lpcap"
 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
 	then
-		echo "-I at includedir@"
+		echo ""
 	elif [ "$show_cflags" = 1 ]
 	then
-		echo "-I at includedir@"
+		echo ""
 	elif [ "$show_libs" = 1 ]
 	then
-		echo "-L at libdir@ $RPATH -lpcap"
+		echo "-lpcap"
 	fi
 fi

libpcap-oldsoname.patch:
 Makefile.in |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE libpcap-oldsoname.patch ---
diff -up libpcap/Makefile.in.oldsoname libpcap/Makefile.in
--- libpcap/Makefile.in.oldsoname	2009-07-17 00:10:42.000000000 +0200
+++ libpcap/Makefile.in	2009-07-22 15:53:32.000000000 +0200
@@ -328,6 +328,8 @@ libpcap.so: $(OBJ)
 	MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
 	@V_SHLIB_CMD@ @V_SHLIB_OPT@ @V_SONAME_OPT@$@.$$MAJOR_VER $(LDFLAGS) \
 	    -o $@.$$VER $(OBJ) $(ADDLOBJS) $(LIBS)
+	@V_SHLIB_CMD@ @V_SHLIB_OPT@ @V_SONAME_OPT@$@.0.9 $(LDFLAGS) \
+	    -o $@.0.9.9 $(OBJ) $(ADDLOBJS) $(LIBS)
 
 #
 # The following rule succeeds, but the result is untested.
@@ -542,6 +544,8 @@ install-shared-so: libpcap.so
 	VER=`cat $(srcdir)/VERSION`; \
 	MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
 	$(INSTALL_PROGRAM) libpcap.so.$$VER $(DESTDIR)$(libdir)/libpcap.so.$$VER; \
+	$(INSTALL_PROGRAM) libpcap.so.0.9.9 $(DESTDIR)$(libdir)/libpcap.so.0.9.9; \
+	ln -sf libpcap.so.0.9.9 $(DESTDIR)$(libdir)/libpcap.so.0.9; \
 	ln -sf libpcap.so.$$VER $(DESTDIR)$(libdir)/libpcap.so.$$MAJOR_VER; \
 	ln -sf libpcap.so.$$MAJOR_VER $(DESTDIR)$(libdir)/libpcap.so
 install-shared-dylib: libpcap.dylib

libpcap-oneshot.patch:
 pcap-linux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libpcap-oneshot.patch ---
diff -up libpcap/pcap-linux.c.oneshot libpcap/pcap-linux.c
--- libpcap/pcap-linux.c.oneshot	2009-07-17 00:10:42.000000000 +0200
+++ libpcap/pcap-linux.c	2009-07-22 14:30:52.000000000 +0200
@@ -2744,7 +2744,7 @@ static void
 pcap_oneshot_mmap(u_char *user, const struct pcap_pkthdr *h,
     const u_char *bytes)
 {
-	struct pkt_for_oneshot *sp = (struct pkt_for_oneshot *)user;
+	struct oneshot_userdata *sp = (struct oneshot_userdata *)user;
 	bpf_u_int32 copylen;
 
 	*sp->hdr = *h;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	24 Oct 2007 16:32:57 -0000	1.5
+++ .cvsignore	22 Jul 2009 16:39:29 -0000	1.6
@@ -1 +1 @@
-libpcap-0.9.8.tar.gz
+libpcap-20090716git6de2de.tar.gz

libpcap-man.patch:
 pcap.3pcap.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: libpcap-man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/devel/libpcap-man.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libpcap-man.patch	28 Nov 2006 11:40:49 -0000	1.1
+++ libpcap-man.patch	22 Jul 2009 16:39:29 -0000	1.2
@@ -1,23 +1,12 @@
---- libpcap-0.9.5/pcap.3.man	2006-01-22 21:12:10.000000000 +0100
-+++ libpcap-0.9.5/pcap.3	2006-11-03 15:36:28.000000000 +0100
-@@ -215,9 +215,9 @@
- .I fname
- specifies the name of the file to open. The file has
- the same format as those used by
--.B tcpdump(1)
-+.B tcpdump(8)
- and
--.BR tcpslice(1) .
-+.BR tcpslice(8) .
- The name "-" in a synonym for
- .BR stdin .
- Alternatively, you may call
-@@ -1283,7 +1283,7 @@
- closes the ``savefile.''
- .PP
+diff -up libpcap/pcap.3pcap.in.man libpcap/pcap.3pcap.in
+--- libpcap/pcap.3pcap.in.man	2009-07-03 06:01:12.000000000 +0200
++++ libpcap/pcap.3pcap.in	2009-07-03 15:00:12.000000000 +0200
+@@ -363,7 +363,7 @@ use an
+ script or some other configuration script to check whether the libpcap
+ 1.0 APIs are available and use them only if they are.
  .SH SEE ALSO
--tcpdump(1), tcpslice(1)
-+tcpdump(8), tcpslice(8)
+-autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8),
++autoconf(1), tcpdump(8), tcpslice(8), pcap-filter(@MAN_MISC_INFO@), pfconfig(8),
+ usermod(1M)
  .SH AUTHORS
- The original authors are:
- .LP
+ The original authors of libpcap are:

libpcap-s390.patch:
 pcap-linux.c |    4 ++++
 1 file changed, 4 insertions(+)

Index: libpcap-s390.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/devel/libpcap-s390.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libpcap-s390.patch	28 Nov 2006 11:40:49 -0000	1.1
+++ libpcap-s390.patch	22 Jul 2009 16:39:29 -0000	1.2
@@ -1,12 +1,14 @@
---- libpcap-0.7.2/pcap-linux.c.s390	2003-02-26 07:45:32.000000000 +0100
-+++ libpcap-0.7.2/pcap-linux.c	2003-02-27 16:48:48.000000000 +0100
-@@ -1214,6 +1214,9 @@
- 					fatal_err = 1;
- 				break;
- 			}
+diff -up libpcap/pcap-linux.c.s390 libpcap/pcap-linux.c
+--- libpcap/pcap-linux.c.s390	2009-07-22 14:33:20.000000000 +0200
++++ libpcap/pcap-linux.c	2009-07-22 15:22:34.000000000 +0200
+@@ -2377,6 +2377,10 @@ activate_new(pcap_t *handle)
+ 				handle->linktype = DLT_LINUX_SLL;
+ 		}
+ 
 +		/* Hack to make things work on s390 ctc interfaces */
 +		if (strncmp("ctc", device, 3) == 0)
 +			handle->linktype = DLT_EN10MB;
- 		} else {
- 			/*
- 			 * This is cooked mode.
++
+ 		handle->md.ifindex = iface_get_id(sock_fd, device,
+ 		    handle->errbuf);
+ 		if (handle->md.ifindex == -1) {


Index: libpcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/devel/libpcap.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libpcap.spec	25 Feb 2009 17:27:15 -0000	1.9
+++ libpcap.spec	22 Jul 2009 16:39:29 -0000	1.10
@@ -1,21 +1,23 @@
-%define pcap_sover 0.9
-
 Name: libpcap
 Epoch: 14
-Version: 0.9.8
-Release: 4%{?dist}
+Version: 1.0.0
+Release: 1.20090716git6de2de%{?dist}
 Summary: A system-independent interface for user-level packet capture
 Group: Development/Libraries
 License: BSD with advertising
 URL: http://www.tcpdump.org
-BuildRequires: glibc-kernheaders >= 2.2.0 bison flex
+BuildRequires: glibc-kernheaders >= 2.2.0 bison flex bluez-libs-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
+#Source: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
+# git snapshot from git://bpf.tcpdump.org/libpcap
+Source: libpcap-20090716git6de2de.tar.gz
 Patch1: libpcap-man.patch
-Patch2: libpcap-0.9.7-shared.patch
+Patch2: libpcap-multilib.patch
 Patch3: libpcap-s390.patch
 Patch4: libpcap-0.8.3-ppp.patch
+Patch5: libpcap-oneshot.patch
+# temporarily provide old soname
+Patch6: libpcap-oldsoname.patch
 
 %description
 Libpcap provides a portable framework for low-level network
@@ -47,22 +49,25 @@ This package provides the libraries, inc
 resources needed for developing libpcap applications.
  
 %prep
-%setup -q
+%setup -q -n libpcap
+echo '1.0.0' > VERSION
 
 %patch1 -p1 -b .man 
-%patch2 -p1 -b .shared 
+%patch2 -p1 -b .multilib
 %patch3 -p1 -b .s390
 %patch4 -p0 -b .ppp
+%patch5 -p1 -b .oneshot
+%patch6 -p1 -b .oldsoname
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)"
-%configure --enable-ipv6
-make SOVERSION=%{pcap_sover}
+%configure --enable-ipv6 --enable-bluetooth
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make SOVERSION=%{pcap_sover} DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/libpcap.a
 
 %clean
@@ -76,14 +81,22 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc LICENSE README CHANGES CREDITS doc/pcap.txt
 %{_libdir}/libpcap.so.*
+%{_mandir}/man7/pcap*.7*
 
 %files devel
 %defattr(-,root,root)
+%{_bindir}/pcap-config
 %{_includedir}/pcap*.h
+%{_includedir}/pcap
 %{_libdir}/libpcap.so
-%{_mandir}/man3/pcap.3*
+%{_mandir}/man1/pcap-config.1*
+%{_mandir}/man3/pcap*.3*
+%{_mandir}/man5/pcap*.5*
 
 %changelog
+* Wed Jul 22 2009 Miroslav Lichvar <mlichvar at redhat.com> 14:1.0.0-1.20090716git6de2de
+- update to 1.0.0, git snapshot 20090716git6de2de
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 14:0.9.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Oct 2007 16:32:57 -0000	1.5
+++ sources	22 Jul 2009 16:39:29 -0000	1.6
@@ -1 +1 @@
-5208f24d0328ee7c20b52c43eaa9aa0e  libpcap-0.9.8.tar.gz
+ac6459eb882d4e1107f8c351eb0131eb  libpcap-20090716git6de2de.tar.gz


--- libpcap-0.9.7-shared.patch DELETED ---


