[csw-devel] SF.net SVN: gar:[4239] csw/mgar/pkg/libpcap/trunk

hson at users.sourceforge.net hson at users.sourceforge.net
Thu Apr 9 04:42:30 CEST 2009


Revision: 4239
          http://gar.svn.sourceforge.net/gar/?rev=4239&view=rev
Author:   hson
Date:     2009-04-09 02:42:30 +0000 (Thu, 09 Apr 2009)

Log Message:
-----------
libpcap: Update to 0.9.8

Modified Paths:
--------------
    csw/mgar/pkg/libpcap/trunk/Makefile
    csw/mgar/pkg/libpcap/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff
    csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff

Removed Paths:
-------------
    csw/mgar/pkg/libpcap/trunk/files/solib.diff

Property Changed:
----------------
    csw/mgar/pkg/libpcap/trunk/


Property changes on: csw/mgar/pkg/libpcap/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/libpcap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpcap/trunk/Makefile	2009-04-09 02:08:32 UTC (rev 4238)
+++ csw/mgar/pkg/libpcap/trunk/Makefile	2009-04-09 02:42:30 UTC (rev 4239)
@@ -1,5 +1,5 @@
 GARNAME = libpcap
-GARVERSION = 0.8.3
+GARVERSION = 0.9.8
 CATEGORIES = lib
 
 DESCRIPTION = Libraries for network diagnostics
@@ -9,22 +9,29 @@
 
 MASTER_SITES = http://www.tcpdump.org/release/ 
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWlibpcap,)
 
+LICENSE = LICENSE
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 # Shared libraries patch
-PATCHFILES = solib.diff
+PATCHFILES  = Makefile.in.diff
+PATCHFILES += scanner.l.diff
 
 # No test target for libpcap
 TEST_SCRIPTS =
 
-CONFIGURE_ARGS = $(DIRPATHS)
+BUILD64 = 1
 
-INSTALL_OVERRIDE_DIRS = prefix exec_prefix includedir libdir mandir 
+EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv8plus+vis 
+EXTRA_BUILD_ISAS_i386  = pentium pentium_pro+mmx
 
+TEST_TARGET = check
+
+EXTRA_CFLAGS = -I.
+
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --enable-ipv6
+
 include gar/category.mk
-
-post-install:
-	rm -f $(DESTDIR)$(libdir)/$(GARNAME).a

Modified: csw/mgar/pkg/libpcap/trunk/checksums
===================================================================
--- csw/mgar/pkg/libpcap/trunk/checksums	2009-04-09 02:08:32 UTC (rev 4238)
+++ csw/mgar/pkg/libpcap/trunk/checksums	2009-04-09 02:42:30 UTC (rev 4239)
@@ -1,3 +1,3 @@
-56a9d4615d8354fcfe8cff8c8443c77b  download/libpcap-0.8.3.tar.gz
-a6d2e7614701143a2e4e905814fead77  download/CSWlibpcap.gspec
-0754daf384e4d107ef35ed2cb4e44f0e  download/solib.diff
+5208f24d0328ee7c20b52c43eaa9aa0e  download/libpcap-0.9.8.tar.gz
+d036716d6563bcad5fad70916f5c2c2e  download/Makefile.in.diff
+c0002322e0b90a3e9eed0b7ac9e6c050  download/scanner.l.diff

