rpms/sepostgresql/F-8 sepostgresql-8.2.6-1.patch, 1.1, 1.2 sepostgresql.init, 1.9, 1.10 sepostgresql.spec, 1.9, 1.10 sepostgresql.te, 1.9, 1.10

[KaiGai Kohei (kaigai)]

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13246

Modified Files:
	sepostgresql-8.2.6-1.patch sepostgresql.init sepostgresql.spec 
	sepostgresql.te 
Log Message:
BUGFIX: (backported from development tree)
 - HeapInsert/HeapUpdate hooks called ReadBuffer without any locks.
 - Unexpected behavior in SELECT ... INTO t2 FROM t1 statement.



sepostgresql-8.2.6-1.patch:

Index: sepostgresql-8.2.6-1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sepostgresql-8.2.6-1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sepostgresql-8.2.6-1.patch	10 Jan 2008 14:53:43 -0000	1.1
+++ sepostgresql-8.2.6-1.patch	22 Jan 2008 12:25:40 -0000	1.2
@@ -1913,8 +1913,8 @@
 +endif
 diff -rpNU3 base/src/backend/security/pgaceCommon.c sepgsql/src/backend/security/pgaceCommon.c
 --- base/src/backend/security/pgaceCommon.c	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql/src/backend/security/pgaceCommon.c	2007-10-25 13:12:52.000000000 +0900
-@@ -0,0 +1,764 @@
++++ sepgsql/src/backend/security/pgaceCommon.c	2008-01-22 21:11:17.000000000 +0900
+@@ -0,0 +1,770 @@
 +/*
 + * src/backend/security/pgaceCommon.c
 + *   Common part of PostgreSQL Access Control Extension
@@ -1929,10 +1929,12 @@
 +#include "catalog/pg_attribute.h"
 +#include "catalog/pg_largeobject.h"
 +#include "catalog/pg_security.h"
++#include "catalog/pg_type.h"
 +#include "executor/executor.h"
 +#include "miscadmin.h"
 +#include "nodes/makefuncs.h"
 +#include "nodes/parsenodes.h"
++#include "parser/parse_expr.h"
 +#include "security/pgace.h"
 +#include "utils/builtins.h"
 +#include "utils/fmgroids.h"
@@ -1952,8 +1954,12 @@
 +
 +		if (tle->resjunk)
 +			continue;
-+		if (!strcmp(tle->resname, SECURITY_SYSATTR_NAME))
++		if (!strcmp(tle->resname, SECURITY_SYSATTR_NAME)) {
++			if (exprType(tle->expr) != SECLABELOID)
++				elog(ERROR, "type mismatch in explicit labeling");
 +			tle->resjunk = true;
++			break;
++		}
 +	}
 +}
 +
@@ -3704,8 +3710,8 @@
 +}
 diff -rpNU3 base/src/backend/security/sepgsqlHooks.c sepgsql/src/backend/security/sepgsqlHooks.c
 --- base/src/backend/security/sepgsqlHooks.c	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql/src/backend/security/sepgsqlHooks.c	2007-10-25 13:12:52.000000000 +0900
-@@ -0,0 +1,676 @@
++++ sepgsql/src/backend/security/sepgsqlHooks.c	2008-01-22 21:11:17.000000000 +0900
+@@ -0,0 +1,678 @@
 +/*
 + * src/backend/sepgsqlHooks.c
 + *   SE-PostgreSQL hooks
@@ -3737,6 +3743,7 @@
 +	HeapTuple oldtup;
 +
 +	buffer = ReadBuffer(rel, ItemPointerGetBlockNumber(tid));
++	LockBuffer(buffer, BUFFER_LOCK_SHARE);
 +
 +	dp = (PageHeader) BufferGetPage(buffer);
 +	lp = PageGetItemId(dp, ItemPointerGetOffsetNumber(tid));
@@ -3747,8 +3754,9 @@
 +	tuple.t_len = ItemIdGetLength(lp);
 +	tuple.t_self = *tid;
 +	tuple.t_tableOid = RelationGetRelid(rel);
-+
 +	oldtup = heap_copytuple(&tuple);
++
++	LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
 +	ReleaseBuffer(buffer);
 +
 +	return oldtup;


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sepostgresql.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sepostgresql.init	14 Jan 2008 15:56:09 -0000	1.9
+++ sepostgresql.init	22 Jan 2008 12:25:40 -0000	1.10
@@ -9,7 +9,7 @@
 
 PGVERSION="8.2.6"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
-SEPGVERSION="1.147"
+SEPGVERSION="1.158"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sepostgresql.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sepostgresql.spec	14 Jan 2008 15:56:09 -0000	1.9
+++ sepostgresql.spec	22 Jan 2008 12:25:40 -0000	1.10
@@ -13,7 +13,7 @@
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 8.2.6
-Release: 1.147%{?sepgsql_extension}%{?dist}
+Release: 1.158%{?sepgsql_extension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -206,6 +206,11 @@
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Tue Jan 22 2008 <kaigai at kaigai.gr.jp> - 8.2.6-1.158
+- backporting bugfixes:
+  lack of lacks when refering buffer pages at update/delete hooks
+  unexpected behavior in explicit labeling using SELECT ... INTO statement
+
 * Tue Jan  8 2008 <kaigai at kaigai.gr.jp> - 8.2.6-1.140
 - add "security_sysattr_name" GUC variable
 - update base PostgreSQL to 8.2.6


Index: sepostgresql.te
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-8/sepostgresql.te,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sepostgresql.te	14 Jan 2008 15:56:09 -0000	1.9
+++ sepostgresql.te	22 Jan 2008 12:25:40 -0000	1.10
@@ -1,4 +1,4 @@
-policy_module(sepostgresql, 1.147)
+policy_module(sepostgresql, 1.158)
 
 gen_require(`
 	all_userspace_class_perms