From 5764d191e490c3b855a65408bc7dc854a659f2d09e52195d14c6b62ccc4c11aa Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Thu, 14 Jan 2010 07:02:56 +0000
Subject: [PATCH] Accepting request 26870 from
 home:jengelh:branches:server:database:postgresql

Copy from home:jengelh:branches:server:database:postgresql/postgresql via accept of submit request 26870 revision 3.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/26870
OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=23
---
 postgresql-8.4.1.tar.bz2 |   3 -
 postgresql-8.4.2.tar.bz2 |   3 +
 postgresql-pl.changes    |   5 +
 postgresql-pl.spec       |  26 ++---
 postgresql.changes       | 201 +++++++++++++++++++++++++++++++++++++++
 postgresql.spec          |  55 ++++++-----
 6 files changed, 251 insertions(+), 42 deletions(-)
 delete mode 100644 postgresql-8.4.1.tar.bz2
 create mode 100644 postgresql-8.4.2.tar.bz2

diff --git a/postgresql-8.4.1.tar.bz2 b/postgresql-8.4.1.tar.bz2
deleted file mode 100644
index 4c4b30b..0000000
--- a/postgresql-8.4.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85f5a5053aea196a2c997785cb5f61368aa46407527de820006d04b594fd9d7c
-size 13579302
diff --git a/postgresql-8.4.2.tar.bz2 b/postgresql-8.4.2.tar.bz2
new file mode 100644
index 0000000..733e434
--- /dev/null
+++ b/postgresql-8.4.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:adb3c5c90396195d76e986f835c2bd0e0dad438f91f4dc2b62048caf6d9869f2
+size 13600699
diff --git a/postgresql-pl.changes b/postgresql-pl.changes
index 6d441aa..f0a8514 100644
--- a/postgresql-pl.changes
+++ b/postgresql-pl.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 16 18:08:38 UTC 2009 - crrodriguez@novell.com
+
+- use find_lang to package language files correctly 
+
 -------------------------------------------------------------------
 Mon May 19 18:31:54 CEST 2008 - schwab@suse.de
 
diff --git a/postgresql-pl.spec b/postgresql-pl.spec
index 9f123b7..6f2ae93 100644
--- a/postgresql-pl.spec
+++ b/postgresql-pl.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package postgresql-pl (Version 8.4.1)
+# spec file for package postgresql-pl (Version 8.4.2)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,10 +23,10 @@ BuildRequires:  openldap2-devel openssl-devel pam-devel readline-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  python-devel tcl-devel
 Summary:        The PL/Tcl, PL/Perl, and PL/Python Procedural Languages for PostgreSQL
-Version:        8.4.1
+Version:        8.4.2
 Release:        1
 %define pg_minor_version %(echo %version | cut -f1-2 -d.)
-License:        BSD 3-clause (or similar)
+License:        BSD3c(or similar)
 Group:          Productivity/Databases/Servers
 Source0:        postgresql-%version.tar.bz2
 NoSource:       0
@@ -59,7 +59,7 @@ Authors:
     Jan Wieck <JanWieck@Yahoo.com>
 
 %package -n postgresql-plperl
-License:        BSD 3-clause (or similar)
+License:        BSD3c(or similar)
 Summary:        The PL/Tcl, PL/Perl, and  PL/Python procedural languages for PostgreSQL
 Group:          Productivity/Databases/Servers
 Requires:       perl
@@ -87,7 +87,7 @@ Authors:
     etc.
 
 %package -n postgresql-plpython
-License:        BSD 3-clause (or similar)
+License:        BSD3c(or similar)
 Summary:        The PL/Python Procedural Languages for PostgreSQL
 Group:          Productivity/Databases/Servers
 Obsoletes:      postgresql-pl
@@ -119,7 +119,7 @@ Authors:
     Jan Wieck <JanWieck@Yahoo.com>
 
 %package -n postgresql-pltcl
-License:        BSD 3-clause (or similar)
+License:        BSD3c(or similar)
 Summary:        PL/Tcl Procedural Language for PostgreSQL
 Group:          Productivity/Databases/Tools
 Obsoletes:      postgresql-pl
