OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 05-Jun-2003 08:43:12
Branch: HEAD Handle: 2003060507431101
Modified files:
openpkg-src/proftpd proftpd.spec
openpkg-web news.txt
Log:
fixed PAM, added MySQL and PostgreSQL support
Summary:
Revision Changes Path
1.50 +32 -4 openpkg-src/proftpd/proftpd.spec
1.4731 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
============================================================================
$ cvs diff -u -r1.49 -r1.50 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 27 May 2003 17:18:03 -0000 1.49
+++ openpkg-src/proftpd/proftpd.spec 5 Jun 2003 06:43:12 -0000 1.50
@@ -33,10 +33,12 @@
Group: FTP
License: GPL
Version: 1.2.8
-Release: 20030527
+Release: 20030605
# package options
-%option with_pam no
+%option with_mysql no
+%option with_pam no
+%option with_pgsql no
# list of sources
Source0: ftp://ftp.proftpd.net/distrib/source/proftpd-%{version}.tar.bz2
@@ -50,10 +52,16 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20030103, ncurses, make
PreReq: OpenPKG, openpkg >= 20030103, ncurses
+%if "%{with_mysql}" == "yes"
+BuildPreReq: MYSQL
+%endif
%if "%{with_pam}" == "yes"
BuildPreReq: PAM
PreReq: PAM
%endif
+%if "%{with_pgsql}" == "yes"
+BuildPreReq: postgresql
+%endif
AutoReq: no
AutoReqProv: no
@@ -88,6 +96,22 @@
include/default_paths.h
# configure the ProFTPd source tree
+ MOD="mod_ratio:mod_readme"
+ MOD_INC="%{l_prefix}/include"
+ MOD_LIB="%{l_prefix}/lib"
+%if "%{with_mysql}" == "yes" || "%{with_pgsql}" == "yes"
+ MOD="$MOD:mod_sql"
+%if "%{with_mysql}" == "yes"
+ MOD="$MOD:mod_sql_mysql"
+ MOD_LIB="MOD_LIB:%{l_prefix}/lib/mysql"
+%endif
+%if "%{with_pgsql}" == "yes"
+ MOD="$MOD:mod_sql_postgres"
+ %{l_shtool} subst \
+ -e 's;^\(#include <\)pgsql/\(libpq-fe.h>.*\)$;\1\2;' \
+ contrib/mod_sql_postgres.c
+%endif
+%endif
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
%if "%{with_pam}" == "yes"
@@ -101,9 +125,13 @@
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/proftpd \
--localstatedir=%{l_prefix}/var/proftpd \
- --with-modules=mod_ratio:mod_readme \
+ --with-modules="$MOD" \
+ --with-includes="$MOD_INC" \
+ --with-libraries="$MOD_LIB" \
%if "%{with_pam}" == "yes"
- --enable-pam
+ --enable-auth-pam
+%else
+ --disable-auth-pam
%endif
# build ProFTPd programs
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4730 -r1.4731 news.txt
--- openpkg-web/news.txt 5 Jun 2003 05:59:32 -0000 1.4730
+++ openpkg-web/news.txt 5 Jun 2003 06:43:11 -0000 1.4731
@@ -1,3 +1,4 @@
+05-Jun-2003: Upgraded package: P<proftpd-1.2.8-20030605>
05-Jun-2003: Upgraded package: P<perl-dbix-20030605-20030605>
05-Jun-2003: Upgraded package: P<rt-3.0.2-20030605>
05-Jun-2003: Upgraded package: P<sendmail-8.12.9-20030605>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
