1 |
commit: 0893de7095967cbdac7060b17a9024c8e7366c88 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 7 15:27:21 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 7 15:29:21 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0893de70 |
7 |
|
8 |
net-ftp/pure-ftpd: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
net-ftp/pure-ftpd/Manifest | 1 - |
14 |
.../files/pure-ftpd-1.0.45-openssl-1.1.patch | 41 ------ |
15 |
net-ftp/pure-ftpd/pure-ftpd-1.0.45-r3.ebuild | 142 --------------------- |
16 |
3 files changed, 184 deletions(-) |
17 |
|
18 |
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest |
19 |
index 469d95112c3..7be11d70d6b 100644 |
20 |
--- a/net-ftp/pure-ftpd/Manifest |
21 |
+++ b/net-ftp/pure-ftpd/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST pure-ftpd-1.0.45.tar.bz2 497695 BLAKE2B c905675253d992757e44baf1fae42d8363789ce3eb4d71d6f0e5c994a63efd307af69fb81aadb1875f0f2da952c0b3c8fbbc79c9c5c0b22c2d2f82029b417f11 SHA512 bb22b6b88778e2586411318905aa165e590185f7a87ac30761d6250f4de22a1deec6be5441926eae28011d3a5a923bad2ac366e237cc96a4d7932e3dbc9a1f2a |
24 |
DIST pure-ftpd-1.0.47.tar.bz2 489177 BLAKE2B 06e71ead47b87dedf47a84e488b2de127fcd297c2e9ca7a617c2ee2760cf55b816884763721826c512558d016cbd38a87a11ca0e8c2334d93145edc6f88d9287 SHA512 c1920a3f67f04635fde600fe226a7730b801e7e64658b25f1d9f9c0b35a704664be4adfb0b291594f7e0f10beade25eae9a5e6cc3b6777a3b413f3c2d9574e63 |
25 |
|
26 |
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.45-openssl-1.1.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.45-openssl-1.1.patch |
27 |
deleted file mode 100644 |
28 |
index 714809f37af..00000000000 |
29 |
--- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.45-openssl-1.1.patch |
30 |
+++ /dev/null |
31 |
@@ -1,41 +0,0 @@ |
32 |
-From 54cc692f997c72eb530f38e62de38ed444eb152e Mon Sep 17 00:00:00 2001 |
33 |
-From: Frank Denis <github@××××××××.org> |
34 |
-Date: Wed, 5 Apr 2017 12:30:32 -0700 |
35 |
-Subject: [PATCH] Add strict support for the OpenSSL 1.1 API |
36 |
- |
37 |
---- |
38 |
- src/tls.c | 10 ++++++++++ |
39 |
- 1 file changed, 10 insertions(+) |
40 |
- |
41 |
-diff --git a/src/tls.c b/src/tls.c |
42 |
-index 3c87bbb..21c83b2 100644 |
43 |
---- a/src/tls.c |
44 |
-+++ b/src/tls.c |
45 |
-@@ -258,9 +258,17 @@ int tls_init_library(void) |
46 |
- |
47 |
- tls_cnx_handshook = 0; |
48 |
- tls_data_cnx_handshook = 0; |
49 |
-+# if OPENSSL_VERSION_NUMBER < 0x10100000L |
50 |
- SSL_library_init(); |
51 |
- SSL_load_error_strings(); |
52 |
- OpenSSL_add_all_algorithms(); |
53 |
-+# else |
54 |
-+ OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | |
55 |
-+ OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); |
56 |
-+ OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | |
57 |
-+ OPENSSL_INIT_ADD_ALL_DIGESTS | |
58 |
-+ OPENSSL_INIT_LOAD_CONFIG, NULL); |
59 |
-+# endif |
60 |
- while (RAND_status() == 0) { |
61 |
- rnd = zrand(); |
62 |
- RAND_seed(&rnd, (int) sizeof rnd); |
63 |
-@@ -347,7 +355,9 @@ void tls_free_library(void) |
64 |
- SSL_CTX_free(tls_ctx); |
65 |
- tls_ctx = NULL; |
66 |
- } |
67 |
-+# if OPENSSL_API_COMPAT < 0x10100000L |
68 |
- EVP_cleanup(); |
69 |
-+# endif |
70 |
- } |
71 |
- |
72 |
- int tls_init_new_session(void) |
73 |
|
74 |
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r3.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r3.ebuild |
75 |
deleted file mode 100644 |
76 |
index 045d7c6b7ed..00000000000 |
77 |
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r3.ebuild |
78 |
+++ /dev/null |
79 |
@@ -1,142 +0,0 @@ |
80 |
-# Copyright 1999-2018 Gentoo Foundation |
81 |
-# Distributed under the terms of the GNU General Public License v2 |
82 |
- |
83 |
-EAPI=7 |
84 |
- |
85 |
-inherit flag-o-matic |
86 |
- |
87 |
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86" |
88 |
- |
89 |
-DESCRIPTION="Fast, production-quality, standard-conformant FTP server" |
90 |
-HOMEPAGE="http://www.pureftpd.org/" |
91 |
-SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2 |
92 |
- http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2" |
93 |
- |
94 |
-LICENSE="BSD" |
95 |
-SLOT="0" |
96 |
- |
97 |
-IUSE="anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd" |
98 |
- |
99 |
-REQUIRED_USE="implicittls? ( ssl )" |
100 |
- |
101 |
-DEPEND="caps? ( sys-libs/libcap ) |
102 |
- charconv? ( virtual/libiconv ) |
103 |
- ldap? ( >=net-nds/openldap-2.0.25 ) |
104 |
- mysql? ( || ( |
105 |
- dev-db/mariadb-connector-c |
106 |
- dev-db/mysql-connector-c |
107 |
- ) ) |
108 |
- pam? ( virtual/pam ) |
109 |
- postgres? ( dev-db/postgresql:= ) |
110 |
- ssl? ( |
111 |
- !libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] ) |
112 |
- libressl? ( dev-libs/libressl:= ) |
113 |
- ) |
114 |
- sysquota? ( sys-fs/quota[-rpc] ) |
115 |
- xinetd? ( virtual/inetd )" |
116 |
- |
117 |
-RDEPEND="${DEPEND} |
118 |
- dev-libs/libsodium:= |
119 |
- net-ftp/ftpbase |
120 |
- selinux? ( sec-policy/selinux-ftp )" |
121 |
- |
122 |
-PATCHES=( |
123 |
- "${FILESDIR}/${PN}-1.0.28-pam.patch" |
124 |
- "${FILESDIR}/${P}-openssl-1.1.patch" |
125 |
- "${FILESDIR}/${PN}-1.0.47-MAX_DATA_SIZE.patch" |
126 |
-) |
127 |
- |
128 |
-src_configure() { |
129 |
- # adjust max user length to something more appropriate |
130 |
- # for virtual hosts. See bug #62472 for details. |
131 |
- sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \ |
132 |
- -i "${S}/src/ftpd.h" || die "sed failed" |
133 |
- |
134 |
- # Those features are only configurable like this, see bug #179375. |
135 |
- use anondel && append-cppflags -DANON_CAN_DELETE |
136 |
- use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS |
137 |
- use anonren && append-cppflags -DANON_CAN_RENAME |
138 |
- use anonres && append-cppflags -DANON_CAN_RESUME |
139 |
- use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS |
140 |
- |
141 |
- # Do not auto-use SSP -- let the user select this. |
142 |
- export ax_cv_check_cflags___fstack_protector_all=no |
143 |
- |
144 |
- local myeconfargs=( |
145 |
- --enable-largefile |
146 |
- --with-altlog |
147 |
- --with-cookie |
148 |
- --with-diraliases |
149 |
- --with-extauth |
150 |
- --with-ftpwho |
151 |
- --with-language=${PUREFTPD_LANG:=english} |
152 |
- --with-peruserlimits |
153 |
- --with-privsep |
154 |
- --with-puredb |
155 |
- --with-quotas |
156 |
- --with-ratios |
157 |
- --with-throttling |
158 |
- --with-uploadscript |
159 |
- --with-virtualhosts |
160 |
- $(use_with charconv rfc2640) |
161 |
- $(use_with ldap) |
162 |
- $(use_with mysql) |
163 |
- $(use_with pam) |
164 |
- $(use_with paranoidmsg) |
165 |
- $(use_with postgres pgsql) |
166 |
- $(use_with ssl tls) |
167 |
- $(use_with implicittls) |
168 |
- $(use_with vchroot virtualchroot) |
169 |
- $(use_with sysquota sysquotas) |
170 |
- $(usex caps '' '--without-capabilities') |
171 |
- $(usex noiplog '--without-iplogging' '') |
172 |
- $(usex xinetd '' '--without-inetd') |
173 |
- ) |
174 |
- econf "${myeconfargs[@]}" |
175 |
-} |
176 |
- |
177 |
-src_install() { |
178 |
- local DOCS=( AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS ) |
179 |
- |
180 |
- default |
181 |
- |
182 |
- newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN} |
183 |
- newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN} |
184 |
- |
185 |
- if use implicittls ; then |
186 |
- sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \ |
187 |
- || die "Adjusting default server port for implicittls usage failed!" |
188 |
- fi |
189 |
- |
190 |
- keepdir /var/lib/run/${PN} |
191 |
- |
192 |
- if use xinetd ; then |
193 |
- insinto /etc/xinetd.d |
194 |
- newins "${FILESDIR}/pure-ftpd.xinetd" ${PN} |
195 |
- fi |
196 |
- |
197 |
- if use ldap ; then |
198 |
- insinto /etc/openldap/schema |
199 |
- doins pureftpd.schema |
200 |
- insinto /etc/openldap |
201 |
- insopts -m 0600 |
202 |
- doins pureftpd-ldap.conf |
203 |
- fi |
204 |
-} |
205 |
- |
206 |
-pkg_postinst() { |
207 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
208 |
- # This is a new installation |
209 |
- elog |
210 |
- elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!" |
211 |
- elog |
212 |
- ewarn "It's *really* important to read the README provided with Pure-FTPd!" |
213 |
- ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info" |
214 |
- ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info." |
215 |
- ewarn |
216 |
- if use charconv ; then |
217 |
- ewarn "Charset conversion is an *experimental* feature!" |
218 |
- ewarn "Remember to set a valid charset for your filesystem in the configuration!" |
219 |
- fi |
220 |
- fi |
221 |
-} |