@@ -191,28 +191,28 @@ done
 for f in %pls; do
 	make DESTDIR=%buildroot -C src/pl/$f install
 done
+for pl in pltcl plperl plpython;do
+%find_lang $pl-%{pg_minor_version} postgresql-$pl.lang
+done
 
 %clean
 rm -rf %buildroot
 
-%files -n postgresql-pltcl
+%files -n postgresql-pltcl -f postgresql-pltcl.lang
 %defattr(-,root,root)
 %dir %_libdir/postgresql
 %_libdir/postgresql/pltcl.so
 %_datadir/postgresql
 %_bindir/pltcl*
-%_datadir/locale/*/*/pltcl-*.mo
 
-%files -n postgresql-plperl
+%files -n postgresql-plperl -f postgresql-plperl.lang
 %defattr(-,root,root)
 %dir %_libdir/postgresql
 %_libdir/postgresql/plperl.so
-%_datadir/locale/*/*/plperl-*.mo
 
-%files -n postgresql-plpython
+%files -n postgresql-plpython -f postgresql-plpython.lang
 %defattr(-,root,root)
 %dir %_libdir/postgresql
 %_libdir/postgresql/plpython.so
-%_datadir/locale/*/*/plpython-*.mo
 
 %changelog
diff --git a/postgresql.changes b/postgresql.changes
index aa34af1..b9cb17c 100644
--- a/postgresql.changes
+++ b/postgresql.changes
@@ -1,3 +1,204 @@
+-------------------------------------------------------------------
+Wed Dec 16 16:19:20 CET 2009 - max@suse.de
+
+- Security and bugfix release 8.4.2:
+
+  * CVE-2009-4136: Protect against indirect security threats
+    caused by index functions changing session-local state. This
+    change prevents allegedly-immutable index functions from
+    possibly subverting a superuser's session.
+
+  * CVE-2009-4034: Reject SSL certificates containing an embedded
+    null byte in the common name (CN) field. This prevents
+    unintended matching of a certificate to a server or client
+    name during SSL validation.
+
+  * Fix hash index corruption. The 8.4 change that made hash
+    indexes keep entries sorted by hash value failed to update the
+    bucket splitting and compaction routines to preserve the
+    ordering. So application of either of those operations could
+    lead to permanent corruption of an index, in the sense that
+    searches might fail to find entries that are present. To deal
+    with this, it is recommended to REINDEX any hash indexes you
+    may have after installing this update.
+
+ * Fix possible crash during backend-startup-time cache
+   initialization
+
+ * Avoid crash on empty thesaurus dictionary
+
+ * Prevent signals from interrupting VACUUM at unsafe times. This
+   fix prevents a PANIC if a VACUUM FULL is cancelled after it's
+   already committed its tuple movements, as well as transient
+   errors if a plain VACUUM is interrupted after having truncated
+   the table.
+
+ * Fix possible crash due to integer overflow in hash table size
+   calculation. This could occur with extremely large planner
+   estimates for the size of a hashjoin's result.
+
+ * Fix crash if a DROP is attempted on an internally-dependent
+   object.
+
+ * Fix very rare crash in inet/cidr comparisons.
+
+ * Ensure that shared tuple-level locks held by prepared
+   transactions are not ignored.
+
+ * Fix premature drop of temporary files used for a cursor that is
+   accessed within a subtransaction.
+
+ * Fix memory leak in syslogger process when rotating to a new CSV
+   logfile.
+
+ * Fix memory leak in postmaster when re-parsing "pg_hba.conf".
+
+ * Make FOR UPDATE/SHARE in the primary query not propagate into
+   WITH queries.
+
+ * Fix bug with a WITH RECURSIVE query immediately inside another
+   one.
+
+ * Fix concurrency bug in hash indexes. Concurrent insertions
+   could cause index scans to transiently report wrong results.
+
+ * Fix incorrect logic for GiST index page splits, when the split
+   depends on a non-first column of the index.
+
+ * Fix wrong search results for a multi-column GIN index with
+   fastupdate enabled.
+
+ * Fix bugs in WAL entry creation for GIN indexes. These bugs were
+   masked when full_page_writes was on, but with it off a WAL
+   replay failure was certain if a crash occurred before the next
+   checkpoint.
+
+ * Don't error out if recycling or removing an old WAL file fails
+   at the end of checkpoint. It's better to treat the problem as
+   non-fatal and allow the checkpoint to complete. Future
+   checkpoints will retry the removal. Such problems are not
+   expected in normal operation, but have been seen to be caused
+   by misdesigned Windows anti-virus and backup software.
+
+ * Ensure WAL files aren't repeatedly archived on Windows. This is
+   another symptom that could happen if some other process
+   interfered with deletion of a no-longer-needed file.
+
+ * Fix PAM password processing to be more robust.  The previous
+   code is known to fail with the combination of the Linux
+   pam_krb5 PAM module with Microsoft Active Directory as the
+   domain controller. It might have problems elsewhere too, since
+   it was making unjustified assumptions about what arguments the
+   PAM stack would pass to it.
+
+ * Raise the maximum authentication token (Kerberos ticket) size
+   in GSSAPI and SSPI authentication methods.  While the old
+   2000-byte limit was more than enough for Unix Kerberos
+   implementations, tickets issued by Windows Domain Controllers
+   can be much larger.
+
+ * Ensure that domain constraints are enforced in constructs like
+   ARRAY[...]::domain, where the domain is over an array type.
+
+ * Fix foreign-key logic for some cases involving composite-type
+   columns as foreign keys.
+
+ * Ensure that a cursor's snapshot is not modified after it is
+   created. This could lead to a cursor delivering wrong results
+   if later operations in the same transaction modify the data the
+   cursor is supposed to return.
+
+ * Fix CREATE TABLE to properly merge default expressions coming
+   from different inheritance parent tables. This used to work but
+   was broken in 8.4.
+
+ * Re-enable collection of access statistics for sequences. This
+   used to work but was broken in 8.3.
+
+ * Fix processing of ownership dependencies during CREATE OR REPLACE
+   FUNCTION.
+
+ * Fix incorrect handling of WHERE "x"="x" conditions.  In some cases
+   these could get ignored as redundant, but they aren't -- they're
+   equivalent to "x" IS NOT NULL.
+
+ * Fix incorrect plan construction when using hash aggregation to
+   implement DISTINCT for textually identical volatile
+   expressions.
+
+ * Fix Assert failure for a volatile SELECT DISTINCT ON expression.
+
+ * Fix ts_stat() to not fail on an empty tsvector value.
+
+ * Make text search parser accept underscores in XML attributes.
+
+ * Fix encoding handling in xml binary input. If the XML header
+   doesn't specify an encoding, we now assume UTF-8 by default;
+   the previous handling was inconsistent.
+
+ * Fix bug with calling plperl from plperlu or vice versa. An
+   error exit from the inner function could result in crashes due
+   to failure to re-select the correct Perl interpreter for the
+   outer function.
+
+ * Fix session-lifespan memory leak when a PL/Perl function is
+   redefined.
+
+ * Ensure that Perl arrays are properly converted to PostgreSQL
+   arrays when returned by a set-returning PL/Perl function. This
+   worked correctly already for non-set-returning functions.
+
+ * Fix rare crash in exception processing in PL/Python.
+
+ * Fix ecpg problem with comments in DECLARE CURSOR statements.
+
+ * Fix ecpg to not treat recently-added keywords as reserved
+   words.  This affected the keywords CALLED, CATALOG, DEFINER,
+   ENUM, FOLLOWING, INVOKER, OPTIONS, PARTITION, PRECEDING, RANGE,
+   SECURITY, SERVER, UNBOUNDED, and WRAPPER.
+
+ * Re-allow regular expression special characters in psql's \df
+   function name parameter.
+
+ * In "contrib/pg_standby", disable triggering failover with a
+   signal on Windows. This never did anything useful, because
+   Windows doesn't have Unix-style signals, but recent changes
+   made it actually crash.
+
+ * Put FREEZE and VERBOSE options in the right order in the VACUUM
+   command that "contrib/vacuumdb" produces.
+
+ * Fix possible leak of connections when "contrib/dblink"
+   encounters an error.
+
+ * Ensure psql's flex module is compiled with the correct system
+   header definitions.  This fixes build failures on platforms
+   where --enable-largefile causes incompatible changes in the
+   generated code.
+
+ * Make the postmaster ignore any application_name parameter in
+   connection request packets, to improve compatibility with
+   future libpq versions.
+
+ * Update the timezone abbreviation files to match current reality
+   This includes adding IDT to the default timezone abbreviation
+   set.
+
+-------------------------------------------------------------------
+Wed Dec 16 10:46:01 CET 2009 - jengelh@medozas.de
+
+- package documentation as noarch
+
+-------------------------------------------------------------------
+Mon Dec 14 16:08:29 CET 2009 - jengelh@medozas.de
+
+- add baselibs.conf as a source
+
+-------------------------------------------------------------------
+Wed Sep 16 18:00:20 UTC 2009 - crrodriguez@novell.com
+
+- use find_lang to package language files correctly 
+
 -------------------------------------------------------------------
 Thu Sep 10 12:06:36 CEST 2009 - max@suse.de
 
