summaryrefslogtreecommitdiff
path: root/net-libs/libpcap
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-02-17 20:03:52 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-02-17 20:03:52 +0000
commit4935506e9a5cbfabd37c64093eac5f36c2ff0017 (patch)
treeaf9dd93ea349eacaf28286c7c45c7a083b0b7c31 /net-libs/libpcap
parent434d713861b70f6c6563d6ee50a8e64f14c970d9 (diff)
gentoo resync : 17.02.2018
Diffstat (limited to 'net-libs/libpcap')
-rw-r--r--net-libs/libpcap/Manifest10
-rw-r--r--net-libs/libpcap/files/libpcap-9999-libnl.patch22
-rw-r--r--net-libs/libpcap/files/libpcap-9999-parallel.patch22
-rw-r--r--net-libs/libpcap/libpcap-1.8.1-r1.ebuild7
-rw-r--r--net-libs/libpcap/libpcap-1.8.1-r2.ebuild3
-rw-r--r--net-libs/libpcap/libpcap-1.8.1.ebuild7
-rw-r--r--net-libs/libpcap/libpcap-9999.ebuild7
7 files changed, 38 insertions, 40 deletions
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 59164074d3b1..ba3e49c2dcf3 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -4,11 +4,11 @@ AUX libpcap-1.8.1-darwin.patch 395 BLAKE2B 629e349f4734ed1fd234082abf06eb2b1280c
AUX libpcap-1.8.1-disable-remote.patch 776 BLAKE2B 085500b64c4f1da871b0ca13115dd95981f96279581908dd5bd779187970c82423531bcbd916955cc3deb1e15b71488adc9dcb5a92207cded6f162d7e137f3a8 SHA512 929243aa68ecf8ee4605fc993a9c64d1b7dba29990765f60a44c158ac7cc8c64f2c06861eae441cf8ee7379ebf3067ba5a2cd2df859212010180e85d2c3c6cd4
AUX libpcap-1.8.1-libnl.patch 688 BLAKE2B 8f3c68374815f86c894c5fb9d29969bb5b76f757cf7e35e44b4d0021a2b67b3a39b70dd070070fd8a82ab68550e2c60bfbf4eb8a95e6a5c478316eceb398b4ad SHA512 f56a8f4b87c2f9bfb70e2b31b2e4dcb4fb80654b13cf541f9ff42f193cb9bb4e90a3ad9ef7e91c6ebc8667525bfc75ab78b54381d3f1709f10aaf9f48fd3a1f0
AUX libpcap-1.8.1-usbmon.patch 522 BLAKE2B 27f464db028d8b2cbc1f4651ebb79b7a7042a2a1bdb97e5c1334e64b27cd969ea6a2f8d9d6301e4a4ec48dec2cec0e53cd68c887bbc445ab056a1f603696a34e SHA512 489c2f20e7935e47d478efb1077e3cf3806614651cdbd6312d0378989c71409e870f9d0fb9d496cf00b7076d8d001714c56d0444144eedbab47c6ed3afd3bf90
-AUX libpcap-9999-libnl.patch 688 BLAKE2B f4f7a29ae843f652e5a3c55e9eb1ab1bbc3ec43933d87232c84ced9077ca0ad88ec18e71a30c3c3b93e2b8b57555e43ddb99c90d8cabdc83509e0d4e70e2c611 SHA512 e7d839e10335d0a04592efae13031c701fd222e88910e0a4dceeafa2c3bcf3aa8ae726710c963dd2b4c53088af4f4d154d73e41d86dbd723511633628b174fd3
+AUX libpcap-9999-parallel.patch 640 BLAKE2B cb1b081fba0b53af09ead5e4c0bc3e5b7856ad2c0ebaf68dc99b8a375158a112c47e0dfad7763caff7b0f7da8ce5b1ebfcb79a6cf3cf72636605dfd4097fb711 SHA512 82e0c48f2fc42c8df4a21009b9afac18ca4aaa14db822c0c85b4ea420434391dec3b5da90261d7afe01879354b43ef425c7464c9fe98a407a4b232590e361117
AUX libpcap-9999-prefix-darwin.patch 394 BLAKE2B b54df9fa5f1d796ad4739b2ae4ea55a8b66fc2ba434438a0e17cbd7ca5bfaf5d1611e0d8431be45d3fb80dbd61bc2bda2b6fa50378da4780154b4ce523a688d8 SHA512 bfd560b1bba72a84c5afa1cdf166944e9ede10cb817c7273941b3fc0838ca2676adfd143c0e8873f234de343aabb2177f46f2cd062738d2837d42a1da7370083
DIST libpcap-1.8.1.tar.gz 753405 BLAKE2B f80fbd6451cf788fc43e5f2240e5ecb267ac98b57bca3fa56dd63576b57d10966bfacde5005d07282352fc2b30d8ef5964cbd126f8f63e565f1bb3dc6f8d9a1c SHA512 7e6a7351bb4213e1c3dd95ef7a460e91f733d933e39ba518ad8ba6d2f86b6e7cfa50ae667c8dc1300ef47bf8693ac8a1f18e068f41175ca5d0147a0b72278882
-EBUILD libpcap-1.8.1-r1.ebuild 1924 BLAKE2B b980119431c525003c7bd210ee0a1d5c017cc221174639d443015d2922c7266896df57eb90ba0d6881e31a947623a4d7d3cea104653094d347682a0905987edd SHA512 fcf5ddcc40205e24d5654b01b34f065df81c64f8e2b6bc33c0e97b693f00a27bc98a7bb764548487156519a78c9690569dadfcca3f3981eab7ecedc216d44911
-EBUILD libpcap-1.8.1-r2.ebuild 1972 BLAKE2B 69ac3ae188c55a9d5abafe86b77976e7ecad1c117dcd6663228f280aad9c16fcbc3f3e570521db335ede5fe2975eb37eee892023b339a77dfcb117a693acd4bc SHA512 a8d536a92fe6e9ad0b4a24a5c43b185a001ba9ea813e93fd9b906a454601e3d52d0eb6bfc66deedbba9917d6db5af9c2b559040467c153a03b8cc7b8ee5e9e1b
-EBUILD libpcap-1.8.1.ebuild 1900 BLAKE2B 1d0e210ddd94eef7e55077b55b6db4564503267b5fd2190ba528a3c1c1e642b4babef11d2f756279f70676576dd750880d6ad3e937a5a82187a6583907cd41fc SHA512 82f191130f7ae698489ff3011a7d943d9567eaf45155ec3b584a6f6ae383649261c6369e665e61de04baa12dcf674287425db42b88f0b31163753fcdaea549b5
-EBUILD libpcap-9999.ebuild 1571 BLAKE2B 0b14fe43dc352586c11b70dfa0ae4c77ee3055dfb52c736e882c12ca420536dd9885ef2ad8271ace1853af4e2e990d53ed3db4e530e4be597a6bd0f0710399f8 SHA512 755d4f7f5c1a9651fe2476a5053d9b5c463e029a9eb70d7069798cae0ee3dd958cc771587a92f75f4f43e9382d4171acff3802773e4e87e5d0b63b27e9c4d55f
+EBUILD libpcap-1.8.1-r1.ebuild 1952 BLAKE2B 5bd058d1c738a3e8b19c3b63a9b7c7860dd7ddeebaf547c839fe4c99f0a543724a94af0f45f71b33ab9a47f02801a91aa0e6d11cf9d8df2b8af8f2fcc3a7648c SHA512 cd158b14c41661e28f87dc2ce6d82d037ab243fbbaf231057943079c23ed1116591262adde4a314ff7b9717969b3f722e33990598f7a93bfe47b91c1b2b4c70c
+EBUILD libpcap-1.8.1-r2.ebuild 2014 BLAKE2B 946e33f229507957e49927fd17cca8bab97b40aae6f26f94a0428961aedd9c6c1f795e574fdd406d419e4b3388176226d15fce66422c055660c34a61ae2a91bd SHA512 d9a4f50d26a7bb0ea07ae0ba9e8f01174cd22abe9f3df6db1af7fbd4e9d762d6f0e48891d3a117ef72fbd8bfca63fd80bd8864c3352d5ceaa937ad59ae9f5497
+EBUILD libpcap-1.8.1.ebuild 1928 BLAKE2B 56d070b51f9432c3b6f67f33f80b260ea922e7e378cbe544c282f0c8a6bc46ae47162358a34b721279b43fe5e3ae17030298d5ac9a04958fb6363c744c8c705a SHA512 f0edfcad21e76a9a6ba6fcf61aa23278899825cf957aeb82a0cdc5a4b8c44bb9941a87b24cec4f1c77763b8f988398f922d76a1d65582073f4fd441f8886175d
+EBUILD libpcap-9999.ebuild 1505 BLAKE2B 0071ca57d3c8d1dd7601b5b52e3e3fbb9f45fea0afb9361557856b31bf1ccdfd6d408c1adf46e54d619f55a99eccc18faff6919f5412782960012102d0ec240d SHA512 06600088a52b75baa2c2a4aa90a5c6d8dbae5cbe54d5b74d5702d0adcf762a72c6546ff151b2750a45fb1e7fa20f621c0d9e59e83cc5f370cf91762a97a72e24
MISC metadata.xml 475 BLAKE2B a914e052c15c557f921c504f0cf128704ed8854bd8107dd2019a5584dd86f80ad06545ef8780e01447c309801207e2f83e286a90ad755ddebd7447d27bba1336 SHA512 ff92cbd5725e74f72d117b57d85858851ddf3b27046bf7d5b9e29cac8e07c98bb21e2a81ff8ffcec08adb062a42deb051019d60911a8b86ecd232a37e1b88170
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 f243906ebad2..000000000000
--- 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 000000000000..61381a8e6d6c
--- /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 af93e87f6c24..e3cfd9d27415 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 a8f06895f6d2..cbce63e8d61c 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 3a8543b92dd7..e362e19d2b4d 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 f7dcbffb9bf8..ad1d93451530 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-21 14:46:29 +0000