From 03efd9dc6df744e3776778c88b2a562ee5146bb9 Mon Sep 17 00:00:00 2001 From: Yixun Lan Date: Tue, 9 Jul 2024 12:07:33 +0000 Subject: net-vpn/tinc: add bash-completion alias for tincd Closes: https://bugs.gentoo.org/925258 Signed-off-by: Yixun Lan --- net-vpn/tinc/tinc-1.1_pre18-r1.ebuild | 88 ---------------------------------- net-vpn/tinc/tinc-1.1_pre18-r2.ebuild | 90 +++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 88 deletions(-) delete mode 100644 net-vpn/tinc/tinc-1.1_pre18-r1.ebuild create mode 100644 net-vpn/tinc/tinc-1.1_pre18-r2.ebuild (limited to 'net-vpn') diff --git a/net-vpn/tinc/tinc-1.1_pre18-r1.ebuild b/net-vpn/tinc/tinc-1.1_pre18-r1.ebuild deleted file mode 100644 index 0fe4682890c8..000000000000 --- a/net-vpn/tinc/tinc-1.1_pre18-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PV=${PV/_/} -MY_P=${PN}-${MY_PV} - -inherit autotools flag-o-matic systemd - -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" - -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" -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 )" - -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 - - # 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 || 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 \ - --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-r2.ebuild b/net-vpn/tinc/tinc-1.1_pre18-r2.ebuild new file mode 100644 index 000000000000..c7e7e106b87e --- /dev/null +++ b/net-vpn/tinc/tinc-1.1_pre18-r2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_/} +MY_P=${PN}-${MY_PV} + +inherit autotools bash-completion-r1 flag-o-matic systemd + +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" + +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" +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 )" + +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 + + # 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 || 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 \ + --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 + + bashcomp_alias tinc 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-65-gdbad