0.5

Changed files:
    libpcap-Makefile.patch -> 1.3
    libpcap-scanner.patch -> 1.2
    libpcap-shared.patch -> 1.2

diff --git a/libpcap-Makefile.patch b/libpcap-Makefile.patch
index 7b89aa43df718c9071c83cb28a66014df6c81aa2..bcc0de5bbfc6b236e26c5e253ff573466d1cc748 100644 (file)
--- a/libpcap-Makefile.patch
+++ b/libpcap-Makefile.patch
@@ -1,8 +1,7 @@
-diff -urN libpcap-0.4.orig/Makefile.in libpcap-0.4/Makefile.in
---- libpcap-0.4.orig/Makefile.in       Sat Jul  3 17:07:22 1999
-+++ libpcap-0.4/Makefile.in    Sat Jul  3 17:08:02 1999
-@@ -119,19 +119,19 @@
-       sed -e 's/.*/char pcap_version[] = "&";/' $(srcdir)/VERSION > $@
+--- libpcap_0_5rel2/Makefile.in.wiget  Thu Jul 13 16:09:22 2000
++++ libpcap_0_5rel2/Makefile.in        Thu Jul 13 16:10:54 2000
+@@ -126,19 +126,19 @@
+       $(CC) $(CFLAGS) -c $(srcdir)/bpf/net/bpf_filter.c -o bpf_filter.o
  
  install: force
 -      $(INSTALL) -m 444 -o bin -g bin libpcap.a $(DESTDIR)$(LIBDEST)/libpcap.a
@@ -16,8 +15,8 @@ diff -urN libpcap-0.4.orig/Makefile.in libpcap-0.4/Makefile.in
 -      $(INSTALL) -m 444 -o bin -g bin $(srcdir)/pcap-namedb.h \
 +      $(INSTALL) -m 444 $(srcdir)/pcap-namedb.h \
            $(DESTDIR)$(INCLDEST)/pcap-namedb.h
--      $(INSTALL) -m 444 -o bin -g bin $(srcdir)/net/bpf.h \
-+      $(INSTALL) -m 444 $(srcdir)/net/bpf.h \
+-      $(INSTALL) -m 444 -o bin -g bin $(srcdir)/bpf/net/bpf.h \
++      $(INSTALL) -m 444 $(srcdir)/bpf/net/bpf.h \
            $(DESTDIR)$(INCLDEST)/net/bpf.h
  
  install-man: force

