[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 01-Jul-2009 12:43:06
Branch: HEAD Handle: 2009070111430600
Modified files:
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
upgrading package: proftpd 1.3.2 -> 1.3.3rc1
Summary:
RevisionChanges Path
1.29+113 -4 openpkg-src/proftpd/proftpd.patch
1.157 +2 -2 openpkg-src/proftpd/proftpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r1.28 -r1.29 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 27 Jan 2009 18:41:00 - 1.28
+++ openpkg-src/proftpd/proftpd.patch 1 Jul 2009 10:43:06 - 1.29
@@ -1,6 +1,18 @@
+Index: mod_exec/mod_exec.c
+--- mod_exec/mod_exec.c.orig 2008-11-14 16:32:42 +0100
mod_exec/mod_exec.c 2009-07-01 12:37:29 +0200
+@@ -212,7 +212,7 @@
+
+ pr_signals_block();
+ PRIVS_ROOT
+- res = log_openfile(exec_logname, &exec_logfd, 0640);
++ res = pr_log_openfile(exec_logname, &exec_logfd, 0640);
+ PRIVS_RELINQUISH
+ pr_signals_unblock();
+
Index: mod_otp/mod_otp.c
--- mod_otp/mod_otp.c.orig 2006-12-06 17:13:06 +0100
-+++ mod_otp/mod_otp.c2009-01-27 08:33:56 +0100
mod_otp/mod_otp.c2009-07-01 12:37:18 +0200
@@ -79,7 +79,7 @@
CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL);
@@ -21,7 +33,7 @@
}
Index: mod_sql_odbc/mod_sql_odbc.c
--- mod_sql_odbc/mod_sql_odbc.c.orig 2007-04-17 17:05:18 +0200
-+++ mod_sql_odbc/mod_sql_odbc.c 2009-01-27 19:16:56 +0100
mod_sql_odbc/mod_sql_odbc.c 2009-07-01 12:37:18 +0200
@@ -890,8 +890,8 @@
/* Set up our timer, if necessary. */
@@ -35,7 +47,7 @@
entry->name, entry->ttl);
Index: mod_sql_sqlite/mod_sql_sqlite.c
--- mod_sql_sqlite/mod_sql_sqlite.c.orig 2007-05-21 17:37:11 +0200
-+++ mod_sql_sqlite/mod_sql_sqlite.c 2009-01-27 19:15:57 +0100
mod_sql_sqlite/mod_sql_sqlite.c 2009-07-01 12:37:18 +0200
@@ -236,8 +236,8 @@
/* Set up our timer, if necessary. */
@@ -49,7 +61,7 @@
entry->name, entry->ttl);
Index: mod_time/mod_time.c
--- mod_time/mod_time.c.orig 2004-05-12 20:57:06 +0200
-+++ mod_time/mod_time.c 2009-01-27 08:33:56 +0100
mod_time/mod_time.c 2009-07-01 12:37:38 +0200
@@ -146,7 +146,7 @@
/* If we don't have a password file, we create an empty array and punt.
*/
@@ -97,6 +109,51 @@
for (gr_mem = gr->gr_mem; *gr_mem; gr_mem++) {
if (strcmp(*gr_mem, pw->pw_name) == 0) {
*((int *) push_array(xgids)) = (int) gr->gr_gid;
+@@ -362,7 +362,7 @@
+ /* find the matching NamedTime
+*/
+ if ((named_time = get_named_time((time_map->namev)[i])) == NULL) {
+-log_debug(DEBUG0, MOD_TIME_VERSION
++pr_log_debug(DEBUG0, MOD_TIME_VERSION
+ ": error: no matching NamedTime found for '%s'",
+ (time_map->namev)[i]);
+ continue;
+@@ -374,7 +374,7 @@
+ if (is_allowed_time(named_time)) {
+ /* Success! Return NULL, and allow the requested action to occur
+ */
+-log_debug(DEBUG3, MOD_TIME_VERSION
++pr_log_debug(DEBUG3, MOD_TIME_VERSION
+ ": command '%s' allowed by NamedTime '%s'", cmd->argv[0],
+ (time_map->namev)[i]);
+ return NULL;
+@@ -385,7 +385,7 @@
+ * command. It doesn't -- yet -- because there may be other
+ * NamedTimes in the list that do allow the command.
+ */
+-log_debug(DEBUG3, MOD_TIME_VERSION
++pr_log_debug(DEBUG3, MOD_TIME_VERSION
+ ": command '%s' denied by NamedTime '%s'", cmd->argv[0],
+ (time_map->namev)[i]);
+ }
+@@ -415,7 +415,7 @@
+ return after_hours_mesg;
+
+ } else {
+-log_debug(DEBUG2, MOD_TIME_VERSION
++pr_log_debug(DEBUG2, MOD_TIME_VERSION
+ ": error finding DisplayAfterHours '%s': %s",
+ after_hours_mesg, strerror(errno));
+ return "";
+@@ -566,7 +566,7 @@
+* is the case, default to using localtime(), and report the
+* problem.
+*/
+- log_pri(LOG_INFO, "gmtime() returned NULL -- using localtime()");
++ pr_log_pri(LOG_INFO, "gmtime() returned NULL -- using localtime()");
+ timep = localtime(&system_time);
+ }
+
@@ -634,7 +634,7 @@
if (!session.user) {
/* Populate the pw stru
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 27-Jan-2009 19:41:00
Branch: HEAD Handle: 200901271841
Modified files:
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
add optional MD5 module, add optional SFTP module(s), fix building of
SQLite and ODBC modules
Summary:
RevisionChanges Path
1.28+30 -2 openpkg-src/proftpd/proftpd.patch
1.146 +49 -5 openpkg-src/proftpd/proftpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r1.27 -r1.28 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 6 Sep 2008 16:02:51 - 1.27
+++ openpkg-src/proftpd/proftpd.patch 27 Jan 2009 18:41:00 - 1.28
@@ -1,6 +1,6 @@
Index: mod_otp/mod_otp.c
--- mod_otp/mod_otp.c.orig 2006-12-06 17:13:06 +0100
-+++ mod_otp/mod_otp.c2008-09-06 09:58:58 +0200
mod_otp/mod_otp.c2009-01-27 08:33:56 +0100
@@ -79,7 +79,7 @@
CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL);
@@ -19,9 +19,37 @@
return DECLINED(cmd);
}
+Index: mod_sql_odbc/mod_sql_odbc.c
+--- mod_sql_odbc/mod_sql_odbc.c.orig 2007-04-17 17:05:18 +0200
mod_sql_odbc/mod_sql_odbc.c 2009-01-27 19:16:56 +0100
+@@ -890,8 +890,8 @@
+
+ /* Set up our timer, if necessary. */
+ if (entry->ttl > 0) {
+-entry->timer = add_timer(entry->ttl, -1, &sql_odbc_module,
+- sqlodbc_timer_cb);
++entry->timer = pr_timer_add(entry->ttl, -1, &sql_odbc_module,
++ sqlodbc_timer_cb, "mod_sql_odbc TTL");
+
+ sql_log(DEBUG_INFO, "'%s' connection: %d second timer started",
+ entry->name, entry->ttl);
+Index: mod_sql_sqlite/mod_sql_sqlite.c
+--- mod_sql_sqlite/mod_sql_sqlite.c.orig 2007-05-21 17:37:11 +0200
mod_sql_sqlite/mod_sql_sqlite.c 2009-01-27 19:15:57 +0100
+@@ -236,8 +236,8 @@
+
+ /* Set up our timer, if necessary. */
+ if (entry->ttl > 0) {
+-entry->timer = add_timer(entry->ttl, -1, &sql_sqlite_module,
+- sql_sqlite_timer_cb);
++entry->timer = pr_timer_add(entry->ttl, -1, &sql_sqlite_module,
++ sql_sqlite_timer_cb, "mod_sql_sqlite TTL");
+
+ sql_log(DEBUG_INFO, "'%s' connection: %d second timer started",
+ entry->name, entry->ttl);
Index: mod_time/mod_time.c
--- mod_time/mod_time.c.orig 2004-05-12 20:57:06 +0200
-+++ mod_time/mod_time.c 2008-09-06 09:59:29 +0200
mod_time/mod_time.c 2009-01-27 08:33:56 +0100
@@ -146,7 +146,7 @@
/* If we don't have a password file, we create an empty array and punt.
*/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.145 -r1.146 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 27 Jan 2009 07:20:17 - 1.145
+++ openpkg-src/proftpd/proftpd.spec 27 Jan 2009 18:41:00 - 1.146
@@ -31,6 +31,9 @@
%define V_mod_time2.2.1
%define V_mod_vroot 0.8
%define V_mod_gss 1.3.1
+%define V_mod_sftp0.9.5
+%define V_mod_sftp_sql0.1
+%define V_mod_md5 0.3.3
# package information
Name: proftpd
@@ -59,6 +62,8 @@
%option with_opie no
%option with_kerberos no
%option with_sslno
+%option with_sftp no
+%option with_md5no
# checking option conflicts
%if "%{with_mysql}" == "yes" && "%{with_pgsql}" == "yes"
@@ -75,10 +80,13 @@
Source6:
http://www.castaglia.net/proftpd/modules/proftpd-mod-time-%{V_mod_time}.tar.gz
Source7:
http://www.castaglia.net/proftpd/modules/proftpd-mod-vroot-%{V_mod_vroot}.tar.gz
Source8:
http://switch.dl.sourceforge.net/gssmod/mod_gss-%{V_mod_gss}.tar.gz
-Source9: proftpd.conf
-Source10: proftpd.msg.goaway
-Source11: proftpd.msg.login
-Source12: rc.proftpd
+Source9:
http://www.castaglia.net/proftpd/modules/proftpd-mod-sftp-%{V_mod_sftp}.tar.gz
+Source10:
http://www.castaglia.net/proftpd/modules/proftpd-mod-sftp-sql-%{V_mod_sftp_sql}.tar.gz
+Source11:
http://www.castaglia.net/proftpd/modules/proftpd-mod-md5-%{V_mod_md5}.tar.gz
+Source12: proftpd.conf
+Source13: proftpd.msg.goaway
+Source14: proftpd.msg.login
+Source15: rc.proftpd
Patch0: proftpd.patch
# build information
@@ -124,7 +132,7 @@
BuildPr
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Sep-2008 18:02:54
Branch: HEAD Handle: 2008090617025101
Modified files:
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
upgrading package: proftpd 1.3.1 -> 1.3.2rc1
Summary:
RevisionChanges Path
1.27+11 -44 openpkg-src/proftpd/proftpd.patch
1.139 +3 -3 openpkg-src/proftpd/proftpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r1.26 -r1.27 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 11 Oct 2007 15:58:07 - 1.26
+++ openpkg-src/proftpd/proftpd.patch 6 Sep 2008 16:02:51 - 1.27
@@ -1,6 +1,6 @@
Index: mod_otp/mod_otp.c
--- mod_otp/mod_otp.c.orig 2006-12-06 17:13:06 +0100
-+++ mod_otp/mod_otp.c2007-10-06 09:52:27 +0200
mod_otp/mod_otp.c2008-09-06 09:58:58 +0200
@@ -79,7 +79,7 @@
CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL);
@@ -21,7 +21,7 @@
}
Index: mod_time/mod_time.c
--- mod_time/mod_time.c.orig 2004-05-12 20:57:06 +0200
-+++ mod_time/mod_time.c 2007-10-06 09:52:27 +0200
mod_time/mod_time.c 2008-09-06 09:59:29 +0200
@@ -146,7 +146,7 @@
/* If we don't have a password file, we create an empty array and punt.
*/
@@ -78,45 +78,12 @@
return NULL;
time_user = pstrdup(session.pool, pw->pw_name);
-Index: modules/mod_auth_unix.c
modules/mod_auth_unix.c.orig 2006-06-29 19:16:23 +0200
-+++ modules/mod_auth_unix.c 2007-10-06 09:52:27 +0200
-@@ -243,7 +243,7 @@
- return gr;
- }
-
--inline static int _compare_uid(idmap_t *m1, idmap_t *m2) {
-+static int _compare_uid(idmap_t *m1, idmap_t *m2) {
- if (m1->id.uid < m2->id.uid)
- return -1;
-
-@@ -253,7 +253,7 @@
- return 0;
- }
-
--inline static int _compare_gid(idmap_t *m1, idmap_t *m2) {
-+static int _compare_gid(idmap_t *m1, idmap_t *m2) {
- if (m1->id.gid < m2->id.gid)
- return -1;
-
-@@ -263,7 +263,7 @@
- return 0;
- }
-
--inline static int _compare_id(xaset_t **table, idauth_t id, idauth_t
idcomp) {
-+static int _compare_id(xaset_t **table, idauth_t id, idauth_t idcomp) {
- if (table == uid_table)
- return id.uid == idcomp.uid;
- else
-Index: configure
configure.orig 2007-10-11 12:22:28.0 +
-+++ configure2007-10-11 13:01:52.0 +
-@@ -19236,7 +19236,7 @@
- if test "${with_getopt+set}" = set; then
- withval="$with_getopt"
-
--if test "$withval" != "no" ; then
-+if test "$withval" = "no" ; then
-
- for ac_func in getopt
- do
+@@ -1603,7 +1603,7 @@
+"%R", (session.c && session.c->remote_name ? session.c->remote_name
: "(unknown)"),
+"%L", main_server->ServerFQDN,
+"%U", user,
+- "%u", session.ident_user,
++ "%u", session.user,
+"%M", mesg_max,
+"%N", mesg_cur,
+"%E", main_server->ServerAdmin,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.138 -r1.139 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 1 Jan 2008 15:03:11 - 1.138
+++ openpkg-src/proftpd/proftpd.spec 6 Sep 2008 16:02:52 - 1.139
@@ -22,8 +22,8 @@
##
# package version
-%define V_proftpd 1.3.1
-%define V_mod_exec0.9.4
+%define V_proftpd 1.3.2rc1
+%define V_mod_exec0.9.5
%define V_mod_otp 0.9.1
%define V_mod_shaper 0.6.3
%define V_mod_sql_sqlite 0.2
@@ -43,7 +43,7 @@
Group:FTP
License: GPL
Version: %{V_proftpd}
-Release: 20080101
+Release: 20080906
# package options
%option with_ifsession no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Oct-2007 17:58:07
Branch: HEAD Handle: 2007101116580700
Modified files:
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
fixed configure not checking for system getopt* if compilled with
--without-getopt
Summary:
RevisionChanges Path
1.26+12 -0 openpkg-src/proftpd/proftpd.patch
1.136 +1 -1 openpkg-src/proftpd/proftpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r1.25 -r1.26 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 6 Oct 2007 07:55:06 - 1.25
+++ openpkg-src/proftpd/proftpd.patch 11 Oct 2007 15:58:07 - 1.26
@@ -108,3 +108,15 @@
if (table == uid_table)
return id.uid == idcomp.uid;
else
+Index: configure
+--- configure.orig 2007-10-11 12:22:28.0 +
configure2007-10-11 13:01:52.0 +
+@@ -19236,7 +19236,7 @@
+ if test "${with_getopt+set}" = set; then
+ withval="$with_getopt"
+
+-if test "$withval" != "no" ; then
++if test "$withval" = "no" ; then
+
+ for ac_func in getopt
+ do
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.135 -r1.136 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 9 Oct 2007 19:08:52 - 1.135
+++ openpkg-src/proftpd/proftpd.spec 11 Oct 2007 15:58:07 - 1.136
@@ -44,7 +44,7 @@
Group:FTP
License: GPL
Version: %{V_proftpd}
-Release: 20071009
+Release: 20071011
# package options
%option with_ifsession no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Oct-2007 09:55:07
Branch: HEAD Handle: 2007100608550600
Modified files:
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
upgrading package: proftpd 1.3.1rc3 -> 1.3.1
Summary:
RevisionChanges Path
1.25+3 -22 openpkg-src/proftpd/proftpd.patch
1.134 +3 -3 openpkg-src/proftpd/proftpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r1.24 -r1.25 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 25 Jul 2007 08:30:54 - 1.24
+++ openpkg-src/proftpd/proftpd.patch 6 Oct 2007 07:55:06 - 1.25
@@ -1,6 +1,6 @@
Index: mod_otp/mod_otp.c
--- mod_otp/mod_otp.c.orig 2006-12-06 17:13:06 +0100
-+++ mod_otp/mod_otp.c2007-07-25 10:24:36 +0200
mod_otp/mod_otp.c2007-10-06 09:52:27 +0200
@@ -79,7 +79,7 @@
CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL);
@@ -21,7 +21,7 @@
}
Index: mod_time/mod_time.c
--- mod_time/mod_time.c.orig 2004-05-12 20:57:06 +0200
-+++ mod_time/mod_time.c 2007-07-25 10:24:36 +0200
mod_time/mod_time.c 2007-10-06 09:52:27 +0200
@@ -146,7 +146,7 @@
/* If we don't have a password file, we create an empty array and punt.
*/
@@ -80,7 +80,7 @@
time_user = pstrdup(session.pool, pw->pw_name);
Index: modules/mod_auth_unix.c
--- modules/mod_auth_unix.c.orig 2006-06-29 19:16:23 +0200
-+++ modules/mod_auth_unix.c 2007-07-25 10:24:36 +0200
modules/mod_auth_unix.c 2007-10-06 09:52:27 +0200
@@ -243,7 +243,7 @@
return gr;
}
@@ -108,22 +108,3 @@
if (table == uid_table)
return id.uid == idcomp.uid;
else
-Index: src/dirtree.c
src/dirtree.c.orig 2007-03-22 04:54:20 +0100
-+++ src/dirtree.c2007-07-25 10:24:36 +0200
-@@ -2911,12 +2911,13 @@
-* this address.
-*/
- snprintf(ipbuf, sizeof(ipbuf), ":::%s", ipstr);
-- ipstr = ipbuf;
-+ ipstr = pstrdup(s->pool, ipbuf);
- }
- }
- #endif /* PR_USE_IPV6 */
-
-- pr_conf_add_server_config_param_str(s, "_bind", 1, ipstr);
-+ if (ipstr)
-+pr_conf_add_server_config_param_str(s, "_bind", 1, ipstr);
- }
- }
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.133 -r1.134 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 16 Sep 2007 07:31:32 - 1.133
+++ openpkg-src/proftpd/proftpd.spec 6 Oct 2007 07:55:06 - 1.134
@@ -23,7 +23,7 @@
##
# package version
-%define V_proftpd 1.3.1rc3
+%define V_proftpd 1.3.1
%define V_mod_exec0.9.3
%define V_mod_otp 0.9.1
%define V_mod_shaper 0.6.3
@@ -31,7 +31,7 @@
%define V_mod_sql_odbc0.3.2
%define V_mod_time2.2.1
%define V_mod_vroot 0.7.2
-%define V_mod_gss 1.3.0a
+%define V_mod_gss 1.3.1
# package information
Name: proftpd
@@ -44,7 +44,7 @@
Group:FTP
License: GPL
Version: %{V_proftpd}
-Release: 20070916
+Release: 20071006
# package options
%option with_ifsession no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Jul-2007 10:30:55
Branch: HEAD Handle: 2007072509305400
Modified files:
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
upgrading package: proftpd 1.3.0a -> 1.3.1rc3
Summary:
RevisionChanges Path
1.24+97 -1152 openpkg-src/proftpd/proftpd.patch
1.131 +3 -3 openpkg-src/proftpd/proftpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r1.23 -r1.24 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 22 May 2007 09:49:57 - 1.23
+++ openpkg-src/proftpd/proftpd.patch 25 Jul 2007 08:30:54 - 1.24
@@ -1,40 +1,87 @@
-Index: mod_sql_sqlite/mod_sql_sqlite.c
mod_sql_sqlite/mod_sql_sqlite.c.orig 2007-05-21 17:37:11 +0200
-+++ mod_sql_sqlite/mod_sql_sqlite.c 2007-05-22 11:38:32 +0200
-@@ -343,7 +343,7 @@
- "lists mod_sql *before* mod_sql_sqlite, and recompile.");
- sql_log(DEBUG_FUNC, "%s", "exiting \tsqlite cmd_defineconnection");
+Index: mod_otp/mod_otp.c
+--- mod_otp/mod_otp.c.orig 2006-12-06 17:13:06 +0100
mod_otp/mod_otp.c2007-07-25 10:24:36 +0200
+@@ -79,7 +79,7 @@
+ CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL);
+
+ bool = get_boolean(cmd, 1);
+- if ((bool == -1)
++ if (bool == -1)
+ CONF_ERROR(cmd, "expecting Boolean parameter");
+
+ c = add_config_param(cmd->argv[0], 1, NULL);
+@@ -128,7 +128,7 @@
+ ": error generating challenge for user '%s': %s", cmd->argv[1],
str);
+
+ } else
+-pr_add_response_dup(R_DUP, "Challenge: [ %s ]", challenge);
++pr_response_add(R_DUP, "Challenge: [ %s ]", challenge);
--return PR_ERROR_MSG(cmd, MOD_SQL_SQLITE_VERSION, "uninitialized
module");
-+return ERROR_MSG(cmd, MOD_SQL_SQLITE_VERSION, "uninitialized module");
+ return DECLINED(cmd);
+ }
+Index: mod_time/mod_time.c
+--- mod_time/mod_time.c.orig 2004-05-12 20:57:06 +0200
mod_time/mod_time.c 2007-07-25 10:24:36 +0200
+@@ -146,7 +146,7 @@
+ /* If we don't have a password file, we create an empty array and punt.
+*/
+ if (!pw) {
+-if (!name || !(pw = (struct passwd *) auth_getpwnam(p, name))) {
++if (!name || !(pw = (struct passwd *) pr_auth_getpwnam(p, name))) {
+ *gids = make_array(p, 2, sizeof(gid_t));
+ *groups = make_array(p, 2, sizeof(char *));
+ return;
+@@ -172,7 +172,7 @@
+ /* Now populate the names of the groups.
+*/
+ for (i = 0; i < total; i++) {
+-if ((gr = (struct group *) auth_getgrgid(p, ((gid_t *)
xgids->elts)[i])))
++if ((gr = (struct group *) pr_auth_getgrgid(p, ((gid_t *)
xgids->elts)[i])))
+ *((char **) push_array(xgroups)) = pstrdup(p, gr->gr_name);
}
- conn = (db_conn_t *) palloc(conn_pool, sizeof(db_conn_t));
-@@ -706,7 +706,7 @@
-
- MODRET sql_sqlite_prepare(cmd_rec *cmd) {
- if (cmd->argc != 1) {
--return PR_ERROR(cmd);
-+return ERROR(cmd);
- }
+@@ -188,7 +188,7 @@
+ /* Nothing there...punt.
+*/
+ if (!pw) {
+-if (!name || !(pw = (struct passwd *) auth_getpwnam(p, name))) {
++if (!name || !(pw = (struct passwd *) pr_auth_getpwnam(p, name))) {
+ *gids = xgids;
+ *groups = xgroups;
+ return;
+@@ -197,16 +197,16 @@
- conn_pool = (pool *) cmd->argv[0];
-Index: mod_vroot/mod_vroot.c
mod_vroot/mod_vroot.c.orig 2006-12-06 03:58:51 +0100
-+++ mod_vroot/mod_vroot.c2006-12-06 08:00:45 +0100
-@@ -582,7 +582,7 @@
- CONF_ERROR(cmd, "must be an absolute path");
+ /* Populate the first group name.
+*/
+- if ((gr = auth_getgrgid(p, pw->pw_gid)) != NULL)
++ if ((gr = pr_auth_getgrgid(p, pw->pw_gid)) != NULL)
+ *((char **) push_array(xgroups)) = pstrdup(p, gr->gr_name);
+
+- auth_setgrent(p);
++ pr_auth_setgrent(p);
+
+ /* This is where things get slow, expensive, and ugly.
+* Loop through everything, checking to make sure we haven't already added
+* it. This is why we have getgroups() and company.
+*/
+- while ((gr = auth_getgrent(p)) != NULL && gr->gr_mem)
++ while ((gr = pr_auth_getgrent(p)) != NULL && gr->gr_mem)
+ for (gr_mem = gr->gr_mem; *gr_mem; gr_mem++) {
+ if (strcmp(*gr_mem, pw->pw_name) == 0) {
+ *((int *) push_array(xgids)) = (int) gr->gr_gid;
+@@ -634,7 +634,7 @@
+ if (!session.user) {
+ /* Populate the pw
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-May-2007 11:49:59
Branch: HEAD Handle: 2007052210495701
Modified files:
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
modifying package: proftpd-1.3.0a 20070518 -> 20070522
Summary:
RevisionChanges Path
1.23+14 -163openpkg-src/proftpd/proftpd.patch
1.130 +2 -2 openpkg-src/proftpd/proftpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r1.22 -r1.23 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 13 Apr 2007 19:24:06 - 1.22
+++ openpkg-src/proftpd/proftpd.patch 22 May 2007 09:49:57 - 1.23
@@ -1,173 +1,24 @@
Index: mod_sql_sqlite/mod_sql_sqlite.c
mod_sql_sqlite/mod_sql_sqlite.c.orig 2006-12-06 08:49:36 +0100
-+++ mod_sql_sqlite/mod_sql_sqlite.c 2006-12-06 09:01:01 +0100
-@@ -22,15 +22,15 @@
- * the source code for OpenSSL in the source distribution.
- *
- * $Id: mod_sql_sqlite.c,v 1.1 2004/10/17 19:59:48 tj Exp tj $
-- * $Libraries: -lsqlite $
-+ * $Libraries: -lsqlite3 $
- */
-
--#include
-+#include
-
- #include "conf.h"
- #include "mod_sql.h"
-
--#define MOD_SQL_SQLITE_VERSION "mod_sql_sqlite/0.1"
-+#define MOD_SQL_SQLITE_VERSION "mod_sql_sqlite/0.1+"
-
- /* Make sure the version of proftpd is as necessary. */
- #if PROFTPD_VERSION_NUMBER < 0x0001021101
-@@ -44,7 +44,7 @@
- char *user;
- char *pass;
-
-- sqlite *dbh;
-+ sqlite3 *dbh;
-
- } db_conn_t;
-
-@@ -185,7 +185,6 @@
- }
-
- MODRET sql_sqlite_open(cmd_rec *cmd) {
-- char *tmp = NULL;
- conn_entry_t *entry = NULL;
- db_conn_t *conn = NULL;
-
-@@ -220,21 +219,17 @@
- return HANDLED(cmd);
- }
-
-- conn->dbh = sqlite_open(conn->dsn, 0, &tmp);
-- if (conn->dbh == NULL) {
--char *errstr = pstrdup(cmd->pool, tmp);
--sqlite_freemem(tmp);
-+ if (sqlite3_open(conn->dsn, &conn->dbh) != SQLITE_OK) {
-+char *errstr = pstrdup(cmd->pool, sqlite3_errmsg(conn->dbh));
-+sqlite3_close(conn->dbh);
+--- mod_sql_sqlite/mod_sql_sqlite.c.orig 2007-05-21 17:37:11 +0200
mod_sql_sqlite/mod_sql_sqlite.c 2007-05-22 11:38:32 +0200
+@@ -343,7 +343,7 @@
+ "lists mod_sql *before* mod_sql_sqlite, and recompile.");
+ sql_log(DEBUG_FUNC, "%s", "exiting \tsqlite cmd_defineconnection");
- sql_log(DEBUG_FUNC, "%s", "exiting \tsqlite cmd_open");
- return ERROR_MSG(cmd, MOD_SQL_SQLITE_VERSION, errstr);
+-return PR_ERROR_MSG(cmd, MOD_SQL_SQLITE_VERSION, "uninitialized
module");
++return ERROR_MSG(cmd, MOD_SQL_SQLITE_VERSION, "uninitialized module");
}
-- if (tmp)
--sqlite_freemem(tmp);
--
- /* Add some SQLite information to the logs. */
- sql_log(DEBUG_INFO, MOD_SQL_SQLITE_VERSION ": SQLite version: %s",
--sqlite_libversion());
-+sqlite3_libversion());
-
- entry->nconn++;
-
-@@ -295,7 +290,7 @@
- (cmd->argc == 2 && cmd->argv[1])) {
-
- if (conn->dbh) {
-- sqlite_close(conn->dbh);
-+ sqlite3_close(conn->dbh);
- conn->dbh = NULL;
- }
+ conn = (db_conn_t *) palloc(conn_pool, sizeof(db_conn_t));
+@@ -706,7 +706,7 @@
-@@ -447,9 +442,9 @@
- /* Perform the query. If it doesn't work, log the error, close the
-* connection, then return the error from the query processing.
-*/
-- if (sqlite_exec(conn->dbh, query, exec_cb, cmd, &tmp) != SQLITE_OK) {
-+ if (sqlite3_exec(conn->dbh, query, exec_cb, cmd, &tmp) != SQLITE_OK) {
- char *errstr = pstrdup(cmd->pool, tmp);
--sqlite_freemem(tmp);
-+sqlite3_free(tmp);
-
- close_cmd = pr_cmd_alloc(cmd->tmp_pool, 1, entry->name);
- sql_sqlite_close(close_cmd);
-@@ -460,7 +455,7 @@
+ MODRET sql_sqlite_prepare(cmd_rec *cmd) {
+ if (cmd->argc != 1) {
+-return PR_ERROR(cmd);
++return ERROR(cmd);
}
- if (tmp)
--sqlite_freemem(tmp);
-+sqlite3_free(tmp);
-
- mr = sql_sqlite_get_data(cmd);
-
-@@ -517,9 +512,9 @@
-* connection (and log any errors there, too) then return the error
-* from the query processing.
-*/
-- if (sqlite_exec(conn->dbh, query, exec_cb, cmd, &tmp) != SQLITE_OK) {
-+ if (sqlite3_exec(conn->dbh, query, exec_cb, cmd, &tmp) != SQLITE_OK) {
- char *errstr = pstrdup(cmd->pool, tmp);
--sqlite_freemem(tmp);
-+sqli
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Apr-2007 21:24:07
Branch: HEAD Handle: 2007041320240600
Modified files:
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
MFE:
Security Fix (CVE-2006-6171)
Security Fix (CVE-2006-6563)
Summary:
RevisionChanges Path
1.22+52 -0 openpkg-src/proftpd/proftpd.patch
1.126 +1 -1 openpkg-src/proftpd/proftpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r1.21 -r1.22 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 19 Jan 2007 12:49:16 - 1.21
+++ openpkg-src/proftpd/proftpd.patch 13 Apr 2007 19:24:06 - 1.22
@@ -214,6 +214,7 @@
-
Security Fix (CVE-2006-5815, according to CVE, but vendor thinks differently)
+Security Fix (CVE-2006-6171, according to OpenPKG GmbH information)
Index: src/main.c
--- src/main.c.orig 2006-03-15 20:41:01 +0100
@@ -1279,3 +1280,54 @@
+ MOD_AUTH_FILE_VERSION
};
+
+-
+
+Security Fix (CVE-2006-6563)
+
+Index: src/ctrls.c
+--- src/ctrls.c.orig 2005-11-11 22:05:32 +0100
src/ctrls.c 2006-12-15 23:30:05 +0100
+@@ -526,11 +526,20 @@
+ return -1;
+ }
+
++ if (reqarglen >= sizeof(reqaction)) {
++pr_signals_unblock();
++errno = ENOMEM;
++return -1;
++ }
++
++ memset(reqaction, '\0', sizeof(reqaction));
++
+ if (read(cl->cl_fd, reqaction, reqarglen) < 0) {
+ pr_signals_unblock();
+ return -1;
+ }
+
++ reqaction[sizeof(reqaction)-1] = '\0';
+ nreqargs--;
+
+ /* Find a matching action object, and use it to populate a ctrl object,
+@@ -649,17 +658,16 @@
+ return -1;
+ }
+
+-memset(response, '\0', sizeof(response));
+-
+ /* Make sure resparglen is not too big */
+-if (resparglen > sizeof(response)) {
++if (resparglen >= sizeof(response)) {
+ pr_signals_unblock();
+ errno = ENOMEM;
+ return -1;
+ }
+
+-bread = read(ctrls_sockfd, response, resparglen);
++memset(response, '\0', sizeof(response));
+
++bread = read(ctrls_sockfd, response, resparglen);
+ while (bread != resparglen) {
+ if (bread < 0) {
+ pr_signals_unblock();
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.125 -r1.126 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 20 Jan 2007 13:41:12 - 1.125
+++ openpkg-src/proftpd/proftpd.spec 13 Apr 2007 19:24:06 - 1.126
@@ -44,7 +44,7 @@
Group:FTP
License: GPL
Version: %{V_proftpd}
-Release: 20070120
+Release: 20070413
# package options
%option with_ifsession no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Dec-2006 18:51:08
Branch: HEAD Handle: 2006120617510800
Modified files:
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
upstream has taken over my patches
Summary:
RevisionChanges Path
1.19+0 -21 openpkg-src/proftpd/proftpd.patch
1.119 +1 -1 openpkg-src/proftpd/proftpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r1.18 -r1.19 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 6 Dec 2006 08:07:43 - 1.18
+++ openpkg-src/proftpd/proftpd.patch 6 Dec 2006 17:51:08 - 1.19
@@ -1,24 +1,3 @@
-Index: mod_otp/mod_otp.c
mod_otp/mod_otp.c.orig 2002-10-31 02:16:23 +0100
-+++ mod_otp/mod_otp.c2005-11-07 21:15:19 +0100
-@@ -127,7 +127,7 @@
- ": error generating challenge for user '%s': %s", cmd->argv[1],
str);
-
- } else
--add_response(R_DUP, "Challenge: [ %s ]", challenge);
-+pr_response_add(R_DUP, "Challenge: [ %s ]", challenge);
-
- return DECLINED(cmd);
- }
-@@ -203,7 +203,7 @@
-
- static cmdtable otp_cmdtab[] = {
- { POST_CMD, C_USER, G_NONE, otp_post_user, FALSE, FALSE },
-- { NULL }
-+ { 0, NULL }
- };
-
- static authtable otp_authtab[] = {
Index: mod_sql_sqlite/mod_sql_sqlite.c
--- mod_sql_sqlite/mod_sql_sqlite.c.orig 2006-12-06 08:49:36 +0100
+++ mod_sql_sqlite/mod_sql_sqlite.c 2006-12-06 09:01:01 +0100
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.118 -r1.119 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 6 Dec 2006 07:47:40 - 1.118
+++ openpkg-src/proftpd/proftpd.spec 6 Dec 2006 17:51:08 - 1.119
@@ -25,7 +25,7 @@
# package version
%define V_proftpd 1.3.0a
%define V_mod_exec0.9
-%define V_mod_otp 0.9
+%define V_mod_otp 0.9.1
%define V_mod_shaper 0.6.2
%define V_mod_sql_sqlite 0.1
%define V_mod_sql_odbc0.3.1
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Dec-2006 08:03:14
Branch: HEAD Handle: 2006120607031300
Modified files:
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
modifying package: proftpd-1.3.0a 20061128 -> 20061206
Summary:
RevisionChanges Path
1.17+12 -0 openpkg-src/proftpd/proftpd.patch
1.116 +2 -2 openpkg-src/proftpd/proftpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r1.16 -r1.17 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 28 Nov 2006 07:48:54 - 1.16
+++ openpkg-src/proftpd/proftpd.patch 6 Dec 2006 07:03:13 - 1.17
@@ -19,6 +19,18 @@
};
static authtable otp_authtab[] = {
+Index: mod_vroot/mod_vroot.c
+--- mod_vroot/mod_vroot.c.orig 2006-12-06 03:58:51 +0100
mod_vroot/mod_vroot.c2006-12-06 08:00:45 +0100
+@@ -582,7 +582,7 @@
+ CONF_ERROR(cmd, "must be an absolute path");
+
+ add_config_param_str(cmd->argv[0], 1, cmd->argv[1]);
+- return PR_HANDLED(cmd);
++ return HANDLED(cmd);
+ }
+
+ /* usage: VRootOptions opt1 opt2 ... optN */
Index: modules/mod_auth_unix.c
--- modules/mod_auth_unix.c.orig 2005-07-03 20:52:02 +0200
+++ modules/mod_auth_unix.c 2006-06-27 16:10:20 +0200
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.115 -r1.116 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 28 Nov 2006 17:51:58 - 1.115
+++ openpkg-src/proftpd/proftpd.spec 6 Dec 2006 07:03:13 - 1.116
@@ -30,7 +30,7 @@
%define V_mod_shaper 0.6.2
%define V_mod_sql_sqlite 0.1
%define V_mod_time2.2.1
-%define V_mod_vroot 0.7.1
+%define V_mod_vroot 0.7.2
# package information
Name: proftpd
@@ -43,7 +43,7 @@
Group:FTP
License: GPL
Version: %{V_proftpd}
-Release: 20061128
+Release: 20061206
# package options
%option with_ifsession no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Nov-2006 08:48:55
Branch: HEAD Handle: 2006112807485400
Modified files:
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
upgrading package: proftpd 1.3.0 -> 1.3.0a
Summary:
RevisionChanges Path
1.16+1 -1 openpkg-src/proftpd/proftpd.patch
1.114 +2 -2 openpkg-src/proftpd/proftpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r1.15 -r1.16 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 16 Nov 2006 21:53:55 - 1.15
+++ openpkg-src/proftpd/proftpd.patch 28 Nov 2006 07:48:54 - 1.16
@@ -52,7 +52,7 @@
-
-Security Fix (CVE-2006-5815)
+Security Fix (CVE-2006-5815, according to CVE, but vendor thinks differently)
Index: src/main.c
--- src/main.c.orig 2006-03-15 20:41:01 +0100
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.113 -r1.114 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 16 Nov 2006 21:26:52 - 1.113
+++ openpkg-src/proftpd/proftpd.spec 28 Nov 2006 07:48:54 - 1.114
@@ -23,7 +23,7 @@
##
# package version
-%define V_proftpd 1.3.0
+%define V_proftpd 1.3.0a
%define V_mod_exec0.9
%define V_mod_exec0.9
%define V_mod_otp 0.9
@@ -43,7 +43,7 @@
Group:FTP
License: GPL
Version: %{V_proftpd}
-Release: 20061116
+Release: 20061128
# package options
%option with_ifsession no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Nov-2006 22:26:52
Branch: HEAD Handle: 2006111621265200
Modified files:
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
Security Fixes
Summary:
RevisionChanges Path
1.14+68 -0 openpkg-src/proftpd/proftpd.patch
1.113 +1 -1 openpkg-src/proftpd/proftpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r1.13 -r1.14 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 27 Jun 2006 14:12:21 - 1.13
+++ openpkg-src/proftpd/proftpd.patch 16 Nov 2006 21:26:52 - 1.14
@@ -49,3 +49,71 @@
if (table == uid_table)
return id.uid == idcomp.uid;
else
+
+-
+
+Security Fix (CVE-2006-5815)
+
+Index: src/main.c
+--- src/main.c.orig 2006-03-15 20:41:01 +0100
src/main.c 2006-11-15 16:47:29 +0100
+@@ -116,6 +116,8 @@
+
+ static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
+
++#define PR_DEFAULT_CMD_BUFSZ 512
++
+ static char **Argv = NULL;
+ static char *LastArgv = NULL;
+ static const char *PidPath = PR_PID_FILE_PATH;
+@@ -820,16 +822,25 @@
+ pr_timer_reset(TIMER_IDLE, NULL);
+
+ if (cmd_buf_size == -1) {
+- long *buf_size = get_param_ptr(main_server->conf,
+-"CommandBufferSize", FALSE);
++ int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize",
++FALSE);
+
+- if (buf_size == NULL || *buf_size <= 0)
+-cmd_buf_size = 512;
++ if (bufsz == NULL ||
++ *bufsz <= 0) {
++pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
++ "given, resetting to default buffer size (%u)",
++ *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
++cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
++
++ } else if (*bufsz + 1 > sizeof(buf)) {
++pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
++ "given, resetting to default buffer size (%u)",
++ *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
++cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+
+- else if (*buf_size + 1 > sizeof(buf)) {
+-pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. "
+- "Resetting to 512.");
+-cmd_buf_size = 512;
++ } else {
++pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
++cmd_buf_size = (long) *bufsz;
+ }
+ }
+
+-
+
+Security Fix
+
+Index: contrib/mod_tls.c
+--- contrib/mod_tls.c.orig 2005-11-08 18:59:49 +0100
contrib/mod_tls.c2006-11-15 17:54:43 +0100
+@@ -2421,6 +2421,8 @@
+ datalen = BIO_get_mem_data(mem, &data);
+
+ if (data) {
++if (datalen > sizeof(buf)-1)
++datalen = sizeof(buf)-1;
+ memset(&buf, '\0', sizeof(buf));
+ memcpy(buf, data, datalen);
+ buf[datalen] = '\0';
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.112 -r1.113 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 24 Oct 2006 05:46:50 - 1.112
+++ openpkg-src/proftpd/proftpd.spec 16 Nov 2006 21:26:52 - 1.113
@@ -43,7 +43,7 @@
Group:FTP
License: GPL
Version: %{V_proftpd}
-Release: 20061024
+Release: 20061116
# package options
%option with_ifsession no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Jun-2006 16:12:22
Branch: HEAD Handle: 2006062715122100
Modified files:
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
get rid of inline/static combination which GCC disliked at least under
64-bit platforms like FreeBSD/amd64
Summary:
RevisionChanges Path
1.13+30 -0 openpkg-src/proftpd/proftpd.patch
1.106 +1 -1 openpkg-src/proftpd/proftpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r1.12 -r1.13 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 7 Nov 2005 20:37:58 - 1.12
+++ openpkg-src/proftpd/proftpd.patch 27 Jun 2006 14:12:21 - 1.13
@@ -19,3 +19,33 @@
};
static authtable otp_authtab[] = {
+Index: modules/mod_auth_unix.c
+--- modules/mod_auth_unix.c.orig 2005-07-03 20:52:02 +0200
modules/mod_auth_unix.c 2006-06-27 16:10:20 +0200
+@@ -248,7 +248,7 @@
+ return gr;
+ }
+
+-inline static int _compare_uid(idmap_t *m1, idmap_t *m2) {
++static int _compare_uid(idmap_t *m1, idmap_t *m2) {
+ if (m1->id.uid < m2->id.uid)
+ return -1;
+
+@@ -258,7 +258,7 @@
+ return 0;
+ }
+
+-inline static int _compare_gid(idmap_t *m1, idmap_t *m2) {
++static int _compare_gid(idmap_t *m1, idmap_t *m2) {
+ if (m1->id.gid < m2->id.gid)
+ return -1;
+
+@@ -268,7 +268,7 @@
+ return 0;
+ }
+
+-inline static int _compare_id(xaset_t **table, idauth_t id, idauth_t
idcomp) {
++static int _compare_id(xaset_t **table, idauth_t id, idauth_t idcomp) {
+ if (table == uid_table)
+ return id.uid == idcomp.uid;
+ else
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.105 -r1.106 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 17 Apr 2006 09:29:27 - 1.105
+++ openpkg-src/proftpd/proftpd.spec 27 Jun 2006 14:12:21 - 1.106
@@ -43,7 +43,7 @@
Group:FTP
License: GPL
Version: %{V_proftpd}
-Release: 20060417
+Release: 20060627
# package options
%option with_ifsession no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Nov-2005 21:37:58
Branch: HEAD Handle: 2005110720375800
Added files:
openpkg-src/proftpd proftpd.patch
Modified files:
openpkg-src/proftpd proftpd.spec
Log:
add a bunch of third-party ProFTPd add-on modules
Summary:
RevisionChanges Path
1.12+21 -0 openpkg-src/proftpd/proftpd.patch
1.99+111 -12openpkg-src/proftpd/proftpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r0 -r1.12 proftpd.patch
--- /dev/null 2005-11-07 21:37:58 +0100
+++ proftpd.patch 2005-11-07 21:37:58 +0100
@@ -0,0 +1,21 @@
+Index: mod_otp/mod_otp.c
+--- mod_otp/mod_otp.c.orig 2002-10-31 02:16:23 +0100
mod_otp/mod_otp.c2005-11-07 21:15:19 +0100
+@@ -127,7 +127,7 @@
+ ": error generating challenge for user '%s': %s", cmd->argv[1],
str);
+
+ } else
+-add_response(R_DUP, "Challenge: [ %s ]", challenge);
++pr_response_add(R_DUP, "Challenge: [ %s ]", challenge);
+
+ return DECLINED(cmd);
+ }
+@@ -203,7 +203,7 @@
+
+ static cmdtable otp_cmdtab[] = {
+ { POST_CMD, C_USER, G_NONE, otp_post_user, FALSE, FALSE },
+- { NULL }
++ { 0, NULL }
+ };
+
+ static authtable otp_authtab[] = {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.98 -r1.99 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 1 Nov 2005 07:33:46 - 1.98
+++ openpkg-src/proftpd/proftpd.spec 7 Nov 2005 20:37:58 - 1.99
@@ -22,6 +22,16 @@
## SUCH DAMAGE.
##
+# package version
+%define V_proftpd 1.3.0rc3
+%define V_mod_exec0.9
+%define V_mod_exec0.9
+%define V_mod_otp 0.9
+%define V_mod_shaper 0.5.6
+%define V_mod_sql_sqlite 0.1
+%define V_mod_time2.2.1
+%define V_mod_vroot 0.7.1
+
# package information
Name: proftpd
Summary: Professional FTP Daemon
@@ -32,15 +42,18 @@
Class:BASE
Group:FTP
License: GPL
-Version: 1.3.0rc3
-Release: 20051101
+Version: %{V_proftpd}
+Release: 20051107
# package options
%option with_ifsession no
-%option with_mysql no
%option with_pamno
+%option with_mysql no
%option with_pgsql no
+%option with_sqlite no
%option with_ldap no
+%option with_skey no
+%option with_opie no
# checking option conflicts
%if "%{with_mysql}" == "yes" && "%{with_pgsql}" == "yes"
@@ -48,11 +61,18 @@
%endif
# list of sources
-Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}.tar.bz2
-Source1: proftpd.conf
-Source2: proftpd.msg.goaway
-Source3: proftpd.msg.login
-Source4: rc.proftpd
+Source0:
ftp://ftp.proftpd.org/distrib/source/proftpd-%{V_proftpd}.tar.bz2
+Source1:
http://www.castaglia.net/proftpd/modules/proftpd-mod-exec-%{V_mod_exec}.tar.gz
+Source2:
http://www.castaglia.net/proftpd/modules/proftpd-mod-otp-%{V_mod_otp}.tar.gz
+Source3:
http://www.castaglia.net/proftpd/modules/proftpd-mod-shaper-%{V_mod_shaper}.tar.gz
+Source4:
http://www.castaglia.net/proftpd/modules/proftpd-mod-sql-sqlite-%{V_mod_sql_sqlite}.tar.gz
+Source5:
http://www.castaglia.net/proftpd/modules/proftpd-mod-time-%{V_mod_time}.tar.gz
+Source6:
http://www.castaglia.net/proftpd/modules/proftpd-mod-vroot-%{V_mod_vroot}.tar.gz
+Source7: proftpd.conf
+Source8: proftpd.msg.goaway
+Source9: proftpd.msg.login
+Source10: rc.proftpd
+Patch0: proftpd.patch
# build information
Prefix: %{l_prefix}
@@ -73,10 +93,22 @@
BuildPreReq: postgresql, openssl
PreReq: postgresql, openssl
%endif
+%if "%{with_sqlite}" == "yes"
+BuildPreReq: sqlite
+PreReq: sqlite
+%endif
%if "%{with_ldap}" == "yes"
BuildPreReq: openldap, openssl
PreReq: openldap, openssl
%endif
+%if "%{with_skey}" == "yes"
+BuildPreReq: skey
+PreReq: skey
+%endif
+%if "%{with_opie}" == "yes"
+BuildPreReq: opie
+PreReq: opie
+%endif
AutoReq: no
AutoReqProv: no
@@ -99,18 +131,51 @@
%
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Nov-2005 08:33:46
Branch: HEAD Handle: 2005110107334600
Modified files:
openpkg-src/proftpd proftpd.spec
Removed files:
openpkg-src/proftpd proftpd.patch
Log:
ok, my FTP protocol fixes are now part of the new 1.3.0rc3 version
Summary:
RevisionChanges Path
1.11+0 -82 openpkg-src/proftpd/proftpd.patch
1.98+2 -4 openpkg-src/proftpd/proftpd.spec
rm -f openpkg-src/proftpd/proftpd.patch <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.97 -r1.98 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 27 Sep 2005 17:43:40 - 1.97
+++ openpkg-src/proftpd/proftpd.spec 1 Nov 2005 07:33:46 - 1.98
@@ -32,8 +32,8 @@
Class:BASE
Group:FTP
License: GPL
-Version: 1.3.0rc2
-Release: 20050927
+Version: 1.3.0rc3
+Release: 20051101
# package options
%option with_ifsession no
@@ -53,7 +53,6 @@
Source2: proftpd.msg.goaway
Source3: proftpd.msg.login
Source4: rc.proftpd
-Patch0: proftpd.patch
# build information
Prefix: %{l_prefix}
@@ -107,7 +106,6 @@
%prep
%setup -q
-%patch -p0
%{l_shtool} subst \
-e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
configure
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 27-Sep-2005 19:43:40 Branch: HEAD Handle: 2005092718434000 Modified files: openpkg-src/proftpd proftpd.patch proftpd.spec Log: the ProFTPD people in the meantime have already taken over my FTP response protocol fixes Summary: RevisionChanges Path 1.10+3 -0 openpkg-src/proftpd/proftpd.patch 1.97+1 -1 openpkg-src/proftpd/proftpd.spec patch -p0 <<'@@ .' Index: openpkg-src/proftpd/proftpd.patch $ cvs diff -u -r1.9 -r1.10 proftpd.patch --- openpkg-src/proftpd/proftpd.patch 11 Sep 2005 11:17:46 - 1.9 +++ openpkg-src/proftpd/proftpd.patch 27 Sep 2005 17:43:40 - 1.10 @@ -1,3 +1,6 @@ +[reported to vendor under http://bugs.proftpd.org/show_bug.cgi?id=2692 + and in the meantime already taken over into vendor CVS on 2005-09-27] + If "DisplayReadme README*" (mod_readme) is configured and a top-level README file exists, mod_readme's "Please read the file README[...]" response lines breaks the FTP protocol already at login time just after @@ . patch -p0 <<'@@ .' Index: openpkg-src/proftpd/proftpd.spec $ cvs diff -u -r1.96 -r1.97 proftpd.spec --- openpkg-src/proftpd/proftpd.spec 11 Sep 2005 11:17:46 - 1.96 +++ openpkg-src/proftpd/proftpd.spec 27 Sep 2005 17:43:40 - 1.97 @@ -33,7 +33,7 @@ Group:FTP License: GPL Version: 1.3.0rc2 -Release: 20050911 +Release: 20050927 # package options %option with_ifsession no @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 11-Sep-2005 13:17:46 Branch: HEAD Handle: 2005091112174600 Added files: openpkg-src/proftpd proftpd.patch Modified files: openpkg-src/proftpd proftpd.spec Log: After a few hours of debugging ProFTPd I was finally able to find the reason why ProFTPd in its latest version(s) has a broken FTP protocol handling of "DisplayReadme README*" is active and a top-evel README file exists (as it is usually the case on most of my FTP services). See the long description in the patch file for details. Summary: RevisionChanges Path 1.9 +79 -0 openpkg-src/proftpd/proftpd.patch 1.96+3 -1 openpkg-src/proftpd/proftpd.spec patch -p0 <<'@@ .' Index: openpkg-src/proftpd/proftpd.patch $ cvs diff -u -r0 -r1.9 proftpd.patch --- /dev/null 2005-09-11 13:17:15 +0200 +++ proftpd.patch 2005-09-11 13:17:46 +0200 @@ -0,0 +1,79 @@ +If "DisplayReadme README*" (mod_readme) is configured and a top-level +README file exists, mod_readme's "Please read the file README[...]" +response lines breaks the FTP protocol already at login time just after +the "PASS" request: + +---> PASS anonymous@ +<--- (null)-Please read the file README +<--- (null)- it was last modified on Sat Sep 10 20:45:37 2005 - 1 day ago +<--- (null) Anonymous access granted, restrictions apply. + +The "(null)" comes from passing a NULL pointer to the format string "%s" +on FreeBSD -- on other platforms it could even lead to a segmentation +fault. + +The reason for the broken response codes is that the mod_readme response +is added to the top of the the internal response list "resp_list" with +the response code R_DUP (= NULL) in mod_readme's POST_CMD for "PASS", +*before* mod_auth's POST_CMD for "PASS" later adds its "Anonymous access +granted, restrictions apply" with a code of "230". But R_DUP only works +if it is *following* a previous (non R_DUP/NULL) response. + +As a possible workaround we make sure that if a numeric (non R_DUP/NULL) +response is added to "resp_list" and the first already existing response +is R_DUP/NULL, insert the new response before and not after the existing +R_DUP response. After this workaround the protocol handling is fixed, +although the order of the response messages is slightly different: + +---> PASS anonymous@ +<--- 230-Anonymous access granted, restrictions apply. +<--- 230-Please read the file README +<--- 230it was last modified on Sat Sep 10 20:45:37 2005 - 1 day ago + +Alternative solutions we investigated in were: + +First, mod_readme's "POST_CMD" handler could have been dispatched +*after* mod_auth's "POST_CMD" handler. This doesn't work because +mod_auth finally HANDLES the command and does not DECLINE it. + +Second, mod_readme could use R_230 instead of R_DUP. But currently +mod_readme uses a generic callback for all commands including "CWD", +etc. And R_230 is intended after "PASS" and not "CWD". + +Finally, as inside ProFTPd the R_DUP is used also at other possibilities +(where it also could break), we decided to fix the handling directly in +the response list management routines. + +--rse 20050911 + +Index: src/response.c +--- src/response.c.orig 2005-07-05 17:42:01 +0200 src/response.c 2005-09-11 12:12:58 +0200 +@@ -124,8 +124,11 @@ + resp->num = (numeric ? pstrdup(resp_pool, numeric) : NULL); + resp->msg = pstrdup(resp_pool, resp_buf); + +- for (head = &resp_err_list; *head && (!numeric || !(*head)->num || +-strcmp((*head)->num, numeric) <= 0); head = &(*head)->next); ++ for (head = &resp_err_list; ++ *head ++ && (!numeric || !(*head)->num || strcmp((*head)->num, numeric) <= 0) ++ && !(numeric && !(*head)->num && head == &resp_list); ++ head = &(*head)->next); + + resp->next = *head; + *head = resp; +@@ -145,8 +148,11 @@ + resp->num = (numeric ? pstrdup(resp_pool, numeric) : NULL); + resp->msg = pstrdup(resp_pool, resp_buf); + +- for (head = &resp_list; *head && (!numeric || !(*head)->num || +-strcmp((*head)->num, numeric) <= 0); head = &(*head)->next); ++ for (head = &resp_list; ++ *head ++ && (!numeric || !(*head)->num || strcmp((*head)->num, numeric) <= 0) ++ && !(numeric && !(*head)->num && head == &resp_list); ++ head = &(*head)->next
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec rc.prof...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Apr-2005 10:50:45
Branch: HEAD Handle: 2005041109504400
Modified files:
openpkg-src/proftpd proftpd.spec rc.proftpd
Removed files:
openpkg-src/proftpd proftpd.patch
Log:
upgrade to 1.3.0rc1; flag more files as %config; fix substitutions;
remove obsolete patch
Summary:
RevisionChanges Path
1.8 +0 -93 openpkg-src/proftpd/proftpd.patch
1.93+7 -8 openpkg-src/proftpd/proftpd.spec
1.17+0 -2 openpkg-src/proftpd/rc.proftpd
rm -f openpkg-src/proftpd/proftpd.patch <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.92 -r1.93 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 6 Apr 2005 19:38:34 - 1.92
+++ openpkg-src/proftpd/proftpd.spec 11 Apr 2005 08:50:44 - 1.93
@@ -32,8 +32,8 @@
Class:BASE
Group:FTP
License: GPL
-Version: 1.2.10
-Release: 20050406
+Version: 1.3.0rc1
+Release: 20050411
# package options
%option with_ifsession no
@@ -53,7 +53,6 @@
Source2: proftpd.msg.goaway
Source3: proftpd.msg.login
Source4: rc.proftpd
-Patch0: proftpd.patch
# build information
Prefix: %{l_prefix}
@@ -107,7 +106,6 @@
%prep
%setup -q
-%patch -p0
# utils also require link with getopt
%{l_shtool} subst \
@@ -140,12 +138,12 @@
-e 's;^\([EMAIL PROTECTED]@\)/proftpd;\1;' \
Make.rules.in
%{l_shtool} subst \
--e 's;^\(#define RUN_DIR "`eval echo
"${localstatedir}\)/proftpd;\1;' \
+-e 's;^\(#define PR_RUN_DIR "`eval echo
"${localstatedir}\)/proftpd;\1;' \
configure
# write shutdown message file to OpenPKG instance, not outside
%{l_shtool} subst \
--e 's;\(#define
SHUTMSG_PATH.*"\)\(/etc/\)\(shutmsg\)";\1%{l_prefix}\2proftpd/\3";' \
+-e 's;\(#define
PR_SHUTMSG_PATH.*"\)\(/etc/\)\(shutmsg\)";\1%{l_prefix}\2proftpd/\3";' \
include/default_paths.h
# configure the ProFTPd source tree
@@ -204,7 +202,7 @@
%{l_shtool} subst -v \
-e 's;-o $(INSTALL_USER) -g $(INSTALL_GROUP);;g' \
-e 's;chown;true;g' \
-Makefile
+Makefile Make.rules
# perform the "install" procedure while redirecting
# it to the temporarily install area
@@ -252,7 +250,8 @@
# determine the package ingredients
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
-'%config %attr(0600,%{l_susr},%{l_sgrp})
%{l_prefix}/etc/proftpd/proftpd.conf'
+'%config %attr(0600,%{l_susr},%{l_sgrp})
%{l_prefix}/etc/proftpd/proftpd.conf' \
+'%config %{l_prefix}/etc/proftpd/proftpd.msg.*'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/rc.proftpd
$ cvs diff -u -r1.16 -r1.17 rc.proftpd
--- openpkg-src/proftpd/rc.proftpd30 Jul 2004 14:03:04 - 1.16
+++ openpkg-src/proftpd/rc.proftpd11 Apr 2005 08:50:44 - 1.17
@@ -67,8 +67,6 @@
%daily -u @l_susr@
rcService proftpd enable yes || exit 0
-
-# rotate logfile
rcTmp -i
hintfile=`rcTmp -f -n hint`
shtool rotate -f \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
