public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/, net-libs/libpcap/files/
@ 2016-10-26  9:04 Jeroen Roovers
  0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers @ 2016-10-26  9:04 UTC (permalink / raw
  To: gentoo-commits

commit:     4a3fc3e111161b3c7b8d15b1e9cefa2c2467f017
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 08:48:10 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 09:04:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3fc3e1

net-libs/libpcap: Default USB monitor name should not depend on local host.

Package-Manager: portage-2.3.2

 net-libs/libpcap/files/libpcap-1.8.1-usbmon.patch | 16 ++++++++++++++++
 net-libs/libpcap/libpcap-1.8.1.ebuild             |  1 +
 2 files changed, 17 insertions(+)

diff --git a/net-libs/libpcap/files/libpcap-1.8.1-usbmon.patch b/net-libs/libpcap/files/libpcap-1.8.1-usbmon.patch
new file mode 100644
index 00000000..0b69e43
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.8.1-usbmon.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1493,10 +1493,9 @@
+ 	AC_DEFINE(PCAP_SUPPORT_USB, 1, [target host supports USB sniffing])
+ 	USB_SRC=pcap-usb-linux.c
+ 	AC_MSG_RESULT(yes)
+-	ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null`
+-	if test $? -ne 0 ; then
+-	  ac_usb_dev_name="usbmon"
+-	fi
++
++	ac_usb_dev_name="usbmon"
++
+ 	AC_DEFINE_UNQUOTED(LINUX_USB_MON_DEV, "/dev/$ac_usb_dev_name", [path for device for USB sniffing])
+ 	AC_MSG_NOTICE(Device for USB sniffing is /dev/$ac_usb_dev_name)
+ 	#

diff --git a/net-libs/libpcap/libpcap-1.8.1.ebuild b/net-libs/libpcap/libpcap-1.8.1.ebuild
index 96ea6bc..5231472 100644
--- a/net-libs/libpcap/libpcap-1.8.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.8.1.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.1-cross-compile.patch
 	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
 	"${FILESDIR}"/${PN}-1.8.1-libnl.patch
+	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/, net-libs/libpcap/files/
@ 2017-05-25 10:08 Jeroen Roovers
  0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers @ 2017-05-25 10:08 UTC (permalink / raw
  To: gentoo-commits

commit:     ab53ab4aae8804e6dd6300b7cb813a41b7119c9b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 10:07:48 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu May 25 10:07:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab53ab4a

net-libs/libpcap: Update live ebuild.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../files/libpcap-1.6.1-prefix-solaris.patch       |  1 -
 ...-linux.patch => libpcap-9999-cross-linux.patch} |  6 ++--
 ...-1.7.2-libnl.patch => libpcap-9999-libnl.patch} |  8 +++---
 ...gure.patch => libpcap-9999-prefix-darwin.patch} |  7 ++---
 net-libs/libpcap/files/mgmt.h                      | 33 ----------------------
 net-libs/libpcap/libpcap-1.8.1-r1.ebuild           |  3 --
 net-libs/libpcap/libpcap-1.8.1.ebuild              |  3 --
 net-libs/libpcap/libpcap-9999.ebuild               | 22 ++++++---------
 net-libs/libpcap/metadata.xml                      | 25 +++++++---------
 9 files changed, 29 insertions(+), 79 deletions(-)

diff --git a/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch b/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
index 7b5efb61823..324aead551a 100644
--- a/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
+++ b/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
@@ -1,6 +1,5 @@
 Prefix' Solaris uses GNU ld
 
-
 --- a/aclocal.m4
 +++ b/aclocal.m4
 @@ -415,7 +415,7 @@

diff --git a/net-libs/libpcap/files/libpcap-1.2.0-cross-linux.patch b/net-libs/libpcap/files/libpcap-9999-cross-linux.patch
similarity index 89%
rename from net-libs/libpcap/files/libpcap-1.2.0-cross-linux.patch
rename to net-libs/libpcap/files/libpcap-9999-cross-linux.patch
index fa3b300d8f4..f01a9ca5c93 100644
--- a/net-libs/libpcap/files/libpcap-1.2.0-cross-linux.patch
+++ b/net-libs/libpcap/files/libpcap-9999-cross-linux.patch
@@ -1,6 +1,6 @@
---- a/configure.in
-+++ b/configure.in
-@@ -291,7 +291,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -317,7 +317,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

diff --git a/net-libs/libpcap/files/libpcap-1.7.2-libnl.patch b/net-libs/libpcap/files/libpcap-9999-libnl.patch
similarity index 88%
rename from net-libs/libpcap/files/libpcap-1.7.2-libnl.patch
rename to net-libs/libpcap/files/libpcap-9999-libnl.patch
index 68545395876..f243906ebad 100644
--- a/net-libs/libpcap/files/libpcap-1.7.2-libnl.patch
+++ b/net-libs/libpcap/files/libpcap-9999-libnl.patch
@@ -1,6 +1,6 @@
---- a/configure.in
-+++ b/configure.in
-@@ -453,10 +453,6 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -492,10 +492,6 @@
  
                  incdir=-I/usr/include/libnl3
                  libnldir=
@@ -11,7 +11,7 @@
  
  		#
  		# Try libnl 3.x first.
-@@ -471,7 +467,7 @@
+@@ -510,7 +506,7 @@
  			AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
  			AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
  			AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])

diff --git a/net-libs/libpcap/files/libpcap-1.6.1-configure.patch b/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch
similarity index 84%
rename from net-libs/libpcap/files/libpcap-1.6.1-configure.patch
rename to net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch
index 538e49d51d1..9bcbfe92ee0 100644
--- a/net-libs/libpcap/files/libpcap-1.6.1-configure.patch
+++ b/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch
@@ -1,10 +1,9 @@
 Prefix' Darwin systems are single arch, hijack Darwin7 case which assumes this setup
 Check for bluetooth/mgmt.h before use
 
-
---- a/configure.in
-+++ b/configure.in
-@@ -1117,7 +1117,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1271,7 +1267,7 @@
  	if test "$enable_universal" != "no"; then
  		case "$host_os" in
  

diff --git a/net-libs/libpcap/files/mgmt.h b/net-libs/libpcap/files/mgmt.h
deleted file mode 100644
index d7fc9c8956a..00000000000
--- a/net-libs/libpcap/files/mgmt.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2010  Nokia Corporation
- *  Copyright (C) 2010  Marcel Holtmann <marcel@holtmann.org>
- *
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef __packed
-#define __packed __attribute__((packed))
-#endif
-
-struct mgmt_hdr {
-	uint16_t opcode;
-	uint16_t index;
-	uint16_t len;
-} __packed;
-#define MGMT_HDR_SIZE	6

diff --git a/net-libs/libpcap/libpcap-1.8.1-r1.ebuild b/net-libs/libpcap/libpcap-1.8.1-r1.ebuild
index 8c51c5ee645..af93e87f6c2 100644
--- a/net-libs/libpcap/libpcap-1.8.1-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.8.1-r1.ebuild
@@ -43,9 +43,6 @@ PATCHES=(
 src_prepare() {
 	default
 
-#	mkdir bluetooth || die
-#	cp "${FILESDIR}"/mgmt.h bluetooth/ || die
-
 	eapply_user
 
 	echo ${PV} > VERSION || die

diff --git a/net-libs/libpcap/libpcap-1.8.1.ebuild b/net-libs/libpcap/libpcap-1.8.1.ebuild
index 62110c6267f..3a8543b92dd 100644
--- a/net-libs/libpcap/libpcap-1.8.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.8.1.ebuild
@@ -43,9 +43,6 @@ PATCHES=(
 src_prepare() {
 	default
 
-#	mkdir bluetooth || die
-#	cp "${FILESDIR}"/mgmt.h bluetooth/ || die
-
 	eapply_user
 
 	echo ${PV} > VERSION || die

diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 27f4a5e3810..28f3488e0ab 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,36 +13,32 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="bluetooth dbus netlink static-libs canusb"
+IUSE="bluetooth dbus netlink static-libs usb"
 KEYWORDS=""
 
 RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
-	canusb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
 	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.0-cross-linux.patch
-	"${FILESDIR}"/${PN}-1.6.1-configure.patch
 	"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
-	"${FILESDIR}"/${PN}-1.7.2-libnl.patch
+	"${FILESDIR}"/${PN}-9999-cross-linux.patch
+	"${FILESDIR}"/${PN}-9999-libnl.patch
+	"${FILESDIR}"/${PN}-9999-prefix-darwin.patch
 )
 
 src_prepare() {
 	default
 
-	mkdir bluetooth || die
-	cp "${FILESDIR}"/mgmt.h bluetooth/ || die
-
-	eapply_user
-
 	eautoreconf
 }
 
@@ -50,8 +46,8 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
 	econf \
 		$(use_enable bluetooth) \
-		$(use_enable canusb) \
 		$(use_enable dbus) \
+		$(use_enable usb) \
 		$(use_with netlink libnl)
 }
 

diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml
index eae7eecb145..488e8703b17 100644
--- a/net-libs/libpcap/metadata.xml
+++ b/net-libs/libpcap/metadata.xml
@@ -1,19 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>netmon@gentoo.org</email>
-    <name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
-  <use>
-    <flag name="netlink">
-      Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.
-    </flag>
-    <flag name="canusb">
-      Use <pkg>virtual/libusb</pkg> to support Controller Area Network over USB (CAN USB)
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">the-tcpdump-group/libpcap</remote-id>
-  </upstream>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<use>
+<flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.</flag>
+</use>
+<upstream>
+<remote-id type="github">the-tcpdump-group/libpcap</remote-id>
+</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/, net-libs/libpcap/files/
@ 2017-10-11  8:23 Jeroen Roovers
  0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers @ 2017-10-11  8:23 UTC (permalink / raw
  To: gentoo-commits

commit:     f1cd2d0b0d61bc2a23a1014783ea1d35e2819bdd
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 11 08:22:56 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Oct 11 08:23:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1cd2d0b

net-libs/libpcap: Drop obsolete patch (bug #633716).

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 net-libs/libpcap/files/libpcap-9999-cross-linux.patch | 16 ----------------
 net-libs/libpcap/libpcap-9999.ebuild                  |  1 -
 2 files changed, 17 deletions(-)

diff --git a/net-libs/libpcap/files/libpcap-9999-cross-linux.patch b/net-libs/libpcap/files/libpcap-9999-cross-linux.patch
deleted file mode 100644
index f01a9ca5c93..00000000000
--- a/net-libs/libpcap/files/libpcap-9999-cross-linux.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -317,7 +317,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,
- AC_HELP_STRING([--with-pcap=TYPE],[use packet capture TYPE]))

diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 28f3488e0ab..f7dcbffb9bf 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -31,7 +31,6 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
-	"${FILESDIR}"/${PN}-9999-cross-linux.patch
 	"${FILESDIR}"/${PN}-9999-libnl.patch
 	"${FILESDIR}"/${PN}-9999-prefix-darwin.patch
 )


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/, net-libs/libpcap/files/
@ 2018-01-15 17:31 Richard Farina
  0 siblings, 0 replies; 9+ messages in thread
From: Richard Farina @ 2018-01-15 17:31 UTC (permalink / raw
  To: gentoo-commits

commit:     5a6e3bf4e5f96760c494f80123af516ea68f268f
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 17:28:04 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 17:31:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a6e3bf4

net-libs/libpcap: import fix from debian for bug#602098

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/libpcap-1.8.1-disable-remote.patch       | 31 ++++++++
 net-libs/libpcap/libpcap-1.8.1-r2.ebuild           | 82 ++++++++++++++++++++++
 2 files changed, 113 insertions(+)

diff --git a/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch b/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch
new file mode 100644
index 00000000000..df68a5f0aa0
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch
@@ -0,0 +1,31 @@
+This patch was taken directly from debian: https://packages.debian.org/source/stretch/libpcap
+
+Disable bits of remote capture support inherited from the WinPCAP merge
+which cause applications to FTBFS if they define HAVE_REMOTE (#843384).
+
+--- a/pcap/pcap.h
++++ b/pcap/pcap.h
+@@ -506,6 +506,11 @@
+   #define MODE_STAT 1
+   #define MODE_MON 2
+ 
++#ifdef HAVE_REMOTE
++  /* Includes most of the public stuff that is needed for the remote capture */
++  #include <remote-ext.h>
++#endif	 /* HAVE_REMOTE */
++
+ #elif defined(MSDOS)
+ 
+   /*
+@@ -526,11 +531,6 @@
+ 
+ #endif /* _WIN32/MSDOS/UN*X */
+ 
+-#ifdef HAVE_REMOTE
+-  /* Includes most of the public stuff that is needed for the remote capture */
+-  #include <remote-ext.h>
+-#endif	 /* HAVE_REMOTE */
+-
+ #ifdef __cplusplus
+ }
+ #endif

diff --git a/net-libs/libpcap/libpcap-1.8.1-r2.ebuild b/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
new file mode 100644
index 00000000000..a8f06895f6d
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="
+	http://www.tcpdump.org/
+	https://github.com/the-tcpdump-group/libpcap
+"
+SRC_URI="
+	https://github.com/the-tcpdump-group/${PN}/archive/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bluetooth dbus netlink static-libs usb"
+
+RDEPEND="
+	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+"
+
+S=${WORKDIR}/${PN}-${P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
+	"${FILESDIR}"/${PN}-1.8.1-cross-compile.patch
+	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
+	"${FILESDIR}"/${PN}-1.8.1-libnl.patch
+	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
+	"${FILESDIR}"/${PN}-1.8.1-disable-remote.patch
+)
+
+src_prepare() {
+	default
+
+	eapply_user
+
+	echo ${PV} > VERSION || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable usb) \
+		$(use_enable dbus) \
+		$(use_with netlink libnl) \
+		--enable-ipv6
+}
+
+multilib_src_compile() {
+	emake all shared
+}
+
+multilib_src_install_all() {
+	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
+
+	# remove static libraries (--disable-static does not work)
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -exec rm {} + || die
+	fi
+	prune_libtool_files
+
+	# We need this to build pppd on G/FBSD systems
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		insinto /usr/include
+		doins pcap-int.h portability.h
+	fi
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/, net-libs/libpcap/files/
@ 2018-02-17 14:21 Jeroen Roovers
  0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers @ 2018-02-17 14:21 UTC (permalink / raw
  To: gentoo-commits

commit:     5cac5ad2a05eea8de21cb1d3c5839154870521a8
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 14:21:02 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 14:21:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cac5ad2

net-libs/libpcap: Fix parallel make issue by Geoff Levand (bug #647538).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-libs/libpcap/files/libpcap-9999-libnl.patch    | 22 ----------------------
 net-libs/libpcap/files/libpcap-9999-parallel.patch | 22 ++++++++++++++++++++++
 net-libs/libpcap/libpcap-1.8.1-r1.ebuild           |  7 +++----
 net-libs/libpcap/libpcap-1.8.1-r2.ebuild           |  3 ++-
 net-libs/libpcap/libpcap-1.8.1.ebuild              |  7 +++----
 net-libs/libpcap/libpcap-9999.ebuild               |  7 +++----
 6 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/net-libs/libpcap/files/libpcap-9999-libnl.patch b/net-libs/libpcap/files/libpcap-9999-libnl.patch
deleted file mode 100644
index f243906ebad..00000000000
--- a/net-libs/libpcap/files/libpcap-9999-libnl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -492,10 +492,6 @@
- 
-                 incdir=-I/usr/include/libnl3
-                 libnldir=
--                if test x$withval != x ; then
--                  libnldir=-L${withval}/lib/.libs
--                  incdir=-I${withval}/include
--                fi
- 
- 		#
- 		# Try libnl 3.x first.
-@@ -510,7 +506,7 @@
- 			AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
- 			AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
- 			AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
--			V_INCLS="$V_INCLS ${incdir}"
-+			V_INCLS="${incdir} $V_INCLS"
- 			have_any_nl="yes"
- 		],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
- 

diff --git a/net-libs/libpcap/files/libpcap-9999-parallel.patch b/net-libs/libpcap/files/libpcap-9999-parallel.patch
new file mode 100644
index 00000000000..61381a8e6d6
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-9999-parallel.patch
@@ -0,0 +1,22 @@
+From 0dd90a6bdbce4dca14106859eee63ef643a106e2 Mon Sep 17 00:00:00 2001
+From: Alfredo Alvarez Fernandez <alfredoalvarezernandez@gmail.com>
+Date: Tue, 21 Feb 2017 11:41:43 +0100
+Subject: [PATCH] Makefile.in: Fix missing dependency
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7044f0438..f5d443aed 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -465,7 +465,7 @@ grammar.h: grammar.c
+ 		$(MAKE) $(MAKEFLAGS) grammar.c; \
+ 	fi
+ 
+-grammar.o: grammar.c
++grammar.o: grammar.c scanner.h
+ 	$(CC) $(FULL_CFLAGS) -c grammar.c
+ 
+ gencode.o: $(srcdir)/gencode.c grammar.h scanner.h

diff --git a/net-libs/libpcap/libpcap-1.8.1-r1.ebuild b/net-libs/libpcap/libpcap-1.8.1-r1.ebuild
index af93e87f6c2..e3cfd9d2741 100644
--- a/net-libs/libpcap/libpcap-1.8.1-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.8.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils multilib-minimal
+inherit autotools multilib-minimal ltprune
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
 HOMEPAGE="
@@ -38,13 +38,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
 	"${FILESDIR}"/${PN}-1.8.1-libnl.patch
 	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
+	"${FILESDIR}"/${PN}-9999-parallel.patch
 )
 
 src_prepare() {
 	default
 
-	eapply_user
-
 	echo ${PV} > VERSION || die
 
 	eautoreconf

diff --git a/net-libs/libpcap/libpcap-1.8.1-r2.ebuild b/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
index a8f06895f6d..cbce63e8d61 100644
--- a/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
+++ b/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils multilib-minimal
+inherit autotools multilib-minimal ltprune
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
 HOMEPAGE="
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.1-libnl.patch
 	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
 	"${FILESDIR}"/${PN}-1.8.1-disable-remote.patch
+	"${FILESDIR}"/${PN}-9999-parallel.patch
 )
 
 src_prepare() {

diff --git a/net-libs/libpcap/libpcap-1.8.1.ebuild b/net-libs/libpcap/libpcap-1.8.1.ebuild
index 3a8543b92dd..e362e19d2b4 100644
--- a/net-libs/libpcap/libpcap-1.8.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils multilib-minimal
+inherit autotools multilib-minimal ltprune
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
 HOMEPAGE="
@@ -38,13 +38,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
 	"${FILESDIR}"/${PN}-1.8.1-libnl.patch
 	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
+	"${FILESDIR}"/${PN}-9999-parallel.patch
 )
 
 src_prepare() {
 	default
 
-	eapply_user
-
 	echo ${PV} > VERSION || die
 
 	eautoreconf

diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index f7dcbffb9bf..ad1d9345153 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils git-r3 multilib-minimal
+inherit autotools git-r3 multilib-minimal ltprune
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
 EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
@@ -31,7 +31,6 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
-	"${FILESDIR}"/${PN}-9999-libnl.patch
 	"${FILESDIR}"/${PN}-9999-prefix-darwin.patch
 )
 
@@ -55,7 +54,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
+	dodoc CREDITS CHANGES VERSION TODO README*
 
 	# remove static libraries (--disable-static does not work)
 	if ! use static-libs; then


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/, net-libs/libpcap/files/
@ 2019-08-24 10:11 Jeroen Roovers
  0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers @ 2019-08-24 10:11 UTC (permalink / raw
  To: gentoo-commits

commit:     01d9a85b1a301f0881bacfae238526536bb8626c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 24 10:06:58 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Aug 24 10:11:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01d9a85b

net-libs/libpcap: Update live ebuild

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 .../files/libpcap-9999-prefix-solaris.patch        | 35 ----------------------
 net-libs/libpcap/libpcap-9999.ebuild               |  1 -
 2 files changed, 36 deletions(-)

diff --git a/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch b/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch
deleted file mode 100644
index 358cb123ff2..00000000000
--- a/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Prefix' Solaris uses GNU ld
-
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -415,7 +415,7 @@
- 	    aix*)
- 		    ;;
- 
--	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*|haiku*|midipix*)
-+	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*|haiku*|midipix*|solaris*)
- 	    	    #
- 		    # Platforms where the linker is the GNU linker
- 		    # or accepts command-line arguments like
-@@ -429,10 +429,10 @@
- 		    PIC_OPT=-fpic
- 		    case "$host_cpu" in
- 
--		    sparc64*)
-+		    sparc64*|sparcv9*)
- 			case "$host_os" in
- 
--			freebsd*|openbsd*)
-+			freebsd*|solaris*|openbsd*)
- 			    PIC_OPT=-fPIC
- 			    ;;
- 			esac
-@@ -497,7 +497,7 @@
- 		    V_SHLIB_OPT="-G -bnoentry -bexpall"
- 		    ;;
- 
--	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
-+	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
- 		    #
- 		    # "cc" is GCC.
- 		    #

diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 45652829cdd..35c308e5a2b 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -31,7 +31,6 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-prefix-darwin.patch
-	"${FILESDIR}"/${PN}-9999-prefix-solaris.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/, net-libs/libpcap/files/
@ 2019-08-30 17:29 Jeroen Roovers
  0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers @ 2019-08-30 17:29 UTC (permalink / raw
  To: gentoo-commits

commit:     4f9ec75b4ecdcfa44e9b242d5feab6975df42912
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 17:27:25 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 17:29:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f9ec75b

net-libs/libpcap: Fix compiling on sparc64-linux-*

Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-libs/libpcap/files/libpcap-1.9.0-os.patch | 33 +++++++++++++++++++++++++++
 net-libs/libpcap/libpcap-1.9.0-r1.ebuild      |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/net-libs/libpcap/files/libpcap-1.9.0-os.patch b/net-libs/libpcap/files/libpcap-1.9.0-os.patch
new file mode 100644
index 00000000000..d3ec8014084
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.9.0-os.patch
@@ -0,0 +1,33 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -415,7 +415,7 @@
+ 	    aix*)
+ 		    ;;
+ 
+-	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
++	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
+ 	    	    #
+ 		    # Platforms where the linker is the GNU linker
+ 		    # or accepts command-line arguments like
+@@ -429,10 +429,10 @@
+ 		    PIC_OPT=-fpic
+ 		    case "$host_cpu" in
+ 
+-		    sparc64*)
++		    sparc64*|sparcv9*)
+ 			case "$host_os" in
+ 
+-			freebsd*|openbsd*)
++			freebsd*|solaris*|openbsd*|linux*)
+ 			    PIC_OPT=-fPIC
+ 			    ;;
+ 			esac
+@@ -497,7 +497,7 @@
+ 		    V_SHLIB_OPT="-G -bnoentry -bexpall"
+ 		    ;;
+ 
+-	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
++	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
+ 		    #
+ 		    # "cc" is GCC.
+ 		    #

diff --git a/net-libs/libpcap/libpcap-1.9.0-r1.ebuild b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
index 4d5a0121e31..38b37dbc6db 100644
--- a/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
@@ -33,10 +33,10 @@ DEPEND="
 S=${WORKDIR}/${PN}-${P/_}
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
 	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
 	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
 	"${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch
+	"${FILESDIR}"/${PN}-1.9.0-os.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/, net-libs/libpcap/files/
@ 2019-10-20  9:32 Jeroen Roovers
  0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers @ 2019-10-20  9:32 UTC (permalink / raw
  To: gentoo-commits

commit:     90da8c63c427e196caf5e8b8c7bbd5af52f0cc49
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 09:31:11 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 09:32:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90da8c63

net-libs/libpcap: Old

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-libs/libpcap/Manifest                          |  2 -
 .../files/libpcap-1.6.1-prefix-solaris.patch       | 35 ---------
 .../files/libpcap-1.8.1-cross-compile.patch        | 16 -----
 net-libs/libpcap/files/libpcap-1.8.1-darwin.patch  | 15 ----
 .../files/libpcap-1.8.1-disable-remote.patch       | 31 --------
 net-libs/libpcap/files/libpcap-1.8.1-libnl.patch   | 22 ------
 net-libs/libpcap/files/libpcap-1.9.0-os.patch      | 33 ---------
 net-libs/libpcap/files/libpcap-9999-parallel.patch | 22 ------
 net-libs/libpcap/libpcap-1.8.1-r2.ebuild           | 83 ----------------------
 net-libs/libpcap/libpcap-1.8.1.ebuild              | 80 ---------------------
 net-libs/libpcap/libpcap-1.9.0-r1.ebuild           | 78 --------------------
 net-libs/libpcap/libpcap-1.9.0.ebuild              | 77 --------------------
 12 files changed, 494 deletions(-)

diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index cfa9abb5df5..1ae3f9ec963 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,3 +1 @@
-DIST libpcap-1.8.1.tar.gz 753405 BLAKE2B f80fbd6451cf788fc43e5f2240e5ecb267ac98b57bca3fa56dd63576b57d10966bfacde5005d07282352fc2b30d8ef5964cbd126f8f63e565f1bb3dc6f8d9a1c SHA512 7e6a7351bb4213e1c3dd95ef7a460e91f733d933e39ba518ad8ba6d2f86b6e7cfa50ae667c8dc1300ef47bf8693ac8a1f18e068f41175ca5d0147a0b72278882
-DIST libpcap-1.9.0.tar.gz 819766 BLAKE2B bf98029eea58328c1c820966b100d8467373c9469c107bfe36bcf17e5250d64c45a331050b8a1027c4f4eb1600925b873e4fe43d866ba5a9dc5dcc7995137de1 SHA512 b94d63204f74fd155c1409c50b84c4a02d5b9db7069a24d42d496056416923183331f587903f9101d8464b74efc7db22f113c48e518bd7fb3082b333bbc337fd
 DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f

diff --git a/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch b/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
deleted file mode 100644
index 324aead551a..00000000000
--- a/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Prefix' Solaris uses GNU ld
-
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -415,7 +415,7 @@
- 	    aix*)
- 		    ;;
- 
--	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
-+	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
- 	    	    #
- 		    # Platforms where the linker is the GNU linker
- 		    # or accepts command-line arguments like
-@@ -429,10 +429,10 @@
- 		    PIC_OPT=-fpic
- 		    case "$host_cpu" in
- 
--		    sparc64*)
-+		    sparc64*|sparcv9*)
- 			case "$host_os" in
- 
--			freebsd*|openbsd*)
-+			freebsd*|solaris*|openbsd*)
- 			    PIC_OPT=-fPIC
- 			    ;;
- 			esac
-@@ -497,7 +497,7 @@
- 		    V_SHLIB_OPT="-G -bnoentry -bexpall"
- 		    ;;
- 
--	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
-+	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
- 		    #
- 		    # "cc" is GCC.
- 		    #

diff --git a/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch b/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch
deleted file mode 100644
index 361cdeb5ec5..00000000000
--- a/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -291,7 +291,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,
- AC_HELP_STRING([--with-pcap=TYPE],[use packet capture TYPE]))

diff --git a/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch b/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch
deleted file mode 100644
index 650bea82518..00000000000
--- a/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Prefix' Darwin systems are single arch, hijack Darwin7 case which assumes this setup
-Check for bluetooth/mgmt.h before use
-
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1117,7 +1117,7 @@
- 	if test "$enable_universal" != "no"; then
- 		case "$host_os" in
- 
--		darwin[0-7].*)
-+		darwin**)
- 			#
- 			# Pre-Tiger.  Build only for 32-bit PowerPC; no
- 			# need for any special compiler or linker flags.

diff --git a/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch b/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch
deleted file mode 100644
index df68a5f0aa0..00000000000
--- a/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-This patch was taken directly from debian: https://packages.debian.org/source/stretch/libpcap
-
-Disable bits of remote capture support inherited from the WinPCAP merge
-which cause applications to FTBFS if they define HAVE_REMOTE (#843384).
-
---- a/pcap/pcap.h
-+++ b/pcap/pcap.h
-@@ -506,6 +506,11 @@
-   #define MODE_STAT 1
-   #define MODE_MON 2
- 
-+#ifdef HAVE_REMOTE
-+  /* Includes most of the public stuff that is needed for the remote capture */
-+  #include <remote-ext.h>
-+#endif	 /* HAVE_REMOTE */
-+
- #elif defined(MSDOS)
- 
-   /*
-@@ -526,11 +531,6 @@
- 
- #endif /* _WIN32/MSDOS/UN*X */
- 
--#ifdef HAVE_REMOTE
--  /* Includes most of the public stuff that is needed for the remote capture */
--  #include <remote-ext.h>
--#endif	 /* HAVE_REMOTE */
--
- #ifdef __cplusplus
- }
- #endif

diff --git a/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch b/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch
deleted file mode 100644
index 61dfc4e201d..00000000000
--- a/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -453,10 +453,6 @@
- 
-                 incdir=-I/usr/include/libnl3
-                 libnldir=
--                if test x$withval != x ; then
--                  libnldir=-L${withval}/lib/.libs
--                  incdir=-I${withval}/include
--                fi
- 
- 		#
- 		# Try libnl 3.x first.
-@@ -471,7 +467,7 @@
- 			AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
- 			AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
- 			AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
--			V_INCLS="$V_INCLS ${incdir}"
-+			V_INCLS="${incdir} $V_INCLS"
- 			have_any_nl="yes"
- 		],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
- 

diff --git a/net-libs/libpcap/files/libpcap-1.9.0-os.patch b/net-libs/libpcap/files/libpcap-1.9.0-os.patch
deleted file mode 100644
index d3ec8014084..00000000000
--- a/net-libs/libpcap/files/libpcap-1.9.0-os.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -415,7 +415,7 @@
- 	    aix*)
- 		    ;;
- 
--	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
-+	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
- 	    	    #
- 		    # Platforms where the linker is the GNU linker
- 		    # or accepts command-line arguments like
-@@ -429,10 +429,10 @@
- 		    PIC_OPT=-fpic
- 		    case "$host_cpu" in
- 
--		    sparc64*)
-+		    sparc64*|sparcv9*)
- 			case "$host_os" in
- 
--			freebsd*|openbsd*)
-+			freebsd*|solaris*|openbsd*|linux*)
- 			    PIC_OPT=-fPIC
- 			    ;;
- 			esac
-@@ -497,7 +497,7 @@
- 		    V_SHLIB_OPT="-G -bnoentry -bexpall"
- 		    ;;
- 
--	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
-+	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
- 		    #
- 		    # "cc" is GCC.
- 		    #

diff --git a/net-libs/libpcap/files/libpcap-9999-parallel.patch b/net-libs/libpcap/files/libpcap-9999-parallel.patch
deleted file mode 100644
index 61381a8e6d6..00000000000
--- a/net-libs/libpcap/files/libpcap-9999-parallel.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0dd90a6bdbce4dca14106859eee63ef643a106e2 Mon Sep 17 00:00:00 2001
-From: Alfredo Alvarez Fernandez <alfredoalvarezernandez@gmail.com>
-Date: Tue, 21 Feb 2017 11:41:43 +0100
-Subject: [PATCH] Makefile.in: Fix missing dependency
-
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 7044f0438..f5d443aed 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -465,7 +465,7 @@ grammar.h: grammar.c
- 		$(MAKE) $(MAKEFLAGS) grammar.c; \
- 	fi
- 
--grammar.o: grammar.c
-+grammar.o: grammar.c scanner.h
- 	$(CC) $(FULL_CFLAGS) -c grammar.c
- 
- gencode.o: $(srcdir)/gencode.c grammar.h scanner.h

diff --git a/net-libs/libpcap/libpcap-1.8.1-r2.ebuild b/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
deleted file mode 100644
index 92a37da429b..00000000000
--- a/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal ltprune
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/libpcap
-"
-SRC_URI="
-	https://github.com/the-tcpdump-group/${PN}/archive/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth dbus netlink static-libs usb"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-"
-
-S=${WORKDIR}/${PN}-${P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
-	"${FILESDIR}"/${PN}-1.8.1-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
-	"${FILESDIR}"/${PN}-1.8.1-libnl.patch
-	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
-	"${FILESDIR}"/${PN}-1.8.1-disable-remote.patch
-	"${FILESDIR}"/${PN}-9999-parallel.patch
-)
-
-src_prepare() {
-	default
-
-	eapply_user
-
-	echo ${PV} > VERSION || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable usb) \
-		$(use_enable dbus) \
-		$(use_with netlink libnl) \
-		--enable-ipv6
-}
-
-multilib_src_compile() {
-	emake all shared
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-	prune_libtool_files
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h portability.h
-	fi
-}

diff --git a/net-libs/libpcap/libpcap-1.8.1.ebuild b/net-libs/libpcap/libpcap-1.8.1.ebuild
deleted file mode 100644
index 9fc1dee0199..00000000000
--- a/net-libs/libpcap/libpcap-1.8.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal ltprune
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/libpcap
-"
-SRC_URI="
-	https://github.com/the-tcpdump-group/${PN}/archive/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth dbus netlink static-libs usb"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-"
-
-S=${WORKDIR}/${PN}-${P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
-	"${FILESDIR}"/${PN}-1.8.1-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
-	"${FILESDIR}"/${PN}-1.8.1-libnl.patch
-	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
-	"${FILESDIR}"/${PN}-9999-parallel.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > VERSION || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable usb) \
-		$(use_enable dbus) \
-		$(use_with netlink libnl) \
-		--enable-ipv6
-}
-
-multilib_src_compile() {
-	emake all shared
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-	prune_libtool_files
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h
-	fi
-}

diff --git a/net-libs/libpcap/libpcap-1.9.0-r1.ebuild b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
deleted file mode 100644
index 4fcee8fb7f7..00000000000
--- a/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal ltprune
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/libpcap
-"
-SRC_URI="
-	https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth dbus netlink static-libs usb"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-"
-
-S=${WORKDIR}/${PN}-${P/_}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
-	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
-	"${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch
-	"${FILESDIR}"/${PN}-1.9.0-os.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > VERSION || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable usb) \
-		$(use_enable dbus) \
-		$(use_with netlink libnl) \
-		--enable-ipv6
-}
-
-multilib_src_compile() {
-	emake all shared
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-	prune_libtool_files
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h portability.h
-	fi
-}

diff --git a/net-libs/libpcap/libpcap-1.9.0.ebuild b/net-libs/libpcap/libpcap-1.9.0.ebuild
deleted file mode 100644
index 2aec97348ef..00000000000
--- a/net-libs/libpcap/libpcap-1.9.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal ltprune
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/libpcap
-"
-SRC_URI="
-	https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth dbus netlink static-libs usb"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
-"
-
-S=${WORKDIR}/${PN}-${P/_}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
-	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
-	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > VERSION || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable usb) \
-		$(use_enable dbus) \
-		$(use_with netlink libnl) \
-		--enable-ipv6
-}
-
-multilib_src_compile() {
-	emake all shared
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-	prune_libtool_files
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h portability.h
-	fi
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/, net-libs/libpcap/files/
@ 2020-08-31 21:16 Jeroen Roovers
  0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers @ 2020-08-31 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     78c662203203c528a69701612845e417db300eae
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 20:46:41 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 21:16:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c66220

net-libs/libpcap: Version 1.10.0_pre

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-libs/libpcap/Manifest                          |  1 +
 net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch | 14 ++++
 net-libs/libpcap/libpcap-1.10.0_pre.ebuild         | 86 ++++++++++++++++++++++
 3 files changed, 101 insertions(+)

diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 1ae3f9ec963..e437bfba26e 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1 +1,2 @@
+DIST libpcap-1.10.0-bp.tar.gz 911001 BLAKE2B bbcb1f48c5cbe8bfc46003cbf7c691e0b3a2051e319aa3ec761de045ac11bbacafe1a06b52c4cd332eb85e598a0a1ff5403ae7c3a611cc0cdd2eeab859587487 SHA512 c3d6047192ab1521687d856f2a954a38bfd8d42aedb853559a698ed3c24bfe5698efb6f81c0280b696229165c1088a58471e8d62f071343fcb14b1464f65fe3f
 DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f

diff --git a/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch b/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch
new file mode 100644
index 00000000000..e5524ac3bae
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2225,10 +2225,7 @@
+       AC_DEFINE(PCAP_SUPPORT_LINUX_USBMON, 1, [target host supports Linux usbmon for USB sniffing])
+       MODULE_C_SRC="$MODULE_C_SRC pcap-usb-linux.c"
+       AC_MSG_RESULT(yes)
+-      ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null`
+-      if test $? -ne 0 ; then
+-        ac_usb_dev_name="usbmon"
+-      fi
++      ac_usb_dev_name="usbmon"
+       AC_DEFINE_UNQUOTED(LINUX_USB_MON_DEV, "/dev/$ac_usb_dev_name", [path for device for USB sniffing])
+       AC_MSG_NOTICE(Device for USB sniffing is /dev/$ac_usb_dev_name)
+       #

diff --git a/net-libs/libpcap/libpcap-1.10.0_pre.ebuild b/net-libs/libpcap/libpcap-1.10.0_pre.ebuild
new file mode 100644
index 00000000000..5fed64f7508
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.10.0_pre.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="
+	https://www.tcpdump.org/
+	https://github.com/the-tcpdump-group/libpcap
+"
+SRC_URI="
+	https://github.com/the-tcpdump-group/${PN}/archive/${P/_pre/-bp}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
+
+RDEPEND="
+	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	rdma? ( sys-cluster/rdma-core )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${PN}-${P/_pre/-bp}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
+	"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
+)
+
+src_prepare() {
+	default
+
+	if ! [[ -f VERSION ]]; then
+		echo ${PV} > VERSION || die
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable dbus) \
+		$(use_enable rdma) \
+		$(use_enable remote) \
+		$(use_enable usb) \
+		$(use_enable yydebug) \
+		$(use_with netlink libnl) \
+		--enable-ipv6
+}
+
+multilib_src_compile() {
+	emake all shared
+}
+
+multilib_src_install_all() {
+	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
+
+	# remove static libraries (--disable-static does not work)
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -exec rm {} + || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# We need this to build pppd on G/FBSD systems
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		insinto /usr/include
+		doins pcap-int.h portability.h
+	fi
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2020-08-31 21:16 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-31 21:16 [gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/, net-libs/libpcap/files/ Jeroen Roovers
  -- strict thread matches above, loose matches on Subject: below --
2019-10-20  9:32 Jeroen Roovers
2019-08-30 17:29 Jeroen Roovers
2019-08-24 10:11 Jeroen Roovers
2018-02-17 14:21 Jeroen Roovers
2018-01-15 17:31 Richard Farina
2017-10-11  8:23 Jeroen Roovers
2017-05-25 10:08 Jeroen Roovers
2016-10-26  9:04 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox