From: Bernard Cafarelli Date: Thu, 18 Aug 2011 14:40:44 +0000 (+0000) Subject: Proxy commit, drop memcache support and cleanups X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2171bdad21584120fcd07e8b8a176fc12f329f71;p=gentoo.git Proxy commit, drop memcache support and cleanups Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index 8da6c6296d96..a12d46b0cd84 100644 --- a/net-ftp/proftpd/ChangeLog +++ b/net-ftp/proftpd/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for net-ftp/proftpd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.274 2011/07/21 17:16:12 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.275 2011/08/18 14:40:44 voyageur Exp $ + +*proftpd-1.3.4_rc2-r2 (18 Aug 2011) + + 18 Aug 2011; Bernard Cafarelli + -proftpd-1.3.4_rc2.ebuild, -proftpd-1.3.4_rc2-r1.ebuild, + +proftpd-1.3.4_rc2-r2.ebuild: + Proxy commit: + * Bump mod_case to 0.7. + * Remove ~amd64-fbsd keyword until all ProFTPD dependencies are keyworded for + ~amd64-fbsd. + * Remove memcache support. ProFTPD requires dev-libs/libmemcached >= 0.41 + which is not in the portage tree yet. See Gentoo Bugs #378881 and #354261. + * Set dependency for USE=acl to virtual/acl. + * Some stylistic changes. 21 Jul 2011; Anthony G. Basile proftpd-1.3.3d-r1.ebuild, proftpd-1.3.3e.ebuild: diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index 1b2ba94d293c..a8cad4d223ed 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -12,20 +12,20 @@ DIST proftpd-1.3.3d.tar.bz2 4177511 RMD160 8aa4e1c0456c771ae77e8682bd612b1229d05 DIST proftpd-1.3.3e.tar.bz2 4180369 RMD160 12eef0bd466cdb1dbdd342cda8e93c1cb619dd07 SHA1 b347aa72d12e41fe8f43e8d91a7a4eeaac6f472f SHA256 f6c65fe9fea6577ac309f4e9e36c80def271fa5c91c4053fb0758824506127b6 DIST proftpd-1.3.4rc2.tar.bz2 6748120 RMD160 c0c5d5b447486e636c8c1de0cc62d1fc393182ac SHA1 693abfc85aa93729c87cf87f53221e95dc0f86d7 SHA256 72f3e85b2bc59b3cb94128065901f95c13c0150da1390a79864abf8d5c94e2ca DIST proftpd-mod-case-0.4.tar.gz 4849 RMD160 fdf579587461c0ad2136f6cc1e3064efe31f2eb6 SHA1 01631d4545d9a4995d452278caa2ef94b84e6a1f SHA256 5c724a2a57a00048529bfab6c5672e16c7c0ecb2eb4e2bedd05bb3a1a5bf97fa +DIST proftpd-mod-case-0.7.tar.gz 13184 RMD160 9514b003b21999a97df59b2fe8b24a71d585047b SHA1 665b25a1673edc34faac87bd48fb193687c131bc SHA256 c3f65588250fea7771439933fa754927794f664e99b8d20f99b1e400fea62111 DIST proftpd-mod-deflate-0.5.4.tar.gz 55219678 RMD160 0d9ac70d076de3be521492d0c79089291a1b6dfd SHA1 292ba9dd301a010c46906ec09b5d455ff2b8ee4f SHA256 6ae753608ad126067bd48da8d4ea6ac3ef8eaf339ae924ffdbe30d1819a5e5db DIST proftpd-mod-diskuse-0.9.tar.gz 18596 RMD160 38629d0a176e11bd10b550a8e49fcc3d8c762470 SHA1 9bf6e14acda088e1663be908df9165650ca13b05 SHA256 424f3fd49237245ec176d27ade0965fe21a0db1d645979d5ae3e55497e3da036 DIST proftpd-mod-vroot-0.8.5.tar.gz 8349 RMD160 0e9c3ea9615ed74556fcaf6145863922ee45bedf SHA1 fea69382f4dda36b620780e69cef5872f41f86fe SHA256 305ad1e3b320dc21172982c54a614a09d43373f7289b63202788de640145bbd4 DIST proftpd-mod-vroot-0.9.2.tar.gz 22438 RMD160 8d8620a346b422e57cd775fdde0241a3c0ca144d SHA1 13ec52c688bbb91eaae76a8e4814bfd49e0bc597 SHA256 b0ea7af760ab7a54a62ac294656b5a34a5339665c0227ade0d2f206cc54a10bf EBUILD proftpd-1.3.3d-r1.ebuild 7245 RMD160 e99c7e74adb60a3d4130943497a6e519b4e09bca SHA1 f11326ac34ee44f117c0c991ca16bb82f6be09c9 SHA256 0656968ac511d2cb18a249b0fe9439b9088d1e84a4506882c919061ca14004a3 EBUILD proftpd-1.3.3e.ebuild 7183 RMD160 4c009e8f89baef255c123f204c8bfec5d09196d9 SHA1 fd7eb7e51c817b07445287db1ed293fb87b76cf8 SHA256 bcd90c24d29af48fefdb4b63aa7928e54a9c1075e4c6cf0ee8dbd4e0786273b8 -EBUILD proftpd-1.3.4_rc2-r1.ebuild 7226 RMD160 984aceccecb3ac44b688b22189568a939e6969e3 SHA1 4df1fb5c41d00ffc4853764f344eb321bb137f19 SHA256 b189a4462add508710551505ffbc6246b82809f5d6597d0be85f590633142a61 -EBUILD proftpd-1.3.4_rc2.ebuild 7137 RMD160 b932f080752ad3f96ec6ecd0c5bfaea42fc9b633 SHA1 7c3c282881ad523972ce4e83f0e751f31415097b SHA256 20a66c046638164d6c57f1d65377c8e16b3c34ec6f81ce2f5c055248eb51a5f9 -MISC ChangeLog 46823 RMD160 fbf04c02a66db9c4914d341cd9374cf3d3563c0d SHA1 dc6da02454e746851b170f3ff3b8ce52cfc4dcc1 SHA256 99fcf41a823b070eea9a3b0f7aa480f04ca38d8ce4f0640ec2b692cb8806b75f +EBUILD proftpd-1.3.4_rc2-r2.ebuild 7060 RMD160 20e85a839bf8d234b9fa5247856d84baa0a0b255 SHA1 1377d503568db5b3ce84fda5312553469e3fa4e7 SHA256 67016b5a2cc3001ffbdce699e667a5f6a70f33f43b0f0d10273be07c3e8bbb42 +MISC ChangeLog 47372 RMD160 7eca324cf1c9ef0abd664a002322ad9a9a009dda SHA1 c475378ce9f48ddc61eff7ea493cab776fda1631 SHA256 2b6cc3910c657027d452de9cab2f761f8328e80d64d364b607108f15a30189fe MISC metadata.xml 2286 RMD160 881ef9e88e0426169393f54c68dcf91f895e898e SHA1 37abd54df219347761bd3e1b9f74bded51aa0740 SHA256 f63550b381774d49259b5723c68e5b73f1e8f0b8a72760a1aa0e54747027a26e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEAREIAAYFAk4oXugACgkQl5yvQNBFVTVSzwCeJ+YF1UIt06A3xciNNWblBaZ+ -tfEAnRWg1dg8XVYn6Vw668ueX06VuNKr -=M3fy +iF4EAREIAAYFAk5NJH8ACgkQFYEBGcdFJfLlXwD/eku48NcfwSLsUv6uFdtkybfR +OirebARevKFssE1Yf8oA/iIYA33vuG/HbRkSm7hoqxchjlYuk667TsYtxmNnCDk4 +=ogwN -----END PGP SIGNATURE----- diff --git a/net-ftp/proftpd/proftpd-1.3.4_rc2-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.4_rc2-r1.ebuild deleted file mode 100644 index 66f3194f6d4a..000000000000 --- a/net-ftp/proftpd/proftpd-1.3.4_rc2-r1.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4_rc2-r1.ebuild,v 1.1 2011/04/14 19:02:59 voyageur Exp $ - -EAPI=4 -inherit eutils autotools - -MOD_CASE="0.4" -MOD_CLAMAV="0.11rc" -MOD_DISKUSE="0.9" -MOD_GSS="1.3.3" -MOD_VROOT="0.9.2" - -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-${MOD_CASE}.tar.gz ) - clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz ) - diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz ) - kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz ) - vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${MOD_VROOT}.tar.gz )" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc exec ifsession ifversion ident - ipv6 kerberos ldap memcache mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite - selinux sftp shaper sitemisc softquota sqlite 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 ) - memcache? ( >=dev-libs/libmemcached-0.37 ) - mysql? ( virtual/mysql ) - nls? ( virtual/libiconv ) - ncurses? ( sys-libs/ncurses ) - pam? ( virtual/pam ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql-base ) - sftp? ( dev-libs/openssl ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl ) - 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 -} - -src_prepare() { - # Gentoo bug #363293 - epatch "${FILESDIR}"/${P}-sql-groupsetfast-null-pointer.patch - - use case && __prepare_module mod_case - if use clamav ; then - mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib - epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch - rm -rf "${WORKDIR}"/mod_clamav-${MOD_CLAMAV} - fi - use vroot && __prepare_module mod_vroot - - 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-${MOD_GSS} - 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" - use copy && mym="${mym}:mod_copy" - if use ctrls || use ban || use shaper ; then - myc="${myc} --enable-ctrls" - mym="${mym}:mod_ctrls_admin" - fi - use deflate && mym="${mym}:mod_deflate" - if use diskuse ; then - cd "${WORKDIR}"/mod_diskuse - econf - mv mod_diskuse.{c,h} "${S}"/contrib - mv mod_diskuse.html "${S}"/doc/contrib - cd "${S}" - rm -rf "${WORKDIR}"/mod_diskuse - mym="${mym}:mod_diskuse" - fi - use exec && mym="${mym}:mod_exec" - use ifsession && mym="${mym}:mod_ifsession" - use ifversion && mym="${mym}:mod_ifversion" - if use kerberos ; then - cd "${WORKDIR}"/mod_gss-${MOD_GSS} - 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-${MOD_GSS} - mym="${mym}:mod_gss:mod_auth_gss" - fi - if use ldap ; then - use elibc_glibc && myl="${myl} -lresolv" - mym="${mym}:mod_ldap" - fi - if use mysql || use postgres || use sqlite ; then - mym="${mym}:mod_sql:mod_sql_passwd" - use mysql && mym="${mym}:mod_sql_mysql" - use postgres && mym="${mym}:mod_sql_postgres" - use sqlite && mym="${mym}:mod_sql_sqlite" - fi - use qos && mym="${mym}:mod_qos" - use radius && mym="${mym}:mod_radius" - use ratio && mym="${mym}:mod_ratio" - use readme && mym="${mym}:mod_readme" - use rewrite && mym="${mym}:mod_rewrite" - use sftp || use ssl && myc="${myc} --enable-openssl" - if use sftp ; then - mym="${mym}:mod_sftp" - use pam && mym="${mym}:mod_sftp_pam" - use mysql || use postgres || use sqlite && mym="${mym}:mod_sftp_sql" - 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" - use mysql || use postgres || use sqlite && mym="${mym}:mod_quotatab_sql" - fi - if use ssl ; then - mym="${mym}:mod_tls:mod_tls_shmcache" - use memcache && mym="${mym}:mod_tls_memcache" - fi - if use tcpd ; then - mym="${mym}:mod_wrap2:mod_wrap2_file" - use mysql || use postgres || use sqlite && mym="${mym}:mod_wrap2_sql" - fi - use vroot && mym="${mym}:mod_vroot" - - [ -z ${mym} ] || myc="${myc} --with-modules=${mym:1}" - LIBS="${myl:1}" econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd \ - $(use_enable acl facl) \ - $(use_enable authfile auth-file) \ - $(use_enable caps cap) \ - $(use_enable ident) \ - $(use_enable ipv6) \ - $(use_enable memcache) \ - $(use_enable ncurses) \ - $(use_enable nls) \ - $(use_enable pam auth-pam) \ - $(use_enable pcre) \ - $(use_enable trace) \ - $(use_enable userland_GNU shadow) \ - $(use_enable userland_GNU autoshadow) \ - ${myc:1} -} - -src_install() { - emake DESTDIR="${ED}" install - newinitd "${FILESDIR}"/proftpd.initd proftpd - insinto /etc/proftpd - doins "${FILESDIR}"/proftpd.conf.sample - - 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 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 - if use tcpd ; then - ewarn - ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper" - ewarn "support has been replaced by mod_wrap2 which is more configurable and" - ewarn "portable. But you have to adjust your configuration before restaring" - ewarn "ProFTPD. On the following website you can find more information:" - ewarn " http://proftpd.org/docs/contrib/mod_wrap2.html" - ewarn - fi -} diff --git a/net-ftp/proftpd/proftpd-1.3.4_rc2.ebuild b/net-ftp/proftpd/proftpd-1.3.4_rc2-r2.ebuild similarity index 91% rename from net-ftp/proftpd/proftpd-1.3.4_rc2.ebuild rename to net-ftp/proftpd/proftpd-1.3.4_rc2-r2.ebuild index 2c3683f91640..d29f02291c82 100644 --- a/net-ftp/proftpd/proftpd-1.3.4_rc2.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.4_rc2-r2.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4_rc2.ebuild,v 1.1 2011/04/04 20:56:08 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4_rc2-r2.ebuild,v 1.1 2011/08/18 14:40:44 voyageur Exp $ EAPI=4 inherit eutils autotools -MOD_CASE="0.4" +MOD_CASE="0.7" MOD_CLAMAV="0.11rc" MOD_DISKUSE="0.9" MOD_GSS="1.3.3" @@ -25,17 +25,16 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc exec ifsession ifversion ident - ipv6 kerberos ldap memcache mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite - selinux sftp shaper sitemisc softquota sqlite ssl tcpd trace vroot xinetd" + ipv6 kerberos ldap mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux + sftp shaper sitemisc softquota sqlite ssl tcpd trace vroot xinetd" -DEPEND="acl? ( sys-apps/acl sys-apps/attr ) +DEPEND="acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) - memcache? ( >=dev-libs/libmemcached-0.37 ) mysql? ( virtual/mysql ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses ) @@ -70,6 +69,9 @@ src_prepare() { sed -i -e "s/utils install-conf install/utils install/g" Makefile.in sed -i -e "s/ @INSTALL_STRIP@//g" Make.rules.in + # Fix Gentoo Bug #363293 / ProFTPD Bug #3642 + epatch "${FILESDIR}"/${P}-sql-groupsetfast-null-pointer.patch + # Support new versions of mit-krb5 (Gentoo Bugs #284853, #324903) if use kerberos ; then cd "${WORKDIR}"/mod_gss-${MOD_GSS} @@ -149,10 +151,7 @@ src_configure() { use radius && mym="${mym}:mod_quotatab_radius" use mysql || use postgres || use sqlite && mym="${mym}:mod_quotatab_sql" fi - if use ssl ; then - mym="${mym}:mod_tls:mod_tls_shmcache" - use memcache && mym="${mym}:mod_tls_memcache" - fi + use ssl && mym="${mym}:mod_tls:mod_tls_shmcache" if use tcpd ; then mym="${mym}:mod_wrap2:mod_wrap2_file" use mysql || use postgres || use sqlite && mym="${mym}:mod_wrap2_sql" @@ -166,7 +165,6 @@ src_configure() { $(use_enable caps cap) \ $(use_enable ident) \ $(use_enable ipv6) \ - $(use_enable memcache) \ $(use_enable ncurses) \ $(use_enable nls) \ $(use_enable pam auth-pam) \ @@ -178,7 +176,7 @@ src_configure() { } src_install() { - emake DESTDIR="${ED}" install + default newinitd "${FILESDIR}"/proftpd.initd proftpd insinto /etc/proftpd doins "${FILESDIR}"/proftpd.conf.sample