From ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Feb 2020 18:01:47 +0000 Subject: gentoo (leap year) resync : 29.02.2020 --- net-vpn/tinc/Manifest | 2 +- net-vpn/tinc/tinc-1.1_pre17-r1.ebuild | 91 +++++++++++++++++++++++++++++++++ net-vpn/tinc/tinc-1.1_pre17.ebuild | 96 ----------------------------------- 3 files changed, 92 insertions(+), 97 deletions(-) create mode 100644 net-vpn/tinc/tinc-1.1_pre17-r1.ebuild delete mode 100644 net-vpn/tinc/tinc-1.1_pre17.ebuild (limited to 'net-vpn/tinc') diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest index 8641f3c7a26f..b783f41a3975 100644 --- a/net-vpn/tinc/Manifest +++ b/net-vpn/tinc/Manifest @@ -12,5 +12,5 @@ DIST tinc-1.1-upstream-patches-2.tar.xz 23500 BLAKE2B ab44d2efcd494c6a49e9e0bc10 DIST tinc-1.1pre17.tar.gz 927313 BLAKE2B d16789b64f6d11deda4752fdeeb603fe62efd6b1d68b0286fbe9c329d8ea51494df59e0e5bf1564b25a0ed44e9244799eb61f73de9ded6a1a418417453adddc4 SHA512 b966dbfa522e12ff6766c4deb54a9da29cddc15c3a1df0f0e084df27ee5f1421ffbebc0e29472b1bcd79ea8b41f8c0ef904172e333dcba0b85bafe4654a63b30 EBUILD tinc-1.0.35-r2.ebuild 1349 BLAKE2B a082f910398173e5956af8fa52782557a263ca1877a7ea710afe0f11f1b82830e851efbf735d92e2e67b267d3bbe85ffb64c28337a59685f41b4355b955f842b SHA512 f765a2da03b5526bdef70fdb50c7efddc0b27d978b97526cb3e0048f1570c9a69ec8376768f462b8d79769eb1185b13b6b42881796471ccafbec246fae2ba41e EBUILD tinc-1.0.36.ebuild 1064 BLAKE2B d0f3f10c386ea9549d55c9b9bca434892ee16ceecc9b035e7e1f890c37198add7556ab5935743ae67b8d8437d0f559bc369ef8058d1d835e84dc123b95aba078 SHA512 a490dab876713a817d4bb32cdbdc8a4651bb26f1c96fc7e61ae7666d632430a22e29ea43778d9351051f9b21cbb7255e5cf029311dcad7fb4e537415dbc07db8 -EBUILD tinc-1.1_pre17.ebuild 2417 BLAKE2B fcbfdddaf5c5e80b9af691bc62e0dd59b297fdcedabe8258edc524306f34e1a1a317bb2e2ef13b6e28f053a5c87f683e99eaa74a7439feb653474ceb80abbff5 SHA512 47f0247a1f47c4cd14f6d9d014b33470276f67a0dcee0d7e81d3fec8d0fe48c2db6c8f6a633a87c108c7e399887fba5d2a6d1afc9304796bc6bd63302c4bb71b +EBUILD tinc-1.1_pre17-r1.ebuild 2290 BLAKE2B 22fc027a87502a50c2e3b616661ff57d61c1c77310e96ad9e57d9d2fa2720b738228b2c292167f13f91518d81fa2526bbd8f9bb99221323f77d2212fbb913919 SHA512 2f4df288a4347ffe4696a61b23389d97d65283ab712d8ae1233a45bafa15ee59da585030a9d4b9ff2d9f41738ae1ce954835540ad44d0bc876ac0d1a5e8f81a8 MISC metadata.xml 723 BLAKE2B 09ac4b61d77c06379478413b2c8f33762908f272de27f7721d7cc02ad77b91755944835544ec6219a5d2744e3d79b2262d570e319140c4d06fae988caf7a7666 SHA512 d1aa24b5c5548fc37c19a992d211918afb93d361b385307f3d6bef783d381a465d0a743832425857766e5af5a8f960e5708cb60a1738d4a29bc659f6293d3bda diff --git a/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild b/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild new file mode 100644 index 000000000000..a98a080d9e83 --- /dev/null +++ b/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2020 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 ~x86-macos" +IUSE="+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib" + +DEPEND=" + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl: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_pre17.ebuild b/net-vpn/tinc/tinc-1.1_pre17.ebuild deleted file mode 100644 index 6eb358d55d46..000000000000 --- a/net-vpn/tinc/tinc-1.1_pre17.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PV=${PV/_/} -MY_P=${PN}-${MY_PV} - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools python-single-r1 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 ~x86-macos" -IUSE="+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - ${PYTHON_DEPS} - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl: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 \ - --disable-silent-rules \ - --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