commit: 2ba00561802481ff7ab940e09581d43c6142695f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Feb 5 19:24:21 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Feb 7 05:10:17 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba00561
net-vpn/tinc: wire up verify-sig Signed-off-by: Sam James <sam <AT> gentoo.org> Part-of: https://github.com/gentoo/gentoo/pull/45648 Closes: https://github.com/gentoo/gentoo/pull/45648 net-vpn/tinc/Manifest | 2 ++ net-vpn/tinc/tinc-1.0.36-r1.ebuild | 11 +++++++++-- net-vpn/tinc/tinc-1.1_pre18-r2.ebuild | 25 +++++++++++++++++-------- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest index 00ec92b71c07..e1e1a09ca7eb 100644 --- a/net-vpn/tinc/Manifest +++ b/net-vpn/tinc/Manifest @@ -1,2 +1,4 @@ DIST tinc-1.0.36.tar.gz 500320 BLAKE2B 6f799ab04f9553fa389baf9d60121540b1fc7d5b5c2b62b2ebe0bf7478f5f69e8638a9c1b15f8ab84268d813ac1b1978c73b12a478b682cd808747fd2eed951c SHA512 23af9162f7ae700bad01e1f59f23f32d1b183b185ec35f4a69a987c52c53cfebfa9e852203b399f035988078e9131e5d59b018554a52a30044f34df6e64b5289 +DIST tinc-1.0.36.tar.gz.sig 866 BLAKE2B 9cabb2fac13363bca39d2ae2b1b8794b6179a9c6e512907cb0c8ba2081da69dfec6fb2224c0bf6497f4a7156808660416e6fe0783598a02e3f4861642b8ee9c9 SHA512 116a13dcecf92523a41091f93c54e5c664494fb0ed1e82b6d56677c69a78817269499d821a4729a1ee1b76109c2f2c4514d5b549fd31549d30718529f38462b7 DIST tinc-1.1pre18.tar.gz 732111 BLAKE2B b236a8a0b7f8b755d71f2e2564af6bd13f5d87aec512b7db388ac1e23110cfdac80d8b642644a4b35fa81d37765e9ced65cc535d48e34b79190c2eddb107a9e2 SHA512 d8b03c78fd579df58d4c8a03f5d2241d2c95edb660ce9aa34441f6e75df09e3fff7524215c7c4b3622311e80f5bb452a6ac1205f3fd13424d56135f70b973183 +DIST tinc-1.1pre18.tar.gz.sig 866 BLAKE2B e5cb86c09adf064a0c58e96999e9901f28f1078ab607bd3b66cafc51cbd85a35eb262860fbd3aad705cf575bf30ffb1a773a23f65fb719e342198d53704841b1 SHA512 3ffe246b93a4581b2a96d293a604cae313efb61ac5bde460b9a09121d0262278ad356dcfad2262d1b46f55645f62dcbeeaf8b261fa7789786089160496f0aade diff --git a/net-vpn/tinc/tinc-1.0.36-r1.ebuild b/net-vpn/tinc/tinc-1.0.36-r1.ebuild index ada0ede631ed..b72d1408cf44 100644 --- a/net-vpn/tinc/tinc-1.0.36-r1.ebuild +++ b/net-vpn/tinc/tinc-1.0.36-r1.ebuild @@ -4,11 +4,15 @@ EAPI=8 # Please keep a version around that matches Debian/Ubuntu for compatibility. -inherit systemd +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tinc.asc +inherit systemd verify-sig DESCRIPTION="tinc is an easy to configure VPN implementation" HOMEPAGE="https://www.tinc-vpn.org/"; -SRC_URI="https://www.tinc-vpn.org/packages/${P}.tar.gz"; +SRC_URI=" + https://www.tinc-vpn.org/packages/${P}.tar.gz + verify-sig? ( https://www.tinc-vpn.org/packages/${P}.tar.gz.sig ) +" LICENSE="GPL-2+" SLOT="0" @@ -24,6 +28,9 @@ RDEPEND=" ${DEPEND} vde? ( net-misc/vde ) " +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-tinc ) +" src_configure() { econf \ diff --git a/net-vpn/tinc/tinc-1.1_pre18-r2.ebuild b/net-vpn/tinc/tinc-1.1_pre18-r2.ebuild index 46d1b906ca52..f0be3e0b6b6a 100644 --- a/net-vpn/tinc/tinc-1.1_pre18-r2.ebuild +++ b/net-vpn/tinc/tinc-1.1_pre18-r2.ebuild @@ -7,12 +7,15 @@ MY_PV=${PV/_/} MY_P=${PN}-${MY_PV} # Please keep a version around that matches Debian/Ubuntu for compatibility. -inherit autotools bash-completion-r1 flag-o-matic systemd +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tinc.asc +inherit autotools bash-completion-r1 flag-o-matic systemd verify-sig DESCRIPTION="tinc is an easy to configure VPN implementation" HOMEPAGE="https://www.tinc-vpn.org/"; - -SRC_URI="https://www.tinc-vpn.org/packages/${MY_P}.tar.gz"; +SRC_URI=" + https://www.tinc-vpn.org/packages/${MY_P}.tar.gz + verify-sig? ( https://www.tinc-vpn.org/packages/${MY_P}.tar.gz.sig ) +" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2+" @@ -28,11 +31,17 @@ DEPEND=" ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) upnp? ( net-libs/miniupnpc:= ) - zlib? ( virtual/zlib:= )" -RDEPEND="${DEPEND} - vde? ( net-misc/vde )" - -PATCHES+=( + zlib? ( virtual/zlib:= ) +" +RDEPEND=" + ${DEPEND} + vde? ( net-misc/vde ) +" +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-tinc ) +" + +PATCHES=( "${FILESDIR}"/tinc-1.1_pre16-r1-fix-paths.patch #560528 "${FILESDIR}"/${PN}-1.1-tinfo.patch #621868 "${FILESDIR}"/${P}-fix-upnp.patch #935718
