From 9aa80713372911cec499b3adb2cd746790920916 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 Jun 2021 10:15:54 +0100 Subject: gentoo resync : 29.06.2021 --- net-vpn/tinc/Manifest | 8 +--- net-vpn/tinc/tinc-1.0.35-r2.ebuild | 53 --------------------- net-vpn/tinc/tinc-1.1_pre17-r1.ebuild | 90 ----------------------------------- net-vpn/tinc/tinc-1.1_pre18.ebuild | 79 ++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 149 deletions(-) delete mode 100644 net-vpn/tinc/tinc-1.0.35-r2.ebuild delete mode 100644 net-vpn/tinc/tinc-1.1_pre17-r1.ebuild create mode 100644 net-vpn/tinc/tinc-1.1_pre18.ebuild (limited to 'net-vpn/tinc') diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest index aef7eefa609b..c5ba43ed7c43 100644 --- a/net-vpn/tinc/Manifest +++ b/net-vpn/tinc/Manifest @@ -5,12 +5,8 @@ AUX tincd-r1 1842 BLAKE2B 889c9f73f3960c913fffaff4a5d49d67c6123ace1c10321815d56c AUX tincd-r2 1830 BLAKE2B 3da729c7bc43c5bef471f0d5798c7e96a114f9cfd79ccb9e5e4383a37e6fb91a3465b6c9ec5125d6b9f775112563f29da1e6b8cb49c89b7e805f7b2e00a08de4 SHA512 59811c3e5241d08ebdfbd539556b7cee0dfaab89727ad503512c98f1a696fae143ecdf2682a652c5d71d077ed254ffe2e1c442b1c305c7e7ea94d9af9a1d385e AUX tincd.conf 728 BLAKE2B fdfe320df4ac8112fb5ee64cd88cd228bef8d1e701a00598691a328fa8ff759ed2f5f42d82a0d3555302cb87d4dfc5521e1850a41b9c5332e9210284f1cb0091 SHA512 f8d9354af5ebc07420ced98059262751bffef434b61c6333964338f327e2ac01ae676e375954efa794a1bccf8b939c78387b9fb7261f675f1237b0d946b529c9 AUX tincd_at.service 197 BLAKE2B f568007b8872e105eb001333d24d7446ff8fb1995edaf77d98679078bfddd2ad9a534e1ed7d8ac743aaf026863dd9952e96e3bf2a8f950115c9f059a2660afc6 SHA512 866f8adbc9c39cc6030e6046e4265a4f6e893960045df15abc0a1865599cf2576ac12468bd1a286df47248ebe2c6b16ba64a60f0ebeeb0212d850a9d7886c98a -DIST tinc-1.0.35-upstream-patches-1.tar.xz 6028 BLAKE2B d236125211efda0c8b5aa4e93a278fec17d57ecb257ea057ca67f2a465d1da7d069f6d3a97220dc1e40123266bc2fc68685d2ea2e143033a12199278b073c31b SHA512 8ae2b96d5f296bc5d0d21fa814832ccafdb5595b06d60d72a090eadb4aade9e386990801b5e1a8cca722f88881aa2d21e70f9154570feede6a9771a0eaec83ab -DIST tinc-1.0.35.tar.gz 499277 BLAKE2B 419b581167614d534b6f2f3b804657f088c013529d7738766aff199da775860ffed42ecb61e8ed008c5b6fa410f071e2fe1ca59f0c6e443c0a8017cd10c31ce3 SHA512 037867306c21506d57d69d35c0f246b2936022047978fa3e01464b5f6b65f109760507d9cc740f82f8166f39c5ce44d9f8dde55655a6372dacd5b5974aeaee32 DIST tinc-1.0.36.tar.gz 500320 BLAKE2B 6f799ab04f9553fa389baf9d60121540b1fc7d5b5c2b62b2ebe0bf7478f5f69e8638a9c1b15f8ab84268d813ac1b1978c73b12a478b682cd808747fd2eed951c SHA512 23af9162f7ae700bad01e1f59f23f32d1b183b185ec35f4a69a987c52c53cfebfa9e852203b399f035988078e9131e5d59b018554a52a30044f34df6e64b5289 -DIST tinc-1.1-upstream-patches-2.tar.xz 23500 BLAKE2B ab44d2efcd494c6a49e9e0bc109670a586b087d5ce1daab9b9cdf8f50a4c9b9d927e102fe947e75e6f7be509ba9315936315006b557b39639399bc7f40109f5f SHA512 351537f212421e7fe28fcf97293550edaa4c4c8a578bf4eeca34ae591caefb222df4d5d96bfa03bddd6afcb5143e68b59f5341b2a6412c053a3cecf4fdd0bee8 -DIST tinc-1.1pre17.tar.gz 927313 BLAKE2B d16789b64f6d11deda4752fdeeb603fe62efd6b1d68b0286fbe9c329d8ea51494df59e0e5bf1564b25a0ed44e9244799eb61f73de9ded6a1a418417453adddc4 SHA512 b966dbfa522e12ff6766c4deb54a9da29cddc15c3a1df0f0e084df27ee5f1421ffbebc0e29472b1bcd79ea8b41f8c0ef904172e333dcba0b85bafe4654a63b30 -EBUILD tinc-1.0.35-r2.ebuild 1278 BLAKE2B e7139f6a9dcffca42f62768d0217cd6f4db531118579066e60d0ff570182b802f2ad28ee562cd473da3699ad7fb4001bce3e045b650001f55d8542112c1e1c4c SHA512 ce92300d4f99475f11f8951e0663b34c85dc222eb85e049222a1d8a2b90270f73079ee45b143d1b8ef86c237151e66b8f179b3909cb41826697226dfca502e80 +DIST tinc-1.1pre18.tar.gz 732111 BLAKE2B b236a8a0b7f8b755d71f2e2564af6bd13f5d87aec512b7db388ac1e23110cfdac80d8b642644a4b35fa81d37765e9ced65cc535d48e34b79190c2eddb107a9e2 SHA512 d8b03c78fd579df58d4c8a03f5d2241d2c95edb660ce9aa34441f6e75df09e3fff7524215c7c4b3622311e80f5bb452a6ac1205f3fd13424d56135f70b973183 EBUILD tinc-1.0.36.ebuild 993 BLAKE2B af32d021acfb333af1344d79fb7f2b1ad8a6d582cebd9c97f88cdc3361b188b78ee26bdba8fe19f53a07e5f0d757fcf3f07b2316c1d9f925cfdf8a8986c552bf SHA512 3496cd6250ff6470049eaa0cf00f2ad1aee985de33c3ab2f533371e7387207ddff9893c4b227dbb4337665fe17b5337a1f537e9c6d131ec340aecf70ba244301 -EBUILD tinc-1.1_pre17-r1.ebuild 2218 BLAKE2B 41ec75ca47b4af40cf3113f1f83f34514f5e5ffdffcde61ce18bd752aeb8eac1b50a578509f176978a7e1520843444558d30d12e6bc331e874be81de3870dece SHA512 8f535824b6ac08a59a733c12778739573841a85305640748be114c204f0ee1a72cff22d485b53dd99eb91f84324123a93a33f8353dbd6fb02a6bb40d7875e819 +EBUILD tinc-1.1_pre18.ebuild 1928 BLAKE2B 0cc479749069276c4dff2b6ef91354c4217842ff2385496099539a3657100dc5db2e7f284c080162fd5a1b451066810856b09ab18a07bebefc6f77af38178941 SHA512 1f37a464b1a956d0bba4f2a26b791f5e19615b37f0f1d7c69afee275cc3c36e26b5f009a7e77fc77bdb5f23043c332d82c2e5067c06eef59c9426470987cd124 MISC metadata.xml 638 BLAKE2B 5aecfad9b7e648fce87e8f9f9713c0cc3c6042a7d67b68c67b58b85c681f41827c4d6bd72bc9b2f759d4ec1c6ad838aa3a6f328cf3394b2e77405b24e6f3dd47 SHA512 494ed9caf18ea348c6e8f80a597e1a45bbfa2c5a41a711539141d7e27ef83182c9593dcfc64b3b384036b989636962f10c4eee02e84011d77075d1a69951061f diff --git a/net-vpn/tinc/tinc-1.0.35-r2.ebuild b/net-vpn/tinc/tinc-1.0.35-r2.ebuild deleted file mode 100644 index be4c667f269a..000000000000 --- a/net-vpn/tinc/tinc-1.0.35-r2.ebuild +++ /dev/null @@ -1,53 +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/" - -UPSTREAM_VER=1 - -[[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" - -SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz - ${UPSTREAM_PATCHSET_URI}" - -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 )" - -# Upstream's patchset -if [[ -n ${UPSTREAM_VER} ]]; then - PATCHES=( "${WORKDIR}"/patches-upstream ) -fi - -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_pre17-r1.ebuild b/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild deleted file mode 100644 index 3d984145f798..000000000000 --- a/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PV=${PV/_/} -MY_P=${PN}-${MY_PV} - -inherit autotools systemd - -DESCRIPTION="tinc is an easy to configure VPN implementation" -HOMEPAGE="http://www.tinc-vpn.org/" - -UPSTREAM_VER=2 - -[[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz" - -SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz - ${UPSTREAM_PATCHSET_URI}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -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}" - -# Upstream's patchset -if [[ -n ${UPSTREAM_VER} ]]; then - PATCHES=( "${WORKDIR}"/patches-upstream ) -fi - -PATCHES+=( - "${FILESDIR}"/tinc-1.1_pre16-r1-fix-paths.patch #560528 - "${FILESDIR}"/${PN}-1.1-tinfo.patch #621868 -) - -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 -} - -src_configure() { - econf \ - --enable-jumbograms \ - --enable-legacy-protocol \ - --disable-tunemu \ - --with-systemd="$(systemd_get_systemunitdir)" \ - $(use_enable lzo) \ - $(use_enable ncurses curses) \ - $(use_enable readline) \ - $(use_enable uml) \ - $(use_enable vde) \ - $(use_enable zlib) \ - $(use_enable upnp miniupnpc) \ - $(use_with ssl openssl) - #--without-libgcrypt \ -} - -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-r2 tincd -} - -pkg_postinst() { - elog "This package requires the tun/tap kernel device." - elog "Look at http://www.tinc-vpn.org/ for how to configure tinc" -} diff --git a/net-vpn/tinc/tinc-1.1_pre18.ebuild b/net-vpn/tinc/tinc-1.1_pre18.ebuild new file mode 100644 index 000000000000..6ffcb15a2051 --- /dev/null +++ b/net-vpn/tinc/tinc-1.1_pre18.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PV=${PV/_/} +MY_P=${PN}-${MY_PV} + +inherit autotools systemd + +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" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +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}" + +PATCHES+=( + "${FILESDIR}"/tinc-1.1_pre16-r1-fix-paths.patch #560528 + "${FILESDIR}"/${PN}-1.1-tinfo.patch #621868 +) + +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 +} + +src_configure() { + econf \ + --enable-jumbograms \ + --enable-legacy-protocol \ + --disable-tunemu \ + --with-systemd="$(systemd_get_systemunitdir)" \ + $(use_enable lzo) \ + $(use_enable ncurses curses) \ + $(use_enable readline) \ + $(use_enable uml) \ + $(use_enable vde) \ + $(use_enable zlib) \ + $(use_enable upnp miniupnpc) \ + $(use_with ssl openssl) + #--without-libgcrypt \ +} + +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-r2 tincd +} + +pkg_postinst() { + elog "This package requires the tun/tap kernel device." + elog "Look at http://www.tinc-vpn.org/ for how to configure tinc" +} -- cgit v1.2.3