diff options
author | Rene Ladan <rene@FreeBSD.org> | 2015-11-28 23:08:03 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2015-11-28 23:08:03 +0000 |
commit | 691f434f549a42a69ac50ff23a1543397490f5c5 (patch) | |
tree | 918183cc54e747acc95c0517ca51c4874a7ee860 /ftp/spegla/files/patch-jftp.c | |
parent | Update ImageMagick to 6.9.2-7. (diff) |
Remove expired ports:
2015-11-26 audio/pecl-id3: Broken for more than 6 months
2015-11-26 dns/geta: Broken for more than 6 months
2015-11-26 finance/openerp-web: Broken for more than 6 months
2015-11-26 devel/py-async: Further using of this module is not encouraged by upstream
2015-11-26 chinese/kon2: Depends on expiring chinese/cce
2015-11-26 games/linux-skulltag: Depends on expiring audio/linux-fmodapi
2015-11-26 archivers/wzip: Broken for more than 6 months
2015-11-26 databases/sybtcl: Broken for more than 6 months
2015-11-26 biology/povchem: Broken for more than 6 months
2015-11-26 audio/btc: Broken for more than 6 months
2015-11-26 astro/wmglobe: Broken for more than 6 months
2015-11-26 graphics/pyro: Broken for more than 6 months
2015-11-26 graphics/jpeg2ps: Broken for more than 6 months
2015-11-26 chinese/gugod-clean: Broken for more than 6 months
2015-11-26 comms/bforce: Broken for more than 6 months
2015-11-26 cad/geda-docs: Broken for more than 6 months
2015-11-26 chinese/cwtexttf: Broken for more than 6 months
2015-11-26 comms/zmtx-zmrx: Broken for more than 6 months
2015-11-26 astro/sky2000: Broken for more than 6 months
2015-11-26 deskutils/libopensync-plugin-file: Broken for more than 6 months
2015-11-26 databases/sqlite-ext-mobigroup: Broken for more than 6 months
2015-11-26 chinese/bg5ps: Broken for more than 6 months
2015-11-26 deskutils/x-tile: Broken for more than 6 months
2015-11-26 graphics/pure-gl: Broken for more than 6 months
2015-11-26 audio/dvda-author: Broken for more than 6 months
2015-11-26 chinese/oxim: Broken for more than 6 months
2015-11-26 editors/spe: Broken for more than 6 months
2015-11-26 audio/mpdscribble: Broken for more than 6 months
2015-11-26 cad/geda-symcheck: Broken for more than 6 months
2015-11-26 audio/linux-fmodapi: Broken for more than 6 months
2015-11-26 audio/pure-audio: Broken for more than 6 months
2015-11-26 editors/bpatch: Broken for more than 6 months
2015-11-26 benchmarks/geekbench: Broken for more than 6 months
2015-11-26 graphics/icoconvert: Broken for more than 6 months
2015-11-26 cad/geda-utils: Broken for more than 6 months
2015-11-26 deskutils/tomboy-plugin-wordcount: Broken for more than 6 months
2015-11-26 graphics/sketch: Broken for more than 6 months
2015-11-26 ftp/spegla: Broken for more than 6 months
2015-11-26 graphics/clutter-box2d: Broken for more than 6 months
2015-11-26 audio/scmpc: Broken for more than 6 months
2015-11-26 ftp/gnusget: Broken for more than 6 months
2015-11-26 comms/gpsk31: Broken for more than 6 months
2015-11-26 cad/geda-gschem: Broken for more than 6 months
2015-11-26 audio/ampache: Broken for more than 6 months
2015-11-26 cad/slffea: Broken for more than 6 months
2015-11-26 audio/cripple: Broken for more than 6 months
2015-11-26 cad/geda-gattrib: Broken for more than 6 months
2015-11-26 cad/findhier: Broken for more than 6 months
2015-11-26 biology/njplot: Broken for more than 6 months
2015-11-26 audio/wmmp: Broken for more than 6 months
2015-11-26 x11/avant-window-navigator: Broken for more than 6 months
2015-11-26 cad/geda-netlist: Broken for more than 6 months
2015-11-26 deskutils/libopensync-plugin-sunbird: Broken for more than 6 months
2015-11-26 biology/ortep3: Broken for more than 6 months
2015-11-26 astro/aa: Broken for more than 6 months
2015-11-26 french/belote: Broken for more than 6 months
2015-11-26 converters/p5-String-SetUTF8: Broken for more than 6 months
2015-11-26 cad/geda-examples: Broken for more than 6 months
2015-11-26 editors/yasnippet: Broken for more than 6 months
2015-11-26 audio/musica: Broken for more than 6 months
2015-11-26 graphics/rubyphoto: Broken for more than 6 months
2015-11-26 german/bsdpaste: Broken for more than 6 months
2015-11-26 audio/amrcoder: Broken for more than 6 months
2015-11-26 sysutils/bashburn: Broken for more than 6 months
2015-11-26 editors/e93: Broken for more than 6 months
2015-11-26 audio/tepsonic: Broken for more than 6 months
2015-11-26 astro/ephem: Broken for more than 6 months
2015-11-26 chinese/cce: Broken for more than 6 months
2015-11-26 graphics/qcread: Broken for more than 6 months
2015-11-26 databases/py-sqlkit: Broken for more than 6 months
2015-11-26 databases/usogres: Broken for more than 6 months
2015-11-26 cad/libgeda: Broken for more than 6 months
2015-11-26 chinese/p5-Lingua-ZH-BPMFConvert: Broken for more than 6 months
2015-11-26 french/alphabet_sounds_fr: Broken for more than 6 months
2015-11-26 deskutils/mrundlg: Broken for more than 6 months
2015-11-26 databases/erlang-mysql: Broken for more than 6 months
2015-11-26 graphics/linux-XnViewMP: Broken for more than 6 months
2015-11-26 deskutils/akamaru: Broken for more than 6 months
2015-11-26 dns/p5-Net-DNS-ZoneCheck: Broken for more than 6 months
2015-11-26 astro/dgpsip: Broken for more than 6 months
2015-11-26 databases/pecl-handlersocket: Broken for more than 6 months
2015-11-26 audio/cymbaline: Broken for more than 6 months
2015-11-26 french/dico: Broken for more than 6 months
2015-11-26 comms/qpage: Broken for more than 6 months
2015-11-26 audio/sonice: Broken for more than 6 months
2015-11-26 cad/geda-symbols: Broken for more than 6 months
2015-11-26 databases/java-mybatis: Broken for more than 6 months
2015-11-26 databases/openbase-jdbc: Broken for more than 6 months
2015-11-27 www/mediawiki119: Please upgrade to mediawiki-1.25
2015-11-28 www/R-cran-Rpad: Unmaintained upstream
Notes
Notes:
svn path=/head/; revision=402562
Diffstat (limited to 'ftp/spegla/files/patch-jftp.c')
-rw-r--r-- | ftp/spegla/files/patch-jftp.c | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/ftp/spegla/files/patch-jftp.c b/ftp/spegla/files/patch-jftp.c deleted file mode 100644 index 5f966968e17a..000000000000 --- a/ftp/spegla/files/patch-jftp.c +++ /dev/null @@ -1,90 +0,0 @@ ---- jftp.c.orig Thu Mar 23 17:34:21 2006 -+++ jftp.c Thu Mar 23 17:39:39 2006 -@@ -40,6 +40,7 @@ - #include <netinet/in.h> - #include <arpa/inet.h> - -+#include <ctype.h> - #include <setjmp.h> - #include <signal.h> - #include <stdio.h> -@@ -246,6 +247,7 @@ - int ftp_status, eol, i, islongtext; - ssize_t done, res, size, pos; - char *nfmt; -+ char rescode[5]; - - if (*fmt != ' ') { - if ((nfmt = alloca(strlen(fmt) + 3)) == NULL) { -@@ -293,12 +295,28 @@ - pos += done; - if(eol) { - ftp_status=0; -- res = sscanf(c->ftp_buf, "%3d", &ftp_status); -- if ((res == 1) && (ftp_status >= 100) && (ftp_status <= 999)) { -- /* We have a line that contains a valid reply code */ - -- /* This may be the start of a multi line reply */ -- islongtext = (c->ftp_buf[3] == '-'); -+ /* We are interested in the first 4 bytes */ -+ (void)memset(rescode, '\0', sizeof(rescode)); -+ (void)memcpy(rescode, c->ftp_buf, sizeof(rescode) - 1); -+ -+ if (isdigit(rescode[0]) -+ && isdigit(rescode[1]) -+ && isdigit(rescode[2])) { -+ res = sscanf(rescode, "%3d", &ftp_status); -+ -+ E_LOGX_1(3, "ftp_status: %d", ftp_status); -+ E_LOGX_1(3, "c->ftp_buf: %s", c->ftp_buf); -+ -+ if ((rescode[3] == '-' || rescode[3] == ' ') -+ && (res == 1)) { -+ islongtext = (rescode[3] == '-'); -+ if (ftp_status < 100) { -+ E_LOGX_1(1, "%s", c->ftp_buf); -+ c->ftp_resp = JFTP_ERR; -+ return -1; -+ } -+ } - } - if(islongtext) { - size = sizeof(c->ftp_buf); -@@ -455,17 +473,22 @@ - c->ftp_resp = JFTP_ERR; - return -1; - } -- if (ftp_req(c, "user %s", c->ftp_user_name) < 0 || c->ftp_resp != 331) { -+ if (ftp_req(c, "user %s", c->ftp_user_name) < 0 -+ || (c->ftp_resp != 331 && c->ftp_resp != 230)) { - E_LOGX_1(0, "Username %s: failed", c->ftp_user_name); - FD_CLOSE(c->ftp_com); - c->ftp_resp = JFTP_ERR; - return -1; - } -- if (ftp_req(c, "pass %s", c->ftp_password) < 0 || c->ftp_resp != 230) { -- E_LOGX(0, "Password xxxxx: failed"); -- FD_CLOSE(c->ftp_com); -- c->ftp_resp = JFTP_ERR; -- return -1; -+ /* USER command can respond 230 immediately in some cases */ -+ if (c->ftp_resp != 230) { -+ if (ftp_req(c, "pass %s", c->ftp_password) < 0 -+ || c->ftp_resp != 230) { -+ E_LOGX(0, "Password xxxxx: failed"); -+ FD_CLOSE(c->ftp_com); -+ c->ftp_resp = JFTP_ERR; -+ return -1; -+ } - } - c->ftp_resp = 0; - if (ftp_req(c, "TYPE I") < 0 || c->ftp_resp != 200) { -@@ -980,7 +1003,7 @@ - /* Late versions of wu-ftpd does some kind of recursive - * listing if only a '.' is given as directory. - */ -- if (strcmp(dir, ".") == 0) -+ if ((strcmp(dir, ".") == 0) || !*dir) - res = ftp_req(c, "list %s", flags); - else - res = ftp_req(c, "list %s %s", flags, dir); |