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-Jan-2006 09:18:21
Branch: HEAD Handle: 2006010608182100
Modified files:
openpkg-src/postgresql postgresql.spec
Log:
upgrading package: postgresql 8.1.1 -> 8.1.2
Summary:
Revision Changes Path
1.179 +43 -13 openpkg-src/postgresql/postgresql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql/postgresql.spec
============================================================================
$ cvs diff -u -r1.178 -r1.179 postgresql.spec
--- openpkg-src/postgresql/postgresql.spec 4 Jan 2006 16:15:42 -0000
1.178
+++ openpkg-src/postgresql/postgresql.spec 6 Jan 2006 08:18:21 -0000
1.179
@@ -25,7 +25,7 @@
# FIXME: rse: pgcluster no longer applies after PostgreSQL 8.1 upgrade
# package versions
-%define V_postgresql 8.1.1
+%define V_postgresql 8.1.2
%define V_libpqpp 4.0
%define V_libpqxx 2.5.5
%define V_pgperl 2.0.2
@@ -44,7 +44,7 @@
Group: Database
License: GPL
Version: %{V_postgresql}
-Release: 20060104
+Release: 20060106
# package options
%option with_server yes
@@ -55,6 +55,7 @@
%option with_tcl no
%option with_slony1 no
%option with_pgcluster no
+%option with_kerberos no
# list of sources
Source0:
ftp://ftp.postgresql.org/pub/source/v%{V_postgresql}/postgresql-%{V_postgresql}.tar.gz
@@ -87,6 +88,10 @@
BuildPreReq: tcl, tcl::with_x11 = yes, X11
PreReq: tcl, tcl::with_x11 = yes, X11
%endif
+%if "%{with_kerberos}" == "yes"
+BuildPreReq: kerberos
+PreReq: kerberos
+%endif
AutoReq: no
AutoReqProv: no
@@ -177,6 +182,11 @@
-e '/preproc\.c/,/Makefile\.aix/d' | \
%{l_patch} -p1
%endif
+%if "%{with_kerberos}" == "yes"
+ %{l_shtool} subst \
+ -e 's;krb5 -ldes -lasn1 -lroken;krb5 -lk5crypto -lkrb5support
-lcom_err;g' \
+ configure
+%endif
# adjust source tree
%{l_shtool} subst \
@@ -198,21 +208,23 @@
# configure package
( echo "ac_cv_func_isinf=no"
) >config.cache
- CC="%{l_cc}" \
+ export CC="%{l_cc}"
+ export CFLAGS="%{l_cflags -O}"
+ export CPPFLAGS="%{l_cppflags readline}
-DOPENSSL_DISABLE_OLD_DES_SUPPORT"
+ export LDFLAGS="%{l_ldflags}"
%if "%{with_slony1}" == "yes"
- CFLAGS="%{l_cflags -O} -pthread" \
-%else
- CFLAGS="%{l_cflags -O}" \
+ CFLAGS="$CFLAGS -pthread"
%endif
%if "%{with_tcl}" == "yes"
- CPPFLAGS="%{l_cppflags readline tcl} -DOPENSSL_DISABLE_OLD_DES_SUPPORT" \
- LDFLAGS="%{l_ldflags} -L`%{l_rc} --query x11_libdir`" \
-%else
- CPPFLAGS="%{l_cppflags readline} -DOPENSSL_DISABLE_OLD_DES_SUPPORT" \
- LDFLAGS="%{l_ldflags}" \
+ CPPFLAGS="$CPPFLAGS %{l_cppflags tcl}"
+ LDFLAGS="$LDFLAGS -L`%{l_rc} --query x11_libdir`"
+%endif
+%if "%{with_kerberos}" == "yes"
+ CPPFLAGS="$CPPFLAGS %{l_cppflags kerberos}"
+ LDFLAGS="$LDFLAGS %{l_ldflags kerberos}"
%endif
- TAR="%{l_tar}" \
- YACC="bison -y" \
+ export TAR="%{l_tar}"
+ export YACC="bison -y"
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
@@ -229,6 +241,10 @@
%if "%{with_slony1}" == "yes"
--enable-thread-safety \
%endif
+%if "%{with_kerberos}" == "yes"
+ --with-krb5 \
+ --with-krb-srvnam=postgresql \
+%endif
--disable-syslog \
--disable-shared
@@ -601,6 +617,20 @@
echo "you should immediately change this with the following
command:"
echo " \$ $RPM_INSTALL_PREFIX/bin/psql -U $l_pguser -d
template1 \\"
echo " -c \"ALTER USER $l_pguser WITH PASSWORD
'<new-password>'\""
+ echo "Then you usually create a database for a user <user> with"
+ echo "password <password> under path /u/<user>/rdbms with the
commands:"
+ echo " \$ mkdir /u/<user>/rdbms"
+ echo " \$ chmod 700 /u/<user>/rdbms"
+ echo " \$ chown %{l_rusr}:%{l_rgrp} /u/<user>/rdbms"
+ echo " \$ $RPM_INSTALL_PREFIX/bin/psql -U $l_pguser -d
template1"
+ echo " template1=> CREATE USER <user>"
+ echo " ENCRYPTED PASSWORD '<password>'"
+ echo " NOCREATEDB NOCREATEUSER;"
+ echo " template1=> CREATE TABLESPACE dss OWNER dss"
+ echo " LOCATION '/u/<user>/rdbms';"
+ echo " template1=> CREATE DATABASE <user>"
+ echo " \$ echo 'localhost:*:<user>:<user>:<password>'"
+ echo " >/home/<user>/.pgpass"
) | %{l_rpmtool} msg -b -t notice
# optionally link into unixODBC
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