diff --git a/libpcap-scanner.patch b/libpcap-scanner.patch
index 2d2bce8e32d74673e79f71627002283ce3b566a6..231dae72b2182308a1106ef7fae0aaeff0fdc124 100644 (file)
--- a/libpcap-scanner.patch
+++ b/libpcap-scanner.patch
@@ -1,6 +1,6 @@
---- libpcap-0.4a6.orig/nametoaddr.c
-+++ libpcap-0.4a6/nametoaddr.c
-@@ -283,7 +283,7 @@
+--- libpcap_0_5rel2/nametoaddr.c.wiget Thu Nov 25 09:25:35 1999
++++ libpcap_0_5rel2/nametoaddr.c       Thu Jul 13 16:31:19 2000
+@@ -308,7 +308,7 @@
        e = ep = (u_char *)malloc(6);
  
        while (*s) {
@@ -9,17 +9,17 @@
                        s += 1;
                d = xdtoi(*s++);
                if (isxdigit(*s)) {
---- libpcap-0.4a6.orig/scanner.l
-+++ libpcap-0.4a6/scanner.l
-@@ -76,6 +76,7 @@
- 
+--- libpcap_0_5rel2/scanner.l.wiget    Wed Nov 17 05:09:58 1999
++++ libpcap_0_5rel2/scanner.l  Thu Jul 13 16:30:01 2000
+@@ -82,6 +82,7 @@
  N             ([0-9]+|(0X|0x)[0-9A-Fa-f]+)
  B             ([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]?)
 +X             [0-9A-Fa-f]
  
- %a 3000
- 
-@@ -134,12 +135,16 @@
+ %a 15000
+ %o 17000
+@@ -235,7 +236,8 @@
  {N}                   { yylval.i = stoi((char *)yytext); return NUM; }
  ({N}\.{N})|({N}\.{N}\.{N})|({N}\.{N}\.{N}\.{N})       {
                        yylval.s = sdup((char *)yytext); return HID; }
@@ -27,13 +27,14 @@
 +({B}:{B}:{B}:{B}:{B}:{B})|({B}\.{B}\.{B}\.{B}\.{B}\.{B}) {
 +                        yylval.e = pcap_ether_aton((char *)yytext);
                          return EID; }
+ {V6}                  {
+ #ifdef INET6
+@@ -253,6 +255,8 @@
+ #endif /*INET6*/
+                       }
  {B}:+({B}:+)+         { bpf_error("bogus ethernet address %s", yytext); }
 +{X}{12}                       { yylval.e = pcap_ether_aton((char *)yytext); 
 +                        return EID; }
  [A-Za-z0-9][-_.A-Za-z0-9]*[.A-Za-z0-9] {
                         yylval.s = sdup((char *)yytext); return ID; }
  "\\"[^ !()\n\t]+      { yylval.s = sdup((char *)yytext + 1); return ID; }
-+
- [^ \[\]\t\n\-_.A-Za-z0-9!<>()&|=]+i {
-                       bpf_error("illegal token: %s\n", yytext); }
- .                     { bpf_error("illegal char '%c'", *yytext); }

diff --git a/libpcap-shared.patch b/libpcap-shared.patch
index d391828068d31d9338f33b2191291889d4e36e84..b529ec52cfdeb26d286698d3b62addef406a59b3 100644 (file)
--- a/libpcap-shared.patch
+++ b/libpcap-shared.patch
@@ -1,6 +1,5 @@
-diff -Nru libpcap-0.4/Makefile.in libpcap-0.4.new/Makefile.in
---- libpcap-0.4/Makefile.in    Sat Nov 27 03:36:49 1999
-+++ libpcap-0.4.new/Makefile.in        Sat Nov 27 03:34:41 1999
+--- libpcap_0_5rel2/Makefile.in.wiget  Thu Jul 13 16:43:30 2000
++++ libpcap_0_5rel2/Makefile.in        Thu Jul 13 16:46:35 2000
 @@ -35,12 +35,20 @@
  
  # VPATH
@@ -13,7 +12,7 @@ diff -Nru libpcap-0.4/Makefile.in libpcap-0.4.new/Makefile.in
  #
  
 +MAJ=0
-+MIN=4
++MIN=5
 +VERSION=$(MAJ).$(MIN)
 +LIBNAME=pcap
 +LIBRARY=lib$(LIBNAME).a
@@ -52,7 +51,7 @@ diff -Nru libpcap-0.4/Makefile.in libpcap-0.4.new/Makefile.in
  HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
        ethertype.h gencode.h gnuc.h
  GENHDR = \
-@@ -88,14 +102,21 @@
+@@ -88,21 +102,31 @@
  TAGFILES = \
        $(SRC) $(HDR) $(TAGHDR)
  
@@ -77,23 +76,45 @@ diff -Nru libpcap-0.4/Makefile.in libpcap-0.4.new/Makefile.in
  
  scanner.c: $(srcdir)/scanner.l
        @rm -f $@
-@@ -111,16 +132,22 @@
+       $(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
+ 
+ scanner.o: scanner.c tokdefs.h
+-      $(CC) $(CFLAGS) -c scanner.c
++      $(CC) $(CFLAGS) -c -o $@ scanner.c
++
++scanner_pic.o: scanner.c tokdefs.h
++      $(CC) -fPIC $(CFLAGS) -c -o $@ scanner.c
+ 
+ tokdefs.h: grammar.c
+ grammar.c: $(srcdir)/grammar.y
+@@ -113,10 +137,17 @@
  
  grammar.o: grammar.c
        @rm -f $@
 -      $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
 +      $(CC) $(CFLAGS) -Dyylval=pcap_lval -c -o $@ grammar.c
++      
 +grammar_pic.o: grammar.c
 +      @rm -f $@
 +      $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -c -o $@ grammar.c
-+
  
  version.o: version.c
+-      $(CC) $(CFLAGS) -c version.c
++      $(CC) $(CFLAGS) -c -o $@ version.c
++
++version_pic.o: version.c
++      $(CC) -fPIC $(CFLAGS) -c -o $@ version.c
+ 
  version.c: $(srcdir)/VERSION
        @rm -f $@
-       sed -e 's/.*/char pcap_version[] = "&";/' $(srcdir)/VERSION > $@
+@@ -125,9 +156,14 @@
+ bpf_filter.o: $(srcdir)/bpf/net/bpf_filter.c
+       $(CC) $(CFLAGS) -c $(srcdir)/bpf/net/bpf_filter.c -o bpf_filter.o
  
 -install: force
++bpf_filter_pic.o: $(srcdir)/bpf/net/bpf_filter.c
++      $(CC) -fPIC $(CFLAGS) -c $(srcdir)/bpf/net/bpf_filter.c -o bpf_filter_pic.o
++
 +install: $(LIBRARY) $(SHAREDLIB)
        $(INSTALL) -m 444 libpcap.a $(DESTDIR)$(LIBDEST)/libpcap.a
        $(RANLIB) $(DESTDIR)$(LIBDEST)/libpcap.a