rpms/sepostgresql/F-9 sepostgresql-sepgsql-8.3.1-2.patch, 1.1, 1.2 sepostgresql.init, 1.18, 1.19 sepostgresql.spec, 1.19, 1.20 sepostgresql.te, 1.18, 1.19

[KaiGai Kohei (kaigai)]

Author: kaigai

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

Modified Files:
	sepostgresql-sepgsql-8.3.1-2.patch sepostgresql.init 
	sepostgresql.spec sepostgresql.te 
Log Message:
- Inconsistent version number format at Changelogs
- BUGFIX: ROW-level control did not work correctly on TRUNCATE



sepostgresql-sepgsql-8.3.1-2.patch:

Index: sepostgresql-sepgsql-8.3.1-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql-sepgsql-8.3.1-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sepostgresql-sepgsql-8.3.1-2.patch	27 Mar 2008 17:23:38 -0000	1.1
+++ sepostgresql-sepgsql-8.3.1-2.patch	30 Apr 2008 03:01:52 -0000	1.2
@@ -3039,8 +3039,8 @@
 +}
 diff -rpNU3 pgace/src/backend/security/sepgsql/proxy.c sepgsql/src/backend/security/sepgsql/proxy.c
 --- pgace/src/backend/security/sepgsql/proxy.c	1970-01-01 09:00:00.000000000 +0900
-+++ sepgsql/src/backend/security/sepgsql/proxy.c	2008-03-11 16:03:12.000000000 +0900
-@@ -0,0 +1,1618 @@
++++ sepgsql/src/backend/security/sepgsql/proxy.c	2008-04-30 10:19:50.000000000 +0900
+@@ -0,0 +1,1617 @@
 +/*
 + * src/backend/security/sepgsqlProxy.c
 + *   SE-PostgreSQL Query Proxy function to walk on query node tree
@@ -4085,7 +4085,7 @@
 +	return list_make1(query);
 +}
 +
-+static Query *convertTruncateToDelete(Relation rel)
++static List *convertTruncateToDelete(Relation rel)
 +{
 +	Query *query = makeNode(Query);
 +	RangeTblEntry *rte;
@@ -4105,31 +4105,30 @@
 +	query->hasSubLinks = false;
 +	query->hasAggs = false;
 +
-+	sepgsqlProxyQuery(query);
++	elog(NOTICE, "SELinux: TRUNCATE %s is replaced unconditional DELETE",
++		 RelationGetRelationName(rel));
 +
-+	return query;
++	return sepgsqlProxyQuery(query);
 +}
 +
 +static List *proxyTruncateStmt(Query *query)
 +{
 +	TruncateStmt *stmt = (TruncateStmt *) query->utilityStmt;
 +	Relation rel;
-+	Query *subqry;
 +	ListCell *l;
-+	List *subquery_list = NIL, *subquery_lids = NIL;
++	List *subquery_list = NIL;
++	List *subquery_lids = NIL;
 +
 +	/* resolve the relation names */
 +	foreach (l, stmt->relations) {
 +		RangeVar *rv = lfirst(l);
 +
 +		rel = heap_openrv(rv, AccessShareLock);
-+		subqry = convertTruncateToDelete(rel);
-+		subquery_list = lappend(subquery_list, subqry);
-+		subquery_lids = lappend_oid(subquery_lids, RelationGetRelid(rel));
-+		heap_close(rel, NoLock);
-+
-+		elog(NOTICE, "SELinux: TRUNCATE %s is replaced unconditional DELETE",
-+			 RelationGetRelationName(rel));
++		subquery_list = list_concat(subquery_list,
++									convertTruncateToDelete(rel));
++		subquery_lids = lappend_oid(subquery_lids,
++									RelationGetRelid(rel));
++		heap_close(rel, AccessShareLock);
 +	}
 +
 +	if (stmt->behavior == DROP_CASCADE) {
@@ -4138,9 +4137,9 @@
 +			Oid relid = lfirst_oid(l);
 +
 +			rel = heap_open(relid, AccessShareLock);
-+			subqry = convertTruncateToDelete(rel);
-+			subquery_list = lappend(subquery_list, subqry);
-+			heap_close(rel, NoLock);
++			subquery_list = list_concat(subquery_list,
++										convertTruncateToDelete(rel));
++			heap_close(rel, AccessShareLock);
 +		}
 +	}
 +	return subquery_list;


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql.init,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sepostgresql.init	27 Mar 2008 17:23:38 -0000	1.18
+++ sepostgresql.init	30 Apr 2008 03:01:52 -0000	1.19
@@ -9,7 +9,7 @@
 
 PGVERSION="8.3.1"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'`
