slyfox 14/05/16 21:08:45
Modified: ChangeLog
Added: proftpd-1.3.4e.ebuild
Removed: proftpd-1.3.4c-r2.ebuild proftpd-1.3.4a-r1.ebuild
proftpd-1.3.4a.ebuild proftpd-1.3.4b.ebuild
proftpd-1.3.3g.ebuild proftpd-1.3.4c-r1.ebuild
proftpd-1.3.4c.ebuild
Log:
Version bump (old stable branch).
(Portage version: 2.2.10_p15/cvs/Linux x86_64, signed Manifest commit with
key 611FF3AA)
Revision Changes Path
1.316 net-ftp/proftpd/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/ChangeLog?rev=1.316&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/ChangeLog?rev=1.316&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/ChangeLog?r1=1.315&r2=1.316
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- ChangeLog 14 Sep 2013 10:37:51 -0000 1.315
+++ ChangeLog 16 May 2014 21:08:45 -0000 1.316
@@ -1,6 +1,17 @@
# ChangeLog for net-ftp/proftpd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.315
2013/09/14 10:37:51 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.316
2014/05/16 21:08:45 slyfox Exp $
+
+*proftpd-1.3.4e (16 May 2014)
+
+ 16 May 2014; Sergei Trofimovich <[email protected]>
+ +files/proftpd-1.3.4e-link-tests.patch, +proftpd-1.3.4e.ebuild,
+ -files/proftpd-1.3.4a-ubug-3682.patch, -files/proftpd-1.3.4a-ubug-3728.patch,
+ -files/proftpd-1.3.4b-ubug-3795.patch,
+ -files/proftpd-1.3.4c-fix-build-noipv6.patch, -proftpd-1.3.3g.ebuild,
+ -proftpd-1.3.4a-r1.ebuild, -proftpd-1.3.4a.ebuild, -proftpd-1.3.4b.ebuild,
+ -proftpd-1.3.4c-r1.ebuild, -proftpd-1.3.4c-r2.ebuild, -proftpd-1.3.4c.ebuild:
+ Version bump (old stable branch).
14 Sep 2013; Agostino Sarubbo <[email protected]> proftpd-1.3.4d.ebuild:
Stable for ppc, wrt bug #484614
1.1 net-ftp/proftpd/proftpd-1.3.4e.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4e.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4e.ebuild?rev=1.1&content-type=text/plain
Index: proftpd-1.3.4e.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4e.ebuild,v 1.1
2014/05/16 21:08:45 slyfox Exp $
EAPI=5
inherit eutils multilib systemd
MOD_CASE="0.7"
MOD_CLAMAV="0.11rc"
MOD_DISKUSE="0.9"
MOD_GSS="1.3.3"
MOD_MSG="0.4.1"
MOD_VROOT="0.9.3"
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.gz
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 )
msg? (
http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
vroot? (
https://github.com/Castaglia/${PN}-mod_vroot/archive/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 dso
dynmasq exec ifsession ifversion ident ipv6
kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT
linguas_ja_JP linguas_ko_KR
linguas_ru_RU linguas_zh_CN linguas_zh_TW memcache msg mysql ncurses
nls openssl pam +pcre postgres qos radius
ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite ssl
tcpd test trace vroot xinetd"
REQUIRED_USE="ban? ( ctrls )
msg? ( ctrls )
sftp? ( openssl )
shaper? ( ctrls )
ssl? ( openssl )"
CDEPEND="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 )
openssl? ( dev-libs/openssl )
pam? ( virtual/pam )
pcre? ( dev-libs/libpcre )
postgres? ( dev-db/postgresql-base )
sqlite? ( dev-db/sqlite:3 )
xinetd? ( virtual/inetd )"
DEPEND="${CDEPEND}
test? ( dev-libs/check )"
RDEPEND="${CDEPEND}
net-ftp/ftpbase
selinux? ( sec-policy/selinux-ftp )"
S="${WORKDIR}/${P/_/}"
__prepare_module() {
local mod_name=$1
local mod_topdir=${WORKDIR}/${2:-${mod_name}}
mv "${mod_topdir}/${mod_name}.c" contrib || die
mv "${mod_topdir}/${mod_name}.html" doc/contrib || die
rm -r "${mod_topdir}" || die
}
src_prepare() {
epatch "${FILESDIR}"/${P}-link-tests.patch
epatch "${FILESDIR}"/${PN}-1.3.4d-memset-fix.patch
# Skip 'install-conf' / Support LINGUAS
sed -i -e "/install-all/s/ install-conf//" Makefile.in
sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
# Prepare external modules
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 -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
fi
use msg && __prepare_module mod_msg
use vroot && __prepare_module mod_vroot
${PN}-mod_vroot-mod_vroot-${MOD_VROOT}
# Prepare external kerberos module
if use kerberos ; then
cd "${WORKDIR}"/mod_gss-${MOD_GSS}
# Support app-crypt/heimdal / Gentoo Bug #284853
sed -i -e "s/krb5_principal2principalname/_\0/"
mod_auth_gss.c.in
# Remove obsolete DES / Gentoo Bug #324903
# Replace 'rpm' lookups / Gentoo Bug #391021
sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-e "s/ac_libdir=\`rpm -q
-l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-e "s/ac_includedir=\`rpm -q
-l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
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"
use ctrls && m="${m}:mod_ctrls_admin"
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 -r "${WORKDIR}"/mod_diskuse
m="${m}:mod_diskuse"
fi
use dynmasq && mym="${mym}:mod_dynmasq"
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 -r "${WORKDIR}"/mod_gss-${MOD_GSS}
m="${m}:mod_gss:mod_auth_gss"
fi
use ldap && m="${m}:mod_ldap"
use msg && mym="${mym}:mod_msg"
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"
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 ctrls) \
$(use_enable dso) \
$(use_enable ident) \
$(use_enable ipv6) \
$(use_enable memcache) \
$(use_enable ncurses) \
$(use_enable nls) \
$(use_enable openssl) \
$(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
[ -z ${LINGUAS} ] && rm -r "${ED}"/usr/share/locale
rm -rf "${ED}"/var/run
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
systemd_dounit "${FILESDIR}"/${PN}.service
systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf
}
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
}
