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-Sep-2007 11:50:51
Branch: HEAD Handle: 2007090610505000
Modified files:
openpkg-src/dbmail dbmail-setup.sh dbmail.spec
Log:
use new pg_superuser.conf
Summary:
Revision Changes Path
1.10 +4 -2 openpkg-src/dbmail/dbmail-setup.sh
1.26 +3 -3 openpkg-src/dbmail/dbmail.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dbmail/dbmail-setup.sh
============================================================================
$ cvs diff -u -r1.9 -r1.10 dbmail-setup.sh
--- openpkg-src/dbmail/dbmail-setup.sh 4 Sep 2007 17:09:54 -0000
1.9
+++ openpkg-src/dbmail/dbmail-setup.sh 6 Sep 2007 09:50:50 -0000
1.10
@@ -32,8 +32,10 @@
db_spass=`grep "^password" @l_prefix@/etc/mysql/my.pwd |\
sed -e 's;^password[^=]*= *;;' -e 's; *$;;'`
elif [ ".$db_type" = .pgsql ]; then
- db_suser="postgresql"
- read -s -p "Password for PostgreSQL user \"$db_suser\": " db_spass
+ db_suser=`grep "^superuser_username"
@l_prefix@/var/postgresql/db/pg_superuser.conf |\
+ sed -e 's;^ *superuser_username="\(.*\)".*;\1;'`
+ db_spass=`grep "^superuser_password"
@l_prefix@/var/postgresql/db/pg_superuser.conf |\
+ sed -e 's;^ *superuser_password="\(.*\)".*;\1;'`
fi
# dispatch operation
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dbmail/dbmail.spec
============================================================================
$ cvs diff -u -r1.25 -r1.26 dbmail.spec
--- openpkg-src/dbmail/dbmail.spec 5 Sep 2007 16:42:41 -0000 1.25
+++ openpkg-src/dbmail/dbmail.spec 6 Sep 2007 09:50:50 -0000 1.26
@@ -38,7 +38,7 @@
Group: Mail
License: GPL
Version: %{V_major}.%{V_minor}%{V_micro}
-Release: 20070905
+Release: 20070906
# package options
%option with_fsl yes
@@ -84,8 +84,8 @@
PreReq: mysql, mysql::with_innobase = yes, zlib
%endif
%if "%{with_pgsql}" == "yes"
-BuildPreReq: postgresql, openssl
-PreReq: postgresql, openssl
+BuildPreReq: postgresql >= 8.2.4-20070906, openssl
+PreReq: postgresql >= 8.2.4-20070906, openssl
%endif
%if "%{with_ldap}" == "yes"
BuildPreReq: openldap, openssl
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
