summaryrefslogtreecommitdiff
path: root/net-ftp
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-08-18 18:16:17 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-08-18 18:16:17 +0100
commitfc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree326613a08f25851c388715e205576a2e7d25dc4f /net-ftp
parentb24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
gentoo resync : 18.08.2019
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/Manifest.gzbin4002 -> 4007 bytes
-rw-r--r--net-ftp/filezilla/Manifest8
-rw-r--r--net-ftp/filezilla/filezilla-3.44.1.ebuild (renamed from net-ftp/filezilla/filezilla-3.41.2.ebuild)6
-rw-r--r--net-ftp/filezilla/filezilla-3.44.2.ebuild (renamed from net-ftp/filezilla/filezilla-3.40.0.ebuild)24
-rw-r--r--net-ftp/proftpd/Manifest2
-rw-r--r--net-ftp/proftpd/proftpd-1.3.6-r3.ebuild272
-rw-r--r--net-ftp/proftpd/proftpd-1.3.6-r4.ebuild274
7 files changed, 23 insertions, 563 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index bbfd6e3db69c..1cd6afcb83e0 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
Binary files differ
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 6f6c2bd5ba8d..739eef628839 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,12 +1,12 @@
AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a3bb2821ad1643e5e5d43cd18adfe5911309a24822368fd38176aaf2af99d7b098864bc5ae2d6f94ffb481a4d25340 SHA512 009946fbb676698e404b1c91bb6b14767234751cbecb7faa097692b382a65af7ab31b54f1aac81fdb72c1492db4698d24f5fa9b1966f69bffa1f4b6073283e00
DIST FileZilla_3.39.0_src.tar.bz2 4995713 BLAKE2B d89aaa1f57187cd926ae1c4dd34624b404baa291334c652293d2dcfaedc4a5dffb401f8727b5d5d1fb483bdd503f35124efb75bdd7dd750d68e517fcb57fb8c0 SHA512 a0360634517ffd07878082abae024dbb4896035edcbd9abe6d8adfc9d37b73d01d95f6c5ca031175d88b6e4badefafcc43b5ddce3d9dbddde4deab5f0cc97e83
-DIST FileZilla_3.40.0_src.tar.bz2 4997647 BLAKE2B 88ff2461d33369c435645f1dd5afa98c566141bf825e74898f870bd4c09cc7b47a70f605afbaf7be28855385812a28ea24303b6ec7f0ba605a793160c3b76027 SHA512 7aeb0c340111a47c435e8d8cbf379e83d2fc6c0a94038e085664df34c2fe1f8ef8496ea894f5e4cfd576d034e8935fe29661bb9eff9f22416032f45f5a66db2f
-DIST FileZilla_3.41.2_src.tar.bz2 4994803 BLAKE2B 34f8331d3dfe3bdf483d234a0473074e17954b7d16abb7276ee6276221091f085c802d8cb0d397e00159b408d2737f5e23f2e50ad19d344c82472c09eea4dcd1 SHA512 c4b8284896942ba46f8f88fc5d60c6893c719e28ab94463848060850b6f9b2f4d3d13f580551dc3b21ab25ffc0cb1f43a2750500b5be2117952e14512a7ee40c
DIST FileZilla_3.42.1_src.tar.bz2 4987250 BLAKE2B 8cc6fd0a0cec336f34793520fe4be52a36a91ba5a4a3d41092d78c00a25899f73abd03f8d6339da40bc98a618dbae98063de2844a83cacb1431fc53f3b962383 SHA512 0dc9b3a6347803f60a71c56bb759700fb2b1b019dc29794aa639ce892ccd1ae53041112987f9d5e8e75ec7e07702a5aac8e1c131796bbc5f210d75d286276deb
DIST FileZilla_3.43.0_src.tar.bz2 4544635 BLAKE2B 13c99918dd7674fe3f2f0217b39ebe7aa89effe411e3cf90e08c9177278ce143ac84a021e49be0bc0772af29a5c34c33b03ce93d54f0b9918e4ea1001875ea48 SHA512 12c518616508e1cbd7ab60f1b94f8c876c885bc4399674c4b2df34235141fde1297a1edc686078c0f93b040ea6e42984c22ace00c4da201c7f99b4c9b71f5bc1
+DIST FileZilla_3.44.1_src.tar.bz2 4606669 BLAKE2B 407697467d7f9511b1b4e2e11505cf8815dd950609eabf242e283918e577d70f9b732fef930bbe97ba60fdffa484d77e0f7d74bb3ade8d1fcd0296ce91384301 SHA512 fa2e8c65621c7c6003e45f99f5153177e507ca34dde49d86d6f59e8b985abdeb80b779d71e554fc6acb891a695a0ef4c275bf0950af1b4cb67ff5ddb4c51e3b7
+DIST FileZilla_3.44.2_src.tar.bz2 4619337 BLAKE2B 11d61b14fcf464706dabe491fa8cbfa28fb516c3e1aafd887679ed6f1a80ba835dc43403c32b1344854f00f5b56f7e27c72bbca197cfadc92e69d92ebb0b1458 SHA512 9d4678a3a06f0ecac5ecfbae33f83df5f07e26da4f4a7e922fe5b00a5e59d5728af028667f6fa56210a23ecaa1c2a661d1874b218c2511a783644ed2b03e36ad
EBUILD filezilla-3.39.0.ebuild 1802 BLAKE2B f15137701d47484e96588c8f306511d913e6fb23077e5a72680adbbde91a004ae59bc6f4b084df90a782fcd9fd852845ca0ddbf7457e7f0088631643bca5175d SHA512 f858b3d7b283a215e4a2eeba84f8a1f64959eff1b7c55e14f3eae219cfe3688f3ce319b7c3b924ac6d1c8e49f85397c2e91f85f5726ae325abe04b0d76af8d17
-EBUILD filezilla-3.40.0.ebuild 1804 BLAKE2B 2ed7f491b4667124b32cf4045d2ee681d5b662e44e134ec00f1297eb320025c655d2ddd36a9341e5fb66dd3d96a1b76f5dc4b39f6eb4cbfef313458e7cdb5f36 SHA512 51ce67a0f1b896c8aa2098f1d7b3021482ec2eb1c7c2039ccb57efd2fe3773f8225300c29b7a59d0f5ff134b4464ee51a072c1f4f57dcffd069e360d471a314f
-EBUILD filezilla-3.41.2.ebuild 1857 BLAKE2B 31fdd12cd442bc32b70f8b1625ff41e0a97d0e1706bd1f5ab7d1c1d39ee9ba1add619acfc9068e8b8baf500ab5d11af042b254fa660db184f75a26ac6009903b SHA512 b1cbdef23ac4f5eb596fa809584e10285b151b4b2beb3817f2b8f44424ee13047a3dab5c8e2372dc5f89c87b5601e2bf66ee74b0dbd6dd2744487eae8863c6be
EBUILD filezilla-3.42.1.ebuild 1856 BLAKE2B b8f950120a699ed5b773f58dbae9b82d93cf5b5e4f2a030a28ee0e796db51c4dee1da5e363eeb70c14d280acfd33d7a4cc00be410e57eb0b040c9bf244d98141 SHA512 1d207f94ce3a81463bdb79f6d027643c06b0c92bb9697e0bba3217f481a458cf7627e2454d66196de77ca28edcf2cf27f599bdcb5f6635ba74e0912373766eba
EBUILD filezilla-3.43.0.ebuild 1856 BLAKE2B 2ad0b83621a4f350b915bfa058a85bbf478d219bbd10bea8ad0358f1a887b23ee871f2fb922219f74f993d3e4a93fe2d0ce2bb487298df26c561b6353b9b4220 SHA512 e4e992bfed08b5df44658debd65c3f7730ca1cd5dc5264506143af885313761237a749f86a2ad5c0cfb44b5a0bc499eec9f8d36fe53bbc3b30599ec5dd260f11
+EBUILD filezilla-3.44.1.ebuild 1856 BLAKE2B 31c76c3b6c5bfa13797d2daece233435da356a336335d241650f5970e88226a7ad59f388eeb8c3e1dbf49387df2d1c48c1a3f8bde8655ddacbb8469d4e2281cb SHA512 1bf3f77d126b977ffc61914f3d32263854d1a18c2f1c4b1fd3e7d9d750566f2784e4f437cc6364e47fde79066ab9bc3d478cf3c52aa6f82077d60081c396f70b
+EBUILD filezilla-3.44.2.ebuild 1856 BLAKE2B 6b03d65184c14aea243d18e362a8700abf4092cd2836efd59f50070f482d1df7d6465a88d7bd3c02759f310fe434109e5bc5ebf35358e199a35afa155ce0dee8 SHA512 253d2f5cd8f0b74730307951808173a899a03a262f7708b42e324015664fa441bbee948f07f6d7d919352df50446a4aaf386309acce21e0f96f0381bb299b20e
MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.41.2.ebuild b/net-ftp/filezilla/filezilla-3.44.1.ebuild
index 7d792e1d1c53..564462ccd07d 100644
--- a/net-ftp/filezilla/filezilla-3.41.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.44.1.ebuild
@@ -23,10 +23,10 @@ IUSE="dbus nls test"
RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
>=dev-libs/nettle-3.1:=
>=dev-db/sqlite-3.7
- >=dev-libs/libfilezilla-0.15.1
- <dev-libs/libfilezilla-0.16.0
+ >=dev-libs/libfilezilla-0.18.0
+ <dev-libs/libfilezilla-0.19.0
>=dev-libs/pugixml-1.7
- >=net-libs/gnutls-3.4.15
+ >=net-libs/gnutls-3.5.7
>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
x11-misc/xdg-utils
dbus? ( sys-apps/dbus )"
diff --git a/net-ftp/filezilla/filezilla-3.40.0.ebuild b/net-ftp/filezilla/filezilla-3.44.2.ebuild
index 17ac010ad2c7..2b4fb7350c29 100644
--- a/net-ftp/filezilla/filezilla-3.40.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.44.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
WX_GTK_VER="3.0-gtk3"
-inherit autotools flag-o-matic gnome2-utils wxwidgets
+inherit autotools flag-o-matic wxwidgets xdg
MY_PV=${PV/_/-}
MY_P="FileZilla_${MY_PV}"
@@ -23,10 +23,10 @@ IUSE="dbus nls test"
RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
>=dev-libs/nettle-3.1:=
>=dev-db/sqlite-3.7
- >=dev-libs/libfilezilla-0.15.1
- <dev-libs/libfilezilla-0.16.0
+ >=dev-libs/libfilezilla-0.18.1
+ <dev-libs/libfilezilla-0.19.0
>=dev-libs/pugixml-1.7
- >=net-libs/gnutls-3.4.15
+ >=net-libs/gnutls-3.5.7
>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
x11-misc/xdg-utils
dbus? ( sys-apps/dbus )"
@@ -62,15 +62,23 @@ src_prepare() {
}
src_configure() {
- econf $(use_with dbus) $(use_enable nls locales) \
- --with-pugixml=system \
+ local myeconfargs=(
--disable-autoupdatecheck
+ --with-pugixml=system
+ $(use_enable nls locales)
+ $(use_with dbus)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
}
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_pkg_postinst
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_pkg_postrm
}
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 7578d978cde4..043ed2090e59 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -18,7 +18,5 @@ DIST proftpd-1.3.6.tar.gz 20251898 BLAKE2B b68bd8bfb6cc970974b7a67cf13d1a543ffbc
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
-EBUILD proftpd-1.3.6-r3.ebuild 8627 BLAKE2B 4d486b8a8d72cf34774fe373582de04b95d22be1865080032df14007386e9add7d1ae16ffe012d9650256db52e81472ef2f71cd3093dd8afb56ccf267ab43aa5 SHA512 72fd496f8f3b309a8532b218d2b578261fae2a741ec49302ad70e4d9087b0f130555f5c576f4b702f1c57efd92a379df548eb4232b5d3278b0f657767c41fa90
-EBUILD proftpd-1.3.6-r4.ebuild 8631 BLAKE2B e9274bdefff19c96a899ed57e17e94c64134dd2e946131846eda0d199998427584612554eea91726d9c45dee3dc6f353cadf972e5cc6c483f3c0bf95a930432a SHA512 3809079d8866fb556955e1ba62ceaf50afbceeade7755b7f4f875f48800c9112aba090849938871bcd83fa72632a839be709992ac374814902fd1fc4d72a710c
EBUILD proftpd-1.3.6-r5.ebuild 8664 BLAKE2B 756dcfb300ed8e6beb5e6d71023f78547e5e7920c8c8d9f686300dc121461341bcf375168e8490e06a1f9f8d2a63bb41400719b186d628c99a0f3bead7415ae3 SHA512 9d2cbd0aaee69700ebb1dc2b0d95dad250bf1feb072cf70d8cf414044fdc9c3fb1776351fa8b4856854552c1e29076b2965d7582ddc0dcbba3c62ce26527a5f2
MISC metadata.xml 2930 BLAKE2B 3b97d562cb49d2a1a431c5b05d1cc24bf87cef2690aedc953274ec78c82bf3e4e9a5fbada45dc7df6ad71ac1b69fd40a055936ed039a8472812ac889a99cba2f SHA512 a4e29b9ac8c96cd4412fbfc854298e310fb80cfff7aeac81bc423a8990bb5c0cdbf274a9f8db2eaafa83830f9be727b7877881647802d8d7ba3eab5b6c395658
diff --git a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
deleted file mode 100644
index c5b9e539a75a..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib systemd tmpfiles
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.6"
-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/
- http://www.thrallingpenguin.com/resources/mod_clamav.htm
- 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://secure.thrallingpenguin.com/redmine/attachments/download/1/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 ~x86-fbsd"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc 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 xinetd"
-# 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? ( virtual/pam )
- pcre? ( dev-libs/libpcre )
- postgres? ( dev-db/postgresql:= )
- sodium? ( dev-libs/libsodium:0= )
- sqlite? ( dev-db/sqlite:3 )
- xinetd? ( virtual/inetd )"
-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}"/${PN}-1.3.6-sighup-crash.patch
-)
-
-RESTRICT=test # tests corrupt memory. need to be fixed upstream first
-
-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 "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.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{,.in} || 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
-}
-
-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=/var/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}"/var/run
-
- newinitd "${FILESDIR}"/proftpd.initd proftpd
- insinto /etc/proftpd
- doins "${FILESDIR}"/proftpd.conf.sample
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/proftpd.xinetd proftpd
- fi
-
- dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
- if use doc ; then
- dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
- docinto rfc
- dodoc doc/rfc/*.txt
- fi
-
- systemd_dounit "${FILESDIR}"/${PN}.service
- systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${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.6-r4.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r4.ebuild
deleted file mode 100644
index 489e76d50264..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.6-r4.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib systemd tmpfiles
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.6"
-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/
- http://www.thrallingpenguin.com/resources/mod_clamav.htm
- 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://secure.thrallingpenguin.com/redmine/attachments/download/1/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 ~x86-fbsd"
-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? ( virtual/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}"/${PN}-1.3.6-sighup-crash.patch
-)
-
-RESTRICT=test # tests corrupt memory. need to be fixed upstream first
-
-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 "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.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{,.in} || 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
-}
-
-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=/var/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}"/var/run
-
- newinitd "${FILESDIR}"/proftpd.initd 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 ${PN}.conf
-}
-
-pkg_postinst() {
- # Create /var/run files at package merge time: bug #650000
- tmpfiles_process ${PN}.conf
-}