diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-07-09 12:24:59 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-07-09 12:24:59 +0100 |
| commit | c218398bbbe70a616790cf146c28c1066b9284bf (patch) | |
| tree | a598e8c85afbc52bb7eca18ae415ef4971e65c8f /net-vpn | |
| parent | a5442e2318cb4df55867389654e322dbac82067e (diff) | |
gentoo auto-resync : 09:07:2024 - 12:24:58
Diffstat (limited to 'net-vpn')
| -rw-r--r-- | net-vpn/Manifest.gz | bin | 7918 -> 7920 bytes | |||
| -rw-r--r-- | net-vpn/tinc/Manifest | 3 | ||||
| -rw-r--r-- | net-vpn/tinc/files/tinc-1.1_pre18-fix-upnp.patch | 18 | ||||
| -rw-r--r-- | net-vpn/tinc/tinc-1.1_pre18-r1.ebuild (renamed from net-vpn/tinc/tinc-1.1_pre18.ebuild) | 9 |
4 files changed, 25 insertions, 5 deletions
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz Binary files differindex b376491b24d4..a85dc8134fd6 100644 --- a/net-vpn/Manifest.gz +++ b/net-vpn/Manifest.gz diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest index 685b89742244..ec3c6f71b77a 100644 --- a/net-vpn/tinc/Manifest +++ b/net-vpn/tinc/Manifest @@ -1,5 +1,6 @@ AUX tinc-1.1-tinfo.patch 143 BLAKE2B a78500b9b020c6cd3f667f59459dd9b146baf7cdee90b96b2ed1ef62e4d9d55d8a8752f4a0544452e604d2a6962d29faf93fa6285475c9b39d72e95e94da2549 SHA512 d18d194b63dc71b8e45a0899ca325e722b4228b22370426265eaa669fb421a9b05fa87e42dbc23ce524ae61e62a99ca949e3f4d96be1f60fa0f77a8e8cb54419 AUX tinc-1.1_pre16-r1-fix-paths.patch 1461 BLAKE2B 4891e18e3c72cb97c553b67b066f432f50cbe8dd227df7ed5b1a3e2c68e5f43e51879ca6ed1d78e66a873becad983ba9daca33d211c8cf203a1ed51e1ae8938a SHA512 cbb43bde1b177fb3c05490e33ca764265c4e02952bc51c1ff1f644106c9e80c9c1323092965af1001a511b2a887da8443251b3a6e2ce2d8f8b2cbc493ce4564a +AUX tinc-1.1_pre18-fix-upnp.patch 536 BLAKE2B 73c7dcacdbe2f174f5582c47e0c5ef79380562046c6102aa2c144e60aa0f1e4dd087510613e997f5bdebad0ee06a3cef04556a0ba21b00df4ed395b01e69beb4 SHA512 03603e0ab298621dc4c77c0f15b3d912813d1c19115453cc952c06925cea354af2b61f02355a8e54d76abef945e2b32a189579e0dc371357219d36ea8bcab6e3 AUX tinc.networks 387 BLAKE2B c3057322b46ee0186db4f2e9cadb8e60a318f5731e77a19e8c31e757c47c88afb8db6848f739511146bd0dc85ffdecea80c5be09890bcc3060a9b9ace9ecf855 SHA512 f7cb459c170898e51176bd92c642335386db90b7bca2abb3f6eb2514546efbd74e5fd2c8845060111dd48a0dd2cc1890717a03315c9b86185047c259cdc27135 AUX tincd-r1 1842 BLAKE2B 889c9f73f3960c913fffaff4a5d49d67c6123ace1c10321815d56c8dd55e29d3916f8de0befdcef4ff7862b5f741406918bba2203c8b2e13548f874edad5c821 SHA512 1308d097487ef0f1fb1763ca99565edc1026c11159775a5d0c1e41905d8332b7df734460ccea5750a7b6dd5897ecffbe8e95cb721d94ffe5b7855ec4293dc360 AUX tincd-r2 1830 BLAKE2B 3da729c7bc43c5bef471f0d5798c7e96a114f9cfd79ccb9e5e4383a37e6fb91a3465b6c9ec5125d6b9f775112563f29da1e6b8cb49c89b7e805f7b2e00a08de4 SHA512 59811c3e5241d08ebdfbd539556b7cee0dfaab89727ad503512c98f1a696fae143ecdf2682a652c5d71d077ed254ffe2e1c442b1c305c7e7ea94d9af9a1d385e @@ -8,5 +9,5 @@ AUX tincd_at.service 197 BLAKE2B f568007b8872e105eb001333d24d7446ff8fb1995edaf77 DIST tinc-1.0.36.tar.gz 500320 BLAKE2B 6f799ab04f9553fa389baf9d60121540b1fc7d5b5c2b62b2ebe0bf7478f5f69e8638a9c1b15f8ab84268d813ac1b1978c73b12a478b682cd808747fd2eed951c SHA512 23af9162f7ae700bad01e1f59f23f32d1b183b185ec35f4a69a987c52c53cfebfa9e852203b399f035988078e9131e5d59b018554a52a30044f34df6e64b5289 DIST tinc-1.1pre18.tar.gz 732111 BLAKE2B b236a8a0b7f8b755d71f2e2564af6bd13f5d87aec512b7db388ac1e23110cfdac80d8b642644a4b35fa81d37765e9ced65cc535d48e34b79190c2eddb107a9e2 SHA512 d8b03c78fd579df58d4c8a03f5d2241d2c95edb660ce9aa34441f6e75df09e3fff7524215c7c4b3622311e80f5bb452a6ac1205f3fd13424d56135f70b973183 EBUILD tinc-1.0.36.ebuild 1008 BLAKE2B a09b3ee3cb09c307ca71ace6a13cfc36c180804bff6ffd51b7bcf6f8871e87568a15327cd40cee2586e6438a765e9799918029cad6ac6a74709cd3dcf7bfc367 SHA512 afbf53a377eaed7c938bd75c9891cc388b190b8ffe38682170e5ec4e05a8cc62bb6db298ace9daf4191c0898d7906c00dd8e6427419f10a8f36bb0fa77bb61e0 -EBUILD tinc-1.1_pre18.ebuild 2161 BLAKE2B d52afdabc096e653c7b2a6ad2de48662af66434d12134867ae8adce9a6b67aa18003d5d2994bdb6cf2eb936f32372d4d3233b59780fa347f054df1cb4f6538cf SHA512 4aa1f0afd92ec1a32bf9ef122c1748dd2a649112c3b3a8242a79ce2560d3fb5f4f80bb957840d803b7f79ba2c0576d4ea77a4c0cb9fc8b8dacc33cceb411139c +EBUILD tinc-1.1_pre18-r1.ebuild 2199 BLAKE2B 18aa2ac9a3348c547b49914efec058f51a3e9e1170a3b731cb1ab7061ce6fc2b9b06b28872bc3ddd3113a0ce6b66f74a4795070f39c293e5ad5c7a97032a80bf SHA512 907934bd1cc7e396d87d6390fc93eb6660a4c584598f9a606214df0be61d1525322e1d2d145a2b5be93ae03713910f84433c6763677da5dce11e696e3c0c731a MISC metadata.xml 526 BLAKE2B 1225e93582cab4f39d68e240265c7507a5298f4f16e433d862c7ef35226a59eb86f3945eaf47a71bb1e55ee083d88393ef217185bec4819017683fc0ee350a82 SHA512 6dbaf88130d9a3389d0c3f34cbafd21500d1b060b1a132f21ea7229029ab134bbd8d3a42a73d7b887ace415e6a2c2f702661c5fa51757d49442748884aa12b6e 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/tinc-1.1_pre18.ebuild b/net-vpn/tinc/tinc-1.1_pre18-r1.ebuild index e5e8aca62cfa..0fe4682890c8 100644 --- a/net-vpn/tinc/tinc-1.1_pre18.ebuild +++ b/net-vpn/tinc/tinc-1.1_pre18-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 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} @@ -13,6 +13,7 @@ HOMEPAGE="https://www.tinc-vpn.org/" SRC_URI="https://www.tinc-vpn.org/packages/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" @@ -25,15 +26,15 @@ DEPEND=" lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) - upnp? ( net-libs/miniupnpc ) + upnp? ( net-libs/miniupnpc:= ) zlib? ( sys-libs/zlib )" RDEPEND="${DEPEND} vde? ( net-misc/vde )" -S="${WORKDIR}/${MY_P}" 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() { @@ -45,7 +46,7 @@ src_prepare() { sed -i "6d" configure.ac || die sed -i "6iAC_INIT([tinc], ${PVR})" configure.ac || die - eautoreconf + eautoreconf } src_configure() { |