Wed, 08 Aug 2012 20:24:57 +0200
Resynchronize with upstream package maintainer version.
libpcap/libpcap.patch | file | annotate | diff | comparison | revisions | |
libpcap/libpcap.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/libpcap/libpcap.patch Wed Aug 08 20:15:17 2012 +0200 1.2 +++ b/libpcap/libpcap.patch Wed Aug 08 20:24:57 2012 +0200 1.3 @@ -1,8 +1,29 @@ 1.4 +Index: Makefile.in 1.5 +--- Makefile.in.orig 2010-03-12 02:56:53.000000000 +0100 1.6 ++++ Makefile.in 2010-03-31 09:50:02.000000000 +0200 1.7 +@@ -324,7 +324,7 @@ 1.8 + Win32/Src/inet_net.c \ 1.9 + Win32/Src/inet_pton.c 1.10 + 1.11 +-all: libpcap.a shared pcap-config 1.12 ++all: libpcap.a pcap-config 1.13 + 1.14 + libpcap.a: $(OBJ) 1.15 + @rm -f $@ 1.16 +@@ -497,7 +497,7 @@ 1.17 + opentest: opentest.c libpcap.a 1.18 + $(CC) $(CFLAGS) -I. -L. -o opentest $(srcdir)/opentest.c libpcap.a $(LIBS) 1.19 + 1.20 +-install: install-shared install-archive pcap-config 1.21 ++install: install-archive pcap-config 1.22 + [ -d $(DESTDIR)$(libdir) ] || \ 1.23 + (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) 1.24 + [ -d $(DESTDIR)$(includedir) ] || \ 1.25 Index: scanner.l 1.26 ---- scanner.l.orig 2007-06-11 21:34:28 +0200 1.27 -+++ scanner.l 2007-12-19 10:56:36 +0100 1.28 -@@ -81,13 +81,6 @@ 1.29 - B ([0-9A-Fa-f][0-9A-Fa-f]?) 1.30 +--- scanner.l.orig 2010-03-12 02:56:54.000000000 +0100 1.31 ++++ scanner.l 2010-03-31 09:46:58.000000000 +0200 1.32 +@@ -96,13 +96,6 @@ 1.33 + B2 ([0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]) 1.34 W ([0-9A-Fa-f][0-9A-Fa-f]?[0-9A-Fa-f]?[0-9A-Fa-f]?) 1.35 1.36 -%a 18400
2.1 --- a/libpcap/libpcap.spec Wed Aug 08 20:15:17 2012 +0200 2.2 +++ b/libpcap/libpcap.spec Wed Aug 08 20:24:57 2012 +0200 2.3 @@ -1,6 +1,6 @@ 2.4 ## 2.5 ## libpcap.spec -- OpenPKG RPM Package Specification 2.6 -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/> 2.7 +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/> 2.8 ## 2.9 ## Permission to use, copy, modify, and distribute this software for 2.10 ## any purpose with or without fee is hereby granted, provided that 2.11 @@ -21,6 +21,10 @@ 2.12 ## SUCH DAMAGE. 2.13 ## 2.14 2.15 +# package version 2.16 +%define V_tarball 1.3.0 2.17 +%define V_subdir 1.3.0 2.18 + 2.19 # package information 2.20 Name: libpcap 2.21 Summary: Network Packet Capture Library 2.22 @@ -31,20 +35,16 @@ 2.23 Class: BASE 2.24 Group: Capturing 2.25 License: GPL 2.26 -Version: 1.0.0 2.27 -Release: 20090106 2.28 +Version: %{V_tarball} 2.29 +Release: 20120613 2.30 2.31 # list of sources 2.32 -Source0: http://www.tcpdump.org/release/libpcap-%{version}.tar.gz 2.33 +Source0: http://www.tcpdump.org/release/libpcap-%{V_tarball}.tar.gz 2.34 Patch0: libpcap.patch 2.35 2.36 # build information 2.37 -Prefix: %{l_prefix} 2.38 -BuildRoot: %{l_buildroot} 2.39 -BuildPreReq: OpenPKG, openpkg >= 20040130, make, bison, flex 2.40 -PreReq: OpenPKG, openpkg >= 20040130 2.41 -AutoReq: no 2.42 -AutoReqProv: no 2.43 +BuildPreReq: OpenPKG, openpkg >= 20100101, bison, flex 2.44 +PreReq: OpenPKG, openpkg >= 20100101 2.45 2.46 %description 2.47 libpcap provides a portable framework for low-level network monitoring and 2.48 @@ -55,35 +55,26 @@ 2.49 2.50 %track 2.51 prog libpcap = { 2.52 - version = %{version} 2.53 - url = http://www.tcpdump.org/release/ 2.54 + version = %{V_tarball} 2.55 + url = http://www.tcpdump.org/ 2.56 regex = libpcap-(__VER__)\.tar\.gz 2.57 } 2.58 2.59 %prep 2.60 - %setup -q 2.61 + %setup -q -n libpcap-%{V_subdir} 2.62 %patch -p0 2.63 - %{l_shtool} subst \ 2.64 - -e 's;for ac_header in$;for ac_header in broken;' \ 2.65 - configure 2.66 2.67 %build 2.68 - case "%{l_platform -t}" in 2.69 - *-sunos* ) 2.70 - ( echo "ac_cv_lib_dlpi_dlpi_walk=no" 2.71 - ) >config.cache 2.72 - ;; 2.73 - esac 2.74 CC="%{l_cc}" \ 2.75 CFLAGS="%{l_cflags -O}" \ 2.76 + GREP="grep" \ 2.77 ./configure \ 2.78 - --cache-file=./config.cache \ 2.79 --prefix=%{l_prefix} \ 2.80 - --mandir=%{l_prefix}/man 2.81 + --mandir=%{l_prefix}/man \ 2.82 + --disable-shared 2.83 %{l_make} %{l_mflags -O} 2.84 2.85 %install 2.86 - rm -rf $RPM_BUILD_ROOT 2.87 %{l_shtool} mkdir -f -p -m 755 \ 2.88 $RPM_BUILD_ROOT%{l_prefix}/bin \ 2.89 $RPM_BUILD_ROOT%{l_prefix}/man/man3 2.90 @@ -96,5 +87,4 @@ 2.91 %files -f files 2.92 2.93 %clean 2.94 - rm -rf $RPM_BUILD_ROOT 2.95