summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Lane <tgl@fedoraproject.org>2004-10-23 20:23:22 +0000
committerTom Lane <tgl@fedoraproject.org>2004-10-23 20:23:22 +0000
commitfefe019c9668356783a8ebb933e7fded2eb2534d (patch)
tree493816e95b854aaff76befcb8a87bea3ef89bbaf
parent3c38c700e24defcee32514ef8df5d9e0d6e6aa1d (diff)
downloadpostgresql-setup-fefe019c9668356783a8ebb933e7fded2eb2534d.tar.gz
postgresql-setup-fefe019c9668356783a8ebb933e7fded2eb2534d.tar.xz
postgresql-setup-fefe019c9668356783a8ebb933e7fded2eb2534d.zip
Update to Postgres 7.4.6 (bugs 136947, 136949)postgresql-7_4_6-1
-rw-r--r--.cvsignore2
-rw-r--r--postgresql.init4
-rwxr-xr-xpostgresql.spec9
-rw-r--r--sources2
4 files changed, 11 insertions, 6 deletions
diff --git a/.cvsignore b/.cvsignore
index 312b51a..2781485 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
PyGreSQL-3.5.tgz
-postgresql-7.4.5.tar.bz2
+postgresql-7.4.6.tar.bz2
diff --git a/postgresql.init b/postgresql.init
index dab3cf7..9f41e9e 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -160,9 +160,9 @@ start(){
else
echo -n $"Initializing database: "
- if [ ! -d $PGDATA ]
+ if [ ! -e $PGDATA -a ! -h $PGDATA ]
then
- mkdir -p $PGDATA
+ mkdir -p $PGDATA || exit 1
chown postgres:postgres $PGDATA
chmod go-rwx $PGDATA
fi
diff --git a/postgresql.spec b/postgresql.spec
index dd4800c..68ed204 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -45,7 +45,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
-Version: 7.4.5
+Version: 7.4.6
# Conventions for PostgreSQL Global Development Group RPM releases:
@@ -67,7 +67,7 @@ Version: 7.4.5
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 4
+Release: 1
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -788,6 +788,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Oct 23 2004 Tom Lane <tgl@redhat.com> 7.4.6-1
+- Update to PostgreSQL 7.4.6 (bugs 136947, 136949)
+- Make init script more paranoid about mkdir step of initializing a new
+ database (bugs 136947, 136949)
+
* Wed Oct 20 2004 Tom Lane <tgl@redhat.com> 7.4.5-4
- Remove contrib/oidjoins stuff from installed fileset; it's of no use
to ordinary users and has a security issue (bugs 136300, 136301)
diff --git a/sources b/sources
index 62165e8..e5b6d7d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
aec4cc8600af25b1fe895f2ee6cd9801 PyGreSQL-3.5.tgz
-97e750c8e69c208b75b6efedc5a36efb postgresql-7.4.5.tar.bz2
+f0ea2b372a7bdaf2613e92176ebf5e0f postgresql-7.4.6.tar.bz2