add a new version that drops support for pam_stack configuration files and just depends on virtual/pam.

Package-Manager: portage-2.1.5_rc10

4 files changed, 115 insertions, 6 deletions

diff --git a/net-ftp/ftpbase/ChangeLog b/net-ftp/ftpbase/ChangeLog
index 718df3ac630c..0158cfc39c4c 100644
--- a/net-ftp/ftpbase/ChangeLog
+++ b/net-ftp/ftpbase/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/ftpbase
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ChangeLog,v 1.16 2007/12/25 16:20:28 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ChangeLog,v 1.17 2008/05/14 22:10:30 flameeyes Exp $
+
+*ftpbase-0.01-r1 (14 May 2008)
+
+  14 May 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +ftpbase-0.01-r1.ebuild:
+  add a new version that drops support for pam_stack configuration files and
+  just depends on virtual/pam.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing uberlord from metadata.xml as per #199318. Assigning to
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index 95d43fb6765f..b27165bcd1e5 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ftp-pamd 807 RMD160 1dce921bb3045aca3f4d57f4bc70f804f49d91cb SHA1 f793dda67863e70ae943a1dc56dc094b9423cb93 SHA256 c378eaaa16ca300bb828256d68807cf6f84751ae3ef9192186cf16bef89076dc
 AUX ftp-pamd-include 747 RMD160 086aa9c0e1b0f23f8792a9da32038efc1a92cf7a SHA1 b6ef4ae821e30acff6827ed6054f6467013e57c2 SHA256 b6194c655619343e5908517a50a615b1b028181ea09280ec87dea23f6c10e9a6
 AUX ftpusers 407 RMD160 46a48b5ab2c51b4062b62a424bd88a244bb08445 SHA1 d814dedf066e0e2233b1c44fff2e5c4f8f66a1ef SHA256 34360cd3a4700e8c03aa08d1a5c3f217bb58b5e935950e14868f5ff8d32e52bc
 EBUILD ftpbase-0.00.ebuild 2296 RMD160 7f5ec5f806e07d07ed059e116eb384e75ddddf70 SHA1 a6a79d1c06625ced2ed0cc78d19b7f57e7eaf218 SHA256 3bea086ac6e183219be377547b4844e0dd64b4c947ce011e63ee55203bd87db5
+EBUILD ftpbase-0.01-r1.ebuild 2183 RMD160 22c6f92a07a4a91910927bba97aa9ee0cd7da398 SHA1 cd2dda46fb119a1829b7f7def7b1e2f9ec36d268 SHA256 5f24601a51a2da098f5783a4efcfab5e06374d1a5a10b6890fcb0da5ad76c7d4
 EBUILD ftpbase-0.01.ebuild 2307 RMD160 6e5f93d84b6a254fbbabe53a572de21e659b3276 SHA1 2578fa72e7d981139389cdc35027ec2a4825edcf SHA256 b5c49ccebc6bd967fe8e7c4ba36f39c7769f083ba84161fe1c7f2f697146351e
-MISC ChangeLog 2505 RMD160 97038d1b249a23bca434a69248acf02656faa384 SHA1 10dc8276517d509b6023c2104225c6ae06fa260b SHA256 51281f293d0d1663055fc2d598bbf3f90d3f8c064c004a964ca0bff53d2de0fe
+MISC ChangeLog 2729 RMD160 ca5083a0a4c8cf3cb4c5bacb0992d84162860235 SHA1 7aa79c66dfde38f68d73067781690df757c0a89d SHA256 165d306ca3b5159cb1ad94cd6c227d8ce2afc351f3b3a4675f5b2525113d9cdd
 MISC metadata.xml 304 RMD160 beebe43c38b7f732ba4e6c3342b21f32199754a8 SHA1 95da89a8ef677e561f97a2e5b70ffe959e94a307 SHA256 3da1224f2d247795716debc8ef84ed8216f546d3576db1c09f0c2cf11a5b7df3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgrY10ACgkQAiZjviIA2XhkTgCgxqDEXfgVZjo2JhvNlN6PWc3d
