Hello community,
here is the log from the commit of package libpcap
checked in at Fri Sep 5 21:34:27 CEST 2008.
--------
--- libpcap/libpcap.changes 2008-08-20 16:36:40.000000000 +0200
+++ libpcap/libpcap.changes 2008-09-04 17:08:17.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Sep 4 17:07:17 CEST 2008 - prusnak@suse.cz
+
+- updated to CVS-20080503
+ * support for USB and Bluetooth capture
+
+-------------------------------------------------------------------
Old:
----
libpcap-0.9.8-socket-timeout.patch
libpcap-0.9.8.tar.bz2
New:
----
libpcap-0.9.8_CVS20080503.tar.bz2
libpcap-0.9.8-fcode.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libpcap.spec ++++++
--- /var/tmp/diff_new_pack.J13096/_old 2008-09-05 21:32:43.000000000 +0200
+++ /var/tmp/diff_new_pack.J13096/_new 2008-09-05 21:32:43.000000000 +0200
@@ -19,24 +19,24 @@
Name: libpcap
-BuildRequires: bison flex
Version: 0.9.8
-Release: 45
+Release: 46
AutoReqProv: on
Group: System/Libraries
License: BSD 3-Clause
Url: http://www.tcpdump.org/
Summary: A Library for Network Sniffers
-Source: %{name}-%{version}.tar.bz2
+Source: %{name}-0.9.8_CVS20080503.tar.bz2
Patch0: %{name}-%{version}-shared.patch
Patch1: %{name}-%{version}-filter-fix.patch
-Patch2: %{name}-%{version}-socket-timeout.patch
+Patch2: %{name}-%{version}-fcode.patch
Patch3: %{name}-%{version}-pcap-bpf.patch
Patch4: %{name}-%{version}-ppp.patch
Patch5: %{name}-%{version}-s390.patch
Patch6: %{name}-%{version}-man.patch
Patch7: %{name}-%{version}-mac_syntax.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: bison bluez-libs flex
%description
libpcap is a library used by packet sniffer programs. It provides an
@@ -115,8 +115,8 @@
Van Jacobson
%prep
-%setup -q
-find -d -name CVS -exec rm -rf {} \;
+%setup -q -n %{name}-0.9.8_CVS20080503
+find -depth -name CVS -exec rm -rf {} \;
%patch0
%patch1
%patch2
@@ -158,6 +158,9 @@
%{_libdir}/*.*a
%changelog
+* Thu Sep 04 2008 prusnak@suse.cz
+- updated to CVS-20080503
+ * support for USB and Bluetooth capture
* Wed Aug 20 2008 prusnak@suse.cz
- renamed libpcap package to libpcap0
- added ppp.patch and s390.patch (small issues)
++++++ libpcap-0.9.8-fcode.patch ++++++
--- pcap-linux.c
+++ pcap-linux.c
@@ -1060,6 +1060,9 @@
struct sock_fprog fcode;
int can_filter_in_kernel;
int err = 0;
+ memset(&fcode, 0, sizeof(fcode));
+ fcode.len = 0;
+ fcode.filter = NULL;
#endif
if (!handle)
@@ -1094,8 +1097,6 @@
* sake of correctness I added this check.
*/
fprintf(stderr, "Warning: Filter too complex for kernel\n");
- fcode.len = 0;
- fcode.filter = NULL;
can_filter_in_kernel = 0;
} else
#endif /* USHRT_MAX */
++++++ libpcap-0.9.8-filter-fix.patch ++++++
--- /var/tmp/diff_new_pack.J13096/_old 2008-09-05 21:32:43.000000000 +0200
+++ /var/tmp/diff_new_pack.J13096/_new 2008-09-05 21:32:43.000000000 +0200
@@ -1,6 +1,6 @@
--- pcap-bpf.c
+++ pcap-bpf.c
-@@ -568,7 +568,7 @@
+@@ -231,7 +231,7 @@
fd = open(device, O_RDWR);
if (fd == -1 && errno == EACCES)
fd = open(device, O_RDONLY);
@@ -11,15 +11,7 @@
* XXX better message for all minors used
--- pcap-linux.c
+++ pcap-linux.c
-@@ -100,6 +100,7 @@
- #include
- #include
- #include
-+#include
-
- /*
- * If PF_PACKET is defined, we can use {SOCK_RAW,SOCK_DGRAM}/PF_PACKET
-@@ -1012,8 +1013,30 @@
+@@ -1144,8 +1144,30 @@
if (can_filter_in_kernel) {
if ((err = set_kernel_filter(handle, &fcode)) == 0)
{
++++++ libpcap-0.9.8-mac_syntax.patch ++++++
--- /var/tmp/diff_new_pack.J13096/_old 2008-09-05 21:32:43.000000000 +0200
+++ /var/tmp/diff_new_pack.J13096/_new 2008-09-05 21:32:43.000000000 +0200
@@ -1,34 +1,14 @@
---- nametoaddr.c
-+++ nametoaddr.c
-@@ -410,7 +410,7 @@
- e = ep = (u_char *)malloc(6);
-
- while (*s) {
-- if (*s == ':')
-+ if (*s == ':' || *s == '.')
- s += 1;
- d = xdtoi(*s++);
- if (isxdigit((unsigned char)*s)) {
--- scanner.l
+++ scanner.l
-@@ -80,6 +80,7 @@
- N ([0-9]+|(0X|0x)[0-9A-Fa-f]+)
+@@ -81,6 +81,7 @@
B ([0-9A-Fa-f][0-9A-Fa-f]?)
+ B2 ([0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f])
W ([0-9A-Fa-f][0-9A-Fa-f]?[0-9A-Fa-f]?[0-9A-Fa-f]?)
+X [0-9A-Fa-f]
%a 18400
%o 21500
-@@ -310,7 +311,7 @@
- {N} { yylval.i = stoi((char *)yytext); return NUM; }
- ({N}\.{N})|({N}\.{N}\.{N})|({N}\.{N}\.{N}\.{N}) {
- yylval.s = sdup((char *)yytext); return HID; }
--{B}:{B}:{B}:{B}:{B}:{B} { yylval.e = pcap_ether_aton((char *)yytext);
-+({B}:{B}:{B}:{B}:{B}:{B})|({B}\.{B}\.{B}\.{B}\.{B}\.{B}) { yylval.e = pcap_ether_aton((char *)yytext);
- return EID; }
- {V6} {
- #ifdef INET6
-@@ -328,6 +329,8 @@
+@@ -341,6 +342,8 @@
#endif /*INET6*/
}
{B}:+({B}:+)+ { bpf_error("bogus ethernet address %s", yytext); }
++++++ libpcap-0.9.8-man.patch ++++++
--- /var/tmp/diff_new_pack.J13096/_old 2008-09-05 21:32:43.000000000 +0200
+++ /var/tmp/diff_new_pack.J13096/_new 2008-09-05 21:32:43.000000000 +0200
@@ -1,31 +1,11 @@
---- pcap.3
-+++ pcap.3
-@@ -215,7 +215,7 @@
- .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) .
- The name "-" in a synonym for
-@@ -437,7 +437,9 @@
- live capture, or all the packets in the file when reading a
- ``savefile''.
- .I callback
--specifies a routine to be called with three arguments:
-+specifies a
-+.I pcap_handler
-+routine to be called with three arguments:
- a
- .I u_char
- pointer which is passed in from
-@@ -1284,7 +1286,7 @@
- closes the ``savefile.''
- .PP
+--- pcap.3pcap
++++ pcap.3pcap
+@@ -363,7 +363,7 @@
+ 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(1)
+-autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(4), pfconfig(8),
++autoconf(1), tcpdump(8), tcpslice(1), pcap-filter(4), pfconfig(8),
+ usermod(1M)
.SH AUTHORS
- The original authors are:
- .LP
+ The original authors of libpcap are:
++++++ libpcap-0.9.8-pcap-bpf.patch ++++++
--- /var/tmp/diff_new_pack.J13096/_old 2008-09-05 21:32:43.000000000 +0200
+++ /var/tmp/diff_new_pack.J13096/_new 2008-09-05 21:32:43.000000000 +0200
@@ -1,6 +1,6 @@
---- pcap-bpf.h
-+++ pcap-bpf.h
-@@ -84,6 +84,25 @@
+--- pcap/bpf.h
++++ pcap/bpf.h
+@@ -83,6 +83,25 @@
#define BPF_MINBUFSIZE 32
/*
++++++ libpcap-0.9.8-ppp.patch ++++++
--- /var/tmp/diff_new_pack.J13096/_old 2008-09-05 21:32:43.000000000 +0200
+++ /var/tmp/diff_new_pack.J13096/_new 2008-09-05 21:32:43.000000000 +0200
@@ -1,6 +1,6 @@
--- gencode.c
+++ gencode.c
-@@ -6355,6 +6355,7 @@
+@@ -7233,6 +7233,7 @@
*/
switch (linktype) {
case DLT_SLIP:
++++++ libpcap-0.9.8-s390.patch ++++++
--- /var/tmp/diff_new_pack.J13096/_old 2008-09-05 21:32:43.000000000 +0200
+++ /var/tmp/diff_new_pack.J13096/_new 2008-09-05 21:32:43.000000000 +0200
@@ -1,12 +1,12 @@
--- pcap-linux.c
+++ pcap-linux.c
-@@ -1556,6 +1556,9 @@
- fatal_err = 1;
- break;
- }
-+ /* Hack to make things work on s390 ctc interfaces */
-+ if (strncmp("ctc", device, 3) == 0)
-+ handle->linktype = DLT_EN10MB;
- } else {
- /*
- * This is cooked mode.
+@@ -1752,6 +1752,9 @@
+ else
+ return 0; /* try old mechanism */
+ }
++ /* Hack to make things work on s390 ctc interfaces */
++ if (strncmp("ctc", device, 3) == 0)
++ handle->linktype = DLT_EN10MB;
+ } else {
+ /*
+ * This is cooked mode.
++++++ libpcap-0.9.8-shared.patch ++++++
--- /var/tmp/diff_new_pack.J13096/_old 2008-09-05 21:32:43.000000000 +0200
+++ /var/tmp/diff_new_pack.J13096/_new 2008-09-05 21:32:43.000000000 +0200
@@ -1,6 +1,6 @@
--- Makefile.in
+++ Makefile.in
-@@ -37,6 +37,14 @@
+@@ -38,6 +38,14 @@
srcdir = @srcdir@
VPATH = @srcdir@
@@ -15,7 +15,7 @@
#
# You shouldn't need to edit anything below.
#
-@@ -97,31 +105,22 @@
+@@ -98,7 +106,8 @@
TAGFILES = \
$(SRC) $(HDR) $(TAGHDR)
@@ -23,12 +23,18 @@
+LIBNAME = libpcap.so
+CLEANFILES = $(OBJ) libpcap.a $(LIBNAME)* $(GENSRC) $(GENHDR) lex.yy.c
+ MAN3PCAP = pcap.3pcap \
+ pcap_breakloop.3pcap \
+@@ -151,22 +160,20 @@
+ MAN4 = pcap-filter.4 \
+ pcap-linktype.4
+
-all: libpcap.a
+all: libpcap.a libpcap.so
libpcap.a: $(OBJ)
@rm -f $@
- ar rc $@ $(OBJ) $(LIBS)
+ $(AR) rc $@ $(OBJ) $(LIBS)
$(RANLIB) $@
-shared: libpcap.$(DYEXT)
@@ -40,23 +46,17 @@
libpcap.so: $(OBJ)
@rm -f $@
- $(CC) -shared -o $@.`cat VERSION` $(OBJ) $(DAGLIBS)
--
--# the following rule succeeds, but the result is untested.
--libpcap.dylib: $(OBJ)
-- rm -f libpcap*.dylib
-- $(CC) -dynamiclib -undefined error -o libpcap.`cat VERSION`.dylib $(OBJ) \
-- -install_name $(libdir)/libpcap.0.dylib -compatibility_version `cat VERSION` \
-- -current_version `cat VERSION`
+ $(CC) -shared -Wl,-soname -Wl,$@.$(MAJOR) -o $@.$(VERSION) $(OBJ)
+ @rm -f $@.$(MAJOR) $@
+ @ln -s $@.$(VERSION) $@.$(MAJOR)
+ @ln -s $@.$(VERSION) $@
++
-
- scanner.c: $(srcdir)/scanner.l
-@@ -172,11 +171,14 @@
- bpf_filter.o: bpf_filter.c
- $(CC) $(CFLAGS) -c bpf_filter.c
+ # the following rule succeeds, but the result is untested.
+ libpcap.dylib: $(OBJ)
+@@ -232,11 +239,14 @@
+ findalldevstest: findalldevstest.c libpcap.a
+ $(CC) $(CFLAGS) -I. -L. -o findalldevstest findalldevstest.c libpcap.a
-install: libpcap.a
+install: $(all)
@@ -70,20 +70,20 @@
+ @ln -sf $(LIBNAME).$(VERSION) $(DESTDIR)$(libdir)/$(LIBNAME)
[ -d $(DESTDIR)$(includedir) ] || \
(mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
- $(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h
-@@ -198,6 +200,7 @@
+ [ -d $(DESTDIR)$(includedir)/pcap ] || \
+@@ -294,6 +304,7 @@
uninstall:
rm -f $(DESTDIR)$(libdir)/libpcap.a
+ rm -f $(DESTDIR)$(libdir)/$(LIBNAME)*
- rm -f $(DESTDIR)$(includedir)/pcap.h
- rm -f $(DESTDIR)$(includedir)/pcap-bpf.h
- rm -f $(DESTDIR)$(includedir)/pcap-namedb.h
+ rm -f $(DESTDIR)$(includedir)/pcap/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.13 $)
+ AC_REVISION($Revision: 1.150 $)
AC_PREREQ(2.50)
-AC_INIT(pcap.c)
+AC_INIT([libpcap], [0.9.8])
@@ -91,7 +91,7 @@
AC_CANONICAL_SYSTEM
-@@ -58,7 +59,7 @@
+@@ -83,7 +84,7 @@
AC_CHECK_FUNCS(vsnprintf snprintf,,
[needsnprintf=yes])
if test $needsnprintf = yes; then
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org