diff options
| -rw-r--r-- | .cvsignore | 4 | ||||
| -rw-r--r-- | postgresql-ac-version.patch | 8 | ||||
| -rwxr-xr-x | postgresql.spec | 76 | ||||
| -rw-r--r-- | sources | 4 |
4 files changed, 37 insertions, 55 deletions
@@ -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 diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch index b6bc5e6..8582720 100644 --- a/postgresql-ac-version.patch +++ b/postgresql-ac-version.patch @@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world. 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@postgresql.org]) + AC_INIT([PostgreSQL], [8.4.2], [pgsql-bugs@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 diff --git a/postgresql.spec b/postgresql.spec index 6772f73..a80885b 100755 --- a/postgresql.spec +++ b/postgresql.spec @@ -56,11 +56,11 @@ %{!?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: 5%{?dist} +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 @@ -76,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 @@ -90,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 @@ -141,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 @@ -169,8 +165,7 @@ if you're installing the postgresql-server package. %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 @@ -181,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 @@ -201,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 @@ -210,10 +205,9 @@ and source files for the PostgreSQL tutorial. %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 @@ -224,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 @@ -238,8 +231,6 @@ develop applications which will interact with a PostgreSQL server. 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 @@ -253,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 @@ -267,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 @@ -283,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 @@ -298,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 @@ -312,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 @@ -603,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 @@ -631,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 @@ -855,6 +826,17 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Dec 16 2009 Tom Lane <tgl@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 + * Mon Dec 7 2009 Stepan Kasal <skasal@redhat.com> - 8.4.1-5 - rebuild against perl 5.10.1 @@ -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 |