* [gentoo-commits] gentoo-x86 commit in net-ftp/proftpd: proftpd-1.3.3.ebuild ChangeLog proftpd-1.3.2e.ebuild proftpd-1.3.3_rc4.ebuild proftpd-1.3.3_rc3-r1.ebuild
@ 2010-03-08 13:38 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; only message in thread
From: Bernard Cafarelli (voyageur) @ 2010-03-08 13:38 UTC (permalink / raw
To: gentoo-commits
voyageur 10/03/08 13:38:46
Modified: ChangeLog
Added: proftpd-1.3.3.ebuild proftpd-1.3.2e.ebuild
Removed: proftpd-1.3.3_rc4.ebuild
proftpd-1.3.3_rc3-r1.ebuild
Log:
Maintenance release for 1.3.2, and final 1.3.3 release, bug #307075. Also remove 1.3.3 RCs
(Portage version: 2.2_rc65/cvs/Linux x86_64)
Revision Changes Path
1.224 net-ftp/proftpd/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/ChangeLog?rev=1.224&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/ChangeLog?rev=1.224&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/ChangeLog?r1=1.223&r2=1.224
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- ChangeLog 7 Mar 2010 15:04:16 -0000 1.223
+++ ChangeLog 8 Mar 2010 13:38:46 -0000 1.224
@@ -1,6 +1,15 @@
# 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.223 2010/03/07 15:04:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.224 2010/03/08 13:38:46 voyageur Exp $
+
+*proftpd-1.3.3 (08 Mar 2010)
+*proftpd-1.3.2e (08 Mar 2010)
+
+ 08 Mar 2010; Bernard Cafarelli <voyageur@gentoo.org>
+ +proftpd-1.3.2e.ebuild, -proftpd-1.3.3_rc3-r1.ebuild,
+ -proftpd-1.3.3_rc4.ebuild, +proftpd-1.3.3.ebuild:
+ Maintenance release for 1.3.2, and final 1.3.3 release, bug #307075. Also
+ remove 1.3.3 RCs
07 Mar 2010; Markus Meier <maekke@gentoo.org> proftpd-1.3.2d.ebuild:
amd64 stable, bug #305343
1.1 net-ftp/proftpd/proftpd-1.3.3.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3.ebuild?rev=1.1&content-type=text/plain
Index: proftpd-1.3.3.ebuild
===================================================================
# 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.3.ebuild,v 1.1 2010/03/08 13:38:46 voyageur Exp $
EAPI="2"
inherit eutils
CASE_VER="0.3"
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 ~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? ( || ( <app-crypt/mit-krb5-1.7 app-crypt/heimdal ) )
ldap? ( net-nds/openldap )
mysql? ( virtual/mysql )
ncurses? ( sys-libs/ncurses )
pam? ( virtual/pam )
postgres? ( virtual/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
# Fix Gentoo Bug #284853
use kerberos && sed -i -e "s/krb5_principal2principalname/_\0/" \
"${WORKDIR}"/mod_gss-${GSS_VER}/mod_auth_gss.c.in
# 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
}
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-1.7 ; 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.2e.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/proftpd-1.3.2e.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/proftpd-1.3.2e.ebuild?rev=1.1&content-type=text/plain
Index: proftpd-1.3.2e.ebuild
===================================================================
# 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.2e.ebuild,v 1.1 2010/03/08 13:38:46 voyageur Exp $
inherit eutils flag-o-matic toolchain-funcs autotools
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="acl authfile ban case clamav deflate hardened ifsession ipv6 kerberos ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
CASE_VER="0.3"
CLAMAV_VER="0.11rc"
DEFLATE_VER="0.4"
MODGSS_VER="1.3.2"
SHAPER_VER="0.6.5"
VROOT_VER="0.8.3"
DESCRIPTION="An advanced and very configurable FTP server."
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-${MODGSS_VER}.tar.gz )
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.thrallingpenguin.com/resources/mod_clamav.htm
http://gssmod.sourceforge.net"
SLOT="0"
LICENSE="GPL-2"
DEPEND="acl? ( sys-apps/acl sys-apps/attr )
clamav? ( app-antivirus/clamav )
kerberos? ( || ( <app-crypt/mit-krb5-1.7 app-crypt/heimdal ) )
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? ( virtual/postgresql-base )
ssl? ( >=dev-libs/openssl-0.9.6f )
tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
xinetd? ( virtual/inetd )"
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 parallel build (committed upstream in 1.3.3rc1)
epatch "${FILESDIR}"/${PN}-1.3.2-parallel-build.patch
# Fix mysql include when both backends are enabled
epatch "${FILESDIR}"/${PN}-1.3.2-mysql-include.patch
# Do not use bundled libltdl when compiling mod_dso
epatch "${FILESDIR}"/${PN}-1.3.2-system-libltdl.patch
# Fix stripping of files
sed -e "s| @INSTALL_STRIP@||g" -i Make*
if use case ; then
unpack ${PN}-mod-case-${CASE_VER}.tar.gz
cp -f mod_case/mod_case.c contrib/
cp -f mod_case/mod_case.html doc/
fi
if use clamav ; then
unpack mod_clamav-${CLAMAV_VER}.tar.gz
cp -f mod_clamav-${CLAMAV_VER}/mod_clamav.* contrib/
epatch mod_clamav-${CLAMAV_VER}/${PN}.patch
fi
if use deflate ; then
unpack ${PN}-mod-deflate-${DEFLATE_VER}.tar.gz
cp -f mod_deflate/mod_deflate.c contrib/
cp -f mod_deflate/mod_deflate.html doc/
fi
if use kerberos ; then
unpack mod_gss-${MODGSS_VER}.tar.gz
fi
if use shaper ; then
unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
cp -f mod_shaper/mod_shaper.c contrib/
cp -f mod_shaper/mod_shaper.html doc/
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
# Fix bug #221275
# extract custom PR_ macros from aclocal.m4 to acinclude.m4
# and delete the provided aclocal.m4 before running autoreconf
einfo "Extract custom m4 macros from aclocal.m4 ..."
sed -e '/libtool\.m4/q' aclocal.m4 > acinclude.m4
rm -f aclocal.m4
eautoreconf
}
src_compile() {
addpredict /etc/krb5.conf
local modules myconf mylibs
modules="mod_ratio:mod_readme:mod_ctrls_admin"
use acl && modules="${modules}:mod_facl"
use ban && modules="${modules}:mod_ban"
use case && modules="${modules}:mod_case"
use clamav && modules="${modules}:mod_clamav"
use deflate && modules="${modules}:mod_deflate"
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"
mylibs="${mylibs} -lresolv"
use ssl && CFLAGS="${CFLAGS} -DUSE_LDAP_TLS"
fi
if use opensslcrypt ; then
myconf="${myconf} --enable-openssl --with-includes=/usr/include/openssl"
mylibs="${mylibs} -lcrypto"
CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
fi
use nls && myconf="${myconf} --enable-nls"
if use mysql || use postgres ; then
modules="${modules}:mod_sql"
if use mysql ; then
modules="${modules}:mod_sql_mysql"
myconf="${myconf} --with-includes=/usr/include/mysql"
fi
if use postgres ; then
modules="${modules}:mod_sql_postgres"
myconf="${myconf} --with-includes=/usr/include/postgresql"
fi
fi
if use softquota ; then
modules="${modules}:mod_quotatab"
if use mysql || use postgres ; then
modules="${modules}:mod_quotatab_sql"
fi
if use radius ; then
modules="${modules}:mod_quotatab_radius"
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
if use kerberos ; then
cd "${S}"/mod_gss-${MODGSS_VER}
# Generate source files for installed virtual/krb5 provider
if has_version app-crypt/mit-krb5; then
econf --enable-mit
else
econf --enable-heimdal
fi
cd "${S}"
# copy the generated files
cp -f mod_gss-${MODGSS_VER}/mod_gss.c contrib/
cp -f mod_gss-${MODGSS_VER}/mod_gss.h include/
cp -f mod_gss-${MODGSS_VER}/mod_auth_gss.c contrib/
myconf="${myconf} --enable-dso --with-shared=mod_gss:mod_auth_gss"
fi
LIBS="${mylibs}" 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() {
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
dohtml doc/howto/*.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() {
elog
elog "You can find the config files in /etc/proftpd"
elog
ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp."
ewarn "Remember to change that in the configuration file."
ewarn
if use mysql && use postgres ; then
ewarn "ProFTPD has been build with the MySQL and PostgreSQL modules."
ewarn "You can use the 'SQLBackend' directive to specify the used SQL"
ewarn "backend. Without this directive the default backend is MySQL."
ewarn
fi
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."
ewarn
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-08 13:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-08 13:38 [gentoo-commits] gentoo-x86 commit in net-ftp/proftpd: proftpd-1.3.3.ebuild ChangeLog proftpd-1.3.2e.ebuild proftpd-1.3.3_rc4.ebuild proftpd-1.3.3_rc3-r1.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