Adding metadata

6 files changed, 85 insertions, 85 deletions

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index d810e6689171..e1e1a09ca7eb 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,3 +1,4 @@
 DIST tinc-1.0.36.tar.gz 500320 BLAKE2B 6f799ab04f9553fa389baf9d60121540b1fc7d5b5c2b62b2ebe0bf7478f5f69e8638a9c1b15f8ab84268d813ac1b1978c73b12a478b682cd808747fd2eed951c SHA512 23af9162f7ae700bad01e1f59f23f32d1b183b185ec35f4a69a987c52c53cfebfa9e852203b399f035988078e9131e5d59b018554a52a30044f34df6e64b5289
-DIST tinc-1.0.37.tar.gz 514854 BLAKE2B f5ff48799aa18de24fd96ed31489017d500d4ffb3d8fa006bdce38bfeea1cfcd915ef829437b899bc931071384c5fdf8739b71f9dfdd4c2ecdfb60f20e44eefb SHA512 916706d32278a4659f1d7da8c58bc5764c1ab5d8f31214dad51e45aae6cf765436f2e9ad55647980b5ba7726d6cfaa1fcf25fbeaffdd95436e77ec3153278237
+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/files/tinc-1.1_pre18-fix-upnp.patch b/net-vpn/tinc/files/tinc-1.1_pre18-fix-upnp.patch
new file mode 100644
index 000000000000..1850540d96fc
--- /dev/null
+++ b/net-vpn/tinc/files/tinc-1.1_pre18-fix-upnp.patch
@@ -0,0 +1,18 @@
+diff --git a/src/upnp.c b/src/upnp.c
+index 553630e..fd2b30b 100644
+--- a/src/upnp.c
++++ b/src/upnp.c
+@@ -124,8 +124,12 @@ static void upnp_refresh() {
+ 	struct IGDdatas data;
+ 
+ 	char myaddr[64];
+-
++#if (MINIUPNPC_API_VERSION >= 18)
++	char wnaddr[64];
++	int result = UPNP_GetValidIGD(devices, &urls, &data, myaddr, sizeof(myaddr), wnaddr, sizeof(wnaddr));
++#else
+ 	int result = UPNP_GetValidIGD(devices, &urls, &data, myaddr, sizeof(myaddr));
++#endif
+ 
+ 	if(result <= 0) {
+ 		logger(DEBUG_PROTOCOL, LOG_WARNING, "[upnp] No IGD found");
diff --git a/net-vpn/tinc/metadata.xml b/net-vpn/tinc/metadata.xml
index 7265eb046560..9d4fb7d3b0e5 100644
--- a/net-vpn/tinc/metadata.xml
+++ b/net-vpn/tinc/metadata.xml
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
   <maintainer type="person">
     <email>dlan@gentoo.org</email>
     <name>Yixun Lan</name>
   </maintainer>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:tinc-vpn:tinc</remote-id>
-  </upstream>
   <use>
     <flag name="uml"> Enable support for User Mode Linux Sockets</flag>
     <flag name="vde"> Enable Virtual Distributed Ethernet (VDE) based networking</flag>
diff --git a/net-vpn/tinc/tinc-1.0.37.ebuild b/net-vpn/tinc/tinc-1.0.36-r1.ebuild
index eee3226a2415..b72d1408cf44 100644
--- a/net-vpn/tinc/tinc-1.0.37.ebuild
+++ b/net-vpn/tinc/tinc-1.0.36-r1.ebuild
@@ -1,25 +1,36 @@
-# Copyright 2021-2026 Liguros Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
-inherit systemd
 
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
+# Please keep a version around that matches Debian/Ubuntu for compatibility.
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tinc.asc
+inherit systemd verify-sig
 
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
+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
+	verify-sig? ( https://www.tinc-vpn.org/packages/${P}.tar.gz.sig )
+"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=" +lzo uml vde +zlib"
+KEYWORDS="amd64 ~arm ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+lzo uml vde +zlib"
 
 DEPEND="
-	dev-libs/openssl:0=
-
+	dev-libs/openssl:=
 	lzo? ( dev-libs/lzo:2 )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	vde? ( net-misc/vde )"
+	zlib? ( virtual/zlib:= )
+"
+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.0.36.ebuild b/net-vpn/tinc/tinc-1.0.36.ebuild
deleted file mode 100644
index 6a586821f7cd..000000000000
--- a/net-vpn/tinc/tinc-1.0.36.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
-
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=" +lzo uml vde +zlib"
-
-DEPEND="
-	dev-libs/openssl:0=
-
-	lzo? ( dev-libs/lzo:2 )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	vde? ( net-misc/vde )"
-
-src_configure() {
-	econf \
-		--enable-jumbograms \
-		--disable-tunemu  \
-		$(use_enable lzo) \
-		$(use_enable uml) \
-		$(use_enable vde) \
-		$(use_enable zlib)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodir /etc/tinc
-	dodoc AUTHORS NEWS README THANKS
-	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf tincd
-	newinitd "${FILESDIR}"/tincd-r1 tincd
-	systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
-}
diff --git a/net-vpn/tinc/tinc-1.1_pre18.ebuild b/net-vpn/tinc/tinc-1.1_pre18-r2.ebuild
index 891d2f9b36ed..f0be3e0b6b6a 100644
--- a/net-vpn/tinc/tinc-1.1_pre18.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre18-r2.ebuild
@@ -1,51 +1,72 @@
-# Copyright 2021 Liguros Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=7
+
+EAPI=8
 
 MY_PV=${PV/_/}
 MY_P=${PN}-${MY_PV}
 
-inherit autotools systemd
+# Please keep a version around that matches Debian/Ubuntu for compatibility.
+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="http://www.tinc-vpn.org/"
-SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz"
-LICENSE="GPL-2"
+HOMEPAGE="https://www.tinc-vpn.org/"
+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+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+lzo +ncurses +readline +ssl uml vde upnp +zlib"
 
 DEPEND="
 	ssl? (
 		dev-libs/openssl:0=
-
 	)
 	lzo? ( dev-libs/lzo:2 )
 	ncurses? ( sys-libs/ncurses:= )
 	readline? ( sys-libs/readline:= )
-	upnp? ( net-libs/miniupnpc )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	vde? ( net-misc/vde )"
-S="${WORKDIR}/${MY_P}"
+	upnp? ( net-libs/miniupnpc:= )
+	zlib? ( virtual/zlib:= )
+"
+RDEPEND="
+	${DEPEND}
+	vde? ( net-misc/vde )
+"
+BDEPEND="
+	verify-sig? ( sec-keys/openpgp-keys-tinc )
+"
 
-PATCHES+=(
+PATCHES=(
 	"${FILESDIR}"/tinc-1.1_pre16-r1-fix-paths.patch #560528
 	"${FILESDIR}"/${PN}-1.1-tinfo.patch #621868
+	"${FILESDIR}"/${P}-fix-upnp.patch #935718
 )
 
 src_prepare() {
 	default
-	eautoreconf
 
 	# Fix the static (failing UNKNOWN) version in the autoconf
 	# NOTE: When updating the ebuild, make sure to check that this
 	# line number hasn't changed in the upstream sources.
-	sed -i "6d" configure.ac
-	sed -i "6iAC_INIT([tinc], ${PVR})" configure.ac
+	sed -i "6d" configure.ac || die
+	sed -i "6iAC_INIT([tinc], ${PVR})" configure.ac || die
+
+	eautoreconf
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/877743
+	#
+	# Fixed upstream:
+	# https://github.com/gsliepen/tinc/commit/28b7a53b693f6b4e70218a926e68a36ece54cda1
+	filter-lto
+
 	econf \
 		--enable-jumbograms \
 		--enable-legacy-protocol \
@@ -59,6 +80,7 @@ src_configure() {
 		$(use_enable zlib) \
 		$(use_enable upnp miniupnpc) \
 		$(use_with ssl openssl)
+		#--without-libgcrypt \
 }
 
 src_install() {
@@ -68,6 +90,8 @@ src_install() {
 	doconfd "${FILESDIR}"/tinc.networks
 	newconfd "${FILESDIR}"/tincd.conf tincd
 	newinitd "${FILESDIR}"/tincd-r2 tincd
+
+	bashcomp_alias tinc tincd
 }
 
 pkg_postinst() {