rpms/postgresql/F-12 .cvsignore, 1.48, 1.49 ecpg_config.h, 1.1, 1.2 pg_config.h, 1.3, 1.4 postgresql-ac-version.patch, 1.9, 1.10 postgresql.spec, 1.120, 1.121 sources, 1.49, 1.50

Wed Dec 16 05:53:16 UTC 2009

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25479

Modified Files:
	.cvsignore ecpg_config.h pg_config.h 
	postgresql-ac-version.patch postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.4.2; sync with recent devel changes


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-12/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49

--- .cvsignore	9 Sep 2009 15:13:29 -0000	1.48
+++ .cvsignore	16 Dec 2009 05:53:16 -0000	1.49
@@ -1,5 +1,5 @@
-postgresql-8.4.1.tar.bz2
+postgresql-8.4.2.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.6.2.tar.gz
 pgtcldocs-20070115.zip
-postgresql-8.4.1-US.pdf
+postgresql-8.4.2-US.pdf


Index: ecpg_config.h
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-12/ecpg_config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ecpg_config.h	4 Sep 2007 17:26:37 -0000	1.1
+++ ecpg_config.h	16 Dec 2009 05:53:16 -0000	1.2
@@ -22,4 +22,8 @@
 #include "ecpg_config_s390x.h"
 #elif defined(__s390__)
 #include "ecpg_config_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ecpg_config_sparc64.h"
+#elif defined(__sparc__)
+#include "ecpg_config_sparc.h"
 #endif


Index: pg_config.h
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-12/pg_config.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pg_config.h	13 Feb 2006 15:53:02 -0000	1.3
+++ pg_config.h	16 Dec 2009 05:53:16 -0000	1.4
@@ -22,4 +22,8 @@
 #include "pg_config_s390x.h"
 #elif defined(__s390__)
 #include "pg_config_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "pg_config_sparc64.h"
+#elif defined(__sparc__)
+#include "pg_config_sparc.h"
 #endif

postgresql-ac-version.patch:
 configure.in |    4 ----
 1 file changed, 4 deletions(-)

Index: postgresql-ac-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-12/postgresql-ac-version.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- postgresql-ac-version.patch	9 Sep 2009 15:13:29 -0000	1.9
+++ postgresql-ac-version.patch	16 Dec 2009 05:53:16 -0000	1.10
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenabl
 Dike out the check.
 
 
-diff -Naur postgresql-8.4.1.orig/configure.in postgresql-8.4.1/configure.in
---- postgresql-8.4.1.orig/configure.in	2009-09-03 20:36:50.000000000 -0400
-+++ postgresql-8.4.1/configure.in	2009-09-04 13:03:07.000000000 -0400
+diff -Naur postgresql-8.4.2.orig/configure.in postgresql-8.4.2/configure.in
+--- postgresql-8.4.2.orig/configure.in	2009-09-03 20:36:50.000000000 -0400
++++ postgresql-8.4.2/configure.in	2009-09-04 13:03:07.000000000 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.4.1], [pgsql-bugs at postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.2], [pgsql-bugs at postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-12/postgresql.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- postgresql.spec	22 Sep 2009 00:45:57 -0000	1.120
+++ postgresql.spec	16 Dec 2009 05:53:16 -0000	1.121
@@ -56,12 +56,13 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 
-Summary: PostgreSQL client programs and libraries
+Summary: PostgreSQL client programs
 Name: postgresql
 %define majorversion 8.4
-Version: 8.4.1
-Release: 3%{?dist}
-# PG considers their license to be simplified BSD, but it's more nearly MIT
+Version: 8.4.2
+Release: 1%{?dist}
+# PostgreSQL calls their license simplified BSD, but the requirements are
+# more similar to other MIT licenses.
 License: MIT
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -75,7 +76,7 @@ Source7: ecpg_config.h
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.4.1-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.4.2-US.pdf
 Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
 Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
 Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -89,7 +90,8 @@ Patch6: postgresql-perl-rpath.patch
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex autoconf gawk
 BuildRequires: perl(ExtUtils::Embed), perl-devel
 # for /sbin/ldconfig
-Prereq: glibc initscripts
+Requires(post): glibc initscripts
+Requires(postun): glibc initscripts
 
 %if %python || %plpython
 BuildRequires: python-devel
@@ -140,11 +142,6 @@ BuildRequires: systemtap-sdt-devel
 # main package requires -libs subpackage
 Requires: postgresql-libs = %{version}-%{release}
 
-Obsoletes: postgresql-clients
-Obsoletes: postgresql-perl
-Obsoletes: postgresql-tk
-Obsoletes: rh-postgresql
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -168,8 +165,7 @@ if you're installing the postgresql-serv
 %package libs
 Summary: The shared libraries required for any PostgreSQL clients
 Group: Applications/Databases
-Provides: libpq.so
-Obsoletes: rh-postgresql-libs
+Provides: libpq.so = %{version}-%{release}
 
 %description libs
 The postgresql-libs package provides the essential shared libraries for any 
@@ -180,9 +176,10 @@ PostgreSQL server.
 %package server
 Summary: The programs needed to create and run a PostgreSQL server
 Group: Applications/Databases
-Prereq: /usr/sbin/useradd /sbin/chkconfig 
 Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-server
+Requires(pre): /usr/sbin/useradd
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
 
 %description server
 The postgresql-server package includes the programs needed to create
@@ -200,7 +197,6 @@ to install the postgresql package.
 Summary: Extra documentation for PostgreSQL
 Group: Applications/Databases
 Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-docs
 
 %description docs
 The postgresql-docs package includes some additional documentation for
@@ -209,10 +205,9 @@ and source files for the PostgreSQL tuto
 
 
 %package contrib
-Summary: Contributed source and binaries distributed with PostgreSQL
+Summary: Contributed modules distributed with PostgreSQL
 Group: Applications/Databases
 Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-contrib
 
 %description contrib
 The postgresql-contrib package contains contributed packages that are
@@ -223,7 +218,6 @@ included in the PostgreSQL distribution.
 Summary: PostgreSQL development header files and libraries
 Group: Development/Libraries
 Requires: postgresql = %{version}-%{release}
-Obsoletes: rh-postgresql-devel
 
 %description devel
 The postgresql-devel package contains the header files and libraries
@@ -237,8 +231,6 @@ develop applications which will interact
 Summary: The Perl procedural language for PostgreSQL
 Group: Applications/Databases
 Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-pl
-Obsoletes: postgresql-pl
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description plperl
@@ -252,8 +244,6 @@ procedural language for the backend.
 Summary: The Python procedural language for PostgreSQL
 Group: Applications/Databases
 Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-pl
-Obsoletes: postgresql-pl
 
 %description plpython
 PostgreSQL is an advanced Object-Relational database management
@@ -266,8 +256,6 @@ procedural language for the backend.
 Summary: The Tcl procedural language for PostgreSQL
 Group: Applications/Databases
 Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-pl
-Obsoletes: postgresql-pl
 
 %description pltcl
 PostgreSQL is an advanced Object-Relational database management
@@ -282,7 +270,6 @@ Group: Applications/Databases
 # this is intentionally not a version-specific Requires:
 Requires: libpq.so
 Requires: tcl >= 8.5
-Obsoletes: rh-postgresql-tcl
 
 %description tcl
 PostgreSQL is an advanced Object-Relational database management
@@ -297,7 +284,6 @@ Group: Applications/Databases
 # this is intentionally not a version-specific Requires:
 Requires: libpq.so
 Requires: python mx
-Obsoletes: rh-postgresql-python
 
 %description python
 PostgreSQL is an advanced Object-Relational database management
@@ -311,7 +297,6 @@ database.
 Summary: The test suite distributed with PostgreSQL
 Group: Applications/Databases
 Requires: postgresql-server = %{version}-%{release}
-Obsoletes: rh-postgresql-test
 
 %description test
 PostgreSQL is an advanced Object-Relational database management
@@ -478,7 +463,7 @@ make -C contrib DESTDIR=$RPM_BUILD_ROOT 
 # multilib header hack; note pg_config.h is installed in two places!
 # we only apply this to known Red Hat multilib arches, per bug #177564
 case `uname -i` in
-  i386 | x86_64 | ppc | ppc64 | s390 | s390x)
+  i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
     mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -i`.h
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
     mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
@@ -602,15 +587,7 @@ cat psql-%{majorversion}.lang >>main.lst
 
 %pre server
 groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
-useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
-	-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
-
-# If we're upgrading from rh-postgresql, we have to repeat the above actions
-# after rh-postgresql-server is uninstalled, because its postun script runs
-# after our pre script ...
-%triggerpostun -n postgresql-server -- rh-postgresql-server
-groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
-useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
+useradd -M -N -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
 	-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
 
 %post server
@@ -630,23 +607,18 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %if %plperl
-%post -p /sbin/ldconfig   plperl
-%postun -p /sbin/ldconfig   plperl
+%post -p /sbin/ldconfig plperl
+%postun -p /sbin/ldconfig plperl
 %endif
 
 %if %plpython
-%post -p /sbin/ldconfig   plpython
-%postun -p /sbin/ldconfig   plpython
+%post -p /sbin/ldconfig plpython
+%postun -p /sbin/ldconfig plpython
 %endif
 
 %if %pltcl
-%post -p /sbin/ldconfig   pltcl
-%postun -p /sbin/ldconfig   pltcl
-%endif
-
-%if %test
-%post test
-chown -R postgres:postgres /usr/share/pgsql/test >/dev/null 2>&1 || :
+%post -p /sbin/ldconfig pltcl
+%postun -p /sbin/ldconfig pltcl
 %endif
 
 %clean
@@ -854,6 +826,18 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Dec 16 2009 Tom Lane <tgl at redhat.com> 8.4.2-1
+- Update to PostgreSQL 8.4.2, for various fixes described at
+  http://www.postgresql.org/docs/8.4/static/release-8-4-2.html
+  including two security issues
+Related: #546321
+Related: #547662
+- Use -N not the obsolete -n in useradd call
+Resolves: #495727
+- Clean up specfile to eliminate rpmlint gripes, mainly by removing
+  no-longer-needed provisions for superseding rh-postgresql
+- add sparc/sparc64 to multilib header support
+
 * Mon Sep 21 2009 Tom Lane <tgl at redhat.com> 8.4.1-3
 - Ensure pgstartup.log gets the right ownership/permissions during initdb
 Resolves: #498959


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-12/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	9 Sep 2009 15:13:29 -0000	1.49
+++ sources	16 Dec 2009 05:53:16 -0000	1.50
@@ -1,5 +1,5 @@
-f2015af17bacbbfe140daf0d1067f9c9  postgresql-8.4.1.tar.bz2
+d738227e2f1f742d2f2d4ab56496c5c6  postgresql-8.4.2.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 abf26e3cd7f8229f468045ed1fb7e748  pgtcl1.6.2.tar.gz
 8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
-37ebde274743cc5ed3cf3d49c3f84119  postgresql-8.4.1-US.pdf
+f01eb7590a297e18a89005d74d693f21  postgresql-8.4.2-US.pdf


