[csw-devel] SF.net SVN: gar:[16626] csw/mgar/pkg/postgresql/branches
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Fri Dec 30 18:29:31 CET 2011
Revision: 16626
http://gar.svn.sourceforge.net/gar/?rev=16626&view=rev
Author: guengel
Date: 2011-12-30 17:29:31 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
postgresql/branches/postgresql-9.0-raos: Branched to version 9.0.
Modified Paths:
--------------
csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile
csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/checksums
Added Paths:
-----------
csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/
csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch
csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-ecpg-usr-local-include-replacement.patch
Removed Paths:
-------------
csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0001-ecpg-usr-local-include-replacement.patch
csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch
Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile 2011-12-30 15:15:25 UTC (rev 16625)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile 2011-12-30 17:29:31 UTC (rev 16626)
@@ -88,10 +88,10 @@
NAME = postgresql
-BASE_VERSION = 8.4
+BASE_VERSION = 9.0
VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION))
-PATCHLEVEL = 10
+PATCHLEVEL = 6
VERSION = $(BASE_VERSION).$(PATCHLEVEL)
CATEGORIES = apps
@@ -121,25 +121,27 @@
BIN_NAMES_SERVER = initdb pg_controldata pg_ctl pg_resetxlog postmaster postgres
BIN_NAMES_DEVEL = ecpg pg_config
BIN_NAMES_CLIENT = clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb
-BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo
+BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo pg_upgrade pg_archivecleanup
# These are shared objects used by the server. Please note, contrib installs
# also shared object in the same place, so make sure you don't mix up things
SO_NAMES_SERVER = ascii_and_mic.so cyrillic_and_mic.so dict_snowball.so euc_cn_and_mic.so
-SO_NAMES_SERVER += euc_jis_2004_and_shift_jis_2004.so euc_jp_and_sjis.so euc_kr_and_mic.so
+SO_NAMES_SERVER += euc_jp_and_sjis.so euc_kr_and_mic.so utf8_and_euc2004.so utf8_and_sjis2004.so
SO_NAMES_SERVER += euc_tw_and_big5.so latin2_and_win1250.so latin_and_mic.so plpgsql.so
SO_NAMES_SERVER += utf8_and_ascii.so utf8_and_big5.so utf8_and_cyrillic.so utf8_and_euc_cn.so
-SO_NAMES_SERVER += utf8_and_euc_jis_2004.so utf8_and_euc_jp.so utf8_and_euc_kr.so utf8_and_euc_tw.so
+SO_NAMES_SERVER += utf8_and_euc_jp.so utf8_and_euc_kr.so utf8_and_euc_tw.so euc2004_sjis2004.so
SO_NAMES_SERVER += utf8_and_gb18030.so utf8_and_gbk.so utf8_and_iso8859.so utf8_and_iso8859_1.so
-SO_NAMES_SERVER += utf8_and_johab.so utf8_and_shift_jis_2004.so utf8_and_sjis.so utf8_and_uhc.so utf8_and_win.so
+SO_NAMES_SERVER += utf8_and_johab.so utf8_and_sjis.so utf8_and_uhc.so utf8_and_win.so
+# This has been introduced with 9.0
+SO_NAMES_SERVER += libpqwalreceiver.so
# These are shared object used by contrib. Please note, the server installs
# also shared object in the same place, so make sure you don't mix up things
-SO_NAMES_CONTRIB = _int.so adminpack.so autoinc.so btree_gist.so chkpass.so
+SO_NAMES_CONTRIB = _int.so adminpack.so autoinc.so btree_gist.so chkpass.so passwordcheck.so
SO_NAMES_CONTRIB += cube.so dblink.so dict_int.so dict_xsyn.so earthdistance.so
-SO_NAMES_CONTRIB += fuzzystrmatch.so hstore.so insert_username.so
+SO_NAMES_CONTRIB += fuzzystrmatch.so hstore.so insert_username.so pg_upgrade_support.so
SO_NAMES_CONTRIB += isn.so lo.so ltree.so moddatetime.so pageinspect.so pg_buffercache.so
SO_NAMES_CONTRIB += pg_freespacemap.so pg_trgm.so pgcrypto.so pgrowlocks.so pgstattuple.so
SO_NAMES_CONTRIB += pgxml.so refint.so seg.so sslinfo.so tablefunc.so test_parser.so timetravel.so tsearch2.so
-SO_NAMES_CONTRIB += auto_explain.so btree_gin.so citext.so pg_stat_statements.so
+SO_NAMES_CONTRIB += auto_explain.so btree_gin.so citext.so pg_stat_statements.so unaccent.so
# Miscellaneous files
MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/conversion_create.sql
MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/information_schema.sql
@@ -214,10 +216,10 @@
# This patch will replace /usr/local/include by /opt/csw/include in
# ecpg.c and thus silence a checkpkg error.
-PATCHFILES += 0001-ecpg-usr-local-include-replacement.patch
+PATCHFILES += 0000-ecpg-usr-local-include-replacement.patch
# Test running on a NFS may fail. Thus we let the test run in
# /var/tmp/pgsql/tmp_check
-PATCHFILES += 0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch
+PATCHFILES += 0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch
INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED)
USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
@@ -383,6 +385,9 @@
BUILD_DEP_PKGS += CSWlibgnugetopt-dev
EXTRA_LD_OPTIONS = -R$(prefix)/lib/\$$ISALIST
+# Needed for thread safety check by configure
+LIBS = -lrt
+EXTRA_CONFIGURE_ENV = LIBS=$(LIBS)
BUILD64 = 1
#ISAEXEC = 0
@@ -399,8 +404,6 @@
CONFIGURE_ARGS += --with-includes=$(includedir)
CONFIGURE_ARGS += --with-libraries=$(libdir)
CONFIGURE_ARGS += --docdir=$(PGDOCDIR)
-# configure complains that we are not thread-safe, wtf? --raos
-#CONFIGURE_ARGS += --enable-thread-safety
CONFIGURE_ARGS += --with-gssapi
CONFIGURE_ARGS += --with-pam
@@ -475,6 +478,7 @@
post-install-modulated:
$(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install
+ $(INSTALL_ENV) gmake -C $(WORKSRC) DESTDIR=$(DESTDIR) install-docs
@$(MAKECOOKIE)
post-merge: $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation
Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/checksums
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/checksums 2011-12-30 15:15:25 UTC (rev 16625)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/checksums 2011-12-30 17:29:31 UTC (rev 16626)
@@ -1 +1 @@
-6fd9b76e1d4df479e0b5402c88b1860e postgresql-8.4.10.tar.bz2
+4ad7e4fc31ef8b8a75a3e4243933963f postgresql-9.0.6.tar.bz2
Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2011-12-30 17:29:31 UTC (rev 16626)
@@ -0,0 +1,43 @@
+From 6087958b802424f91462b3a98cf75bc0d3471e09 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol at opencsw.org>
+Date: Fri, 30 Dec 2011 16:33:54 +0100
+Subject: [PATCH] Run tests in /var/tmp/pgsql/tmp_check
+
+---
+ src/test/regress/GNUmakefile | 8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
+index 31762b8..ffe0667 100644
+--- a/src/test/regress/GNUmakefile
++++ b/src/test/regress/GNUmakefile
+@@ -141,7 +141,8 @@ tablespace-setup:
+ pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) $(NOLOCALE)
+
+ check: all
+- $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
++ install -d /var/tmp/pgsql/tmp_check
++ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
+
+ installcheck: all
+ $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule
+@@ -162,7 +163,8 @@ bigtest: all
+ $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule numeric_big
+
+ bigcheck: all
+- $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big
++ install -d /var/tmp/pgsql/tmp_check
++ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big
+
+
+ ##
+@@ -175,5 +177,5 @@ clean distclean maintainer-clean: clean-lib
+ # things created by various check targets
+ rm -f $(output_files) $(input_files)
+ rm -rf testtablespace
+- rm -rf results tmp_check log
++ rm -rf results /var/tmp/pgsql/tmp_check log
+ rm -f regression.diffs regression.out regress.out run_check.out
+--
+1.7.6.1
+
Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-ecpg-usr-local-include-replacement.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-ecpg-usr-local-include-replacement.patch (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-ecpg-usr-local-include-replacement.patch 2011-12-30 17:29:31 UTC (rev 16626)
@@ -0,0 +1,25 @@
+From dec1e5ffd2ec2e58d185f6e4753e38ff5a0af1cd Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol at opencsw.org>
+Date: Fri, 30 Dec 2011 16:27:27 +0100
+Subject: [PATCH] ecpg /usr/local/include replacement
+
+---
+ src/interfaces/ecpg/preproc/ecpg.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
+index db52bf5..05cad72 100644
+--- a/src/interfaces/ecpg/preproc/ecpg.c
++++ b/src/interfaces/ecpg/preproc/ecpg.c
+@@ -253,7 +253,7 @@ main(int argc, char *const argv[])
+ }
+
+ add_include_path(".");
+- add_include_path("/usr/local/include");
++ add_include_path("/opt/csw/include");
+ get_include_path(my_exec_path, include_path);
+ add_include_path(include_path);
+ add_include_path("/usr/include");
+--
+1.7.6.1
+
Deleted: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0001-ecpg-usr-local-include-replacement.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0001-ecpg-usr-local-include-replacement.patch 2011-12-30 15:15:25 UTC (rev 16625)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0001-ecpg-usr-local-include-replacement.patch 2011-12-30 17:29:31 UTC (rev 16626)
@@ -1,25 +0,0 @@
-From dc1c663085dff97adb890534a5d6bd7ede0bf542 Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <raos at opencsw.org>
-Date: Fri, 9 Dec 2011 18:09:58 +0100
-Subject: [PATCH] ecpg /usr/local/include replacement
-
----
- src/interfaces/ecpg/preproc/ecpg.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
-index e42d443..ac19813 100644
---- a/src/interfaces/ecpg/preproc/ecpg.c
-+++ b/src/interfaces/ecpg/preproc/ecpg.c
-@@ -255,7 +255,7 @@ main(int argc, char *const argv[])
- }
-
- add_include_path(".");
-- add_include_path("/usr/local/include");
-+ add_include_path("/opt/csw/include");
- get_include_path(my_exec_path, include_path);
- add_include_path(include_path);
- add_include_path("/usr/include");
---
-1.7.6.1
-
Deleted: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2011-12-30 15:15:25 UTC (rev 16625)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2011-12-30 17:29:31 UTC (rev 16626)
@@ -1,42 +0,0 @@
-From 8ea189fd88c2e2fb0c0d5df0e9addcd07b7a637d Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <raos at opencsw.org>
-Date: Sun, 18 Dec 2011 22:09:16 +0100
-Subject: [PATCH] Run tests in /var/tmp/pgsql/tmp_check
-
----
- src/test/regress/GNUmakefile | 7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
-index 83b02cb..85884ee 100644
---- a/src/test/regress/GNUmakefile
-+++ b/src/test/regress/GNUmakefile
-@@ -141,7 +141,8 @@ tablespace-setup:
- 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)
-+ install -d /var/tmp/pgsql/tmp_check
-+ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
-
- installcheck: all
- $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule
-@@ -160,7 +161,7 @@ bigtest: all
- $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule numeric_big
-
- bigcheck: all
-- $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big
-+ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big
-
-
- ##
-@@ -173,5 +174,5 @@ clean distclean maintainer-clean: clean-lib
- # things created by various check targets
- rm -f $(output_files) $(input_files)
- rm -rf testtablespace
-- rm -rf results tmp_check log
-+ rm -rf results /var/tmp/pgsql/tmp_check log
- rm -f regression.diffs regression.out regress.out run_check.out
---
-1.7.6.1
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list