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:
Revision Changes Path
1.23 +14 -163 openpkg-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 -0000 1.22
+++ openpkg-src/proftpd/proftpd.patch 22 May 2007 09:49:57 -0000 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 <sqlite.h>
-+#include <sqlite3.h>
-
- #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);
-+ sqlite3_free(tmp);
-
- close_cmd = pr_cmd_alloc(cmd->tmp_pool, 1, entry->name);
- sql_sqlite_close(close_cmd);
-@@ -530,7 +525,7 @@
- }
-
- if (tmp)
-- sqlite_freemem(tmp);
-+ sqlite3_free(tmp);
-
- /* Reset these variables. The memory in them is allocated from this
- * same cmd_rec, and will be recovered when the cmd_rec is destroyed.
-@@ -594,9 +589,9 @@
- /* Perform the query. If it doesn't work 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);
-@@ -607,7 +602,7 @@
- }
-
- if (tmp)
-- sqlite_freemem(tmp);
-+ sqlite3_free(tmp);
-
- /* Reset these variables. The memory in them is allocated from this
- * same cmd_rec, and will be recovered when the cmd_rec is destroyed.
-@@ -674,9 +669,9 @@
- /* Perform the query. If it doesn't work 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);
-@@ -687,7 +682,7 @@
- }
-
- if (tmp)
-- sqlite_freemem(tmp);
-+ sqlite3_free(tmp);
-
- mr = sql_sqlite_get_data(cmd);
-
-@@ -724,9 +719,9 @@
- conn = (db_conn_t *) entry->data;
-
- unescaped = cmd->argv[1];
-- tmp = sqlite_mprintf("%q", unescaped);
-+ tmp = sqlite3_mprintf("%q", unescaped);
- escaped = pstrdup(cmd->pool, tmp);
-- sqlite_freemem(tmp);
-+ sqlite3_free(tmp);
-
- sql_log(DEBUG_FUNC, "%s", "exiting \tsqlite cmd_escapestring");
- return mod_create_data(cmd, escaped);
+ 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.c 2006-12-06 08:00:45 +0100
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
============================================================================
$ cvs diff -u -r1.129 -r1.130 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 18 May 2007 06:10:49 -0000 1.129
+++ openpkg-src/proftpd/proftpd.spec 22 May 2007 09:49:58 -0000 1.130
@@ -27,7 +27,7 @@
%define V_mod_exec 0.9.2
%define V_mod_otp 0.9.1
%define V_mod_shaper 0.6.3
-%define V_mod_sql_sqlite 0.1
+%define V_mod_sql_sqlite 0.2
%define V_mod_sql_odbc 0.3.2
%define V_mod_time 2.2.1
%define V_mod_vroot 0.7.2
@@ -44,7 +44,7 @@
Group: FTP
License: GPL
Version: %{V_proftpd}
-Release: 20070518
+Release: 20070522
# package options
%option with_ifsession no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
