diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-16 04:58:57 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-16 05:33:13 +0000 |
| commit | 8c16aaa2be0e0e8072d712b3dcfd48d58b6cec76 (patch) | |
| tree | 99d9eb4a3ef1019246cc3f86cad1f213250e87dd /net-analyzer/tcpdump | |
| parent | net-analyzer/tcpdump: use live template (diff) | |
| download | gentoo-8c16aaa2be0e0e8072d712b3dcfd48d58b6cec76.tar.gz gentoo-8c16aaa2be0e0e8072d712b3dcfd48d58b6cec76.tar.bz2 gentoo-8c16aaa2be0e0e8072d712b3dcfd48d58b6cec76.zip | |
net-analyzer/tcpdump: add verify-sig support
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-analyzer/tcpdump')
| -rw-r--r-- | net-analyzer/tcpdump/Manifest | 3 | ||||
| -rw-r--r-- | net-analyzer/tcpdump/tcpdump-4.99.0.ebuild | 13 | ||||
| -rw-r--r-- | net-analyzer/tcpdump/tcpdump-9999.ebuild | 11 |
3 files changed, 22 insertions, 5 deletions
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest index cd74edc21c66..763bfb1acbb8 100644 --- a/net-analyzer/tcpdump/Manifest +++ b/net-analyzer/tcpdump/Manifest @@ -1,2 +1,3 @@ DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22 -DIST tcpdump-4.99.0.tar.gz 1876161 BLAKE2B 5ad7e7f888f56fac92ef3c01229ba03b45cfd706d7a904a10118b65c73aa6c5c1d39f54b7139c72116b67ed2971566596ae51d65de8528116b3a81bbcc7f52ab SHA512 921c27bdd803de9ecebe735a3efc82ac87c4efbd47949119241b8290ed1a015c25d252e428d5bf3b8e275e5b084d19bafb31020b1b3e241202cbc42f1f1d4801 +DIST tcpdump-4.99.0-upstream.tar.gz 2008080 BLAKE2B 389939ea501edf66b7bb809c835feffebf15f30fbba559ce40963733a79ca271982336884acd7ff3d078decb1aaea0616d98091199918b520ef3d1fe0f194431 SHA512 03a434ec41c0026f237bc1e7a928b7ce67dbc342a8d982caded93d987bd356faf706a9d884231bd94f5e2a8580499fe95a28728e37a6672e371a1501ec5d6f79 +DIST tcpdump-4.99.0-upstream.tar.gz.sig 442 BLAKE2B a6cafbccdc1ecfb236a643b72114411e173cc898cda41edeac0c9755e48980f2d44f54c1f52b23dd992890b5aaa57e19430a600662e623832ccc62bfb7ac6fb4 SHA512 545770f09bec2f4ab3e723ab8582f1256eb0cb774ac2f329de17a45ee8256faea49469b796e17250d10c0455b305d39283c9b1d8b3c5a06c47a0d8088c874803 diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild index 98642f217869..d06df7164dbd 100644 --- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild +++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild @@ -13,8 +13,13 @@ if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" else - SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz" - S="${WORKDIR}/${PN}-${P/_}" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc + inherit verify-sig + + # Note: drop -upstream on bump, this is just because we switched to the official + # distfiles for verify-sig + SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz" + SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" fi @@ -53,6 +58,10 @@ DEPEND=" " BDEPEND="drop-root? ( virtual/pkgconfig )" +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )" +fi + PATCHES=( "${FILESDIR}"/${PN}-9999-libdir.patch ) diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild index db5f72d97ac2..3e4c338aca2d 100644 --- a/net-analyzer/tcpdump/tcpdump-9999.ebuild +++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild @@ -13,8 +13,11 @@ if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" else - SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz" - S="${WORKDIR}/${PN}-${P/_}" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc + inherit verify-sig + + SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi @@ -53,6 +56,10 @@ DEPEND=" " BDEPEND="drop-root? ( virtual/pkgconfig )" +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-tcpdump )" +fi + PATCHES=( "${FILESDIR}"/${PN}-9999-libdir.patch ) |