From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- net-ftp/pure-ftpd/pure-ftpd-9999.ebuild | 105 ++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 47 deletions(-) (limited to 'net-ftp/pure-ftpd/pure-ftpd-9999.ebuild') diff --git a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild b/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild index 4be40c54c4ef..712fefda22b2 100644 --- a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild +++ b/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild @@ -6,66 +6,63 @@ EAPI=8 inherit flag-o-matic DESCRIPTION="Fast, production-quality, standard-conformant FTP server" -HOMEPAGE="http://www.pureftpd.org/" +HOMEPAGE="https://www.pureftpd.org/project/pure-ftpd/" if [[ "${PV}" == 9999 ]] ; then inherit autotools git-r3 EGIT_REPO_URI="https://github.com/jedisct1/pure-ftpd.git" else - SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2 - http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + SRC_URI=" + ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2 + http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2 + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -LICENSE="BSD" +LICENSE="BSD GPL-2" SLOT="0" - IUSE="anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd" - REQUIRED_USE="implicittls? ( ssl )" -BDEPEND="sys-devel/autoconf-archive" - -DEPEND="dev-libs/libsodium:= +DEPEND=" + dev-libs/libsodium:= virtual/libcrypt:= caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25:= ) mysql? ( || ( - dev-db/mariadb-connector-c - dev-db/mysql-connector-c - ) ) + dev-db/mariadb-connector-c + dev-db/mysql-connector-c + ) + ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) - ssl? ( - >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] - ) + ssl? ( dev-libs/openssl:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) - xinetd? ( virtual/inetd )" + xinetd? ( virtual/inetd ) +" -RDEPEND="${DEPEND} +RDEPEND=" + ${DEPEND} net-ftp/ftpbase - selinux? ( sec-policy/selinux-ftp )" + selinux? ( sec-policy/selinux-ftp ) +" -PATCHES=( - "${FILESDIR}/${PN}-1.0.28-pam.patch" -) +BDEPEND="sys-devel/autoconf-archive" + +PATCHES=( "${FILESDIR}/${PN}-1.0.28-pam.patch" ) src_prepare() { default + [[ "${PV}" == 9999 ]] && eautoreconf } src_configure() { - # adjust max user length to something more appropriate - # for virtual hosts. See bug #62472 for details. - sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \ - -i "${S}/src/ftpd.h" || die "sed failed" - # Those features are only configurable like this, see bug #179375. - use anondel && append-cppflags -DANON_CAN_DELETE - use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS - use anonren && append-cppflags -DANON_CAN_RENAME - use anonres && append-cppflags -DANON_CAN_RESUME - use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS + use anondel && append-cppflags -DANON_CAN_DELETE + use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS + use anonren && append-cppflags -DANON_CAN_RENAME + use anonres && append-cppflags -DANON_CAN_RESUME + use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS # Do not auto-use SSP -- let the user select this. export ax_cv_check_cflags___fstack_protector_all=no @@ -73,7 +70,7 @@ src_configure() { local myeconfargs=( --enable-largefile # Required for correct pid file location. - # pure-ftpd appends "/run/pure-ftpd.pid" to the localstatedir + # Pure-FTPd appends "/run/pure-ftpd.pid" to the localstatedir # path, and tries to write to that file even when being # started in foreground. So we need to pin this to / --localstatedir="${EPREFIX}"/ @@ -91,40 +88,41 @@ src_configure() { --with-throttling --with-uploadscript --with-virtualhosts + $(use_with implicittls) $(use_with ldap) $(use_with mysql) $(use_with pam) $(use_with paranoidmsg) $(use_with postgres pgsql) $(use_with ssl tls) - $(use_with implicittls) - $(use_with vchroot virtualchroot) $(use_with sysquota sysquotas) + $(use_with vchroot virtualchroot) $(usex caps '' '--without-capabilities') $(usex noiplog '--without-iplogging' '') $(usex xinetd '' '--without-inetd') ) + econf "${myeconfargs[@]}" } src_install() { - local DOCS=( AUTHORS ChangeLog FAQ HISTORY README* NEWS ) - default - newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN} - newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN} + newinitd "${FILESDIR}/pure-ftpd.initd-r12" pure-ftpd + newconfd "${FILESDIR}/pure-ftpd.confd-r4" pure-ftpd + + newinitd "${FILESDIR}/pure-uploadscript.initd-r1" pure-uploadscript + newconfd "${FILESDIR}/pure-uploadscript.confd" pure-uploadscript if use implicittls ; then - sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \ - || die "Adjusting default server port for implicittls usage failed!" + sed -e '/^# Bind/s@21@990@' -i "${ED}"/etc/pure-ftpd.conf || die fi - keepdir /var/lib/run/${PN} + if use ssl ; then + newinitd "${FILESDIR}/pure-certd.initd" pure-certd - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}/pure-ftpd.xinetd" ${PN} + exeinto /etc + newexe "${FILESDIR}/pure-certd.script" pure-certd.sh fi if use ldap ; then @@ -134,17 +132,30 @@ src_install() { insopts -m 0600 doins pureftpd-ldap.conf fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}/pure-ftpd.xinetd" pure-ftpd + fi } pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then + if [[ -z "${REPLACING_VERSIONS}" ]] ; then # This is a new installation elog - elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!" + elog "Before starting Pure-FTPd, you have to edit the /etc/pure-ftpd.conf file!" elog ewarn "It's *really* important to read the README provided with Pure-FTPd!" ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info" ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info." ewarn + else + for v in ${REPLACING_VERSIONS} ; do + if ver_test "${v}" -le "1.0.50" ; then + einfo "Configuration through /etc/conf.d/pure-ftpd is now deprecated!" + einfo "Please migrate your settings to the new configuration file." + einfo "Use /etc/pure-ftpd.conf to adjust your settings." + fi + done fi } -- cgit v1.2.3