rpms/sepostgresql/devel sepostgresql-8.4.patch, 1.2, 1.3 sepostgresql.spec, 1.42, 1.43

KaiGai Kohei kaigai at fedoraproject.org
Tue Dec 8 06:00:14 UTC 2009


Author: kaigai

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

Modified Files:
	sepostgresql-8.4.patch sepostgresql.spec 
Log Message:
- rework: backport features from v8.5devel tree
- fixbug: selinux netlink receiver process didn't have correct ps display



sepostgresql-8.4.patch:
 configure                                                          |  113 
 configure.in                                                       |   13 
 src/Makefile.global.in                                             |    1 
 src/backend/Makefile                                               |    7 
 src/backend/access/common/heaptuple.c                              |   15 
 src/backend/access/common/tupdesc.c                                |    6 
 src/backend/access/heap/heapam.c                                   |   12 
 src/backend/access/heap/tuptoaster.c                               |   12 
 src/backend/access/transam/xact.c                                  |   26 
 src/backend/bootstrap/bootparse.y                                  |   11 
 src/backend/bootstrap/bootstrap.c                                  |   20 
 src/backend/catalog/Makefile                                       |    4 
 src/backend/catalog/aclchk.c                                       |   25 
 src/backend/catalog/catalog.c                                      |    6 
 src/backend/catalog/dependency.c                                   |   35 
 src/backend/catalog/heap.c                                         |   89 
 src/backend/catalog/index.c                                        |    6 
 src/backend/catalog/namespace.c                                    |   33 
 src/backend/catalog/pg_aggregate.c                                 |    3 
 src/backend/catalog/pg_conversion.c                                |    4 
 src/backend/catalog/pg_largeobject.c                               |    7 
 src/backend/catalog/pg_namespace.c                                 |    4 
 src/backend/catalog/pg_operator.c                                  |   17 
 src/backend/catalog/pg_proc.c                                      |   14 
 src/backend/catalog/pg_security.c                                  |  637 ++
 src/backend/catalog/pg_shdepend.c                                  |    6 
 src/backend/catalog/pg_type.c                                      |   20 
 src/backend/catalog/toasting.c                                     |   10 
 src/backend/commands/aggregatecmds.c                               |    4 
 src/backend/commands/alter.c                                       |   29 
 src/backend/commands/cluster.c                                     |   11 
 src/backend/commands/conversioncmds.c                              |   12 
 src/backend/commands/copy.c                                        |  268 
 src/backend/commands/dbcommands.c                                  |   95 
 src/backend/commands/foreigncmds.c                                 |   23 
 src/backend/commands/functioncmds.c                                |   92 
 src/backend/commands/indexcmds.c                                   |    4 
 src/backend/commands/lockcmds.c                                    |    4 
 src/backend/commands/opclasscmds.c                                 |   44 
 src/backend/commands/operatorcmds.c                                |    3 
 src/backend/commands/proclang.c                                    |   21 
 src/backend/commands/schemacmds.c                                  |   65 
 src/backend/commands/sequence.c                                    |   16 
 src/backend/commands/tablecmds.c                                   |  248 
 src/backend/commands/trigger.c                                     |    9 
 src/backend/commands/tsearchcmds.c                                 |   54 
 src/backend/commands/typecmds.c                                    |   13 
 src/backend/commands/view.c                                        |    4 
 src/backend/executor/execJunk.c                                    |    5 
 src/backend/executor/execMain.c                                    |  140 
 src/backend/executor/execQual.c                                    |    3 
 src/backend/executor/execScan.c                                    |   24 
 src/backend/executor/execTuples.c                                  |   14 
 src/backend/executor/execUtils.c                                   |    6 
 src/backend/executor/functions.c                                   |    6 
 src/backend/executor/nodeAgg.c                                     |    4 
 src/backend/executor/nodeMergejoin.c                               |    2 
 src/backend/executor/nodeSubplan.c                                 |    4 
 src/backend/executor/nodeWindowAgg.c                               |    4 
 src/backend/executor/spi.c                                         |    2 
 src/backend/libpq/be-fsstubs.c                                     |   68 
 src/backend/nodes/copyfuncs.c                                      |   22 
 src/backend/nodes/equalfuncs.c                                     |   19 
 src/backend/nodes/outfuncs.c                                       |    4 
 src/backend/optimizer/plan/createplan.c                            |    3 
 src/backend/optimizer/util/clauses.c                               |    3 
 src/backend/optimizer/util/relnode.c                               |    2 
 src/backend/parser/analyze.c                                       |   46 
 src/backend/parser/gram.y                                          |  106 
 src/backend/parser/parse_target.c                                  |   63 
 src/backend/parser/parse_utilcmd.c                                 |    3 
 src/backend/postmaster/autovacuum.c                                |    2 
 src/backend/postmaster/postmaster.c                                |   51 
 src/backend/rewrite/rewriteDefine.c                                |    4 
 src/backend/rewrite/rewriteRemove.c                                |    4 
 src/backend/security/Makefile                                      |   13 
 src/backend/security/rowlevel.c                                    |  121 
 src/backend/security/sepgsql/Makefile                              |   16 
 src/backend/security/sepgsql/avc.c                                 |  880 +++
 src/backend/security/sepgsql/bridge.c                              | 2876 ++++++++++
 src/backend/security/sepgsql/checker.c                             |  424 +
 src/backend/security/sepgsql/dummy.c                               |   79 
 src/backend/security/sepgsql/hooks.c                               |  239 
 src/backend/security/sepgsql/label.c                               | 1140 +++
 src/backend/security/sepgsql/misc.c                                |  304 +
 src/backend/security/sepgsql/perms.c                               |  597 ++
 src/backend/security/sepgsql/policy/Makefile                       |   28 
 src/backend/security/sepgsql/policy/sepostgresql-devel.fc.template |   12 
 src/backend/security/sepgsql/policy/sepostgresql-devel.te          |  123 
 src/backend/storage/file/fd.c                                      |    7 
 src/backend/storage/ipc/ipci.c                                     |    2 
 src/backend/storage/large_object/inv_api.c                         |  118 
 src/backend/tcop/fastpath.c                                        |    3 
 src/backend/tcop/pquery.c                                          |    2 
 src/backend/tcop/utility.c                                         |   36 
 src/backend/utils/adt/genfile.c                                    |    6 
 src/backend/utils/adt/ri_triggers.c                                |   18 
 src/backend/utils/adt/tid.c                                        |    4 
 src/backend/utils/adt/trigfuncs.c                                  |    4 
 src/backend/utils/cache/plancache.c                                |    9 
 src/backend/utils/cache/relcache.c                                 |   22 
 src/backend/utils/cache/syscache.c                                 |   26 
 src/backend/utils/fmgr/dfmgr.c                                     |    7 
 src/backend/utils/fmgr/fmgr.c                                      |    2 
 src/backend/utils/init/postinit.c                                  |    9 
 src/backend/utils/misc/guc.c                                       |   27 
 src/backend/utils/misc/postgresql.conf.sample                      |    4 
 src/backend/utils/misc/superuser.c                                 |   10 
 src/bin/initdb/initdb.c                                            |   13 
 src/bin/pg_dump/pg_dump.c                                          |  150 
 src/bin/pg_dump/pg_dump.h                                          |    2 
 src/bin/pg_dump/pg_dumpall.c                                       |   72 
 src/include/access/htup.h                                          |   32 
 src/include/access/sysattr.h                                       |   14 
 src/include/access/tupdesc.h                                       |    1 
 src/include/bootstrap/bootstrap.h                                  |    3 
 src/include/catalog/dependency.h                                   |    3 
 src/include/catalog/heap.h                                         |   11 
 src/include/catalog/indexing.h                                     |    5 
 src/include/catalog/pg_attribute.h                                 |    4 
 src/include/catalog/pg_conversion_fn.h                             |    2 
 src/include/catalog/pg_namespace.h                                 |    2 
 src/include/catalog/pg_proc.h                                      |   21 
 src/include/catalog/pg_proc_fn.h                                   |    3 
 src/include/catalog/pg_security.h                                  |  101 
 src/include/catalog/toasting.h                                     |    3 
 src/include/commands/alter.h                                       |    1 
 src/include/commands/dbcommands.h                                  |    1 
 src/include/commands/defrem.h                                      |    1 
 src/include/commands/schemacmds.h                                  |    1 
 src/include/commands/tablecmds.h                                   |    3 
 src/include/executor/executor.h                                    |    7 
 src/include/executor/tuptable.h                                    |    1 
 src/include/libpq/be-fsstubs.h                                     |    3 
 src/include/nodes/nodes.h                                          |    1 
 src/include/nodes/parsenodes.h                                     |   18 
 src/include/nodes/plannodes.h                                      |    7 
 src/include/nodes/relation.h                                       |    9 
 src/include/pg_config.h.in                                         |    3 
 src/include/security/rowlevel.h                                    |   44 
 src/include/security/sepgsql.h                                     |  777 ++
 src/include/storage/fd.h                                           |    1 
 src/include/storage/large_object.h                                 |    3 
 src/include/storage/lwlock.h                                       |    1 
 src/include/storage/proc.h                                         |    4 
 src/include/utils/errcodes.h                                       |    5 
 src/include/utils/syscache.h                                       |    2 
 src/test/regress/GNUmakefile                                       |    8 
 src/test/regress/expected/sanity_check.out                         |    3 
 src/test/regress/pg_regress.c                                      |    9 
 150 files changed, 10632 insertions(+), 3 deletions(-), 677 modifications(!)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2 -r 1.3 sepostgresql-8.4.patchIndex: sepostgresql-8.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql-8.4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sepostgresql-8.4.patch	11 Sep 2009 10:40:20 -0000	1.2
