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:46:55
Branch: HEAD Handle: 2006120607465400
Modified files:
openpkg-src/proftpd proftpd.spec
Log:
add optional mod_sql_odbc based SQL/ODBC support
Summary:
Revision Changes Path
1.117 +35 -7 openpkg-src/proftpd/proftpd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
============================================================================
$ cvs diff -u -r1.116 -r1.117 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 6 Dec 2006 07:03:13 -0000 1.116
+++ openpkg-src/proftpd/proftpd.spec 6 Dec 2006 07:46:54 -0000 1.117
@@ -29,6 +29,7 @@
%define V_mod_otp 0.9
%define V_mod_shaper 0.6.2
%define V_mod_sql_sqlite 0.1
+%define V_mod_sql_odbc 0.3.1
%define V_mod_time 2.2.1
%define V_mod_vroot 0.7.2
@@ -53,6 +54,7 @@
%option with_mysql no
%option with_pgsql no
%option with_sqlite no
+%option with_odbc no
%option with_ldap no
%option with_skey no
%option with_opie no
@@ -68,12 +70,13 @@
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
+Source5:
http://www.castaglia.net/proftpd/modules/proftpd-mod-sql-odbc-%{V_mod_sql_odbc}.tar.gz
+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: proftpd.conf
+Source9: proftpd.msg.goaway
+Source10: proftpd.msg.login
+Source11: rc.proftpd
Patch0: proftpd.patch
# build information
@@ -99,6 +102,10 @@
BuildPreReq: sqlite, sqlite::with_v2 = yes
PreReq: sqlite, sqlite::with_v2 = yes
%endif
+%if "%{with_odbc}" == "yes"
+BuildPreReq: ODBC
+PreReq: ODBC
+%endif
%if "%{with_ldap}" == "yes"
BuildPreReq: openldap, openssl
PreReq: openldap, openssl
@@ -152,6 +159,11 @@
url = http://www.castaglia.net/proftpd/
regex = proftpd-mod-sql-sqlite-(__VER__)\.tar\.gz
}
+ prog proftpd:mod_sql_odbc = {
+ version = %{V_mod_sql_odbc}
+ url = http://www.castaglia.net/proftpd/
+ regex = proftpd-mod-sql-odbc-(__VER__)\.tar\.gz
+ }
prog proftpd:mod_time = {
version = %{V_mod_time}
url = http://www.castaglia.net/proftpd/
@@ -171,6 +183,7 @@
%setup -q -D -T -a 4
%setup -q -D -T -a 5
%setup -q -D -T -a 6
+ %setup -q -D -T -a 7
%patch -p0
%{l_shtool} subst \
@@ -222,9 +235,21 @@
) || exit $?
%endif
+ # prepare mod_sql_odbc module
+%if "%{with_odbc}" == "yes"
+ ( cd mod_sql_odbc
+ if [ -f %{l_prefix}/etc/unixodbc/odbc.ini ]; then
+ ./configure --enable-unixodbc
+ else
+ ./configure --enable-iodbc
+ fi
+ ) || exit $?
+%endif
+
# prepare optional add-on modules
cp mod_exec/mod_exec.c contrib/
cp mod_sql_sqlite/mod_sql_sqlite.c contrib/
+ cp mod_sql_odbc/mod_sql_odbc.[ch] contrib/
cp mod_time/mod_time.c contrib/
cp mod_vroot/mod_vroot.c contrib/
%if "%{with_ctrls}" == "yes"
@@ -259,7 +284,7 @@
%if "%{with_radius}" == "yes"
MOD="$MOD:mod_radius"
%endif
-%if "%{with_mysql}" == "yes" || "%{with_pgsql}" == "yes" || "%{with_sqlite}"
== "yes"
+%if "%{with_mysql}" == "yes" || "%{with_pgsql}" == "yes" || "%{with_sqlite}"
== "yes" || "%{with_odbc}" == "yes"
MOD="$MOD:mod_sql"
%if "%{with_mysql}" == "yes"
MOD="$MOD:mod_sql_mysql"
@@ -272,6 +297,9 @@
%if "%{with_sqlite}" == "yes"
MOD="$MOD:mod_sql_sqlite"
%endif
+%if "%{with_odbc}" == "yes"
+ MOD="$MOD:mod_sql_odbc"
+%endif
%endif
%if "%{with_ldap}" == "yes"
MOD="$MOD:mod_ldap"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
