Revision bump, improvements in the conf.d file

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

5 files changed, 37 insertions, 17 deletions

diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog
index f803df9de235..ecb0f5b7136b 100644
--- a/net-ftp/oftpd/ChangeLog
+++ b/net-ftp/oftpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.29 2010/11/06 01:37:10 xmw Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.30 2011/06/17 00:35:32 xmw Exp $
+
+*oftpd-0.3.7-r7 (17 Jun 2011)
+
+  17 Jun 2011; Michael Weber <xmw@gentoo.org> -oftpd-0.3.7-r6.ebuild,
+  +oftpd-0.3.7-r7.ebuild, +files/conf.d.oftpd-r7, +files/init.d.oftpd-r7,
+  -files/conf.d.oftpd-r6, -files/init.d.oftpd-r1:
+  Revision bump, improvements in the conf.d file, thanks to SpanKY (bug 371967)
 
 *oftpd-0.3.7-r6 (06 Nov 2010)
 
diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
index ebf18582e45f..0892e31a8f17 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -1,13 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX conf.d.oftpd 469 RMD160 2e70e1d86efadaf72d0f6fe56bd8f07167a7badb SHA1 8e0d30aa2ecf77a58a3790ecc1fee32a420d22d9 SHA256 d1bab71ab0942df8dcb2f88bb50a3c318fe97676d278ccf26d540fdc9c4e69ba
-AUX conf.d.oftpd-r6 579 RMD160 8433daa924b3cda57ca579ef451c25749b07b4d2 SHA1 9989021aac01c58e0b5e5703b2263c32184a0c34 SHA256 fabff4fcce71d756ea1fb88951dee6f6146aa3d0dc867ccbca02723369fce800
+AUX conf.d.oftpd-r7 677 RMD160 b8288f70113a45bdfcdf2368683b89d56e65be05 SHA1 e7e1616abe24df0952ba07fa32fa48a279ec16e0 SHA256 50c45148beafb8ff8ad59d4c3bea8cc7b5aa8ddab78482c3ff8b0ab62542927e
 AUX init.d.oftpd 676 RMD160 95af3c24dda70f631f487495d0a67f280ec1277a SHA1 e50c5f5b83ec97129aa6510d7ba957f565b36773 SHA256 96d69985013735c39e6e4913797fe753e8971cf836e4bc8e5a8f5ed3d8dc03a2
-AUX init.d.oftpd-r1 722 RMD160 3e24790f4d56d2eff46ce810c8433a10f852c1ad SHA1 49e4d235f382eedd24b25955c1cf2764a94ee08b SHA256 cd3c98cc8bc3255503d9cc9946749d53d90410bf9d4c0a3a9ddb6819c87ab84e
+AUX init.d.oftpd-r7 632 RMD160 57070d86842550d63c8e831b3b387588ba5fb92c SHA1 356d32087a2cda5ae9558b9a3baaaef645f0eb20 SHA256 197817aa4897233863ce9afa75ce5c785f646192f94aa2324e1ea6d7708ed798
 AUX oftpd-0.3.7-family-1.patch 936 RMD160 0668323bb69fac190d8b1c4bcb0f5ed1c9c2b692 SHA1 945970c75cd4d23b4027f72521f4390a8b8ee4e6 SHA256 fe903d6fbb4a523f7b85dfb4c112f489da07764e8d67e15faa9b8380d400ba2a
 AUX oftpd-0.3.7-family.patch 550 RMD160 f99e24cda14e2a273564e1d637f9478b0c502c61 SHA1 4c2b80ea4e464458c480defdd2d1a791a3e6ac30 SHA256 f97f380705c42a215b2f4f094cce9b9ea6d5778a605bd532334a8fe07d829023
 AUX oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch 14107 RMD160 73cd9354fc48d887d6c38eff1c0bb0baff0a83ba SHA1 6a1a1d7382e9c04b8e38534e5cdb78841ccbee16 SHA256 83101b57c00cebe9ed456d79697520f582fc427d18ecf84137c502709fef6bf3
 DIST oftpd-0.3.6-ipv6rel2.patch.gz 12478 RMD160 32c080fa2898272b7bde05c806371021bc2d9ea9 SHA1 0502988b5bde25961efdceb36c303dbb351744ea SHA256 b1165052e0169e1495b5009111f07ba56cb81ce34234b9578a9eb2862e76ac3d
 DIST oftpd-0.3.7.tar.gz 97364 RMD160 9430607bf0c51847a4e4cc97c84be0495c931183 SHA1 d6d3ce43c009bb68736d50739e9a2f60bede99c1 SHA256 b135cd2bc6c54e03e5374845964eab73d5e567160c15bb4226c1c922b1e6d64e
 EBUILD oftpd-0.3.7-r3.ebuild 1042 RMD160 469cda3176006ad6434c69eb21f998bd487fe586 SHA1 730851bdfd154d4242c45384dba08698e19c3fac SHA256 33677fd0c45af6bdf47cf873211a260483afa236432efe5c4f7fc717e89e9323
