commit: 6082420412f4762700deea04d87b3e66d480ab5a Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com> AuthorDate: Sun Jan 21 21:20:29 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jan 22 05:54:51 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60824204
net-p2p/qbittorrent: add verify-sig support Upstream has signed the official tarballs for like a decade. The current SRC_URI was using github autogenerated tarballs of unknown provenance instead... Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> net-p2p/qbittorrent/Manifest | 5 ++++- net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild | 13 +++++++++---- net-p2p/qbittorrent/qbittorrent-4.6.2-r1.ebuild | 13 +++++++++---- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest index 02d87c5bb3c6..f04c83f371e8 100644 --- a/net-p2p/qbittorrent/Manifest +++ b/net-p2p/qbittorrent/Manifest @@ -1,4 +1,7 @@ DIST qbittorrent-4.5.2.tar.gz 8890525 BLAKE2B 48585b703ce6edf862ea3c8cfad6cab2edcb65a138c6e8d232322b4f4fd682c87447ff11d29c04c26b5623e730ab9a1ce0496456b3ba6122f97913bd92b86790 SHA512 e900a1c5f0f70163463557aec3de0d31394fac56cfed91ea53ee5cf852cce4b2998bf79be60fc547c1c34a1658378f3ed9dbfb30aae5a772b85d819c7e7ce458 DIST qbittorrent-4.5.4.tar.gz 8791236 BLAKE2B 70b3194d6c4819655998406e0a13d22f3a5068e724048010daebd83d8b8db9e17daee943ca8dabaacd92a0fbc5249257de6d175b35287c748dc2d15395bd71fc SHA512 2e7988922137c9fade99e90236cc0c5b8b30f09021472f8ffc9048a7a2d989925eed7bfab4d79c93ca7d0f21acfde2e7feee5e6c43b557bf2c6f472fd52fbcea DIST qbittorrent-4.5.5.tar.gz 8802492 BLAKE2B 1d20d7900b5b65603c5cf13452fb5aebe396473290d4904641b78867c5345d783482c46edc7042a2e86e79afd790e8c470df62131595eba288f195cc5e716eec SHA512 8b5c2654b3bc03c0b4de77e8388ee543c3892ef9453749ea737aaee999a16d50bd1b30ebe0519a86d7ab8ffc6224d7d9cf678464aebf96433cd71dd57b46dd53 -DIST qbittorrent-4.6.2.tar.gz 9058275 BLAKE2B b55de1ab7cd08fe4ee6d89eb269b884abea6cb478cc65f74a8e2f718f16919248d7e7cf01f10b5c4065d978d5ad906a60320c336a5cda8beeae7d4fe8cc6c25d SHA512 04977ae048a7f377b5d6a3091b93bbb84b085be9fb48a4096104fd00b77aaf41c8e62f6b527e69a92ce2ab604e95a91222d5f286b9219d094777833c302418e4 +DIST qbittorrent-4.5.5.tar.xz 4352524 BLAKE2B 16252e43ca7dc5090bd385079ee2116cb03945808a0a5150ff9fa3573f31eab1ecfa9daff4bb1fd250373b282fb38902c169d412f5c24588eececd2446b8f988 SHA512 178e41d97067f94ff9d24cc62a24178c260116c1e4d6a12785fcb392d8391664c9ae054b46c623510a11c3ee753ae115fbfc40db09ddc4dc218c4b28942062ea +DIST qbittorrent-4.5.5.tar.xz.asc 849 BLAKE2B d9d3d18c0c26898eccbad2c92b62f4f72f71f132cfbad5aa7ecefe0bde70f1e5890a2b6051178e98eacafb770a58ec3f55d6d0f5d29c5c32ffc33b4b47667b54 SHA512 3a7215d711fa89e88c47cebdfed57d059dad93836b2dd75b89e39ea46c97820212efb01334eee6149adca3b8dc0eec88f0be6ed71fca8764871428a992409d66 +DIST qbittorrent-4.6.2.tar.xz 4506224 BLAKE2B 74c2fa8ffdb6e0787559e943dd6e2c4d09b4d6bc6c72db01e47a001a99599bf7d6b12c0cd954b8db3bdacd2db5bb445d28e04d6abe6114b05242c3f5b5b2b56d SHA512 e4363a30bd722d4bd8144c484830caad5610ca273d40395e593e5b37b94f11f4a786481a770b847ee24517cb355d9bc2e27d07f2c66d4e852d1061a8edb7a75f +DIST qbittorrent-4.6.2.tar.xz.asc 849 BLAKE2B 639dc8a75a926c9ec7ff42e52c93d33aa5494b6c64848778ad885d059c0272239c92fa935bcdab6477c4a20329d2c7538bdb9df5893a5e4264a604e264ed911e SHA512 ced33ae194a18c82c39318c07f160d5cc4a4f7ebebffb03cb16a555e4f277ad8d1305ec0e7c476bb51c5c50004501dbde6a729d05f1b557138414bab52ee21f9 diff --git a/net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild b/net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild index 59e8d99bcc36..a98b2347ddef 100644 --- a/net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake edo multibuild systemd xdg +inherit cmake edo multibuild systemd verify-sig xdg DESCRIPTION="BitTorrent client in C++ and Qt" HOMEPAGE="https://www.qbittorrent.org"; @@ -12,9 +12,14 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git"; inherit git-r3 else - SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + mirror://sourceforge/qbittorrent/${P}.tar.xz + verify-sig? ( mirror://sourceforge/qbittorrent/${P}.tar.xz.asc ) + " KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" - S="${WORKDIR}"/qBittorrent-release-${PV} + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc fi LICENSE="GPL-2" @@ -59,7 +64,7 @@ DEPEND=" test? ( !qt6? ( dev-qt/qttest:5 ) )" -BDEPEND=" +BDEPEND+=" !qt6? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) virtual/pkgconfig" diff --git a/net-p2p/qbittorrent/qbittorrent-4.6.2-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.6.2-r1.ebuild index 1c8f0230fd60..c52bd5d5331f 100644 --- a/net-p2p/qbittorrent/qbittorrent-4.6.2-r1.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-4.6.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake edo multibuild systemd xdg +inherit cmake edo multibuild systemd verify-sig xdg DESCRIPTION="BitTorrent client in C++ and Qt" HOMEPAGE="https://www.qbittorrent.org"; @@ -12,9 +12,14 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git"; inherit git-r3 else - SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + mirror://sourceforge/qbittorrent/${P}.tar.xz + verify-sig? ( mirror://sourceforge/qbittorrent/${P}.tar.xz.asc ) + " KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" - S="${WORKDIR}"/qBittorrent-release-${PV} + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc fi LICENSE="GPL-2" @@ -59,7 +64,7 @@ DEPEND=" test? ( !qt6? ( dev-qt/qttest:5 ) )" -BDEPEND=" +BDEPEND+=" !qt6? ( dev-qt/linguist-tools:5 ) qt6? ( >=dev-qt/qttools-6.2:6[linguist] ) virtual/pkgconfig"
