diff options
22 files changed, 346 insertions, 716 deletions
diff --git a/net-libs/libpcap/files/libpcap-0.8.1-fPIC.patch b/net-libs/libpcap/files/libpcap-0.8.1-fPIC.patch deleted file mode 100644 index 616cd5b3444c..000000000000 --- a/net-libs/libpcap/files/libpcap-0.8.1-fPIC.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in 2004-01-03 12:51:50.914715352 +0000 -+++ Makefile.in 2004-01-03 13:04:17.524952464 +0000 -@@ -48,7 +48,7 @@ - LIBS = @V_LIBS@ - - # Standard CFLAGS --CFLAGS = $(CCOPT) $(INCLS) $(DEFS) -+CFLAGS = $(CCOPT) $(INCLS) $(DEFS) -fPIC - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/net-libs/libpcap/files/libpcap-0.9.3-whitespace.diff b/net-libs/libpcap/files/libpcap-0.9.3-whitespace.diff deleted file mode 100644 index 4c22d08c7df0..000000000000 --- a/net-libs/libpcap/files/libpcap-0.9.3-whitespace.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --exclude='*~' -Naur libpcap-0.9.3.orig/pcap.h libpcap-0.9.3/pcap.h ---- libpcap-0.9.3.orig/pcap.h 2005-09-11 16:43:56.000000000 -0300 -+++ libpcap-0.9.3/pcap.h 2005-09-11 16:45:06.000000000 -0300 -@@ -38,13 +38,13 @@ - #define lib_pcap_h - - #if defined(WIN32) -- #include <pcap-stdinc.h> -+#include <pcap-stdinc.h> - #elif defined(MSDOS) -- #include <sys/types.h> -- #include <sys/socket.h> /* u_int, u_char etc. */ -+#include <sys/types.h> -+#include <sys/socket.h> /* u_int, u_char etc. */ - #else /* UN*X */ -- #include <sys/types.h> -- #include <sys/time.h> -+#include <sys/types.h> -+#include <sys/time.h> - #endif /* WIN32/MSDOS/UN*X */ - - #ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H diff --git a/net-libs/libpcap/files/libpcap-0.9.8-arptype-65534.patch b/net-libs/libpcap/files/libpcap-0.9.8-arptype-65534.patch deleted file mode 100644 index 7ad7f60aa9cc..000000000000 --- a/net-libs/libpcap/files/libpcap-0.9.8-arptype-65534.patch +++ /dev/null @@ -1,31 +0,0 @@ -Source: upstream developer Guy Harris -https://www.wireshark.org/lists/wireshark-users/200806/msg00206.html -Reason: avoid messages: arptype 65534 not supported by libpcap - falling back to cooked socket. - -Index: pcap-linux.c -=================================================================== -RCS file: /tcpdump/master/libpcap/pcap-linux.c,v -retrieving revision 1.148 -diff -c -r1.148 pcap-linux.c -*** pcap-linux.c 14 Apr 2008 21:04:51 -0000 1.148 ---- pcap-linux.c 24 Jun 2008 06:43:49 -0000 -*************** -*** 1539,1544 **** ---- 1539,1555 ---- - handle->linktype = DLT_LINUX_LAPD; - break; - -+ #ifndef ARPHRD_NONE -+ #define ARPHRD_NONE 0xFFFE -+ #endif -+ case ARPHRD_NONE: -+ /* -+ * No link-layer header; packets are just IP -+ * packets, so use DLT_RAW. -+ */ -+ handle->linktype = DLT_RAW; -+ break; -+ - default: - handle->linktype = -1; - break; diff --git a/net-libs/libpcap/files/libpcap-0.9.8-largefile.patch b/net-libs/libpcap/files/libpcap-0.9.8-largefile.patch deleted file mode 100644 index 756e369bdac8..000000000000 --- a/net-libs/libpcap/files/libpcap-0.9.8-largefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.orig 2008-04-02 03:15:24.000000000 +1100 -+++ configure.in 2008-04-02 03:15:45.000000000 +1100 -@@ -786,6 +786,8 @@ - - esac - -+AC_SYS_LARGEFILE -+ - AC_PROG_RANLIB - - AC_LBL_DEVEL(V_CCOPT) diff --git a/net-libs/libpcap/files/libpcap-0.9.8-pcap_compile.patch b/net-libs/libpcap/files/libpcap-0.9.8-pcap_compile.patch deleted file mode 100644 index 1691a75aaf15..000000000000 --- a/net-libs/libpcap/files/libpcap-0.9.8-pcap_compile.patch +++ /dev/null @@ -1,57 +0,0 @@ -Source: upstream ... -> revision 1.291 -> date: 2007-10-26 00:44:56 +0000; author: guy; state: Exp; lines: +13 -1 -> Re-initialize the table of used registers, and the current register, -> before compiling an expression; pcap_compile() can be called more than -> once, and some registers can now be allocated and not freed in the -> process of code generation (for example, the register allocated to hold -> the length of a radiotap header, which can't be freed until we're -> finished generating all the code). - -Index: gencode.c -=================================================================== -RCS file: /tcpdump/master/libpcap/gencode.c,v -retrieving revision 1.290 -retrieving revision 1.291 -diff -c -r1.290 -r1.291 -*** gencode.c 5 Oct 2007 01:40:14 -0000 1.290 ---- gencode.c 26 Oct 2007 00:44:56 -0000 1.291 -*************** -*** 134,139 **** ---- 134,140 ---- - - static void init_linktype(pcap_t *); - -+ static void init_regs(void); - static int alloc_reg(void); - static void free_reg(int); - -*************** -*** 369,374 **** ---- 370,376 ---- - n_errors = 0; - root = NULL; - bpf_pcap = p; -+ init_regs(); - if (setjmp(top_ctx)) { - lex_cleanup(); - freechunks(); -*************** -*** 6045,6050 **** ---- 6047,6062 ---- - static int curreg; - - /* -+ * Initialize the table of used registers and the current register. -+ */ -+ static void -+ init_regs() -+ { -+ curreg = 0; -+ memset(regused, 0, sizeof regused); -+ } -+ -+ /* - * Return the next free register. - */ - static int diff --git a/net-libs/libpcap/files/libpcap-1.0.0-LDFLAGS.patch b/net-libs/libpcap/files/libpcap-1.0.0-LDFLAGS.patch deleted file mode 100644 index 9adcacaefc6f..000000000000 --- a/net-libs/libpcap/files/libpcap-1.0.0-LDFLAGS.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'Makefile.in' ---- Makefile.in 2008-11-04 18:53:20 +0000 -+++ Makefile.in 2008-11-04 18:53:49 +0000 -@@ -328,7 +328,7 @@ - # - libpcap.so: $(OBJ) - @rm -f $@ -- $(CC) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS) -+ $(CC) -shared $(LDFLAGS) -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS) - - # - # The following rule succeeds, but the result is untested. - diff --git a/net-libs/libpcap/files/libpcap-1.0.0-bindir.patch b/net-libs/libpcap/files/libpcap-1.0.0-bindir.patch deleted file mode 100644 index dc7ce1529b41..000000000000 --- a/net-libs/libpcap/files/libpcap-1.0.0-bindir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libpcap-1.0.0~/Makefile.in 2008-11-08 13:26:54.000000000 +0100 -+++ libpcap-1.0.0/Makefile.in 2008-11-08 13:41:06.000000000 +0100 -@@ -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 --git a/net-libs/libpcap/files/libpcap-1.0.0-cross-linux.patch b/net-libs/libpcap/files/libpcap-1.0.0-cross-linux.patch deleted file mode 100644 index 314b58050673..000000000000 --- a/net-libs/libpcap/files/libpcap-1.0.0-cross-linux.patch +++ /dev/null @@ -1,30 +0,0 @@ -=== modified file 'configure.in' ---- configure.in 2008-11-02 07:39:02 +0000 -+++ configure.in 2008-11-02 07:45:33 +0000 -@@ -218,7 +218,12 @@ - dnl XXX This could be done for cross-compiling, but for now it's not. - dnl - if test -z "$with_pcap" && test "$cross_compiling" = yes; then -- AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...) -+ if test -z "$with_pcap" ; then -+ case $host in -+ *-linux*) with_pcap="linux";; -+ *) AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...);; -+ esac -+ fi - fi - AC_ARG_WITH(pcap, [ --with-pcap=TYPE use packet capture TYPE]) - AC_MSG_CHECKING(packet capture type) -@@ -338,8 +343,10 @@ - linux) - AC_MSG_CHECKING(Linux kernel version) - if test "$cross_compiling" = yes; then -+ dnl we could check linux/version.h here, but who runs -+ dnl versions of linux older than 2.0.x anymore to bother ? - AC_CACHE_VAL(ac_cv_linux_vers, -- ac_cv_linux_vers=unknown) -+ ac_cv_linux_vers=2) - else - AC_CACHE_VAL(ac_cv_linux_vers, - ac_cv_linux_vers=`uname -r 2>&1 | \ - diff --git a/net-libs/libpcap/files/libpcap-1.0.0-freebsd-pic.patch b/net-libs/libpcap/files/libpcap-1.0.0-freebsd-pic.patch deleted file mode 100644 index 93b633df6d56..000000000000 --- a/net-libs/libpcap/files/libpcap-1.0.0-freebsd-pic.patch +++ /dev/null @@ -1,13 +0,0 @@ -Compile with -fPIC also on FreeBSD (it's needed for amd64-fbsd) - ---- configure.in.orig -+++ configure.in -@@ -959,7 +959,7 @@ - MAN_MISC_INFO=5 - ;; - --linux*) -+linux*|freebsd*) - V_CCOPT="$V_CCOPT -fPIC" - ;; - diff --git a/net-libs/libpcap/files/libpcap-1.0.0-install-bindir.patch b/net-libs/libpcap/files/libpcap-1.0.0-install-bindir.patch deleted file mode 100644 index eafa57041e22..000000000000 --- a/net-libs/libpcap/files/libpcap-1.0.0-install-bindir.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'Makefile.in' ---- Makefile.in 2008-11-02 09:45:33 +0000 -+++ Makefile.in 2008-11-02 10:46:03 +0000 -@@ -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 --git a/net-libs/libpcap/files/libpcap-1.0.0-install-headers.patch b/net-libs/libpcap/files/libpcap-1.0.0-install-headers.patch deleted file mode 100644 index ebd583d2c1b2..000000000000 --- a/net-libs/libpcap/files/libpcap-1.0.0-install-headers.patch +++ /dev/null @@ -1,41 +0,0 @@ -=== modified file 'Makefile.in' ---- Makefile.in 2008-11-02 10:49:47 +0000 -+++ Makefile.in 2008-11-04 18:03:48 +0000 -@@ -85,6 +85,8 @@ - GENSRC = scanner.c grammar.c version.c - LIBOBJS = @LIBOBJS@ - -+HAVE_LINUX_TPACKET_AUXDATA = @HAVE_LINUX_TPACKET_AUXDATA@ -+ - SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC) - - # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot -@@ -434,6 +436,14 @@ - $(DESTDIR)$(includedir)/pcap/pcap.h - $(INSTALL_DATA) $(srcdir)/pcap/bpf.h \ - $(DESTDIR)$(includedir)/pcap/bpf.h -+ if test ! -z "@HAVE_LINUX_TPACKET_AUXDATA@" ; then \ -+ $(INSTALL_DATA) $(srcdir)/pcap/vlan.h \ -+ $(DESTDIR)$(includedir)/pcap/vlan.h ; \ -+ fi -+ if test ! -z "@BT_SRC@" ; then \ -+ $(INSTALL_DATA) $(srcdir)/pcap/bluetooth.h \ -+ $(DESTDIR)$(includedir)/pcap/bluetooth.h ; \ -+ fi - $(INSTALL_DATA) $(srcdir)/pcap/namedb.h \ - $(DESTDIR)$(includedir)/pcap/namedb.h - $(INSTALL_DATA) $(srcdir)/pcap/sll.h \ - -=== modified file 'aclocal.m4' ---- aclocal.m4 2008-11-02 09:45:33 +0000 -+++ aclocal.m4 2008-11-04 18:05:01 +0000 -@@ -930,6 +930,8 @@ - ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci=no)) - AC_MSG_RESULT($ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci) - if test $ac_cv_lbl_linux_tpacket_auxdata_tp_vlan_tci = yes ; then -+ HAVE_LINUX_TPACKET_AUXDATA=tp_vlan_tci -+ AC_SUBST(HAVE_LINUX_TPACKET_AUXDATA) - AC_DEFINE(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI,1,[if tp_vlan_tci exists]) - fi]) - - diff --git a/net-libs/libpcap/files/libpcap-1.0.0-optional-bluetooth.patch b/net-libs/libpcap/files/libpcap-1.0.0-optional-bluetooth.patch deleted file mode 100644 index 3f7942ad351e..000000000000 --- a/net-libs/libpcap/files/libpcap-1.0.0-optional-bluetooth.patch +++ /dev/null @@ -1,151 +0,0 @@ -=== modified file 'configure.in' ---- configure.in 2008-11-04 18:26:23 +0000 -+++ configure.in 2008-11-04 18:42:51 +0000 -@@ -185,7 +185,8 @@ - - dnl to pacify those who hate protochain insn - AC_MSG_CHECKING(if --disable-protochain option is specified) --AC_ARG_ENABLE(protochain, [ --disable-protochain disable \"protochain\" insn]) -+AC_ARG_ENABLE(protochain, -+AS_HELP_STRING([--disable-protochain],[disable \"protochain\" insn])) - case "x$enable_protochain" in - xyes) enable_protochain=enabled ;; - xno) enable_protochain=disabled ;; -@@ -201,7 +202,8 @@ - # SITA support is mutually exclusive with native capture support; - # "--with-sita" selects SITA support. - # --AC_ARG_WITH(sita, [ --with-sita include SITA support], -+AC_ARG_WITH(sita, -+AS_HELP_STRING([--with-sita],[include SITA support]), - [ - if test ! "x$withval" = "xno" ; then - AC_DEFINE(SITA,1,[include ACN support]) -@@ -222,7 +224,8 @@ - if test -z "$with_pcap" && test "$cross_compiling" = yes; then - AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...) - fi --AC_ARG_WITH(pcap, [ --with-pcap=TYPE use packet capture TYPE]) -+AC_ARG_WITH(pcap, -+AS_HELP_STRING([--with-pcap=TYPE],[use packet capture TYPE])) - AC_MSG_CHECKING(packet capture type) - if test ! -z "$with_pcap" ; then - V_PCAP="$withval" -@@ -503,7 +506,8 @@ - fi - AC_MSG_RESULT($have_socklen_t) - --AC_ARG_ENABLE(ipv6, [ --enable-ipv6 build IPv6-capable version @<:@default=yes, if getaddrinfo available@:>@], -+AC_ARG_ENABLE(ipv6, -+AS_HELP_STRING([--enable-ipv6],[build IPv6-capable version @<:@default=yes, if getaddrinfo available@:>@]), - [], - [enable_ipv6=ifavailable]) - if test "$enable_ipv6" != "no"; then -@@ -519,14 +523,16 @@ - fi - - AC_MSG_CHECKING(whether to build optimizer debugging code) --AC_ARG_ENABLE(optimizer-dbg, [ --enable-optimizer-dbg build optimizer debugging code]) -+AC_ARG_ENABLE(optimizer-dbg, -+AS_HELP_STRING([--enable-optimizer-dbg],[build optimizer debugging code])) - if test "$enable_optimizer_dbg" = "yes"; then - AC_DEFINE(BDEBUG,1,[Enable optimizer debugging]) - fi - AC_MSG_RESULT(${enable_optimizer_dbg-no}) - - AC_MSG_CHECKING(whether to build parser debugging code) --AC_ARG_ENABLE(yydebug, [ --enable-yydebug build parser debugging code]) -+AC_ARG_ENABLE(yydebug, -+AS_HELP_STRING([--enable-yydebug],[build parser debugging code])) - if test "$enable_yydebug" = "yes"; then - AC_DEFINE(YYDEBUG,1,[Enable parser debugging]) - fi -@@ -544,7 +550,8 @@ - AC_MSG_RESULT($ac_cv_lbl_proc_net_dev) - - # Check for Endace DAG card support. --AC_ARG_WITH([dag], [ --with-dag[[=DIR]] include Endace DAG support ("yes", "no" or DIR; default="yes" on BSD and Linux if present)], -+AC_ARG_WITH([dag], -+AS_HELP_STRING([--with-dag@<:@=DIR@:>@],[include Endace DAG support @<:@"yes", "no" or DIR; default="yes" on BSD and Linux if present@:>@]), - [ - if test "$withval" = no - then -@@ -566,14 +573,16 @@ - want_dag=ifpresent - ]) - --AC_ARG_WITH([dag-includes], [ --with-dag-includes=DIR Endace DAG include directory], -+AC_ARG_WITH([dag-includes], -+AS_HELP_STRING([--with-dag-includes=DIR],[Endace DAG include directory]), - [ - # User wants DAG support and has specified a header directory, so use the provided value. - want_dag=yes - dag_include_dir=$withval - ],[]) - --AC_ARG_WITH([dag-libraries], [ --with-dag-libraries=DIR Endace DAG library directory], -+AC_ARG_WITH([dag-libraries], -+AS_HELP_STRING([--with-dag-libraries=DIR],[Endace DAG library directory]), - [ - # User wants DAG support and has specified a library directory, so use the provided value. - want_dag=yes -@@ -767,7 +776,8 @@ - AC_MSG_RESULT(yes) - fi - --AC_ARG_WITH(septel, [ --with-septel[[=DIR]] include Septel support (located in directory DIR, if supplied). [default=yes, on Linux, if present]], -+AC_ARG_WITH(septel, -+AS_HELP_STRING([--with-septel@<:@=DIR@:>@],[include Septel support (located in directory DIR, if supplied). @<:@default=yes, on Linux, if present@:>@]), - [ - if test "$withval" = no - then -@@ -1038,24 +1048,30 @@ - AC_SUBST(PCAP_SUPPORT_USB) - AC_SUBST(USB_SRC) - --dnl check for bluetooth sniffing support --case "$host_os" in --linux*) -- AC_CHECK_HEADER(bluetooth/bluetooth.h, -- [ -- AC_DEFINE(PCAP_SUPPORT_BT, 1, [target host supports Bluetooth sniffing]) -- BT_SRC=pcap-bt-linux.c -- AC_MSG_NOTICE(Bluetooth sniffing is supported) -- ], -- AC_MSG_NOTICE(Bluetooth sniffing is not supported; install bluez-lib devel to enable it) -- ) -- ;; --*) -- AC_MSG_NOTICE(no Bluetooth sniffing support) -- ;; --esac --AC_SUBST(PCAP_SUPPORT_BT) --AC_SUBST(BT_SRC) -+AC_ARG_ENABLE([bluetooth], -+[AS_HELP_STRING([--enable-bluetooth],[enable bluetooth support @<:@default=yes, if support available@:>@])], -+,enable_bluetooth=yes) -+ -+if test "x$enable_bluetooth" != "xno" ; then -+ dnl check for bluetooth sniffing support -+ case "$host_os" in -+ linux*) -+ AC_CHECK_HEADER(bluetooth/bluetooth.h, -+ [ -+ AC_DEFINE(PCAP_SUPPORT_BT, 1, [target host supports Bluetooth sniffing]) -+ BT_SRC=pcap-bt-linux.c -+ AC_MSG_NOTICE(Bluetooth sniffing is supported) -+ ], -+ AC_MSG_NOTICE(Bluetooth sniffing is not supported; install bluez-lib devel to enable it) -+ ) -+ ;; -+ *) -+ AC_MSG_NOTICE(no Bluetooth sniffing support) -+ ;; -+ esac -+ AC_SUBST(PCAP_SUPPORT_BT) -+ AC_SUBST(BT_SRC) -+fi - - AC_PROG_INSTALL - - diff --git a/net-libs/libpcap/files/libpcap-1.0.0-whitespace.patch b/net-libs/libpcap/files/libpcap-1.0.0-whitespace.patch deleted file mode 100644 index cd9d12485ab2..000000000000 --- a/net-libs/libpcap/files/libpcap-1.0.0-whitespace.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ru libpcap-1.0.0~/pcap/pcap.h libpcap-1.0.0/pcap/pcap.h ---- libpcap-1.0.0~/pcap/pcap.h 2008-11-08 13:26:54.000000000 +0100 -+++ libpcap-1.0.0/pcap/pcap.h 2008-11-08 13:27:06.000000000 +0100 -@@ -38,13 +38,13 @@ - #define lib_pcap_pcap_h - - #if defined(WIN32) -- #include <pcap-stdinc.h> -+#include <pcap-stdinc.h> - #elif defined(MSDOS) -- #include <sys/types.h> -- #include <sys/socket.h> /* u_int, u_char etc. */ -+#include <sys/types.h> -+#include <sys/socket.h> /* u_int, u_char etc. */ - #else /* UN*X */ -- #include <sys/types.h> -- #include <sys/time.h> -+#include <sys/types.h> -+#include <sys/time.h> - #endif /* WIN32/MSDOS/UN*X */ - - #ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H diff --git a/net-libs/libpcap/files/libpcap-1.0.1-autoconf.patch b/net-libs/libpcap/files/libpcap-1.0.1-autoconf.patch deleted file mode 100644 index 5d5598fbb33a..000000000000 --- a/net-libs/libpcap/files/libpcap-1.0.1-autoconf.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://bugs.gentoo.org/281690 -https://sourceforge.net/tracker/index.php?func=detail&aid=2881185&group_id=53067&atid=469577 - -the code before AC_PROG_CC isnt terribly important, so ignore it for now so -that we work with autoconf-2.64+ - ---- libpcap/aclocal.m4 -+++ libpcap/aclocal.m4 -@@ -44,7 +44,7 @@ - dnl - AC_DEFUN(AC_LBL_C_INIT, - [AC_PREREQ(2.12) -- AC_BEFORE([$0], [AC_PROG_CC]) -+ AC_REQUIRE([AC_PROG_CC]) - AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) - AC_BEFORE([$0], [AC_LBL_DEVEL]) - AC_ARG_WITH(gcc, [ --without-gcc don't use gcc]) diff --git a/net-libs/libpcap/files/libpcap-1.0.1_pre20090708-libnl-automagic.patch b/net-libs/libpcap/files/libpcap-1.0.1_pre20090708-libnl-automagic.patch deleted file mode 100644 index 1895dbe576ad..000000000000 --- a/net-libs/libpcap/files/libpcap-1.0.1_pre20090708-libnl-automagic.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit e61f27f56bef0f229f0bf02911f76cfcfa12f083 -Author: Peter Volkov <pva@gentoo.org> -Date: Wed Jul 8 16:06:18 2009 +0400 - - Add --without-libnl configure switch - - Allow build libpcap with libnl disabled even in case libnl is installed - at system. - -diff --git a/configure.in b/configure.in -index 88a71ef..397a9c7 100644 ---- a/configure.in -+++ b/configure.in -@@ -437,9 +437,19 @@ linux) - # - # Do we have libnl? - # -- AC_CHECK_LIB(nl, nl_handle_alloc, -- LIBS="-lnl $LIBS" -- AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]),) -+ AC_ARG_WITH(libnl, -+ AC_HELP_STRING([--without-libnl],[disable libnl support @<:@default=yes, on Linux, if present@:>@]), -+ with_libnl=$withval,,) -+ -+ if test x$with_libnl != xno ; then -+ AC_CHECK_LIB(nl, nl_handle_alloc, -+ LIBS="-lnl $LIBS" -+ AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]), -+ if test x$with_libnl = xyes ; then -+ AC_MSG_ERROR([libnl support requested but libnl not found]) -+ fi -+ ) -+ fi - - AC_LBL_TPACKET_STATS - AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI diff --git a/net-libs/libpcap/files/libpcap-1.0.1_pre20090812-poll-cpu-usage.patch b/net-libs/libpcap/files/libpcap-1.0.1_pre20090812-poll-cpu-usage.patch deleted file mode 100644 index 8468dc503447..000000000000 --- a/net-libs/libpcap/files/libpcap-1.0.1_pre20090812-poll-cpu-usage.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.launchpad.net/ubuntu/+source/tcpdump/+bug/369288 - -Rediffed to apply. - -diff -Nuar --exclude '*.orig' --exclude '*.rej' libpcap-1.0.1-20090708.orig/pcap-linux.c libpcap-1.0.1-20090708/pcap-linux.c ---- libpcap-1.0.1-20090708.orig/pcap-linux.c 2009-07-08 11:52:08.000000000 +0000 -+++ libpcap-1.0.1-20090708/pcap-linux.c 2009-08-29 20:47:44.951806355 +0000 -@@ -2785,6 +2785,19 @@ - handle->fd, errno, pcap_strerror(errno)); - return -1; - } -+ -+ /* poll() sometimes returns > 0 even in error cases -+ * and sets error-bits like POLLERR, POLLHUP, .. -+ * Are also "good" bits are possible, like POLLPRI. -+ * TODO: what's with POLLRDHUP since kernel 2.6.17? -+ */ -+ if (ret > 0 && pollinfo.revents & (POLLERR | POLLHUP | POLLNVAL)) { -+ snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, -+ "critical revent in poll on packet socket fd %d: 0x%4.4x", -+ handle->fd, pollinfo.revents); -+ return -1; -+ } -+ - /* check for break loop condition on interrupted syscall*/ - if (handle->break_loop) { - handle->break_loop = 0; diff --git a/net-libs/libpcap/files/libpcap-1.1.1-libidn2.patch b/net-libs/libpcap/files/libpcap-1.1.1-libidn2.patch new file mode 100644 index 000000000000..04293562dc42 --- /dev/null +++ b/net-libs/libpcap/files/libpcap-1.1.1-libidn2.patch @@ -0,0 +1,329 @@ +diff --git a/config.h.in b/config.h.in +index f988e8f..3b9ce3c 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -52,6 +52,9 @@ + /* if libnl exists */ + #undef HAVE_LIBNL + ++/* if libnl exists and is version 2.x */ ++#undef HAVE_LIBNL_2_x ++ + /* Define to 1 if you have the <limits.h> header file. */ + #undef HAVE_LIMITS_H + +diff --git a/configure b/configure +index c99c1ab..7338dee 100755 +--- a/configure ++++ b/configure +@@ -7340,7 +7340,93 @@ fi + + + if test x$with_libnl != xno ; then +- { echo "$as_me:$LINENO: checking for nl_handle_alloc in -lnl" >&5 ++ # ++ # Try libnl 2.x first. ++ # ++ { echo "$as_me:$LINENO: checking for nl_socket_alloc in -lnl" >&5 ++echo $ECHO_N "checking for nl_socket_alloc in -lnl... $ECHO_C" >&6; } ++if test "${ac_cv_lib_nl_nl_socket_alloc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lnl $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char nl_socket_alloc (); ++int ++main () ++{ ++return nl_socket_alloc (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++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_link") 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_exeext && ++ $as_test_x conftest$ac_exeext; then ++ ac_cv_lib_nl_nl_socket_alloc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_nl_nl_socket_alloc=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nl_nl_socket_alloc" >&5 ++echo "${ECHO_T}$ac_cv_lib_nl_nl_socket_alloc" >&6; } ++if test $ac_cv_lib_nl_nl_socket_alloc = yes; then ++ ++ # ++ # Yes, we have libnl 2.x. ++ # ++ LIBS="-lnl-genl -lnl $LIBS" ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_LIBNL 1 ++_ACEOF ++ ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_LIBNL_2_x 1 ++_ACEOF ++ ++ ++else ++ ++ # ++ # No, we don't; do we have libnl 1.x? ++ # ++ { echo "$as_me:$LINENO: checking for nl_handle_alloc in -lnl" >&5 + echo $ECHO_N "checking for nl_handle_alloc in -lnl... $ECHO_C" >&6; } + if test "${ac_cv_lib_nl_nl_handle_alloc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7402,18 +7488,30 @@ fi + { echo "$as_me:$LINENO: result: $ac_cv_lib_nl_nl_handle_alloc" >&5 + echo "${ECHO_T}$ac_cv_lib_nl_nl_handle_alloc" >&6; } + if test $ac_cv_lib_nl_nl_handle_alloc = yes; then +- LIBS="-lnl $LIBS" ++ ++ # ++ # Yes. ++ # ++ LIBS="-lnl $LIBS" + + cat >>confdefs.h <<\_ACEOF + #define HAVE_LIBNL 1 + _ACEOF + ++ + else +- if test x$with_libnl = xyes ; then +- { { echo "$as_me:$LINENO: error: libnl support requested but libnl not found" >&5 ++ ++ # ++ # No, we don't have libnl at all. ++ # ++ if test x$with_libnl = xyes ; then ++ { { echo "$as_me:$LINENO: error: libnl support requested but libnl not found" >&5 + echo "$as_me: error: libnl support requested but libnl not found" >&2;} + { (exit 1); exit 1; }; } +- fi ++ fi ++ ++fi ++ + + fi + +diff --git a/configure.in b/configure.in +index 16eadf9..ef801ed 100644 +--- a/configure.in ++++ b/configure.in +@@ -445,13 +445,39 @@ linux) + with_libnl=$withval,,) + + if test x$with_libnl != xno ; then +- AC_CHECK_LIB(nl, nl_handle_alloc, +- LIBS="-lnl $LIBS" +- AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]), +- if test x$with_libnl = xyes ; then +- AC_MSG_ERROR([libnl support requested but libnl not found]) +- fi +- ) ++ # ++ # Try libnl 2.x first. ++ # ++ AC_CHECK_LIB(nl, nl_socket_alloc, ++ [ ++ # ++ # Yes, we have libnl 2.x. ++ # ++ LIBS="-lnl-genl -lnl $LIBS" ++ AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]) ++ AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x]) ++ ], ++ [ ++ # ++ # No, we don't; do we have libnl 1.x? ++ # ++ AC_CHECK_LIB(nl, nl_handle_alloc, ++ [ ++ # ++ # Yes. ++ # ++ LIBS="-lnl $LIBS" ++ AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]) ++ ], ++ [ ++ # ++ # No, we don't have libnl at all. ++ # ++ if test x$with_libnl = xyes ; then ++ AC_MSG_ERROR([libnl support requested but libnl not found]) ++ fi ++ ]) ++ ]) + fi + + AC_LBL_TPACKET_STATS +diff --git a/pcap-linux.c b/pcap-linux.c +index f8b3f10..deabbc4 100644 +--- a/pcap-linux.c ++++ b/pcap-linux.c +@@ -527,8 +527,37 @@ get_mac80211_phydev(pcap_t *handle, const char *device, char *phydev_path, + return 1; + } + ++#ifndef HAVE_LIBNL_2_x ++/* libnl 2.x compatibility code */ ++ ++#define nl_sock nl_handle ++ ++static inline struct nl_handle * ++nl_socket_alloc(void) ++{ ++ return nl_handle_alloc(); ++} ++ ++static inline void ++nl_socket_free(struct nl_handle *h) ++{ ++ nl_handle_destroy(h); ++} ++ ++static inline int ++__genl_ctrl_alloc_cache(struct nl_handle *h, struct nl_cache **cache) ++{ ++ struct nl_cache *tmp = genl_ctrl_alloc_cache(h); ++ if (!tmp) ++ return -ENOMEM; ++ *cache = tmp; ++ return 0; ++} ++#define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache ++#endif /* !HAVE_LIBNL_2_x */ ++ + struct nl80211_state { +- struct nl_handle *nl_handle; ++ struct nl_sock *nl_sock; + struct nl_cache *nl_cache; + struct genl_family *nl80211; + }; +@@ -536,23 +565,26 @@ struct nl80211_state { + static int + nl80211_init(pcap_t *handle, struct nl80211_state *state, const char *device) + { +- state->nl_handle = nl_handle_alloc(); +- if (!state->nl_handle) { ++ int err; ++ ++ state->nl_sock = nl_socket_alloc(); ++ if (!state->nl_sock) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, + "%s: failed to allocate netlink handle", device); + return PCAP_ERROR; + } + +- if (genl_connect(state->nl_handle)) { ++ if (genl_connect(state->nl_sock)) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, + "%s: failed to connect to generic netlink", device); + goto out_handle_destroy; + } + +- state->nl_cache = genl_ctrl_alloc_cache(state->nl_handle); +- if (!state->nl_cache) { ++ err = genl_ctrl_alloc_cache(state->nl_sock, &state->nl_cache); ++ if (err < 0) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, +- "%s: failed to allocate generic netlink cache", device); ++ "%s: failed to allocate generic netlink cache: %s", ++ device, strerror(-err)); + goto out_handle_destroy; + } + +@@ -568,7 +600,7 @@ nl80211_init(pcap_t *handle, struct nl80211_state *state, const char *device) + out_cache_free: + nl_cache_free(state->nl_cache); + out_handle_destroy: +- nl_handle_destroy(state->nl_handle); ++ nl_socket_free(state->nl_sock); + return PCAP_ERROR; + } + +@@ -577,7 +609,7 @@ nl80211_cleanup(struct nl80211_state *state) + { + genl_family_put(state->nl80211); + nl_cache_free(state->nl_cache); +- nl_handle_destroy(state->nl_handle); ++ nl_socket_free(state->nl_sock); + } + + static int +@@ -605,7 +637,7 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + NLA_PUT_STRING(msg, NL80211_ATTR_IFNAME, mondevice); + NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_MONITOR); + +- err = nl_send_auto_complete(state->nl_handle, msg); ++ err = nl_send_auto_complete(state->nl_sock, msg); + if (err < 0) { + if (err == -ENFILE) { + /* +@@ -626,7 +658,7 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + return PCAP_ERROR; + } + } +- err = nl_wait_for_ack(state->nl_handle); ++ err = nl_wait_for_ack(state->nl_sock); + if (err < 0) { + if (err == -ENFILE) { + /* +@@ -685,7 +717,7 @@ del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + 0, NL80211_CMD_DEL_INTERFACE, 0); + NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex); + +- err = nl_send_auto_complete(state->nl_handle, msg); ++ err = nl_send_auto_complete(state->nl_sock, msg); + if (err < 0) { + if (err == -ENFILE) { + /* +@@ -706,7 +738,7 @@ del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + return PCAP_ERROR; + } + } +- err = nl_wait_for_ack(state->nl_handle); ++ err = nl_wait_for_ack(state->nl_sock); + if (err < 0) { + if (err == -ENFILE) { + /* diff --git a/net-libs/libpcap/files/libpcap-cross-linux.patch b/net-libs/libpcap/files/libpcap-cross-linux.patch deleted file mode 100644 index 8d21868018dd..000000000000 --- a/net-libs/libpcap/files/libpcap-cross-linux.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ru libpcap-0.9.5~/configure.in libpcap-0.9.5/configure.in ---- libpcap-0.9.5~/configure.in 2007-05-05 12:43:21.000000000 +0200 -+++ libpcap-0.9.5/configure.in 2007-05-05 12:43:41.000000000 +0200 -@@ -178,7 +178,10 @@ - dnl XXX This could be done for cross-compiling, but for now it's not. - dnl - if test -z "$with_pcap" && test "$cross_compiling" = yes; then -- AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...) -+ case $host in -+ *-linux*) with_pcap="linux";; -+ *) AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...);; -+ esac - fi - AC_ARG_WITH(pcap, [ --with-pcap=TYPE use packet capture TYPE]) - AC_MSG_CHECKING(packet capture type) -@@ -347,8 +350,10 @@ - linux) - AC_MSG_CHECKING(Linux kernel version) - if test "$cross_compiling" = yes; then -+ dnl we could check linux/version.h here, but who runs -+ dnl versions of linux older than 2.0.x anymore to bother ? - AC_CACHE_VAL(ac_cv_linux_vers, -- ac_cv_linux_vers=unknown) -+ ac_cv_linux_vers=2) - else - AC_CACHE_VAL(ac_cv_linux_vers, - ac_cv_linux_vers=`uname -r 2>&1 | \ diff --git a/net-libs/libpcap/libpcap-0.9.8-r2.ebuild b/net-libs/libpcap/libpcap-0.9.8-r2.ebuild deleted file mode 100644 index 3a1d298d4165..000000000000 --- a/net-libs/libpcap/libpcap-0.9.8-r2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-0.9.8-r2.ebuild,v 1.9 2011/04/02 12:57:21 ssuominen Exp $ - -inherit autotools eutils multilib toolchain-funcs - -DESCRIPTION="A system-independent library for user-level network packet capture" -HOMEPAGE="http://www.tcpdump.org/" -SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz - http://www.jp.tcpdump.org/release/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="ipv6" - -RDEPEND="" -DEPEND="${RDEPEND} - sys-devel/flex" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-0.9.3-whitespace.diff - epatch "${FILESDIR}"/${PN}-0.8.1-fPIC.patch - epatch "${FILESDIR}"/${PN}-cross-linux.patch - epatch "${FILESDIR}"/${P}-largefile.patch - epatch "${FILESDIR}"/${P}-arptype-65534.patch - epatch "${FILESDIR}"/${P}-pcap_compile.patch - eautoreconf -} - -src_compile() { - econf $(use_enable ipv6) - emake || die "compile problem" - - # no provision for this in the Makefile, so... - $(tc-getCC) ${LDFLAGS} -Wl,-soname,libpcap.so.0 -shared -fPIC -o libpcap.so.${PV:0:3} *.o \ - || die "couldn't make a shared lib" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # We need this to build pppd on G/FBSD systems - if [[ "${USERLAND}" == "BSD" ]]; then - insinto /usr/include - doins pcap-int.h || die "failed to install pcap-int.h" - fi - - insopts -m 755 - insinto /usr/$(get_libdir) - doins libpcap.so.${PV:0:3} - dosym libpcap.so.${PV:0:3} /usr/$(get_libdir)/libpcap.so.0 - dosym libpcap.so.${PV:0:3} /usr/$(get_libdir)/libpcap.so - - # We are not installing README.{Win32,aix,hpux,tru64} (bug 183057) - dodoc CREDITS CHANGES FILES VERSION TODO README{,.dag,.linux,.macosx,.septel} -} diff --git a/net-libs/libpcap/libpcap-1.0.0-r2.ebuild b/net-libs/libpcap/libpcap-1.0.0-r2.ebuild deleted file mode 100644 index 15c0965e209c..000000000000 --- a/net-libs/libpcap/libpcap-1.0.0-r2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.0.0-r2.ebuild,v 1.11 2011/04/02 12:57:21 ssuominen Exp $ - -inherit autotools eutils multilib toolchain-funcs - -DESCRIPTION="A system-independent library for user-level network packet capture" -HOMEPAGE="http://www.tcpdump.org/" -SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz - http://www.jp.tcpdump.org/release/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="ipv6 bluetooth" - -RDEPEND="bluetooth? ( net-wireless/bluez )" -DEPEND="${RDEPEND} - sys-devel/flex" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-cross-linux.patch" - epatch "${FILESDIR}/${P}-install-bindir.patch" - epatch "${FILESDIR}/${P}-install-headers.patch" - epatch "${FILESDIR}/${P}-optional-bluetooth.patch" - epatch "${FILESDIR}/${P}-LDFLAGS.patch" - epatch "${FILESDIR}/${P}-freebsd-pic.patch" - eautoreconf -} - -src_compile() { - econf $(use_enable ipv6) \ - $(use_enable bluetooth) - emake all shared || die "compile problem" -} - -src_install() { - emake DESTDIR="${D}" install install-shared || die "emake install failed" - - dosym libpcap.so.${PV:0:5} /usr/$(get_libdir)/libpcap.so.1 - dosym libpcap.so.${PV:0:5} /usr/$(get_libdir)/libpcap.so - - # We need this to build pppd on G/FBSD systems - if [[ "${USERLAND}" == "BSD" ]]; then - insinto /usr/include - doins pcap-int.h || die "failed to install pcap-int.h" - fi - - # We are not installing README.{Win32,aix,hpux,tru64} (bug 183057) - dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} -} diff --git a/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild b/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild deleted file mode 100644 index fd581d79ed6a..000000000000 --- a/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild,v 1.6 2011/04/02 12:57:21 ssuominen Exp $ - -EAPI=2 -inherit autotools eutils multilib toolchain-funcs - -DESCRIPTION="A system-independent library for user-level network packet capture" -HOMEPAGE="http://www.tcpdump.org/" -MY_P=${PN}-${PV/_pre/-} -SRC_URI="mirror://gentoo/${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} -# SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz -# http://www.jp.tcpdump.org/release/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="bluetooth ipv6 libnl" - -RDEPEND="bluetooth? ( net-wireless/bluez ) - libnl? ( dev-libs/libnl )" -DEPEND="${RDEPEND} - sys-devel/flex" - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.0.0-cross-linux.patch" - epatch "${FILESDIR}/${PN}-1.0.1_pre20090812-poll-cpu-usage.patch" - epatch "${FILESDIR}"/${PN}-1.0.1-autoconf.patch #281690 - echo ${PV} > VERSION # Avoid CVS in version - eautoreconf -} - -src_configure() { - econf $(use_enable ipv6) \ - $(use_with libnl) \ - $(use_enable bluetooth) -} - -src_compile() { - emake all shared || die "compile problem" -} - -src_install() { - emake DESTDIR="${D}" install install-shared || die "emake install failed" - - dosym libpcap$(get_libname ${PV}) /usr/$(get_libdir)/libpcap$(get_libname 1) - dosym libpcap$(get_libname ${PV}) /usr/$(get_libdir)/libpcap$(get_libname) - - # We need this to build pppd on G/FBSD systems - if [[ "${USERLAND}" == "BSD" ]]; then - insinto /usr/include - doins pcap-int.h || die "failed to install pcap-int.h" - fi - - # We are not installing README.{Win32,aix,hpux,tru64} (bug 183057) - dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} || die -} diff --git a/net-libs/libpcap/libpcap-1.1.1-r1.ebuild b/net-libs/libpcap/libpcap-1.1.1-r1.ebuild index 0493f6c5a6f8..35146a25a351 100644 --- a/net-libs/libpcap/libpcap-1.1.1-r1.ebuild +++ b/net-libs/libpcap/libpcap-1.1.1-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.1-r1.ebuild,v 1.4 2011/08/11 02:35:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.1-r1.ebuild,v 1.5 2011/09/10 08:26:04 scarabeus Exp $ -EAPI=2 +EAPI=4 inherit autotools eutils multilib toolchain-funcs DESCRIPTION="A system-independent library for user-level network packet capture" @@ -21,33 +21,37 @@ DEPEND="${RDEPEND} sys-devel/flex virtual/yacc" +DOCS=( CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} ) + src_prepare() { - epatch "${FILESDIR}/${PN}-1.1-cross-linux.patch" - epatch "${FILESDIR}/${P}-ignore-ENODEV.patch" - # Force usbmon device to avoid #318359 - sed 's:\(ac_usb_dev_name=\).*udevinfo.*:\1"usbmon":' -i configure.in || die + epatch \ + "${FILESDIR}/${PN}-1.1-cross-linux.patch" \ + "${FILESDIR}/${P}-ignore-ENODEV.patch" \ + "${FILESDIR}/${P}-libidn2.patch" + eautoreconf } src_configure() { - econf $(use_enable ipv6) \ + econf \ + $(use_enable ipv6) \ $(use_with libnl) \ $(use_enable bluetooth) } src_compile() { - emake all shared || die "compile problem" + emake all shared } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + default + + # remove static libraries (--disable-static does not work) + find "${ED}" -name '*.a' -exec rm -f {} + # We need this to build pppd on G/FBSD systems if [[ "${USERLAND}" == "BSD" ]]; then insinto /usr/include - doins pcap-int.h || die "failed to install pcap-int.h" + doins pcap-int.h fi - - # We are not installing README.{Win32,aix,hpux,tru64} (bug 183057) - dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} || die } |