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: 04-Aug-2007 21:32:04
Branch: HEAD Handle: 2007080420320400
Modified files:
openpkg-src/dbmail dbmail-setup.sh dbmail.spec
Log:
use 'dbmail' as the database name for MySQL/PosgreSQL and create the
database schema under the DBMail user instead of the database
superuser as at least under PostgreSQL 8.2 this else would lead to
permission problems on the dbmail_xxx tables
Summary:
Revision Changes Path
1.4 +2 -2 openpkg-src/dbmail/dbmail-setup.sh
1.19 +1 -1 openpkg-src/dbmail/dbmail.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dbmail/dbmail-setup.sh
============================================================================
$ cvs diff -u -r1.3 -r1.4 dbmail-setup.sh
--- openpkg-src/dbmail/dbmail-setup.sh 13 Dec 2006 08:05:21 -0000
1.3
+++ openpkg-src/dbmail/dbmail-setup.sh 4 Aug 2007 19:32:04 -0000
1.4
@@ -45,13 +45,13 @@
( echo "GRANT ALL ON $db_name.* TO [EMAIL PROTECTED] IDENTIFIED
BY '$db_pass';"
echo "FLUSH PRIVILEGES;"
) | @l_prefix@/bin/mysql --user="$db_suser"
--password="$db_spass" mysql
- @l_prefix@/bin/mysql --user="$db_suser" --password="$db_spass"
"$db_name" <$db_script
+ @l_prefix@/bin/mysql --user="$db_user" --password="$db_pass"
"$db_name" <$db_script
elif [ ".$db_type" = .pgsql ]; then
( echo "CREATE ROLE $db_user LOGIN ENCRYPTED PASSWORD '$db_pass'
NOCREATEDB NOCREATEUSER;"
echo "CREATE TABLESPACE $db_name OWNER $db_user LOCATION
'$db_dir';"
echo "CREATE DATABASE $db_name OWNER $db_user TABLESPACE
$db_name;"
) | @l_prefix@/bin/psql -U "$db_suser" -d template1 -f-
- @l_prefix@/bin/psql -U "$db_suser" -d "$db_name" -f- <$db_script
+ @l_prefix@/bin/psql -U "$db_user" -d "$db_name" -f- <$db_script
fi
;;
uninstall )
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dbmail/dbmail.spec
============================================================================
$ cvs diff -u -r1.18 -r1.19 dbmail.spec
--- openpkg-src/dbmail/dbmail.spec 4 Aug 2007 09:31:58 -0000 1.18
+++ openpkg-src/dbmail/dbmail.spec 4 Aug 2007 19:32:04 -0000 1.19
@@ -225,7 +225,7 @@
%else
-e 's;^\(user[^=]*=\).*$;\1 dbmail;' \
-e 's;^\(pass[^=]*=\).*$;\1 dbmail;' \
- -e 's;^\(db[^=]*=\).*$;\1;' \
+ -e 's;^\(db[^=]*=\).*$;\1 dbmail;' \
%endif
-e 's;^\(sendmail[^=]*=\).*$;\1 %{l_prefix}/sbin/sendmail;' \
-e 's;^\(EFFECTIVE_USER[^=]*=\).*$;\1 %{l_rusr};' \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
