diff options
| -rw-r--r-- | net-ftp/proftpd/ChangeLog | 19 | ||||
| -rw-r--r-- | net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2 | 15 | ||||
| -rw-r--r-- | net-ftp/proftpd/proftpd-1.3.1_rc2.ebuild | 212 |
3 files changed, 245 insertions, 1 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index fc60e8e80c0d..657446a90715 100644 --- a/net-ftp/proftpd/ChangeLog +++ b/net-ftp/proftpd/ChangeLog @@ -1,6 +1,23 @@ # ChangeLog for net-ftp/proftpd # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.146 2007/01/23 10:18:19 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.147 2007/01/25 13:03:50 chtekk Exp $ + +*proftpd-1.3.1_rc2 (25 Jan 2007) + + 25 Jan 2007; Luca Longinotti <chtekk@gentoo.org> + -files/proftpd-1.2.10-ftpshut.patch, + -files/proftpd-1.2.10-gcc4_mod_quotatab_sql.patch, + -files/proftpd-1.2.10-openssl_0.9.8.patch, + -files/proftpd-1.2.10-sqlshowinfo.patch, + -files/proftpd-1.3.0-main_commandbuf.patch, + -files/proftpd-1.3.0-mod_ctrls_sighup.patch, + -files/proftpd-1.3.0-mod_sql_mysql.patch, + -files/proftpd-1.3.0-mod_tls_overflow.patch, -proftpd-1.2.10-r7.ebuild, + -proftpd-1.3.0a.ebuild, -proftpd-1.3.1_rc1.ebuild, + +proftpd-1.3.1_rc2.ebuild: + Remove old 1.2.10 and 1.3.0a versions. Move 1.3.1_rc1 to 1.3.1_rc2, which + just fixes a few bugs, two of which important/critical, see Gentoo bugs + #159066 and #159772. 23 Jan 2007; Steve Dibb <beandog@gentoo.org> proftpd-1.3.1_rc1.ebuild: amd64 stable, security bug 158122 diff --git a/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2 b/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2 new file mode 100644 index 000000000000..b18daddb66a6 --- /dev/null +++ b/net-ftp/proftpd/files/digest-proftpd-1.3.1_rc2 @@ -0,0 +1,15 @@ +MD5 da279361d5a34b37ce1f64d3830c4c17 mod_clamav_new.c 7399 +RMD160 ae4de6385245a3c79d3c54bb7af9d2fe45a59feb mod_clamav_new.c 7399 +SHA256 a5a3860c73c8bc3781516cbc912d7736517a92a15a6fd8352eeed638bcce60c1 mod_clamav_new.c 7399 +MD5 098551feed28f069ef01e77af88d55dc mod_clamav_new.html 4645 +RMD160 bc853541e6859e7929c0ed9b01b8f220e09b8ca2 mod_clamav_new.html 4645 +SHA256 ac0ab5f44cfc6c8118664c2a7300450486f52fb3bcde332b4bb9c506dd765a1e mod_clamav_new.html 4645 +MD5 b117abb8fa7df8bc6d5e2ee85d97b4e0 proftpd-1.3.1rc2.tar.bz2 1516464 +RMD160 aa928315880cf1e9d1980850ce2bb07193d2ac46 proftpd-1.3.1rc2.tar.bz2 1516464 +SHA256 7494ea061ef28efc7afa63ffe0a80d598a55909d06dede9254e955c67e6440da proftpd-1.3.1rc2.tar.bz2 1516464 +MD5 74fbdcac94cde09c67bc033e22324c8c proftpd-mod-shaper-0.6.2.tar.gz 19002 +RMD160 3d1fdb82596672c9177009ebb30459a017e74c53 proftpd-mod-shaper-0.6.2.tar.gz 19002 +SHA256 59f39bca40462c3bba20feb7be031d7453c366adb4b7fa6d8f50974eb45ae99e proftpd-mod-shaper-0.6.2.tar.gz 19002 +MD5 7abc595e45ce13e38edd6110d1745436 proftpd-mod-vroot-0.7.2.tar.gz 6071 +RMD160 b152162b3714910d5b9378611313041c3e7e17d4 proftpd-mod-vroot-0.7.2.tar.gz 6071 +SHA256 cab5a42390eac4e0b8bdcbe1e6d15804c8029d51da9ad3bd428b46a80cd69d5a proftpd-mod-vroot-0.7.2.tar.gz 6071 diff --git a/net-ftp/proftpd/proftpd-1.3.1_rc2.ebuild b/net-ftp/proftpd/proftpd-1.3.1_rc2.ebuild new file mode 100644 index 000000000000..f59613334da7 --- /dev/null +++ b/net-ftp/proftpd/proftpd-1.3.1_rc2.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1_rc2.ebuild,v 1.1 2007/01/25 13:03:50 chtekk Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86" + +IUSE="acl authfile clamav hardened ifsession ipv6 ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd" + +SHAPER_VER="0.6.2" +VROOT_VER="0.7.2" + +DESCRIPTION="An advanced and very configurable FTP server." +SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2 + clamav? ( http://www.uglyboxindustries.com/mod_clamav_new.c http://www.uglyboxindustries.com/mod_clamav_new.html ) + shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz ) + 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" + +DEPEND="acl? ( sys-apps/acl sys-apps/attr ) + clamav? ( app-antivirus/clamav ) + ldap? ( >=net-nds/openldap-1.2.11 ) + mysql? ( virtual/mysql ) + ncurses? ( sys-libs/ncurses ) + opensslcrypt? ( >=dev-libs/openssl-0.9.6f ) + pam? ( virtual/pam ) + postgres? ( >=dev-db/postgresql-7.3 ) + ssl? ( >=dev-libs/openssl-0.9.6f ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 ) + xinetd? ( sys-apps/xinetd )" + +RDEPEND="${DEPEND} + net-ftp/ftpbase + selinux? ( sec-policy/selinux-ftpd )" + +S="${WORKDIR}/${P/_/}" + +pkg_setup() { + # Add the proftpd user to make the default config + # work out-of-the-box + enewgroup proftpd + enewuser proftpd -1 -1 -1 proftpd +} + +src_unpack() { + unpack ${P/_/}.tar.bz2 + + cd "${S}" + + # Fix stripping of files + sed -e "s| @INSTALL_STRIP@||g" -i Make* + + if use shaper ; then + unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz + cp -f mod_shaper/mod_shaper.c contrib/ + fi + + if use clamav ; then + cp -f "${DISTDIR}/mod_clamav_new.c" contrib/mod_clamav.c + cp -f "${DISTDIR}/mod_clamav_new.html" doc/mod_clamav.html + fi + + if use vroot ; then + unpack ${PN}-mod-vroot-${VROOT_VER}.tar.gz + cp -f mod_vroot/mod_vroot.c contrib/ + cp -f mod_vroot/mod_vroot.html doc/ + fi +} + +src_compile() { + addpredict /etc/krb5.conf + local modules myconf + + modules="mod_ratio:mod_readme" + use acl && modules="${modules}:mod_facl" + use clamav && modules="${modules}:mod_clamav" + use pam && modules="${modules}:mod_auth_pam" + use radius && modules="${modules}:mod_radius" + use rewrite && modules="${modules}:mod_rewrite" + use shaper && modules="${modules}:mod_shaper" + use sitemisc && modules="${modules}:mod_site_misc" + use ssl && modules="${modules}:mod_tls" + use tcpd && modules="${modules}:mod_wrap" + use vroot && modules="${modules}:mod_vroot" + + # pam needs to be explicitely disabled + use pam || myconf="${myconf} --enable-auth-pam=no" + + if use ldap ; then + modules="${modules}:mod_ldap" + append-ldflags "-lresolv" + fi + + if use opensslcrypt ; then + append-ldflags "-lcrypto" + myconf="${myconf} --enable-openssl --with-includes=/usr/include/openssl" + CFLAGS="${CFLAGS} -DHAVE_OPENSSL" + fi + + if use nls ; then + myconf="${myconf} --enable-nls" + 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 + + # mod_ifsession should be the last module in the --with-modules list + # see http://www.castaglia.org/proftpd/modules/mod_ifsession.html#Installation + 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 acl facl) \ + $(use_enable authfile auth-file) \ + $(use_enable ipv6) \ + $(use_enable ncurses) \ + ${myconf} || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + # Note rundir needs to be specified to avoid sandbox violation + # on initial install. See Make.rules + emake DESTDIR="${D}" install || die "emake install failed" + + 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 -f "${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" proftpd +} + +pkg_postinst() { + einfo + einfo "You can find the config files in /etc/proftpd" + einfo + ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp." + ewarn "Remember to change that in the configuration file." + einfo + if use clamav ; then + ewarn "mod_clamav was updated to a new version, which uses Clamd" + ewarn "only for virus scanning, so you'll have to set Clamd up" + ewarn "and start it, also re-check the mod_clamav docs." + einfo + fi +} |