bumping

(Portage version: 2.1.1_pre1-r1)
 (Signed Manifest commit)

3 files changed, 17 insertions, 224 deletions

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 70d66a2fb0e6..9bfa27f321ca 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.2.9_rc3-reversedns.diff 1974 RMD160 f060a6c7df6e0b75d5a7fc974c49f977b4242c0a SHA1 55eaf2f9c230f309602a728acb7f5a794398aa9c SHA256 c6065fbe185cc0b1194d765a59161eec7ea0e2312885a7440e80279899848efd
 MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974
 RMD160 f060a6c7df6e0b75d5a7fc974c49f977b4242c0a files/1.2.9_rc3-reversedns.diff 1974
@@ -61,10 +64,10 @@ EBUILD proftpd-1.2.10-r7.ebuild 4574 RMD160 effd6fecf47e23a61548e785259109c2df4d
 MD5 611edc7465c5c640b305903b21819046 proftpd-1.2.10-r7.ebuild 4574
 RMD160 effd6fecf47e23a61548e785259109c2df4d0a29 proftpd-1.2.10-r7.ebuild 4574
 SHA256 d7b1b3255c6ccbed6a3ff12e6323a1ba6e0258d8931053e9ef06152573deaa47 proftpd-1.2.10-r7.ebuild 4574
-EBUILD proftpd-1.3.0.ebuild 5734 RMD160 ce0f795ada35bfd11068680b93734888d2b47a43 SHA1 3d588000b07b9fb1f45bf0489ad7193fcb4e8f16 SHA256 cc8617201991bc1a555f68c6a4cb132e03895caf6f3d373d76e566fe5595928b
-MD5 afc9614f46a2bcd1aec801c5d6ae38b2 proftpd-1.3.0.ebuild 5734
-RMD160 ce0f795ada35bfd11068680b93734888d2b47a43 proftpd-1.3.0.ebuild 5734
-SHA256 cc8617201991bc1a555f68c6a4cb132e03895caf6f3d373d76e566fe5595928b proftpd-1.3.0.ebuild 5734
+EBUILD proftpd-1.3.0-r1.ebuild 5827 RMD160 04aa2ad204d89f9968a1fd18d11f54ad728fe1b9 SHA1 23343b5842287ad9f5de5b887aa62e32a2e5b0da SHA256 00504805ffd0832aca6f0b48d72c97796d656aaa3482d90ba9ccaf73a3be9367
+MD5 643e144d24546a3822a6ad39853b9be9 proftpd-1.3.0-r1.ebuild 5827
+RMD160 04aa2ad204d89f9968a1fd18d11f54ad728fe1b9 proftpd-1.3.0-r1.ebuild 5827
+SHA256 00504805ffd0832aca6f0b48d72c97796d656aaa3482d90ba9ccaf73a3be9367 proftpd-1.3.0-r1.ebuild 5827
 MISC ChangeLog 17296 RMD160 4f3102313842c112b4e86ac8ae895beb196a8607 SHA1 abcb7b3eee34d9a9c60c0e63e8f64904798ae614 SHA256 dbcbb944c631a4f37c8d4eb4e9a84b6082f2866bd9b5ed90e5f1378bdb00d920
 MD5 50bba71c253d4ccf4fcbc89a2996a62f ChangeLog 17296
 RMD160 4f3102313842c112b4e86ac8ae895beb196a8607 ChangeLog 17296
@@ -73,13 +76,16 @@ MISC metadata.xml 401 RMD160 7440f97adc26aa165c6d9a343a3f227ac9962036 SHA1 4de99
 MD5 5c73abc1fe44fb1d866736316d2c89ac metadata.xml 401
 RMD160 7440f97adc26aa165c6d9a343a3f227ac9962036 metadata.xml 401
 SHA256 035eb7c56b3e676e3549207650c993fe3c38762db55a57a40a9b479c3a8cdb2f metadata.xml 401
-MISC proftpd-1.3.0.ebuild.orig 5640 RMD160 9ebf18540a3c7665b50192d97c3f23d2c3e7778a SHA1 ae910269c7ae1c6146210773a637f7efa97f875d SHA256 6e0c2811b1b3edffd2ca8b098e87e3b278e692b0a1095b8c9ec7d4804718e877
-MD5 4064d5c50ad722252ee076ad072951bb proftpd-1.3.0.ebuild.orig 5640
-RMD160 9ebf18540a3c7665b50192d97c3f23d2c3e7778a proftpd-1.3.0.ebuild.orig 5640
-SHA256 6e0c2811b1b3edffd2ca8b098e87e3b278e692b0a1095b8c9ec7d4804718e877 proftpd-1.3.0.ebuild.orig 5640
 MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r7 142
 RMD160 0ca845195d9659ea72d00d5755ffce659a7df751 files/digest-proftpd-1.2.10-r7 142
 SHA256 f85d284ae51d8763204788be6fc821d9daa429876f141cee641cf2cdcdf312c4 files/digest-proftpd-1.2.10-r7 142