-EBUILD oftpd-0.3.7-r6.ebuild 1236 RMD160 d8b8c48bf4ee07264ba27a84a7de73e9945ce1ea SHA1 1e69eb43ec30574fb25e1f28def6d3074a19a840 SHA256 f95879522632d316e6f331b3b10126e9ee4fe96ae165068d193f778f422db462
-MISC ChangeLog 4813 RMD160 f5e4d67edb571cde4ad383119434f3ee6d4c3272 SHA1 7603d9c0305edbbb2233aa87f64e02b3807dba41 SHA256 b1dd627542947bcced29de7825e57674b70b03836f599e66b0a8e46ca1772648
+EBUILD oftpd-0.3.7-r7.ebuild 1236 RMD160 b3ab0f3465f2c8a38bbfbd0cf80915a613ad9537 SHA1 f6955a0c15deb130fd245f290a4f7a1c96cc890b SHA256 b3e4743462d04aafc54e48b72f973de7265f6f7ca8bf74ed8f0eb112c9dcbbbf
+MISC ChangeLog 5119 RMD160 4acb87240ccf9a30c81b1b111f130d5feb5601f4 SHA1 80f35b8d9b3ad759f4759d7d70d24c75c22c0bbd SHA256 6fa7a4688df6da62185706b349f6140d950112bbccb234e1da1b72e0ad93f3a1
 MISC metadata.xml 255 RMD160 074d0756614e5268d188aa562b5774eedda511d0 SHA1 ee37445e389c446bbdc21503ba2b6c9dd6746eb1 SHA256 d540a4739cb022c072918b4b0b648e9121a7dcb956ddee9505fa6b9f9fc813e7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk36oVoACgkQknrdDGLu8JD4VQD+NOmUq6I3wFn2A4g+V3QR3KZI
+e703sBkzHkNv++FKY+gA/2gVCgagH2dBUKcBNIZ3yoqO5BJ/SWcXvDztTxqxqZSr
+=jUmS
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/oftpd/files/conf.d.oftpd-r6 b/net-ftp/oftpd/files/conf.d.oftpd-r7
index dee1cba00863..81cd2a5903ed 100644
--- a/net-ftp/oftpd/files/conf.d.oftpd-r6
+++ b/net-ftp/oftpd/files/conf.d.oftpd-r7
@@ -13,5 +13,8 @@ FTPUSER=ftp
 FTPROOT=/home/ftp
 
 # FTPPORT (TCP port)
-# 22 is the standard ftp port, but you can change it here to something else
-FTPPORT=22
+# 21 is the standard ftp port, but you can change it here to something else
+FTPPORT=21
+
+## Uncoment this line to activate oftpd service
+OFTPD_OPTS="-p ${FTPPORT} ${FTPUSER} ${FTPPORT}"
diff --git a/net-ftp/oftpd/files/init.d.oftpd-r1 b/net-ftp/oftpd/files/init.d.oftpd-r7
index a910b92fa188..da73e608e662 100644
--- a/net-ftp/oftpd/files/init.d.oftpd-r1
+++ b/net-ftp/oftpd/files/init.d.oftpd-r7
@@ -1,15 +1,15 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/files/init.d.oftpd-r7,v 1.1 2011/06/17 00:35:32 xmw 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"
+	if [ -z "${OFTPD_OPTS}" ] ; then
+		eerror "You need to setup OFTPD_OPTS /etc/conf.d/oftpd"
 		return 1
 	fi
 }
@@ -18,7 +18,7 @@ start() {
 	checkconfig || return 1
 
 	ebegin "Starting oftpd"
-       	start-stop-daemon --start --exec /usr/sbin/oftpd -- -p ${FTPPORT} ${FTPUSER} ${FTPROOT}
+       	start-stop-daemon --start --exec /usr/sbin/oftpd -- ${OFTPD_OPTS}
 	eend $?
 }
 
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r6.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r7.ebuild
index e9dd22d4c758..3fa8c1661f32 100644
--- a/net-ftp/oftpd/oftpd-0.3.7-r6.ebuild
+++ b/net-ftp/oftpd/oftpd-0.3.7-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r7.ebuild,v 1.1 2011/06/17 00:35:32 xmw Exp $
 
 EAPI=2
 
@@ -41,6 +41,6 @@ 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
+	newinitd "${FILESDIR}"/init.d.oftpd-r7 oftpd || die
+	newconfd "${FILESDIR}"/conf.d.oftpd-r7 oftpd || die
 }