From 6e88bac8dd26372eea042112ad3769b1fac9ae18 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 May 2023 11:36:18 +0100 Subject: gentoo auto-resync : 07:05:2023 - 11:36:18 --- net-ftp/Manifest.gz | Bin 3186 -> 3185 bytes net-ftp/proftpd/Manifest | 4 +- .../files/proftpd-1.3.8-configure-clang16.patch | 255 +++++++++++++++++++ net-ftp/proftpd/proftpd-1.3.8-r1.ebuild | 275 +++++++++++++++++++++ net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild | 274 -------------------- 5 files changed, 532 insertions(+), 276 deletions(-) create mode 100644 net-ftp/proftpd/files/proftpd-1.3.8-configure-clang16.patch create mode 100644 net-ftp/proftpd/proftpd-1.3.8-r1.ebuild delete mode 100644 net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild (limited to 'net-ftp') diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz index 31875d299233..bb7ab7069dc0 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 c6b435f4ca1b..d641a5e8e71f 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -3,6 +3,7 @@ AUX proftpd-1.3.6_rc4-diskuse-refresh-api.patch 576 BLAKE2B ce4522896a81fed326ae AUX proftpd-1.3.6_rc4-gss-refresh-api.patch 1868 BLAKE2B ff50d3834d6cc0970256dcada8a14db6681440494abc24ccbf53ea5baef2362a9174de3bf7e3e07d562f30a55492735137efa91a9dd09676dbb95e624f3ae77f SHA512 4cc235bdb60ea4c84794d4347826b040057067d8283dcfcb795d5d25a156de480df7d897078ab8ab4faf12d4fc9e714a55f723ce27c9397bc2223550597df674 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-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 @@ -14,11 +15,10 @@ AUX proftpd.xinetd 295 BLAKE2B 4863cea66df5c32efba61647bbc854953dff28e154fab284c DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef79dce7f51bcfed8dc726cb01a231232c65821ca3a240b77a5019fa22f31b45496c128a06627bd24dc960b566f SHA512 44615983b0f67939b110e54c4a83b3056263bad72ba78de1b16f9f8590f5504c60e679f55484708d49e694c528d4715d9abd0cb75cfe439982ea9e02e0c18891 DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea342ca49d49598e7a4c5596382aa2c1d4e8228a1cdcfff324feb92dac80fcc58e35bbb77155069749afdd7cc41fb SHA512 f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce DIST proftpd-1.3.8.tar.gz 19744412 BLAKE2B b694ef6a2cbc562e88593e28bdcbc03e7b27f35d9a96c0c337cbc2b8685089ffcc9fe23bb243eab63c2f63fd0d30896407fdb163af231509a217425cd5ebd352 SHA512 e7db8829b60dbe5526a5a6160b09dcbdbeeac8f05eaa64950f4d5a918e5bfaf36924059fadef7d8a095e779da2de9c86da4e71761c573803c79eab6c2429ef8b -DIST proftpd-1.3.8rc2.tar.gz 20485204 BLAKE2B fc79d56dfe61e2b7b0b2a8da52237f402212389b424c92142e24d4caa8688598ca26d2e2956e1ce5fa9c5ac7467aa7f61ebecc6e4ffe73a74118ab242049b68f SHA512 0d98fb2a3044c4426aaf47f483e7af09c736d641ab7334e5f0f32088be1c904bc9ca00aae8977e496c951c63071deb20c282f53f43c1664bc4978a66215a774a DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012 DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772 +EBUILD proftpd-1.3.8-r1.ebuild 8594 BLAKE2B 3d503296fba0d897117fde8581da814e430c2ca617f7d9a9523064956f28188c501a97886de8c6407522a54be5408e8996b00d0ca3e19b6f0520a43fedb5c272 SHA512 fa75774fd1df959520d20b89172618376e2800dfd0ec9bcf9d140b27968e4fe232e66218b5aa000fe9887b5c9cb9b2d1a16380f6feb89a8215f05d97c497e7ec EBUILD proftpd-1.3.8.ebuild 8544 BLAKE2B fe0edce5e670bd9da9611b189f165df7b283a5eec1bf8caf115f90f47ae081f2e53309af442ba8ebce75de9eef7b9eb67e79deea193af359653b253186da9f5a SHA512 a47477d65a65b6c9b7d9b9bae89a721bff820df560326a317c8d00828c07965a4bf1eba33ed2812efb0120478278dca2f164bbfe064d8f59dc40a29846261d8d -EBUILD proftpd-1.3.8_rc2-r2.ebuild 8544 BLAKE2B 9f439ee29ae6a3850e2d02c7ea73d661669811c7697ec4f466acf5a12ffe5e4b00280df0af29602ab35de14d5742ddb1c5d2784b08844e5687c17ad5e03b19f0 SHA512 bb4baeda34f50689b60d99efd8fb0b5efdce16ab6481223978a963a7d47b45028fa8ebfb33de73ff82a6d575c2da7a03df7b8fdfacacd646698f9654e3a50014 MISC metadata.xml 2793 BLAKE2B fa59abf255f37e7fb5442f6cb3c0234ac2eb5590a633f82ed0c8af6a4f6c534ecd3fbab8497d40d3e2d7117b4ca92fa9f8dbbd4c093c45cb45ce5f06f97d6974 SHA512 623e38d9da86cd996b22fcddbc5a04bd43655fc4a84e601ce112bdc2fa35eb94a0476382e3dd65d3fad412b916b9673d0f9edd3f328b5b9ce73998c7312ba745 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 +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 +--- 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 ++ #endif ++ #if HAVE_CRYPT_H ++ # include ++ #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 ++ #endif ++ #if HAVE_NETDB_H ++ # include ++ #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 ++ #endif ++ #if HAVE_ARPA_INET_H ++ # include ++ #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 ++ #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 ++ #endif ++ #if HAVE_SYS_SOCKET_H ++ # include ++ #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 ++ #endif ++ #if HAVE_CRYPT_H ++ # include ++ #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 ++ #endif ++ #if HAVE_NETDB_H ++ # include ++ #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 ++ #endif ++ #if HAVE_ARPA_INET_H ++ # include ++ #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 ++ #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 ++ #endif ++ #if HAVE_SYS_SOCKET_H ++ # include ++ #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 +} diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild deleted file mode 100644 index 2f368e288ee7..000000000000 --- a/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# Copyright 1999-2022 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 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 -) - -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 -} -- cgit v1.2.3