diff --git a/postgresql.spec b/postgresql.spec
index 8994c8f..f9020bf 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package postgresql (Version 8.4.1)
+# spec file for package postgresql (Version 8.4.2)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,12 +23,13 @@ BuildRequires:  bison flex gettext-devel krb5-devel libxslt-devel
 BuildRequires:  openldap2-devel openssl-devel pam-devel readline-devel zlib-devel
 BuildRequires:  ncurses-devel
 Summary:        Basic Clients and Utilities for PostgreSQL
-Version:        8.4.1
+Version:        8.4.2
 Release:        1
 %define pg_minor_version %(echo %version | cut -f1-2 -d.)
-License:        BSD 3-clause (or similar)
+License:        BSD3c(or similar)
 Group:          Productivity/Databases/Tools
 Source0:        postgresql-%version.tar.bz2
+Source1:        baselibs.conf
 Source2:        postgresql-README.SuSE.de
 Source3:        postgresql-README.SuSE.en
 Source8:        postgresql-sysconfig
@@ -68,7 +69,7 @@ Authors:
     Jan Wieck <JanWieck@Yahoo.com>
 
 %package libs
-License:        BSD 3-clause (or similar)
+License:        BSD3c(or similar)
 Summary:        Shared Libraries Required for PostgreSQL Clients
 Group:          Productivity/Databases/Clients
 # bug437293
@@ -101,7 +102,7 @@ Authors:
     Jan Wieck <JanWieck@Yahoo.com>
 
 %package server
-License:        BSD 3-clause (or similar)
+License:        BSD3c(or similar)
 Summary:        The Programs Needed to Create and Run a PostgreSQL Server
 Group:          Productivity/Databases/Servers
 PreReq:         %insserv_prereq %fillup_prereq
@@ -112,9 +113,12 @@ Requires:       glibc-locale
 Provides:       postgresql-server = %pg_minor_version
 
 %package docs
-License:        BSD 3-clause (or similar)
+License:        BSD3c(or similar)
 Summary:        HTML Documentation for PostgreSQL
 Group:          Productivity/Databases/Tools
+%if 0%{?suse_version} >= 1120
+BuildArch:	noarch
+%endif
 
 %description docs
 PostgreSQL is an advanced object-relational database management system
@@ -138,7 +142,7 @@ Authors:
     Jan Wieck <JanWieck@Yahoo.com>
 
 %package contrib
-License:        BSD 3-clause (or similar)
+License:        BSD3c(or similar)
 Summary:        Contributed Extensions and Additions to PostgreSQL
 Group:          Productivity/Databases/Tools
 Requires:       postgresql-server = %pg_minor_version
@@ -187,7 +191,7 @@ Authors:
     Jan Wieck <JanWieck@Yahoo.com>
 
 %package devel
-License:        BSD 3-clause (or similar)
+License:        BSD3c(or similar)
 Summary:        PostgreSQL development header files and libraries
 Group:          Productivity/Databases/Tools
 Requires:       postgresql-libs = %pg_minor_version
@@ -303,6 +307,18 @@ cp doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README* COPYRIGHT \
    README HISTORY doc/bug.template %buildroot%_docdir/postgresql
 cp -a %SOURCE2 %buildroot%_docdir/postgresql/README.SuSE.de
 cp -a %SOURCE3 %buildroot%_docdir/postgresql/README.SuSE.en
+for appname in pg_dump pgscripts psql;do
+%find_lang $appname-%{pg_minor_version} %{name}.lang
+done
+for libname in libpq5 ecpglib6;do
+%find_lang $libname-%{pg_minor_version} %{name}-libs.lang
+done
+for serverapp in initdb postgres pg_controldata pg_ctl pg_resetxlog plpgsql;do
+%find_lang $serverapp-%{pg_minor_version}  %{name}-server.lang
+done
+for develapp in pg_config ecpg;do
+%find_lang $develapp-%{pg_minor_version} %{name}-devel.lang 
+done
 
 %post libs -p /sbin/ldconfig
 
@@ -352,16 +368,13 @@ fi
 rm -rf %buildroot
 rm -f %my_provides
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc %_mandir/man7/*
 %docdir %_docdir/postgresql
 %dir %_docdir/postgresql
 %_docdir/postgresql/[[:upper:]]*
 %_docdir/postgresql/bug.template
-%_datadir/locale/*/*/pg_dump-*.mo
-%_datadir/locale/*/*/pgscripts-*.mo
-%_datadir/locale/*/*/psql-*.mo
 # command line tools
 %_bindir/createdb
 %doc %_mandir/man1/createdb.1*
@@ -405,13 +418,11 @@ rm -f %my_provides
 %dir %_datadir/postgresql
 %dir %_datadir/postgresql/contrib
 
-%files libs
+%files libs -f %{name}-libs.lang
 %defattr(-,root,root)
 %_libdir/lib*.so.*
-%_datadir/locale/*/*/libpq*.mo
-%_datadir/locale/*/*/ecpglib*-*.mo
 
-%files server
+%files server -f %{name}-server.lang
 %defattr(-,root,root)
 %config /etc/init.d/postgresql
 %config /var/adm/fillup-templates/sysconfig.postgresql
@@ -439,19 +450,13 @@ rm -f %my_provides
 %dir %_datadir/postgresql
 %_datadir/postgresql/timezone*
 %_datadir/postgresql/*.*
-%_datadir/locale/*/*/initdb-*.mo
-%_datadir/locale/*/*/postgres-*.mo
-%_datadir/locale/*/*/pg_controldata-*.mo
-%_datadir/locale/*/*/pg_ctl-*.mo
-%_datadir/locale/*/*/pg_resetxlog-*.mo
-%_datadir/locale/*/*/plpgsql-*.mo
 %_libdir/postgresql/*_and_*.so
 %attr(750,postgres,postgres) %dir /var/lib/pgsql
 %attr(700,postgres,postgres) %dir /var/lib/pgsql/data
 %attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
 %attr(640,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile
 
-%files devel
+%files devel -f %{name}-devel.lang
 %defattr(-,root,root)
 %_includedir/pgsql
 %_bindir/ecpg
@@ -459,8 +464,6 @@ rm -f %my_provides
 %_libdir/lib*.so
 %_libdir/libpgport.a
 %_libdir/postgresql/pgxs
-%_datadir/locale/*/*/pg_config-*.mo
-%_datadir/locale/*/*/ecpg-*.mo
 %doc %_mandir/man1/ecpg.1*
 %doc %_mandir/man1/pg_config.1*