Added: csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff
===================================================================
--- csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff	                        (rev 0)
+++ csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff	2009-04-09 02:42:30 UTC (rev 4239)
@@ -0,0 +1,116 @@
+--- ../build-global/libpcap-0.9.8/Makefile.in	2007-07-24 04:35:15.000000000 +0200
++++ libpcap-0.9.8/Makefile.in	2009-04-09 04:07:28.839392745 +0200
+@@ -37,6 +37,15 @@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
++# some defines for shared library compilation - FIXME
++MAJ=0
++MIN=9.8
++VERSION=$(MAJ).$(MIN)
++LIBNAME=pcap
++LIBRARY=lib$(LIBNAME).a
++SOLIBRARY=lib$(LIBNAME).so
++SHAREDLIB=$(SOLIBRARY).$(VERSION)
++
+ #
+ # You shouldn't need to edit anything below.
+ #
+@@ -52,6 +61,7 @@
+ 
+ # Standard CFLAGS
+ CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
++CFLAGS_SHARED = -G $(LDFLAGS) -Wl,-h,$(SOLIBRARY).$(MAJ)
+ 
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -71,7 +81,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) -KPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c
+ 
+ PSRC =	pcap- at V_PCAP@.c
+ FSRC =  fad- at V_FINDALLDEVS@.c
+@@ -86,6 +100,8 @@
+ # 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 = \
+@@ -98,14 +114,22 @@
+ 	$(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)
++	- at rm -f $@
++	- at rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ)
++	$(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc
++	ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ)
++	ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY)
++
+ shared: libpcap.$(DYEXT)
+ 
+ #
+@@ -131,6 +155,9 @@
+ scanner.o: scanner.c tokdefs.h
+ 	$(CC) $(CFLAGS) -c scanner.c
+ 
++scanner_pic.o: scanner.c tokdefs.h
++	$(CC) -KPIC $(CFLAGS) -o $@ -c scanner.c
++
+ pcap.o: version.h
+ 
+ tokdefs.h: grammar.c
+@@ -144,9 +171,16 @@
+ 	@rm -f $@
+ 	$(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
+ 
++grammar_pic.o: grammar.c
++	@rm -f $@
++	$(CC) -KPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
++
+ version.o: version.c
+ 	$(CC) $(CFLAGS) -c version.c
+ 
++version_pic.o: version.c
++	$(CC) -KPIC $(CFLAGS) -o $@ -c version.c
++
+ snprintf.o: $(srcdir)/missing/snprintf.c
+ 	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
+ 
+@@ -172,10 +206,16 @@
+ bpf_filter.o: bpf_filter.c
+ 	$(CC) $(CFLAGS) -c bpf_filter.c
+ 
++bpf_filter_pic.o: bpf_filter.c
++	$(CC) -KPIC $(CFLAGS) -o $@ -c bpf_filter.c
++
+ install: libpcap.a 
+ 	[ -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))

Added: csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff
===================================================================
--- csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff	                        (rev 0)
+++ csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff	2009-04-09 02:42:30 UTC (rev 4239)
@@ -0,0 +1,11 @@
+--- ../build-global/libpcap-0.9.8/scanner.l	2007-06-11 21:34:28.000000000 +0200
++++ libpcap-0.9.8/scanner.l	2009-04-09 04:41:33.481612776 +0200
+@@ -32,6 +32,8 @@
+ #include <ctype.h>
+ #include <string.h>
+ 
++#include <stdlib.h> 
++
+ #include "pcap-int.h"
+ 
+ #include "gencode.h"

