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: 2009012718410000
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:
Revision Changes 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 -0000 1.27
+++ openpkg-src/proftpd/proftpd.patch 27 Jan 2009 18:41:00 -0000 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.c 2008-09-06 09:58:58 +0200
++++ mod_otp/mod_otp.c 2009-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 -0000 1.145
+++ openpkg-src/proftpd/proftpd.spec 27 Jan 2009 18:41:00 -0000 1.146
@@ -31,6 +31,9 @@
%define V_mod_time 2.2.1
%define V_mod_vroot 0.8
%define V_mod_gss 1.3.1
+%define V_mod_sftp 0.9.5
+%define V_mod_sftp_sql 0.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_ssl no
+%option with_sftp no
+%option with_md5 no
# 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 @@
BuildPreReq: KERBEROS
PreReq: KERBEROS
%endif
-%if "%{with_ssl}" == "yes"
+%if "%{with_ssl}" == "yes" || "%{with_sftp}" == "yes"
BuildPreReq: openssl
PreReq: openssl
%endif
@@ -189,6 +197,21 @@
url = http://prdownloads.sourceforge.net/gssmod/
regex = mod_gss-(__VER__)\.tar\.gz
}
+ prog proftpd:mod_sftp = {
+ version = %{V_mod_sftp}
+ url = http://www.castaglia.net/proftpd/
+ regex = proftpd-mod-sftp-(__VER__)\.tar\.gz
+ }
+ prog proftpd:mod_sftp_sql = {
+ version = %{V_mod_sftp_sql}
+ url = http://www.castaglia.net/proftpd/
+ regex = proftpd-mod-sftp-sql-(__VER__)\.tar\.gz
+ }
+ prog proftpd:mod_md5 = {
+ version = %{V_mod_md5}
+ url = http://www.castaglia.net/proftpd/
+ regex = proftpd-mod-md5-(__VER__)\.tar\.gz
+ }
%prep
%setup -q
@@ -200,6 +223,9 @@
%setup -q -D -T -a 6
%setup -q -D -T -a 7
%setup -q -D -T -a 8
+ %setup -q -D -T -a 9
+ %setup -q -D -T -a 10
+ %setup -q -D -T -a 11
%patch -p0
%{l_shtool} subst \
@@ -272,6 +298,15 @@
%if "%{with_ctrls}" == "yes"
cp mod_shaper/mod_shaper.c contrib/
%endif
+%if "%{with_sftp}" == "yes"
+ cp -r mod_sftp contrib/
+%if "%{with_mysql}" == "yes" || "%{with_pgsql}" == "yes" || "%{with_sqlite}"
== "yes" || "%{with_odbc}" == "yes"
+ cp mod_sftp_sql/mod_sftp_sql.c contrib/
+%endif
+%endif
+%if "%{with_md5}" == "yes"
+ cp mod_md5/mod_md5.c contrib/
+%endif
# prepare mod_gss module
%if "%{with_kerberos}" == "yes"
@@ -349,6 +384,15 @@
%if "%{with_ssl}" == "yes"
MOD="$MOD:mod_tls"
%endif
+%if "%{with_sftp}" == "yes"
+ MOD="$MOD:mod_sftp"
+%if "%{with_mysql}" == "yes" || "%{with_pgsql}" == "yes" || "%{with_sqlite}"
== "yes" || "%{with_odbc}" == "yes"
+ MOD="$MOD:mod_sftp_sql"
+%endif
+%endif
+%if "%{with_md5}" == "yes"
+ MOD="$MOD:mod_md5"
+%endif
export CC="%{l_cc}"
export CFLAGS="%{l_cflags -O}"
export CPPFLAGS="%{l_cppflags ncurses}"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
