From 3e6a3a38d4a9a52324f746b54cfae051bf7f8691 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 30 Jun 2021 19:39:41 +0100 Subject: net-ftp/pure-ftpd: add missing libcrypt dependency, fix RDEPEND Signed-off-by: Sam James --- net-ftp/pure-ftpd/pure-ftpd-1.0.49-r3.ebuild | 156 -------------------------- net-ftp/pure-ftpd/pure-ftpd-1.0.49-r4.ebuild | 158 +++++++++++++++++++++++++++ net-ftp/pure-ftpd/pure-ftpd-9999.ebuild | 5 +- 3 files changed, 161 insertions(+), 158 deletions(-) delete mode 100644 net-ftp/pure-ftpd/pure-ftpd-1.0.49-r3.ebuild create mode 100644 net-ftp/pure-ftpd/pure-ftpd-1.0.49-r4.ebuild (limited to 'net-ftp/pure-ftpd') diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r3.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r3.ebuild deleted file mode 100644 index 88de93f5b489..000000000000 --- a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r3.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic - -DESCRIPTION="Fast, production-quality, standard-conformant FTP server" -HOMEPAGE="http://www.pureftpd.org/" -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" -fi - -LICENSE="BSD" -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="caps? ( sys-libs/libcap ) - ldap? ( >=net-nds/openldap-2.0.25 ) - mysql? ( || ( - 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(-)] - ) - sysquota? ( sys-fs/quota[-rpc] ) - xinetd? ( virtual/inetd )" - -RDEPEND="${DEPEND} - dev-libs/libsodium:= - net-ftp/ftpbase - selinux? ( sec-policy/selinux-ftp )" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.28-pam.patch" - - # https://bugs.gentoo.org/711124 - "${FILESDIR}/${P}-diraliases_uninitialized_pointer.patch" - "${FILESDIR}/${P}-pure_strcmp_OOB_read.patch" - - # https://bugs.gentoo.org/721242 - "${FILESDIR}/${P}-do-not-call-ar-directly.patch" -) - -src_prepare() { - default - 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 - - # Do not auto-use SSP -- let the user select this. - export ax_cv_check_cflags___fstack_protector_all=no - - local myeconfargs=( - --enable-largefile - # Required for correct pid file location. - # 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}"/ - --with-altlog - --with-cookie - --with-diraliases - --with-extauth - --with-ftpwho - --with-language=${PUREFTPD_LANG:=english} - --with-peruserlimits - --with-privsep - --with-puredb - --with-quotas - --with-ratios - --with-throttling - --with-uploadscript - --with-virtualhosts - $(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) - $(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} - - if use implicittls ; then - sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \ - || die "Adjusting default server port for implicittls usage failed!" - fi - - keepdir /var/lib/run/${PN} - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}/pure-ftpd.xinetd" ${PN} - fi - - if use ldap ; then - insinto /etc/openldap/schema - doins pureftpd.schema - insinto /etc/openldap - insopts -m 0600 - doins pureftpd-ldap.conf - fi -} - -pkg_postinst() { - 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 - 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 - fi -} diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r4.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r4.ebuild new file mode 100644 index 000000000000..739fda506a4e --- /dev/null +++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r4.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic + +DESCRIPTION="Fast, production-quality, standard-conformant FTP server" +HOMEPAGE="http://www.pureftpd.org/" +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" +fi + +LICENSE="BSD" +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:= + virtual/libcrypt:= + caps? ( sys-libs/libcap ) + ldap? ( >=net-nds/openldap-2.0.25 ) + mysql? ( || ( + 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(-)] + ) + sysquota? ( sys-fs/quota[-rpc] ) + xinetd? ( virtual/inetd )" + +RDEPEND="${DEPEND} + dev-libs/libsodium:= + net-ftp/ftpbase + selinux? ( sec-policy/selinux-ftp )" + +PATCHES=( + "${FILESDIR}/${PN}-1.0.28-pam.patch" + + # https://bugs.gentoo.org/711124 + "${FILESDIR}/${P}-diraliases_uninitialized_pointer.patch" + "${FILESDIR}/${P}-pure_strcmp_OOB_read.patch" + + # https://bugs.gentoo.org/721242 + "${FILESDIR}/${P}-do-not-call-ar-directly.patch" +) + +src_prepare() { + default + 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 + + # Do not auto-use SSP -- let the user select this. + export ax_cv_check_cflags___fstack_protector_all=no + + local myeconfargs=( + --enable-largefile + # Required for correct pid file location. + # 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}"/ + --with-altlog + --with-cookie + --with-diraliases + --with-extauth + --with-ftpwho + --with-language=${PUREFTPD_LANG:=english} + --with-peruserlimits + --with-privsep + --with-puredb + --with-quotas + --with-ratios + --with-throttling + --with-uploadscript + --with-virtualhosts + $(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) + $(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} + + if use implicittls ; then + sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \ + || die "Adjusting default server port for implicittls usage failed!" + fi + + keepdir /var/lib/run/${PN} + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}/pure-ftpd.xinetd" ${PN} + fi + + if use ldap ; then + insinto /etc/openldap/schema + doins pureftpd.schema + insinto /etc/openldap + insopts -m 0600 + doins pureftpd-ldap.conf + fi +} + +pkg_postinst() { + 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 + 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 + fi +} diff --git a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild b/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild index e598a3d92ac6..e96ace757a52 100644 --- a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild +++ b/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild @@ -25,7 +25,9 @@ REQUIRED_USE="implicittls? ( ssl )" BDEPEND="sys-devel/autoconf-archive" -DEPEND="caps? ( sys-libs/libcap ) +DEPEND="dev-libs/libsodium:= + virtual/libcrypt:= + caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( || ( dev-db/mariadb-connector-c @@ -40,7 +42,6 @@ DEPEND="caps? ( sys-libs/libcap ) xinetd? ( virtual/inetd )" RDEPEND="${DEPEND} - dev-libs/libsodium:= net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )" -- cgit v1.2.3-65-gdbad