# HG changeset patch # User Michael Schloh von Bennewitz # Date 1344450297 -7200 # Node ID 0bcf858a6152374c58b75cbdf42b2b827c3e446e # Parent 76a25ceeb6bf07a66446094ae171a07e0d664338 Resynchronize with upstream package maintainer version. diff -r 76a25ceeb6bf -r 0bcf858a6152 libpcap/libpcap.patch --- a/libpcap/libpcap.patch Wed Aug 08 20:15:17 2012 +0200 +++ b/libpcap/libpcap.patch Wed Aug 08 20:24:57 2012 +0200 @@ -1,8 +1,29 @@ +Index: Makefile.in +--- Makefile.in.orig 2010-03-12 02:56:53.000000000 +0100 ++++ Makefile.in 2010-03-31 09:50:02.000000000 +0200 +@@ -324,7 +324,7 @@ + Win32/Src/inet_net.c \ + Win32/Src/inet_pton.c + +-all: libpcap.a shared pcap-config ++all: libpcap.a pcap-config + + libpcap.a: $(OBJ) + @rm -f $@ +@@ -497,7 +497,7 @@ + opentest: opentest.c libpcap.a + $(CC) $(CFLAGS) -I. -L. -o opentest $(srcdir)/opentest.c libpcap.a $(LIBS) + +-install: install-shared install-archive pcap-config ++install: install-archive pcap-config + [ -d $(DESTDIR)$(libdir) ] || \ + (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) + [ -d $(DESTDIR)$(includedir) ] || \ Index: scanner.l ---- scanner.l.orig 2007-06-11 21:34:28 +0200 -+++ scanner.l 2007-12-19 10:56:36 +0100 -@@ -81,13 +81,6 @@ - B ([0-9A-Fa-f][0-9A-Fa-f]?) +--- scanner.l.orig 2010-03-12 02:56:54.000000000 +0100 ++++ scanner.l 2010-03-31 09:46:58.000000000 +0200 +@@ -96,13 +96,6 @@ + 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]?) -%a 18400 diff -r 76a25ceeb6bf -r 0bcf858a6152 libpcap/libpcap.spec --- a/libpcap/libpcap.spec Wed Aug 08 20:15:17 2012 +0200 +++ b/libpcap/libpcap.spec Wed Aug 08 20:24:57 2012 +0200 @@ -1,6 +1,6 @@ ## ## libpcap.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -21,6 +21,10 @@ ## SUCH DAMAGE. ## +# package version +%define V_tarball 1.3.0 +%define V_subdir 1.3.0 + # package information Name: libpcap Summary: Network Packet Capture Library @@ -31,20 +35,16 @@ Class: BASE Group: Capturing License: GPL -Version: 1.0.0 -Release: 20090106 +Version: %{V_tarball} +Release: 20120613 # list of sources -Source0: http://www.tcpdump.org/release/libpcap-%{version}.tar.gz +Source0: http://www.tcpdump.org/release/libpcap-%{V_tarball}.tar.gz Patch0: libpcap.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, make, bison, flex -PreReq: OpenPKG, openpkg >= 20040130 -AutoReq: no -AutoReqProv: no +BuildPreReq: OpenPKG, openpkg >= 20100101, bison, flex +PreReq: OpenPKG, openpkg >= 20100101 %description libpcap provides a portable framework for low-level network monitoring and @@ -55,35 +55,26 @@ %track prog libpcap = { - version = %{version} - url = http://www.tcpdump.org/release/ + version = %{V_tarball} + url = http://www.tcpdump.org/ regex = libpcap-(__VER__)\.tar\.gz } %prep - %setup -q + %setup -q -n libpcap-%{V_subdir} %patch -p0 - %{l_shtool} subst \ - -e 's;for ac_header in$;for ac_header in broken;' \ - configure %build - case "%{l_platform -t}" in - *-sunos* ) - ( echo "ac_cv_lib_dlpi_dlpi_walk=no" - ) >config.cache - ;; - esac CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ + GREP="grep" \ ./configure \ - --cache-file=./config.cache \ --prefix=%{l_prefix} \ - --mandir=%{l_prefix}/man + --mandir=%{l_prefix}/man \ + --disable-shared %{l_make} %{l_mflags -O} %install - rm -rf $RPM_BUILD_ROOT %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/bin \ $RPM_BUILD_ROOT%{l_prefix}/man/man3 @@ -96,5 +87,4 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT