diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
| commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
| tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-ftp | |
| parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) | |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'net-ftp')
48 files changed, 205 insertions, 822 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz Binary files differindex 6d5188f39cd2..991e8e4a7713 100644 --- a/net-ftp/Manifest.gz +++ b/net-ftp/Manifest.gz diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest index ab093f3a723e..ea1a3b29812f 100644 --- a/net-ftp/atftp/Manifest +++ b/net-ftp/atftp/Manifest @@ -1,19 +1,8 @@ -AUX atftp-0.7-CFLAGS.patch 619 BLAKE2B 8749303ede615e0ff4ac26a5a6349ed768ae15aac99fedcdeed3202f986290b81d856097a3a276d7450f1420a77c2e0b5930e4cd4b05f72b4f3612c3d821c1ff SHA512 9227354689ea504f0500c244335a83d8a77dcb74c876ada1065c955f414e1f51e06dafcdb5d99f1fbb22036a074f9e46cada7378824d70f677ff6db931a35289 -AUX atftp-0.7-blockno.patch 5686 BLAKE2B dc8f2c2c9305d8432264f55964988f5cecacb5eeda0f5456994ac5efb562d9c5bfd882f7202eac2ba5d14b561b116620d5890821efcadbabedd3afa78718c9d2 SHA512 f91e7a7811a1a08268f2ca378eb4e473838e0c07c3cb8c6e6fec1e0e4e9068705451d8d0ae5f3d184a9455d5035bb656176fa3ed09b50fecb6c2d42e8dc73e1d -AUX atftp-0.7-glibc24.patch 778 BLAKE2B 47dce340676636a2f2ca647e9efd7fcbc203dca73197d38a8d5d8ef687706a06dfff8627615237abd7c3a1a566abbaf3a33e80aa86939e2db1f199794a917c4a SHA512 1000972a84d3462a0924a4189b240160a9ae5e1429365b329e0be582fdd6593611a59d3f7f955956269144f4c764bb378e04aecc5c18405d340f7cd60efb4e5a -AUX atftp-0.7-illreply.patch 382 BLAKE2B 67893950b43b34b48152475f08d7fd7020eaa09deaa9b16bfaa7c0ddc3b0c3bb70c7c354129d26bf61c16c37125fc0c5924f99759e7fdb1caa12461264e6e3fb SHA512 42efdd402a6fb07bd02286afb41c8eb14d68595454e882a967e40453ec85e59214e635537ea8d580259f1bfdb0524bcaba29e8af321136c3e2d973f22b08b467 -AUX atftp-0.7-password.patch 3906 BLAKE2B beb8fadcbc9b42689c5ebfbb41e234d79f742d5995157eab7d37330bc9aec7d3c3e7d84ee44fb56b79da53aeee5cb2c5fa1dd0ebf646b98dcd348057b71a02ac SHA512 5f04d4d54aaf5f459e1aa87f56b3920fc039303f6c1c6d0f205bc1937b9c5263e5a51224838ee7aab1b73e0df6c312620caeba9dd2388e1b5b7bdf8253a56fc0 -AUX atftp-0.7-pcre.patch 661 BLAKE2B 39080ad1cd36f434c0405fd42605cba4890ff912a63c1aea079cb0ae2c078e3d81b6c0b203d4a7c0ce1f81acf62ebb278000dc4ebb590e2e488151094d58012e SHA512 773ecc9aa63a9ffb2774ca5454daf573813f988defa6e6f8e9f99cfcc88c7984632b6d1944994c2dd6426200057a552743b9c30d5c158f469a9a74b3cd0c5dff -AUX atftp-0.7-spaced_filename.patch 2395 BLAKE2B 5f0ab736e05094fa42fa891990a3664fdf0033b9ec23479945a419df909e7963fb1013b1d48668d0554704c7adf647b409745dcd68f623a68d0d311d90cb7894 SHA512 f6b352105d40fd4de2b079e847c7e6230ebeef3d2c5568aa260f7c74b22962c168928b38a244e3784e6ba282b47ae09d28b572c36944360f5bf8d880d16aeb64 -AUX atftp-0.7-tests.patch 582 BLAKE2B e0eb7fe0dbd78ea164e65b320b6b4d7047becfea6c25655639c411af06d2c127102d3bb0b2eb5afcd3ec33b27d5362dfe62f417e71823e798689341cb77a5142 SHA512 93863aed523c9787f37b671caa894a92e864b009dd5c028066f7e10e50cefce955f3cf9a24ecc702c3ce572bd88fa6a47d524af08ecbaa6ff116487a68393ea8 AUX atftp-0.7.2-CFLAGS.patch 611 BLAKE2B a897ae1d9f03387283826c5b9795028b9190ca5a55e9db795d6a3753c7ce45ccd75a8d37eb2de228bd1b8fc57472fb3f662860c0f1efdc5a0ceab2d1a178c1dc SHA512 b020e761af2b73193e0bc3ef0e11e293babdfaedeac5429f3ad89079d686ce9c69737a4f74e147a023a92a2424241d61f17574feaadc39a5b6bd361245886c8a AUX atftp.confd 105 BLAKE2B 6672479bce2240d4c34c70853227a769fa45c06e4b5c04f7d5aebdbceb0987316a9ec906182cacf5337fce5190aeac3bfc4cda0be72b8d48e99a5b2cbc2eca0e SHA512 cdbd63df16c2cee7491209de8ec44e05e10beccc6286cf7cb1c5dc7731c616d41bc94ce4d6c020b4ac8bb77b27956e9ee36d9b5703dcd3477e8b14927d154b91 AUX atftp.init 438 BLAKE2B 1783431801dbf04353bde6c3766c7d0acdd06b8ec853c8fba5cf1bbfe6c7020b55305f44992e3921a63654f290a28c28373dd94f925188c72105c8a3dd047dca SHA512 b64f78658d2da17a4fe4237835c0a6a0cc59d0b7278e8f6f49673ffd8a97a9473e4773b43bcc70d312043ee4324d8105c50f0cfcf6055c0755ce598c9d7e5a23 AUX atftp.service 233 BLAKE2B 4c9a1a8041ffc4cdf71a24800494f340121beb9bde9760fa090b9e515ef0b2aa7dd73173543c75fde465dbf9cc229b04acc9e72c296fa27cace2063128de06c6 SHA512 533372c4863e39d6139ddc491c2b2b2051f1094a90d9854879f28bae7975c8dc997696318794cd1136f9cc542a8f418ad8361b87dd6b3455445d8528d2cc993a AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d0374623c782afacae1284f5385967dfa91026553845f9283be59b4c7d96031da85261067b7be6544f7 SHA512 661befb6873eee6c0ed25fd5cb156e3d7c4ef801d2f58cda8df0f0c5fd851c7eb28089a9399529164c61505963e9d10143df2195d57ff66f85ad0e2750fbbd57 DIST atftp-0.7.2.tar.gz 248038 BLAKE2B 3ca44624bf989009c2ebd0ae97927b0784e3c617a79a1bd00212a72a185302cf84f51c8bcda2012981d67cfed4d241b70f8719e78155207608f07a2227e6c437 SHA512 d602bb69451175a36e619abcff412ab1f6d0e7baf8c3f9a2b32081530fbc5816157404b80d42a8b6caa89cc83675b5cbeefcd57a5d98b8f5b43c6254b20ef28b -DIST atftp-0.7.dfsg.tar.gz 187992 BLAKE2B 8196c333ea8042879196ca9f9c656b4d60a332ed1d64a5738870e1d4fd5f108716da6769bf52759626ad3efce11946b5d6285ac9fbe46cb63e6e2d051fc7aeb3 SHA512 40d231c0bc0478fedb3eff9b4c540c62dd9bd6c40d9738e2db1813797a5d48e201720d43a48970ce250f1bb5b15460bb9b3d631c06f96c1a74775ecfb6d13f82 -DIST atftp_0.7-11.diff.gz 26055 BLAKE2B c9be58836b5a7e3943dd28dd4661abab5e86b1941c9a2b58786eebe702ab515cf1bc08bf44c8ab4157584a437e861e24eb0c833c1fa1bc774f7f8a2134b6cd27 SHA512 28747f8f3ef2fc3b122361f682fe26ba93acf09b190f61efb3cfcbb6bdeef78cfe1348aeaf1699003a7e02586579be670d85b65baad1b1165a4bec9a9279adb5 -EBUILD atftp-0.7-r6.ebuild 1831 BLAKE2B 076b4853e8a1066d359b8ebac48eb9551e9b9b8083833752b4ba050e67b05e971b9979b95878e7e6176e193a243768544a16c9acf48e18b88a3167f4fdd45003 SHA512 e0f2cfe21ac0d293620850cba2994d2436fc33812e6e04b42cb719458c5c2aa5ec1075f70cc388ae7ecb328666aad87d88c8a48c562e009da5a0d71ec2da800c -EBUILD atftp-0.7.2-r1.ebuild 1459 BLAKE2B 4a5059d8c4f4d47fa934a3f185a9cc2a37281d6d3822070c0f7dfeb5cb92a202f433d28c91c47232c874c33ed532b618731bbb37e7f06517ad68946d0f20351e SHA512 76286fe573e6958b61a55e2c3e3f1e1829cea7ef0b822600b9248930cea6836d4b302a4d18f165151e6fa550060a6f7cadcf1e975af3c5015c437129edbd3909 +EBUILD atftp-0.7.2-r1.ebuild 1454 BLAKE2B 1dd9278366a7bbc136e6f7fcf584a7f52076de01a53cdf2b65e486bd1582c75211cca6e7380ddc8978f3760a369be5b580dfcac99c4d5672e9a86a8478ff8450 SHA512 a7f27b1c0087aceb9f8c4e9e645cc932b9d69faecc0a7d51529f8395017a2a8ea8a25f9a882f2d128fbd0cb4a51b53cc351b2310b12ae207e543047bc32801c0 MISC metadata.xml 418 BLAKE2B 882119fa041eaa33650c5e3efaa440e3ed25056f05dda4667a150a8646f32f620b3479821b0e6c3220541afd811f35b6060127aa58b98e7604fc498536e8c724 SHA512 cff57d66fe14a48905bd9280e15f794a66df58f83fff73290db3dc7a8d2196c5ffba05693d9e8909e3bf710bb05b72e00001747bd9d92379a7cdfc0dbaba57cb diff --git a/net-ftp/atftp/atftp-0.7-r6.ebuild b/net-ftp/atftp/atftp-0.7-r6.ebuild deleted file mode 100644 index 64badd5fa1e9..000000000000 --- a/net-ftp/atftp/atftp-0.7-r6.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools flag-o-matic systemd - -DEBIAN_PV="11" -DEBIAN_A="${PN}_${PV}-${DEBIAN_PV}.diff" - -DESCRIPTION="Advanced TFTP implementation client/server" -HOMEPAGE="https://sourceforge.net/projects/atftp/" -SRC_URI="mirror://sourceforge/${PN}/${P}.dfsg.tar.gz - mirror://debian/pool/main/a/${PN}/${DEBIAN_A}.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 ~s390 sparc x86" -IUSE="selinux tcpd readline pcre" - -DEPEND="tcpd? ( sys-apps/tcp-wrappers ) - readline? ( sys-libs/readline:0= ) - pcre? ( dev-libs/libpcre )" -RDEPEND="${DEPEND} - !net-ftp/netkit-tftp - !net-ftp/tftp-hpa - !net-ftp/uftpd - selinux? ( sec-policy/selinux-tftp )" - -PATCHES=( - "${WORKDIR}/${DEBIAN_A}" - "${FILESDIR}/${P}-pcre.patch" - "${FILESDIR}/${P}-password.patch" - "${FILESDIR}/${P}-tests.patch" - "${FILESDIR}/${P}-glibc24.patch" - "${FILESDIR}/${P}-blockno.patch" - "${FILESDIR}/${P}-spaced_filename.patch" - "${FILESDIR}/${P}-illreply.patch" - "${FILESDIR}/${P}-CFLAGS.patch" -) - -src_unpack() { - default - mv atftp-0.7.dfsg atftp-0.7 || die -} - -src_prepare() { - append-cppflags -D_REENTRANT -DRATE_CONTROL - # fix #561720 by restoring pre-GCC5 inline semantics - append-cflags -std=gnu89 - - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable tcpd libwrap) \ - $(use_enable readline libreadline) \ - $(use_enable pcre libpcre) \ - --enable-mtftp -} - -src_install() { - default - - newinitd "${FILESDIR}"/atftp.init atftp - newconfd "${FILESDIR}"/atftp.confd atftp - - systemd_dounit "${FILESDIR}"/atftp.service - systemd_install_serviced "${FILESDIR}"/atftp.service.conf - - dodoc README* BUGS FAQ Changelog INSTALL TODO - dodoc "${S}"/docs/* - - docinto test - cd "${S}"/test || die - dodoc load.sh mtftp.conf pcre_pattern.txt test.sh test_suite.txt -} diff --git a/net-ftp/atftp/atftp-0.7.2-r1.ebuild b/net-ftp/atftp/atftp-0.7.2-r1.ebuild index 5a2c3723d44a..ed32bfa406cf 100644 --- a/net-ftp/atftp/atftp-0.7.2-r1.ebuild +++ b/net-ftp/atftp/atftp-0.7.2-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/atftp/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm ppc ppc64 ~s390 ~sparc x86" IUSE="selinux tcpd readline pcre" DEPEND="tcpd? ( sys-apps/tcp-wrappers ) diff --git a/net-ftp/atftp/files/atftp-0.7-CFLAGS.patch b/net-ftp/atftp/files/atftp-0.7-CFLAGS.patch deleted file mode 100644 index 566c1791c591..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-CFLAGS.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- atftp-0.7/configure.ac -+++ atftp-0.7/configure.ac -@@ -66,29 +66,6 @@ - dnl Check for AIX - AC_AIX - --CFLAGS="-g -Wall -D_REENTRANT" -- --if test x$debug = xtrue; then -- CFLAGS="$CFLAGS -O0 -DDEBUG" --else -- if test -n "$auto_cflags"; then -- if test -n "$GCC"; then -- CFLAGS="$CFLAGS -g -O2 -Wall -Wno-implicit" -- else -- case "$host_os" in -- *hpux*) CFLAGS="$CFLAGS +O3" -- ;; -- *ultrix* | *osf*) CFLAGS="$CFLAGS -O -Olimit 2000" -- ;; -- *) CFLAGS="$CFLAGS -O2" -- ;; -- esac -- fi -- else -- CFLAGS="$CFLAGS -O2" -- fi --fi -- - AC_PROG_MAKE_SET - AC_PROG_INSTALL - diff --git a/net-ftp/atftp/files/atftp-0.7-blockno.patch b/net-ftp/atftp/files/atftp-0.7-blockno.patch deleted file mode 100644 index 6a3184f98bec..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-blockno.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- atftp-0.7/tftp_file.c~ 2010-05-27 13:05:12.000000000 -0500 -+++ atftp-0.7/tftp_file.c 2010-05-27 12:50:05.000000000 -0500 -@@ -133,19 +133,21 @@ - int mcast_sockfd = 0; - struct sockaddr_in sa_mcast; - struct ip_mreq mreq; - struct hostent *host; - int master_client = 0; - unsigned int file_bitmap[NB_BLOCK]; - int prev_bitmap_hole = -1; /* the previous hole found in the bitmap */ - char string[MAXLEN]; -+ int rx_block_number; - - int prev_block_number = 0; /* needed to support netascii convertion */ - int temp = 0; -+ size_t ignore; - - data->file_size = 0; - tftp_cancel = 0; - from.sin_addr.s_addr = 0; - - memset(&sa_mcast, 0, sizeof(struct sockaddr_in)); - memset(&file_bitmap, 0, sizeof(file_bitmap)); - -@@ -300,17 +302,17 @@ - { - connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); - connected = 1; - } - state = S_OACK_RECEIVED; - break; - case GET_ERROR: - fprintf(stderr, "tftp: error received from server <"); -- fwrite(tftphdr->th_msg, 1, data_size - 4 - 1, stderr); -+ ignore = fwrite(tftphdr->th_msg, 1, data_size - 4 - 1, stderr); - fprintf(stderr, ">\n"); - state = S_ABORT; - break; - case GET_DATA: - number_of_timeout = 0; - /* if the socket if not connected, connect it */ - if (!connected) - { -@@ -513,21 +515,24 @@ - state = S_WAIT_PACKET; - break; - case S_DATA_RECEIVED: - if ((multicast && master_client) || (!multicast)) - timeout_state = S_SEND_ACK; - else - timeout_state = S_WAIT_PACKET; - -- block_number = ntohs(tftphdr->th_block); -+ rx_block_number = ntohs(tftphdr->th_block); - if (data->trace) - fprintf(stderr, "received DATA <block: %d, size: %d>\n", - ntohs(tftphdr->th_block), data_size - 4); - -+ if ((uint16_t)rx_block_number == (uint16_t)(block_number+1)) -+ ++block_number; -+ - if (tftp_file_write(fp, tftphdr->th_data, data->data_buffer_size - 4, block_number, - data_size - 4, convert, &prev_block_number, &temp) - != data_size - 4) - { - - fprintf(stderr, "tftp: error writing to file %s\n", - data->local_file); - tftp_send_error(sockfd, &sa, ENOSPACE, data->data_buffer, -@@ -613,19 +618,21 @@ - int connected; /* 1 when sockfd is connected */ - struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; - FILE *fp; /* the local file pointer */ - int number_of_timeout = 0; - struct stat file_stat; - int convert = 0; /* if true, do netascii convertion */ - char string[MAXLEN]; - -+ int ack_block_number; - int prev_block_number = 0; /* needed to support netascii convertion */ - int prev_file_pos = 0; - int temp = 0; -+ size_t ignore; - - data->file_size = 0; - tftp_cancel = 0; - from.sin_addr.s_addr = 0; - - /* make sure the socket is not connected */ - sa.sin_family = AF_UNSPEC; - connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); -@@ -759,20 +766,23 @@ - case GET_ACK: - number_of_timeout = 0; - /* if the socket if not connected, connect it */ - if (!connected) - { - //connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); - connected = 1; - } -- block_number = ntohs(tftphdr->th_block); -+ ack_block_number = ntohs(tftphdr->th_block); -+ if ((uint16_t)(block_number+1) == ack_block_number) -+ ++block_number; - if (data->trace) - fprintf(stderr, "received ACK <block: %d>\n", -- block_number); -+ ack_block_number); -+ - if ((last_block != -1) && (block_number > last_block)) - { - state = S_END; - break; - } - state = S_SEND_DATA; - break; - case GET_OACK: -@@ -782,17 +792,17 @@ - { - //connect(sockfd, (struct sockaddr *)&sa, sizeof(sa)); - connected = 1; - } - state = S_OACK_RECEIVED; - break; - case GET_ERROR: - fprintf(stderr, "tftp: error received from server <"); -- fwrite(tftphdr->th_msg, 1, data_size - 4 - 1, stderr); -+ ignore = fwrite(tftphdr->th_msg, 1, data_size - 4 - 1, stderr); - fprintf(stderr, ">\n"); - state = S_ABORT; - break; - case GET_DISCARD: - /* consider discarded packet as timeout to make sure when don't lock up - if routing is broken */ - number_of_timeout++; - fprintf(stderr, "tftp: packet discard <%s:%d>.\n", diff --git a/net-ftp/atftp/files/atftp-0.7-glibc24.patch b/net-ftp/atftp/files/atftp-0.7-glibc24.patch deleted file mode 100644 index 195aec69b021..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-glibc24.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- atftp-0.7/stats.c.org -+++ atftp-0.7/stats.c -@@ -18,6 +18,7 @@ - - #include <limits.h> - #include <string.h> -+#include <unistd.h> - #include "tftp_def.h" - #include "stats.h" - #include "logger.h" -@@ -157,8 +158,9 @@ - - logger(LOG_INFO, " Load measurements:"); -+ long sc_clk_tck = sysconf(_SC_CLK_TCK); - logger(LOG_INFO, " User: %8.3fs Sys:%8.3fs", -- (double)(s_stats.tms.tms_utime) / CLK_TCK, -- (double)(s_stats.tms.tms_stime) / CLK_TCK); -+ (double)(s_stats.tms.tms_utime) / sc_clk_tck, -+ (double)(s_stats.tms.tms_stime) / sc_clk_tck); - logger(LOG_INFO, " Total:%8.3fs CPU:%8.3f%%", - (double)(tmp.tv_sec + tmp.tv_usec * 1e-6), - (double)(s_stats.tms.tms_utime + s_stats.tms.tms_stime) / diff --git a/net-ftp/atftp/files/atftp-0.7-illreply.patch b/net-ftp/atftp/files/atftp-0.7-illreply.patch deleted file mode 100644 index 0f1cacd9b955..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-illreply.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** atftp-0.7/tftp_def.old.c 2009-02-28 17:56:12.000000000 +0100 ---- atftp-0.7/tftp_def.c 2009-02-28 17:57:02.000000000 +0100 -*************** -*** 141,146 **** ---- 141,147 ---- - */ - inline char *Strncpy(char *to, const char *from, size_t size) - { -+ if (size <= 0) { *to = '\000'; return to; } - to[size-1] = '\000'; - return strncpy(to, from, size - 1); - } diff --git a/net-ftp/atftp/files/atftp-0.7-password.patch b/net-ftp/atftp/files/atftp-0.7-password.patch deleted file mode 100644 index 26b59085dde5..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-password.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -Naur atftp-0.7.orig/tftp.c atftp-0.7/tftp.c ---- atftp-0.7.orig/tftp.c 2004-03-15 18:55:56.000000000 -0500 -+++ atftp-0.7/tftp.c 2005-08-29 21:40:06.000000000 -0400 -@@ -525,6 +525,10 @@ - fprintf(stderr, " multicast: enabled\n"); - else - fprintf(stderr, " multicast: disabled\n"); -+ if (data.tftp_options[OPT_PASSWORD].specified) -+ fprintf(stderr, " password: enabled\n"); -+ else -+ fprintf(stderr, " password: disabled\n"); - return ERR; - } - /* if disabling an option */ -@@ -971,6 +975,7 @@ - { "put", 0, NULL, 'p'}, - { "local-file", 1, NULL, 'l'}, - { "remote-file", 1, NULL, 'r'}, -+ { "password", 1, NULL, 'P'}, - { "tftp-timeout", 1, NULL, 'T'}, - { "mode", 1, NULL, 'M'}, - { "option", 1, NULL, 'O'}, -@@ -993,7 +998,7 @@ - }; - - /* Support old argument until 0.8 */ -- while ((c = getopt_long(argc, argv, /*"gpl:r:Vh"*/ "gpl:r:Vht:b:sm", -+ while ((c = getopt_long(argc, argv, /*"gpl:r:Vh"*/ "gpl:r:Vht:b:smP:", - options, &option_index)) != EOF) - { - switch (c) -@@ -1028,6 +1033,11 @@ - else - action = PUT; - break; -+ case 'P': -+ snprintf(string, sizeof(string), "option password %s", optarg); -+ make_arg(string, &ac, &av); -+ process_cmd(ac, av); -+ break; - case 'l': - interactive = 0; - Strncpy(local_file, optarg, MAXLEN); -@@ -1169,6 +1179,7 @@ - " -p, --put : put file\n" - " -l, --local-file <file> : local file name\n" - " -r, --remote-file <file> : remote file name\n" -+ " -P, --password <password>: specify password (Linksys ext.)\n" - " --tftp-timeout <value> : delay before retransmission, client side\n" - #if 0 - " t, --timeout <value> : delay before retransmission, " -diff -Naur atftp-0.7.orig/tftp_def.c atftp-0.7/tftp_def.c ---- atftp-0.7.orig/tftp_def.c 2004-02-12 22:16:09.000000000 -0500 -+++ atftp-0.7/tftp_def.c 2005-08-29 21:36:57.000000000 -0400 -@@ -37,6 +37,7 @@ - { "timeout", "5", 0, 1 }, /* 2348, 2349, 2090. */ - { "blksize", "512", 0, 1 }, /* This is the default option */ - { "multicast", "", 0, 1 }, /* structure */ -+ { "password", "", 0, 1}, /* password */ - { "", "", 0, 0} - }; - -diff -Naur atftp-0.7.orig/tftp_def.h atftp-0.7/tftp_def.h ---- atftp-0.7.orig/tftp_def.h 2004-02-12 22:16:09.000000000 -0500 -+++ atftp-0.7/tftp_def.h 2005-08-29 20:16:27.000000000 -0400 -@@ -40,6 +40,7 @@ - #define OPT_TIMEOUT 3 - #define OPT_BLKSIZE 4 - #define OPT_MULTICAST 5 -+#define OPT_PASSWORD 6 - #define OPT_NUMBER 7 - - #define OPT_SIZE 12 -diff -Naur atftp-0.7.orig/tftp_io.c atftp-0.7/tftp_io.c ---- atftp-0.7.orig/tftp_io.c 2004-02-18 20:30:00.000000000 -0500 -+++ atftp-0.7/tftp_io.c 2005-08-29 22:05:11.000000000 -0400 -@@ -70,10 +70,13 @@ - break; - if (tftp_options[i].enabled && tftp_options[i].specified) - { -- Strncpy(data_buffer + buf_index, tftp_options[i].option, -- data_buffer_size - buf_index); -- buf_index += strlen(tftp_options[i].option); -- buf_index++; -+ if (i != OPT_PASSWORD) -+ { -+ Strncpy(data_buffer + buf_index, tftp_options[i].option, -+ data_buffer_size - buf_index); -+ buf_index += strlen(tftp_options[i].option); -+ buf_index++; -+ } - Strncpy(data_buffer + buf_index, tftp_options[i].value, - data_buffer_size - buf_index); - buf_index += strlen(tftp_options[i].value); diff --git a/net-ftp/atftp/files/atftp-0.7-pcre.patch b/net-ftp/atftp/files/atftp-0.7-pcre.patch deleted file mode 100644 index 1f24b67471e2..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-pcre.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- atftp-0.7/tftpd_pcre.c~ 2005-10-17 23:14:52.000000000 +0200 -+++ atftp-0.7/tftpd_pcre.c 2005-10-17 23:14:52.000000000 +0200 -@@ -211,9 +211,9 @@ - chp++; /* point to value indicating substring */ - rc = pcre_get_substring(str, ovector, matches, *chp - 0x30, &tmpstr); - /* found string */ -- if (rc > 0) -+ if (rc > 0 && outchp - outstr + rc+1 < outsize) - { -- Strncpy(outchp, tmpstr, rc); -+ Strncpy(outchp, tmpstr, rc+1); - outchp += rc; - pcre_free_substring(tmpstr); - continue; diff --git a/net-ftp/atftp/files/atftp-0.7-spaced_filename.patch b/net-ftp/atftp/files/atftp-0.7-spaced_filename.patch deleted file mode 100644 index da96d9f6b820..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-spaced_filename.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- atftp-0.7/tftp.c~ 2010-06-03 08:51:14.000000000 -0500 -+++ atftp-0.7/tftp.c 2010-06-03 09:40:56.000000000 -0500 -@@ -18,16 +18,17 @@ - #include "config.h" - - #include <stdio.h> - #include <stdlib.h> - #include <string.h> - #include <unistd.h> - #include <getopt.h> - #include <string.h> -+#include <stdarg.h> - - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> - #include <netdb.h> - - #include <signal.h> -@@ -344,16 +345,41 @@ - - /* If no names matched, then return NULL. */ - return NULL; - } - # endif - #endif - - /* -+ * set argc/argv from variadic string arguments -+*/ -+void make_arg_vector(int *argc, char***argv, ...) -+{ -+ char **p; -+ char *s; -+ va_list argp; -+ -+ // how many args? -+ *argc = 0; -+ va_start(argp, argv); -+ while ( (s=va_arg(argp, char*)) ) -+ ++*argc; -+ -+ // allocate storage -+ *argv = malloc(*argc * sizeof (char*)); -+ -+ // store args -+ p = *argv; -+ va_start(argp, argv); -+ while ( (s=va_arg(argp, char*)) ) -+ *p++ = s; -+} -+ -+/* - * Split a string into args. - */ - void make_arg(char *string, int *argc, char ***argv) - { - static char *tmp = NULL; - size_t argz_len; - - /* split the string to an argz vector */ -@@ -1142,30 +1168,26 @@ - argv[optind+1]); - make_arg(string, &ac, &av); - process_cmd(ac, av); - } - - if (!interactive) - { - if (action == PUT) -- snprintf(string, sizeof(string), "put %s %s", local_file, -- remote_file); -+ make_arg_vector(&ac,&av,"put",local_file,remote_file,NULL); - else if (action == GET) -- snprintf(string, sizeof(string), "get %s %s", remote_file, -- local_file); -+ make_arg_vector(&ac,&av,"get",remote_file,local_file,NULL); - else if (action == MGET) -- snprintf(string, sizeof(string), "mget %s %s", remote_file, -- local_file); -+ make_arg_vector(&ac,&av,"mget",remote_file,local_file,NULL); - else - { - fprintf(stderr, "No action specified in batch mode!\n"); - exit(ERR); - } -- make_arg(string, &ac, &av); - if (process_cmd(ac, av) == ERR) - exit(ERR); - } - return OK; - } - - void tftp_usage(void) - { diff --git a/net-ftp/atftp/files/atftp-0.7-tests.patch b/net-ftp/atftp/files/atftp-0.7-tests.patch deleted file mode 100644 index 9e087950e659..000000000000 --- a/net-ftp/atftp/files/atftp-0.7-tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur atftp-0.7.orig/test/test.sh atftp-0.7/test/test.sh ---- atftp-0.7.orig/test/test.sh 2003-04-28 21:59:51.000000000 -0400 -+++ atftp-0.7/test/test.sh 2005-10-26 22:42:15.000000000 -0400 -@@ -151,7 +151,7 @@ - test_blocksize 1428 - test_blocksize 16000 - test_blocksize 64000 --test_blocksize 65465 -+test_blocksize 65464 - - # - # testing fot tsize -@@ -162,9 +162,9 @@ - TSIZE=`grep "OACK <tsize:" out | sed -e "s/[^0-9]//g"` - if [ "$TSIZE" != "2048" ]; then - echo "ERROR (server report $TSIZE bytes but it should be 2048)" -+ ERROR=1 - else - echo "OK" -- ERROR=1 - fi - - # diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest index 04dc88f3b286..d75b297c4efa 100644 --- a/net-ftp/filezilla/Manifest +++ b/net-ftp/filezilla/Manifest @@ -3,13 +3,13 @@ AUX filezilla-3.47.0-metainfo.patch 309 BLAKE2B b36d7f3e5446c76cc9e20be01b3a5005 DIST FileZilla_3.39.0_src.tar.bz2 4995713 BLAKE2B d89aaa1f57187cd926ae1c4dd34624b404baa291334c652293d2dcfaedc4a5dffb401f8727b5d5d1fb483bdd503f35124efb75bdd7dd750d68e517fcb57fb8c0 SHA512 a0360634517ffd07878082abae024dbb4896035edcbd9abe6d8adfc9d37b73d01d95f6c5ca031175d88b6e4badefafcc43b5ddce3d9dbddde4deab5f0cc97e83 DIST FileZilla_3.44.2_src.tar.bz2 4619337 BLAKE2B 11d61b14fcf464706dabe491fa8cbfa28fb516c3e1aafd887679ed6f1a80ba835dc43403c32b1344854f00f5b56f7e27c72bbca197cfadc92e69d92ebb0b1458 SHA512 9d4678a3a06f0ecac5ecfbae33f83df5f07e26da4f4a7e922fe5b00a5e59d5728af028667f6fa56210a23ecaa1c2a661d1874b218c2511a783644ed2b03e36ad DIST FileZilla_3.45.1_src.tar.bz2 4649083 BLAKE2B 8d3113e5ce96d2115a6ec02109f2617d3d58109464c527284baecacea733d2f564206779cd32be4060171d7fcd8768b0296b445842b8c2964b173ca360983082 SHA512 feb267b85ad2843baea0c6df66ed86866121f33e2295fcb9003a8bc2603ad684f4fe801ea842cb291e3fb5cd7195ccb2d21bfa95711a61be6b4debfd4e1c7822 -DIST FileZilla_3.46.0_src.tar.bz2 4661100 BLAKE2B ccda60b590e85afd7de0edd064ee7b993e663e43643f262378db6d26a019730ec493518e0e2b39bce0710acafe888f47f84ecb098e35d3b32061f089a99a6a30 SHA512 26ffb039b4a6d51d6d1011ee452f3690f74514c91a9e58c79880dbf778296cfc81283fade52f65f81654b828449e2b7e703b1d6c1e2e84c08f54681d2aa92674 DIST FileZilla_3.46.3_src.tar.bz2 4720329 BLAKE2B 92369d2fb3b8c9eded37f912bbd25a0e995a5fc1ab86ef6aa746a8eb239f17e8fafa78de00529b0f3af102fe268b51a60ce40ac967cf9b2fbbd6fa7900898ffc SHA512 35b61c3bfd1d40848e7846b4533da8844df0e4873cb89286b90330cbc29dffeff96fcab10aec908a08d9129198bb2d80df8f223d8ebc1a0863a4083cb06abffc DIST FileZilla_3.47.1_src.tar.bz2 4732088 BLAKE2B 3db5247a9e2d9a7bf296091317b8faf049dbe9dca328536671dba5e5ab7b32d16d273348d0cbcf89342262a34dcf7d90198b4dfb98e67bfb683febf07b7b680e SHA512 32573e847bc23acb86bdea8eb4de102e4f673465e0b86738d954b47eacdf6e534854a9065bddf8b586eba315bf65b1bfc4f17f9379819a6c9bd43ae6ed8f388a +DIST FileZilla_3.47.2.1_src.tar.bz2 4733941 BLAKE2B 0517d43bfba8aa116ae4031d56e5070aadbcaf81ace2311f6cfddb47e7f67ec62396ae3690c139bcc1a8368be690776b3163dd6d53a6ebb27ee5e99300b3c67b SHA512 8919eab7762e0e30241637a8978fbf61f02ac4c52aac293191315b931d52b41ae228b753f4e3b7530835578836dfee7f91772841273e9fc2bdf75ff7ed48fafc EBUILD filezilla-3.39.0.ebuild 1830 BLAKE2B f3456ceeac58ed5fb0ebdb16091bdfd64282112179c74849cdef2750ef8b70217a747945f193b4852568c0cd7d022e155e3d5a9e8c829162c4405a09fce05576 SHA512 76ecbf6aee36f8000fdbcdfdee9fbc55628c5b6885148d4726a3cdc64be9a21272c0351fd39315fb54aea7215d7a5b5f71828fb7359aae201a5422f8a9c4ce5d EBUILD filezilla-3.44.2.ebuild 1884 BLAKE2B 5175bcabdcbb34dc8c6c2ee967b4aa2a487f04a5148469656b8f8014e325d5055cef22103d808a92d2323549b02d1b2cc8fd3a02fed89109ba604b36f378596d SHA512 25ca53bffa1e9729e4f9f3613f7b81582842fdd1bd076905a841bf1f993b8564d67833691316281f4603a6c93ac573ec626431e334d7f2de6d97a09ccb3d2485 EBUILD filezilla-3.45.1.ebuild 1888 BLAKE2B 3a89bb7289cdb392e74572a707621c30afbdfacb3cb93510d18683a07039b286ede6ee8b62c63ee64f1c31bf1bc80f959a0fbbbcbbf2452cc46b87abf3c50c6b SHA512 ff7bdce8a143dd46860cd112283f69e02251b79879c12e850945b0f03af97bcbfac4400b789cc045c735d01bd2fde9203e58a0019fe2fe502a318fdb29dd1e51 -EBUILD filezilla-3.46.0.ebuild 1888 BLAKE2B 9682974c356117d373fa3b0db1f702689e779703152651190d5d667131cd6f2c573943e485d79221e2c86d5bb751035df2f91bccad436e93ab2fc37e002c13ce SHA512 cc272b8acdb871132fba72529fd3afcedae057502da09eb00b4740e21dda814a68d534c3697ceabaa288382cf266877abacbdd78a5082a39a7afc89b482a1be6 EBUILD filezilla-3.46.3.ebuild 1895 BLAKE2B 62393dba06d50ec02917d54851592ae850b4a919c9e85137684904fe913be20e2cff1b00a547e237fcb556204e6f8ebc33043c61dea30b5b5fbf19ba17ea8b02 SHA512 53f08f568ae779249224d664c48093663cf00c0f6fdfd0020283da2713c44fd104ddf7349815b5bae3e21709f459f62c1bc858ef11c2bce1527de99d400cd0c3 -EBUILD filezilla-3.47.1.ebuild 1938 BLAKE2B 6ed7c1e29b623d3a27847ed154b4db6ba0decc1b0e5f32099d36656f88daae0823bc29aabc7ac250149e62aa506dfeb8146f3b39bfab250f5bfeeba679eaa001 SHA512 939329857bcc97baa25909bf39639b46b8a22ed09202a0e26d53a9d468d616ab3f165fc05cd7f9ae6063ffe57ca570cc603b3776a62c04662761b4f955ffc4f8 +EBUILD filezilla-3.47.1.ebuild 1938 BLAKE2B dfa4d3964806042458fa10d8e01e4fb3c3d89fcd37bdbdf54d9820d3d05add1c2a3a3f145ed13a8852a21039e1dbea2fa6738692ec9402af747e2280839d55f0 SHA512 17267be9cf6b2c46c0a95b82920d095190867dfef4829caa5a719c4d354040e8e544ac1c68b84dc5bb5306dc413ec191946215c53171302c86f14c0824802a6a +EBUILD filezilla-3.47.2.1.ebuild 1938 BLAKE2B 92452ac6f88f795c89879960501abdae16afc58e864f5f759838be245ea4fea0a8c06a85a1d7890c1e8b5415451a8b08d4d79e7e420329e9e93dd3ea5d4259da SHA512 c74dc961e3fb51d06aff66a913ac812173ea7cf6748cd3a609b7f06002daa176a80df27af9b8f9f4e91d84431cb41b8b5c863890d5cad26b0dbc8c722b2dfd7d MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544 diff --git a/net-ftp/filezilla/filezilla-3.47.1.ebuild b/net-ftp/filezilla/filezilla-3.47.1.ebuild index 9f99a47ff441..9781e040e7d5 100644 --- a/net-ftp/filezilla/filezilla-3.47.1.ebuild +++ b/net-ftp/filezilla/filezilla-3.47.1.ebuild @@ -24,7 +24,7 @@ RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.20.0:= - <dev-libs/libfilezilla-0.21.0:= + <dev-libs/libfilezilla-0.20.2:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X] diff --git a/net-ftp/filezilla/filezilla-3.46.0.ebuild b/net-ftp/filezilla/filezilla-3.47.2.1.ebuild index 16d30fb6b0ee..0d2c7ce5cccf 100644 --- a/net-ftp/filezilla/filezilla-3.46.0.ebuild +++ b/net-ftp/filezilla/filezilla-3.47.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,15 +16,15 @@ SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" IUSE="dbus nls test" # pugixml 1.7 minimal dependency is for c++11 proper configuration RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 - >=dev-libs/libfilezilla-0.19.1:= - <dev-libs/libfilezilla-0.20.0:= + >=dev-libs/libfilezilla-0.20.2:= + <dev-libs/libfilezilla-0.21.0:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X] @@ -44,6 +44,7 @@ DOCS=(AUTHORS ChangeLog NEWS ) PATCHES=( "${FILESDIR}"/${PN}-3.22.1-debug.patch + "${FILESDIR}"/${PN}-3.47.0-metainfo.patch ) pkg_pretend() { diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest index 8363d4921361..7f93b8cfcf99 100644 --- a/net-ftp/frox/Manifest +++ b/net-ftp/frox/Manifest @@ -1,8 +1,9 @@ AUX 0.7.18-netfilter-includes.patch 552 BLAKE2B 32f7e081f64a76ca4a62d6dc13e8d9ff458048e6932b664c31f6685c7700f77ae27a433e8045136a4cd11b177a9a683f7e84c62760126d261ec2f8374f24dac7 SHA512 3dbed66a3602736f881ca993b416731112bcdd9885f9b9f8d05f573e748dcbd43d118f3b97d4689ad17695e52d6c7e94e2e72e04921f19ec4af181f16e9361aa AUX 0.7.18-respect-CFLAGS.patch 332 BLAKE2B 14e47c8f0362bb69293163f9f1964cfbf494fe947e25698cd0f45164927a078c982a491bad302e0d4c2e3a521209f25cdb92437b1d9f2eaa2e8b829920da0952 SHA512 88c6efab38aaf9cf58e77d4c6f677f66920f9a48fcd964ac4e02a471a805b41ad85949bc7134eff715254235be77b8056f03d031dcf310fd883c37eb820942b3 AUX frox-0.7.18-config.patch 1960 BLAKE2B a6ca1b8bd15f39a3dc5b3b10cb4a578447ce306f9f82262e99ead6a57bceb007da44172648e66fde609e4c71c839625b4ca28b35d8fd8750d8b9b0334f0a7b82 SHA512 69210560adaa38cc94960f4e76ba4ae9f20b5044c0d3d84e835a107554ae3f5315f9463c7730ada716c63615cab782d140e8df8c2b9f9bcf6e844a7bd7033666 +AUX frox-0.7.18-no-common.patch 1644 BLAKE2B a84e686a1bffa8d8adb92bbc030b1fa61df6dd978f84490f48e102e9fcc3efbd77b3cbf09071ca7c1dcf15bb20cd149c576680d7705beb4c8814bc15e8afbc44 SHA512 99c2157206f1cf14bb5bef5b2fef656c4322077363d531c2798091d871e1931a81df8dd5a21f9b57ecba22c5379ad72ddf36c10d78e9efcdfee7e1e29fbf6108 AUX frox.initd 873 BLAKE2B 1f4182a11bd42d091b9d6cbba4b2115327766787f329c6c113e43070f8fc6a8867017bdf009a2c97a94b16e958888384dc604dfc06ecf5df0cc711f212b11d76 SHA512 26bc18f28cf46184b0c387196958f9236ec0cd70fe43ac8b18de66e69c42d73087ed5063f3ecc1b1d5c0880b2047293403e4cfbb15f5a23ca5d6fc521021f364 DIST frox-0.7.18.tar.bz2 173355 BLAKE2B 70e51ef14fd16dfeb8c2b8c42acf32b4fc8456622f6258aca7faee49e59ccd4e3cb563620a50a4cb877401d9154311dd2f88e76a94c48974bf9b77ad558a6d9f SHA512 bdffe4b70c91b920378a422dcf386088c3bb34f26e10de8ff57f487ccef6356803c93057eee2b3801a79120a6b2e1618a51dde5bc8c42e13211abf4182c4ff8c EBUILD frox-0.7.18-r5.ebuild 1863 BLAKE2B 48fba76ac94415e82046d0486d9afe2c4b84a6e2e1694b7a30b9bda22ee70a373fa1a055fa5ac8865d0a344a85e8b9dcc7fa3dc892e8ac96239476dc843be63f SHA512 3490ec5fd9d7e25825b8d69ee23113dc565b2d7925b335441ce0b2b54051ce7d1d75e148a23f7471d90dec0d85af0ed8e78233c141f067183e28d5418f1acf98 -EBUILD frox-0.7.18-r6.ebuild 1972 BLAKE2B 003ece373a12d8e295d874b1d042455d5878c5c2d240351c22e27db03c06086c75e75eef21423e1328a265e0d17d01b7cb9078c42a2865ad2abb72179966e4fc SHA512 883072a3b61878ee675f4c0093ae0358b948c99e0f4814c2d545cb44ce62fccd63c0dcc6ecb99705a96946d00cecba3d476633a4ade6dc7b2e72cae8b846b612 -MISC metadata.xml 656 BLAKE2B 0df7615c3cc7c5abf83bd69242e2ef175436f184858a7c7501f9328ff29a0c131622142ff89764069de5c3a90299b46b9192b8152bad3f00578722349cb0ce07 SHA512 c4e9a07f7e868c032e8830b70d3ccc876a54d685790e74aac5ea5554710af473004a176ffb9501e87fa6b32010464e274a111f34f318e12be97f86a96df58f3a +EBUILD frox-0.7.18-r6.ebuild 2015 BLAKE2B 0aee6ae2281032f87a418a3447a9ce53365d7c77d92d632f7283afba8f77bc2a9a25f72bdc115b2a9d7d63b02bec467b828ca9ff9002184dec8c50c32c6c1a70 SHA512 6651750ae788cbf944eab85a543567de946144067be94ae671f1f232e9cfef03f8d65643b68c07eb99b3f4b5dd5b636ab431623c8ce493d352ec79375baa0cc4 +MISC metadata.xml 593 BLAKE2B 65aeb3bac2df8a84512c91c24632a9d4b744344c95afe91c1631d442bcef11d19f922eb61ad85052ec14e9908bbbbe43f57a20a89a4fa39e3b8591734fc09bd6 SHA512 eb6aa83ad2cafe20d5348ff946f4f8d9c8b24dea6c0cd43de4ca9cfb27cd134e595874f09576a156b0936add5dab9b3924bbee40605095da899f28ced299943f diff --git a/net-ftp/frox/files/frox-0.7.18-no-common.patch b/net-ftp/frox/files/frox-0.7.18-no-common.patch new file mode 100644 index 000000000000..ef2e72898aca --- /dev/null +++ b/net-ftp/frox/files/frox-0.7.18-no-common.patch @@ -0,0 +1,63 @@ +Fix compilation with -fno-common (default for GCC 10) + +Signed-off-by: Marek Behún kabel@blackhole.sk> +--- +diff --git a/lib/sstrlib/sstr_private.h b/lib/sstrlib/sstr_private.h +--- a/lib/sstrlib/sstr_private.h ++++ b/lib/sstrlib/sstr_private.h +@@ -32,6 +32,6 @@ struct _sstr { + }; + + int sstr_alloc_space(sstr * p, int len); +-void (*on_error) (void); ++extern void (*on_error) (void); + + #endif /*SSTR_PRIVATE_H */ +diff --git a/src/common.h b/src/common.h +--- a/src/common.h ++++ b/src/common.h +@@ -184,7 +184,7 @@ typedef struct _session_info { + /******************* + **Global Variables** + ********************/ +-session_info *info; ++extern session_info *info; + extern pid_t cmgrpid, tdatapid; + + #endif /* COMMON_H */ +diff --git a/src/ftp-cmds.c b/src/ftp-cmds.c +--- a/src/ftp-cmds.c ++++ b/src/ftp-cmds.c +@@ -38,6 +38,8 @@ void xfer_command(sstr * cmd, sstr * arg + void cwd_command(sstr * cmd, sstr * arg); + void pasv_reply(sstr * msg); + ++struct cmd_struct *ftp_cmds; ++ + void ftpcmds_init() + { + static struct cmd_struct list[] = { /*Pinched in part SUSE */ +diff --git a/src/ftp-cmds.h b/src/ftp-cmds.h +--- a/src/ftp-cmds.h ++++ b/src/ftp-cmds.h +@@ -33,7 +33,7 @@ struct cmd_struct { + void (*cmd) (sstr * cmd, sstr * arg); + }; + +-struct cmd_struct *ftp_cmds; ++extern struct cmd_struct *ftp_cmds; + void user_munge(sstr * cmd, sstr * arg); + + +diff --git a/src/main.c b/src/main.c +--- a/src/main.c ++++ b/src/main.c +@@ -62,6 +62,8 @@ static struct client_info { + void add_client(pid_t, struct sockaddr_in client); + void rm_client(pid_t pid); + ++session_info *info; ++ + #ifdef ENABLE_CHANGEPROC + int main(int argc, char *argv[], char *envp[]) + #else diff --git a/net-ftp/frox/frox-0.7.18-r6.ebuild b/net-ftp/frox/frox-0.7.18-r6.ebuild index 943286654f7b..0f3521729e32 100644 --- a/net-ftp/frox/frox-0.7.18-r6.ebuild +++ b/net-ftp/frox/frox-0.7.18-r6.ebuild @@ -45,6 +45,7 @@ src_prepare() { eapply "${FILESDIR}/${PV}-respect-CFLAGS.patch" eapply "${FILESDIR}/${PV}-netfilter-includes.patch" eapply "${FILESDIR}/${P}-config.patch" + eapply "${FILESDIR}/${P}-no-common.patch" if use clamav ; then sed -i -e "s:^# VirusScanner.*:# VirusScanner '\"/usr/bin/clamscan\" \"%s\"':" \ diff --git a/net-ftp/frox/metadata.xml b/net-ftp/frox/metadata.xml index 62cb681b803e..748515899f6e 100644 --- a/net-ftp/frox/metadata.xml +++ b/net-ftp/frox/metadata.xml @@ -12,7 +12,6 @@ <use> <flag name="transparent">Enable transparent proxying of data connections</flag> </use> - <longdescription>A transparent ftp proxy</longdescription> <upstream> <remote-id type="sourceforge">frox</remote-id> </upstream> diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest index 44495cd7e3b3..60cb968c92a0 100644 --- a/net-ftp/ftp/Manifest +++ b/net-ftp/ftp/Manifest @@ -1,5 +1,5 @@ DIST netkit-ftp-0.17-patches-2.tar.bz2 4307 BLAKE2B d7febb30807dab2dd66b6fe1991675b37cdea63703769f228895d7722f46b56dd2f5a7774d92740ff3f9ff7797a64660a580cb231582d2b9b912da35c209746a SHA512 6a9adfd33eae4ac2e1a9e070ed89467804dc484eda084694398bb7e3ebbaf04bf70d00ffaa637bace078c4c0024115ba3620fd75d4a3558a44dc991798885461 DIST netkit-ftp-0.17.tar.gz 53934 BLAKE2B 451f90f26cd5cc1a6693fea7c31d47127d8b89b4b00a2f863af61d46d87f6e416141db1c6f6bb320021665a99f0d9e00dc4a5c3b0bb209df0ae74aad97a45f20 SHA512 ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554 DIST netkit-ftp-ssl_0.17.23+0.2-1.debian.tar.gz 48189 BLAKE2B 7894f64308ae14c72e2fcf7e18225fa36680d2d88a3e59c4b7edac3669e051e3196a2acda3f8da083bd3d8405e9f28f67be10d70684854e8bbc7008f8189cb8d SHA512 c2fa882c185987298a73e7cef8c073ab0aee7627b60b412be90eef8619bf02d97721c15197fe4f443eab53bcca87876633924872f3102ef9e92dc7511c065228 -EBUILD ftp-0.17.23.0.2.1.ebuild 1555 BLAKE2B e32b63a0d5f1e2d88842da5b115f807bc0576b15bc1d3a31b86cda8050ba32c5d1a8aa92b5f7c24ec404478edd52334a85a36983e8f3e929233fc2c482339af2 SHA512 ae600f58f6bc3a741096bf3d27a0dba4afb8c1c3e8f868e385d546b9f38994062456338793625bd8bbe8e1eeda9eb0330adb19476514032ca56dcd79e7a29ea1 +EBUILD ftp-0.17.23.0.2.1.ebuild 1553 BLAKE2B d1b07bbeaecbe4c36a9136259f11306754424434a31ef9956e07f4c3811d0ddb45db059ea818c1ad0de6f8274d5607ebb64d1ea6a9b338f738aad2d93e084a36 SHA512 644376682f3728d9912a251aaad6da07503ada4dd6adc1b683043dce57764ee613f5be29ba3575699b3886f2d544ff1e11b18f705681fc1eb90d4edf21fe44f7 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild index 9b818719ad41..74f1d138b99e 100644 --- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild +++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild @@ -19,7 +19,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" IUSE="ipv6 libressl readline ssl" RDEPEND=" diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest index 9320da0f5624..4d040266c574 100644 --- a/net-ftp/ftpbase/Manifest +++ b/net-ftp/ftpbase/Manifest @@ -1,5 +1,5 @@ AUX ftp-pamd 700 BLAKE2B c867c659cac367c51021504dd4da0a9dc90609564613f580a0a01a94d2a87d0df903f22486561f23722901df4df06a33d7d7b643ffa4562cf426f2058391d887 SHA512 61aceee28610cb7a6989fca0ee82702df1118dd2e964bb26fe5cfcb508250599e9e1cdb9aa5dfb61df9c5fef25af4334a87d5f1f4065f693193912dfe172bb68 AUX ftp-pamd-include 632 BLAKE2B 28aa913499698f136e784e8ed420748fe1415d0ddeb64761b8ed71b869e4b9afb6b86df4b8a8a748ec3a740d99c000fcc4789ee45c3a302f81ffbaab07c7e106 SHA512 adc59c544b815bd88b7e91a43cb5620008d1f83d15a08620f56242d74991ba413e56b31bcca8e5fcfe71f05362bbad89b02d5289260f08649d38965c8951ec76 AUX ftpusers 300 BLAKE2B 02489b8eed29bfd4cea148b1b4214ac5ba798faa44da1be68cea06c18680e44f0054c952107810e4a199398b6ba382c649a481cf9d7388cd5caa10ace50e06d3 SHA512 29a8bdca1a6bb516c5189e6c69969cba3c220ea878e352e78bb6ea5cb2ac7476306736240155dc6d3f7512aac48164354db68721ea952d1010639e8ae14635e0 -EBUILD ftpbase-0.01-r3.ebuild 927 BLAKE2B 28db6fa82cf520b6cd42d0b451d92814a9212641e3b4937cb5d80d3218fbd3cb6bca4a224a3e00282488f2b3c7cb8d814dc79f6c1546a0bf68f2011641fec657 SHA512 5c76b17fb68f8c73e82473b5c59e678016a4a10fb8a77847356feb286697fa4d6cd8d019eb910fb0d308e29cf1f162e296a5859ec731af06348c161e126f8a88 +EBUILD ftpbase-0.01-r3.ebuild 925 BLAKE2B 998379d0b90a72a8f1a8bcb676c118474f639ac01a8df184b81c4f944a161e3f705fc42a96ad3d01c407b49a282e78b5f637239314d0ec6af4312bad52722c77 SHA512 0ca1c63f5cc85c2b0981c1925ad85961e3f202a3adcf56591ea3124d8821d84f8b715869ef191b10fd179537782c9c36f1e4a22258e0c3b1c6e42808a52ae8fa MISC metadata.xml 235 BLAKE2B da947ee7650abf01b4eee1667349a14d2d8d496ec234acd60db66c1059d42d6e9a1d30403068b7977a397f4e0a2934fe4e7c2c04d356b2c23a5e8a87ac7266a1 SHA512 fa78af8197737bd5d9b44305bac24dacac9034fd96284af1e3c89428fc418e17a4bea91fa53f07dce02e6ab8afe6455343db364d031ab342225a26d0364c23da diff --git a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild index af588e5b6ba0..5683be0aad22 100644 --- a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild +++ b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86" IUSE="pam" DEPEND="pam? ( sys-libs/pam ) diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest index fe704b072724..d05f01498c81 100644 --- a/net-ftp/lftp/Manifest +++ b/net-ftp/lftp/Manifest @@ -10,11 +10,12 @@ AUX lftp-4.8.2-libdir-openssl.patch 658 BLAKE2B 430dab0713f82c3c10ac7395b8ca9ca1 AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8370cdf511303df4b17346275d936ebfcb658262102c01e61e11861d69e4c54f45baeddb246c062f3c66eadf8b0bcd SHA512 4a47a2e63bfe80faa640edc92c645e89d5c0063c0adc992f0b0613e01cfa0599f61f9bd07568432673addb1a981f101c474b1a0d99fd50fced455c9700b886e6 AUX lftp-4.9.0-ipv6.patch 496 BLAKE2B 66ea52d0f7d23b851de91b96753a76d9269c09de1666252c2120fb0c362f411703ddc8c748e642b6e57165fcd7132d5d8b6573539340eb6b542b1a73e80f04e5 SHA512 e9c58552f7491c1fb8a1834c535330f68ab325e79cd474ab259d6d3297c36342a350a21aba39df00b58daf37f175736485c285035b1c903ee8afa19e82e50dba AUX lftp-4.9.1-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b +AUX lftp-9999-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1 DIST lftp-4.9.0.tar.xz 1642596 BLAKE2B 111e559c98e0572e1ca79f935a1db8c45c99275c8aa7b584be06d1738296b32808e97d696a02751575c5d1ea24a30a52f5d9f177a193f70addf1168e3208aa13 SHA512 8d83ea76390d38cb1f84f02eb7bf45780758afb9fe61f5b7278a48c9a5d216d03bc8b699c0f449a0036bdb441b4225af074da1b5e92a77ddb61aca704758211e DIST lftp-4.9.1.tar.xz 1648564 BLAKE2B 2f36dec3de01dd3f9e7316567912a04196732a1e71a4d1c3a5124471d2941673d7b58bc3182d73d3cf154def905f57d37667d33fedec6ea9434f74850aa64f4d SHA512 303e2354bd61a850403a02ac5b71e54719c12b026c7e36194a6382e9044f1fee93ea581ba0a55fea19981e07b896216e92c7d961c719350762eb0cfb51a2c506 -EBUILD lftp-4.8.4-r1.ebuild 2639 BLAKE2B 037859c6c642f2a523c8304d2a0f78ca981c323bcd04375890196e5d7ef73511a7b4cb75bf913cd7bc0ddff67a5b3a0fd501d4c5e7260b006d36b785d4791d47 SHA512 5268c73dfb4f6b4cc77ffd5a00a0b6019b2f196a32d86a61167702cb256b7564a384115fe714fe674c5a09c8cfc390d834404327382177c34f6158f92519b894 +EBUILD lftp-4.8.4-r1.ebuild 2640 BLAKE2B 1564537bc51ef422d739ac7142ec8d5b577a38103c48fc5e493c7bd84929b5acdeb4395a41fc41a99fcca2cef8bd2cf026c4b3d327a44171a71635211d08bda6 SHA512 e985116056491ea403f2741e4d741ee3c143abf797e5944edb3af3979f9117092a77aac474f618b0d461179c52ef814699fd208a1d19037a94fbd76f5b6d1f53 EBUILD lftp-4.9.0.ebuild 2685 BLAKE2B 9fe88b5dbdaf91a6f1ec1082aa88bcd71e0a27a2c2c98ecfab4c5b825793ba4ae82b732785327add1c37f5b3af52ef0f8d3d7a7d847b6449dc7172925492520c SHA512 1263601be64e0d5755bc6d26d2002e3922964700bc08e09e09ae893e23c369a8449fbb1377f8d228f0e09452929dc7ccfe9a83676d1b47650615b31b7de730bb EBUILD lftp-4.9.1.ebuild 2647 BLAKE2B fa80daecd6dde52a240315ab5e962858437aaca2facef16b39fe04e81115c14d4826a974a7f3c77611e3ce27b9a0c4e4a1640ed219da4bbf1e8893caa53af061 SHA512 f11cc44daa678b17d4345adae1ebcde1a3d7eac2a7b987227d40a2ed3c54254688a106af3e1c431e51c89f5b5fafed74581b6f65d47369b67218c56f504ec40e -EBUILD lftp-9999.ebuild 2438 BLAKE2B 4061f2513e9a5695288c66590604fafd4641280e9a72a4be1a60d5c9a6337088d082734291f9d54d35083cbff0c634b18495bcd7b963b09abc82a22d6f841a72 SHA512 71a5ab649e24cb8f49d686830bb3a0a56a0cd4cd15d5a563a2fed2592c46ae71f0d3630d3479bf5ac7a8c22e70214523354e054872d0be5145e13ac6efb40e38 +EBUILD lftp-9999.ebuild 2437 BLAKE2B 231733a4f693e72104f2276cc254eae3ecc205738bccdd1efd3dd362caa6a3d08216a93dc2ceeb7a4ae001a6a5e0845a1e7a271d7d53b47426b59bf2d241d700 SHA512 5a51e8c3d1c1f3a435c405ed31417b902c2158dee815268f91c40acf5b0e8e29d3b6bbfc8068e41c501d4250812639f2137ad87b4d01da0d6b3fb62e359fceac MISC metadata.xml 465 BLAKE2B b2c378d349c81c2e99b76a1a5585d58a7aa1bb866e3336e37336c838a87f78425f04a0eeca9d49ee246e085b934a9da4d5b17adf72a4b224d03b76d37bdd84db SHA512 542f366f55d7c19bb3e17a57d060824db5933f2ea3b3aaa8dd3520dc757be53e1dcf4f91fa34f15abc478e9c6b68799df3ad14836e0579f02977843e8d330bfd diff --git a/net-ftp/lftp/files/lftp-9999-libdir-readline.patch b/net-ftp/lftp/files/lftp-9999-libdir-readline.patch new file mode 100644 index 000000000000..fde1017f4bdc --- /dev/null +++ b/net-ftp/lftp/files/lftp-9999-libdir-readline.patch @@ -0,0 +1,11 @@ +--- a/m4/lftp_lib_readline.m4 ++++ b/m4/lftp_lib_readline.m4 +@@ -107,7 +107,7 @@ + if test -f "$readline_include_dir/readline/readline.h"; then + readline_include_dir="$readline_include_dir/readline" + fi +- readline_ld_flags="-L$readline_prefix/lib" ++ readline_ld_flags="-L$libdir" + if test -z "$readline_lib_flags"; then + readline_lib_flags="-lreadline" + fi diff --git a/net-ftp/lftp/lftp-4.8.4-r1.ebuild b/net-ftp/lftp/lftp-4.8.4-r1.ebuild index 7be261bf93d5..5da30b09e283 100644 --- a/net-ftp/lftp/lftp-4.8.4-r1.ebuild +++ b/net-ftp/lftp/lftp-4.8.4-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://lftp.tech/ftp/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file" RESTRICT="test" diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild index 44b55978713a..b38775a32ae7 100644 --- a/net-ftp/lftp/lftp-9999.ebuild +++ b/net-ftp/lftp/lftp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -53,11 +53,11 @@ DOCS=( PATCHES=( "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch "${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch - "${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch "${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch "${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch "${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch "${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch + "${FILESDIR}"/${PN}-9999-libdir-readline.patch ) src_prepare() { diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest index 320d9e060fc1..2a52a7cc9f6e 100644 --- a/net-ftp/ncftp/Manifest +++ b/net-ftp/ncftp/Manifest @@ -1,5 +1,5 @@ AUX ncftp-3.2.6-fno-common.patch 1818 BLAKE2B 620e3fbc7e297d3186fe9eef8855e2a663a5abcd680269101d5547ab9f6b9addcfe6040ba35e16e8e540784796e34304a9377b1149f7ac00fe0859627a141200 SHA512 c6bf0cc4324583d9aae3f3a57c900437a78d30138d0b9da06fea66cd5fbf57a79ea420afe33536a5bbcf2ace61aaca30ea04155df638daeae125ed9ca90b1c25 DIST ncftp-3.2.6.tar.xz 418836 BLAKE2B f0ffa0cc26617ee4007fe8589dbbc8d122edbfc8106a8618a66eab5d9def258d2ee9c2b709e1a637b9d833513ef87b652f4ab0ff518dc9d67d90a7dd43941d3c SHA512 040db7e2ca2ee78b79d682a951fd98c1e0ee2936b64462259992d70c51241fa50ae06c66b4f40933ad0ab7122f581bbb8ba7cda764dba5f70a1f8c7d3d751199 -EBUILD ncftp-3.2.6-r1.ebuild 979 BLAKE2B 9e68d2e14177156f97097fe1b4951de353a913626a3e8a7478a34fa8914a9810a4076011bbbe994640ab57b4c1bf3bc1ee2c69a17cf4c3749c6fa29488ba235f SHA512 9200b5c0e4fdfd52742b12c57df84a04a40482e7e3efba9a322701f5e0f4de692f38c1bd6d2f81d73235e3167a0bf7d00523b2044e79f2662796a9f2cba9e178 -EBUILD ncftp-3.2.6.ebuild 1046 BLAKE2B 0123fc148793c84d312160acc6f3515e522f42556608244bdba34cf93fa4a89cb71cd4c217913428d73e40cbcd242a66d665e59d9cecaf4b3729bde557937ec1 SHA512 07de610cc1d0062d0861b925f8e42f38d40fe7a87d76bdce46d565beb9d478a7d576eba39c0f14daed5dfed7b3cef7b5d705a223b54f428f9ae662ec10a88821 +EBUILD ncftp-3.2.6-r1.ebuild 975 BLAKE2B 30ff54992100b50c7b9a55300f324b369b8a5d6bc4e6084a00c5982648595211839262463d4f44b0474cfc86b63dbebb6ac650b2c7a9ab32c2cdb59fee3dc73b SHA512 9cf1333cd5ab061dabbc252df65598d0411a7a254596b35601a41dace0c713d0b0f503956f0fe26f2acfddfda1b8bde1d1d7da4fd0345ba8066d1b23263555a9 +EBUILD ncftp-3.2.6.ebuild 1043 BLAKE2B b5b30ecd0d33201c30a5ccfa13ddddbc9134b2176f4097be558659182538d5604d4ba9adf9ceb69a1c596695b4aad38e24e5184c9b389dfafb24f887cccbaa89 SHA512 e9912f780ccd6f0658a227d451934ba95ac0b29f27098300af44abaf8375a893992ef1aed4e13db43d59dadcbcb2dab3f60512383fcc4ece14d72eed612e0dfd MISC metadata.xml 738 BLAKE2B 98d564b3063dd25384758125efec702f385768f3f0c4066ef5b0e6748f9c27d0ef838c4a669e7113bbb70ff74882b1d4c3b0e09011f3ff5f01dad3eea56c6b16 SHA512 e792a9cbbc371515f5137c4c00faad6936b4c6cc27bcfd5bfab151b00002ae8159cb9b76777a4bdd59dd87ea951ea62898ac74f6afd8a4ec0a1e5dcec12210b3 diff --git a/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild index 7c177b45e9f7..1d4e5c3cf8fe 100644 --- a/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild +++ b/net-ftp/ncftp/ncftp-3.2.6-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI=" LICENSE="Clarified-Artistic" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" IUSE="pch" DEPEND=" diff --git a/net-ftp/ncftp/ncftp-3.2.6.ebuild b/net-ftp/ncftp/ncftp-3.2.6.ebuild index 68aad34002a3..7623cbf8ac32 100644 --- a/net-ftp/ncftp/ncftp-3.2.6.ebuild +++ b/net-ftp/ncftp/ncftp-3.2.6.ebuild @@ -12,7 +12,7 @@ SRC_URI=" LICENSE="Clarified-Artistic" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" IUSE="pch" DEPEND=" diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index 02d2417a1cc9..891d30384e86 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -9,6 +9,7 @@ AUX proftpd-1.3.6_rc4-msg-refresh-api.patch 903 BLAKE2B e335f81685552b0b9a05af37 AUX proftpd-1.3.6_rc4-vroot-refresh-api.patch 736 BLAKE2B 9f3c4a1f80a27ce7e6f9348153584bc1134e63ad4c839927b7680439966003c76c7a25821be0f3431c472092ef5c8386166b372645f498fb655559fd683c3e6e SHA512 9cd98e2fb8c17d2ca38f5f7a20f5c6ffb03da7f51e53542237992bd2b98b2ef5b5fc0634cd7f5eef24fba8a601703b70ff7d0404e1c5103394e9fda260b815cd AUX proftpd-1.3.6a-fix-libcheck.patch 726 BLAKE2B e971ccfd5d5cd708054096eef3d8b4910d380933b79d7616225194f71213a07c14139cc7bc76b9fcb4f86f0a97672288837d5a1e7ce68673665db65e75328252 SHA512 8e4aface4c7ca010808e0531b896f8554107ad66c7e1019f25168e71e5f8d2df3673511dd4717eb8bdeedb2ca07bd6a587caca4955c4903991bcfb020ed72636 AUX proftpd-1.3.6b-tls-crl-crash.patch 1466 BLAKE2B dc8f5cd38d07d2194966005eaf3d52b0230a763e35cb3ccbdd7c603eed5fee26a76a49feb31c6422a8adddd355059f82b6b07ac577a328b90e3e35ee5ece242b SHA512 b32281c717c8b1d1cd1ea86bebb6dc8577596e8dc97ad7fc797c83d34a5bbce1141a72f021d59e81be6437844411635c563baf84ef18eb9c5d576e84c80a786d +AUX proftpd-1.3.6c-gcc-10.patch 653 BLAKE2B c756979c01e40b9bb83da39a05e5b8cf49db3e6954df7e31645357411b053b21a3dbc073429e9156ab40d9137286ef5c5469d35781eb3ca56ff4b3e7d09fc382 SHA512 0b735b97b2ccc849d12754323de97b72e049a5a5bca869e76c167ec2527e7e773cf53d4b41645d2a8532385edd23b905f38fe3ab0ad3c44923c1d5ff61557c3a AUX proftpd-tmpfiles.d.conf 34 BLAKE2B 03da2e04c7e0d4c6e889e4414a205942f0762a1ae856d16f95abb1d2e927d68f583ad5bbdbf142b32b141cd82e9288f2ef1faf459cbe8433e2e1127d3b30d686 SHA512 aa6ffbf15e4275941837306259fb426608e82e45a2da4b99c5d7778d11b8c9341e3a12ae9b751d0e173635239b6f1b20f0431be17296c005a83525a48327fa52 AUX proftpd.conf.sample 1275 BLAKE2B db10306f79544b344856e065946e9ae0fa37d43507185f7d2407f23a962750a05bb2682e7c97e3979ca42dfe35921c3db7e98c095431796d82144869df0e324e SHA512 1c26f3e98ed07d89192c640f7823af168c045abee6ab076791aee9d50be5446be870a189979df4b828e7ae907dd40a346f1b92998fa39195195bfada4061c5df AUX proftpd.initd 1434 BLAKE2B a5d4b8c085925d08d7d0962ccd6a3eaad1a3a9227ea6cf553a217f9ef60c88841b5ab8fa8d249e68182a68ebae5940a421b220af4d2f30cf5c2af8ee4b6678dd SHA512 24875a5034813a12f1d24e1fa2c7a71330ffded96112d50dbe4fea6ea127f735eae48134e2f4c3faad168706eb9ff4e15f93dbbe7d6cb6ed0e0768e47aa1100b @@ -17,12 +18,12 @@ AUX proftpd.service 196 BLAKE2B 89ef578220f97095a5ffd6b4f6d1880dfc26f54e1ac86670 AUX proftpd.xinetd 295 BLAKE2B 4863cea66df5c32efba61647bbc854953dff28e154fab284c7e9f84efe3279a49c660ae37ef5b1410decdf32bb3061713e371fa3b529098848cae71f3e66d40d SHA512 a13d29ca2289f8bd58b4eb317683d57dfb7d608c53f163844349bbf0b896790f5e9f47a27eafda3b8fc78e60f4a0d6859da7c7ced7df852166cf0b8bcad876d4 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.6b.tar.gz 20260731 BLAKE2B 03ef212bcb1bcc53dd6d1dc4472c5565682b1c6b99af737f4ad09c280f1038f0658a8cc9609634e9b4a2a1cb56f76d83278056af0a9d136b957f853615e46cac SHA512 51511f05f481a038fa3826bdf1bdb866423d9f8df48071a8a263347a1ed096a553e66daefcc95dfdfcde503e664ed4140cdbb2a4f95ade8b7aadf2007aa3a671 DIST proftpd-1.3.6c.tar.gz 20271908 BLAKE2B 64f0aa70df844a376d333804100e18a28af6ab2b17a3d6f250817141db3952835740c15dcd68f71498b076238a668bdaf9672b4fd7d6fe61f8632d813e221573 SHA512 9b10e603b26d527b594682a4905e70dc0a8361372ed80a8e2617167305047bf94ea16b441f9d5782ae04dd50768d32e12f9cb68708c1f80dcd219b09e0d4fd15 +DIST proftpd-1.3.7rc3.tar.gz 20359920 BLAKE2B 96d2e26c815cd2c461580a2af642ac332bd848418d3d829f2795c610eead00a290a9633088809a5cd56899e3510dc3e608f1688052e1ca5121c78fcc80017523 SHA512 cab3ffee0ce6b921596cafc5fd2e0059c59a03f790791973b502e6384d45f0880b94e0d0961c3b230541a1785e9b0afa3d80276c82f4720696a46ea6594d744f 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.6b-r1.ebuild 8683 BLAKE2B 59bdfbebe224ffdd843c3abcfaaba5461899ef76eff40144807598b2740717373e068962ca5f1b276526c21b769b0624068b5655f4a998c09af5901b4592f8bc SHA512 abd5fa622034cda491f3bd8200b433b910ff0e78605817e29010975ab1284e4dc4b92e74b0e18d18d6286944820a0c765c95ea0103c697bd02a76c06f011c81f -EBUILD proftpd-1.3.6c.ebuild 8643 BLAKE2B b6e8543ca2a377bf74fed26a8d2e0b7b527b49337ce81e4ab387e72838d9c5a231c85f4ca7259d0f06a2a858eebe7fa61be50552a798f33a932367d5a7ad5edf SHA512 b2c48642c8dfc857450201e1079aac8656da19d9c2caed23f5fa1515b38c639670f2cc9ba35aa8bd7d32b7578c1dd271cbd122a86b60a5a6e4ba50ebae447958 +EBUILD proftpd-1.3.6c.ebuild 8678 BLAKE2B 9f02b99da55a9528466538a0d889bb94dae0633f44f2eb7fcd8feb7d0bdeca9fa299d2b7e2ed8ae3d43ac457b47f908e51cc9f27e79caba5688668221be29b92 SHA512 f74170b4ddbced1a35db736e755420a10281c9e4bbdc8c5fc9ee387260fee97b5145ed5e8aae340a869a1648f7b9dab77337970c604f8fe6d567ab1e21be21a3 +EBUILD proftpd-1.3.7_rc3.ebuild 8630 BLAKE2B 334ca9731d3c4b952212d45c3ec7120d6f9135f45fc62da406bb1d580c7173d5c61aee8e0fe409bd47503d8158d3bc519bff547e4b266bc7e7b09375d6753eb2 SHA512 910b5600bdaa9ff8e8d4d0bdf3c749d7f43d480a162430ad3e4bd7e4be35e17e3d327aaff38bc0b6eb32c6a0856188d85b065cbf990c9adb8bd0ea136940d3d3 MISC metadata.xml 2930 BLAKE2B f3f8218a737f50599ff687030bd8c84f1818b290d6d89bd6627ab8eb02598d196f1bae03d7b15e4eb02967fb7e0d826cdda10588c8bfe4f8a387a49d70d9cab0 SHA512 c90941671532512e4d085f3c6b4f56f3c2a252a613bf5c978d763fb0f8f9190431a41816f4fddde47e28eaeddcd17a7aef52064e5825499801bcdfbd72745be8 diff --git a/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch b/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch new file mode 100644 index 000000000000..c3ee704c085c --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch @@ -0,0 +1,21 @@ +--- a/contrib/mod_quotatab.c ++++ b/contrib/mod_quotatab.c +@@ -50,6 +50,7 @@ typedef struct regtab_obj { + module quotatab_module; + + /* Quota objects for the current session */ ++quota_deltas_t quotatab_deltas; + static quota_table_t *limit_tab = NULL; + static quota_limit_t sess_limit; + +--- a/contrib/mod_quotatab.h ++++ b/contrib/mod_quotatab.h +@@ -188,7 +188,7 @@ typedef struct table_obj { + #define QUOTATAB_TALLY_SRC 0x0002 + + /* Quota objects for the current session. */ +-quota_deltas_t quotatab_deltas; ++extern quota_deltas_t quotatab_deltas; + + /* Function prototypes necessary for quotatab sub-modules */ + int quotatab_log(const char *, ...) diff --git a/net-ftp/proftpd/proftpd-1.3.6c.ebuild b/net-ftp/proftpd/proftpd-1.3.6c.ebuild index 5c8f9eb610d3..c89615285d09 100644 --- a/net-ftp/proftpd/proftpd-1.3.6c.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.6c.ebuild @@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" 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" @@ -71,6 +71,7 @@ S="${WORKDIR}/${P/_/}" PATCHES=( "${FILESDIR}"/${PN}-1.3.6-use-trace.patch "${FILESDIR}"/${PN}-1.3.6a-fix-libcheck.patch + "${FILESDIR}"/${PN}-1.3.6c-gcc-10.patch ) RESTRICT=test # tests corrupt memory. need to be fixed upstream first diff --git a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild index 154eef3fbc46..40523c9d6937 100644 --- a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild @@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" 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" @@ -70,11 +70,10 @@ S="${WORKDIR}/${P/_/}" PATCHES=( "${FILESDIR}"/${PN}-1.3.6-use-trace.patch - "${FILESDIR}"/${PN}-1.3.6a-fix-libcheck.patch - "${FILESDIR}"/${PN}-1.3.6b-tls-crl-crash.patch + "${FILESDIR}"/${PN}-1.3.6c-gcc-10.patch ) -RESTRICT=test # tests corrupt memory. need to be fixed upstream first +RESTRICT=test # Some tests are ran in chroot. Confuse sandbox. in_dir() { pushd "${WORKDIR}/${1}" || die diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest index 0afdb2a4bde1..03a090f5b09d 100644 --- a/net-ftp/pure-ftpd/Manifest +++ b/net-ftp/pure-ftpd/Manifest @@ -1,14 +1,10 @@ AUX pure-ftpd-1.0.28-pam.patch 568 BLAKE2B cb7a9540e5646d7e9b734f893d4449e11cad60f897b39ed111559877edb4cf22e607fcf15d6ed7eea6dbf7a03a430c9182d6405ced13cf9c6614d15a45e17a49 SHA512 c331837c4c8988e0623a6a4f4222263dd161a49a2748079d3c539db2025b7b048ca5976b4450dd32cab5755932c7e59f6976d9d3bda2e5e87f1869789f8e00ba -AUX pure-ftpd-1.0.47-MAX_DATA_SIZE.patch 787 BLAKE2B bac7b7d788e2928c7c5a4f9af593b6841475d0850b1b3c09f6c6e3f7a575db13975fccfabbcb5813482c326f355dadcd33aa30184da9c098764480b95a9730ac SHA512 1124ba66f8c98935acf3f9bc11b7c90370e2e0dee05fa0c25ae517d198ef1bf47b7d93b3abbe79a3e98356588bd12a6f44584ff85a5fe241e2561c5805876624 -AUX pure-ftpd-1.0.47-TLSv1.3.patch 1743 BLAKE2B 54d88c30f842da11c93121d2cda6d91cd7a1971b4703b29373716c90eab7ae781067eee7e20028fe71a22cc74a5329dd338a3d8299adba23711486e847f34040 SHA512 25804c6f7a46b1a032efa97dae5b086b66946346a6192c21e4e48537a392fbbc3b0748674c9015aa9b6e273015fe13877fdc27009e5ff5b5be56d2983645e5e2 -AUX pure-ftpd-1.0.47-disable-TLSv1.1.patch 687 BLAKE2B 3d33790c7a410bf994cb24efddc07ce79e9fb5ca2e21f32dc007a8b8ef6801f5cc7e9c1fcce58e947d3e6a52aae7b58a60314c93ae9bc5daaa1b10ceaaad8c0e SHA512 81bee81a8ed942b004ba72b97c8c7f7df05ae0344e16b9cc909a70a717a0a32de882c393ccb9565e8892dccf8ede3b71de4e9eb442918bf1991a66c4b5561980 -AUX pure-ftpd-1.0.47-disable-TLSv1.3.patch 652 BLAKE2B cf6c1879eb1a2ad07117f6f8dcf7640d97b8e2ed331be327a160f1686bd2041e5b19d45194d0e2567aab77e0001671bb60200fa7c513bb85354906a65fcf044b SHA512 925087b9a454b5d3da289d04db52c947e29983041456ebf4e05d055b1526240587016db05a3e8a1b54dc7bb55a413319ef9cea084fd71cac1de888f0d22328c9 +AUX pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch 898 BLAKE2B ccccd0302184a768ac522197628b2021374579afcda595a70041dc14f3cab05317ac373a2fadf9d0565a95c0d730c87590c3dc13efa944e8d496264b3f0e4ab1 SHA512 7930dddc7e58bd00fdeb4cd0da49491d59907334f47f23d12433f71a9a2103a8b5cc503c5d4d461b110cdea61f2f6ef974bf123d96394334f668aacdb747f830 +AUX pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch 847 BLAKE2B f7e12194d219bb5a410a7b55743cdb2b8eb268a60aef8b8d9826e242264989a4502bb2378503c3a7ed8913fce4d95b681fcd185d184ef54e04dcda6b4853d99e SHA512 ff4aefeffd92f9e01e7c57779cc9ed59c0972a40a02431fa4e63696071ebbf28e4a0f83b6b6c878d4b62fed7efa05ff90e9d604e8c7e6a9358bc8853105731f1 AUX pure-ftpd.conf_d-3 3728 BLAKE2B a9bfa8208bdf7fcb053cd48e17638f787388804c57788ac594fae096cc824e347979b251b2c8e9d753308bfb63a37111f9690aabe684dc3eb614f68949d3983b SHA512 a5cc8e59178a5d0f7b5909d09009ef6ace1f8e6874bd733e21bc30f4899447e70b020a0369077132751ceb28afa971588efedcce3dea83e9b043b1545caf3393 AUX pure-ftpd.rc11 2018 BLAKE2B 1783228b5179b6d11fd6b06bc722e15f6f81e6c8443dd516f8fe1b7c7132ef4f8b92a67083354a4f78d41cee4b4a33b39d1940748bcd1056d336b5744069aac8 SHA512 920bb0c20a3a0a053977e999cf26a23a835155eca9c0224577b13623e002a07f52c30439e54f66c42dd89566b66cc5b8341a3d2e78a9bdc038f2a096153daaba AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d -DIST pure-ftpd-1.0.47.tar.bz2 489177 BLAKE2B 06e71ead47b87dedf47a84e488b2de127fcd297c2e9ca7a617c2ee2760cf55b816884763721826c512558d016cbd38a87a11ca0e8c2334d93145edc6f88d9287 SHA512 c1920a3f67f04635fde600fe226a7730b801e7e64658b25f1d9f9c0b35a704664be4adfb0b291594f7e0f10beade25eae9a5e6cc3b6777a3b413f3c2d9574e63 DIST pure-ftpd-1.0.49.tar.bz2 487958 BLAKE2B bd5f10a49b533eb6c257032659e97aa7ae16ec9402704d8ee06c92938e217b748b390ccf0e31b3640f41cb7a93f85b29c8ddcdc296f214391b1d92da9d701a7c SHA512 b44896d6fe2cda9169b1db93c5260bb892af14a173f2d25e60dd6530afe85d8e9156985609e35da7e5550dc123afb42bc5012beb9fca9011054cf0ed8b2eddef -EBUILD pure-ftpd-1.0.47-r4.ebuild 4099 BLAKE2B 8a9931bab67c29030b59a066a3f7669c4d9377dd3c6eac64c87766ac1a35eab23d411e3e10259a34cf3c4cede7ef290adebbc10bcd8b9d781f019d845269091e SHA512 0dbd75aae92fe8deef2307da001d1d8e2ff2532749645e6502c8d7357b450b320de96b2c6d008f537c554309993413f17eecb08aa11feeb078eb6ff141a5f3b0 -EBUILD pure-ftpd-1.0.49-r1.ebuild 4099 BLAKE2B 3723ab3562ea792ea7d939eb35f11f7fc31b82f002cb53a4c436a1a2ffb3a1883211ad083bb17527f43c9972a58cc079297ea01b1647453f0e62f10597bab3a9 SHA512 489ed9093dd16d6afea68fa288617221dbdd19ed25d642fce3d5ae0725c373497b84991f96924b91f878ed5752bc8e34d71d2ba04c3871058d145fa25d4c6457 +EBUILD pure-ftpd-1.0.49-r2.ebuild 4234 BLAKE2B d40992d9cc1515aab154e8dcf99b1f6f9cb93174bad78a92377c13dd701ea351ee4959425fdb258de40dcdb876202a6c84f644eeef7871b7cb4768fdba16de74 SHA512 845a00014a2afa9c6810848b9db83791eb33120be2a14a4d4e138e236aea1e1bc9541f1033773879cd596bc9f0271b79d1f27eae644c0e61a40939d3dcbbe577 EBUILD pure-ftpd-9999.ebuild 4099 BLAKE2B 3723ab3562ea792ea7d939eb35f11f7fc31b82f002cb53a4c436a1a2ffb3a1883211ad083bb17527f43c9972a58cc079297ea01b1647453f0e62f10597bab3a9 SHA512 489ed9093dd16d6afea68fa288617221dbdd19ed25d642fce3d5ae0725c373497b84991f96924b91f878ed5752bc8e34d71d2ba04c3871058d145fa25d4c6457 -MISC metadata.xml 1233 BLAKE2B 02ea0260dacca81d5b2eef251f98756f151b03ee7abcf3ccc46832167848b8aa80dba90d855c118908b87ce7085921cae81f3a747402c5e0fb70401dd668150b SHA512 ce47470d3c8bfeba9c02f6d6638e7b0bb6e0ddeddd1aaf0362342aadf07e823f1093523a1432c703bd410c3b760049a1e1c32e3f36718844b3a1ba44144afea4 +MISC metadata.xml 1176 BLAKE2B b11de08a23ff79546eaa18ea83dda697c855f2f4f636ef933737d31a11f225502121dd2138c9f015114484526378f2905892dcb709269c6df7fa78e3c0670957 SHA512 1e4c4bfc1adb2d9996e3bf9cdd2a4946b8314ffe2d1292d3313458d5cdf35824fe6e3af1ae9e66da824815dd16e3d0875daf55f613b3ac362bee0e48558d2161 diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-MAX_DATA_SIZE.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-MAX_DATA_SIZE.patch deleted file mode 100644 index a9ad0a30b9b6..000000000000 --- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-MAX_DATA_SIZE.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 27a5c200f9643ce907118aad169279b3a66a9e8a Mon Sep 17 00:00:00 2001 -From: Frank Denis <github@pureftpd.org> -Date: Sat, 4 Nov 2017 20:46:16 +0100 -Subject: [PATCH] Increase MAX_DATA_SIZE due to Argon2id requirements - ---- - src/ftpd.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ftpd.h b/src/ftpd.h -index 1beeab8..5bb1f6b 100644 ---- a/src/ftpd.h -+++ b/src/ftpd.h -@@ -557,7 +557,7 @@ Your platform has a very large PATH_MAX, we should not trust it. - - #ifndef MAX_DATA_SIZE - # ifdef HAVE_LIBSODIUM --# define MAX_DATA_SIZE (40 * 1024 * 1024) -+# define MAX_DATA_SIZE (70 * 1024 * 1024) - # elif defined(WITH_LDAP) || defined(WITH_MYSQL) || defined(WITH_PGSQL) - # define MAX_DATA_SIZE (16 * 1024 * 1024) /* Max memory usage - SQL/LDAP need more */ - # else diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-TLSv1.3.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-TLSv1.3.patch deleted file mode 100644 index 65f19bf49da7..000000000000 --- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-TLSv1.3.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4a495c61ce22c893aed5ee57f6ce0b43c3be59ad Mon Sep 17 00:00:00 2001 -From: Frank Denis <github@pureftpd.org> -Date: Wed, 19 Sep 2018 23:53:45 +0200 -Subject: [PATCH] TLS1.3 compatibility - -Fixes #94 ---- - src/tls.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/src/tls.c b/src/tls.c -index c693d3b..f383ed9 100644 ---- a/src/tls.c -+++ b/src/tls.c -@@ -228,7 +228,16 @@ static void ssl_info_cb(const SSL *cnx, int where, int ret) - if ((where & SSL_CB_HANDSHAKE_START) != 0) { - if ((cnx == tls_cnx && tls_cnx_handshook != 0) || - (cnx == tls_data_cnx && tls_data_cnx_handshook != 0)) { -- die(400, LOG_ERR, "TLS renegociation"); -+ const SSL_CIPHER *cipher; -+ const char *cipher_version; -+ if ((cipher = SSL_get_current_cipher(cnx)) == NULL || -+ (cipher_version = SSL_CIPHER_get_version(cipher)) == NULL) { -+ die(400, LOG_ERR, "No cipher"); -+ } -+ if (strcmp(cipher_version, "TLSv1.3") != 0) { -+ die(400, LOG_ERR, "TLS renegociation"); -+ return; -+ } - } - return; - } -@@ -264,10 +273,10 @@ int tls_init_library(void) - OpenSSL_add_all_algorithms(); - # else - OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | -- OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); -+ OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); - OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | -- OPENSSL_INIT_ADD_ALL_DIGESTS | -- OPENSSL_INIT_LOAD_CONFIG, NULL); -+ OPENSSL_INIT_ADD_ALL_DIGESTS | -+ OPENSSL_INIT_LOAD_CONFIG, NULL); - # endif - while (RAND_status() == 0) { - rnd = zrand(); diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.1.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.1.patch deleted file mode 100644 index cd4532bb97ab..000000000000 --- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From aa68b2d620ef0c83c7f52213c7e6093722b0b8bd Mon Sep 17 00:00:00 2001 -From: Frank Denis <github@pureftpd.org> -Date: Wed, 24 Oct 2018 19:19:26 +0200 -Subject: [PATCH] Disable TLSv1_1 - ---- - src/tls.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tls.c b/src/tls.c -index f383ed9..c4e2a1b 100644 ---- a/src/tls.c -+++ b/src/tls.c -@@ -297,7 +297,7 @@ int tls_init_library(void) - SSL_CTX_set_options(tls_ctx, SSL_OP_NO_TLSv1); - # endif - # ifdef SSL_OP_NO_TLSv1_1 -- SSL_CTX_clear_options(tls_ctx, SSL_OP_NO_TLSv1_1); -+ SSL_CTX_set_options(tls_ctx, SSL_OP_NO_TLSv1_1); - # endif - # ifdef SSL_OP_NO_TLSv1_2 - SSL_CTX_clear_options(tls_ctx, SSL_OP_NO_TLSv1_2); diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.3.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.3.patch deleted file mode 100644 index cbe9c8bdcb8f..000000000000 --- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.3.patch +++ /dev/null @@ -1,21 +0,0 @@ -Temporarily disable TLSv1.3 support - -Disable TLSv1.3 until support for it is fixed in pure-ftpd. This is a -workaround for the following issue: -https://github.com/jedisct1/pure-ftpd/issues/102 - ---- a/src/tls.c -+++ b/src/tls.c -@@ -301,6 +301,10 @@ int tls_init_library(void) - # endif - # ifdef SSL_OP_NO_TLSv1_2 - SSL_CTX_clear_options(tls_ctx, SSL_OP_NO_TLSv1_2); -+# endif -+ /* Disable TLSv1.3 support until it works properly in pure-ftpd */ -+# ifdef SSL_OP_NO_TLSv1_3 -+ SSL_CTX_set_options(tls_ctx, SSL_OP_NO_TLSv1_3); - # endif - if (tlsciphersuite != NULL) { - if (SSL_CTX_set_cipher_list(tls_ctx, tlsciphersuite) != 1) { --- -2.20.1 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 new file mode 100644 index 000000000000..7e29934caf5d --- /dev/null +++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch @@ -0,0 +1,31 @@ +From 8d0d42542e2cb7a56d645fbe4d0ef436e38bcefa Mon Sep 17 00:00:00 2001 +From: Frank Denis <github@pureftpd.org> +Date: Tue, 18 Feb 2020 18:36:58 +0100 +Subject: [PATCH] diraliases: always set the tail of the list to NULL + +Spotted and reported by Antonio Norales from GitHub Security Labs. +Thanks! +--- + src/diraliases.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/diraliases.c b/src/diraliases.c +index 4002a36..fb70273 100644 +--- a/src/diraliases.c ++++ b/src/diraliases.c +@@ -93,7 +93,6 @@ int init_aliases(void) + (tail->dir = strdup(dir)) == NULL) { + die_mem(); + } +- tail->next = NULL; + } else { + DirAlias *curr; + +@@ -105,6 +104,7 @@ int init_aliases(void) + tail->next = curr; + tail = curr; + } ++ tail->next = NULL; + } + fclose(fp); + aliases_up++; 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 new file mode 100644 index 000000000000..4ed197e46d35 --- /dev/null +++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch @@ -0,0 +1,27 @@ +From 36c6d268cb190282a2c17106acfd31863121b58e Mon Sep 17 00:00:00 2001 +From: Frank Denis <github@pureftpd.org> +Date: Mon, 24 Feb 2020 15:19:43 +0100 +Subject: [PATCH] pure_strcmp(): len(s2) can be > len(s1) + +Reported by Antonio Morales from GitHub Security Labs, thanks! +--- + src/utils.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/utils.c b/src/utils.c +index f41492d..a7f0381 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -45,5 +45,11 @@ int pure_memcmp(const void * const b1_, const void * const b2_, size_t len) + + int pure_strcmp(const char * const s1, const char * const s2) + { +- return pure_memcmp(s1, s2, strlen(s1) + 1U); ++ const size_t s1_len = strlen(s1); ++ const size_t s2_len = strlen(s2); ++ ++ if (s1_len != s2_len) { ++ return -1; ++ } ++ return pure_memcmp(s1, s2, s1_len); + } diff --git a/net-ftp/pure-ftpd/metadata.xml b/net-ftp/pure-ftpd/metadata.xml index 5ee42de87aec..35a922921783 100644 --- a/net-ftp/pure-ftpd/metadata.xml +++ b/net-ftp/pure-ftpd/metadata.xml @@ -11,7 +11,6 @@ <flag name="anonperm">Permit anonymous to change file permissions</flag> <flag name="anonren">Permit anonymous to rename files</flag> <flag name="anonres">Permit anonymous to resume file transfers</flag> - <flag name="charconv">Enables charset conversion</flag> <flag name="implicittls">Enable TLS on Port 990</flag> <flag name="noiplog">Disables logging of IP addresses</flag> <flag name="paranoidmsg">Display paranoid messages instead of normal diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r4.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r4.ebuild deleted file mode 100644 index de299a33183d..000000000000 --- a/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r4.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86" - -DESCRIPTION="Fast, production-quality, standard-conformant FTP server" -HOMEPAGE="http://www.pureftpd.org/" -SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2 - http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" - -IUSE="anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd" - -REQUIRED_USE="implicittls? ( ssl )" - -DEPEND="caps? ( sys-libs/libcap ) - charconv? ( virtual/libiconv ) - ldap? ( >=net-nds/openldap-2.0.25 ) - mysql? ( || ( - dev-db/mariadb-connector-c - dev-db/mysql-connector-c - ) ) - pam? ( sys-libs/pam ) - postgres? ( dev-db/postgresql:= ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] ) - libressl? ( dev-libs/libressl:= ) - ) - sysquota? ( sys-fs/quota[-rpc] ) - xinetd? ( virtual/inetd )" - -RDEPEND="${DEPEND} - dev-libs/libsodium:= - net-ftp/ftpbase - selinux? ( sec-policy/selinux-ftp )" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.28-pam.patch" - "${FILESDIR}/${PN}-1.0.47-MAX_DATA_SIZE.patch" - "${FILESDIR}/${PN}-1.0.47-TLSv1.3.patch" - "${FILESDIR}/${PN}-1.0.47-disable-TLSv1.3.patch" - "${FILESDIR}/${PN}-1.0.47-disable-TLSv1.1.patch" -) - -src_configure() { - # adjust max user length to something more appropriate - # for virtual hosts. See bug #62472 for details. - sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \ - -i "${S}/src/ftpd.h" || die "sed failed" - - # Those features are only configurable like this, see bug #179375. - use anondel && append-cppflags -DANON_CAN_DELETE - use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS - use anonren && append-cppflags -DANON_CAN_RENAME - use anonres && append-cppflags -DANON_CAN_RESUME - use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS - - # Do not auto-use SSP -- let the user select this. - export ax_cv_check_cflags___fstack_protector_all=no - - local myeconfargs=( - --enable-largefile - --with-altlog - --with-cookie - --with-diraliases - --with-extauth - --with-ftpwho - --with-language=${PUREFTPD_LANG:=english} - --with-peruserlimits - --with-privsep - --with-puredb - --with-quotas - --with-ratios - --with-throttling - --with-uploadscript - --with-virtualhosts - $(use_with charconv rfc2640) - $(use_with ldap) - $(use_with mysql) - $(use_with pam) - $(use_with paranoidmsg) - $(use_with postgres pgsql) - $(use_with ssl tls) - $(use_with implicittls) - $(use_with vchroot virtualchroot) - $(use_with sysquota sysquotas) - $(usex caps '' '--without-capabilities') - $(usex noiplog '--without-iplogging' '') - $(usex xinetd '' '--without-inetd') - ) - econf "${myeconfargs[@]}" -} - -src_install() { - local DOCS=( AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS ) - - default - - newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN} - newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN} - - if use implicittls ; then - sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \ - || die "Adjusting default server port for implicittls usage failed!" - fi - - keepdir /var/lib/run/${PN} - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}/pure-ftpd.xinetd" ${PN} - fi - - if use ldap ; then - insinto /etc/openldap/schema - doins pureftpd.schema - insinto /etc/openldap - insopts -m 0600 - doins pureftpd-ldap.conf - fi -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog - elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!" - elog - ewarn "It's *really* important to read the README provided with Pure-FTPd!" - ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info" - ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info." - ewarn - if use charconv ; then - ewarn "Charset conversion is an *experimental* feature!" - ewarn "Remember to set a valid charset for your filesystem in the configuration!" - fi - fi -} diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r2.ebuild index d1be10cc99f1..3386fbb63f8f 100644 --- a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r1.ebuild +++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ "${PV}" == 9999 ]] ; then else SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2 http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86" fi LICENSE="BSD" @@ -45,6 +45,10 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}/${PN}-1.0.28-pam.patch" + + # https://bugs.gentoo.org/711124 + "${FILESDIR}/${P}-diraliases_uninitialized_pointer.patch" + "${FILESDIR}/${P}-pure_strcmp_OOB_read.patch" ) src_prepare() { diff --git a/net-ftp/tftp-hpa/Manifest b/net-ftp/tftp-hpa/Manifest index 672bde382a7b..a3fc137dfe06 100644 --- a/net-ftp/tftp-hpa/Manifest +++ b/net-ftp/tftp-hpa/Manifest @@ -5,5 +5,5 @@ AUX tftp.service 119 BLAKE2B a2d50dba1103fb7c868e070331c8a2000e65364801abc85d969 AUX tftp.socket 112 BLAKE2B 11e8c6e77819ba772b709843af11449e768db16fe866dc67e4209e83e7d6d273583b2cd9104ba611e3acca0018d915f4313860039a3b0003e556f49f82917ef1 SHA512 d49cdbb7e265aa98d989f8ae96e2c80bfd5887ae0efc6bfcd726d5fa4d83ffc480f5f374e30b8564b05d9690eb2a0c0ed0077982a74946edfbce5d19066d0564 AUX tftp.xinetd 219 BLAKE2B d348f13fdfa749b10ec765d5cd90a65a46d266a132dde47dad00fbd1ef4046c250cd9246e7b1fe9590e974a2bc7fcc817535fd2e9447a10c5286f7c4148eec93 SHA512 26883a4feffe8f66fe2c21c05892beeb93fa4511ca5ce18e92273badd4b93afefb0d9cef48e07503037ca37b2ff0cdb24d35e5c24d2e32d8027a5e74c49426f5 DIST tftp-hpa-5.2.tar.xz 89564 BLAKE2B 45917ca3d710f8a4b584dbe1e9a912e06fd181e4ffcfd8fba13008f08dbbce0fe339b61fb6f97236b8012e755025d05700214e365adac81dfce42b0edd636e80 SHA512 a5198e923a6e58281f749dc77b3f3ed8579e56b6f0fd6a17482cc88bdc8d34b6702c7c709717885b9b937ecae459d9a832328a49a2e3536dc7432cdb39d2a394 -EBUILD tftp-hpa-5.2-r1.ebuild 1361 BLAKE2B 72dd1453bdb0910feeb54fcce3384aab55f2a91ccabeba7f6f4dd874373f6addde548297c8ac8ad39ae3ff6baa4ba9c3fb9dc06f28e9f6d49d01e8e10a02727a SHA512 f971610c761758febdb7111d875b278cd12183b88965deb580afc67817688e4629f95d959d4ef75f56de352d4ee2493c775087c416959af87abaeef65cc618fc +EBUILD tftp-hpa-5.2-r1.ebuild 1359 BLAKE2B 8d23615339df9e236c357bc31ec30787fb41910abc4806e4bdb411aec60c2294d357e9a3fa580eec8c3708046eab84eac507b2327ed71bc11f59bddd73e69236 SHA512 7ab446cc7bef3cd7a6826e85e0967a32d2819537c48146412aa9b54562ff0bda3c6a3e63706ffc1836a6c89611263b1e4ab5749204cc00178f467b802fac1b52 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild index 78723b2d830f..79f9fb828a2a 100644 --- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild +++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz" LICENSE="BSD-4" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos" IUSE="ipv6 readline selinux tcpd" CDEPEND=" diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest index 7e37eb1b0550..fc711fa16a3d 100644 --- a/net-ftp/vsftpd/Manifest +++ b/net-ftp/vsftpd/Manifest @@ -16,5 +16,5 @@ AUX vsftpd.socket 104 BLAKE2B 093a6265694c177e724fa2880e8de2e0477347bda315937dba AUX vsftpd.xinetd 321 BLAKE2B 3a91c0e65a511ed5ca0feed429550b0ce6e1bd2cc133460e2642fe37aa122b59c0a3fe509d00a5435eaf4c300962c9cb5712b083e7d7d927ffbc148d0bd6a5b8 SHA512 30fb4ae07f55011b9b29625db072062a0f1df4f1c7578041231f35febfb90ad2d2dfe1deb964e34fde5c660f0e3ffc3df3d77af1b2f3a1f724176f691a53a182 AUX vsftpd_at.service 328 BLAKE2B 826daeaa5b388273c6cefcfcee7415353773db5b9937b3ee714bcf76dd8b061c0693bc9d4b60742fcf5cc946543e69dbb7caacc4ba07b5503d8b66c7db4174df SHA512 5a39e853405bd5028f2c52183eb91ad559fb8edbaacfff5d5146e686417c208bb894bd86d5830a61720a1aaa9ba901160c75ed2bf47eec459b2a49ed217b9cb1 DIST vsftpd-3.0.3.tar.gz 196649 BLAKE2B dbf96e788494c29d78ca49fad6a03641c9725f9a5b01a4059ad009870fdc28520cd467cd8288a8a9a520c411c495a42c3fff57ee1069efc65840adb245792dca SHA512 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7 -EBUILD vsftpd-3.0.3-r3.ebuild 3694 BLAKE2B 10256812e1bdf9d455e69aef203c6e63afb3e0f67d15c6a1d1dd9e6e266552c55769098ee21d3dff23ba15f750a0bec6b5d29d1fc12e6345bd91cc7bb3afea26 SHA512 ed73641f99e079a41c282a109aa5f32687e3137e059e056c0ba64ffa1ec4f9db87de32f202ff011ca5ca6c906f2b5d16af3310016117b7eadf42ff21e36fd38a +EBUILD vsftpd-3.0.3-r3.ebuild 3692 BLAKE2B 3ad2c105fcd94f52d1f629b01aa25578508507e7e97a7a5d2ab97632760f3a504f378c49790ab47e4124470f914326831a2b2213ce408a349913de1bec9b9123 SHA512 ce9508fb84021805449dd80973a07e602f8a26c04ca591efb0594f7b41018c32a80ab39c42d15e110d0af4ba372e4442a6180c9f7d3245df4a8a304730dccfa7 MISC metadata.xml 289 BLAKE2B 3792154c21dd99e4a6e68a711493e3086ddf124a40275c43d8d6aca47f01dd76e7992eea16b235302d83529483a13843c8fb254ae2e436e9c2bd398908d65bcf SHA512 89cacd404713612a2347edb25dccf6c25c565d2b18ecdceb8614b5b5c5a913cd5ac0fe0b2ca32918854a69817e7b43300612eb6248655b59cf147b6d03922360 diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild index b5dea09d6877..c065044f937f 100644 --- a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild +++ b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86" IUSE="caps libressl pam tcpd ssl selinux xinetd" DEPEND="caps? ( >=sys-libs/libcap-2 ) |