From 991abe31bbfd68f4673aaaffa29016c9aee19be1b2fec0d85c4ae965d4277de3 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 19 Jan 2009 01:22:34 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libpcap?expand=0&rev=13 --- baselibs.conf | 2 +- libpcap-0.9.8-shared.patch | 102 ------------------ libpcap-0.9.8_CVS20080503.tar.bz2 | 3 - ...8-fcode.patch => libpcap-1.0.0-fcode.patch | 0 ...ix.patch => libpcap-1.0.0-filter-fix.patch | 0 ...ax.patch => libpcap-1.0.0-mac_syntax.patch | 0 ...0.9.8-man.patch => libpcap-1.0.0-man.patch | 8 +- ...-bpf.patch => libpcap-1.0.0-pcap-bpf.patch | 0 ...0.9.8-ppp.patch => libpcap-1.0.0-ppp.patch | 0 ...9.8-s390.patch => libpcap-1.0.0-s390.patch | 0 libpcap-1.0.0.tar.bz2 | 3 + libpcap.changes | 35 ++++++ libpcap.spec | 89 ++++++++++----- 13 files changed, 103 insertions(+), 139 deletions(-) delete mode 100644 libpcap-0.9.8-shared.patch delete mode 100644 libpcap-0.9.8_CVS20080503.tar.bz2 rename libpcap-0.9.8-fcode.patch => libpcap-1.0.0-fcode.patch (100%) rename libpcap-0.9.8-filter-fix.patch => libpcap-1.0.0-filter-fix.patch (100%) rename libpcap-0.9.8-mac_syntax.patch => libpcap-1.0.0-mac_syntax.patch (100%) rename libpcap-0.9.8-man.patch => libpcap-1.0.0-man.patch (52%) rename libpcap-0.9.8-pcap-bpf.patch => libpcap-1.0.0-pcap-bpf.patch (100%) rename libpcap-0.9.8-ppp.patch => libpcap-1.0.0-ppp.patch (100%) rename libpcap-0.9.8-s390.patch => libpcap-1.0.0-s390.patch (100%) create mode 100644 libpcap-1.0.0.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index 50b6239..7dd1541 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libpcap0 +libpcap1 diff --git a/libpcap-0.9.8-shared.patch b/libpcap-0.9.8-shared.patch deleted file mode 100644 index 5b3a233..0000000 --- a/libpcap-0.9.8-shared.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- Makefile.in -+++ Makefile.in -@@ -38,6 +38,14 @@ - srcdir = @srcdir@ - VPATH = @srcdir@ - -+### -+# pcaplib 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. - # -@@ -98,7 +106,8 @@ - TAGFILES = \ - $(SRC) $(HDR) $(TAGHDR) - --CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c -+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) - $(RANLIB) $@ - --shared: libpcap.$(DYEXT) -- --# --# XXX - this works with GNU ld, but won't necessarily work with native --# ld on, for example, various SVR4-flavored platforms, or Digital UNIX. --# - libpcap.so: $(OBJ) - @rm -f $@ -- $(CC) -shared -o $@.`cat VERSION` $(OBJ) $(DAGLIBS) -+ $(CC) -shared -Wl,-soname -Wl,$@.$(MAJOR) -o $@.$(VERSION) $(OBJ) -+ @rm -f $@.$(MAJOR) $@ -+ @ln -s $@.$(VERSION) $@.$(MAJOR) -+ @ln -s $@.$(VERSION) $@ -+ - - # 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) - [ -d $(DESTDIR)$(libdir) ] || \ - (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) -- $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a -+ $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/ - $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a -+ $(INSTALL_PROGRAM) $(LIBNAME).$(VERSION) $(DESTDIR)$(libdir)/ -+ @ln -sf $(LIBNAME).$(VERSION) $(DESTDIR)$(libdir)/$(LIBNAME).$(MAJOR) -+ @ln -sf $(LIBNAME).$(VERSION) $(DESTDIR)$(libdir)/$(LIBNAME) - [ -d $(DESTDIR)$(includedir) ] || \ - (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) - [ -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/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.150 $) - AC_PREREQ(2.50) --AC_INIT(pcap.c) -+AC_INIT([libpcap], [0.9.8]) -+AC_CONFIG_SRCDIR([pcap.c]) - - AC_CANONICAL_SYSTEM - -@@ -83,7 +84,7 @@ - AC_CHECK_FUNCS(vsnprintf snprintf,, - [needsnprintf=yes]) - if test $needsnprintf = yes; then -- AC_LIBOBJ(snprintf) -+ AC_LIBOBJ([snprintf]) - fi - - # diff --git a/libpcap-0.9.8_CVS20080503.tar.bz2 b/libpcap-0.9.8_CVS20080503.tar.bz2 deleted file mode 100644 index f4d0529..0000000 --- a/libpcap-0.9.8_CVS20080503.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74091c1ed933e490a02f6ba64333ff065f032a01fc98f4fc6c91dfd4b3d749ad -size 443895 diff --git a/libpcap-0.9.8-fcode.patch b/libpcap-1.0.0-fcode.patch similarity index 100% rename from libpcap-0.9.8-fcode.patch rename to libpcap-1.0.0-fcode.patch diff --git a/libpcap-0.9.8-filter-fix.patch b/libpcap-1.0.0-filter-fix.patch similarity index 100% rename from libpcap-0.9.8-filter-fix.patch rename to libpcap-1.0.0-filter-fix.patch diff --git a/libpcap-0.9.8-mac_syntax.patch b/libpcap-1.0.0-mac_syntax.patch similarity index 100% rename from libpcap-0.9.8-mac_syntax.patch rename to libpcap-1.0.0-mac_syntax.patch diff --git a/libpcap-0.9.8-man.patch b/libpcap-1.0.0-man.patch similarity index 52% rename from libpcap-0.9.8-man.patch rename to libpcap-1.0.0-man.patch index 37d75ad..58bf6ec 100644 --- a/libpcap-0.9.8-man.patch +++ b/libpcap-1.0.0-man.patch @@ -1,11 +1,11 @@ ---- pcap.3pcap -+++ pcap.3pcap +--- pcap.3pcap.in ++++ pcap.3pcap.in @@ -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 --autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(4), pfconfig(8), -+autoconf(1), tcpdump(8), tcpslice(1), pcap-filter(4), pfconfig(8), +-autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8), ++autoconf(1), tcpdump(8), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8), usermod(1M) .SH AUTHORS The original authors of libpcap are: diff --git a/libpcap-0.9.8-pcap-bpf.patch b/libpcap-1.0.0-pcap-bpf.patch similarity index 100% rename from libpcap-0.9.8-pcap-bpf.patch rename to libpcap-1.0.0-pcap-bpf.patch diff --git a/libpcap-0.9.8-ppp.patch b/libpcap-1.0.0-ppp.patch similarity index 100% rename from libpcap-0.9.8-ppp.patch rename to libpcap-1.0.0-ppp.patch diff --git a/libpcap-0.9.8-s390.patch b/libpcap-1.0.0-s390.patch similarity index 100% rename from libpcap-0.9.8-s390.patch rename to libpcap-1.0.0-s390.patch diff --git a/libpcap-1.0.0.tar.bz2 b/libpcap-1.0.0.tar.bz2 new file mode 100644 index 0000000..1ff1a15 --- /dev/null +++ b/libpcap-1.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0a590014eb2ac2367eda2cadcc1d4285d7e5054609f8f3aa17cfc057bd7a3ec +size 423995 diff --git a/libpcap.changes b/libpcap.changes index ff19b87..f8ee143 100644 --- a/libpcap.changes +++ b/libpcap.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Wed Jan 14 16:38:27 CET 2009 - prusnak@suse.cz + +- updated to 1.0.0 + * Compile with IPv6 support by default + * Compile with large file support on by default + * Add pcap-config script, which deals with -I/-L flags + for compiling + * DLT: Add IPMB + * DLT: Add LAPD + * DLT: Add AX25 (AX.25 w/KISS header) + * DLT: Add JUNIPER_ST + * 802.15.4 support + * Variable length 802.11 header support + * X2E data type support + * SITA ACN Interface support - see README.sita + * Support for zerocopy BPF on platforms that support it + * Better support for dealing with VLAN tagging/stripping on Linux + * Fix dynamic library support on OSX + * Return PCAP_ERROR_IFACE_NOT_UP if the interface isn't 'UP', so + applications can print better diagnostic information + * Return PCAP_ERROR_PERM_DENIED if we don't have permission to open + a device, so applications can tell the user they need to go play + with permissions + * On Linux, ignore ENETDOWN so we can continue to capture packets + if the interface goes down and comes back up again. + * On Linux, support new tpacket frame headers (2.6.27+) + * On Mac OS X, add scripts for changing permissions on /dev/pbf* and + launchd plist + * On Solaris, support 'passive mode' on systems that support it + * Fixes to autoconf and general build environment + * Man page reorganization + cleanup + * Autogenerate VERSION numbers better +- dropped obsoleted shared.patch + ------------------------------------------------------------------- Tue Jan 13 12:34:56 CET 2009 - olh@suse.de diff --git a/libpcap.spec b/libpcap.spec index a7ebb93..ad93f0f 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -1,5 +1,5 @@ # -# spec file for package libpcap (Version 0.9.8) +# spec file for package libpcap (Version 1.0.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,22 +19,20 @@ Name: libpcap -Version: 0.9.8 -Release: 48 -AutoReqProv: on +Version: 1.0.0 +Release: 1 Group: System/Libraries License: BSD 3-Clause Url: http://www.tcpdump.org/ Summary: A Library for Network Sniffers -Source: %{name}-0.9.8_CVS20080503.tar.bz2 -Patch0: %{name}-%{version}-shared.patch -Patch1: %{name}-%{version}-filter-fix.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 +Source: %{name}-%{version}.tar.bz2 +Patch0: %{name}-%{version}-filter-fix.patch +Patch1: %{name}-%{version}-fcode.patch +Patch2: %{name}-%{version}-pcap-bpf.patch +Patch3: %{name}-%{version}-ppp.patch +Patch4: %{name}-%{version}-s390.patch +Patch5: %{name}-%{version}-man.patch +Patch6: %{name}-%{version}-mac_syntax.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison bluez-devel flex @@ -59,7 +57,7 @@ Authors: Craig Leres Van Jacobson -%package -n libpcap0 +%package -n libpcap1 License: BSD 3-Clause Summary: A Library for Network Sniffers Group: System/Libraries @@ -71,7 +69,7 @@ Obsoletes: libpcap-64bit Provides: libpcap = %{version} Obsoletes: libpcap < %{version} -%description -n libpcap0 +%description -n libpcap1 libpcap is a library used by packet sniffer programs. It provides an interface for them to capture and analyze packets from network devices. This package is only needed if you plan to compile or write such a @@ -96,7 +94,7 @@ Authors: License: BSD 3-Clause Summary: A Library for Network Sniffers Group: Development/Libraries/C and C++ -Requires: libpcap0 = %{version} +Requires: libpcap1 = %{version} %description devel libpcap is a library used by packet sniffer programs. It provides an @@ -120,8 +118,7 @@ Authors: Van Jacobson %prep -%setup -q -n %{name}-0.9.8_CVS20080503 -find -depth -name CVS -exec rm -rf {} \; +%setup -q %patch0 %patch1 %patch2 @@ -129,40 +126,74 @@ find -depth -name CVS -exec rm -rf {} \; %patch4 %patch5 %patch6 -%patch7 %build -%{suse_update_config -f} -autoreconf -fi export CFLAGS="$RPM_OPT_FLAGS -fpic" CXXFLAGS="$RPM_OPT_FLAGS -fpic" %configure \ - --enable-ipv6 -make VERSION=%{version} + --enable-ipv6 +make all shared %install -make DESTDIR=$RPM_BUILD_ROOT install +mkdir -p $RPM_BUILD_ROOT%{_bindir} +make DESTDIR=$RPM_BUILD_ROOT install install-shared +# create symlinks +ln -s %{name}.so.%{version} $RPM_BUILD_ROOT%{_libdir}/%{name}.so.1.0 +ln -s %{name}.so.%{version} $RPM_BUILD_ROOT%{_libdir}/%{name}.so.1 +ln -s %{name}.so.%{version} $RPM_BUILD_ROOT%{_libdir}/%{name}.so %clean rm -rf $RPM_BUILD_ROOT -%post -n libpcap0 -p /sbin/ldconfig +%post -n libpcap1 -p /sbin/ldconfig -%postun -n libpcap0 -p /sbin/ldconfig +%postun -n libpcap1 -p /sbin/ldconfig -%files -n libpcap0 +%files -n libpcap1 %defattr(-, root, root) -%doc README README.linux CHANGES CREDITS LICENSE TODO +%doc CHANGES CREDITS LICENSE README README.linux TODO %{_libdir}/*.so.* %files devel %defattr(-, root, root) -%doc doc/* %doc %{_mandir}/man?/* %{_includedir}/* +%{_bindir}/pcap-config %{_libdir}/*.so %{_libdir}/*.*a %changelog +* Wed Jan 14 2009 prusnak@suse.cz +- updated to 1.0.0 + * Compile with IPv6 support by default + * Compile with large file support on by default + * Add pcap-config script, which deals with -I/-L flags + for compiling + * DLT: Add IPMB + * DLT: Add LAPD + * DLT: Add AX25 (AX.25 w/KISS header) + * DLT: Add JUNIPER_ST + * 802.15.4 support + * Variable length 802.11 header support + * X2E data type support + * SITA ACN Interface support - see README.sita + * Support for zerocopy BPF on platforms that support it + * Better support for dealing with VLAN tagging/stripping on Linux + * Fix dynamic library support on OSX + * Return PCAP_ERROR_IFACE_NOT_UP if the interface isn't 'UP', so + applications can print better diagnostic information + * Return PCAP_ERROR_PERM_DENIED if we don't have permission to open + a device, so applications can tell the user they need to go play + with permissions + * On Linux, ignore ENETDOWN so we can continue to capture packets + if the interface goes down and comes back up again. + * On Linux, support new tpacket frame headers (2.6.27+) + * On Mac OS X, add scripts for changing permissions on /dev/pbf* and + launchd plist + * On Solaris, support 'passive mode' on systems that support it + * Fixes to autoconf and general build environment + * Man page reorganization + cleanup + * Autogenerate VERSION numbers better +- dropped obsoleted shared.patch * Tue Jan 13 2009 olh@suse.de - obsolete old -XXbit packages (bnc#437293) * Mon Sep 15 2008 dmueller@suse.de