-MD5 35995cbe20ae79ce7bfe3c607082f42d files/digest-proftpd-1.3.0 1214
-RMD160 a3b3282020c26af5c1725d10c26e98bcccda3d36 files/digest-proftpd-1.3.0 1214
-SHA256 6c4adc001a19e749394cc9b3a8356c02451e4c3cabac659af921a8e628e84416 files/digest-proftpd-1.3.0 1214
+MD5 35995cbe20ae79ce7bfe3c607082f42d files/digest-proftpd-1.3.0-r1 1214
+RMD160 a3b3282020c26af5c1725d10c26e98bcccda3d36 files/digest-proftpd-1.3.0-r1 1214
+SHA256 6c4adc001a19e749394cc9b3a8356c02451e4c3cabac659af921a8e628e84416 files/digest-proftpd-1.3.0-r1 1214
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEnTKU8zY1VwezZiERAhqeAJ9eqIn7I91Spa9wFNTKWoUrk6G1PACfSQCX
+ksq2ZDsG0SE1S0iMxg+X5F4=
+=Qbpc
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.3.0 b/net-ftp/proftpd/files/digest-proftpd-1.3.0
deleted file mode 100644
index 080bbeb3944e..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 1786d61986bde69ef9c3d882cd90c7ae mod_clamav.c 6338
-RMD160 0a642be8149ee118426bf04d04eca5b2250ea2b2 mod_clamav.c 6338
-SHA256 d3b7da4b145b355fe4d05f453d6803a7c6b0bf99af2aedbd65431ae6b98a4db7 mod_clamav.c 6338
-MD5 90df329b43b29cea757efb6b11dcc87d mod_clamav.html 4151
-RMD160 8ada0d2126ff1977d9277e0f5a1464caaf5f7b62 mod_clamav.html 4151
-SHA256 4e6c3936ba307376561dd164c52964c14a83bcb23fd5801eaaab22be325370bc mod_clamav.html 4151
-MD5 fae47d01b52e035eb6b7190e74c17722 proftpd-1.3.0.tar.bz2 1386086
-RMD160 46cdd29a6c6ce4c3dd8f1a972df0a52b90a6d2ec proftpd-1.3.0.tar.bz2 1386086
-SHA256 83f220cba64455a2b1701b97ce9896f66a0020b179c50daf4860cdf362464ffe proftpd-1.3.0.tar.bz2 1386086
-MD5 a81c3ed2d45f7c938416a970fd559703 proftpd-mod-shaper-0.5.6.tar.gz 18099
-RMD160 3727e4407728727da4e6546e01b86c6b2cb68657 proftpd-mod-shaper-0.5.6.tar.gz 18099
-SHA256 b846b9f4d8601a7ce426afa049b26db4da4ee8226ff61af97b0ca86b2fb8c827 proftpd-mod-shaper-0.5.6.tar.gz 18099
-MD5 bafd6c9ecfdf352641465b866be12f27 proftpd-mod-vroot-0.7.1.tar.gz 5613
-RMD160 b9677793f7cf6075467d7f41e4b8a9dfef89a847 proftpd-mod-vroot-0.7.1.tar.gz 5613
-SHA256 30d58c326bb30c080048662db0c4ffaf28f478fce40452c0c3c217cb5d2124e1 proftpd-mod-vroot-0.7.1.tar.gz 5613
diff --git a/net-ftp/proftpd/proftpd-1.3.0.ebuild b/net-ftp/proftpd/proftpd-1.3.0.ebuild
deleted file mode 100644
index 955a93fc4d0c..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.0.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.0.ebuild,v 1.2 2006/06/24 12:32:00 humpback Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd
-	selinux sendfile noauthunix authfile ncurses xinetd acl sitemisc rewrite clamav opensslcrypt
-	  ifsession radius vroot"
-
-SHAPER_VER="0.5.6"
-VROOT_VER="0.7.1"
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P}.tar.bz2
-		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz )
-		clamav? ( http://www.uglyboxindustries.com/mod_clamav.c http://www.uglyboxindustries.com/mod_clamav.html )
-		vroot?	 ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
-HOMEPAGE="http://www.proftpd.org/
-		http://www.castaglia.org/proftpd/
-		http://www.uglyboxindustries.com/open-source.php"
-
-SLOT="0"
-LICENSE="GPL-2"
-#removed mips due to dep issue with clamav
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="pam? ( || ( virtual/pam sys-libs/pam ) )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6f )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
-	ncurses? ( sys-libs/ncurses )
-	xinetd? ( sys-apps/xinetd )
-	acl? ( sys-apps/acl sys-apps/attr )
-	clamav? ( app-antivirus/clamav )
-	opensslcrypt? ( >=dev-libs/openssl-0.9.6f )"
-
-RDEPEND="${DEPEND}
-		net-ftp/ftpbase
-		selinux? ( sec-policy/selinux-ftpd )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	epatch "${FILESDIR}"/mod_sql_mysql.diff
-	if use shaper; then
-		unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
-		cp mod_shaper/mod_shaper.c contrib/
-	fi
-	if use clamav; then
-		cp "${DISTDIR}"/mod_clamav.c contrib/
-		cp "${DISTDIR}"/mod_clamav.html doc/
-	fi
-	if use vroot; then
-		unpack ${PN}-mod-vroot-${VROOT_VER}.tar.gz
-		cp mod_vroot/mod_vroot.c contrib/
-		cp mod_vroot/mod_vroot.html doc/
-	fi
-}
-
-src_compile() {
-	addpredict /etc/krb5.conf
-	local modules myconf
-
-	modules="mod_ratio:mod_readme"
-	use pam && modules="${modules}:mod_auth_pam"
-	use tcpd && modules="${modules}:mod_wrap"
-	use shaper && modules="${modules}:mod_shaper"
-	use acl && modules="${modules}:mod_facl"
-	use sitemisc && modules="${modules}:mod_site_misc"
-	use rewrite && modules="${modules}:mod_rewrite"
-	use clamav && modules="${modules}:mod_clamav"
-	use radius && modules="${modules}:mod_radius"
-	use vroot && modules="${modules}:mod_vroot"
-	use ssl && modules="${modules}:mod_tls"
-
-	if use ldap; then
-		modules="${modules}:mod_ldap"
-		append-ldflags "-lresolv"
-	fi
-
-	if use opensslcrypt; then
-		append-ldflags "-lcrypto"
-		myconf="${myconf} --with-includes=/usr/include/openssl"
-		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
-	fi
-
-	if use mysql && use postgres
-	then
-		ewarn "ProFTPD only supports either the MySQL or PostgreSQL modules."
-		ewarn "Presently this ebuild defaults to mysql. If you would like to"
-		ewarn "change the default behaviour, merge ProFTPD with;"
-		ewarn "USE=\"-mysql postgres\" emerge proftpd"
-		epause 5
-	fi
-
-	if use mysql; then
-		modules="${modules}:mod_sql:mod_sql_mysql"
-		myconf="${myconf} --with-includes=/usr/include/mysql"
-	elif use postgres; then
-		modules="${modules}:mod_sql:mod_sql_postgres"
-		myconf="${myconf} --with-includes=/usr/include/postgresql"
-	fi
-
-	if use softquota; then
-		modules="${modules}:mod_quotatab"
-		if use mysql || use postgres; then
-			modules="${modules}:mod_quotatab_sql"
-		fi
-		if use ldap; then
-			modules="${modules}:mod_quotatab_file:mod_quotatab_ldap"
-		else
-			modules="${modules}:mod_quotatab_file"
-		fi
-	fi
-
-	#This should be the last module
-	use ifsession && modules="${modules}:mod_ifsession"
-
-	# bug #30359
-	use hardened && echo > lib/libcap/cap_sys.c
-	gcc-specs-pie && echo > lib/libcap/cap_sys.c
-
-	if use noauthunix ; then
-		myconf="${myconf} --disable-auth-unix"
-	else
-		myconf="${myconf} --enable-auth-unix"
-	fi
-
-	econf \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var/run \
-		--sysconfdir=/etc/proftpd \
-		--enable-shadow \
-		--enable-autoshadow \
-		--enable-ctrls \
-		--with-modules=${modules} \
-		$(use_enable authfile auth-file) \
-		$(use_enable ncurses) \
-		$(use_enable ipv6) \
-		$(use_with sendfile) \
-		$(use_enable acl facl ) \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	# Note rundir needs to be specified to avoid sandbox violation
-	# on initial install. See Make.rules
-	make DESTDIR=${D} install || die
-
-	keepdir /var/run/proftpd
-
-	dodoc ${FILESDIR}/proftpd.conf \
-		COPYING CREDITS ChangeLog NEWS README* \
-		doc/license.txt
-	dohtml doc/*.html
-
-	use shaper && dohtml mod_shaper/mod_shaper.html
-
-	docinto rfc
-	dodoc doc/rfc/*.txt
-
-	mv ${D}/etc/proftpd/proftpd.conf ${D}/etc/proftpd/proftpd.conf.distrib
-
-	insinto /etc/proftpd
-	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
-
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		newins ${FILESDIR}/proftpd.xinetd proftpd
-	fi
-
-	newinitd ${FILESDIR}/proftpd.rc6-r2 proftpd
-}
-
-pkg_postinst() {
-	if use sendfile; then
-		einfo
-		einfo 'Please note that ProFTPD now uses the sendfile() system calls when possible to'
-		einfo 'improve performance. The downside of this is that the scoreboard file cannot be'
-		einfo 'updated during a download, so tools like ftpwho and ftptop will not show the'
-		einfo 'transfer rates for them. Upload transfer rates will still be displayed.'
-	fi
-
-	einfo
-	einfo 'You can find the config files in /etc/proftpd'
-	einfo
-	ewarn 'With introduction of net-ftp/ftpbase the ftp user is now ftp.'
-	ewarn 'Remember to change that in the configuration file.'
-}
-