From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C28AB1382C5 for ; Sun, 31 May 2020 17:18:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02ADDE0878; Sun, 31 May 2020 17:18:45 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3BDFE0878 for ; Sun, 31 May 2020 17:18:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D0B8F34EF64 for ; Sun, 31 May 2020 17:18:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8BAC4242 for ; Sun, 31 May 2020 17:18:42 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1590945460.59a0aa9bb1a306346250c4b30fbe937f197218bc.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/proftpd/proftpd-1.3.7_rc4.ebuild X-VCS-Directories: net-ftp/proftpd/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 59a0aa9bb1a306346250c4b30fbe937f197218bc X-VCS-Branch: master Date: Sun, 31 May 2020 17:18:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0aa325e1-0f6f-4d8c-9866-d7ba524c2d7f X-Archives-Hash: 784b80ac63bdfca94524433cce270c02 commit: 59a0aa9bb1a306346250c4b30fbe937f197218bc Author: Sergei Trofimovich gentoo org> AuthorDate: Sun May 31 17:16:18 2020 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sun May 31 17:17:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59a0aa9b net-ftp/proftpd: drop old Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Sergei Trofimovich gentoo.org> net-ftp/proftpd/proftpd-1.3.7_rc4.ebuild | 275 ------------------------------- 1 file changed, 275 deletions(-) diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc4.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc4.ebuild deleted file mode 100644 index d5a2fd81ae5..00000000000 --- a/net-ftp/proftpd/proftpd-1.3.7_rc4.ebuild +++ /dev/null @@ -1,275 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit multilib systemd tmpfiles toolchain-funcs - -MOD_CASE="0.7" -MOD_CLAMAV="0.14rc2" -MOD_DISKUSE="0.9" -MOD_GSS="1.3.9" -MOD_MSG="0.4.1" -MOD_VROOT="0.9.4" - -DESCRIPTION="An advanced and very configurable FTP server" -HOMEPAGE="http://www.proftpd.org/ - http://www.castaglia.org/proftpd/ - https://github.com/jbenden/mod_clamav - 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://github.com/jbenden/mod_clamav/archive/v${MOD_CLAMAV}.tar.gz -> ${PN}-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/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.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 copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 - kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius - ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot" -# TODO: geoip -REQUIRED_USE="ban? ( ctrls ) - msg? ( ctrls ) - sftp? ( ssl ) - shaper? ( ctrls ) - - mysql? ( ssl ) - postgres? ( ssl ) - sqlite? ( ssl ) -" - -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? ( dev-db/mysql-connector-c:0= ) - nls? ( virtual/libiconv ) - ncurses? ( sys-libs/ncurses:0= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - pam? ( sys-libs/pam ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql:= ) - sodium? ( dev-libs/libsodium:0= ) - sqlite? ( dev-db/sqlite:3 ) -" -DEPEND="${CDEPEND} - test? ( dev-libs/check )" -RDEPEND="${CDEPEND} - net-ftp/ftpbase - selinux? ( sec-policy/selinux-ftp )" - -S="${WORKDIR}/${P/_/}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.6-use-trace.patch -) - -RESTRICT=test # Some tests are ran in chroot. Confuse sandbox. - -in_dir() { - pushd "${WORKDIR}/${1}" || die - shift - "$@" - popd -} - -src_prepare() { - # Skip 'install-conf' / Support LINGUAS - sed -i -e "/install-all/s/ install-conf//" Makefile.in || die - sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in || die - - # Prepare external modules - if use case; then - cp -v "${WORKDIR}"/mod_case/mod_case.c contrib || die - cp -v "${WORKDIR}"/mod_case/mod_case.html doc/contrib || die - fi - - if use clamav ; then - cp -v "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib || die - eapply -p0 "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/001-add-mod_clamav-to-tests.patch - fi - - if use diskuse; then - in_dir mod_diskuse eapply "${FILESDIR}"/${PN}-1.3.6_rc4-diskuse-refresh-api.patch - - # ./configure will modify files. Symlink them instead of copying - ln -sv "${WORKDIR}"/mod_diskuse/mod_diskuse.h "${S}"/contrib || die - - cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.c "${S}"/contrib || die - cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.html "${S}"/doc/contrib || die - fi - - if use msg; then - in_dir mod_msg eapply "${FILESDIR}"/${PN}-1.3.6_rc4-msg-refresh-api.patch - - cp -v "${WORKDIR}"/mod_msg/mod_msg.c contrib || die - cp -v "${WORKDIR}"/mod_msg/mod_msg.html doc/contrib || die - fi - - if use vroot; then - in_dir ${PN}-mod_vroot-${MOD_VROOT} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-vroot-refresh-api.patch - - cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.c contrib || die - cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.html doc/contrib || die - fi - - if use kerberos ; then - # in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-gss-refresh-api.patch - - # Support app-crypt/heimdal / Gentoo Bug #284853 - sed -i -e "s/krb5_principal2principalname/_\0/" "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c.in || die - - # 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\//" "${WORKDIR}"/mod_gss-${MOD_GSS}/configure{,.ac} || die - - # ./configure will modify files. Symlink them instead of copying - ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c "${S}"/contrib || die - ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.c "${S}"/contrib || die - ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.h "${S}"/include || die - - cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/README.mod_{auth_gss,gss} "${S}" || die - cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.html "${S}"/doc/contrib || die - cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/rfc{1509,2228}.txt "${S}"/doc/rfc || die - fi - - default - - tc-export CC -} - -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 - in_dir mod_diskuse econf - m="${m}:mod_diskuse" - fi - use dynmasq && m="${m}:mod_dynmasq" - use exec && m="${m}:mod_exec" - use ifsession && m="${m}:mod_ifsession" - use ifversion && m="${m}:mod_ifversion" - if use kerberos ; then - in_dir mod_gss-${MOD_GSS} econf - m="${m}:mod_gss:mod_auth_gss" - fi - use ldap && m="${m}:mod_ldap" - use log-forensic && m="${m}:mod_log_forensic" - use msg && m="${m}: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" - use snmp && m="${m}:mod_snmp" - 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 unique-id && m="${m}:mod_unique_id" - use vroot && m="${m}:mod_vroot" - - if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then - einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'" - m="${m}:${PROFTP_CUSTOM_MODULES}" - fi - - [[ -z ${m} ]] || c="${c} --with-modules=${m:1}" - - econf --localstatedir=/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 ssl openssl) \ - $(use_enable pam auth-pam) \ - $(use_enable pcre) \ - $(use_enable sodium) \ - $(use_enable test tests) \ - --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-set} ]] && rm -r "${ED}"/usr/share/locale - rm -rf "${ED}"/run "${ED}"/var/run - - newinitd "${FILESDIR}"/proftpd.initd-r1 proftpd - insinto /etc/proftpd - doins "${FILESDIR}"/proftpd.conf.sample - - insinto /etc/xinetd.d - newins "${FILESDIR}"/proftpd.xinetd proftpd - - insinto /etc/logrotate.d - newins "${FILESDIR}"/${PN}.logrotate ${PN} - - dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES - - docinto html - dodoc doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html - - docinto rfc - dodoc doc/rfc/*.txt - - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf -} - -pkg_postinst() { - # Create /var/run files at package merge time: bug #650000 - tmpfiles_process ${PN}.conf -}