[csw-devel] SF.net SVN: gar:[6597] csw/mgar/pkg/libpcap/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Mon Sep 28 16:49:34 CEST 2009
Revision: 6597
http://gar.svn.sourceforge.net/gar/?rev=6597&view=rev
Author: dmichelsen
Date: 2009-09-28 14:49:31 +0000 (Mon, 28 Sep 2009)
Log Message:
-----------
libpcap: Update to 1.0.0
Modified Paths:
--------------
csw/mgar/pkg/libpcap/trunk/Makefile
csw/mgar/pkg/libpcap/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff
csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff
Modified: csw/mgar/pkg/libpcap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-28 13:58:17 UTC (rev 6596)
+++ csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-28 14:49:31 UTC (rev 6597)
@@ -1,5 +1,5 @@
GARNAME = libpcap
-GARVERSION = 0.9.8
+GARVERSION = 1.0.0
CATEGORIES = lib
DESCRIPTION = Libraries for network diagnostics
@@ -15,9 +15,12 @@
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+PATCHFILES = sf-bugtrack-2224954-fix-autoconf-header.diff
+PATCHFILES += sf-bugtrack-2504874-create-dir-patch.diff
+
# Shared libraries patch
-PATCHFILES = Makefile.in.diff
-PATCHFILES += scanner.l.diff
+#PATCHFILES = Makefile.in.diff
+#PATCHFILES += scanner.l.diff
# No test target for libpcap
TEST_SCRIPTS =
Modified: csw/mgar/pkg/libpcap/trunk/checksums
===================================================================
--- csw/mgar/pkg/libpcap/trunk/checksums 2009-09-28 13:58:17 UTC (rev 6596)
+++ csw/mgar/pkg/libpcap/trunk/checksums 2009-09-28 14:49:31 UTC (rev 6597)
@@ -1,3 +1,2 @@
-5208f24d0328ee7c20b52c43eaa9aa0e download/libpcap-0.9.8.tar.gz
-d036716d6563bcad5fad70916f5c2c2e download/Makefile.in.diff
-c0002322e0b90a3e9eed0b7ac9e6c050 download/scanner.l.diff
+e2396bd0e71b247413ea26ced5ca923f download/fix-autoconf-header.diff
+9ad1358c5dec48456405eac197a46d3d download/libpcap-1.0.0.tar.gz
Added: csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff
===================================================================
--- csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff (rev 0)
+++ csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff 2009-09-28 14:49:31 UTC (rev 6597)
@@ -0,0 +1,172 @@
+diff -Naur libpcap-1.0.0.orig/Makefile.in libpcap-1.0.0.patched/Makefile.in
+--- libpcap-1.0.0.orig/Makefile.in 2008-10-28 02:26:13.000000000 +0100
++++ libpcap-1.0.0.patched/Makefile.in 2009-09-28 16:33:43.194864215 +0200
+@@ -445,6 +445,8 @@
+ $(DESTDIR)$(includedir)/pcap-bpf.h
+ $(INSTALL_DATA) $(srcdir)/pcap-namedb.h \
+ $(DESTDIR)$(includedir)/pcap-namedb.h
++ [ -d $(DESTDIR)$(bindir) ] || \
++ (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
+ $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
+ for i in $(MAN1); do \
+ $(INSTALL_DATA) $(srcdir)/$$i \
+diff -Naur libpcap-1.0.0.orig/configure libpcap-1.0.0.patched/configure
+--- libpcap-1.0.0.orig/configure 2008-10-28 02:26:13.000000000 +0100
++++ libpcap-1.0.0.patched/configure 2009-09-28 16:32:19.576622377 +0200
+@@ -6655,145 +6655,6 @@
+
+ done
+
+- for ac_header in
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6; }
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-
+- ;;
+-esac
+-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+ { echo "$as_me:$LINENO: checking if if_packet.h has tpacket_stats defined" >&5
+ echo $ECHO_N "checking if if_packet.h has tpacket_stats defined... $ECHO_C" >&6; }
+ if test "${ac_cv_lbl_tpacket_stats+set}" = set; then
+diff -Naur libpcap-1.0.0.orig/configure.in libpcap-1.0.0.patched/configure.in
+--- libpcap-1.0.0.orig/configure.in 2008-10-28 02:26:13.000000000 +0100
++++ libpcap-1.0.0.patched/configure.in 2009-09-28 16:32:39.158704830 +0200
+@@ -358,7 +358,6 @@
+ #include <net/if.h>
+ #include <linux/types.h>
+ ])
+- AC_CHECK_HEADERS()
+ AC_LBL_TPACKET_STATS
+ AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI
+ ;;
Added: csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff
===================================================================
--- csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff (rev 0)
+++ csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff 2009-09-28 14:49:31 UTC (rev 6597)
@@ -0,0 +1,47 @@
+diff --git a/Makefile.in b/Makefile.in
+index 5c4d679..f2717d5 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -445,11 +445,17 @@ install: libpcap.a pcap-config
+ $(DESTDIR)$(includedir)/pcap-bpf.h
+ $(INSTALL_DATA) $(srcdir)/pcap-namedb.h \
+ $(DESTDIR)$(includedir)/pcap-namedb.h
++ [ -d $(DESTDIR)$(bindir) ] || \
++ (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
+ $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
+ for i in $(MAN1); do \
++ [ -d $(DESTDIR)$(mandir)/man1 ] || \
++ (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1); \
+ $(INSTALL_DATA) $(srcdir)/$$i \
+ $(DESTDIR)$(mandir)/man1/$$i; done
+ for i in $(MAN3PCAP); do \
++ [ -d $(DESTDIR)$(mandir)/man3 ] || \
++ (mkdir -p $(DESTDIR)$(mandir)/man3; chmod 755 $(DESTDIR)$(mandir)/man3); \
+ $(INSTALL_DATA) $(srcdir)/$$i \
+ $(DESTDIR)$(mandir)/man3/$$i; done
+ ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \
+@@ -471,16 +477,24 @@ install: libpcap.a pcap-config
+ ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \
+ $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
+ for i in $(MANFILE); do \
++ [ -d $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@ ] || \
++ (mkdir -p $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@); \
+ $(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manfile.in/.manfile/'` \
+ $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/. at MAN_FILE_FORMATS@/'`; done
+ for i in $(MANMISC); do \
++ [ -d $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@ ] || \
++ (mkdir -p $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@); \
+ $(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manmisc.in/.manmisc/'` \
+ $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/. at MAN_MISC_INFO@/'`; done
+
+ install-shared: install-shared-$(DYEXT)
+ install-shared-so: libpcap.so
++ [ -d $(DESTDIR)$(libdir) ] || \
++ (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
+ $(INSTALL_PROGRAM) libpcap.so.`cat VERSION` $(DESTDIR)$(libdir)/libpcap.so.`cat VERSION`
+ install-shared-dylib: libpcap.dylib
++ [ -d $(DESTDIR)$(libdir) ] || \
++ (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
+ $(INSTALL_PROGRAM) libpcap.`cat VERSION`.dylib $(DESTDIR)$(libdir)/libpcap.`cat VERSION`.dylib
+ VER=`cat VERSION`; cd $(DESTDIR)$(libdir) && ln -sf libpcap.$$VER.dylib libpcap.A.dylib; ln -sf libpcap.A.dylib libpcap.dylib
+
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