瀏覽代碼

upgrading package: libpcap 1.0.0 -> 1.1

Ralf S. Engelschall 15 年之前
父節點
當前提交
1daa4f4c3b
共有 2 個文件被更改,包括 29 次插入7 次删除
  1. 25 4
      libpcap/libpcap.patch
  2. 4 3
      libpcap/libpcap.spec

+ 25 - 4
libpcap/libpcap.patch

@@ -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

+ 4 - 3
libpcap/libpcap.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        BASE
 Group:        Capturing
 License:      GPL
-Version:      1.0.0
-Release:      20090503
+Version:      1.1
+Release:      20100331
 
 #   list of sources
 Source0:      http://www.tcpdump.org/release/libpcap-%{version}.tar.gz
@@ -66,7 +66,8 @@ PreReq:       OpenPKG, openpkg >= 20100101
     GREP="grep" \
     ./configure \
         --prefix=%{l_prefix} \
-        --mandir=%{l_prefix}/man
+        --mandir=%{l_prefix}/man \
+        --disable-shared
     %{l_make} %{l_mflags -O}
 
 %install