rpms/postgresql/devel postgresql.init, 1.25, 1.26 postgresql.spec, 1.119, 1.120

[Tom Lane]

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6108

Modified Files:
	postgresql.init postgresql.spec 
Log Message:
Ensure pgstartup.log gets the right ownership/permissions during initdb


Index: postgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.init,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- postgresql.init	18 Aug 2009 02:58:55 -0000	1.25
+++ postgresql.init	22 Sep 2009 00:45:57 -0000	1.26
@@ -132,7 +132,7 @@ start(){
 		touch "$PGLOG" || exit 1
 		chown postgres:postgres "$PGLOG"
 		chmod go-rwx "$PGLOG"
-		[ -x /usr/bin/chcon ] && /usr/bin/chcon -u system_u -r object_r -t postgresql_log_t "$PGLOG" 2>/dev/null
+		[ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
 	fi
 
 	# Check for the PGDATA structure
@@ -243,8 +243,19 @@ initdb(){
 	fi
 	# Clean up SELinux tagging for PGDATA
 	[ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
+
+	# Make sure the startup-time log file is OK, too
+	if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]
+	then
+		touch "$PGLOG" || exit 1
+		chown postgres:postgres "$PGLOG"
+		chmod go-rwx "$PGLOG"
+		[ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
+	fi
+
 	# Initialize the database
 	$SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'" >> "$PGLOG" 2>&1 < /dev/null
+
 	# Create directory for postmaster log
 	mkdir "$PGDATA/pg_log"
 	chown postgres:postgres "$PGDATA/pg_log"


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- postgresql.spec	16 Sep 2009 17:50:13 -0000	1.119
+++ postgresql.spec	22 Sep 2009 00:45:57 -0000	1.120
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs and 
 Name: postgresql
 %define majorversion 8.4
 Version: 8.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 # PG considers their license to be simplified BSD, but it's more nearly MIT
 License: MIT
 Group: Applications/Databases
@@ -854,6 +854,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 21 2009 Tom Lane <tgl at redhat.com> 8.4.1-3
+- Ensure pgstartup.log gets the right ownership/permissions during initdb
+Resolves: #498959
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 8.4.1-2
 - Use password-auth common PAM configuration instead of system-auth