Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/pure-ftpd/files/, net-ftp/pure-ftpd/
Date: Fri, 27 May 2022 22:34:14
Message-Id: 1653690818.e991d2f044f54c1516cc4e1dec4f1863acd9cb4e.conikost@gentoo
1 commit: e991d2f044f54c1516cc4e1dec4f1863acd9cb4e
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 27 20:17:40 2022 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Fri May 27 22:33:38 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e991d2f0
7
8 net-ftp/pure-ftpd: drop 1.0.49-r6, 1.0.50-r1
9
10 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
11
12 net-ftp/pure-ftpd/Manifest | 1 -
13 ...d-1.0.49-diraliases_uninitialized_pointer.patch | 31 ----
14 .../pure-ftpd-1.0.49-do-not-call-ar-directly.patch | 23 ---
15 .../pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch | 27 ----
16 ...pure-ftpd-1.0.49-quota_maxfile_size_check.patch | 25 ----
17 net-ftp/pure-ftpd/files/pure-ftpd.conf_d-3 | 90 ------------
18 net-ftp/pure-ftpd/files/pure-ftpd.rc11 | 75 ----------
19 net-ftp/pure-ftpd/pure-ftpd-1.0.49-r6.ebuild | 160 ---------------------
20 net-ftp/pure-ftpd/pure-ftpd-1.0.50-r1.ebuild | 150 -------------------
21 9 files changed, 582 deletions(-)
22
23 diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
24 index 9399be6f1d46..95a31323d918 100644
25 --- a/net-ftp/pure-ftpd/Manifest
26 +++ b/net-ftp/pure-ftpd/Manifest
27 @@ -1,2 +1 @@
28 -DIST pure-ftpd-1.0.49.tar.bz2 487958 BLAKE2B bd5f10a49b533eb6c257032659e97aa7ae16ec9402704d8ee06c92938e217b748b390ccf0e31b3640f41cb7a93f85b29c8ddcdc296f214391b1d92da9d701a7c SHA512 b44896d6fe2cda9169b1db93c5260bb892af14a173f2d25e60dd6530afe85d8e9156985609e35da7e5550dc123afb42bc5012beb9fca9011054cf0ed8b2eddef
29 DIST pure-ftpd-1.0.50.tar.bz2 520167 BLAKE2B 0c694ed48e896be13d907a71a24357f8676daf2c66bdaac41d31b162741164fe5ab1560499acc08b11e4fdb2a678c81c81c03e65a8181fcfd960ffbfe4b731d4 SHA512 8fbd24fb0450b9ed8e47335c97c3bc1cbcd0ee2ac7ebea95721b9dbddb7f61d8bedaa1710ba94213d96c79e12ec9b2b555ddb5f494c8961ca2339b176a52fe12
30
31 diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch
32 deleted file mode 100644
33 index 7e29934caf5d..000000000000
34 --- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch
35 +++ /dev/null
36 @@ -1,31 +0,0 @@
37 -From 8d0d42542e2cb7a56d645fbe4d0ef436e38bcefa Mon Sep 17 00:00:00 2001
38 -From: Frank Denis <github@××××××××.org>
39 -Date: Tue, 18 Feb 2020 18:36:58 +0100
40 -Subject: [PATCH] diraliases: always set the tail of the list to NULL
41 -
42 -Spotted and reported by Antonio Norales from GitHub Security Labs.
43 -Thanks!
44 ----
45 - src/diraliases.c | 2 +-
46 - 1 file changed, 1 insertion(+), 1 deletion(-)
47 -
48 -diff --git a/src/diraliases.c b/src/diraliases.c
49 -index 4002a36..fb70273 100644
50 ---- a/src/diraliases.c
51 -+++ b/src/diraliases.c
52 -@@ -93,7 +93,6 @@ int init_aliases(void)
53 - (tail->dir = strdup(dir)) == NULL) {
54 - die_mem();
55 - }
56 -- tail->next = NULL;
57 - } else {
58 - DirAlias *curr;
59 -
60 -@@ -105,6 +104,7 @@ int init_aliases(void)
61 - tail->next = curr;
62 - tail = curr;
63 - }
64 -+ tail->next = NULL;
65 - }
66 - fclose(fp);
67 - aliases_up++;
68
69 diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-do-not-call-ar-directly.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-do-not-call-ar-directly.patch
70 deleted file mode 100644
71 index 0df21320957d..000000000000
72 --- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-do-not-call-ar-directly.patch
73 +++ /dev/null
74 @@ -1,23 +0,0 @@
75 -https://bugs.gentoo.org/721242
76 -Backport of https://github.com/jedisct1/pure-ftpd/pull/148
77 -
78 ---- a/configure.ac
79 -+++ b/configure.ac
80 -@@ -7,7 +7,7 @@ AC_INIT([pure-ftpd],[1.0.49],
81 - [https://www.pureftpd.org])
82 - AC_CONFIG_SRCDIR(src/ftpd.c)
83 - AC_CONFIG_HEADERS([config.h])
84 --AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
85 -+AM_INIT_AUTOMAKE([1.11.2 dist-bzip2 tar-ustar])
86 - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
87 - AM_MAINTAINER_MODE
88 - AM_DEP_TRACK
89 -@@ -17,6 +17,7 @@ AC_SUBST(VERSION)
90 -
91 - dnl Checks for programs.
92 - LX_CFLAGS=${CFLAGS-NONE}
93 -+AM_PROG_AR
94 - AC_PROG_CC
95 - AC_PROG_RANLIB
96 - AC_USE_SYSTEM_EXTENSIONS
97 -
98
99 diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch
100 deleted file mode 100644
101 index 4ed197e46d35..000000000000
102 --- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch
103 +++ /dev/null
104 @@ -1,27 +0,0 @@
105 -From 36c6d268cb190282a2c17106acfd31863121b58e Mon Sep 17 00:00:00 2001
106 -From: Frank Denis <github@××××××××.org>
107 -Date: Mon, 24 Feb 2020 15:19:43 +0100
108 -Subject: [PATCH] pure_strcmp(): len(s2) can be > len(s1)
109 -
110 -Reported by Antonio Morales from GitHub Security Labs, thanks!
111 ----
112 - src/utils.c | 8 +++++++-
113 - 1 file changed, 7 insertions(+), 1 deletion(-)
114 -
115 -diff --git a/src/utils.c b/src/utils.c
116 -index f41492d..a7f0381 100644
117 ---- a/src/utils.c
118 -+++ b/src/utils.c
119 -@@ -45,5 +45,11 @@ int pure_memcmp(const void * const b1_, const void * const b2_, size_t len)
120 -
121 - int pure_strcmp(const char * const s1, const char * const s2)
122 - {
123 -- return pure_memcmp(s1, s2, strlen(s1) + 1U);
124 -+ const size_t s1_len = strlen(s1);
125 -+ const size_t s2_len = strlen(s2);
126 -+
127 -+ if (s1_len != s2_len) {
128 -+ return -1;
129 -+ }
130 -+ return pure_memcmp(s1, s2, s1_len);
131 - }
132
133 diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-quota_maxfile_size_check.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-quota_maxfile_size_check.patch
134 deleted file mode 100644
135 index 8b1877366c20..000000000000
136 --- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-quota_maxfile_size_check.patch
137 +++ /dev/null
138 @@ -1,25 +0,0 @@
139 -From fb93975777a1cffba80544e08ca81606532395d6 Mon Sep 17 00:00:00 2001
140 -From: DroidTest <53651584+DroidTest@××××××××××××××××××××.com>
141 -Date: Thu, 29 Jul 2021 11:36:26 +0800
142 -Subject: [PATCH] fix the maxfile_size checking bug
143 -
144 -Fix the predicate that never evaluates true
145 ----
146 - src/ftpd.c | 4 ++--
147 - 1 file changed, 2 insertions(+), 2 deletions(-)
148 -
149 -diff --git a/src/ftpd.c b/src/ftpd.c
150 -index d856839..61275de 100644
151 ---- a/src/ftpd.c
152 -+++ b/src/ftpd.c
153 -@@ -4247,8 +4247,8 @@ void dostor(char *name, const int append, const int autorename)
154 - if (quota_update(&quota, 0LL, 0LL, &overflow) == 0 &&
155 - (overflow > 0 || quota.files >= user_quota_files ||
156 - quota.size > user_quota_size ||
157 -- (max_filesize >= (off_t) 0 &&
158 -- (max_filesize = user_quota_size - quota.size) < (off_t) 0))) {
159 -+ ((max_filesize = user_quota_size - quota.size) < (off_t) 0 &&
160 -+ max_filesize >= (off_t) 0))) {
161 - overflow = 1;
162 - (void) close(f);
163 - goto afterquota;
164
165 diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d-3 b/net-ftp/pure-ftpd/files/pure-ftpd.conf_d-3
166 deleted file mode 100644
167 index 29b15a5a8928..000000000000
168 --- a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d-3
169 +++ /dev/null
170 @@ -1,90 +0,0 @@
171 -# Config file for /etc/init.d/pure-ftpd
172 -##Comment variables out to disable its features, or change the values in it... ##
173 -
174 -## This variable must be uncommented in order for the server to start ##
175 -#IS_CONFIGURED="yes"
176 -
177 -## FTP Server,Port (separated by comma) ##
178 -## If you prefer host names over IP addresses, it's your choice:
179 -## SERVER="-S ftp.rtchat.com,21"
180 -## IPv6 addresses are supported.
181 -## !!! WARNING !!!
182 -## Using an invalid IP will result in the server not starting,
183 -## but reporting a correct start!
184 -## SERVER="-S 192.168.0.1,21"
185 -## By default binds to all available IPs.
186 -SERVER="-S 21"
187 -
188 -## Number of simultaneous connections in total, and per IP ##
189 -MAX_CONN="-c 30"
190 -MAX_CONN_IP="-C 10"
191 -
192 -## Don't allow uploads if the partition is more full then this var ##
193 -DISK_FULL="-k 90%"
194 -
195 -## If your FTP server is behind a NAT box, uncomment this ##
196 -#USE_NAT="-N"
197 -
198 -## Authentication mechanisms (others are 'pam', ...) ##
199 -## Further infos can be found in the README file.
200 -AUTH="-l unix"
201 -
202 -## Change the maximum idle time (in minutes) ##
203 -## If this variable is not defined, it will default to 15 minutes.
204 -#TIMEOUT="-I <timeout>'"
205 -
206 -## Facility used for syslog logging ##
207 -## If this variable is not defined, it will default to the 'ftp' facility.
208 -## Logging can be disabled with '-f none'.
209 -#LOG="-f <facility>"
210 -
211 -## Charset conversion support *experimental* ##
212 -## Only works if USE "charconv" is enabled (only Pure-FTPd >=1.0.21).
213 -## Set the charset of the filesystem.
214 -# CHARCONV="--fscharset <charset>"
215 -
216 -## If you want to process each file uploaded through Pure-FTPd, enter the name
217 -## of the script that should process the files below.
218 -## man pure-uploadscript to learn more about how to write this script.
219 -# UPLOADSCRIPT="/path/to/uploadscript"
220 -
221 -## Misc. Others ##
222 -MISC_OTHER="-A -x -j -R -Z"
223 -
224 -#
225 -# Use these inside $MISC_OTHER
226 -# More can be found on "http://download.pureftpd.org/pub/pure-ftpd/doc/README"
227 -#
228 -# -A [ chroot() everyone, but root ]
229 -# -e [ Only allow anonymous users ]
230 -# -E [ Only allow authenticated users. Anonymous logins are prohibited. ]
231 -# -i [ Disallow upload for anonymous users, whatever directory perms are ]
232 -# -j [ If the home directory of a user doesn't exist, auto-create it ]
233 -# -M [ Allow anonymous users to create directories. ]
234 -# -R [ Disallow users (even non-anonymous ones) usage of the CHMOD command ]
235 -# -x [ In normal operation mode, authenticated users can read/write
236 -# files beginning with a dot ('.'). Anonymous users can't, for security reasons
237 -# (like changing banners or a forgotten .rhosts). When '-x' is used, authenticated
238 -# users can download dot-files, but not overwrite/create them, even if they own
239 -# them. ]
240 -# -X [ This flag is identical to the previous one (writing
241 -# dot-files is prohibited), but in addition, users can't even *read* files and
242 -# directories beginning with a dot (like "cd .ssh"). ]
243 -# -D [ List files beginning with a dot ('.') even when the client doesn't
244 -# append the '-a' option to the list command. A workaround for badly
245 -# configured FTP clients. ]
246 -# -G [ Disallow renaming. ]
247 -# -d [ Send various debugging messages to the syslog. ONLY for DEBUG ]
248 -# -F <fortune file> [ Display a fortune cookie on login. Check the README file ]
249 -# -H [ By default, fully-qualified host names are logged. The '-H' flag avoids host names resolution. ]
250 -
251 -
252 -# Some filesystems don't like accesses being memory mapped. This happens for
253 -# example with ftpwho on JFFS2 filesystems (bug #330563). If you happen to
254 -# have such a filesystem on /var set TMPFS_MOUNT to "true".
255 -TMPFS_MOUNT="false"
256 -
257 -# Special mount options (like nosuid or nodev) for the tmpfs mount can be added
258 -# here. Several options must be separated by comma: "nodev,nosuid"
259 -#TMPFS_OPTS=""
260 -
261
262 diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 b/net-ftp/pure-ftpd/files/pure-ftpd.rc11
263 deleted file mode 100644
264 index 35270ff33507..000000000000
265 --- a/net-ftp/pure-ftpd/files/pure-ftpd.rc11
266 +++ /dev/null
267 @@ -1,75 +0,0 @@
268 -#!/sbin/openrc-run
269 -# Copyright 1999-2019 Gentoo Authors
270 -# Distributed under the terms of the GNU General Public License v2
271 -
272 -ftpd_pidfile="/var/run/pure-ftpd.pid"
273 -script_pidfile="/var/run/pure-uploadscript.pid"
274 -ftpd_rundir="/var/lib/run/pure-ftpd"
275 -daemon="/usr/sbin/pure-ftpd"
276 -script_daemon="/usr/sbin/pure-uploadscript"
277 -
278 -depend() {
279 - need localmount
280 - use netmount
281 -}
282 -
283 -start_pre() {
284 - if [ -z "${IS_CONFIGURED}" ] ; then
285 - eerror "You need to setup /etc/conf.d/pure-ftpd first!"
286 - return 1
287 - fi
288 -}
289 -
290 -start() {
291 - UPSCRIPT=""
292 - if [ -n "${UPLOADSCRIPT}" ] ; then
293 - UPSCRIPT="--uploadscript"
294 - fi
295 -
296 - FTPD_CONFIG="$SERVER $MAX_CONN $MAX_CONN_IP $DISK_FULL $USE_NAT $AUTH
297 - $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT"
298 -
299 - WAIT="--wait 100"
300 -
301 - if ${TMPFS_MOUNT:-false} && grep -q tmpfs /proc/filesystems ; then
302 - [ -n "${TMPFS_OPTS}" ] && MOUNT_OPTS="-o ${TMPFS_OPTS}"
303 - einfo "Mounting tmpfs on ${ftpd_rundir}"
304 - mount ${MOUNT_OPTS} -t tmpfs tmpfs ${ftpd_rundir} \
305 - || eerror "Unable to mount tmpfs"
306 - fi
307 -
308 - ebegin "Starting Pure-FTPd"
309 - start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} \
310 - --make-pidfile --background --exec /usr/sbin/pure-ftpd ${WAIT} \
311 - -- $(echo ${FTPD_CONFIG} | sed 's@\([[:space:]]\+\|^\)-B\([[:space:]]\+\|$\)@\1@g')
312 - result=$?
313 - if [ ${result} -ne 0 ] ; then
314 - eend 1 "Could not launch Pure-FTPd"
315 - else
316 - eend $result
317 - if [ -n "${UPLOADSCRIPT}" ] ; then
318 - ebegin "Starting Pure-FTPd upload script"
319 - start-stop-daemon --start --quiet --make-pidfile \
320 - --pidfile ${script_pidfile} \
321 - --exec ${script_daemon} --background ${WAIT} \
322 - -- -r $UPLOADSCRIPT
323 - eend $?
324 - fi
325 - fi
326 -}
327 -
328 -stop() {
329 - if [ -n "${UPLOADSCRIPT}" ] ; then
330 - ebegin "Stopping Pure-FTPd upload script"
331 - start-stop-daemon --stop --retry 20 --quiet \
332 - --pidfile ${script_pidfile}
333 - eend $?
334 - fi
335 - ebegin "Stopping Pure-FTPd"
336 - start-stop-daemon --stop --retry 20 --quiet --pidfile ${ftpd_pidfile}
337 - eend $?
338 -
339 - if ${TMPFS_MOUNT:-false} && mount | grep -q ${ftpd_rundir} ; then
340 - umount ${ftpd_rundir} >/dev/null 2>&1
341 - fi
342 -}
343
344 diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r6.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r6.ebuild
345 deleted file mode 100644
346 index 784e79dcafc5..000000000000
347 --- a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r6.ebuild
348 +++ /dev/null
349 @@ -1,160 +0,0 @@
350 -# Copyright 1999-2022 Gentoo Authors
351 -# Distributed under the terms of the GNU General Public License v2
352 -
353 -EAPI=7
354 -
355 -inherit autotools flag-o-matic
356 -
357 -DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
358 -HOMEPAGE="http://www.pureftpd.org/"
359 -if [[ "${PV}" == 9999 ]] ; then
360 - inherit autotools git-r3
361 - EGIT_REPO_URI="https://github.com/jedisct1/pure-ftpd.git"
362 -else
363 - SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
364 - http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
365 - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
366 -fi
367 -
368 -LICENSE="BSD GPL-2"
369 -SLOT="0"
370 -
371 -IUSE="anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
372 -
373 -REQUIRED_USE="implicittls? ( ssl )"
374 -
375 -BDEPEND="sys-devel/autoconf-archive"
376 -
377 -DEPEND="dev-libs/libsodium:=
378 - virtual/libcrypt:=
379 - caps? ( sys-libs/libcap )
380 - ldap? ( >=net-nds/openldap-2.0.25:= )
381 - mysql? ( || (
382 - dev-db/mariadb-connector-c
383 - dev-db/mysql-connector-c
384 - ) )
385 - pam? ( sys-libs/pam )
386 - postgres? ( dev-db/postgresql:= )
387 - ssl? (
388 - >=dev-libs/openssl-0.9.6g:0=[-bindist(-)]
389 - )
390 - sysquota? ( sys-fs/quota[-rpc] )
391 - xinetd? ( virtual/inetd )"
392 -
393 -RDEPEND="${DEPEND}
394 - net-ftp/ftpbase
395 - selinux? ( sec-policy/selinux-ftp )"
396 -
397 -PATCHES=(
398 - "${FILESDIR}/${PN}-1.0.28-pam.patch"
399 -
400 - # https://bugs.gentoo.org/711124
401 - "${FILESDIR}/${P}-diraliases_uninitialized_pointer.patch"
402 - "${FILESDIR}/${P}-pure_strcmp_OOB_read.patch"
403 -
404 - # https://bugs.gentoo.org/721242
405 - "${FILESDIR}/${P}-do-not-call-ar-directly.patch"
406 -
407 - # https://bugs.gentoo.org/811786
408 - "${FILESDIR}/${P}-quota_maxfile_size_check.patch"
409 -)
410 -
411 -src_prepare() {
412 - default
413 - eautoreconf
414 -}
415 -
416 -src_configure() {
417 - # adjust max user length to something more appropriate
418 - # for virtual hosts. See bug #62472 for details.
419 - sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \
420 - -i "${S}/src/ftpd.h" || die "sed failed"
421 -
422 - # Those features are only configurable like this, see bug #179375.
423 - use anondel && append-cppflags -DANON_CAN_DELETE
424 - use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
425 - use anonren && append-cppflags -DANON_CAN_RENAME
426 - use anonres && append-cppflags -DANON_CAN_RESUME
427 - use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
428 -
429 - # Do not auto-use SSP -- let the user select this.
430 - export ax_cv_check_cflags___fstack_protector_all=no
431 -
432 - local myeconfargs=(
433 - --enable-largefile
434 - # Required for correct pid file location.
435 - # pure-ftpd appends "/run/pure-ftpd.pid" to the localstatedir
436 - # path, and tries to write to that file even when being
437 - # started in foreground. So we need to pin this to /
438 - --localstatedir="${EPREFIX}"/
439 - --with-altlog
440 - --with-cookie
441 - --with-diraliases
442 - --with-extauth
443 - --with-ftpwho
444 - --with-language=${PUREFTPD_LANG:=english}
445 - --with-peruserlimits
446 - --with-privsep
447 - --with-puredb
448 - --with-quotas
449 - --with-ratios
450 - --with-throttling
451 - --with-uploadscript
452 - --with-virtualhosts
453 - $(use_with ldap)
454 - $(use_with mysql)
455 - $(use_with pam)
456 - $(use_with paranoidmsg)
457 - $(use_with postgres pgsql)
458 - $(use_with ssl tls)
459 - $(use_with implicittls)
460 - $(use_with vchroot virtualchroot)
461 - $(use_with sysquota sysquotas)
462 - $(usex caps '' '--without-capabilities')
463 - $(usex noiplog '--without-iplogging' '')
464 - $(usex xinetd '' '--without-inetd')
465 - )
466 - econf "${myeconfargs[@]}"
467 -}
468 -
469 -src_install() {
470 - local DOCS=( AUTHORS ChangeLog FAQ HISTORY README* NEWS )
471 -
472 - default
473 -
474 - newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN}
475 - newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN}
476 -
477 - if use implicittls ; then
478 - sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \
479 - || die "Adjusting default server port for implicittls usage failed!"
480 - fi
481 -
482 - keepdir /var/lib/run/${PN}
483 -
484 - if use xinetd ; then
485 - insinto /etc/xinetd.d
486 - newins "${FILESDIR}/pure-ftpd.xinetd" ${PN}
487 - fi
488 -
489 - if use ldap ; then
490 - insinto /etc/openldap/schema
491 - doins pureftpd.schema
492 - insinto /etc/openldap
493 - insopts -m 0600
494 - doins pureftpd-ldap.conf
495 - fi
496 -}
497 -
498 -pkg_postinst() {
499 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
500 - # This is a new installation
501 - elog
502 - elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
503 - elog
504 - ewarn "It's *really* important to read the README provided with Pure-FTPd!"
505 - ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
506 - ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
507 - ewarn
508 - fi
509 -}
510
511 diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r1.ebuild
512 deleted file mode 100644
513 index e78b1e52dc2e..000000000000
514 --- a/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r1.ebuild
515 +++ /dev/null
516 @@ -1,150 +0,0 @@
517 -# Copyright 1999-2022 Gentoo Authors
518 -# Distributed under the terms of the GNU General Public License v2
519 -
520 -EAPI=8
521 -
522 -inherit flag-o-matic
523 -
524 -DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
525 -HOMEPAGE="http://www.pureftpd.org/"
526 -if [[ "${PV}" == 9999 ]] ; then
527 - inherit autotools git-r3
528 - EGIT_REPO_URI="https://github.com/jedisct1/pure-ftpd.git"
529 -else
530 - SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
531 - http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
532 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
533 -fi
534 -
535 -LICENSE="BSD GPL-2"
536 -SLOT="0"
537 -
538 -IUSE="anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
539 -
540 -REQUIRED_USE="implicittls? ( ssl )"
541 -
542 -BDEPEND="sys-devel/autoconf-archive"
543 -
544 -DEPEND="dev-libs/libsodium:=
545 - virtual/libcrypt:=
546 - caps? ( sys-libs/libcap )
547 - ldap? ( >=net-nds/openldap-2.0.25:= )
548 - mysql? ( || (
549 - dev-db/mariadb-connector-c
550 - dev-db/mysql-connector-c
551 - ) )
552 - pam? ( sys-libs/pam )
553 - postgres? ( dev-db/postgresql:= )
554 - ssl? (
555 - >=dev-libs/openssl-0.9.6g:0=[-bindist(-)]
556 - )
557 - sysquota? ( sys-fs/quota[-rpc] )
558 - xinetd? ( virtual/inetd )"
559 -
560 -RDEPEND="${DEPEND}
561 - net-ftp/ftpbase
562 - selinux? ( sec-policy/selinux-ftp )"
563 -
564 -PATCHES=(
565 - "${FILESDIR}/${PN}-1.0.28-pam.patch"
566 -)
567 -
568 -src_prepare() {
569 - default
570 - [[ "${PV}" == 9999 ]] && eautoreconf
571 -}
572 -
573 -src_configure() {
574 - # adjust max user length to something more appropriate
575 - # for virtual hosts. See bug #62472 for details.
576 - sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \
577 - -i "${S}/src/ftpd.h" || die "sed failed"
578 -
579 - # Those features are only configurable like this, see bug #179375.
580 - use anondel && append-cppflags -DANON_CAN_DELETE
581 - use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
582 - use anonren && append-cppflags -DANON_CAN_RENAME
583 - use anonres && append-cppflags -DANON_CAN_RESUME
584 - use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
585 -
586 - # Do not auto-use SSP -- let the user select this.
587 - export ax_cv_check_cflags___fstack_protector_all=no
588 -
589 - local myeconfargs=(
590 - --enable-largefile
591 - # Required for correct pid file location.
592 - # pure-ftpd appends "/run/pure-ftpd.pid" to the localstatedir
593 - # path, and tries to write to that file even when being
594 - # started in foreground. So we need to pin this to /
595 - --localstatedir="${EPREFIX}"/
596 - --with-altlog
597 - --with-cookie
598 - --with-diraliases
599 - --with-extauth
600 - --with-ftpwho
601 - --with-language=${PUREFTPD_LANG:=english}
602 - --with-peruserlimits
603 - --with-privsep
604 - --with-puredb
605 - --with-quotas
606 - --with-ratios
607 - --with-throttling
608 - --with-uploadscript
609 - --with-virtualhosts
610 - $(use_with ldap)
611 - $(use_with mysql)
612 - $(use_with pam)
613 - $(use_with paranoidmsg)
614 - $(use_with postgres pgsql)
615 - $(use_with ssl tls)
616 - $(use_with implicittls)
617 - $(use_with vchroot virtualchroot)
618 - $(use_with sysquota sysquotas)
619 - $(usex caps '' '--without-capabilities')
620 - $(usex noiplog '--without-iplogging' '')
621 - $(usex xinetd '' '--without-inetd')
622 - )
623 - econf "${myeconfargs[@]}"
624 -}
625 -
626 -src_install() {
627 - local DOCS=( AUTHORS ChangeLog FAQ HISTORY README* NEWS )
628 -
629 - default
630 -
631 - newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN}
632 - newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN}
633 -
634 - if use implicittls ; then
635 - sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \
636 - || die "Adjusting default server port for implicittls usage failed!"
637 - fi
638 -
639 - keepdir /var/lib/run/${PN}
640 -
641 - if use xinetd ; then
642 - insinto /etc/xinetd.d
643 - newins "${FILESDIR}/pure-ftpd.xinetd" ${PN}
644 - fi
645 -
646 - if use ldap ; then
647 - insinto /etc/openldap/schema
648 - doins pureftpd.schema
649 - insinto /etc/openldap
650 - insopts -m 0600
651 - doins pureftpd-ldap.conf
652 - fi
653 -}
654 -
655 -pkg_postinst() {
656 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
657 - # This is a new installation
658 - elog
659 - elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
660 - elog
661 - ewarn "It's *really* important to read the README provided with Pure-FTPd!"
662 - ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
663 - ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
664 - ewarn
665 - fi
666 -}