-SEPGVERSION="2.179"
+SEPGVERSION="2.197"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sepostgresql.spec	27 Mar 2008 17:23:38 -0000	1.19
+++ sepostgresql.spec	30 Apr 2008 03:01:52 -0000	1.20
@@ -13,7 +13,7 @@
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 8.3.1
-Release: 2.179%{?sepgsql_extension}%{?dist}
+Release: 2.197%{?sepgsql_extension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -211,26 +211,32 @@
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
-* Sun Mar  9 2008 <kaigai at kaigai.gr.jp> - sepostgresql-8.3.0-2.129
+* Wed Apr 30 2008 <kaigai at kaigai.gr.jp> - 8.3.1-2.197
+- Inconsistent version number format at Changelogs
+
+* Wed Apr 30 2008 <kaigai at kaigai.gr.jp> - 8.3.1-2.196
+- BUGFIX: ROW-level control did not work correctly on TRUNCATE
+
+* Sun Mar  9 2008 <kaigai at kaigai.gr.jp> - 8.3.0-2.129
 - BUGFIX: more conprehensive fixes in "SELECT COUNT(*) ..."
 
-* Sun Mar  2 2008 <kaigai at kaigai.gr.jp> - sepostgresql-8.3.0-2.120
+* Sun Mar  2 2008 <kaigai at kaigai.gr.jp> - 8.3.0-2.120
 - BUGFIX: CREATE TABLE statement with explicit labeled columns
 - BUGFIX: SELECT count(*) does not filter unallowed tuples
 
-* Wed Feb 27 2008 <kaigai at kaigai.gr.jp> - sepostgresql-8.3.0-2.117
+* Wed Feb 27 2008 <kaigai at kaigai.gr.jp> - 8.3.0-2.117
 - ".beta" removed.
 
-* Wed Feb 27 2008 <kaigai at kaigai.gr.jp> - sepostgresql-8.3.0-2.114
+* Wed Feb 27 2008 <kaigai at kaigai.gr.jp> - 8.3.0-2.114
 - Security policy updates
 
-* Tue Feb 26 2008 <kaigai at kaigai.gr.jp> - sepostgresql-8.3.0-2.113
+* Tue Feb 26 2008 <kaigai at kaigai.gr.jp> - 8.3.0-2.113
 - BUGFIX: CREATE/ALTER TABLE with CONTEXT='...' did nothing.
 
-* Thu Feb  7 2008 <kaigai at kaigai.gr.jp> - sepostgresql-8.3.0-2.108
+* Thu Feb  7 2008 <kaigai at kaigai.gr.jp> - 8.3.0-2.108
 - add /etc/logrotate.d/sepostgresql
 
-* Thu Feb  7 2008 <kaigai at kaigai.gr.jp> - sepostgresql-8.3.0-2.105
+* Thu Feb  7 2008 <kaigai at kaigai.gr.jp> - 8.3.0-2.105
 - update base version to stable 8.3.0
 - add tzdata dependency
 - allow db_database:{get_param set_param} for generic domain
@@ -240,17 +246,17 @@
 - BUGFIX: incorrect permission in DELETE with RETURNING clause
 - incorrect permission when we read and update security_context in same time.
 
-* Fri Jan 25 2008 <kaigai at kaigai.gr.jp> - sepostgresql-8.3RC2-2.62
+* Fri Jan 25 2008 <kaigai at kaigai.gr.jp> - 8.3RC2-2.62
 - BUGFIX: add handling to invalid contexts already stored
 
-* Tue Jan 22 2008 <kaigai at kaigai.gr.jp> - sepostgresql-8.3RC2-2.56
+* Tue Jan 22 2008 <kaigai at kaigai.gr.jp> - 8.3RC2-2.56
 - BUGFIX: lack of locks when refering buffer pages at update/delete hooks
 - BUGFIX: explicit labeling using SELECT ... INTO statement.
 
-* Sun Jan 20 2008 <kaigai at kaigai.gr.jp> - sepostgresql-8.3RC2-2.52
+* Sun Jan 20 2008 <kaigai at kaigai.gr.jp> - 8.3RC2-2.52
 - shares /usr/lib/pgsql/*.so libraries, with original postgresql.
 
-* Thu Jan 10 2008 <kaigai at kaigai.gr.jp> - sepostgresql-8.3RC1-2.37
+* Thu Jan 10 2008 <kaigai at kaigai.gr.jp> - 8.3RC1-2.37
 - add sepg_dump/sepg_dumpall support for 8.3base package.
 
 * Mon Nov 26 2007 <kaigai at kaigai.gr.jp> - 8.3beta3-2.0


Index: sepostgresql.te
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/F-9/sepostgresql.te,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sepostgresql.te	27 Mar 2008 17:23:38 -0000	1.18
+++ sepostgresql.te	30 Apr 2008 03:01:52 -0000	1.19
@@ -1,4 +1,4 @@
-policy_module(sepostgresql, 2.179)
+policy_module(sepostgresql, 2.197)
 
 gen_require(`
         class db_database all_db_database_perms;