* [gentoo-commits] gentoo-x86 commit in net-ftp/proftpd: ChangeLog proftpd-1.3.3f.ebuild proftpd-1.3.4_rc3.ebuild proftpd-1.3.3d-r1.ebuild proftpd-1.3.4_rc2-r2.ebuild
@ 2011-09-28 9:47 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; only message in thread
From: Bernard Cafarelli (voyageur) @ 2011-09-28 9:47 UTC (permalink / raw
To: gentoo-commits
voyageur 11/09/28 09:47:22
Modified: ChangeLog
Added: proftpd-1.3.3f.ebuild proftpd-1.3.4_rc3.ebuild
Removed: proftpd-1.3.3d-r1.ebuild
proftpd-1.3.4_rc2-r2.ebuild
Log:
Fix init script depecrated variables, version bumps
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Revision Changes Path
1.276 net-ftp/proftpd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/ChangeLog?rev=1.276&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/ChangeLog?rev=1.276&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/ChangeLog?r1=1.275&r2=1.276
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- ChangeLog 18 Aug 2011 14:40:44 -0000 1.275
+++ ChangeLog 28 Sep 2011 09:47:22 -0000 1.276
@@ -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.275 2011/08/18 14:40:44 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.276 2011/09/28 09:47:22 voyageur Exp $
+
+*proftpd-1.3.4_rc3 (28 Sep 2011)
+*proftpd-1.3.3f (28 Sep 2011)
+
+ 28 Sep 2011; Bernard Cafarelli <voyageur@gentoo.org>
+ -proftpd-1.3.3d-r1.ebuild, +proftpd-1.3.3f.ebuild,
+ -proftpd-1.3.4_rc2-r2.ebuild, +proftpd-1.3.4_rc3.ebuild,
+ -files/proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch,
+ -files/proftpd-bug3586.patch, files/proftpd.initd:
+ Proxy commit:
+ * Remove init script deprecated --oknodo (bug #384393)
+ * Readd memcache support (bug #378881)
+ * Add support of ProFTPD's api test suite
+ * Remove trivial mod_exec warning
*proftpd-1.3.4_rc2-r2 (18 Aug 2011)
1.1 net-ftp/proftpd/proftpd-1.3.3f.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3f.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3f.ebuild?rev=1.1&content-type=text/plain
Index: proftpd-1.3.3f.ebuild
===================================================================
# 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.3f.ebuild,v 1.1 2011/09/28 09:47:22 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.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-${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 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 ban || 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
}
1.1 net-ftp/proftpd/proftpd-1.3.4_rc3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4_rc3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4_rc3.ebuild?rev=1.1&content-type=text/plain
Index: proftpd-1.3.4_rc3.ebuild
===================================================================
# 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_rc3.ebuild,v 1.1 2011/09/28 09:47:22 voyageur Exp $
EAPI=4
inherit eutils autotools
MOD_CASE="0.7"
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 ~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 test trace vroot xinetd"
COMMON_DEPEND="acl? ( virtual/acl )
caps? ( sys-libs/libcap )
clamav? ( app-antivirus/clamav )
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
memcache? ( >=dev-libs/libmemcached-0.41 )
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 )"
DEPEND="${COMMON_DEPEND}
test? ( dev-libs/check )"
RDEPEND="${COMMON_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() {
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
# 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 c m
use acl && m="${m}:mod_facl"
use ban && m="${m}:mod_ban"
use case && m="${m}:mod_case"
use clamav && m="${m}:mod_clamav"
use copy && m="${m}:mod_copy"
if use ctrls || use ban || use shaper ; then
c="${c} --enable-ctrls"
m="${m}:mod_ctrls_admin"
fi
use deflate && m="${m}: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
m="${m}:mod_diskuse"
fi
use exec && m="${m}:mod_exec"
use ifsession && m="${m}:mod_ifsession"
use ifversion && m="${m}: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}
m="${m}:mod_gss:mod_auth_gss"
fi
use ldap && m="${m}:mod_ldap"
if use mysql || use postgres || use sqlite ; then
m="${m}:mod_sql:mod_sql_passwd"
use mysql && m="${m}:mod_sql_mysql"
use postgres && m="${m}:mod_sql_postgres"
use sqlite && m="${m}:mod_sql_sqlite"
fi
use qos && m="${m}:mod_qos"
use radius && m="${m}:mod_radius"
use ratio && m="${m}:mod_ratio"
use readme && m="${m}:mod_readme"
use rewrite && m="${m}:mod_rewrite"
use sftp || use ssl && c="${c} --enable-openssl"
if use sftp ; then
m="${m}:mod_sftp"
use pam && m="${m}:mod_sftp_pam"
use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
fi
use shaper && m="${m}:mod_shaper"
use sitemisc && m="${m}:mod_site_misc"
if use softquota ; then
m="${m}:mod_quotatab:mod_quotatab_file"
use ldap && m="${m}:mod_quotatab_ldap"
use radius && m="${m}:mod_quotatab_radius"
use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
fi
if use ssl ; then
m="${m}:mod_tls:mod_tls_shmcache"
use memcache && m="${m}:mod_tls_memcache"
fi
if use tcpd ; then
m="${m}:mod_wrap2:mod_wrap2_file"
use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
fi
use vroot && m="${m}:mod_vroot"
[ -z ${m} ] || c="${c} --with-modules=${m:1}"
econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
$(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 test tests) \
$(use_enable trace) \
$(use_enable userland_GNU shadow) \
$(use_enable userland_GNU autoshadow) \
${c:1}
}
src_test() {
emake api-tests -C tests
}
src_install() {
default
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 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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-09-28 9:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-28 9:47 [gentoo-commits] gentoo-x86 commit in net-ftp/proftpd: ChangeLog proftpd-1.3.3f.ebuild proftpd-1.3.4_rc3.ebuild proftpd-1.3.3d-r1.ebuild proftpd-1.3.4_rc2-r2.ebuild Bernard Cafarelli (voyageur)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox