pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2007Q2]: pkgsrc/net/proftpd Pullup ticket 2139 - requested by ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ec6ca1591928
branches: pkgsrc-2007Q2
changeset: 530468:ec6ca1591928
user: ghen <ghen%pkgsrc.org@localhost>
date: Tue Jul 10 12:16:04 2007 +0000
description:
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.
diffstat:
net/proftpd/Makefile | 6 +-
net/proftpd/PLIST | 3 +-
net/proftpd/distinfo | 15 +-
net/proftpd/patches/patch-ab | 10 +-
net/proftpd/patches/patch-ac | 8 +-
net/proftpd/patches/patch-ad | 22 --
net/proftpd/patches/patch-ae | 15 -
net/proftpd/patches/patch-af | 398 -------------------------------------------
8 files changed, 19 insertions(+), 458 deletions(-)
diffs (truncated from 540 to 300 lines):
diff -r 0429faf39841 -r ec6ca1591928 net/proftpd/Makefile
--- a/net/proftpd/Makefile Tue Jul 10 11:13:36 2007 +0000
+++ b/net/proftpd/Makefile Tue Jul 10 12:16:04 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2007/06/26 23:25:56 lkundrak Exp $
+# $NetBSD: Makefile,v 1.41.2.1 2007/07/10 12:16:04 ghen Exp $
-DISTNAME= proftpd-1.3.1rc2
-PKGREVISION= 1
+DISTNAME= proftpd-1.3.1rc3
+#PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
ftp://ftp.servus.at/ProFTPD/distrib/source/ \
diff -r 0429faf39841 -r ec6ca1591928 net/proftpd/PLIST
--- a/net/proftpd/PLIST Tue Jul 10 11:13:36 2007 +0000
+++ b/net/proftpd/PLIST Tue Jul 10 12:16:04 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2007/01/13 09:47:38 martti Exp $
+@comment $NetBSD: PLIST,v 1.12.4.1 2007/07/10 12:16:04 ghen Exp $
bin/ftpcount
bin/ftpdctl
bin/ftptop
@@ -25,7 +25,6 @@
include/proftpd/help.h
include/proftpd/ident.h
include/proftpd/inet.h
-include/proftpd/lastlog.h
include/proftpd/libsupp.h
include/proftpd/log.h
include/proftpd/mkhome.h
diff -r 0429faf39841 -r ec6ca1591928 net/proftpd/distinfo
--- a/net/proftpd/distinfo Tue Jul 10 11:13:36 2007 +0000
+++ b/net/proftpd/distinfo Tue Jul 10 12:16:04 2007 +0000
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.23 2007/06/26 23:25:56 lkundrak Exp $
+$NetBSD: distinfo,v 1.23.2.1 2007/07/10 12:16:05 ghen Exp $
-SHA1 (proftpd-1.3.1rc2.tar.bz2) = 7db6435707983fe8e865064661cedb159ebc1cf6
-RMD160 (proftpd-1.3.1rc2.tar.bz2) = aa928315880cf1e9d1980850ce2bb07193d2ac46
-Size (proftpd-1.3.1rc2.tar.bz2) = 1516464 bytes
+SHA1 (proftpd-1.3.1rc3.tar.bz2) = a752ccc2ea4d7ae6f55ac5486d1ede01f734280c
+RMD160 (proftpd-1.3.1rc3.tar.bz2) = 68cbdd137caa0f7a46be18eb682d5c3c516ca167
+Size (proftpd-1.3.1rc3.tar.bz2) = 1538700 bytes
SHA1 (patch-aa) = d7ad034e763a2bf729c9af669c3094402bdd03b7
-SHA1 (patch-ab) = 2b6921efa11884286c022a1da7691fc971d65cca
-SHA1 (patch-ac) = a73ceb99485ea16a4b008971cba58204b8d3f90d
-SHA1 (patch-ad) = 17390cac03e1a3fb8d2ce5f854ad9d239eae40fd
-SHA1 (patch-ae) = b7a8ba05a4399438f04d976aa36535e1f02f0c41
-SHA1 (patch-af) = 5f6642a36efe9fdacefed698aba2a86b737dd953
+SHA1 (patch-ab) = f214c7b321028bda1c27d654059b2a1d6aa73cbc
+SHA1 (patch-ac) = be33bb40718c4f5a124e2c80ad5dfe8db28e3af3
diff -r 0429faf39841 -r ec6ca1591928 net/proftpd/patches/patch-ab
--- a/net/proftpd/patches/patch-ab Tue Jul 10 11:13:36 2007 +0000
+++ b/net/proftpd/patches/patch-ab Tue Jul 10 12:16:04 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2007/01/13 09:47:38 martti Exp $
+$NetBSD: patch-ab,v 1.6.4.1 2007/07/10 12:16:05 ghen Exp $
---- configure.orig 2007-01-10 04:55:21.000000000 +0000
-+++ configure 2007-01-13 11:42:19.000000000 +0000
-@@ -36772,7 +36772,7 @@
+--- configure.orig 2007-05-23 00:01:32.000000000 +0300
++++ configure 2007-07-06 13:52:59.000000000 +0300
+@@ -37098,7 +37098,7 @@
_ACEOF
cat >>confdefs.h <<_ACEOF
@@ -11,7 +11,7 @@
_ACEOF
cat >>confdefs.h <<_ACEOF
-@@ -36780,7 +36780,7 @@
+@@ -37106,7 +37106,7 @@
_ACEOF
cat >>confdefs.h <<_ACEOF
diff -r 0429faf39841 -r ec6ca1591928 net/proftpd/patches/patch-ac
--- a/net/proftpd/patches/patch-ac Tue Jul 10 11:13:36 2007 +0000
+++ b/net/proftpd/patches/patch-ac Tue Jul 10 12:16:04 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.8 2007/01/13 09:47:38 martti Exp $
+$NetBSD: patch-ac,v 1.8.4.1 2007/07/10 12:16:05 ghen Exp $
---- configure.in.orig 2007-01-10 03:45:08.000000000 +0000
-+++ configure.in 2007-01-13 11:43:20.000000000 +0000
-@@ -2009,9 +2009,9 @@
+--- configure.in.orig 2007-05-22 23:54:09.000000000 +0300
++++ configure.in 2007-07-06 13:53:22.000000000 +0300
+@@ -2019,9 +2019,9 @@
AC_DEFINE_UNQUOTED(PR_CONFIG_DIR, "`eval echo "${sysconfdir}"`")
AC_DEFINE_UNQUOTED(PR_LIBEXEC_DIR, "`eval echo "${libexecdir}"`")
AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${datadir}/locale"`")
diff -r 0429faf39841 -r ec6ca1591928 net/proftpd/patches/patch-ad
--- a/net/proftpd/patches/patch-ad Tue Jul 10 11:13:36 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2007/06/26 23:25:56 lkundrak Exp $
-
-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 **);
-
- /* For internal use only. */
-+int init_auth(void);
- int set_groups(pool *, gid_t, array_header *);
-
- #endif /* PR_MODULES_H */
diff -r 0429faf39841 -r ec6ca1591928 net/proftpd/patches/patch-ae
--- a/net/proftpd/patches/patch-ae Tue Jul 10 11:13:36 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2007/06/26 23:25:56 lkundrak Exp $
-
-Part of fix for CVE-2007-2165 grabbed from upstream #2922.
-
---- modules/mod_core.c.orig 2007-06-27 01:13:50.000000000 +0200
-+++ modules/mod_core.c
-@@ -4444,6 +4444,8 @@ static int core_sess_init(void) {
- config_rec *c = NULL;
- unsigned int *debug_level = NULL;
-
-+ init_auth();
-+
- /* Check for a server-specific TimeoutIdle. */
- c = find_config(main_server->conf, CONF_PARAM, "TimeoutIdle", FALSE);
- if (c != NULL)
diff -r 0429faf39841 -r ec6ca1591928 net/proftpd/patches/patch-af
--- a/net/proftpd/patches/patch-af Tue Jul 10 11:13:36 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,398 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/06/26 23:25:56 lkundrak Exp $
-
-Part of fix for CVE-2007-2165 grabbed from upstream #2922.
-
---- src/auth.c.orig 2007-06-27 01:13:58.000000000 +0200
-+++ src/auth.c
-@@ -2,7 +2,7 @@
- * ProFTPD - FTP server daemon
- * Copyright (c) 1997, 1998 Public Flood Software
- * Copyright (c) 1999, 2000 MacGyver aka Habeeb J. Dihu <macgyver%tos.net@localhost>
-- * Copyright (c) 2001-2006 The ProFTPD Project team
-+ * Copyright (c) 2001-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
-@@ -30,6 +30,10 @@
-
- #include "conf.h"
-
-+static pool *auth_pool = NULL;
-+static pr_table_t *auth_tab = NULL;
-+static const char *trace_channel = "auth";
-+
- /* The difference between this function, and pr_cmd_alloc(), is that this
- * allocates the cmd_rec directly from the given pool, whereas pr_cmd_alloc()
- * will allocate a subpool from the given pool, and allocate its cmd_rec
-@@ -63,7 +67,7 @@ static cmd_rec *make_cmd(pool *cp, int a
- return c;
- }
-
--static modret_t *dispatch_auth(cmd_rec *cmd, char *match) {
-+static modret_t *dispatch_auth(cmd_rec *cmd, char *match, module **m) {
- authtable *start_tab = NULL, *iter_tab = NULL;
- modret_t *mr = NULL;
-
-@@ -74,7 +78,12 @@ static modret_t *dispatch_auth(cmd_rec *
- while (iter_tab) {
- pr_signals_handle();
-
-- pr_trace_msg("auth", 6, "dispatching auth request \"%s\" to module mod_%s",
-+ if (m && *m && *m != iter_tab->m) {
-+ goto next;
-+ }
-+
-+ pr_trace_msg(trace_channel, 6,
-+ "dispatching auth request \"%s\" to module mod_%s",
- match, iter_tab->m->name);
-
- mr = call_module(iter_tab->m, iter_tab->handler, cmd);
-@@ -83,9 +92,19 @@ static modret_t *dispatch_auth(cmd_rec *
- break;
-
- if (MODRET_ISHANDLED(mr) ||
-- MODRET_ISERROR(mr))
-+ MODRET_ISERROR(mr)) {
-+
-+ /* Return a pointer, if requested, to the module which answered the
-+ * auth request. This is used, for example, by auth_getpwnam() for
-+ * associating the answering auth module with the data looked up.
-+ */
-+ if (m)
-+ *m = iter_tab->m;
-+
- break;
-+ }
-
-+ next:
- iter_tab = pr_stash_get_symbol(PR_SYM_AUTH, match, iter_tab,
- &cmd->stash_index);
-
-@@ -106,7 +125,7 @@ void pr_auth_setpwent(pool *p) {
- modret_t *mr = NULL;
-
- cmd = make_cmd(p, 0);
-- mr = dispatch_auth(cmd, "setpwent");
-+ mr = dispatch_auth(cmd, "setpwent", NULL);
-
- if (cmd->tmp_pool) {
- destroy_pool(cmd->tmp_pool);
-@@ -121,13 +140,20 @@ void pr_auth_endpwent(pool *p) {
- modret_t *mr = NULL;
-
- cmd = make_cmd(p, 0);
-- mr = dispatch_auth(cmd, "endpwent");
-+ mr = dispatch_auth(cmd, "endpwent", NULL);
-
- if (cmd->tmp_pool) {
- destroy_pool(cmd->tmp_pool);
- cmd->tmp_pool = NULL;
- }
-
-+ if (auth_tab) {
-+ pr_trace_msg(trace_channel, 5, "emptying authcache");
-+ (void) pr_table_empty(auth_tab);
-+ (void) pr_table_free(auth_tab);
-+ auth_tab = NULL;
-+ }
-+
- return;
- }
-
-@@ -136,7 +162,7 @@ void pr_auth_setgrent(pool *p) {
- modret_t *mr = NULL;
-
- cmd = make_cmd(p, 0);
-- mr = dispatch_auth(cmd, "setgrent");
-+ mr = dispatch_auth(cmd, "setgrent", NULL);
-
- if (cmd->tmp_pool) {
- destroy_pool(cmd->tmp_pool);
-@@ -151,7 +177,7 @@ void pr_auth_endgrent(pool *p) {
- modret_t *mr = NULL;
-
- cmd = make_cmd(p, 0);
-- mr = dispatch_auth(cmd, "endgrent");
-+ mr = dispatch_auth(cmd, "endgrent", NULL);
-
- if (cmd->tmp_pool) {
- destroy_pool(cmd->tmp_pool);
-@@ -167,7 +193,7 @@ struct passwd *pr_auth_getpwent(pool *p)
- struct passwd *res = NULL;
-
- cmd = make_cmd(p, 0);
-- mr = dispatch_auth(cmd, "getpwent");
-+ mr = dispatch_auth(cmd, "getpwent", NULL);
-
- if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
- res = mr->data;
-@@ -201,7 +227,7 @@ struct group *pr_auth_getgrent(pool *p)
- struct group *res = NULL;
-
- cmd = make_cmd(p, 0);
-- mr = dispatch_auth(cmd, "getgrent");
-+ mr = dispatch_auth(cmd, "getgrent", NULL);
-
- if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
- res = mr->data;
-@@ -228,11 +254,13 @@ struct passwd *pr_auth_getpwnam(pool *p,
- cmd_rec *cmd = NULL;
- modret_t *mr = NULL;
- struct passwd *res = NULL;
-+ module *m = NULL;
-
- cmd = make_cmd(p, 1, name);
-- mr = dispatch_auth(cmd, "getpwnam");
-+ mr = dispatch_auth(cmd, "getpwnam", &m);
-
-- if (MODRET_ISHANDLED(mr) && MODRET_HASDATA(mr))
-+ if (MODRET_ISHANDLED(mr) &&
-+ MODRET_HASDATA(mr))
- res = mr->data;
-
- if (cmd->tmp_pool) {
-@@ -257,6 +285,46 @@ struct passwd *pr_auth_getpwnam(pool *p,
- return NULL;
- }
-
-+ if (!auth_tab && auth_pool) {
Home |
Main Index |
Thread Index |
Old Index