1 |
commit: f7a0467760358bdf4042b0a162dd61f880ff1b90 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 1 02:34:52 2023 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 1 02:34:52 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a04677 |
7 |
|
8 |
net-libs/libpcap: add 1.10.2 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
net-libs/libpcap/Manifest | 2 ++ |
13 |
.../{libpcap-9999.ebuild => libpcap-1.10.2.ebuild} | 16 ++++------------ |
14 |
net-libs/libpcap/libpcap-9999.ebuild | 16 ++++------------ |
15 |
3 files changed, 10 insertions(+), 24 deletions(-) |
16 |
|
17 |
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest |
18 |
index 87ff3b256453..ee7a63215c96 100644 |
19 |
--- a/net-libs/libpcap/Manifest |
20 |
+++ b/net-libs/libpcap/Manifest |
21 |
@@ -1,2 +1,4 @@ |
22 |
DIST libpcap-1.10.1-upstream.tar.gz 935221 BLAKE2B 0ec028e5d026a97b92ba6f23f88daf36b827eee08a752a0162fbabd1b5a2a70141ec403b6ff26dc3eb25ca5c6630c9c2f60f05b33161770da3d5e829c4eecdc6 SHA512 56c314f19c2b857742bf8abcb1e78066986aaa95cec339b75a3c8b70a9fa2b5167da98708352f9ec97a1cea2700cfb4e040bda108d58ac46cec9b7deab88d171 |
23 |
DIST libpcap-1.10.1-upstream.tar.gz.sig 442 BLAKE2B b76bf3c40a923b6c8fb9a356dff49a90e30dd0b0d785f138ac56bf1a41ad3a6fcfa3d5b3d28c12543857c5616b8938108b06313e35e4474d50991b72d9d371c8 SHA512 f9807efd11d99524b247981e5f4f02e1ffbeaa8468a9a22c66f9931a894071b9182164807b9fd11436883d36e8b0c6cc62302852005d958e34b5236e20caa33d |
24 |
+DIST libpcap-1.10.2.tar.gz 951063 BLAKE2B f8280c8e12065b4d86e451df8504c834da9c94b25029f0e5c22359d0ce35cf4e3490fa3343d0112209600ea01ffa54249c82c20e2859515884daee759e4a5e9b SHA512 ccacebf367db44ab74e588f88a4fd7cd82c58e478e6c35414ae36df58fb06d85d542597485b1d1393edfaacc2bc5d35578b7b87fee4965f6dfde10a03d2ddd32 |
25 |
+DIST libpcap-1.10.2.tar.gz.sig 442 BLAKE2B c470ff70e58c13dfd1a6d72a00d83883515b9ca63e1561b3acbb75d744b043726df9b8dcb70dfa5ea1c0fa54624a407364d85e83fd3ec4dfd605aa401f5351df SHA512 122bf14c2525a05b2781f6d7bc029d73bcf4584c184220b9f9716def327cc0521ec78d658ad58bdf8a9cd9415ab9ad4d1d24ed1880db25ace6a01a93786bcc5e |
26 |
|
27 |
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-1.10.2.ebuild |
28 |
similarity index 85% |
29 |
copy from net-libs/libpcap/libpcap-9999.ebuild |
30 |
copy to net-libs/libpcap/libpcap-1.10.2.ebuild |
31 |
index 6f83d33095c3..9bda8d87fb64 100644 |
32 |
--- a/net-libs/libpcap/libpcap-9999.ebuild |
33 |
+++ b/net-libs/libpcap/libpcap-1.10.2.ebuild |
34 |
@@ -1,7 +1,7 @@ |
35 |
-# Copyright 1999-2022 Gentoo Authors |
36 |
+# Copyright 1999-2023 Gentoo Authors |
37 |
# Distributed under the terms of the GNU General Public License v2 |
38 |
|
39 |
-EAPI=7 |
40 |
+EAPI=8 |
41 |
|
42 |
inherit autotools multilib-minimal |
43 |
|
44 |
@@ -15,10 +15,8 @@ else |
45 |
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc |
46 |
inherit verify-sig |
47 |
|
48 |
- # Note: drop -upstream on bump, this is just because we switched to the official |
49 |
- # distfiles for verify-sig |
50 |
- SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz" |
51 |
- SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )" |
52 |
+ SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" |
53 |
+ SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" |
54 |
|
55 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" |
56 |
fi |
57 |
@@ -47,12 +45,6 @@ if [[ ${PV} != *9999* ]] ; then |
58 |
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )" |
59 |
fi |
60 |
|
61 |
-PATCHES=( |
62 |
- "${FILESDIR}"/${PN}-1.10.0-usbmon.patch |
63 |
- |
64 |
- "${FILESDIR}"/${PN}-1.10.1-pcap-config.patch |
65 |
-) |
66 |
- |
67 |
src_prepare() { |
68 |
default |
69 |
|
70 |
|
71 |
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild |
72 |
index 6f83d33095c3..9bda8d87fb64 100644 |
73 |
--- a/net-libs/libpcap/libpcap-9999.ebuild |
74 |
+++ b/net-libs/libpcap/libpcap-9999.ebuild |
75 |
@@ -1,7 +1,7 @@ |
76 |
-# Copyright 1999-2022 Gentoo Authors |
77 |
+# Copyright 1999-2023 Gentoo Authors |
78 |
# Distributed under the terms of the GNU General Public License v2 |
79 |
|
80 |
-EAPI=7 |
81 |
+EAPI=8 |
82 |
|
83 |
inherit autotools multilib-minimal |
84 |
|
85 |
@@ -15,10 +15,8 @@ else |
86 |
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc |
87 |
inherit verify-sig |
88 |
|
89 |
- # Note: drop -upstream on bump, this is just because we switched to the official |
90 |
- # distfiles for verify-sig |
91 |
- SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz" |
92 |
- SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )" |
93 |
+ SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" |
94 |
+ SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" |
95 |
|
96 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" |
97 |
fi |
98 |
@@ -47,12 +45,6 @@ if [[ ${PV} != *9999* ]] ; then |
99 |
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )" |
100 |
fi |
101 |
|
102 |
-PATCHES=( |
103 |
- "${FILESDIR}"/${PN}-1.10.0-usbmon.patch |
104 |
- |
105 |
- "${FILESDIR}"/${PN}-1.10.1-pcap-config.patch |
106 |
-) |
107 |
- |
108 |
src_prepare() { |
109 |
default |