diff options
| -rw-r--r-- | .cvsignore | 8 | ||||
| -rw-r--r-- | pg_config.h | 5 | ||||
| -rwxr-xr-x | postgresql.spec | 30 | ||||
| -rw-r--r-- | sources | 8 |
4 files changed, 32 insertions, 19 deletions
@@ -1,8 +1,8 @@ -postgresql-8.1.2.tar.bz2 +postgresql-8.1.3.tar.bz2 PyGreSQL-3.7.tgz pgtcl1.5.2.tar.gz pgtcldocs-20041108.zip -postgresql-8.1-404.jdbc2.jar -postgresql-8.1-404.jdbc2ee.jar -postgresql-8.1-404.jdbc3.jar postgresql-8.1-US.pdf +postgresql-8.1-405.jdbc2.jar +postgresql-8.1-405.jdbc2ee.jar +postgresql-8.1-405.jdbc3.jar diff --git a/pg_config.h b/pg_config.h index 4f1df24..f00828a 100644 --- a/pg_config.h +++ b/pg_config.h @@ -4,13 +4,14 @@ * identical. Hence, this file is architecture-independent and calls * in an arch-dependent file that will appear in just one RPM. * + * To avoid breaking arches not explicitly supported by Red Hat, we + * use this indirection file *only* on known multilib arches. + * * Note: this may well fail if user tries to use gcc's -I- option. * But that option is deprecated anyway. */ #if defined(__x86_64__) #include "pg_config_x86_64.h" -#elif defined(__ia64__) -#include "pg_config_ia64.h" #elif defined(__i386__) #include "pg_config_i386.h" #elif defined(__ppc64__) || defined(__powerpc64__) diff --git a/postgresql.spec b/postgresql.spec index af982ab..c855f3f 100755 --- a/postgresql.spec +++ b/postgresql.spec @@ -81,8 +81,8 @@ Summary: PostgreSQL client programs and libraries. Name: postgresql -Version: 8.1.2 -Release: 1.1 +Version: 8.1.3 +Release: 1 License: BSD Group: Applications/Databases Url: http://www.postgresql.org/ @@ -92,9 +92,9 @@ Source3: postgresql.init Source4: Makefile.regress Source5: pg_config.h Source6: README.rpm-dist -Source8: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc2.jar -Source9: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc2ee.jar -Source10: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc3.jar +Source8: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc2.jar +Source9: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc2ee.jar +Source10: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc3.jar Source14: postgresql.pam Source15: postgresql-bashprofile Source16: filter-requires-perl-Pg.sh @@ -471,10 +471,17 @@ make -C contrib/xml2 DESTDIR=$RPM_BUILD_ROOT install %endif # multilib header hack; note pg_config.h is installed in two places! -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 -install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/ +# we only apply this to known Red Hat multilib arches, per bug #177564 +case `uname -i` in + i386 | x86_64 | ppc | ppc64 | s390 | s390x) + 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 + install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/ + ;; + *) + ;; +esac install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial @@ -819,6 +826,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Feb 13 2006 Tom Lane <tgl@redhat.com> 8.1.3-1 +- Update to PostgreSQL 8.1.3 (fixes bug #180617, CVE-2006-0553) +- Update to jdbc driver build 405 +- Modify multilib header hack to not break non-RH arches, per bug #177564 + * Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 8.1.2-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes @@ -1,8 +1,8 @@ -12d54a11bc3a414477d37ef338bec161 postgresql-8.1.2.tar.bz2 +bb510edbb533962c0692e211b3bd8cfa postgresql-8.1.3.tar.bz2 9fa4c2fc1dd0b3b93a3381c048443e16 PyGreSQL-3.7.tgz d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz 3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip -441d73f6f3a56c1abf8970ed79f51d28 postgresql-8.1-404.jdbc2.jar -f506ae68d039bcc820641c1b1a8430c7 postgresql-8.1-404.jdbc2ee.jar -8d8788f0a8b8d2184b452e3f34d62966 postgresql-8.1-404.jdbc3.jar 66d80897840724917cb838c76393692b postgresql-8.1-US.pdf +32e874651c4916bfd1a827c503d3505a postgresql-8.1-405.jdbc2.jar +80ca36179ab2ea0fd4e8dbf6d76ade6a postgresql-8.1-405.jdbc2ee.jar +2b699f0e686bcf7ec56bea16474ab2c2 postgresql-8.1-405.jdbc3.jar |