+++ sepostgresql-8.4.patch	8 Dec 2009 06:00:14 -0000	1.3
@@ -406,7 +406,7 @@ diff -Nrpc base/src/backend/access/commo
   	{
 diff -Nrpc base/src/backend/access/heap/heapam.c sepgsql/src/backend/access/heap/heapam.c
 *** base/src/backend/access/heap/heapam.c	Sun Sep  6 19:40:49 2009
---- sepgsql/src/backend/access/heap/heapam.c	Tue Sep  8 23:55:48 2009
+--- sepgsql/src/backend/access/heap/heapam.c	Tue Dec  8 14:53:28 2009
 ***************
 *** 54,59 ****
 --- 54,60 ----
@@ -591,7 +591,7 @@ diff -Nrpc base/src/backend/access/trans
   
 diff -Nrpc base/src/backend/bootstrap/bootparse.y sepgsql/src/backend/bootstrap/bootparse.y
 *** base/src/backend/bootstrap/bootparse.y	Sat Jan  3 13:01:35 2009
---- sepgsql/src/backend/bootstrap/bootparse.y	Wed Jul 15 19:35:52 2009
+--- sepgsql/src/backend/bootstrap/bootparse.y	Thu Oct  8 09:29:32 2009
 ***************
 *** 42,47 ****
 --- 42,48 ----
@@ -604,15 +604,17 @@ diff -Nrpc base/src/backend/bootstrap/bo
   #include "storage/ipc.h"
 *************** Boot_CreateStmt:
 *** 211,216 ****
---- 212,222 ----
+--- 212,224 ----
   					else
   					{
   						Oid id;
 + 						Oid *secLabels =
-+ 							sepgsqlCreateTableColumns(NULL,
-+ 													  LexIDStr($5),
-+ 													  PG_CATALOG_NAMESPACE,
-+ 													  tupdesc, RELKIND_RELATION);
++ 							sepgsql_relation_create(LexIDStr($5),
++ 													RELKIND_RELATION,
++ 													tupdesc,
++ 													PG_CATALOG_NAMESPACE,
++ 													NULL, NIL,
++ 													false, false);
   
   						id = heap_create_with_catalog(LexIDStr($5),
   													  PG_CATALOG_NAMESPACE,
@@ -625,7 +627,7 @@ diff -Nrpc base/src/backend/bootstrap/bo
   						elog(DEBUG4, "relation created with oid %u", id);
   					}
   					do_end();
---- 231,238 ----
+--- 233,240 ----
   													  0,
   													  ONCOMMIT_NOOP,
   													  (Datum) 0,
@@ -636,10 +638,10 @@ diff -Nrpc base/src/backend/bootstrap/bo
   					do_end();
 diff -Nrpc base/src/backend/bootstrap/bootstrap.c sepgsql/src/backend/bootstrap/bootstrap.c
 *** base/src/backend/bootstrap/bootstrap.c	Fri Feb 20 22:15:36 2009
---- sepgsql/src/backend/bootstrap/bootstrap.c	Wed Sep  9 13:14:37 2009
+--- sepgsql/src/backend/bootstrap/bootstrap.c	Tue Dec  8 14:04:25 2009
 ***************
-*** 26,31 ****
---- 26,32 ----
+*** 26,37 ****
+--- 26,39 ----
   #include "access/xact.h"
   #include "bootstrap/bootstrap.h"
   #include "catalog/index.h"
@@ -647,9 +649,45 @@ diff -Nrpc base/src/backend/bootstrap/bo
   #include "catalog/pg_type.h"
   #include "libpq/pqsignal.h"
   #include "miscadmin.h"
+  #include "nodes/makefuncs.h"
+  #include "postmaster/bgwriter.h"
+  #include "postmaster/walwriter.h"
++ #include "security/sepgsql.h"
+  #include "storage/bufmgr.h"
+  #include "storage/ipc.h"
+  #include "storage/proc.h"
+*************** AuxiliaryProcessMain(int argc, char *arg
+*** 338,343 ****
+--- 340,350 ----
+  			case WalWriterProcess:
+  				statmsg = "wal writer process";
+  				break;
++ #ifdef HAVE_SELINUX
++ 			case SelinuxReceiverProcess:
++ 				statmsg = "selinux netlink receiver";
++ 				break;
++ #endif
+  			default:
+  				statmsg = "??? process";
+  				break;
+*************** AuxiliaryProcessMain(int argc, char *arg
+*** 430,435 ****
+--- 437,448 ----
+  			WalWriterMain();
+  			proc_exit(1);		/* should never return */
+  
++ #ifdef HAVE_SELINUX
++ 		case SelinuxReceiverProcess:
++ 			sepgsqlReceiverMain();
++ 			proc_exit(1);		/* should nener return */
++ #endif
++ 
+  		default:
+  			elog(PANIC, "unrecognized process type: %d", auxType);
+  			proc_exit(1);
 *************** BootstrapModeMain(void)
 *** 497,502 ****
---- 498,508 ----
+--- 510,520 ----
   	 */
   	boot_yyparse();
   
@@ -663,7 +701,7 @@ diff -Nrpc base/src/backend/bootstrap/bo
   	CreateCheckPoint(CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_IMMEDIATE);
 *************** InsertOneTuple(Oid objectid)
 *** 794,799 ****
---- 800,807 ----
+--- 812,819 ----
   	tupDesc = CreateTupleDesc(numattr,
   							  RelationGetForm(boot_reldesc)->relhasoids,
   							  attrtypes);
@@ -711,7 +749,7 @@ diff -Nrpc base/src/backend/catalog/Make
   	toasting.h indexing.h \
 diff -Nrpc base/src/backend/catalog/aclchk.c sepgsql/src/backend/catalog/aclchk.c
 *** base/src/backend/catalog/aclchk.c	Thu Jun 18 10:20:52 2009
---- sepgsql/src/backend/catalog/aclchk.c	Wed Sep  9 21:29:33 2009
+--- sepgsql/src/backend/catalog/aclchk.c	Fri Sep 18 14:51:00 2009
 ***************
 *** 35,40 ****
 --- 35,41 ----
@@ -747,25 +785,91 @@ diff -Nrpc base/src/backend/catalog/aclc
   		/* Views don't have any system columns at all */
   		if (classForm->relkind == RELKIND_VIEW && curr_att < 0)
   			continue;
+*************** ExecGrant_Attribute(InternalGrant *istmt
+*** 774,779 ****
+--- 782,789 ----
+  								 relOid, grantorId, ACL_KIND_COLUMN,
+  								 relname, attnum,
+  								 NameStr(pg_attribute_tuple->attname));
++ 	/* SELinux checks */
++ 	sepgsql_attribute_grant(relOid, attnum);
+  
+  	/*
+  	 * Generate new ACL.
+*************** ExecGrant_Relation(InternalGrant *istmt)
+*** 1029,1034 ****
+--- 1039,1046 ----
+  										 ? ACL_KIND_SEQUENCE : ACL_KIND_CLASS,
+  										 NameStr(pg_class_tuple->relname),
+  										 0, NULL);
++ 			/* SELinux checks */
++ 			sepgsql_relation_grant(relOid);
+  
+  			/*
+  			 * Generate new ACL.
+*************** ExecGrant_Database(InternalGrant *istmt)
+*** 1217,1222 ****
+--- 1229,1236 ----
+  									 datId, grantorId, ACL_KIND_DATABASE,
+  									 NameStr(pg_database_tuple->datname),
+  									 0, NULL);
++ 		/* SELinux permission checks */
++ 		sepgsql_database_grant(datId);
+  
+  		/*
+  		 * Generate new ACL.
+*************** ExecGrant_Fdw(InternalGrant *istmt)
+*** 1335,1340 ****
+--- 1349,1356 ----
+  									 fdwid, grantorId, ACL_KIND_FDW,
+  									 NameStr(pg_fdw_tuple->fdwname),
+  									 0, NULL);
++ 		/* SELinux permission checks */
++ 		sepgsql_fdw_grant(fdwid);
+  
+  		/*
+  		 * Generate new ACL.
+*************** ExecGrant_ForeignServer(InternalGrant *i
+*** 1454,1459 ****
+--- 1470,1477 ----
+  								   srvid, grantorId, ACL_KIND_FOREIGN_SERVER,
+  									 NameStr(pg_server_tuple->srvname),
+  									 0, NULL);
++ 		/* SELinux checks */
++ 		sepgsql_foreign_server_grant(srvid);
+  
+  		/*
+  		 * Generate new ACL.
 *************** ExecGrant_Function(InternalGrant *istmt)
 *** 1572,1577 ****
---- 1580,1587 ----
+--- 1590,1597 ----
[...11234 lines suppressed...]
++ #define sepgsql_proc_alter(a,b,c)				do {} while(0)
++ #define sepgsql_proc_drop(a)					do {} while(0)
++ #define sepgsql_proc_relabel(a,b)				(InvalidOid)
++ #define sepgsql_proc_grant(a)					do {} while(0)
++ #define sepgsql_proc_execute(a)					do {} while(0)
++ #define sepgsql_proc_hint_inlined(a)			(true)
++ #define sepgsql_proc_entrypoint(a,b)			do {} while(0)
++ 
++ #define sepgsql_rule_create(a,b)				do {} while(0)
++ #define sepgsql_rule_drop(a,b)					do {} while(0)
++ 
++ #define sepgsql_trigger_create(a,b,c)			do {} while(0)
++ #define sepgsql_trigger_alter(a,b)				do {} while(0)
++ #define sepgsql_trigger_drop(a,b)				do {} while(0)
++ 
++ #define sepgsql_ts_config_create(a,b)			(InvalidOid)
++ #define sepgsql_ts_config_alter(a,b)			do {} while(0)
++ #define sepgsql_ts_config_drop(a)				do {} while(0)
++ 
++ #define sepgsql_ts_config_create(a,b)			(InvalidOid)
++ #define sepgsql_ts_config_alter(a,b)			do {} while(0)
++ #define sepgsql_ts_config_drop(a)				do {} while(0)
++ 
++ #define sepgsql_ts_dict_create(a,b)				(InvalidOid)
++ #define sepgsql_ts_dict_alter(a,b)				do {} while(0)
++ #define sepgsql_ts_dict_drop(a)					do {} while(0)
++ 
++ #define sepgsql_ts_parser_create(a,b,c,d,e,f,g)	(InvalidOid)
++ #define sepgsql_ts_parser_alter(a,b)			do {} while(0)
++ #define sepgsql_ts_parser_drop(a)				do {} while(0)
++ 
++ #define sepgsql_ts_template_create(a,b,c,d)		(InvalidOid)
++ #define sepgsql_ts_template_alter(a,b)			do {} while(0)
++ #define sepgsql_ts_template_drop(a)				do {} while(0)
++ 
++ #define sepgsql_type_create(a,b,c,d,e,f,g,h,i,j)	(InvalidOid)
++ #define sepgsql_type_alter(a,b,c)				do {} while(0)
++ #define sepgsql_type_drop(a)					do {} while(0)
++ 
++ #define sepgsql_sysobj_drop(a)					do {} while(0)
++ 
++ #define sepgsql_file_stat(a)					do {} while(0)
++ #define sepgsql_file_read(a)					do {} while(0)
++ #define sepgsql_file_write(a)					do {} while(0)
 + 
 + /* label.c */
 + #define sepgsqlTupleDescHasSecLabel(a,b)		(false)
 + #define sepgsqlSetDefaultSecLabel(a,b)			do {} while(0)
-+ #define sepgsqlCreateTableColumns(a,b,c,d,e)	(NULL)
-+ #define sepgsqlCopyTableColumns(a)				(NULL)
-+ #define sepgsqlMetaSecurityLabel()				(NULL)
 + #define sepgsqlTransSecLabelIn(a)				(a)
 + #define sepgsqlTransSecLabelOut(a)				(a)
 + #define sepgsqlRawSecLabelIn(a)					(a)
@@ -15420,6 +18925,30 @@ diff -Nrpc base/src/include/storage/lwlo
   	/* Individual lock IDs end here */
   	FirstBufMappingLock,
   	FirstLockMgrLock = FirstBufMappingLock + NUM_BUFFER_PARTITIONS,
+diff -Nrpc base/src/include/storage/proc.h sepgsql/src/include/storage/proc.h
+*** base/src/include/storage/proc.h	Thu Feb 26 10:18:55 2009
+--- sepgsql/src/include/storage/proc.h	Tue Dec  8 14:04:25 2009
+*************** typedef struct PROC_HDR
+*** 143,150 ****
+   * normal operation. Startup process also consumes one slot, but WAL
+   * writer and autovacuum launcher are launched only after it has
+   * exited.
+   */
+! #define NUM_AUXILIARY_PROCS		3
+  
+  
+  /* configurable options */
+--- 143,152 ----
+   * normal operation. Startup process also consumes one slot, but WAL
+   * writer and autovacuum launcher are launched only after it has
+   * exited.
++  * In addition, a netlink receiver process may be launched, if SELinux
++  * support is enabled.
+   */
+! #define NUM_AUXILIARY_PROCS		4
+  
+  
+  /* configurable options */
 diff -Nrpc base/src/include/utils/errcodes.h sepgsql/src/include/utils/errcodes.h
 *** base/src/include/utils/errcodes.h	Fri Mar  6 09:45:33 2009
 --- sepgsql/src/include/utils/errcodes.h	Wed Jul 15 19:35:52 2009
@@ -15451,6 +18980,41 @@ diff -Nrpc base/src/include/utils/syscac
   	STATRELATT,
   	TSCONFIGMAP,
   	TSCONFIGNAMENSP,
+diff -Nrpc base/src/test/regress/GNUmakefile sepgsql/src/test/regress/GNUmakefile
+*** base/src/test/regress/GNUmakefile	Sat Jan  3 13:01:35 2009
+--- sepgsql/src/test/regress/GNUmakefile	Tue Dec  1 17:11:40 2009
+*************** ifdef NO_LOCALE
+*** 38,43 ****
+--- 38,49 ----
+  NOLOCALE += --no-locale
+  endif
+  
++ # SELinux support
++ ENABLE_SELINUX =
++ ifdef SELINUX
++ ENABLE_SELINUX += --enable-selinux
++ endif
++ 
+  # stuff to pass into build of pg_regress
+  EXTRADEFS = '-DHOST_TUPLE="$(host_tuple)"' \
+  	'-DMAKEPROG="$(MAKE)"' \
+*************** tablespace-setup:
+*** 138,144 ****
+  ## Run tests
+  ##
+  
+! pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
+  
+  check: all
+  	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
+--- 144,150 ----
+  ## Run tests
+  ##
+  
+! pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) $(ENABLE_SELINUX)
+  
+  check: all
+  	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
 diff -Nrpc base/src/test/regress/expected/sanity_check.out sepgsql/src/test/regress/expected/sanity_check.out
 *** base/src/test/regress/expected/sanity_check.out	Tue Feb 10 10:10:02 2009
 --- sepgsql/src/test/regress/expected/sanity_check.out	Thu Jul 16 23:18:11 2009
@@ -15481,3 +19045,72 @@ diff -Nrpc base/src/test/regress/expecte
   
   --
   -- another sanity check: every system catalog that has OIDs should have
+diff -Nrpc base/src/test/regress/pg_regress.c sepgsql/src/test/regress/pg_regress.c
+*** base/src/test/regress/pg_regress.c	Thu Jun 18 10:20:52 2009
+--- sepgsql/src/test/regress/pg_regress.c	Tue Dec  1 17:11:40 2009
+*************** static _stringlist *schedulelist = NULL;
+*** 82,87 ****
+--- 82,88 ----
+  static _stringlist *extra_tests = NULL;
+  static char *temp_install = NULL;
+  static char *temp_config = NULL;
++ static bool enable_selinux = false;
+  static char *top_builddir = NULL;
+  static bool nolocale = false;
+  static char *hostname = NULL;
+*************** help(void)
+*** 1863,1868 ****
+--- 1864,1870 ----
+  	printf(_("  --top-builddir=DIR        (relative) path to top level build directory\n"));
+  	printf(_("  --port=PORT               start postmaster on PORT\n"));
+  	printf(_("  --temp-config=PATH        append contents of PATH to temporary config\n"));
++ 	printf(_("  --enable-selinux          enables SELinux support, if available\n"));
+  	printf(_("\n"));
+  	printf(_("Options for using an existing installation:\n"));
+  	printf(_("  --host=HOST               use postmaster running on HOST\n"));
+*************** regression_main(int argc, char *argv[], 
+*** 1907,1912 ****
+--- 1909,1915 ----
+  		{"dlpath", required_argument, NULL, 17},
+  		{"create-role", required_argument, NULL, 18},
+  		{"temp-config", required_argument, NULL, 19},
++ 		{"enable-selinux", optional_argument, NULL, 20},
+  		{NULL, 0, NULL, 0}
+  	};
+  
+*************** regression_main(int argc, char *argv[], 
+*** 1997,2002 ****
+--- 2000,2008 ----
+  			case 19:
+  				temp_config = strdup(optarg);
+  				break;
++ 			case 20:
++ 				enable_selinux = true;
++ 				break;
+  			default:
+  				/* getopt_long already emitted a complaint */
+  				fprintf(stderr, _("\nTry \"%s -h\" for more information.\n"),
+*************** regression_main(int argc, char *argv[], 
+*** 2086,2095 ****
+  		/* initdb */
+  		header(_("initializing database system"));
+  		snprintf(buf, sizeof(buf),
+! 				 SYSTEMQUOTE "\"%s/initdb\" -D \"%s/data\" -L \"%s\" --noclean%s%s > \"%s/log/initdb.log\" 2>&1" SYSTEMQUOTE,
+  				 bindir, temp_install, datadir,
+  				 debug ? " --debug" : "",
+  				 nolocale ? " --no-locale" : "",
+  				 outputdir);
+  		if (system(buf))
+  		{
+--- 2092,2102 ----
+  		/* initdb */
+  		header(_("initializing database system"));
+  		snprintf(buf, sizeof(buf),
+! 				 SYSTEMQUOTE "\"%s/initdb\" -D \"%s/data\" -L \"%s\" --noclean%s%s%s > \"%s/log/initdb.log\" 2>&1" SYSTEMQUOTE,
+  				 bindir, temp_install, datadir,
+  				 debug ? " --debug" : "",
+  				 nolocale ? " --no-locale" : "",
++ 				 enable_selinux ? " --enable-selinux" : "",
+  				 outputdir);
+  		if (system(buf))
+  		{


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sepostgresql.spec	11 Sep 2009 10:40:20 -0000	1.42
+++ sepostgresql.spec	8 Dec 2009 06:00:14 -0000	1.43
@@ -12,7 +12,7 @@
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 8.4.1
-Release: 2305%{?dist}
+Release: 2464%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -192,6 +192,10 @@ fi
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Fri Dec 8 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.4.1-2464
+- rework: backport features from v8.5devel tree
+- fixbug: selinux netlink receiver process didn't have correct ps display
+
 * Fri Sep 11 2009 KaiGai Kohei <kaigai at kaigai.gr.jp> - 8.4.1-2305
 - Upgrade base SE-PostgreSQL v8.4.0->v8.4.1
 - rework: backport features from v8.5devel tree




More information about the scm-commits mailing list