Deleted: csw/mgar/pkg/libpcap/trunk/files/solib.diff
===================================================================
--- csw/mgar/pkg/libpcap/trunk/files/solib.diff	2009-04-09 02:08:32 UTC (rev 4238)
+++ csw/mgar/pkg/libpcap/trunk/files/solib.diff	2009-04-09 02:42:30 UTC (rev 4239)
@@ -1,159 +0,0 @@
-diff --speed-large-files --minimal -Nru libpcap-0.7.1.orig/Makefile.in libpcap-0.7.1/Makefile.in
---- libpcap-0.7.1.orig/Makefile.in	2001-01-17 20:05:12.000000000 -0800
-+++ libpcap-0.7.1/Makefile.in	2003-07-28 14:12:12.837173000 -0700
-@@ -37,6 +37,15 @@
- srcdir = @srcdir@
- VPATH = @srcdir@
- 
-+# some defines for shared library compilation - FIXME
-+MAJ=0
-+MIN=7.1
-+VERSION=$(MAJ).$(MIN)
-+LIBNAME=pcap
-+LIBRARY=lib$(LIBNAME).a
-+SOLIBRARY=lib$(LIBNAME).so
-+SHAREDLIB=$(SOLIBRARY).$(VERSION)
-+
- #
- # You shouldn't need to edit anything below.
- #
-@@ -48,6 +57,7 @@
- 
- # Standard CFLAGS
- CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
-+CFLAGS_SHARED = -G -Wl,-h,$(SOLIBRARY).$(MAJ)
- 
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -67,7 +77,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) -KPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c
- 
- PSRC =	pcap- at V_PCAP@.c
- CSRC =	pcap.c inet.c gencode.c optimize.c nametoaddr.c \
-@@ -80,6 +94,8 @@
- # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
- # hack the extra indirection
- OBJ =	$(PSRC:.c=.o) $(CSRC:.c=.o) $(GENSRC:.c=.o) # $(LIBOBJS)
-+OBJ_PIC = $(PSRC:.c=_pic.o) $(CSRC:.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 = \
-@@ -91,15 +107,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)
- 	$(RANLIB) $@
- 
-+$(SHAREDLIB): $(OBJ_PIC)
-+	- at rm -f $@
-+	- at 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 $$$$.$@ $@
-@@ -107,6 +130,9 @@
- scanner.o: scanner.c tokdefs.h
- 	$(CC) $(CFLAGS) -c scanner.c
- 
-+scanner_pic.o: scanner.c tokdefs.h
-+	$(CC) -KPIC $(CFLAGS) -o $@ -c scanner.c
-+
- tokdefs.h: grammar.c
- grammar.c: $(srcdir)/grammar.y
- 	@rm -f grammar.c tokdefs.h
-@@ -118,9 +144,16 @@
- 	@rm -f $@
- 	$(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
- 
-+grammar_pic.o: grammar.c
-+	@rm -f $@
-+	$(CC) -KPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
-+
- version.o: version.c
- 	$(CC) $(CFLAGS) -c version.c
- 
-+version_pic.o: version.c
-+	$(CC) -KPIC $(CFLAGS) -o $@ -c version.c
-+
- snprintf.o: $(srcdir)/../tcpdump/missing/snprintf.c
- 	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/../tcpdump/missing/snprintf.c
- 
-@@ -135,31 +168,35 @@
- bpf_filter.o: bpf_filter.c
- 	$(CC) $(CFLAGS) -c bpf_filter.c
- 
-+bpf_filter_pic.o: bpf_filter.c
-+	$(CC) -KPIC $(CFLAGS) -o $@ -c bpf_filter.c
-+
- install:
--	[ -d $(DESTDIR)$(libdir) ] || \
--	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
--	$(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
--	$(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
--	[ -d $(DESTDIR)$(includedir) ] || \
--	    (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
--	$(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h
--	$(INSTALL_DATA) $(srcdir)/pcap-namedb.h \
--	    $(DESTDIR)$(includedir)/pcap-namedb.h
--	[ -d $(DESTDIR)$(includedir)/net ] || \
--	    (mkdir -p $(DESTDIR)$(includedir)/net; chmod 755 $(DESTDIR)$(includedir)/net)
--	$(INSTALL_DATA) $(srcdir)/bpf/net/bpf.h \
--	    $(DESTDIR)$(includedir)/net/bpf.h
--	[ -d $(DESTDIR)$(mandir)/man3 ] || \
--		(mkdir -p $(DESTDIR)$(mandir)/man3; chmod 755 $(DESTDIR)$(mandir)/man3)
--	$(INSTALL_DATA) $(srcdir)/pcap.3 \
--	    $(DESTDIR)$(mandir)/man3/pcap.3
-+	[ -d $(libdir) ] || \
-+		(mkdir -p $(libdir); chmod 755 $(libdir))
-+	$(INSTALL_DATA) libpcap.a $(libdir)/libpcap.a
-+	$(INSTALL_DATA) $(SHAREDLIB) $(libdir)/
-+	ln -sf $(SHAREDLIB) $(libdir)/$(SOLIBRARY).$(MAJ)
-+	ln -sf $(SOLIBRARY).$(MAJ) $(libdir)/$(SOLIBRARY)
-+	$(RANLIB) $(libdir)/libpcap.a
-+	[ -d $(includedir) ] || \
-+		(mkdir -p $(includedir); chmod 755 $(includedir))
-+	$(INSTALL_DATA) $(srcdir)/pcap.h $(includedir)/pcap.h
-+	$(INSTALL_DATA) $(srcdir)/pcap-namedb.h $(includedir)/pcap-namedb.h
-+	[ -d $(includedir)/net ] || \
-+		(mkdir -p $(includedir)/net; chmod 755 $(includedir)/net)
-+	$(INSTALL_DATA) $(srcdir)/bpf/net/bpf.h $(includedir)/net/bpf.h
-+	[ -d $(mandir)/man3 ] || \
-+		(mkdir -p $(mandir)/man3; chmod 755 $(mandir)/man3)
-+	$(INSTALL_DATA) $(srcdir)/pcap.3 $(mandir)/man3/pcap.3
-+
- 
- uninstall:
--	rm -f $(DESTDIR)$(libdir)/libpcap.a
--	rm -f $(DESTDIR)$(includedir)/pcap.h
--	rm -f $(DESTDIR)$(includedir)/pcap-namedb.h
--	rm -f $(DESTDIR)$(includedir)/net/bpf.h
--	rm -f $(DESTDIR)$(mandir)/man3/pcap.3
-+	rm -f $(libdir)/libpcap.a
-+	rm -f $(includedir)/pcap.h
-+	rm -f $(includedir)/pcap-namedb.h
-+	rm -f $(includedir)/net/bpf.h
-+	rm -f $(mandir)/man3/pcap.3
- 
- clean:
- 	rm -f $(CLEANFILES)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list