From c5c648567d8271effb18d5032eba2d5058bd4c2d Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 6 Nov 2010 07:13:20 +0000 Subject: [PATCH] net-ftp/oftpd: bump to gentoo's latest conf file git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2671 6952d904-891a-0410-993b-d76249ca496b --- net-ftp/oftpd/ChangeLog | 5 ++++ net-ftp/oftpd/Manifest | 6 ++-- .../{conf.d.oftpd-r1 => conf.d.oftpd-r6} | 2 +- net-ftp/oftpd/files/init.d.oftpd-r1 | 29 ------------------- ...-0.3.7-r5.ebuild => oftpd-0.3.7-r6.ebuild} | 2 +- 5 files changed, 10 insertions(+), 34 deletions(-) rename net-ftp/oftpd/files/{conf.d.oftpd-r1 => conf.d.oftpd-r6} (86%) delete mode 100644 net-ftp/oftpd/files/init.d.oftpd-r1 rename net-ftp/oftpd/{oftpd-0.3.7-r5.ebuild => oftpd-0.3.7-r6.ebuild} (95%) diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog index 48663aa8..0958640b 100644 --- a/net-ftp/oftpd/ChangeLog +++ b/net-ftp/oftpd/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 06 Nov 2010; Mario Fetka -oftpd-0.3.7-r5.ebuild, + +oftpd-0.3.7-r6.ebuild, -files/conf.d.oftpd-r1, +files/conf.d.oftpd-r6, + -files/init.d.oftpd-r1: + bump to gentoo's latest conf file + 09 May 2010; Mario Fetka +files/oftpd-0.3.7-r4.diff: add ipv6 patch diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest index 5510dcd2..db5e16ca 100644 --- a/net-ftp/oftpd/Manifest +++ b/net-ftp/oftpd/Manifest @@ -1,9 +1,9 @@ -AUX conf.d.oftpd-r1 578 RMD160 84ba38720a6a2ac8f0873ebbc4cab82f0394232c SHA1 821a500ff9a3d8e35f7aaf39c4c3935546399ae1 SHA256 6ba360cac50935ee9c8ed2961b95e57d7c63c5f63dc0ce7befb942756e054f62 +AUX conf.d.oftpd-r6 579 RMD160 8433daa924b3cda57ca579ef451c25749b07b4d2 SHA1 9989021aac01c58e0b5e5703b2263c32184a0c34 SHA256 fabff4fcce71d756ea1fb88951dee6f6146aa3d0dc867ccbca02723369fce800 AUX init.d.oftpd-r1 722 RMD160 3e24790f4d56d2eff46ce810c8433a10f852c1ad SHA1 49e4d235f382eedd24b25955c1cf2764a94ee08b SHA256 cd3c98cc8bc3255503d9cc9946749d53d90410bf9d4c0a3a9ddb6819c87ab84e AUX oftpd-0.3.7-family-1.patch 936 RMD160 0668323bb69fac190d8b1c4bcb0f5ed1c9c2b692 SHA1 945970c75cd4d23b4027f72521f4390a8b8ee4e6 SHA256 fe903d6fbb4a523f7b85dfb4c112f489da07764e8d67e15faa9b8380d400ba2a AUX oftpd-0.3.7-ipv6rel2-1.patch 44765 RMD160 563fafe68e9e1be6b96116b7ae0c24204147b6f7 SHA1 5b7fd9a9b46cdcb2e3d081bdecb255b584826d42 SHA256 4ae576a749c26dd66432c273ec71c0d7fc34a4159cd7fd7760e484304eeb1ccc AUX oftpd-0.3.7-r4.diff 1254 RMD160 64dbf5d120e03beffb3bce72ce16d647f54c906c SHA1 f8182ff728b0d9752429702e7ca04e79051dfca2 SHA256 4497626ffbbff1134b8940da423a2ad1f8fecba0e743d370e73da756ae949438 DIST oftpd-0.3.7.tar.gz 97364 RMD160 9430607bf0c51847a4e4cc97c84be0495c931183 SHA1 d6d3ce43c009bb68736d50739e9a2f60bede99c1 SHA256 b135cd2bc6c54e03e5374845964eab73d5e567160c15bb4226c1c922b1e6d64e -EBUILD oftpd-0.3.7-r5.ebuild 1030 RMD160 0754f5ee486989d5703e9215b9765678d757fcb4 SHA1 65b01a4c08f8c5fe47e49c15388939fa9438173e SHA256 96739a8ff08100c97ca1d0f00bf5e5f803e7eb563ee8e9cc1bd85eced93ea4ad -MISC ChangeLog 357 RMD160 ce9c79b713c53b1aeafb0ff90efd87bfc3de3d19 SHA1 df763134e0e3b4efb6ceac46e92e4208bbcc0377 SHA256 a93b70e75e3adc3c38f8c0060d1aa6dd611cbca8a694fa8f5d7b1bbdea7abbbf +EBUILD oftpd-0.3.7-r6.ebuild 1030 RMD160 f7c031eefa6978cb7402c2291b8d4aa0f282ad2e SHA1 183e9049795dd1feb90784d9c9bcb47aabe31d08 SHA256 0eddbfd2e9371052b8ba1a2a1aafb41b7224e4ff0efb33bae8039d0ad82fd72b +MISC ChangeLog 569 RMD160 563e0da64e455f4635ae1dd1b3ddeb3d60a39806 SHA1 27d8338f3ec467612b5943436f718abd20788c3b SHA256 3e3680b977a8a5c555d9563c1d08e96b8ef18f1c4d5f705814270c36d5bc5d42 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/net-ftp/oftpd/files/conf.d.oftpd-r1 b/net-ftp/oftpd/files/conf.d.oftpd-r6 similarity index 86% rename from net-ftp/oftpd/files/conf.d.oftpd-r1 rename to net-ftp/oftpd/files/conf.d.oftpd-r6 index 67c40c89..dee1cba0 100644 --- a/net-ftp/oftpd/files/conf.d.oftpd-r1 +++ b/net-ftp/oftpd/files/conf.d.oftpd-r6 @@ -1,4 +1,4 @@ -# Please read the oftd(8) man page for a more detailed explaination of these +# Please read the oftpd(8) man page for a more detailed explaination of these # variables. # # FTPUSER (user-name in the man page): diff --git a/net-ftp/oftpd/files/init.d.oftpd-r1 b/net-ftp/oftpd/files/init.d.oftpd-r1 deleted file mode 100644 index a910b92f..00000000 --- a/net-ftp/oftpd/files/init.d.oftpd-r1 +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/files/init.d.oftpd-r1,v 1.3 2009/06/13 19:31:06 grobian Exp $ - -depend() { - need net -} - -checkconfig() { - if [ -z "${FTPUSER}" ] || [ -z "${FTPROOT}" ] || [ -z "${FTPPORT}" ] ; then - eerror "You need to setup FTPUSER, FTPROOT and FTPPORT in /etc/conf.d/oftpd" - return 1 - fi -} - -start() { - checkconfig || return 1 - - ebegin "Starting oftpd" - start-stop-daemon --start --exec /usr/sbin/oftpd -- -p ${FTPPORT} ${FTPUSER} ${FTPROOT} - eend $? -} - -stop() { - ebegin "Stopping oftpd" - start-stop-daemon --stop --quiet --exec /usr/sbin/oftpd - eend $? -} diff --git a/net-ftp/oftpd/oftpd-0.3.7-r5.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r6.ebuild similarity index 95% rename from net-ftp/oftpd/oftpd-0.3.7-r5.ebuild rename to net-ftp/oftpd/oftpd-0.3.7-r6.ebuild index 81ae2b62..1682c57b 100644 --- a/net-ftp/oftpd/oftpd-0.3.7-r5.ebuild +++ b/net-ftp/oftpd/oftpd-0.3.7-r6.ebuild @@ -36,5 +36,5 @@ src_install() { dodoc AUTHORS BUGS FAQ NEWS README TODO keepdir /home/ftp newinitd "${FILESDIR}"/init.d.oftpd-r1 oftpd - newconfd "${FILESDIR}"/conf.d.oftpd-r1 oftpd + newconfd "${FILESDIR}"/conf.d.oftpd-r6 oftpd }