summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2017-05-25 12:07:48 +0200
committerJeroen Roovers <jer@gentoo.org>2017-05-25 12:07:48 +0200
commitab53ab4aae8804e6dd6300b7cb813a41b7119c9b (patch)
tree7b06423e9a1c9001388a625800416d8f5b4ceb0e /net-libs/libpcap
parentkde-frameworks/kcoreaddons: Don't run tests in parallel (diff)
downloadgentoo-ab53ab4aae8804e6dd6300b7cb813a41b7119c9b.tar.gz
gentoo-ab53ab4aae8804e6dd6300b7cb813a41b7119c9b.tar.bz2
gentoo-ab53ab4aae8804e6dd6300b7cb813a41b7119c9b.zip
net-libs/libpcap: Update live ebuild.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'net-libs/libpcap')
-rw-r--r--net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch1
-rw-r--r--net-libs/libpcap/files/libpcap-9999-cross-linux.patch (renamed from net-libs/libpcap/files/libpcap-1.2.0-cross-linux.patch)6
-rw-r--r--net-libs/libpcap/files/libpcap-9999-libnl.patch (renamed from net-libs/libpcap/files/libpcap-1.7.2-libnl.patch)8
-rw-r--r--net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch (renamed from net-libs/libpcap/files/libpcap-1.6.1-configure.patch)7
-rw-r--r--net-libs/libpcap/files/mgmt.h33
-rw-r--r--net-libs/libpcap/libpcap-1.8.1-r1.ebuild3
-rw-r--r--net-libs/libpcap/libpcap-1.8.1.ebuild3
-rw-r--r--net-libs/libpcap/libpcap-9999.ebuild22
-rw-r--r--net-libs/libpcap/metadata.xml25
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
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
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
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>