From 8fc08491f26431ec46b36d6ebef9551f3773b96f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Dec 2023 23:17:55 +0000 Subject: gentoo auto-resync : 09:12:2023 - 23:17:54 --- net-ftp/Manifest.gz | Bin 3184 -> 3183 bytes net-ftp/proftpd/Manifest | 2 + .../files/proftpd-1.3.8a-configure-c99.patch | 34 +++ net-ftp/proftpd/proftpd-1.3.8a-r1.ebuild | 304 +++++++++++++++++++++ 4 files changed, 340 insertions(+) create mode 100644 net-ftp/proftpd/files/proftpd-1.3.8a-configure-c99.patch create mode 100644 net-ftp/proftpd/proftpd-1.3.8a-r1.ebuild (limited to 'net-ftp') diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz index 815b031614e0..f114d9a3ca8e 100644 Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index f68cafde011d..9e037a7c41cb 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -4,6 +4,7 @@ AUX proftpd-1.3.6_rc4-gss-refresh-api.patch 1868 BLAKE2B ff50d3834d6cc0970256dca AUX proftpd-1.3.6_rc4-msg-refresh-api.patch 903 BLAKE2B e335f81685552b0b9a05af3700ce4a09d7f31ca9b24c66e1a1306bbe26c243b553c1cb81c13cc9593ae36e93b03f28faeb64fe2ae2f834575e9dee402f73ee55 SHA512 d0dcc467289b4107aecee66edf122667b2fbb9b1f1a6a6ecea517f286090d22682200b9d11f503465cb9b5387e8fb749cc09c3033825282450fe1d6c0a4bb11d AUX proftpd-1.3.6_rc4-vroot-refresh-api.patch 736 BLAKE2B 9f3c4a1f80a27ce7e6f9348153584bc1134e63ad4c839927b7680439966003c76c7a25821be0f3431c472092ef5c8386166b372645f498fb655559fd683c3e6e SHA512 9cd98e2fb8c17d2ca38f5f7a20f5c6ffb03da7f51e53542237992bd2b98b2ef5b5fc0634cd7f5eef24fba8a601703b70ff7d0404e1c5103394e9fda260b815cd AUX proftpd-1.3.8-configure-clang16.patch 5872 BLAKE2B 4aeec52bbdebb5029e375c65a49bbb6a787ed9ca8e595e34c21f944d84ca9e47a05e6cc3d8510aa75e6ceddf8e08cac4af452200d9aa8c5b3889fdde972bdfb7 SHA512 91d6f9752bee6f3a5f78e85dcf0fba542ee06d2ed4f53b9c7c220cf011319b5ebcb352995a2a5887f0189abe68fe6bf27387635e55bfa477f96a71d83b38a96a +AUX proftpd-1.3.8a-configure-c99.patch 1003 BLAKE2B 4958cb7ca0735b245672d0bc92f2d6ec68b3d4dc35fc1c36a7aca3c48b00ecc6ec42bd5857db3f4696cdccf5ea81520237b80a751004bcf53f041140dac83310 SHA512 e73fe25afd5e55d4fbc82833954ba6c9a981a09500f337a7c092670ca72bad2c11f45dbd5ed45027cd6c0474b26d3c2620f6a84490515b971783b954ba70849a AUX proftpd-tmpfiles.d.conf 34 BLAKE2B 03da2e04c7e0d4c6e889e4414a205942f0762a1ae856d16f95abb1d2e927d68f583ad5bbdbf142b32b141cd82e9288f2ef1faf459cbe8433e2e1127d3b30d686 SHA512 aa6ffbf15e4275941837306259fb426608e82e45a2da4b99c5d7778d11b8c9341e3a12ae9b751d0e173635239b6f1b20f0431be17296c005a83525a48327fa52 AUX proftpd-tmpfiles.d.conf-r1 30 BLAKE2B 0eb931370872ef78732d23179f20a3fe1289f8e601478c1b4709755748416f9283cdadcb2c43765019a9f6b5407e7c9db1aba8b1c1524db1e702b52898aa7602 SHA512 c85a6bc1375ebb44d88114c5c6f46d9c2e207e9d9555d9dc599f69a6485e2d5b2a161ac151f8b9e76f8e385f9dc3b811128db68f5d45648d960c8e8fbeb0050b AUX proftpd.conf.sample 1275 BLAKE2B db10306f79544b344856e065946e9ae0fa37d43507185f7d2407f23a962750a05bb2682e7c97e3979ca42dfe35921c3db7e98c095431796d82144869df0e324e SHA512 1c26f3e98ed07d89192c640f7823af168c045abee6ab076791aee9d50be5446be870a189979df4b828e7ae907dd40a346f1b92998fa39195195bfada4061c5df @@ -22,5 +23,6 @@ DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a5239 DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772 EBUILD proftpd-1.3.8-r1.ebuild 8595 BLAKE2B 68bd6fabd6f0be2f2152b10eb85472c0beb0266e698a544f2f05568f6b8b79ac4fd57f9112fb6c2fb0d991e873522fe856a2d1a9c84ef35bdde1006d98f5ed9b SHA512 1b141bf6458565740966d2dfbd5a44985ccd1480d17a0796bf553398ad3a0ff6c3e25a0df0b7672c4439472498f8cfbe256cef9f42c85d2a41e09b718b0b38b2 EBUILD proftpd-1.3.8.ebuild 8544 BLAKE2B fe0edce5e670bd9da9611b189f165df7b283a5eec1bf8caf115f90f47ae081f2e53309af442ba8ebce75de9eef7b9eb67e79deea193af359653b253186da9f5a SHA512 a47477d65a65b6c9b7d9b9bae89a721bff820df560326a317c8d00828c07965a4bf1eba33ed2812efb0120478278dca2f164bbfe064d8f59dc40a29846261d8d +EBUILD proftpd-1.3.8a-r1.ebuild 8980 BLAKE2B 5471fb72d1e36d7ae461ee926f85899845e94c83c06116c33532d91e909e6169d0483c9ec0f4b2f54897dd567e3108cda3d24f163fd4c8d72b578a4787868ea8 SHA512 dc61b5d8491749ef9cc1e1df76e45dcb81094bad4725f57eccec691b9e8b57976ab490ce1e11ec4bc4a9fa5ce9ab0354e06b0de6716090ea8c6a4651b567d522 EBUILD proftpd-1.3.8a.ebuild 8884 BLAKE2B 7f524771baf51363869ba158e2554aa11dcf1009278e96a5dfe8046a4b1eed498980c143c41f903ad5f29c4cc57917a1a118e681894bede4826a7bc04985a103 SHA512 88ba2146617c0bf2eaf3888091ca45d717a5094196369d9955233056ee138a6f57a9b795050e7540c2bed44a78423e897f1b6fc134cd9eeb168e7f5367e1c80d MISC metadata.xml 2793 BLAKE2B fa59abf255f37e7fb5442f6cb3c0234ac2eb5590a633f82ed0c8af6a4f6c534ecd3fbab8497d40d3e2d7117b4ca92fa9f8dbbd4c093c45cb45ce5f06f97d6974 SHA512 623e38d9da86cd996b22fcddbc5a04bd43655fc4a84e601ce112bdc2fa35eb94a0476382e3dd65d3fad412b916b9673d0f9edd3f328b5b9ce73998c7312ba745 diff --git a/net-ftp/proftpd/files/proftpd-1.3.8a-configure-c99.patch b/net-ftp/proftpd/files/proftpd-1.3.8a-configure-c99.patch new file mode 100644 index 000000000000..9364b23f0daa --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.8a-configure-c99.patch @@ -0,0 +1,34 @@ +https://github.com/proftpd/proftpd/pull/1754 + +From 020192499202f268e6d96339597921aec01ec737 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Fri, 8 Dec 2023 19:58:51 +0100 +Subject: [PATCH] configure: Use char ** for the iconv input argument + +The standard iconv function uses char ** even for the input buffer. +Using the incompatible const char ** type causes the check to fail if +the compiler treats such type errors as errors, instead of merely +warning about it. +--- a/configure ++++ b/configure +@@ -21475,7 +21475,7 @@ main () + { + + size_t res, in_len = 0, out_len = 0; +- const char *in = NULL; ++ char *in = NULL; + char *out = NULL; + res = iconv((iconv_t)-1, &in, &in_len, &out, &out_len); + +--- a/configure.in ++++ b/configure.in +@@ -2100,7 +2100,7 @@ AC_TRY_LINK( + ], + [ + size_t res, in_len = 0, out_len = 0; +- const char *in = NULL; ++ char *in = NULL; + char *out = NULL; + res = iconv((iconv_t)-1, &in, &in_len, &out, &out_len); + ], + diff --git a/net-ftp/proftpd/proftpd-1.3.8a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.8a-r1.ebuild new file mode 100644 index 000000000000..8e3630ce042f --- /dev/null +++ b/net-ftp/proftpd/proftpd-1.3.8a-r1.ebuild @@ -0,0 +1,304 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 ) +" +S="${WORKDIR}/${P/_/}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 + kerberos ldap 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" +# Some tests are ran in chroot. Confuses sandbox. +RESTRICT="test" +# TODO: geoip +REQUIRED_USE=" + ban? ( ctrls ) + msg? ( ctrls ) + sftp? ( ssl ) + shaper? ( ctrls ) + + mysql? ( ssl ) + postgres? ( ssl ) + sqlite? ( ssl ) +" + +COMMON_DEPEND=" + virtual/libcrypt:= + 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? ( dev-libs/openssl:0= ) + pam? ( sys-libs/pam ) + pcre? ( dev-libs/libpcre ) + postgres? ( dev-db/postgresql:= ) + sodium? ( dev-libs/libsodium:0= ) + sqlite? ( dev-db/sqlite:3 ) +" +DEPEND=" + ${COMMON_DEPEND} + test? ( dev-libs/check ) +" +RDEPEND=" + ${COMMON_DEPEND} + net-ftp/ftpbase + selinux? ( sec-policy/selinux-ftp ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.6-use-trace.patch + "${FILESDIR}"/${PN}-1.3.8-configure-clang16.patch + "${FILESDIR}"/${PN}-1.3.8a-configure-c99.patch +) + +QA_CONFIG_IMPL_DECL_SKIP=( + # AIX only + authenticate + loginfailed + loginsuccess + + # Deprecated/removed functions, not actually checking for this anyway + SSLeay_add_all_algorithms + # Test isn't actually checking for BIO_f_zlib + BIO_f_zlib +) + +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}" + + local myeconfargs=( + --cache-file="${S}"/config.cache + --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 + --enable-shadow + --enable-autoshadow + ${c:1} + ) + + econf "${myeconfargs[@]}" +} + +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 + newtmpfiles "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf +} + +pkg_postinst() { + # Create /var/run files at package merge time: bug #650000 + tmpfiles_process ${PN}.conf +} -- cgit v1.2.3