From 6f7793faa95ac4394ce5c61f2928163ecfedc36d Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Tue, 31 Jan 2012 22:53:03 +0000 Subject: Fix bug #401423 and removed older ~arch (Portage version: 2.1.10.44/cvs/Linux x86_64) --- net-misc/tinc/ChangeLog | 9 ++++- net-misc/tinc/files/tincd.1 | 6 ++-- net-misc/tinc/files/tincd.lo.1 | 6 ++-- net-misc/tinc/tinc-1.0.16-r1.ebuild | 38 --------------------- net-misc/tinc/tinc-1.0.16-r2.ebuild | 66 ------------------------------------- net-misc/tinc/tinc-1.0.16-r3.ebuild | 66 +++++++++++++++++++++++++++++++++++++ 6 files changed, 80 insertions(+), 111 deletions(-) delete mode 100644 net-misc/tinc/tinc-1.0.16-r1.ebuild delete mode 100644 net-misc/tinc/tinc-1.0.16-r2.ebuild create mode 100644 net-misc/tinc/tinc-1.0.16-r3.ebuild (limited to 'net-misc/tinc') diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog index 3234002f8aa5..c3371b622be8 100644 --- a/net-misc/tinc/ChangeLog +++ b/net-misc/tinc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/tinc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.28 2012/01/15 19:48:38 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.29 2012/01/31 22:53:03 blueness Exp $ + +*tinc-1.0.16-r3 (31 Jan 2012) + + 31 Jan 2012; Anthony G. Basile -tinc-1.0.16-r1.ebuild, + -tinc-1.0.16-r2.ebuild, +tinc-1.0.16-r3.ebuild, files/tincd.1, + files/tincd.lo.1: + Fix bug #401423 and removed older ~arch 15 Jan 2012; Torsten Veller tinc-1.0.16-r1.ebuild, tinc-1.0.16-r2.ebuild: diff --git a/net-misc/tinc/files/tincd.1 b/net-misc/tinc/files/tincd.1 index e41f4fac03ba..b0b1869d938f 100644 --- a/net-misc/tinc/files/tincd.1 +++ b/net-misc/tinc/files/tincd.1 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.1,v 1.2 2011/12/04 10:30:32 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.1,v 1.3 2012/01/31 22:53:03 blueness Exp $ extra_started_commands="reload" @@ -37,7 +37,7 @@ start() { else LOG="--logfile=/var/log/tinc.${NETNAME}.log" fi - start-stop-daemon --start --exec "${DAEMON}" -- --net="${NETNAME}" "${LOG}" --pidfile "${PIDFILE}" + start-stop-daemon --start --exec "${DAEMON}" --pidfile "${PIDFILE}" -- --net="${NETNAME}" "${LOG}" eend $? fi done diff --git a/net-misc/tinc/files/tincd.lo.1 b/net-misc/tinc/files/tincd.lo.1 index 6bd6875ba646..6b04ad28915f 100644 --- a/net-misc/tinc/files/tincd.lo.1 +++ b/net-misc/tinc/files/tincd.lo.1 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.lo.1,v 1.2 2011/12/04 10:30:32 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.lo.1,v 1.3 2012/01/31 22:53:03 blueness Exp $ extra_started_commands="reload" @@ -28,7 +28,7 @@ start() else LOG="--logfile=/var/log/tinc.${NETNAME}.log" fi - start-stop-daemon --start --exec "${DAEMON}" -- --net="${NETNAME}" "${LOG}" --pidfile "${PIDFILE}" + start-stop-daemon --start --exec "${DAEMON}" --pidfile "${PIDFILE}" -- --net="${NETNAME}" "${LOG}" eend $? fi } diff --git a/net-misc/tinc/tinc-1.0.16-r1.ebuild b/net-misc/tinc/tinc-1.0.16-r1.ebuild deleted file mode 100644 index e7c526fc15dc..000000000000 --- a/net-misc/tinc/tinc-1.0.16-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.16-r1.ebuild,v 1.2 2012/01/15 19:48:38 tove Exp $ - -EAPI=4 - -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 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos" -IUSE="+lzo +zlib" - -DEPEND=">=dev-libs/openssl-0.9.7c - lzo? ( dev-libs/lzo:2 ) - zlib? ( >=sys-libs/zlib-1.1.4-r2 )" -RDEPEND="${DEPEND}" - -src_configure() { - econf --enable-jumbograms $(use_enable lzo) $(use_enable zlib) -} - -src_install() { - emake DESTDIR="${D}" install - dodir /etc/tinc - dodoc AUTHORS NEWS README THANKS - newinitd "${FILESDIR}"/tincd.1 tincd - newinitd "${FILESDIR}"/tincd.lo.1 tincd.lo - doconfd "${FILESDIR}"/tinc.networks - newconfd "${FILESDIR}"/tincd.conf.1 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-misc/tinc/tinc-1.0.16-r2.ebuild b/net-misc/tinc/tinc-1.0.16-r2.ebuild deleted file mode 100644 index 27002300ec0d..000000000000 --- a/net-misc/tinc/tinc-1.0.16-r2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.16-r2.ebuild,v 1.2 2012/01/15 19:48:38 tove Exp $ - -EAPI="4" - -inherit eutils - -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 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos" -IUSE="+lzo +zlib raw uml vde" - -DEPEND=">=dev-libs/openssl-0.9.7c - lzo? ( dev-libs/lzo:2 ) - zlib? ( >=sys-libs/zlib-1.1.4-r2 ) - vde? ( net-misc/vde )" -RDEPEND="${DEPEND}" - -src_prepare() { - local COUNT=0 - use raw && COUNT=$(($COUNT+1)) - use uml && COUNT=$(($COUNT+1)) - use vde && COUNT=$(($COUNT+1)) - - if [[ ${COUNT} -gt 1 ]]; then - eerror - eerror "\033[1;31m**************************************************\033[1;31m" - eerror - eerror "\033[1;31m If you selected either raw, uml or vde,\033[1;31m" - eerror "\033[1;31m you can select only one.\033[1;31m" - eerror - eerror "\033[1;31m**************************************************\033[1;31m" - eerror - die - fi - - epatch "${FILESDIR}"/fix-missing-vde.patch - epatch "${FILESDIR}"/fix-compile-vde-uml.patch -} - -src_configure() { - econf --enable-jumbograms $(use_enable lzo) $(use_enable zlib) - use raw && cd "${S}"/src && ln -sf raw_socket/device.c - use uml && cd "${S}"/src && ln -sf uml_socket/device.c - use vde && cd "${S}"/src && ln -sf vde/device.c -} - -src_install() { - emake DESTDIR="${D}" install - dodir /etc/tinc - dodoc AUTHORS NEWS README THANKS - newinitd "${FILESDIR}"/tincd.1 tincd - newinitd "${FILESDIR}"/tincd.lo.1 tincd.lo - doconfd "${FILESDIR}"/tinc.networks - newconfd "${FILESDIR}"/tincd.conf.1 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-misc/tinc/tinc-1.0.16-r3.ebuild b/net-misc/tinc/tinc-1.0.16-r3.ebuild new file mode 100644 index 000000000000..ce18345389b9 --- /dev/null +++ b/net-misc/tinc/tinc-1.0.16-r3.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.16-r3.ebuild,v 1.1 2012/01/31 22:53:03 blueness Exp $ + +EAPI="4" + +inherit eutils + +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 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos" +IUSE="+lzo +zlib raw uml vde" + +DEPEND=">=dev-libs/openssl-0.9.7c + lzo? ( dev-libs/lzo:2 ) + zlib? ( >=sys-libs/zlib-1.1.4-r2 ) + vde? ( net-misc/vde )" +RDEPEND="${DEPEND}" + +src_prepare() { + local COUNT=0 + use raw && COUNT=$(($COUNT+1)) + use uml && COUNT=$(($COUNT+1)) + use vde && COUNT=$(($COUNT+1)) + + if [[ ${COUNT} -gt 1 ]]; then + eerror + eerror "\033[1;31m**************************************************\033[1;31m" + eerror + eerror "\033[1;31m If you selected either raw, uml or vde,\033[1;31m" + eerror "\033[1;31m you can select only one.\033[1;31m" + eerror + eerror "\033[1;31m**************************************************\033[1;31m" + eerror + die + fi + + epatch "${FILESDIR}"/fix-missing-vde.patch + epatch "${FILESDIR}"/fix-compile-vde-uml.patch +} + +src_configure() { + econf --enable-jumbograms $(use_enable lzo) $(use_enable zlib) + use raw && cd "${S}"/src && ln -sf raw_socket/device.c + use uml && cd "${S}"/src && ln -sf uml_socket/device.c + use vde && cd "${S}"/src && ln -sf vde/device.c +} + +src_install() { + emake DESTDIR="${D}" install + dodir /etc/tinc + dodoc AUTHORS NEWS README THANKS + newinitd "${FILESDIR}"/tincd.1 tincd + newinitd "${FILESDIR}"/tincd.lo.1 tincd.lo + doconfd "${FILESDIR}"/tinc.networks + newconfd "${FILESDIR}"/tincd.conf.1 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