[csw-devel] SF.net SVN: gar:[9485] csw/mgar/pkg/libpcap/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Mar 31 14:11:47 CEST 2010
Revision: 9485
http://gar.svn.sourceforge.net/gar/?rev=9485&view=rev
Author: dmichelsen
Date: 2010-03-31 12:11:47 +0000 (Wed, 31 Mar 2010)
Log Message:
-----------
libpcap: Update to 1.1
Modified Paths:
--------------
csw/mgar/pkg/libpcap/trunk/Makefile
csw/mgar/pkg/libpcap/trunk/checksums
Removed 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
csw/mgar/pkg/libpcap/trunk/files/shared-library.diff
Modified: csw/mgar/pkg/libpcap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpcap/trunk/Makefile 2010-03-31 11:49:15 UTC (rev 9484)
+++ csw/mgar/pkg/libpcap/trunk/Makefile 2010-03-31 12:11:47 UTC (rev 9485)
@@ -1,5 +1,5 @@
GARNAME = libpcap
-GARVERSION = 1.0.0
+GARVERSION = 1.1
CATEGORIES = lib
DESCRIPTION = System-independent interface for user-level packet capture
@@ -15,9 +15,9 @@
# 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
-PATCHFILES += shared-library.diff
+# PATCHFILES = sf-bugtrack-2224954-fix-autoconf-header.diff
+# PATCHFILES += sf-bugtrack-2504874-create-dir-patch.diff
+# PATCHFILES += shared-library.diff
PACKAGES = CSWlibpcap CSWlibpcapdevel
@@ -25,8 +25,10 @@
CATALOGNAME_CSWlibpcapdevel = libpcap_devel
SPKG_DESC_CSWlibpcap = System-independent interface for user-level packet capture
-SPKG_DESC_CSWlibpcapdevel = libpcap development files
+SPKG_DESC_CSWlibpcapdevel = Development files for libpcap
+RUNTIME_DEP_PKGS_CSWlibpcapdevel = CSWlibpcap
+
BUILD64 = 1
EXTRA_BUILD_ISAS_sparc = sparcv8plus
@@ -55,10 +57,10 @@
PKGFILES_CSWlibpcapdevel = $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWlibpcapdevel = CSWlibpcap
+CHECKPKG_OVERRIDES_CSWlibpcapdevel += surplus-dependency|CSWlibpcap
include gar/category.mk
-post-install-modulated:
- ln -s libpcap.so.1.0.0 $(DESTDIR)$(libdir)/libpcap.so
- @$(MAKECOOKIE)
+#post-install-modulated:
+# ln -s libpcap.so.1.0.0 $(DESTDIR)$(libdir)/libpcap.so
+# @$(MAKECOOKIE)
Modified: csw/mgar/pkg/libpcap/trunk/checksums
===================================================================
--- csw/mgar/pkg/libpcap/trunk/checksums 2010-03-31 11:49:15 UTC (rev 9484)
+++ csw/mgar/pkg/libpcap/trunk/checksums 2010-03-31 12:11:47 UTC (rev 9485)
@@ -1,4 +1,2 @@
-9ad1358c5dec48456405eac197a46d3d download/libpcap-1.0.0.tar.gz
-4b3aba885cc3a967721616419e1b17d1 download/sf-bugtrack-2224954-fix-autoconf-header.diff
-10f021b867602038e71a48f5662467bc download/sf-bugtrack-2504874-create-dir-patch.diff
-3115b52dbe16ed2b4174ed19fb63f2d6 download/shared-library.diff
+534cd879be5bd19e4927441402df945d libpcap-1.1.tar.gz
+3115b52dbe16ed2b4174ed19fb63f2d6 shared-library.diff
Deleted: 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 2010-03-31 11:49:15 UTC (rev 9484)
+++ csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff 2010-03-31 12:11:47 UTC (rev 9485)
@@ -1,160 +0,0 @@
-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
- ;;
Deleted: 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 2010-03-31 11:49:15 UTC (rev 9484)
+++ csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff 2010-03-31 12:11:47 UTC (rev 9485)
@@ -1,47 +0,0 @@
-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
-
Deleted: csw/mgar/pkg/libpcap/trunk/files/shared-library.diff
===================================================================
--- csw/mgar/pkg/libpcap/trunk/files/shared-library.diff 2010-03-31 11:49:15 UTC (rev 9484)
+++ csw/mgar/pkg/libpcap/trunk/files/shared-library.diff 2010-03-31 12:11:47 UTC (rev 9485)
@@ -1,12 +0,0 @@
-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 21:54:53.647596468 +0200
-@@ -326,7 +326,7 @@
- #
- libpcap.so: $(OBJ)
- @rm -f $@
-- $(CC) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS)
-+ $(CC) -G -o $@.`cat $(srcdir)/VERSION` $(LDFLAGS) $(OBJ) $(DAGLIBS)
-
- #
- # The following rule succeeds, but the result is untested.
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