SOURCES: libpcap-shared.patch - updated to 0.9.4

qboosh qboosh at pld-linux.org
Thu Oct 13 13:02:20 CEST 2005


Author: qboosh                       Date: Thu Oct 13 11:02:20 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 0.9.4

---- Files affected:
SOURCES:
   libpcap-shared.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/libpcap-shared.patch
diff -u SOURCES/libpcap-shared.patch:1.4 SOURCES/libpcap-shared.patch:1.5
--- SOURCES/libpcap-shared.patch:1.4	Sat Jan  3 00:39:28 2004
+++ SOURCES/libpcap-shared.patch	Thu Oct 13 13:02:15 2005
@@ -1,5 +1,5 @@
---- libpcap-0.8.1/Makefile.in.orig	2003-12-15 02:42:23.000000000 +0100
-+++ libpcap-0.8.1/Makefile.in	2004-01-03 00:33:12.330707904 +0100
+--- libpcap-0.9.4/Makefile.in.orig	2003-12-15 02:35:03.000000000 +0100
++++ libpcap-0.9.4/Makefile.in	2005-10-13 12:17:30.000000000 +0200
 @@ -41,6 +41,14 @@
  # You shouldn't need to edit anything below.
  #
@@ -15,7 +15,7 @@
  CC = @CC@
  CCOPT = @V_CCOPT@
  INCLS = -I. @V_INCLS@
-@@ -49,6 +57,7 @@
+@@ -50,6 +58,7 @@
  
  # Standard CFLAGS
  CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
@@ -23,7 +23,7 @@
  
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -70,6 +79,10 @@
+@@ -71,6 +80,10 @@
  	@rm -f $@
  	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
  
@@ -34,7 +34,7 @@
  PSRC =	pcap- at V_PCAP@.c
  FSRC =  fad- at V_FINDALLDEVS@.c
  SSRC =  @SSRC@
-@@ -83,6 +96,7 @@
+@@ -84,6 +97,7 @@
  # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
  # hack the extra indirection
  OBJ =	$(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
@@ -42,7 +42,7 @@
  HDR =	pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
  	ethertype.h gencode.h gnuc.h
  GENHDR = \
-@@ -94,15 +108,22 @@
+@@ -95,15 +109,22 @@
  TAGFILES = \
  	$(SRC) $(HDR) $(TAGHDR)
  
@@ -65,10 +65,10 @@
 +	ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ)
 +	ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY)
 +
- scanner.c: $(srcdir)/scanner.l
- 	@rm -f $@
- 	$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
-@@ -110,6 +131,9 @@
+ shared: libpcap.$(DYEXT)
+ 
+ #
+@@ -129,6 +150,9 @@
  scanner.o: scanner.c tokdefs.h
  	$(CC) $(CFLAGS) -c scanner.c
  
@@ -78,7 +78,7 @@
  pcap.o: version.h
  
  tokdefs.h: grammar.c
-@@ -123,12 +147,22 @@
+@@ -142,12 +166,22 @@
  	@rm -f $@
  	$(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
  
@@ -101,11 +101,11 @@
  version.c: $(srcdir)/VERSION
  	@rm -f $@
  	sed -e 's/.*/char pcap_version[] = "&";/' $(srcdir)/VERSION > $@
-@@ -151,11 +185,16 @@
+@@ -170,11 +204,16 @@
  bpf_filter.o: bpf_filter.c
  	$(CC) $(CFLAGS) -c bpf_filter.c
  
--install:
+-install: libpcap.a 
 +bpf_filter_pic.o: bpf_filter.c
 +	$(CC) -fPIC $(CFLAGS) -o $@ -c bpf_filter.c
 +
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/libpcap-shared.patch?r1=1.4&r2=1.5&f=u




More information about the pld-cvs-commit mailing list