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:
Revision Changes 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 -0000 1.28
+++ openpkg-src/proftpd/proftpd.patch 1 Jul 2009 10:43:06 -0000 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.c 2009-01-27 08:33:56 +0100
++++ mod_otp/mod_otp.c 2009-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 struct, check for a NULL return value. */
@@ -115,3 +172,55 @@
"%M", mesg_max,
"%N", mesg_cur,
"%E", main_server->ServerAdmin,
+@@ -1929,12 +1929,12 @@
+ * the command pass now.
+ */
+ if ((deny_mesg_file = get_deny_mesg(cmd)) == NULL) {
+- log_debug(DEBUG3, MOD_TIME_VERSION ": %s allowed by configuration",
++ pr_log_debug(DEBUG3, MOD_TIME_VERSION ": %s allowed by configuration",
+ cmd->argv[0]);
+ return DECLINED(cmd);
+ }
+
+- log_debug(DEBUG3, MOD_TIME_VERSION ": %s denied by configuration",
++ pr_log_debug(DEBUG3, MOD_TIME_VERSION ": %s denied by configuration",
+ cmd->argv[0]);
+
+ /* Check for an empty deny_mesg_file string, signalling no message.
+@@ -1961,7 +1961,7 @@
+ */
+
+ if (strlen(deny_mesg_file) > 0) {
+- log_debug(DEBUG4, MOD_TIME_VERSION ": displaying '%s'", deny_mesg_file);
++ pr_log_debug(DEBUG4, MOD_TIME_VERSION ": displaying '%s'",
deny_mesg_file);
+
+ if (strcmp(cmd->argv[0], C_PASV) == 0 ||
+ strcmp(cmd->argv[0], C_PORT) == 0)
+@@ -1982,11 +1982,11 @@
+ if ((denymesg = (char *) get_param_ptr((session.anon_config ?
+ session.anon_config->subset : cmd->server->conf),
+ "AccessDenyMsg", FALSE)) != NULL) {
+- log_debug(DEBUG5, MOD_TIME_VERSION ": displaying AccessDenyMsg");
++ pr_log_debug(DEBUG5, MOD_TIME_VERSION ": displaying AccessDenyMsg");
+ denymesg = sreplace(cmd->tmp_pool, denymesg, "%u", user, NULL);
+
+ } else {
+- log_debug(DEBUG5, MOD_TIME_VERSION ": displaying default message");
++ pr_log_debug(DEBUG5, MOD_TIME_VERSION ": displaying default message");
+ denymesg = pstrcat(cmd->tmp_pool, cmd->argv[0],
+ " not allowed at this time.", NULL);
+ }
+@@ -2025,11 +2025,11 @@
+ * If none are found, let the command pass now.
+ */
+ if ((deny_mesg_file = get_deny_mesg(cmd)) == NULL) {
+- log_debug(DEBUG5, MOD_TIME_VERSION ": login allowed by configuration");
++ pr_log_debug(DEBUG5, MOD_TIME_VERSION ": login allowed by
configuration");
+ return DECLINED(cmd);
+ }
+
+- log_debug(DEBUG3, MOD_TIME_VERSION ": login denied by configuration");
++ pr_log_debug(DEBUG3, MOD_TIME_VERSION ": login denied by configuration");
+
+ /* Check for an empty deny_mesg_file string, signalling no message.
+ * Deny connection with a 421 error.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
============================================================================
$ cvs diff -u -r1.156 -r1.157 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 30 Jun 2009 20:21:17 -0000 1.156
+++ openpkg-src/proftpd/proftpd.spec 1 Jul 2009 10:43:06 -0000 1.157
@@ -22,7 +22,7 @@
##
# package version
-%define V_proftpd 1.3.2
+%define V_proftpd 1.3.3rc1
%define V_mod_exec 0.9.6
%define V_mod_otp 0.9.1
%define V_mod_shaper 0.6.5
@@ -46,7 +46,7 @@
Group: FTP
License: GPL
Version: %{V_proftpd}
-Release: 20090327
+Release: 20090701
# package options
%option with_ifsession no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
