diff options
author | Bernard Cafarelli <voyageur@gentoo.org> | 2010-11-03 09:23:46 +0000 |
---|---|---|
committer | Bernard Cafarelli <voyageur@gentoo.org> | 2010-11-03 09:23:46 +0000 |
commit | 529eb60a21fdd2056c167c6cdfab5969281788f7 (patch) | |
tree | 00f8147cc2357f031a2c3ab69606b8636fcc356e /net-ftp | |
parent | x86 stable wrt security bug #339717 (diff) | |
download | historical-529eb60a21fdd2056c167c6cdfab5969281788f7.tar.gz historical-529eb60a21fdd2056c167c6cdfab5969281788f7.tar.bz2 historical-529eb60a21fdd2056c167c6cdfab5969281788f7.zip |
Security version bump, bug #343389
Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64
Diffstat (limited to 'net-ftp')
-rw-r--r-- | net-ftp/proftpd/ChangeLog | 8 | ||||
-rw-r--r-- | net-ftp/proftpd/Manifest | 4 | ||||
-rw-r--r-- | net-ftp/proftpd/proftpd-1.3.3c.ebuild | 221 |
3 files changed, 231 insertions, 2 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index 3a969a195775..3c08582e368f 100644 --- a/net-ftp/proftpd/ChangeLog +++ b/net-ftp/proftpd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-ftp/proftpd # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.241 2010/10/26 09:29:45 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.242 2010/11/03 09:23:46 voyageur Exp $ + +*proftpd-1.3.3c (03 Nov 2010) + + 03 Nov 2010; Bernard Cafarelli <voyageur@gentoo.org> + +proftpd-1.3.3c.ebuild: + Security version bump, bug #343389 26 Oct 2010; Jeroen Roovers <jer@gentoo.org> proftpd-1.3.3a.ebuild: Stable for HPPA (bug #333507). diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index 7bddc59eb09d..8d85390f8438 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -16,6 +16,7 @@ DIST proftpd-1.3.2e.tar.bz2 2545499 RMD160 31e814b7d009251bfa1a459066574c741309d DIST proftpd-1.3.3.tar.bz2 4132650 RMD160 01c9226f694129561dd35a03631c6a2b8bd593dc SHA1 ce7c1f96648f94e32d5d104cd1405e6778aae045 SHA256 793f2bde2ab5aeb86a68349118d87bb151ba1278987612b7a12872110f9d759c DIST proftpd-1.3.3a.tar.bz2 4157983 RMD160 a900502b02518fcad7595d19bb14bbd74c6690ba SHA1 89b6f42b6d14b53b1e35f365ed60aa3f06d116b8 SHA256 c1f73e7b189c22fe2f33a0cd6f9d3f3ad10ee73c23a1347cd13daf87fea729f7 DIST proftpd-1.3.3b.tar.bz2 4162969 RMD160 643a154af5f7bdc3325256065dc2d6bc3d703109 SHA1 5ecc934389d5022d3f7e1246b53c0f6bf09e642c SHA256 28d235cf312df19d03762ef106ba9371741646f0fc36127db0482a8861d46794 +DIST proftpd-1.3.3c.tar.bz2 4166609 RMD160 08a6fac94aa3449192e92848c6271cca33ea26cc SHA1 167d2f5f22f2bf8a5365b18adfd18a5fc750b07f SHA256 ea7f02e21f81e6ce79ebde8bbbd334bd269a039ac9137196a35309f791b24db1 DIST proftpd-mod-case-0.3.tar.gz 4781 RMD160 99f46a2cfb88ec2f3070d632dbc17d89d12ec30b SHA1 c8ea2c4604ab2ffa5853284d0696b1dfe518ae84 SHA256 a9affd47558020b2b3f369c9a945ac91d22b45368734d839404b76e0fbdaaf7c DIST proftpd-mod-case-0.4.tar.gz 4849 RMD160 fdf579587461c0ad2136f6cc1e3064efe31f2eb6 SHA1 01631d4545d9a4995d452278caa2ef94b84e6a1f SHA256 5c724a2a57a00048529bfab6c5672e16c7c0ecb2eb4e2bedd05bb3a1a5bf97fa DIST proftpd-mod-deflate-0.4.tar.gz 2779844 RMD160 e6c7689b281ef015ceefa1d2939f5cf0a6fffc72 SHA1 2f42c3761445657e032739ea67c1cf359e527a98 SHA256 4451d9af02900aabe769f0d8a5efa80bdf2973efc4db2d138623b01b3ef72b69 @@ -29,5 +30,6 @@ EBUILD proftpd-1.3.3-r1.ebuild 7276 RMD160 d8a9357e896df752923fcf8d637f10632c510 EBUILD proftpd-1.3.3.ebuild 7087 RMD160 1f93876a995e5caf2145f8a03047de839ba8b507 SHA1 d03bf525d997c485226186f3a4cb901165c73723 SHA256 54eb92d72aaea49232ce31da936c14cd80cdec8de64201fe03b671b7478f93d8 EBUILD proftpd-1.3.3a.ebuild 7176 RMD160 63ca14d5336dfe09cf6ce5cf39614445e30c516c SHA1 f6e03cb666697df4bbb37a22234a55bfb2e94aaf SHA256 bf809fbf5d848224377b77d3dd3c56380fbf82ecebd00a8b706513b01dc1b396 EBUILD proftpd-1.3.3b.ebuild 7185 RMD160 5df871f80938efee49ee42f1e93cc3e1291bdb89 SHA1 48ed5607609cd6a1c9ee6797e886dcb5dff8c982 SHA256 2cc45e574d5f9cddd66f6d9c2b771cb1b6895f74115f467aa8d82e45845a1917 -MISC ChangeLog 40561 RMD160 6f25d7ffe274ffdd642f3237349b389897f797dc SHA1 ec2b6a79576b6f1cfbfd0f2778b9d895103d3730 SHA256 c1438dc52f315008d46d1079521ac5fcb0c1dca0d7be2be46dab0fbbe2b8a2ce +EBUILD proftpd-1.3.3c.ebuild 7188 RMD160 85c216f4a9256bdf5826e10650d43f5075c5c352 SHA1 ecc3368d710c2f3b5d6eb22b1db487515646fc34 SHA256 ffaa1de92dc12b095e5bfb42c12ae1e261a622a380cc9ffe20866b0ef6e87e70 +MISC ChangeLog 40716 RMD160 64eb0bda8855948d8dc31c7815d821956825ff7b SHA1 05a989c016b9929f7eb782d9754def4fc424563d SHA256 3f28b586c77dfd73cef24f54a83de36f897cc4e7e76646dd497f8bc7f60cb6f1 MISC metadata.xml 1812 RMD160 79f9109e0364ddcff30da3f86af3c889f4ea1cee SHA1 dacd8d433d5f42e4dd7b6cb33ec9131f07abd98b SHA256 313c3786f11cc6311966be048d4290cf363e46c5e7dc31b5ed6890c7071efdbf diff --git a/net-ftp/proftpd/proftpd-1.3.3c.ebuild b/net-ftp/proftpd/proftpd-1.3.3c.ebuild new file mode 100644 index 000000000000..043178dac4ae --- /dev/null +++ b/net-ftp/proftpd/proftpd-1.3.3c.ebuild @@ -0,0 +1,221 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3c.ebuild,v 1.1 2010/11/03 09:23:46 voyageur Exp $ + +EAPI="2" +inherit eutils autotools + +CASE_VER="0.4" +CLAMAV_VER="0.11rc" +DEFLATE_VER="0.5.4" +GSS_VER="1.3.3" +VROOT_VER="0.8.5" + +DESCRIPTION="An advanced and very configurable FTP server." +HOMEPAGE="http://www.proftpd.org/ + http://www.castaglia.org/proftpd/ + http://www.thrallingpenguin.com/resources/mod_clamav.htm + http://gssmod.sourceforge.net/" +SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2 + case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz ) + clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${CLAMAV_VER}.tar.gz ) + deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz ) + kerberos? ( mirror://sourceforge/gssmod/mod_gss-${GSS_VER}.tar.gz ) + vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="acl authfile ban +caps case clamav +ctrls deflate doc exec hardened ifsession ident ipv6 kerberos ldap mysql ncurses nls pam postgres radius ratio readme rewrite selinux sftp shaper sitemisc softquota ssl tcpd trace vroot xinetd" + +DEPEND="acl? ( sys-apps/acl sys-apps/attr ) + caps? ( sys-libs/libcap ) + clamav? ( app-antivirus/clamav ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + mysql? ( virtual/mysql ) + ncurses? ( sys-libs/ncurses ) + pam? ( virtual/pam ) + postgres? ( dev-db/postgresql-base ) + sftp? ( dev-libs/openssl ) + ssl? ( dev-libs/openssl ) + tcpd? ( sys-apps/tcp-wrappers ) + xinetd? ( virtual/inetd )" +RDEPEND="${DEPEND} + net-ftp/ftpbase + selinux? ( sec-policy/selinux-ftpd )" + +S="${WORKDIR}/${P/_/}" + +__prepare_module() { + mv "${WORKDIR}"/$1/$1.c contrib + mv "${WORKDIR}"/$1/$1.html doc/contrib + rm -rf "${WORKDIR}"/$1 +} + +pkg_setup() { + if [ -f "${ROOT}"/var/run/proftpd.pid ] ; then + eerror "Your ProFTPD server is running. In order to install this update" + eerror "you have to stop the running server. If you are using ProFTPD in" + eerror "the standalone mode you can stop the server by executing:" + eerror " /etc/init.d/proftpd stop" + eerror "If you are sure that ProFTPD is not running anymore you have to" + eerror "delete the /var/run/proftpd.pid file." + die "This update requires to stop the ProFTPD server!" + fi +} + +src_prepare() { + use case && __prepare_module mod_case + if use clamav ; then + mv "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/mod_clamav.{c,h} contrib + epatch "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/${PN}.patch + rm -rf "${WORKDIR}"/mod_clamav-${CLAMAV_VER} + fi + use deflate && __prepare_module mod_deflate + use vroot && __prepare_module mod_vroot + + # Fix MySQL includes + sed -i -e "s/<mysql.h>/<mysql\/mysql.h>/g" contrib/mod_sql_mysql.c + + # Manipulate build system + sed -i -e "s/utils install-conf install/utils install/g" Makefile.in + sed -i -e "s/ @INSTALL_STRIP@//g" Make.rules.in + + # Support new versions of mit-krb5 (Gentoo Bugs #284853, #324903) + if use kerberos ; then + cd "${WORKDIR}"/mod_gss-${GSS_VER} + sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in + sed -i -e "/ac_gss_libs/s/\-ldes425\ //" configure.in + eautoreconf + fi +} + +src_configure() { + local myc myl mym + + use acl && mym="${mym}:mod_facl" + use ban && mym="${mym}:mod_ban" + use case && mym="${mym}:mod_case" + use clamav && mym="${mym}:mod_clamav" + if use ctrls || use shaper ; then + myc="${myc} --enable-ctrls" + mym="${mym}:mod_ctrls_admin" + fi + use deflate && mym="${mym}:mod_deflate" + use exec && mym="${mym}:mod_exec" + if use kerberos ; then + cd "${WORKDIR}"/mod_gss-${GSS_VER} + if has_version app-crypt/mit-krb5 ; then + econf --enable-mit + else + econf --enable-heimdal + fi + mv mod_{auth_gss,gss}.c "${S}"/contrib + mv mod_gss.h "${S}"/include + mv README.mod_{auth_gss,gss} "${S}" + mv mod_gss.html "${S}"/doc/contrib + mv rfc{1509,2228}.txt "${S}"/doc/rfc + cd "${S}" + rm -rf "${WORKDIR}"/mod_gss-${GSS_VER} + mym="${mym}:mod_gss:mod_auth_gss" + fi + if use ldap ; then + myl="${myl} -lresolv" + mym="${mym}:mod_ldap" + fi + if use mysql || use postgres ; then + mym="${mym}:mod_sql:mod_sql_passwd" + if use mysql ; then + myc="${myc} --with-includes=/usr/include/mysql" + mym="${mym}:mod_sql_mysql" + fi + if use postgres ; then + myc="${myc} --with-includes=/usr/include/postgresql" + mym="${mym}:mod_sql_postgres" + fi + fi + if use sftp || use ssl ; then + CFLAGS="${CFLAGS} -DHAVE_OPENSSL" + myc="${myc} --enable-openssl --with-includes=/usr/include/openssl" + myl="${myl} -lcrypto" + fi + use radius && mym="${mym}:mod_radius" + use ratio && mym="${mym}:mod_ratio" + use readme && mym="${mym}:mod_readme" + use rewrite && mym="${mym}:mod_rewrite" + if use sftp ; then + mym="${mym}:mod_sftp" + use pam && mym="${mym}:mod_sftp_pam" + if use mysql || use postgres ; then + mym="${mym}:mod_sftp_sql" + fi + fi + use shaper && mym="${mym}:mod_shaper" + use sitemisc && mym="${mym}:mod_site_misc" + if use softquota ; then + mym="${mym}:mod_quotatab:mod_quotatab_file" + use ldap && mym="${mym}:mod_quotatab_ldap" + use radius && mym="${mym}:mod_quotatab_radius" + if use mysql || use postgres ; then + mym="${mym}:mod_quotatab_sql" + fi + fi + use ssl && mym="${mym}:mod_tls:mod_tls_shmcache" + use tcpd && mym="${mym}:mod_wrap" + use vroot && mym="${mym}:mod_vroot" + # mod_ifsession needs to be the last module in the mym list. + use ifsession && mym="${mym}:mod_ifsession" + + [ -z ${mym} ] || myc="${myc} --with-modules=${mym:1}" + LIBS="${myl:1}" econf --sbindir=/usr/sbin --localstatedir=/var/run/proftpd \ + --sysconfdir=/etc/proftpd --enable-shadow --enable-autoshadow ${myc:1} \ + $(use_enable acl facl) \ + $(use_enable authfile auth-file) \ + $(use_enable caps cap) \ + $(use_enable ident) \ + $(use_enable ipv6) \ + $(use_enable ncurses) \ + $(use_enable nls) \ + $(use_enable trace) \ + $(use_enable pam auth-pam) +} + +src_install() { + emake DESTDIR="${D}" install + + insinto /etc/proftpd + doins "${FILESDIR}"/proftpd.conf.sample + keepdir /var/run/proftpd + newinitd "${FILESDIR}"/proftpd.initd proftpd + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/proftpd.xinetd proftpd + fi + + dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES + if use doc ; then + dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html + docinto rfc + dodoc doc/rfc/*.txt + fi +} + +pkg_postinst() { + if use mysql && use postgres ; then + elog + elog "ProFTPD has been built with the MySQL and PostgreSQL modules." + elog "You can use the 'SQLBackend' directive to specify the used SQL" + elog "backend. Without this directive the default backend is MySQL." + elog + fi + if use exec ; then + ewarn + ewarn "ProFTPD has been built with the mod_exec module. This module" + ewarn "can be a security risk for your server as it executes external" + ewarn "programs. Vulnerables in these external programs may disclose" + ewarn "information or even compromise your server." + ewarn "You have been warned! Use this module at your own risk!" + ewarn + fi +} |