dist-git conversion

#2781)

.cvsignore

@@ -1,4 +0,0 @@
-postgresql-8.2.4.tar.gz
-postgresql-8.2.5.tar.gz
-sepostgresql-8.2.4-0.434.patch
-sepostgresql-8.2.4-1.patch

.gitignore

@@ -0,0 +1 @@
+postgresql-8.2.11.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: sepostgresql
-# $Id$
-NAME := sepostgresql
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sepostgresql.init

@@ -7,9 +7,9 @@
 # pidfile: /var/run/postmaster.pid
 #---------------------------------------------------------------------
 
-PGVERSION="8.2.5"
+PGVERSION="8.2.11"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
-SEPGVERSION="1.33"
+SEPGVERSION="1.1182"
 
 # source function library
 . /etc/rc.d/init.d/functions

sepostgresql.spec

@@ -12,8 +12,8 @@
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
-Version: 8.2.5
-Release: 1.33%{?sepgextension}%{?dist}
+Version: 8.2.11
+Release: 1.1182%{?sepgsql_extension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -24,9 +24,9 @@ Source2: sepostgresql.if
 Source3: sepostgresql.te
 Source4: sepostgresql.fc
 Source5: sepostgresql.8
-Patch0: sepostgresql-8.2.5-1.patch
+Patch0: sepostgresql-8.2.11-1.patch
 Patch1: sepostgresql-fedora-prefix.patch
-BuildRequires: perl glibc-devel bison flex autoconf readline-devel zlib-devel >= 1.0.4
+BuildRequires: perl glibc-devel bison flex readline-devel zlib-devel >= 1.0.4
 Buildrequires: checkpolicy libselinux-devel >= 2.0.13 selinux-policy-devel >= 3.0.6
 Requires(pre): shadow-utils
 Requires(post): policycoreutils /sbin/chkconfig
@@ -65,7 +65,6 @@ done
 popd
 
 # build SE-PostgreSQL
-autoconf
 %configure      --disable-rpath                 \
                 --enable-selinux                \
 %if %{defined sepgextension}
@@ -76,8 +75,7 @@ autoconf
                 --datadir=%{_datadir}/sepgsql
 
 # parallel build, if possible
-SECCLASS_DB_DATABASE=`grep ^define %{_datadir}/selinux/devel/include/support/all_perms.spt | cat -n | grep all_db_database_perms | awk '{print $1}'`
-make CUSTOM_COPT="-D SECCLASS_DB_DATABASE=${SECCLASS_DB_DATABASE}" %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -113,7 +111,6 @@ rm -rf %{buildroot}%{_bindir}.orig
 rm -rf %{buildroot}%{_libdir}/sepgsql.orig
 rm -rf %{buildroot}%{_includedir}
 rm -rf %{buildroot}%{_usr}/doc
-rm -rf %{buildroot}%{_datadir}/sepgsql/timezone
 rm -rf %{buildroot}%{_mandir}
 
 # /var/lib/sepgsql
@@ -198,6 +195,7 @@ fi
 %{_datadir}/sepgsql/postgres.shdescription
 %{_datadir}/sepgsql/system_views.sql
 %{_datadir}/sepgsql/*.sample
+%{_datadir}/sepgsql/timezone/
 %{_datadir}/sepgsql/timezonesets/
 %{_datadir}/sepgsql/conversion_create.sql
 %{_datadir}/sepgsql/information_schema.sql
@@ -208,9 +206,49 @@ fi
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Wed Nov  5 2008 <kaigai@kaigai.gr.jp> - 8.2.11-1.1182
+- upgrade base PostgreSQL 8.2.10 -> 8.2.11
+
+* Tue Sep 30 2008 <kaigai@kaigai.gr.jp> - 8.2.10-1.1067
+- upgrade base PostgreSQL 8.2.9 -> 8.2.10
+
+* Fri Jun 13 2008 <kaigai@kaigai.gr.jp> - 8.2.9-1.869
+- upgrade base PostgreSQL 8.2.7 -> 8.2.9
+
+* Wed Apr 30 2008 <kaigai@kaigai.gr.jp> - 8.2.7-1.298
+- BUGFIX: ROW-level control did not work correctly on TRUNCATE
+
+* Thu Mar 27 2008 <kaigai@kaigai.gr.jp> - 8.2.7-1.281
+- update base PostgreSQL 8.2.6->8.2.7
+
+* Sun Mar  2 2008 <kaigai@kaigai.gr.jp> - 8.2.6-1.231
+- bugfix: SELECT count(*) was not filtered correctly.
+
+* Wed Feb  6 2008 <kaigai@kaigai.gr.jp> - 8.2.6-1.208
+- bugfix: blob:{read} is not evaluated correctly
+- policy update: allow db_database:{set_param}
+- packs timezone related files
+
+* Tue Jan 22 2008 <kaigai@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@kaigai.gr.jp> - 8.2.6-1.140
+- add "security_sysattr_name" GUC variable
+- update base PostgreSQL to 8.2.6
+
+* Wed Nov 21 2007 <kaigai@kaigai.gr.jp> - 8.2.5-1.66
+- Add a policy module hotfix for labeled networking
+
+* Thu Nov 1 2007 <kaigai@kaigai.gr.jp> - 8.2.5-1.51
+- Re-organize repository to prepare to branch 8.3.x based tree.
+  (no differences from 8.2.5-1.33)
+
 * Wed Oct 17 2007 <kaigai@kaigai.gr.jp> - 8.2.5-1.33
 - Fix bug: security context was not canonicalized
   when irregular context (but interpretable) was inputed.
+
 * Mon Oct 15 2007 <kaigai@kaigai.gr.jp> - 8.2.5-1.31
 - Fix bug: type definitions of security_label_to_text()
   and text_to_security_label() are mismatched.

sepostgresql.te

@@ -1,7 +1,12 @@
-policy_module(sepostgresql, 1.33)
+policy_module(sepostgresql, 1.1182)
 
 gen_require(`
-	all_userspace_class_perms
+	class db_database all_db_database_perms;
+	class db_table all_db_table_perms;
+	class db_procedure all_db_procedure_perms;
+	class db_column all_db_column_perms;
+	class db_tuple all_db_tuple_perms;
+	class db_blob all_db_blob_perms;
 
 	type postgresql_t;
 	type lib_t, shlib_t;
@@ -205,7 +210,7 @@ tunable_policy(`sepgsql_enable_unconfined',`
 # SE-PostgreSQL policy for generic domain
 #
 
-allow sepgsql_users_domain sepgsql_db_t : db_database { getattr access };
+allow sepgsql_users_domain sepgsql_db_t : db_database { getattr access get_param set_param };
 
 allow sepgsql_users_domain sepgsql_table_t : db_table { getattr use select update insert delete };
 allow sepgsql_users_domain sepgsql_table_t : db_column { getattr use select update insert };
@@ -281,3 +286,30 @@ tunable_policy(`! sepgsql_enable_auditdeny',`
 tunable_policy(`! sepgsql_enable_audittuple || ! sepgsql_enable_auditdeny',`
 	dontaudit domain sepgsql_table_type : db_tuple all_db_tuple_perms;
 ')
+
+########################################
+#
+# Hotfixes for labeled networking
+# 
+# NOTE: These changes are to be merged in the later releases.
+optional_policy(`
+	gen_require(`
+		attribute sepgsql_server_type;
+		attribute sepgsql_users_domain;
+		attribute unconfined_domain_type;
+		type unlabeled_t;
+		type ipsec_spd_t;
+		type racoon_t;
+	')
+	# allow unconfined_t to set default SPD context
+	allow unconfined_domain_type ipsec_spd_t : association { setcontext };
+	# allow server/client domain to communicate via default SPD context
+	allow { sepgsql_server_type sepgsql_users_domain } ipsec_spd_t : association { polmatch };
+	allow { sepgsql_server_type sepgsql_users_domain } self : association { sendto };
+	allow sepgsql_server_type sepgsql_users_domain : { association tcp_socket } recvfrom;
+	allow sepgsql_users_domain sepgsql_server_type : { association tcp_socket } recvfrom;
+	# racoon_t/unlabeled_t related
+	allow unlabeled_t self : association { sendto };
+	allow unlabeled_t ipsec_spd_t : association { polmatch };
+	allow racoon_t unlabeled_t : association { setcontext };
+')

sources

@@ -1 +1 @@
-f7f2548c41b87ceb63a495dc47a67440  postgresql-8.2.4.tar.gz
+1d0c0647e336f15e6d920ef09cac2478  postgresql-8.2.11.tar.gz