commit: 278b1e2a39273b072681f15b75fa6e9ee17030ab Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun May 7 07:20:41 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun May 7 07:21:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=278b1e2a
net-ftp/proftpd: fix configure w/ clang 16 Still seeing some suspicious ones so keeping it open for now. Bug: https://bugs.gentoo.org/881709 Bug: https://bugs.gentoo.org/900066 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/proftpd-1.3.8-configure-clang16.patch | 255 +++++++++++++++++++ net-ftp/proftpd/proftpd-1.3.8-r1.ebuild | 275 +++++++++++++++++++++ 2 files changed, 530 insertions(+) diff --git a/net-ftp/proftpd/files/proftpd-1.3.8-configure-clang16.patch b/net-ftp/proftpd/files/proftpd-1.3.8-configure-clang16.patch new file mode 100644 index 000000000000..c44fd72262d2 --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.8-configure-clang16.patch @@ -0,0 +1,255 @@ +https://bugs.gentoo.org/881709 (and dupe https://bugs.gentoo.org/900066) +https://github.com/proftpd/proftpd/pull/1667 + +From 98e46de3093da71121362d5be4c445a3ef227010 Mon Sep 17 00:00:00 2001 +From: Arjun Shankar <ar...@redhat.com> +Date: Fri, 5 May 2023 15:35:56 +0200 +Subject: [PATCH] configure: Remove several implicit function declarations + +During configure, some checks omit the corresponding include. A compiler +defaulting to C99 mode could cause those checks to fail since C99 does +not allow implicit function declarations. This commit fixes the same. +The configure script is re-generated. + +Signed-off-by: Arjun Shankar <ar...@redhat.com> +--- a/configure ++++ b/configure +@@ -18305,6 +18305,20 @@ _ACEOF + fi + + ++for ac_header in stddef.h crypt.h netdb.h arpa/inet.h sys/socket.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for standalone crypt" >&5 + $as_echo_n "checking for standalone crypt... " >&6; } + if ${pr_cv_lib_standalone_crypt+:} false; then : +@@ -18313,10 +18327,19 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++ #if HAVE_STDDEF_H ++ # include <stddef.h> ++ #endif ++ #if HAVE_CRYPT_H ++ # include <crypt.h> ++ #endif ++ + int + main () + { +-crypt(); ++ ++ crypt(NULL, NULL); ++ + ; + return 0; + } +@@ -18388,10 +18411,19 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++ #if HAVE_STDDEF_H ++ # include <stddef.h> ++ #endif ++ #if HAVE_NETDB_H ++ # include <netdb.h> ++ #endif ++ + int + main () + { +-gethostbyname(); ++ ++ gethostbyname(NULL); ++ + ; + return 0; + } +@@ -18508,10 +18540,19 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++ #if HAVE_STDDEF_H ++ # include <stddef.h> ++ #endif ++ #if HAVE_ARPA_INET_H ++ # include <arpa/inet.h> ++ #endif ++ + int + main () + { +-inet_aton(); ++ ++ inet_aton(NULL, NULL); ++ + ; + return 0; + } +@@ -18584,10 +18625,16 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++ #if HAVE_NETDB_H ++ # include <netdb.h> ++ #endif ++ + int + main () + { +-gethostent(); ++ ++ gethostent(); ++ + ; + return 0; + } +@@ -18659,10 +18706,19 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++ #if HAVE_STDDEF_H ++ # include <stddef.h> ++ #endif ++ #if HAVE_SYS_SOCKET_H ++ # include <sys/socket.h> ++ #endif ++ + int + main () + { +-bind(); ++ ++ bind(0, NULL, 0); ++ + ; + return 0; + } +--- a/configure.in ++++ b/configure.in +@@ -1476,18 +1476,42 @@ AC_ARG_ENABLE(transfer-buffer-size, + ]) + + dnl Checks for libraries. Yes, this is the hard way, but it's necessary. ++AC_CHECK_HEADERS(stddef.h crypt.h netdb.h arpa/inet.h sys/socket.h) ++ + AC_CACHE_CHECK(for standalone crypt,pr_cv_lib_standalone_crypt, +- AC_TRY_LINK(,[crypt();], +- pr_cv_lib_standalone_crypt="yes", pr_cv_lib_standalone_crypt="no" )) ++ AC_TRY_LINK( ++ [ ++ #if HAVE_STDDEF_H ++ # include <stddef.h> ++ #endif ++ #if HAVE_CRYPT_H ++ # include <crypt.h> ++ #endif ++ ], ++ [ ++ crypt(NULL, NULL); ++ ], ++ pr_cv_lib_standalone_crypt="yes", pr_cv_lib_standalone_crypt="no" )) + + if test "$pr_cv_lib_standalone_crypt" = "no"; then + AC_CHECK_LIB(crypt, crypt) + fi + + AC_CACHE_CHECK(for standalone gethostbyname,pr_cv_lib_standalone_gethost, +- AC_TRY_LINK(,[gethostbyname();], +- pr_cv_lib_standalone_gethost="yes", +- pr_cv_lib_standalone_gethost="no" )) ++ AC_TRY_LINK( ++ [ ++ #if HAVE_STDDEF_H ++ # include <stddef.h> ++ #endif ++ #if HAVE_NETDB_H ++ # include <netdb.h> ++ #endif ++ ], ++ [ ++ gethostbyname(NULL); ++ ], ++ pr_cv_lib_standalone_gethost="yes", ++ pr_cv_lib_standalone_gethost="no" )) + + if test "$pr_cv_lib_standalone_gethost" = "no"; then + AC_CHECK_LIB(resolv, gethostbyname) +@@ -1495,25 +1519,57 @@ if test "$pr_cv_lib_standalone_gethost" = "no"; then + fi + + AC_CACHE_CHECK(for standalone inet_aton,pr_cv_lib_standalone_aton, +- AC_TRY_LINK(,[inet_aton();], +- pr_cv_lib_standalone_aton="yes", +- pr_cv_lib_standalone_aton="no" )) ++ AC_TRY_LINK( ++ [ ++ #if HAVE_STDDEF_H ++ # include <stddef.h> ++ #endif ++ #if HAVE_ARPA_INET_H ++ # include <arpa/inet.h> ++ #endif ++ ], ++ [ ++ inet_aton(NULL, NULL); ++ ], ++ pr_cv_lib_standalone_aton="yes", ++ pr_cv_lib_standalone_aton="no" )) + + if test "$pr_cv_lib_standalone_aton" = "no"; then + AC_CHECK_LIB(bind, inet_aton) + fi + + AC_CACHE_CHECK(for standalone nsl functions,pr_cv_lib_standalone_nsl,[ +- AC_TRY_LINK(,[gethostent();], +- pr_cv_lib_standalone_nsl="yes", pr_cv_lib_standalone_nsl="no") ]) ++ AC_TRY_LINK( ++ [ ++ #if HAVE_NETDB_H ++ # include <netdb.h> ++ #endif ++ ], ++ [ ++ gethostent(); ++ ], ++ pr_cv_lib_standalone_nsl="yes", ++ pr_cv_lib_standalone_nsl="no") ]) + + if test "$pr_cv_lib_standalone_nsl" = "no"; then + AC_CHECK_LIB(nsl, gethostent) + fi + + AC_CACHE_CHECK(for standalone socket functions,pr_cv_lib_standalone_sockets, +- AC_TRY_LINK(,[bind();], +- pr_cv_lib_standalone_sockets="yes", pr_cv_lib_standalone_sockets="no")) ++ AC_TRY_LINK( ++ [ ++ #if HAVE_STDDEF_H ++ # include <stddef.h> ++ #endif ++ #if HAVE_SYS_SOCKET_H ++ # include <sys/socket.h> ++ #endif ++ ], ++ [ ++ bind(0, NULL, 0); ++ ], ++ pr_cv_lib_standalone_sockets="yes", ++ pr_cv_lib_standalone_sockets="no")) + + if test "$pr_cv_lib_standalone_sockets" = "no"; then + AC_CHECK_LIB(socket, bind) + diff --git a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild new file mode 100644 index 000000000000..67887804453b --- /dev/null +++ b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild @@ -0,0 +1,275 @@ +# 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 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~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" +# TODO: geoip +REQUIRED_USE="ban? ( ctrls ) + msg? ( ctrls ) + sftp? ( ssl ) + shaper? ( ctrls ) + + mysql? ( ssl ) + postgres? ( ssl ) + sqlite? ( ssl ) +" + +CDEPEND="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="${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 + "${FILESDIR}"/${P}-configure-clang16.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 \ + --enable-shadow \ + --enable-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 + 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 +}