+dVcAoNNPfKXFqQn3CwVgV6V3juLck3lv
+=4/H6
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r1.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r1.ebuild
new file mode 100644
index 000000000000..0e9ec448dd11
--- /dev/null
+++ b/net-ftp/ftpbase/ftpbase-0.01-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ftpbase-0.01-r1.ebuild,v 1.1 2008/05/14 22:10:30 flameeyes Exp $
+
+inherit eutils pam
+
+DESCRIPTION="FTP layout package"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="pam"
+
+DEPEND="pam? ( virtual/pam )
+	!<net-ftp/proftpd-1.2.10-r6
+	!<net-ftp/pure-ftpd-1.0.20-r2
+	!<net-ftp/vsftpd-2.0.3-r1"
+
+S=${WORKDIR}
+
+check_collision() {
+	[[ ! -e $1 ]] && return 0
+
+	[[ $(head -n 1 "$1") == $(head -n 1 "$2") ]] && return 0
+
+	eerror "   $1 exists and was not provided by ${P}"
+	return 1
+}
+
+pkg_setup() {
+	ebegin "Checking for possible file collisions..."
+
+	local collide=false
+	check_collision "${ROOT}etc/ftpusers" "${FILESDIR}/ftpusers" || collide=true
+
+	if use pam ; then
+		check_collision "${ROOT}etc/pam.d/ftp" "${FILESDIR}/ftp-pamd" || collide=true
+	fi
+
+	if ${collide} ; then
+		eerror
+		eerror "Those files listed above have to be removed in order to"
+		eerror "install this version of ftpbase."
+		eerror
+		eerror "If you edited them, remember to backup and when restoring make"
+		eerror " sure the first line in each file is:"
+		eerror "$(head -n 1 "${FILESDIR}/ftpusers")"
+		eend 1
+		die "Can't be installed, files will collide"
+	fi
+
+	eend 0
+
+	# Check if home exists
+	local exists=false
+	[[ -d "${ROOT}home/ftp" ]] && exists=true
+
+	# Add our default ftp user
+	enewgroup ftp 21
+	enewuser ftp 21 -1 /home/ftp ftp
+
+	# If home did not exist and does now then we created it in the enewuser
+	# command. Now we have to change it's permissions to something sane.
+	if [[ ${exists} == "false" && -d "${ROOT}home/ftp" ]] ; then
+		chown root:ftp "${ROOT}"home/ftp
+	fi
+}
+
+src_install() {
+	# The ftpusers file is a list of people who are NOT allowed
+	# to use the ftp service.
+	insinto /etc
+	doins "${FILESDIR}/ftpusers" || die
+
+	# Ideally we would create the home directory here with a dodir.
+	# But we cannot until bug #9849 is solved - so we kludge in pkg_postinst()
+
+	newpamd "${FILESDIR}/ftp-pamd-include" ftp
+}
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index f44193677b40..74b77a279fa4 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vsftpd-2.0.3-gentoo.patch 7128 RMD160 99ef0aee94847405e6185cc95acbc72cba0df0e0 SHA1 4608e2656d83cc17fcef229a8f4b66c803b899d8 SHA256 8f3215d43948364d431312dd4109af09e9a83ebbafb7a1c388f2aefea4df9154
 AUX vsftpd-2.0.5-anon-upload-umask.patch 818 RMD160 2c8a64226056df2b7451d434d0a5ec8302abfda3 SHA1 178e2d0a7f7862fefcd8dd6f36ae36583aee91ab SHA256 9875216bc2b1396e11a634e2a3ddf8ede6af0e0be797d9809b04d73e45aedc01
 AUX vsftpd-2.0.6-caps.patch 649 RMD160 161b4610fdedcc3b1173055e534682fc5450b1d7 SHA1 cf63310bcee83e68079377c1da55e2b0d0111ebf SHA256 1435d0bc4e0d0e5f4a86ba2c42e77663be10d494cc9bc3af782c104a062e2778
@@ -8,7 +11,14 @@ AUX vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 SHA1 cf1
 AUX vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 SHA1 5325ecbf0755ebd5778d69039393af075c1a9b40 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f
 DIST vsftpd-2.0.5.tar.gz 155985 RMD160 297c383aae9fd90f75d5d6a62b2ed5e54adf25d4 SHA1 9b6a079699aaeb01219665acf203c093f94faef0 SHA256 5462ebf0df2792dde8ea3cf5d87c715200aac388554b3f0a9ace6265edecfa5b
 DIST vsftpd-2.0.6.tar.gz 158516 RMD160 33e9782e2c99986c2c8b60fc29880cedad7ba1fa SHA1 23fcc21996cd1404f6957d83bfb2e8004401a858 SHA256 8e35c3962477c5c539d9be489d0d3794840f5eda15690e492a6f1f256398ce30
-EBUILD vsftpd-2.0.5-r3.ebuild 3155 RMD160 0d537c0c70a1df0ab9aaab585f5a2f9c72f6c27d SHA1 9eb9361f7677cde6dfc89d22d8ed0a2329126fe0 SHA256 6199559d9e03aa846f51cc33db1a65953b134432066c141086f93fd4ca6b68c0
-EBUILD vsftpd-2.0.6.ebuild 3068 RMD160 d7dfb864328c39b5934788981d2e205b065c2c99 SHA1 4bc16d37222cca2992d573a5f5184a4009bfbf4a SHA256 3fa080bc2ae15f7059dac4d460d3fc64fff158ea3644d5f7fa71d373b6aa79f8
-MISC ChangeLog 13509 RMD160 f3d61bbfcded4305e6e8516845e30accad7a211c SHA1 f5bb0006b8f27ee26dcc8932686d8f544753729d SHA256 ed7e5bf6e65217604222432cd7e7abd8d618f23800da7acd36828620c500b0b9
+EBUILD vsftpd-2.0.5-r3.ebuild 3137 RMD160 8811a452f2468fbeae101b5656f012bb3b795650 SHA1 826bbaef7734756449be0e55f7d4e639be1d2095 SHA256 f6dabaffbee5306548f8c8ba434f99941885007b1fc85d3cc5dbab9fe61b3023
+EBUILD vsftpd-2.0.6.ebuild 3049 RMD160 29794b069c64d837c044c7100bd2e1117e6971b9 SHA1 a6eda2f4704f5b4e2a11d8becfc1ece6ccfacd25 SHA256 64375e14aa29f2e758eff5ae69922fa854bcda43bcea3b313ebeaca208347f15
+MISC ChangeLog 13663 RMD160 dba15067cfa12ff486505f39fc419da7b92308a6 SHA1 49c3fda366dd8b27179bb10a1f60488a0596c236 SHA256 52a5fc1dc9bc9b28f4ab0424b5325bbdca2c68d72f56b8511dbe5449a7a13b27
 MISC metadata.xml 358 RMD160 f8ffc0942c689c54a62b078a9a5bcd44702a5e68 SHA1 a252bf60d812dad06cbe00c324671cfba7b4e991 SHA256 cdc354a30f912a068432b3de197b3886ac05661869e7a0f67ac29f1da04b3b0d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgrY+8ACgkQAiZjviIA2XiAgACfW1ZQAB+btUuU9EaRnDnBl1/Z
+g9AAnj8iqBqLOoZtWnFokKRnIoYIo85a
+=18LW
+-----END PGP SIGNATURE-----