From 0100e41f71ff76bfe79dea8df0265e0dcf8ef16d Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 30 Mar 2005 14:43:56 +0000
Subject: Make libpcap shared

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@476 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/libpcap/patches/100-shared-lib.patch       | 117 +++++++++++++++++++++
 .../libpcap/patches/101-cross-compile-fix.patch    |  11 ++
 package/libpcap/patches/102-alt-ether.patch        |  39 +++++++
 package/libpcap/patches/cross-compile-fix.patch    |  11 --
 4 files changed, 167 insertions(+), 11 deletions(-)
 create mode 100644 package/libpcap/patches/100-shared-lib.patch
 create mode 100644 package/libpcap/patches/101-cross-compile-fix.patch
 create mode 100644 package/libpcap/patches/102-alt-ether.patch
 delete mode 100644 package/libpcap/patches/cross-compile-fix.patch

(limited to 'package/libpcap/patches')

diff --git a/package/libpcap/patches/100-shared-lib.patch b/package/libpcap/patches/100-shared-lib.patch
new file mode 100644
index 0000000000..fbbef5b674
--- /dev/null
+++ b/package/libpcap/patches/100-shared-lib.patch
@@ -0,0 +1,117 @@
+--- libpcap-0.8.3-orig/Makefile.in	2003-12-15 02:42:23.000000000 +0100
++++ libpcap-0.8.3-7/Makefile.in	2005-03-08 03:38:22.000000000 +0100
+@@ -37,6 +37,15 @@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
++# some defines for shared library compilation
++MAJ=0.8
++MIN=3
++VERSION=$(MAJ).$(MIN)
++LIBNAME=pcap
++LIBRARY=lib$(LIBNAME).a
++SOLIBRARY=lib$(LIBNAME).so
++SHAREDLIB=$(SOLIBRARY).$(VERSION)
++
+ #
+ # You shouldn't need to edit anything below.
+ #
+@@ -49,6 +58,7 @@
+ 
+ # Standard CFLAGS
+ CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
++CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ)
+ 
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -68,7 +78,11 @@
+ # problem if you don't own the file but can write to the directory.
+ .c.o:
+ 	@rm -f $@
+-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
++	$(CC) $(CFLAGS) -c -o $@ $(srcdir)/$*.c
++
++%_pic.o: %.c
++	@rm -f $@
++	$(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c
+ 
+ PSRC =	pcap-@V_PCAP@.c
+ FSRC =  fad-@V_FINDALLDEVS@.c
+@@ -83,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)
++OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=_pic.o) $(CSRC:.c=_pic.o) $(SSRC:.c=_pic.o) $(GENSRC:.c=_pic.o)
+ HDR =	pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
+ 	ethertype.h gencode.h gnuc.h
+ GENHDR = \
+@@ -94,15 +109,22 @@
+ TAGFILES = \
+ 	$(SRC) $(HDR) $(TAGHDR)
+ 
+-CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
++CLEANFILES = $(OBJ) $(OBJ_PIC) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so*
+ 
+-all: libpcap.a
++all: libpcap.a $(SHAREDLIB)
+ 
+ libpcap.a: $(OBJ)
+ 	@rm -f $@
+ 	ar rc $@ $(OBJ) $(LIBS)
+ 	$(RANLIB) $@
+ 
++$(SHAREDLIB): $(OBJ_PIC)
++	-@rm -f $@
++	-@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ)
++	$(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc
++	ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ)
++	ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY)
++
+ scanner.c: $(srcdir)/scanner.l
+ 	@rm -f $@
+ 	$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
+@@ -110,6 +132,9 @@
+ scanner.o: scanner.c tokdefs.h
+ 	$(CC) $(CFLAGS) -c scanner.c
+ 
++scanner_pic.o: scanner.c tokdefs.h
++	$(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c
++
+ pcap.o: version.h
+ 
+ tokdefs.h: grammar.c
+@@ -123,9 +148,17 @@
+ 	@rm -f $@
+ 	$(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
+ 
++grammar_pic.o: grammar.c
++	@rm -f $@
++	$(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c 
++
+ version.o: version.c
+ 	$(CC) $(CFLAGS) -c version.c
+ 
++version_pic.o: version.c
++	$(CC) -fPIC $(CFLAGS) -c version.c -o $@
++
++
+ snprintf.o: $(srcdir)/missing/snprintf.c
+ 	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
+ 
+@@ -151,10 +184,16 @@
+ bpf_filter.o: bpf_filter.c
+ 	$(CC) $(CFLAGS) -c bpf_filter.c
+ 
++bpf_filter_pic.o: bpf_filter.c
++	$(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@
++
+ install:
+ 	[ -d $(DESTDIR)$(libdir) ] || \
+ 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
+ 	$(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
++	$(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/
++	ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ)
++	ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY)
+ 	$(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
+ 	[ -d $(DESTDIR)$(includedir) ] || \
+ 	    (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
diff --git a/package/libpcap/patches/101-cross-compile-fix.patch b/package/libpcap/patches/101-cross-compile-fix.patch
new file mode 100644
index 0000000000..196ee34eb3
--- /dev/null
+++ b/package/libpcap/patches/101-cross-compile-fix.patch
@@ -0,0 +1,11 @@
+--- libpcap-0.8.3/Makefile.in.orig	2005-01-17 19:04:41.291056960 -0500
++++ libpcap-0.8.3/Makefile.in	2005-01-17 19:04:47.836061968 -0500
+@@ -100,7 +100,7 @@
+ 
+ libpcap.a: $(OBJ)
+ 	@rm -f $@
+-	ar rc $@ $(OBJ) $(LIBS)
++	$(AR) rc $@ $(OBJ) $(LIBS)
+ 	$(RANLIB) $@
+ 
+ scanner.c: $(srcdir)/scanner.l
diff --git a/package/libpcap/patches/102-alt-ether.patch b/package/libpcap/patches/102-alt-ether.patch
new file mode 100644
index 0000000000..d5e010ec67
--- /dev/null
+++ b/package/libpcap/patches/102-alt-ether.patch
@@ -0,0 +1,39 @@
+--- libpcap-0.8.3-orig/nametoaddr.c	2003-11-19 19:13:48.000000000 +0100
++++ libpcap-0.8.3-7/nametoaddr.c	2005-03-08 03:38:22.000000000 +0100
+@@ -333,7 +333,7 @@
+ 	e = ep = (u_char *)malloc(6);
+ 
+ 	while (*s) {
+-		if (*s == ':')
++		if (*s == ':' || *s == '.')
+ 			s += 1;
+ 		d = xdtoi(*s++);
+ 		if (isxdigit((unsigned char)*s)) {
+--- libpcap-0.8.3-orig/scanner.l	2004-03-28 23:45:33.000000000 +0200
++++ libpcap-0.8.3-7/scanner.l	2005-03-08 03:38:22.000000000 +0100
+@@ -80,6 +80,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 16000
+ %o 19000
+@@ -296,7 +297,7 @@
+ {N}			{ yylval.i = stoi((char *)yytext); return NUM; }
+ ({N}\.{N})|({N}\.{N}\.{N})|({N}\.{N}\.{N}\.{N})	{
+ 			yylval.s = sdup((char *)yytext); return HID; }
+-{B}:{B}:{B}:{B}:{B}:{B} { yylval.e = pcap_ether_aton((char *)yytext);
++({B}:{B}:{B}:{B}:{B}:{B})|({B}\.{B}\.{B}\.{B}\.{B}\.{B}) { yylval.e = pcap_ether_aton((char *)yytext);
+ 			  return EID; }
+ {V6}			{
+ #ifdef INET6
+@@ -314,6 +315,8 @@
+ #endif /*INET6*/
+ 			}
+ {B}:+({B}:+)+		{ bpf_error("bogus ethernet address %s", yytext); }
++{X}{12}			{ yylval.e = pcap_ether_aton((char *)yytext); return EID;}
++
+ icmptype		{ yylval.i = 0; return NUM; }
+ icmpcode		{ yylval.i = 1; return NUM; }
+ icmp-echoreply		{ yylval.i = 0; return NUM; }
diff --git a/package/libpcap/patches/cross-compile-fix.patch b/package/libpcap/patches/cross-compile-fix.patch
deleted file mode 100644
index 196ee34eb3..0000000000
--- a/package/libpcap/patches/cross-compile-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpcap-0.8.3/Makefile.in.orig	2005-01-17 19:04:41.291056960 -0500
-+++ libpcap-0.8.3/Makefile.in	2005-01-17 19:04:47.836061968 -0500
-@@ -100,7 +100,7 @@
- 
- libpcap.a: $(OBJ)
- 	@rm -f $@
--	ar rc $@ $(OBJ) $(LIBS)
-+	$(AR) rc $@ $(OBJ) $(LIBS)
- 	$(RANLIB) $@
- 
- scanner.c: $(srcdir)/scanner.l
-- 
cgit v1.2.3