head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.12 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.10 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.8 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.6 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.4 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.2 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.5.0.2 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.4.0.10 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.8 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.6 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.4 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.2 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.3.0.2 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.2.0.12 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.10 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.8 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.6 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.4 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.1.0.4 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.2; locks; strict; comment @# @; 1.8 date 2008.12.28.08.56.59; author kim; state dead; branches; next 1.7; 1.7 date 2008.12.28.08.42.01; author kim; state Exp; branches; next 1.6; 1.6 date 2008.11.21.08.00.36; author martti; state dead; branches; next 1.5; 1.5 date 2008.10.03.06.52.03; author martti; state Exp; branches; next 1.4; 1.4 date 2007.07.06.11.04.41; author martti; state dead; branches; next 1.3; 1.3 date 2007.06.26.23.25.56; author lkundrak; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 2005.11.03.19.09.46; author martti; state dead; branches 1.2.12.1; next 1.1; 1.1 date 2005.08.06.11.51.18; author adrianp; state Exp; branches 1.1.2.1; next ; 1.3.2.1 date 2007.07.10.12.16.05; author ghen; state dead; branches; next ; 1.2.12.1 date 2007.06.28.10.49.45; author ghen; state Exp; branches; next ; 1.1.2.1 date 2005.08.06.11.51.18; author salo; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2005.08.06.22.17.34; author salo; state Exp; branches; next ; desc @@ 1.8 log @Grrr, cannot patch next to RCS id strings, so use sed instead. @ text @$NetBSD: patch-ad,v 1.7 2008/12/28 08:42:01 kim Exp $ The -lnsl library has its own check in configure. We cannot hardcode it as it is not needed and does not even exist on all platforms. --- contrib/mod_wrap.c.orig 2008-01-25 03:53:34.000000000 +0200 +++ contrib/mod_wrap.c 2008-12-26 11:42:48.000000000 +0200 @@@@ -23,7 +23,7 @@@@ * the source code for OpenSSL in the source distribution. * * -- DO NOT MODIFY THE TWO LINES BELOW -- - * $Libraries: -lwrap -lnsl$ + * $Libraries: -lwrap$ * $Id: patch-ad,v 1.7 2008/12/28 08:42:01 kim Exp $ */ @ 1.7 log @Fix the "pam" option to leave out PAM when it is not wanted. Add an "inet6" option for enabling IPv6 support. Add a "ban" option for enabling mod_ban. Make the "wrap" option compile all binaries successfully. Fix generating language catalog with older versions of msgfmt. @ text @d1 1 a1 1 $NetBSD$ d14 1 a14 1 * $Id: mod_wrap.c,v 1.18 2008/01/25 01:53:34 castaglia Exp $ @ 1.6 log @Updated net/proftpd to 1.3.2rc3 * Bug fixes @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.5 2008/10/03 06:52:03 martti Exp $ d3 2 a4 1 http://bugs.proftpd.org/show_bug.cgi?id=3115 d6 10 a15 12 Index: src/main.c =================================================================== RCS file: /cvsroot/proftp/proftpd/src/main.c,v retrieving revision 1.344 diff -u -r1.344 main.c --- src/main.c 8 Sep 2008 00:47:11 -0000 1.344 +++ src/main.c 20 Sep 2008 20:10:49 -0000 @@@@ -516,20 +516,32 @@@@ static long get_max_cmd_len(size_t buflen) { long res; int *bufsz = NULL; + size_t default_cmd_bufsz; a16 63 + /* It's possible for the admin to select a PR_TUNABLE_BUFFER_SIZE which + * is smaller than PR_DEFAULT_CMD_BUFSZ. We need to handle such cases + * properly. + */ + default_cmd_bufsz = PR_DEFAULT_CMD_BUFSZ; + if (default_cmd_bufsz > buflen) { + default_cmd_bufsz = buflen; + } + bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", FALSE); if (bufsz == NULL) { - res = PR_DEFAULT_CMD_BUFSZ; + res = default_cmd_bufsz; } else if (*bufsz <= 0) { pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) given, " - "using default buffer size (%u) instead", *bufsz, PR_DEFAULT_CMD_BUFSZ); - res = PR_DEFAULT_CMD_BUFSZ; + "using default buffer size (%lu) instead", *bufsz, + (unsigned long) default_cmd_bufsz); + res = default_cmd_bufsz; } else if (*bufsz + 1 > buflen) { pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) given, " - "using default buffer size (%u) instead", *bufsz, PR_DEFAULT_CMD_BUFSZ); - res = PR_DEFAULT_CMD_BUFSZ; + "using default buffer size (%lu) instead", *bufsz, + (unsigned long) default_cmd_bufsz); + res = default_cmd_bufsz; } else { pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz); @@@@ -577,11 +589,26 @@@@ return -1; } - memset(buf, '\0', sizeof(buf)); + while (TRUE) { + pr_signals_handle(); - if (pr_netio_telnet_gets(buf, sizeof(buf)-1, session.c->instrm, - session.c->outstrm) == NULL) - return -1; + memset(buf, '\0', sizeof(buf)); + + if (pr_netio_telnet_gets(buf, sizeof(buf)-1, session.c->instrm, + session.c->outstrm) == NULL) { + + if (errno == E2BIG) { + /* The client sent a too-long command which was ignored; give + * them another chance? + */ + continue; + } + + return -1; + } + + break; + } if (cmd_bufsz == -1) cmd_bufsz = get_max_cmd_len(sizeof(buf)); @ 1.5 log @Updated net/proftpd to 1.3.2rc2 Fix for http://bugs.proftpd.org/show_bug.cgi?id=3115 @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Updated net/proftpd to 1.3.1rc3 Hello, ProFTPD community. The ProFTPD Project team is pleased to announce that the third release candidate for ProFTPD 1.3.1 is now available for public consumption. The 1.3.1rc3 release includes a number of minor bugfixes, including segfaults when handling the NLST command, dealing assigning IPv6 addresses for the EPSV command, and better handling of Display files in chrooted sessions. Please read the included NEWS and ChangeLog files for the full details. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3 2007/06/26 23:25:56 lkundrak Exp $ d3 1 a3 1 Part of fix for CVE-2007-2165 grabbed from upstream #2922. d5 12 a16 16 --- include/auth.h.orig 2007-06-27 01:13:43.000000000 +0200 +++ include/auth.h @@@@ -1,6 +1,6 @@@@ /* * ProFTPD - FTP server daemon - * Copyright (c) 2004-2005 The ProFTPD Project team + * Copyright (c) 2004-2007 The ProFTPD Project team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@@ -86,6 +86,7 @@@@ int pr_auth_requires_pass(pool *, const config_rec *pr_auth_get_anon_config(pool *p, char **, char **, char **); /* For internal use only. */ +int init_auth(void); int set_groups(pool *, gid_t, array_header *); d18 63 a80 1 #endif /* PR_MODULES_H */ @ 1.3 log @Fix for a CVE-2007-2165 security issue grabbed from upstream #2922. @ text @d1 1 a1 1 $NetBSD$ @ 1.3.2.1 log @Pullup ticket 2139 - requested by martti bugfix update for proftpd - pkgsrc/net/proftpd/Makefile 1.42 - pkgsrc/net/proftpd/PLIST 1.13 - pkgsrc/net/proftpd/distinfo 1.24 - pkgsrc/net/proftpd/patches/patch-ab 1.7 - pkgsrc/net/proftpd/patches/patch-ac 1.9 - pkgsrc/net/proftpd/patches/patch-ad removed - pkgsrc/net/proftpd/patches/patch-ae removed - pkgsrc/net/proftpd/patches/patch-af removed Module Name: pkgsrc Committed By: martti Date: Fri Jul 6 11:04:41 UTC 2007 Modified Files: pkgsrc/net/proftpd: Makefile PLIST distinfo pkgsrc/net/proftpd/patches: patch-ab patch-ac Removed Files: pkgsrc/net/proftpd/patches: patch-ad patch-ae patch-af Log Message: Updated net/proftpd to 1.3.1rc3 Hello, ProFTPD community. The ProFTPD Project team is pleased to announce that the third release candidate for ProFTPD 1.3.1 is now available for public consumption. The 1.3.1rc3 release includes a number of minor bugfixes, including segfaults when handling the NLST command, dealing assigning IPv6 addresses for the EPSV command, and better handling of Display files in chrooted sessions. Please read the included NEWS and ChangeLog files for the full details. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3 2007/06/26 23:25:56 lkundrak Exp $ @ 1.2 log @Updated proftpd to 1.3.0rc3 A lot of changes and bug fixes, including fix for the following security problem: http://security.lss.hr/index.php?page=details&ID=LSS-2004-10-02 @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1 2005/08/06 11:51:18 adrianp Exp $ d3 14 a16 5 --- src/response.c.orig 2005-08-06 12:20:27.000000000 +0100 +++ src/response.c @@@@ -169,7 +169,7 @@@@ void pr_response_send_async(const char * buf[sizeof(buf) - 1] = '\0'; sstrcat(buf, "\r\n", sizeof(buf)); d18 3 a20 3 - RESPONSE_WRITE_STR_ASYNC(session.c->outstrm, buf, strlen(buf)) + RESPONSE_WRITE_STR_ASYNC(session.c->outstrm, "%s", buf) } d22 1 a22 1 void pr_response_send(const char *resp_numeric, const char *fmt, ...) { @ 1.2.12.1 log @Pullup ticket 2124 - requested by lkundrak security fix for proftpd - pkgsrc/net/proftpd/Makefile 1.41 - pkgsrc/net/proftpd/distinfo 1.23 - pkgsrc/net/proftpd/patches/patch-ad 1.3 - pkgsrc/net/proftpd/patches/patch-ae 1.3 - pkgsrc/net/proftpd/patches/patch-af 1.1 Module Name: pkgsrc Committed By: lkundrak Date: Tue Jun 26 23:25:57 UTC 2007 Modified Files: pkgsrc/net/proftpd: Makefile distinfo Added Files: pkgsrc/net/proftpd/patches: patch-ad patch-ae patch-af Log Message: Fix for a CVE-2007-2165 security issue grabbed from upstream #2922. @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 14 Part of fix for CVE-2007-2165 grabbed from upstream #2922. --- include/auth.h.orig 2007-06-27 01:13:43.000000000 +0200 +++ include/auth.h @@@@ -1,6 +1,6 @@@@ /* * ProFTPD - FTP server daemon - * Copyright (c) 2004-2005 The ProFTPD Project team + * Copyright (c) 2004-2007 The ProFTPD Project team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@@ -86,6 +86,7 @@@@ int pr_auth_requires_pass(pool *, const config_rec *pr_auth_get_anon_config(pool *p, char **, char **, char **); d9 3 a11 3 /* For internal use only. */ +int init_auth(void); int set_groups(pool *, gid_t, array_header *); d13 1 a13 1 #endif /* PR_MODULES_H */ @ 1.1 log @Patches to address recent security issue via Gentoo: http://secunia.com/advisories/16181/ @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-ad was added on branch pkgsrc-2005Q2 on 2005-08-06 11:51:18 +0000 @ text @d1 13 @ 1.1.2.2 log @Pullup ticket 662 - requested by Adrian Portelli update and security fixes for proftpd Revisions pulled up: - pkgsrc/net/proftpd/Makefile 1.22, 1.23, 1.24 - pkgsrc/net/proftpd/PLIST 1.9 - pkgsrc/net/proftpd/distinfo 1.10, 1.11, 1.12, 1.13 - pkgsrc/net/proftpd/options.mk 1.1 - pkgsrc/net/proftpd/files/proftpd.sh 1.2 - pkgsrc/net/proftpd/patches/patch-ab 1.1 - pkgsrc/net/proftpd/patches/patch-ac 1.1, 1.2 - pkgsrc/net/proftpd/patches/patch-ad 1.1 - pkgsrc/net/proftpd/patches/patch-ae 1.1 Module Name: pkgsrc Committed By: salo Date: Wed Jun 22 22:43:37 UTC 2005 Modified Files: pkgsrc/net/proftpd: Makefile PLIST distinfo pkgsrc/net/proftpd/files: proftpd.sh Added Files: pkgsrc/net/proftpd: options.mk pkgsrc/net/proftpd/patches: patch-ab Log Message: PKGREVISION++ - split PKG_OPTIONS to options.mk file - fix issue with state directory in (typically) /var/run, noted by Justin Newcomer on tech-pkg@@ - delint --- Module Name: pkgsrc Committed By: christos Date: Thu Jun 23 04:49:27 UTC 2005 Modified Files: pkgsrc/net/proftpd: Makefile distinfo Added Files: pkgsrc/net/proftpd/patches: patch-ac Log Message: Make it log in wtmpx properly. XXX: someone should fix the array has type char issues. --- Module Name: pkgsrc Committed By: christos Date: Sun Jul 10 19:57:07 UTC 2005 Modified Files: pkgsrc/net/proftpd: distinfo pkgsrc/net/proftpd/patches: patch-ac Log Message: Simplify (and correct) the previous ut_ss filling code. --- Module Name: pkgsrc Committed By: adrianp Date: Sat Aug 6 11:51:18 UTC 2005 Modified Files: pkgsrc/net/proftpd: Makefile Added Files: pkgsrc/net/proftpd/patches: patch-ad patch-ae Log Message: Patches to address recent security issue via Gentoo: http://secunia.com/advisories/16181/ --- Module Name: pkgsrc Committed By: adrianp Date: Sat Aug 6 12:29:25 UTC 2005 Modified Files: pkgsrc/net/proftpd: distinfo Log Message: Add missing patch from last update - ride the previous bump @ text @a0 13 $NetBSD: patch-ad,v 1.1.2.1 2005/08/06 22:17:34 salo Exp $ --- src/response.c.orig 2005-08-06 12:20:27.000000000 +0100 +++ src/response.c @@@@ -169,7 +169,7 @@@@ void pr_response_send_async(const char * buf[sizeof(buf) - 1] = '\0'; sstrcat(buf, "\r\n", sizeof(buf)); - RESPONSE_WRITE_STR_ASYNC(session.c->outstrm, buf, strlen(buf)) + RESPONSE_WRITE_STR_ASYNC(session.c->outstrm, "%s", buf) } void pr_response_send(const char *resp_numeric, const char *fmt, ...) { @