From 93e165e6b58108f99071e6265b2f317fb1320f72 Mon Sep 17 00:00:00 2001 From: Michael Weber <xmw@gentoo.org> Date: Sat, 6 Nov 2010 01:37:10 +0000 Subject: fix config file (Portage version: 2.1.8.3/cvs/Linux x86_64) --- net-ftp/oftpd/ChangeLog | 10 +++++++- net-ftp/oftpd/files/conf.d.oftpd-r1 | 17 -------------- net-ftp/oftpd/files/conf.d.oftpd-r6 | 17 ++++++++++++++ net-ftp/oftpd/oftpd-0.3.7-r4.ebuild | 38 ------------------------------ net-ftp/oftpd/oftpd-0.3.7-r5.ebuild | 46 ------------------------------------- net-ftp/oftpd/oftpd-0.3.7-r6.ebuild | 46 +++++++++++++++++++++++++++++++++++++ 6 files changed, 72 insertions(+), 102 deletions(-) delete mode 100644 net-ftp/oftpd/files/conf.d.oftpd-r1 create mode 100644 net-ftp/oftpd/files/conf.d.oftpd-r6 delete mode 100644 net-ftp/oftpd/oftpd-0.3.7-r4.ebuild delete mode 100644 net-ftp/oftpd/oftpd-0.3.7-r5.ebuild create mode 100644 net-ftp/oftpd/oftpd-0.3.7-r6.ebuild diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog index 73ae3855a8be..f803df9de235 100644 --- a/net-ftp/oftpd/ChangeLog +++ b/net-ftp/oftpd/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-ftp/oftpd # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.28 2010/09/01 10:00:39 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.29 2010/11/06 01:37:10 xmw Exp $ + +*oftpd-0.3.7-r6 (06 Nov 2010) + + 06 Nov 2010; Michael Weber <xmw@gentoo.org> -oftpd-0.3.7-r4.ebuild, + -oftpd-0.3.7-r5.ebuild, +oftpd-0.3.7-r6.ebuild, -files/conf.d.oftpd-r1, + +files/conf.d.oftpd-r6: + Rev bump to fix default port and description in config file (bug #344169, + thanks to Christohper Harrington <ironiridis@gmail.com>). *oftpd-0.3.7-r5 (01 Sep 2010) diff --git a/net-ftp/oftpd/files/conf.d.oftpd-r1 b/net-ftp/oftpd/files/conf.d.oftpd-r1 deleted file mode 100644 index 67c40c897b6f..000000000000 --- a/net-ftp/oftpd/files/conf.d.oftpd-r1 +++ /dev/null @@ -1,17 +0,0 @@ -# Please read the oftd(8) man page for a more detailed explaination of these -# variables. -# -# FTPUSER (user-name in the man page): -# Set this variable to the user to run the ftp daemon as -FTPUSER=ftp - -# FTPROOT (root-directory in the man page): -# The server uses chroot(2) to change the root directory of the server to this -# directory. When a user connects, this is the directory that they will start -# in, and is the top of their directory tree. -# -FTPROOT=/home/ftp - -# FTPPORT (TCP port) -# 22 is the standard ftp port, but you can change it here to something else -FTPPORT=22 diff --git a/net-ftp/oftpd/files/conf.d.oftpd-r6 b/net-ftp/oftpd/files/conf.d.oftpd-r6 new file mode 100644 index 000000000000..dee1cba00863 --- /dev/null +++ b/net-ftp/oftpd/files/conf.d.oftpd-r6 @@ -0,0 +1,17 @@ +# Please read the oftpd(8) man page for a more detailed explaination of these +# variables. +# +# FTPUSER (user-name in the man page): +# Set this variable to the user to run the ftp daemon as +FTPUSER=ftp + +# FTPROOT (root-directory in the man page): +# The server uses chroot(2) to change the root directory of the server to this +# directory. When a user connects, this is the directory that they will start +# in, and is the top of their directory tree. +# +FTPROOT=/home/ftp + +# FTPPORT (TCP port) +# 22 is the standard ftp port, but you can change it here to something else +FTPPORT=22 diff --git a/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild deleted file mode 100644 index 0e90fea40bd1..000000000000 --- a/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild,v 1.1 2009/05/29 14:00:05 rbu Exp $ - -EAPI=2 -inherit eutils - -DESCRIPTION="Secure, small, anonymous only ftpd" -HOMEPAGE="http://www.time-travellers.org/oftpd" -SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86" -IUSE="" - -DEPEND="net-ftp/ftpbase" -RDEPEND="${DEPEND}" - -src_prepare() { - # Don't crash when using an unsupported address family, #159178. - epatch "${FILESDIR}"/oftpd-0.3.7-family.patch -} - -src_configure() { - # local myconf - # ipv6 support busted according to lamer - # use ipv6 && myconf="${myconf} --enable-ipv6" - econf --bindir=/usr/sbin || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS BUGS FAQ NEWS README TODO - keepdir /home/ftp - newinitd "${FILESDIR}"/init.d.oftpd-r1 oftpd - newconfd "${FILESDIR}"/conf.d.oftpd-r1 oftpd -} diff --git a/net-ftp/oftpd/oftpd-0.3.7-r5.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r5.ebuild deleted file mode 100644 index e3be0fe5f834..000000000000 --- a/net-ftp/oftpd/oftpd-0.3.7-r5.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r5.ebuild,v 1.1 2010/09/01 10:00:39 xmw Exp $ - -EAPI=2 - -inherit autotools eutils - -DESCRIPTION="Secure, small, anonymous only ftpd" -HOMEPAGE="http://www.time-travellers.org/oftpd" -SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz - ftp://ftp.deepspace6.net/pub/ds6/sources/${PN}/${PN}-0.3.6-ipv6rel2.patch.gz" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86" -IUSE="ipv6" - -DEPEND="net-ftp/ftpbase" -RDEPEND="${DEPEND}" - -src_prepare() { - cd "${WORKDIR}" || die - epatch "${FILESDIR}"/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch - - cd "${S}" || die - epatch "${WORKDIR}"/${PN}-0.3.6-ipv6rel2.patch - - # Don't crash when using an unsupported address family, #159178. - # updated in bug #157005 - epatch "${FILESDIR}"/${P}-family-1.patch - - eautoreconf -} - -src_configure() { - econf --bindir=/usr/sbin $(use_enable ipv6) -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS BUGS FAQ NEWS README TODO || die - keepdir /home/ftp - newinitd "${FILESDIR}"/init.d.oftpd-r1 oftpd || die - newconfd "${FILESDIR}"/conf.d.oftpd-r1 oftpd || die -} diff --git a/net-ftp/oftpd/oftpd-0.3.7-r6.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r6.ebuild new file mode 100644 index 000000000000..e9dd22d4c758 --- /dev/null +++ b/net-ftp/oftpd/oftpd-0.3.7-r6.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r6.ebuild,v 1.1 2010/11/06 01:37:10 xmw Exp $ + +EAPI=2 + +inherit autotools eutils + +DESCRIPTION="Secure, small, anonymous only ftpd" +HOMEPAGE="http://www.time-travellers.org/oftpd" +SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz + ftp://ftp.deepspace6.net/pub/ds6/sources/${PN}/${PN}-0.3.6-ipv6rel2.patch.gz" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="ipv6" + +DEPEND="net-ftp/ftpbase" +RDEPEND="${DEPEND}" + +src_prepare() { + cd "${WORKDIR}" || die + epatch "${FILESDIR}"/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch + + cd "${S}" || die + epatch "${WORKDIR}"/${PN}-0.3.6-ipv6rel2.patch + + # Don't crash when using an unsupported address family, #159178. + # updated in bug #157005 + epatch "${FILESDIR}"/${P}-family-1.patch + + eautoreconf +} + +src_configure() { + econf --bindir=/usr/sbin $(use_enable ipv6) +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS BUGS FAQ NEWS README TODO || die + keepdir /home/ftp + newinitd "${FILESDIR}"/init.d.oftpd-r1 oftpd || die + newconfd "${FILESDIR}"/conf.d.oftpd-r6 oftpd || die +} -- cgit v1.2.3-65-gdbad