| 1 |
commit: 47f2f61b980efab9ea9412db2aa484e51f0c5b2e |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 5 23:39:19 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 5 23:39:19 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47f2f61b |
| 7 |
|
| 8 |
net-ftp/proftpd: bump up to proftpd-1.3.7rc3 |
| 9 |
|
| 10 |
Pull in release candidate to better handle tlc-1.3. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/690526 |
| 13 |
Package-Manager: Portage-2.3.92, Repoman-2.3.20 |
| 14 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 15 |
|
| 16 |
net-ftp/proftpd/Manifest | 1 + |
| 17 |
net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild | 274 +++++++++++++++++++++++++++++++ |
| 18 |
2 files changed, 275 insertions(+) |
| 19 |
|
| 20 |
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest |
| 21 |
index 1099fc7d2e3..9b4db517227 100644 |
| 22 |
--- a/net-ftp/proftpd/Manifest |
| 23 |
+++ b/net-ftp/proftpd/Manifest |
| 24 |
@@ -2,6 +2,7 @@ DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef |
| 25 |
DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea342ca49d49598e7a4c5596382aa2c1d4e8228a1cdcfff324feb92dac80fcc58e35bbb77155069749afdd7cc41fb SHA512 f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce |
| 26 |
DIST proftpd-1.3.6b.tar.gz 20260731 BLAKE2B 03ef212bcb1bcc53dd6d1dc4472c5565682b1c6b99af737f4ad09c280f1038f0658a8cc9609634e9b4a2a1cb56f76d83278056af0a9d136b957f853615e46cac SHA512 51511f05f481a038fa3826bdf1bdb866423d9f8df48071a8a263347a1ed096a553e66daefcc95dfdfcde503e664ed4140cdbb2a4f95ade8b7aadf2007aa3a671 |
| 27 |
DIST proftpd-1.3.6c.tar.gz 20271908 BLAKE2B 64f0aa70df844a376d333804100e18a28af6ab2b17a3d6f250817141db3952835740c15dcd68f71498b076238a668bdaf9672b4fd7d6fe61f8632d813e221573 SHA512 9b10e603b26d527b594682a4905e70dc0a8361372ed80a8e2617167305047bf94ea16b441f9d5782ae04dd50768d32e12f9cb68708c1f80dcd219b09e0d4fd15 |
| 28 |
+DIST proftpd-1.3.7rc3.tar.gz 20359920 BLAKE2B 96d2e26c815cd2c461580a2af642ac332bd848418d3d829f2795c610eead00a290a9633088809a5cd56899e3510dc3e608f1688052e1ca5121c78fcc80017523 SHA512 cab3ffee0ce6b921596cafc5fd2e0059c59a03f790791973b502e6384d45f0880b94e0d0961c3b230541a1785e9b0afa3d80276c82f4720696a46ea6594d744f |
| 29 |
DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc |
| 30 |
DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975 |
| 31 |
DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012 |
| 32 |
|
| 33 |
diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild |
| 34 |
new file mode 100644 |
| 35 |
index 00000000000..40523c9d693 |
| 36 |
--- /dev/null |
| 37 |
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild |
| 38 |
@@ -0,0 +1,274 @@ |
| 39 |
+# Copyright 1999-2020 Gentoo Authors |
| 40 |
+# Distributed under the terms of the GNU General Public License v2 |
| 41 |
+ |
| 42 |
+EAPI=7 |
| 43 |
+inherit multilib systemd tmpfiles |
| 44 |
+ |
| 45 |
+MOD_CASE="0.7" |
| 46 |
+MOD_CLAMAV="0.14rc2" |
| 47 |
+MOD_DISKUSE="0.9" |
| 48 |
+MOD_GSS="1.3.9" |
| 49 |
+MOD_MSG="0.4.1" |
| 50 |
+MOD_VROOT="0.9.4" |
| 51 |
+ |
| 52 |
+DESCRIPTION="An advanced and very configurable FTP server" |
| 53 |
+HOMEPAGE="http://www.proftpd.org/ |
| 54 |
+ http://www.castaglia.org/proftpd/ |
| 55 |
+ https://github.com/jbenden/mod_clamav |
| 56 |
+ http://gssmod.sourceforge.net/" |
| 57 |
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz |
| 58 |
+ case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz ) |
| 59 |
+ clamav? ( https://github.com/jbenden/mod_clamav/archive/v${MOD_CLAMAV}.tar.gz -> ${PN}-mod_clamav-${MOD_CLAMAV}.tar.gz ) |
| 60 |
+ diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz ) |
| 61 |
+ kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz ) |
| 62 |
+ msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz ) |
| 63 |
+ vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.tar.gz )" |
| 64 |
+LICENSE="GPL-2" |
| 65 |
+ |
| 66 |
+SLOT="0" |
| 67 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
| 68 |
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 |
| 69 |
+ kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius |
| 70 |
+ ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot" |
| 71 |
+# TODO: geoip |
| 72 |
+REQUIRED_USE="ban? ( ctrls ) |
| 73 |
+ msg? ( ctrls ) |
| 74 |
+ sftp? ( ssl ) |
| 75 |
+ shaper? ( ctrls ) |
| 76 |
+ |
| 77 |
+ mysql? ( ssl ) |
| 78 |
+ postgres? ( ssl ) |
| 79 |
+ sqlite? ( ssl ) |
| 80 |
+" |
| 81 |
+ |
| 82 |
+CDEPEND="acl? ( virtual/acl ) |
| 83 |
+ caps? ( sys-libs/libcap ) |
| 84 |
+ clamav? ( app-antivirus/clamav ) |
| 85 |
+ kerberos? ( virtual/krb5 ) |
| 86 |
+ ldap? ( net-nds/openldap ) |
| 87 |
+ memcache? ( >=dev-libs/libmemcached-0.41 ) |
| 88 |
+ mysql? ( dev-db/mysql-connector-c:0= ) |
| 89 |
+ nls? ( virtual/libiconv ) |
| 90 |
+ ncurses? ( sys-libs/ncurses:0= ) |
| 91 |
+ ssl? ( |
| 92 |
+ !libressl? ( dev-libs/openssl:0= ) |
| 93 |
+ libressl? ( dev-libs/libressl:= ) |
| 94 |
+ ) |
| 95 |
+ pam? ( sys-libs/pam ) |
| 96 |
+ pcre? ( dev-libs/libpcre ) |
| 97 |
+ postgres? ( dev-db/postgresql:= ) |
| 98 |
+ sodium? ( dev-libs/libsodium:0= ) |
| 99 |
+ sqlite? ( dev-db/sqlite:3 ) |
| 100 |
+" |
| 101 |
+DEPEND="${CDEPEND} |
| 102 |
+ test? ( dev-libs/check )" |
| 103 |
+RDEPEND="${CDEPEND} |
| 104 |
+ net-ftp/ftpbase |
| 105 |
+ selinux? ( sec-policy/selinux-ftp )" |
| 106 |
+ |
| 107 |
+S="${WORKDIR}/${P/_/}" |
| 108 |
+ |
| 109 |
+PATCHES=( |
| 110 |
+ "${FILESDIR}"/${PN}-1.3.6-use-trace.patch |
| 111 |
+ "${FILESDIR}"/${PN}-1.3.6c-gcc-10.patch |
| 112 |
+) |
| 113 |
+ |
| 114 |
+RESTRICT=test # Some tests are ran in chroot. Confuse sandbox. |
| 115 |
+ |
| 116 |
+in_dir() { |
| 117 |
+ pushd "${WORKDIR}/${1}" || die |
| 118 |
+ shift |
| 119 |
+ "$@" |
| 120 |
+ popd |
| 121 |
+} |
| 122 |
+ |
| 123 |
+src_prepare() { |
| 124 |
+ # Skip 'install-conf' / Support LINGUAS |
| 125 |
+ sed -i -e "/install-all/s/ install-conf//" Makefile.in || die |
| 126 |
+ sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in || die |
| 127 |
+ |
| 128 |
+ # Prepare external modules |
| 129 |
+ if use case; then |
| 130 |
+ cp -v "${WORKDIR}"/mod_case/mod_case.c contrib || die |
| 131 |
+ cp -v "${WORKDIR}"/mod_case/mod_case.html doc/contrib || die |
| 132 |
+ fi |
| 133 |
+ |
| 134 |
+ if use clamav ; then |
| 135 |
+ cp -v "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib || die |
| 136 |
+ eapply -p0 "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/001-add-mod_clamav-to-tests.patch |
| 137 |
+ fi |
| 138 |
+ |
| 139 |
+ if use diskuse; then |
| 140 |
+ in_dir mod_diskuse eapply "${FILESDIR}"/${PN}-1.3.6_rc4-diskuse-refresh-api.patch |
| 141 |
+ |
| 142 |
+ # ./configure will modify files. Symlink them instead of copying |
| 143 |
+ ln -sv "${WORKDIR}"/mod_diskuse/mod_diskuse.h "${S}"/contrib || die |
| 144 |
+ |
| 145 |
+ cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.c "${S}"/contrib || die |
| 146 |
+ cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.html "${S}"/doc/contrib || die |
| 147 |
+ fi |
| 148 |
+ |
| 149 |
+ if use msg; then |
| 150 |
+ in_dir mod_msg eapply "${FILESDIR}"/${PN}-1.3.6_rc4-msg-refresh-api.patch |
| 151 |
+ |
| 152 |
+ cp -v "${WORKDIR}"/mod_msg/mod_msg.c contrib || die |
| 153 |
+ cp -v "${WORKDIR}"/mod_msg/mod_msg.html doc/contrib || die |
| 154 |
+ fi |
| 155 |
+ |
| 156 |
+ if use vroot; then |
| 157 |
+ in_dir ${PN}-mod_vroot-${MOD_VROOT} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-vroot-refresh-api.patch |
| 158 |
+ |
| 159 |
+ cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.c contrib || die |
| 160 |
+ cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.html doc/contrib || die |
| 161 |
+ fi |
| 162 |
+ |
| 163 |
+ if use kerberos ; then |
| 164 |
+ # in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-gss-refresh-api.patch |
| 165 |
+ |
| 166 |
+ # Support app-crypt/heimdal / Gentoo Bug #284853 |
| 167 |
+ sed -i -e "s/krb5_principal2principalname/_\0/" "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c.in || die |
| 168 |
+ |
| 169 |
+ # Remove obsolete DES / Gentoo Bug #324903 |
| 170 |
+ # Replace 'rpm' lookups / Gentoo Bug #391021 |
| 171 |
+ sed -i -e "/ac_gss_libs/s/ -ldes425//" \ |
| 172 |
+ -e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \ |
| 173 |
+ -e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" "${WORKDIR}"/mod_gss-${MOD_GSS}/configure{,.ac} || die |
| 174 |
+ |
| 175 |
+ # ./configure will modify files. Symlink them instead of copying |
| 176 |
+ ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c "${S}"/contrib || die |
| 177 |
+ ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.c "${S}"/contrib || die |
| 178 |
+ ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.h "${S}"/include || die |
| 179 |
+ |
| 180 |
+ cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/README.mod_{auth_gss,gss} "${S}" || die |
| 181 |
+ cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.html "${S}"/doc/contrib || die |
| 182 |
+ cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/rfc{1509,2228}.txt "${S}"/doc/rfc || die |
| 183 |
+ fi |
| 184 |
+ |
| 185 |
+ default |
| 186 |
+} |
| 187 |
+ |
| 188 |
+src_configure() { |
| 189 |
+ local c m |
| 190 |
+ |
| 191 |
+ use acl && m="${m}:mod_facl" |
| 192 |
+ use ban && m="${m}:mod_ban" |
| 193 |
+ use case && m="${m}:mod_case" |
| 194 |
+ use clamav && m="${m}:mod_clamav" |
| 195 |
+ use copy && m="${m}:mod_copy" |
| 196 |
+ use ctrls && m="${m}:mod_ctrls_admin" |
| 197 |
+ use deflate && m="${m}:mod_deflate" |
| 198 |
+ if use diskuse ; then |
| 199 |
+ in_dir mod_diskuse econf |
| 200 |
+ m="${m}:mod_diskuse" |
| 201 |
+ fi |
| 202 |
+ use dynmasq && m="${m}:mod_dynmasq" |
| 203 |
+ use exec && m="${m}:mod_exec" |
| 204 |
+ use ifsession && m="${m}:mod_ifsession" |
| 205 |
+ use ifversion && m="${m}:mod_ifversion" |
| 206 |
+ if use kerberos ; then |
| 207 |
+ in_dir mod_gss-${MOD_GSS} econf |
| 208 |
+ m="${m}:mod_gss:mod_auth_gss" |
| 209 |
+ fi |
| 210 |
+ use ldap && m="${m}:mod_ldap" |
| 211 |
+ use log-forensic && m="${m}:mod_log_forensic" |
| 212 |
+ use msg && m="${m}:mod_msg" |
| 213 |
+ if use mysql || use postgres || use sqlite ; then |
| 214 |
+ m="${m}:mod_sql:mod_sql_passwd" |
| 215 |
+ use mysql && m="${m}:mod_sql_mysql" |
| 216 |
+ use postgres && m="${m}:mod_sql_postgres" |
| 217 |
+ use sqlite && m="${m}:mod_sql_sqlite" |
| 218 |
+ fi |
| 219 |
+ use qos && m="${m}:mod_qos" |
| 220 |
+ use radius && m="${m}:mod_radius" |
| 221 |
+ use ratio && m="${m}:mod_ratio" |
| 222 |
+ use readme && m="${m}:mod_readme" |
| 223 |
+ use rewrite && m="${m}:mod_rewrite" |
| 224 |
+ if use sftp ; then |
| 225 |
+ m="${m}:mod_sftp" |
| 226 |
+ use pam && m="${m}:mod_sftp_pam" |
| 227 |
+ use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql" |
| 228 |
+ fi |
| 229 |
+ use shaper && m="${m}:mod_shaper" |
| 230 |
+ use sitemisc && m="${m}:mod_site_misc" |
| 231 |
+ use snmp && m="${m}:mod_snmp" |
| 232 |
+ if use softquota ; then |
| 233 |
+ m="${m}:mod_quotatab:mod_quotatab_file" |
| 234 |
+ use ldap && m="${m}:mod_quotatab_ldap" |
| 235 |
+ use radius && m="${m}:mod_quotatab_radius" |
| 236 |
+ use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql" |
| 237 |
+ fi |
| 238 |
+ if use ssl ; then |
| 239 |
+ m="${m}:mod_tls:mod_tls_shmcache" |
| 240 |
+ use memcache && m="${m}:mod_tls_memcache" |
| 241 |
+ fi |
| 242 |
+ if use tcpd ; then |
| 243 |
+ m="${m}:mod_wrap2:mod_wrap2_file" |
| 244 |
+ use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql" |
| 245 |
+ fi |
| 246 |
+ use unique-id && m="${m}:mod_unique_id" |
| 247 |
+ use vroot && m="${m}:mod_vroot" |
| 248 |
+ |
| 249 |
+ if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then |
| 250 |
+ einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'" |
| 251 |
+ m="${m}:${PROFTP_CUSTOM_MODULES}" |
| 252 |
+ fi |
| 253 |
+ |
| 254 |
+ [[ -z ${m} ]] || c="${c} --with-modules=${m:1}" |
| 255 |
+ |
| 256 |
+ econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \ |
| 257 |
+ $(use_enable acl facl) \ |
| 258 |
+ $(use_enable authfile auth-file) \ |
| 259 |
+ $(use_enable caps cap) \ |
| 260 |
+ $(use_enable ctrls) \ |
| 261 |
+ $(use_enable dso) \ |
| 262 |
+ $(use_enable ident) \ |
| 263 |
+ $(use_enable ipv6) \ |
| 264 |
+ $(use_enable memcache) \ |
| 265 |
+ $(use_enable ncurses) \ |
| 266 |
+ $(use_enable nls) \ |
| 267 |
+ $(use_enable ssl openssl) \ |
| 268 |
+ $(use_enable pam auth-pam) \ |
| 269 |
+ $(use_enable pcre) \ |
| 270 |
+ $(use_enable sodium) \ |
| 271 |
+ $(use_enable test tests) \ |
| 272 |
+ --enable-trace \ |
| 273 |
+ $(use_enable userland_GNU shadow) \ |
| 274 |
+ $(use_enable userland_GNU autoshadow) \ |
| 275 |
+ ${c:1} |
| 276 |
+} |
| 277 |
+ |
| 278 |
+src_test() { |
| 279 |
+ emake api-tests -C tests |
| 280 |
+} |
| 281 |
+ |
| 282 |
+src_install() { |
| 283 |
+ default |
| 284 |
+ [[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale |
| 285 |
+ rm -rf "${ED}"/var/run |
| 286 |
+ |
| 287 |
+ newinitd "${FILESDIR}"/proftpd.initd proftpd |
| 288 |
+ insinto /etc/proftpd |
| 289 |
+ doins "${FILESDIR}"/proftpd.conf.sample |
| 290 |
+ |
| 291 |
+ insinto /etc/xinetd.d |
| 292 |
+ newins "${FILESDIR}"/proftpd.xinetd proftpd |
| 293 |
+ |
| 294 |
+ insinto /etc/logrotate.d |
| 295 |
+ newins "${FILESDIR}"/${PN}.logrotate ${PN} |
| 296 |
+ |
| 297 |
+ dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES |
| 298 |
+ |
| 299 |
+ docinto html |
| 300 |
+ dodoc doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html |
| 301 |
+ |
| 302 |
+ docinto rfc |
| 303 |
+ dodoc doc/rfc/*.txt |
| 304 |
+ |
| 305 |
+ systemd_dounit "${FILESDIR}"/${PN}.service |
| 306 |
+ systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf |
| 307 |
+} |
| 308 |
+ |
| 309 |
+pkg_postinst() { |
| 310 |
+ # Create /var/run files at package merge time: bug #650000 |
| 311 |
+ tmpfiles_process ${PN}.conf |
| 312 |
+} |
Archives