rpms/sepostgresql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upgrade base postgresql 8.3.5->8.3.6

Browse source
This commit is contained in:
KaiGai Kohei 2009-02-06 02:34:41 +00:00
commit b90dc1fbc8
7 changed files with 7557 additions and 6437 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.cvsignore
View file

@ -1 +1 @@
postgresql-8.3.5.tar.bz2
postgresql-8.3.6.tar.bz2

83
sepostgresql-pg_dump-8.3.5-2.patch → sepostgresql-pg_dump-8.3.6-2.patch
View file

@ -1,3 +1,52 @@
diff -rpNU3 base/src/bin/initdb/initdb.c sepgsql/src/bin/initdb/initdb.c
--- base/src/bin/initdb/initdb.c 2008-11-05 09:57:00.000000000 +0900
+++ sepgsql/src/bin/initdb/initdb.c 2008-12-28 01:19:14.000000000 +0900
@@ -94,6 +94,7 @@ static bool debug = false;
static bool noclean = false;
static bool show_setting = false;
static char *xlog_dir = "";
+static char *pgace_feature = "none";
/* internal vars */
@@ -1212,6 +1213,11 @@ setup_config(void)
"#default_text_search_config = 'pg_catalog.simple'",
repltok);
+ snprintf(repltok, sizeof(repltok),
+ "pgace_feature = '%s'", pgace_feature);
+ conflines = replace_token(conflines,
+ "#pgace_feature = 'none'", repltok);
+
snprintf(path, sizeof(path), "%s/postgresql.conf", pg_data);
writefile(path, conflines);
@@ -2383,6 +2389,7 @@ usage(const char *progname)
printf(_(" -U, --username=NAME database superuser name\n"));
printf(_(" -W, --pwprompt prompt for a password for the new superuser\n"));
printf(_(" --pwfile=FILE read password for the new superuser from file\n"));
+ printf(_(" --pgace-feature=FEATURE specify an enhanced security feature\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_(" -V, --version output version information, then exit\n"));
printf(_("\nLess commonly used options:\n"));
@@ -2417,6 +2424,7 @@ main(int argc, char *argv[])
{"auth", required_argument, NULL, 'A'},
{"pwprompt", no_argument, NULL, 'W'},
{"pwfile", required_argument, NULL, 9},
+ {"pgace-feature", required_argument, NULL, 10},
{"username", required_argument, NULL, 'U'},
{"help", no_argument, NULL, '?'},
{"version", no_argument, NULL, 'V'},
@@ -2531,6 +2539,9 @@ main(int argc, char *argv[])
case 9:
pwfilename = xstrdup(optarg);
break;
+ case 10:
+ pgace_feature = xstrdup(optarg);
+ break;
case 's':
show_setting = true;
break;
diff -rpNU3 base/src/bin/pg_dump/pg_ace_dump.h sepgsql/src/bin/pg_dump/pg_ace_dump.h
--- base/src/bin/pg_dump/pg_ace_dump.h 1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_ace_dump.h 2008-10-14 15:38:18.000000000 +0900
@ -287,8 +336,8 @@ diff -rpNU3 base/src/bin/pg_dump/pg_ace_dump.h sepgsql/src/bin/pg_dump/pg_ace_du
+
+#endif
diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
--- base/src/bin/pg_dump/pg_dump.c 2008-02-03 01:11:28.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_dump.c 2008-07-11 14:10:51.000000000 +0900
--- base/src/bin/pg_dump/pg_dump.c 2009-02-02 11:47:17.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_dump.c 2009-02-02 11:58:34.000000000 +0900
@@ -50,6 +50,7 @@ int optreset;
#include "pg_backup_archiver.h"
@ -340,7 +389,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
printf(_("\nConnection options:\n"));
printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));
@@ -1160,7 +1169,8 @@ dumpTableData_insert(Archive *fout, void
@@ -1171,7 +1180,8 @@ dumpTableData_insert(Archive *fout, void
if (fout->remoteVersion >= 70100)
{
appendPQExpBuffer(q, "DECLARE _pg_dump_cursor CURSOR FOR "
@ -350,7 +399,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
fmtQualifiedId(tbinfo->dobj.namespace->dobj.name,
classname));
}
@@ -1774,11 +1784,14 @@ dumpBlobComments(Archive *AH, void *arg)
@@ -1785,11 +1795,14 @@ dumpBlobComments(Archive *AH, void *arg)
Oid blobOid;
char *comment;
@ -366,7 +415,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
comment = PQgetvalue(res, i, 1);
printfPQExpBuffer(commentcmd, "COMMENT ON LARGE OBJECT %u IS ",
@@ -2926,6 +2939,7 @@ getTables(int *numTables)
@@ -2927,6 +2940,7 @@ getTables(int *numTables)
"d.refobjsubid as owning_col, "
"(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, "
"array_to_string(c.reloptions, ', ') as reloptions "
@ -374,7 +423,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
"from pg_class c "
"left join pg_depend d on "
"(c.relkind = '%c' and "
@@ -2935,6 +2949,7 @@ getTables(int *numTables)
@@ -2936,6 +2950,7 @@ getTables(int *numTables)
"where relkind in ('%c', '%c', '%c', '%c') "
"order by c.oid",
username_subquery,
@ -382,7 +431,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
RELKIND_SEQUENCE,
RELKIND_RELATION, RELKIND_SEQUENCE,
RELKIND_VIEW, RELKIND_COMPOSITE_TYPE);
@@ -3131,6 +3146,7 @@ getTables(int *numTables)
@@ -3132,6 +3147,7 @@ getTables(int *numTables)
}
tblinfo[i].reltablespace = strdup(PQgetvalue(res, i, i_reltablespace));
tblinfo[i].reloptions = strdup(PQgetvalue(res, i, i_reloptions));
@ -390,7 +439,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
/* other fields were zeroed above */
@@ -4362,11 +4378,13 @@ getTableAttrs(TableInfo *tblinfo, int nu
@@ -4363,11 +4379,13 @@ getTableAttrs(TableInfo *tblinfo, int nu
appendPQExpBuffer(q, "SELECT a.attnum, a.attname, a.atttypmod, a.attstattarget, a.attstorage, t.typstorage, "
"a.attnotnull, a.atthasdef, a.attisdropped, a.attislocal, "
"pg_catalog.format_type(t.oid,a.atttypmod) as atttypname "
@ -404,7 +453,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
tbinfo->dobj.catId.oid);
}
else if (g_fout->remoteVersion >= 70100)
@@ -4425,6 +4443,7 @@ getTableAttrs(TableInfo *tblinfo, int nu
@@ -4426,6 +4444,7 @@ getTableAttrs(TableInfo *tblinfo, int nu
tbinfo->typstorage = (char *) malloc(ntups * sizeof(char));
tbinfo->attisdropped = (bool *) malloc(ntups * sizeof(bool));
tbinfo->attislocal = (bool *) malloc(ntups * sizeof(bool));
@ -412,7 +461,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
tbinfo->notnull = (bool *) malloc(ntups * sizeof(bool));
tbinfo->attrdefs = (AttrDefInfo **) malloc(ntups * sizeof(AttrDefInfo *));
tbinfo->inhAttrs = (bool *) malloc(ntups * sizeof(bool));
@@ -4456,6 +4475,8 @@ getTableAttrs(TableInfo *tblinfo, int nu
@@ -4457,6 +4476,8 @@ getTableAttrs(TableInfo *tblinfo, int nu
tbinfo->inhAttrs[j] = false;
tbinfo->inhAttrDef[j] = false;
tbinfo->inhNotNull[j] = false;
@ -421,7 +470,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
}
PQclear(res);
@@ -6459,8 +6480,10 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
@@ -6460,8 +6481,10 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
"provolatile, proisstrict, prosecdef, "
"proconfig, procost, prorows, "
"(SELECT lanname FROM pg_catalog.pg_language WHERE oid = prolang) as lanname "
@ -432,7 +481,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
finfo->dobj.catId.oid);
}
else if (g_fout->remoteVersion >= 80100)
@@ -6698,6 +6721,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
@@ -6699,6 +6722,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
if (prosecdef[0] == 't')
appendPQExpBuffer(q, " SECURITY DEFINER");
@ -441,7 +490,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
/*
* COST and ROWS are emitted only if present and not default, so as not to
* break backwards-compatibility of the dump without need. Keep this code
@@ -8779,6 +8804,8 @@ dumpTableSchema(Archive *fout, TableInfo
@@ -8780,6 +8805,8 @@ dumpTableSchema(Archive *fout, TableInfo
if (tbinfo->notnull[j] && !tbinfo->inhNotNull[j])
appendPQExpBuffer(q, " NOT NULL");
@ -450,7 +499,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
actual_atts++;
}
}
@@ -8826,6 +8853,8 @@ dumpTableSchema(Archive *fout, TableInfo
@@ -8827,6 +8854,8 @@ dumpTableSchema(Archive *fout, TableInfo
if (tbinfo->reloptions && strlen(tbinfo->reloptions) > 0)
appendPQExpBuffer(q, "\nWITH (%s)", tbinfo->reloptions);
@ -459,7 +508,7 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
appendPQExpBuffer(q, ";\n");
/* Loop dumping statistics and storage statements */
@@ -10243,6 +10272,10 @@ fmtCopyColumnList(const TableInfo *ti)
@@ -10244,6 +10273,10 @@ fmtCopyColumnList(const TableInfo *ti)
appendPQExpBuffer(q, "(");
needComma = false;
@ -471,8 +520,8 @@ diff -rpNU3 base/src/bin/pg_dump/pg_dump.c sepgsql/src/bin/pg_dump/pg_dump.c
{
if (attisdropped[i])
diff -rpNU3 base/src/bin/pg_dump/pg_dump.h sepgsql/src/bin/pg_dump/pg_dump.h
--- base/src/bin/pg_dump/pg_dump.h 2008-01-07 23:51:33.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_dump.h 2008-06-15 22:27:55.000000000 +0900
--- base/src/bin/pg_dump/pg_dump.h 2009-02-02 11:47:17.000000000 +0900
+++ sepgsql/src/bin/pg_dump/pg_dump.h 2009-02-02 11:58:34.000000000 +0900
@@ -238,6 +238,7 @@ typedef struct _tableInfo
char relkind;
char *reltablespace; /* relation tablespace */

63
sepostgresql-policy-8.3.5-2.patch → sepostgresql-policy-8.3.6-2.patch
View file

@ -103,9 +103,9 @@ diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.if sepgs
+## There are no interface declaration
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.te sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te
--- base/src/backend/security/sepgsql/policy/sepostgresql-devel.te 1970-01-01 09:00:00.000000000 +0900
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te 2008-10-13 17:08:55.000000000 +0900
@@ -0,0 +1,127 @@
+policy_module(sepostgresql-devel, 3.14)
+++ sepgsql/src/backend/security/sepgsql/policy/sepostgresql-devel.te 2009-01-20 16:35:05.000000000 +0900
@@ -0,0 +1,120 @@
+policy_module(sepostgresql-devel, 3.23)
+
+gen_require(`
+ class db_database all_db_database_perms;
@ -115,7 +115,6 @@ diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.te sepgs
+ class db_tuple all_db_tuple_perms;
+ class db_blob all_db_blob_perms;
+
+ attribute domain, home_type, tmpfile;
+ attribute sepgsql_client_type;
+ attribute sepgsql_unconfined_type;
+
@ -126,7 +125,13 @@ diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.te sepgs
+ attribute sepgsql_blob_type;
+ attribute sepgsql_module_type;
+
+ # for regression test
+ type bin_t;
+ type user_home_t;
+ type sepgsql_trusted_proc_t;
+
+ attribute tmpfile;
+ attribute user_ptynode;
+')
+
+#################################
@ -134,44 +139,30 @@ diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.te sepgs
+# Domain for Testcases
+#
+
+type sepgsql_test_t;
+domain_type(sepgsql_test_t)
+role sepgsql_test_r;
+
+userdom_unpriv_user_template(sepgsql_test)
+
+ifdef(`postgresql_role', `
+ postgresql_role(sepgsql_test_r, sepgsql_test_t)
+',`
+ postgresql_userdom_template(sepgsql_test, sepgsql_test_t, sepgsql_test_r)
+')
+
+allow sepgsql_test_t tmpfile : dir search_dir_perms;
+allow sepgsql_test_t tmpfile : file rw_file_perms;
+allow sepgsql_test_t user_ptynode : chr_file rw_file_perms;
+
+optional_policy(`
+ gen_require(`
+ role unconfined_r;
+ type unconfined_t;
+ role unconfined_r;
+ ')
+ allow unconfined_t sepgsql_test_t : process transition;
+ role unconfined_r types sepgsql_test_t;
+ role unconfined_r types sepgsql_trusted_proc_t;
+')
+
+corecmd_exec_bin(sepgsql_test_t)
+allow sepgsql_test_t bin_t : file { entrypoint };
+
+files_read_usr_files(sepgsql_test_t)
+files_read_etc_files(sepgsql_test_t)
+libs_use_ld_so(sepgsql_test_t)
+libs_use_shared_libs(sepgsql_test_t)
+
+term_use_all_terms(sepgsql_test_t)
+
+files_search_home(sepgsql_test_t)
+allow sepgsql_test_t home_type : file rw_file_perms;
+allow sepgsql_test_t home_type : dir search_dir_perms;
+miscfiles_read_localization(sepgsql_test_t)
+
+allow sepgsql_test_t tmpfile : dir search_dir_perms;
+allow sepgsql_test_t tmpfile : file rw_file_perms;
+
+postgresql_stream_connect(sepgsql_test_t)
+postgresql_unpriv_client(sepgsql_test_t)
+
+optional_policy(`
+ nscd_shm_use(sepgsql_test_t)
+')
+
+#################################
+#
+# SE-PostgreSQL Declarations
@ -207,6 +198,7 @@ diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.te sepgs
+ auditallow domain sepgsql_database_type : db_database *;
+ auditallow domain sepgsql_table_type : db_table *;
+ auditallow domain sepgsql_table_type : db_column *;
+ auditallow domain sepgsql_table_type : db_tuple { relabelfrom relabelto };
+ auditallow domain sepgsql_procedure_type : db_procedure *;
+ auditallow domain sepgsql_blob_type : db_blob *;
+ auditallow domain sepgsql_module_type : db_database { install_module };
@ -217,6 +209,7 @@ diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.te sepgs
+ dontaudit domain sepgsql_database_type : db_database *;
+ dontaudit domain sepgsql_table_type : db_table *;
+ dontaudit domain sepgsql_table_type : db_column *;
+ dontaudit domain sepgsql_table_type : db_tuple { relabelfrom relabelto };
+ dontaudit domain sepgsql_procedure_type : db_procedure *;
+ dontaudit domain sepgsql_blob_type : db_blob *;
+ dontaudit domain sepgsql_module_type : db_database { install_module };
@ -228,9 +221,9 @@ diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql-devel.te sepgs
+# SE-PostgreSQL regression test mode switch
+#
+tunable_policy(`sepgsql_regression_test_mode',`
+ allow sepgsql_client_type home_type : db_database { install_module };
+ allow sepgsql_unconfined_type home_type : db_database { install_module };
+ allow sepgsql_database_type home_type : db_database { load_module };
+ allow sepgsql_client_type user_home_t : db_database { install_module };
+ allow sepgsql_unconfined_type user_home_t : db_database { install_module };
+ allow sepgsql_database_type user_home_t : db_database { load_module };
+')
diff -rpNU3 base/src/backend/security/sepgsql/policy/sepostgresql.fc.template sepgsql/src/backend/security/sepgsql/policy/sepostgresql.fc.template
--- base/src/backend/security/sepgsql/policy/sepostgresql.fc.template 1970-01-01 09:00:00.000000000 +0900

8112
sepostgresql-sepgsql-8.3.5-2.patch → sepostgresql-sepgsql-8.3.6-2.patch
View file

File diff suppressed because it is too large Load diff

8
sepostgresql.init
View file

@ -7,9 +7,9 @@
# pidfile: /var/run/postmaster.pid
#---------------------------------------------------------------------
PGVERSION="8.3.5"
PGVERSION="8.3.6"
PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'`
SEPGVERSION="2.1183"
SEPGVERSION="2.1518"
# source function library
. /etc/rc.d/init.d/functions
@ -38,7 +38,7 @@ export SEPGSQL_FALLBACK_CONTEXT
# Check that networking is up.
test "${NETWORKING}" = "no" && exit 0
test -f "${SEPGSQL_BIN}/postmaster" || exit 1
test -f "${SEPGSQL_BIN}/sepostgres" || exit 1
script_result=0
@ -165,7 +165,7 @@ do_initdb() {
test -x /sbin/restorecon && /sbin/restorecon -R "${SEPGSQL_DATA}"
# Initialize the database
cd ${SEPGSQL_BIN}
/sbin/runuser -- sepgsql -c "./initdb.sepgsql -A 'ident sameuser' ${SEPGSQL_DATA}" \
/sbin/runuser -- sepgsql -c "./initdb.sepgsql --pgace-feature=selinux -A 'ident sameuser' ${SEPGSQL_DATA}" \
>> "${SEPGSQL_STARTUP_LOG}" 2>&1 < /dev/null
if [ -f "${SEPGSQL_DATA}/PG_VERSION" ]; then
echo_success

14
sepostgresql.spec
View file

@ -21,8 +21,8 @@
Summary: Security Enhanced PostgreSQL
Name: sepostgresql
Version: 8.3.5
Release: 2.1183%{?sepgsql_extension}%{?dist}
Version: 8.3.6
Release: 2.1518%{?sepgsql_extension}%{?dist}
License: BSD
Group: Applications/Databases
Url: http://code.google.com/p/sepgsql/
@ -31,9 +31,9 @@ Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.t
Source1: sepostgresql.init
Source2: sepostgresql.8
Source3: sepostgresql.logrotate
Patch0: sepostgresql-sepgsql-8.3.5-2.patch
Patch1: sepostgresql-policy-8.3.5-2.patch
Patch2: sepostgresql-pg_dump-8.3.5-2.patch
Patch0: sepostgresql-sepgsql-8.3.6-2.patch
Patch1: sepostgresql-policy-8.3.6-2.patch
Patch2: sepostgresql-pg_dump-8.3.6-2.patch
Patch3: sepostgresql-fedora-prefix.patch
BuildRequires: perl glibc-devel bison flex readline-devel zlib-devel >= 1.0.4
BuildRequires: checkpolicy libselinux-devel >= 2.0.43
@ -214,6 +214,10 @@ fi
%attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
%changelog
* Fri Feb 6 2009 <kaigai@kaigai.gr.jp> - 8.3.6-2.1518
- upgrade base PostgreSQL version 8.3.5->8.3.6
- backport features from 8.4devel tree
* Sat Jan 17 2009 Tomas Mraz <tmraz@redhat.com> - 8.3.5-2.1183
- rebuild with new openssl

2
sources
View file

@ -1 +1 @@
3bc028774d7a79e926be0c6a9c7ca209 postgresql-8.3.5.tar.bz2
4f8c67d802bd03b5b844e268bba7d44a postgresql-8.3.6.tar.bz2