From 72388599a8796553b78f3d27d616c07a68c2398b1c9f4dcffbdd43369c748155 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Wed, 5 Oct 2011 16:42:26 +0000 Subject: [PATCH] Version 9.1.1 OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=61 --- postgresql-9.0.4.tar.bz2 | 3 --- postgresql-9.1.1.tar.bz2 | 3 +++ postgresql-conf.patch | 17 +++++------------ postgresql-libs.changes | 10 ++++++++++ postgresql-libs.spec | 10 +++++++--- postgresql-perl514.patch | 23 ----------------------- postgresql-plperl.patch | 38 +++++++++++++++++++++++++++++--------- postgresql-regress.patch | 18 ++++++++++++------ postgresql.changes | 15 +++++++++++++++ postgresql.spec | 30 ++++++++++++++++++------------ postgresql.spec.in | 31 +++++++++++++++++++------------ 11 files changed, 118 insertions(+), 80 deletions(-) delete mode 100644 postgresql-9.0.4.tar.bz2 create mode 100644 postgresql-9.1.1.tar.bz2 delete mode 100644 postgresql-perl514.patch diff --git a/postgresql-9.0.4.tar.bz2 b/postgresql-9.0.4.tar.bz2 deleted file mode 100644 index e047c75..0000000 --- a/postgresql-9.0.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30572706e3176228415991895e63a8b77343a5abad11407961cfd08790be9e84 -size 14040871 diff --git a/postgresql-9.1.1.tar.bz2 b/postgresql-9.1.1.tar.bz2 new file mode 100644 index 0000000..fceec2f --- /dev/null +++ b/postgresql-9.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2 +size 14884071 diff --git a/postgresql-conf.patch b/postgresql-conf.patch index 40650b4..a76de05 100644 --- a/postgresql-conf.patch +++ b/postgresql-conf.patch @@ -1,6 +1,8 @@ ---- src/backend/utils/misc/postgresql.conf.sample +Index: src/backend/utils/misc/postgresql.conf.sample +=================================================================== +--- src/backend/utils/misc/postgresql.conf.sample.orig +++ src/backend/utils/misc/postgresql.conf.sample -@@ -253,13 +253,13 @@ +@@ -273,13 +273,13 @@ # - Where to Log - @@ -16,16 +18,7 @@ # into log files. Required to be on for # csvlogs. # (change requires restart) -@@ -287,7 +287,7 @@ - #syslog_facility = 'LOCAL0' - #syslog_ident = 'postgres' - --#silent_mode = off # Run server silently. -+silent_mode = on # Run server silently. - # DO NOT USE without syslog or - # logging_collector - # (change requires restart) -@@ -352,7 +352,8 @@ +@@ -374,7 +374,8 @@ #log_duration = off #log_error_verbosity = default # terse, default, or verbose messages #log_hostname = off diff --git a/postgresql-libs.changes b/postgresql-libs.changes index 1a9a4e3..aa981fa 100644 --- a/postgresql-libs.changes +++ b/postgresql-libs.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Oct 5 16:41:31 UTC 2011 - max@suse.com + +- New version 9.1.1. For detailed release notes, see: + http://www.postgresql.org/docs/9.1/static/release-9-1-1.html +- Stop using deprecated silent_mode in default config. +- postgresql-perl514.patch is no longer needed. +- Use %_smp_mflags for parallel make +- Keep the rpath when linking plperl [bnc#578053]. + ------------------------------------------------------------------- Fri Sep 16 17:17:08 UTC 2011 - jengelh@medozas.de diff --git a/postgresql-libs.spec b/postgresql-libs.spec index 4d46708..7a35590 100644 --- a/postgresql-libs.spec +++ b/postgresql-libs.spec @@ -27,12 +27,13 @@ Name: postgresql-libs %define libpq libpq5 %define libecpg libecpg6 %define buildall 0 +%define extensiondir %_datadir/postgresql/extension %if 0%{?suse_version} > 910 BuildRequires: krb5-devel libxslt-devel %endif BuildRequires: openldap2-devel openssl-devel Summary: Basic Clients and Utilities for PostgreSQL -Version: 9.0.4 +Version: 9.1.1 Release: 2 %define pg_minor_version %(echo %version | sed -r 's/^([0-9]+\\.[0-9]+).*/\\1/') License: BSD3c(or similar) @@ -52,7 +53,6 @@ Patch1: postgresql-conf.patch Patch2: postgresql-regress.patch Patch3: postgresql-sle10-timestamptz.patch Patch4: postgresql-plperl.patch -Patch5: postgresql-perl514.patch Url: http://www.postgresql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: postgresql = %pg_minor_version @@ -156,6 +156,9 @@ which will interact with a PostgreSQL server. %prep %setup -q -n %_name-%version +# Keep the timestamp of configure, because patching it would otherwise +# confuse PostgreSQL's build system +touch -r configure tmp %patch1 %patch2 # apply the following patch only on SLE10 @@ -163,7 +166,8 @@ which will interact with a PostgreSQL server. %patch3 -p1 %endif %patch4 -%patch5 -p1 +touch -r tmp configure +rm tmp %build export CFLAGS="%optflags $SP" diff --git a/postgresql-perl514.patch b/postgresql-perl514.patch deleted file mode 100644 index 22d9744..0000000 --- a/postgresql-perl514.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- postgresql-9.0.4/src/pl/plperl/plperl.c 2011-04-15 05:15:53.000000000 +0200 -+++ postgresql-9.0.4/src/pl/plperl/plperl.c 2011-05-25 10:01:08.543018259 +0200 -@@ -874,7 +874,7 @@ - if (!isGV_with_GP(sv) || !GvCV(sv)) - continue; - SvREFCNT_dec(GvCV(sv)); /* free the CV */ -- GvCV(sv) = NULL; /* prevent call via GV */ -+ GvCV_set(sv, NULL); /* prevent call via GV */ - } - hv_clear(stash); - ---- postgresql-9.0.4/src/pl/plperl/plperl.h 2011-04-15 05:15:53.000000000 +0200 -+++ postgresql-9.0.4/src/pl/plperl/plperl.h 2011-05-25 10:12:02.358018289 +0200 -@@ -53,6 +53,8 @@ - void plperl_spi_freeplan(char *); - void plperl_spi_cursor_close(char *); - -- -+#ifndef GvCV_set -+# define GvCV_set(gv, cv) (GvCV(gv)=(cv)) -+#endif - - #endif /* PL_PERL_H */ diff --git a/postgresql-plperl.patch b/postgresql-plperl.patch index 7842e64..96506fd 100644 --- a/postgresql-plperl.patch +++ b/postgresql-plperl.patch @@ -1,10 +1,30 @@ ---- src/pl/plperl/plperl.c -+++ src/pl/plperl/plperl.c -@@ -652,6 +652,7 @@ - RETPUSHYES; - - DIE(aTHX_ "Unable to load %s into plperl", name); -+ return NULL; /* make rpmlint happy */ - } - +Index: config/perl.m4 +=================================================================== +--- config/perl.m4.orig ++++ config/perl.m4 +@@ -57,9 +57,7 @@ AC_DEFUN([PGAC_CHECK_PERL_CONFIGS], + AC_DEFUN([PGAC_CHECK_PERL_EMBED_LDFLAGS], + [AC_REQUIRE([PGAC_PATH_PERL]) + AC_MSG_CHECKING(for flags to link embedded Perl) +-pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts` +-pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'` +-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]` ++perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts` + AC_SUBST(perl_embed_ldflags)dnl + if test -z "$perl_embed_ldflags" ; then + AC_MSG_RESULT(no) +Index: configure +=================================================================== +--- configure.orig ++++ configure +@@ -7157,9 +7157,7 @@ $as_echo "$perl_useshrplib" >&6; } + { $as_echo "$as_me:$LINENO: checking for flags to link embedded Perl" >&5 + $as_echo_n "checking for flags to link embedded Perl... " >&6; } +-pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts` +-pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'` +-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"` ++perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts` + if test -z "$perl_embed_ldflags" ; then + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } diff --git a/postgresql-regress.patch b/postgresql-regress.patch index 547fb9d..12c5def 100644 --- a/postgresql-regress.patch +++ b/postgresql-regress.patch @@ -1,6 +1,8 @@ ---- src/test/regress/expected/horology.out +Index: src/test/regress/expected/horology.out +=================================================================== +--- src/test/regress/expected/horology.out.orig +++ src/test/regress/expected/horology.out -@@ -603,26 +603,26 @@ +@@ -616,26 +616,26 @@ SELECT (timestamp with time zone 'tomorr (1 row) -- timestamp with time zone, interval arithmetic around DST change @@ -32,9 +34,11 @@ Apr 2, 11:00 ------------------------------ Sat Apr 02 11:00:00 2005 CST ---- src/test/regress/pg_regress.c +Index: src/test/regress/pg_regress.c +=================================================================== +--- src/test/regress/pg_regress.c.orig +++ src/test/regress/pg_regress.c -@@ -72,7 +72,7 @@ +@@ -72,7 +72,7 @@ static char *shellprog = SHELLPROG; */ #ifndef WIN32 const char *basic_diff_opts = ""; @@ -43,9 +47,11 @@ #else const char *basic_diff_opts = "-w"; const char *pretty_diff_opts = "-w -C3"; ---- src/test/regress/sql/horology.sql +Index: src/test/regress/sql/horology.sql +=================================================================== +--- src/test/regress/sql/horology.sql.orig +++ src/test/regress/sql/horology.sql -@@ -113,11 +113,11 @@ +@@ -116,11 +116,11 @@ SELECT (timestamp with time zone 'tomorr SELECT (timestamp with time zone 'tomorrow' > 'now') as "True"; -- timestamp with time zone, interval arithmetic around DST change diff --git a/postgresql.changes b/postgresql.changes index 3bc2c5b..aa981fa 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Oct 5 16:41:31 UTC 2011 - max@suse.com + +- New version 9.1.1. For detailed release notes, see: + http://www.postgresql.org/docs/9.1/static/release-9-1-1.html +- Stop using deprecated silent_mode in default config. +- postgresql-perl514.patch is no longer needed. +- Use %_smp_mflags for parallel make +- Keep the rpath when linking plperl [bnc#578053]. + +------------------------------------------------------------------- +Fri Sep 16 17:17:08 UTC 2011 - jengelh@medozas.de + +- Add postgresql-devel to baselibs + ------------------------------------------------------------------- Wed Jun 8 16:40:03 UTC 2011 - max@novell.com diff --git a/postgresql.spec b/postgresql.spec index 44f104c..22d1660 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -34,12 +34,13 @@ BuildRequires: fdupes %define libpq libpq5 %define libecpg libecpg6 %define buildall 0 +%define extensiondir %_datadir/postgresql/extension %if 0%{?suse_version} > 910 BuildRequires: krb5-devel libxslt-devel %endif BuildRequires: openldap2-devel openssl-devel Summary: Basic Clients and Utilities for PostgreSQL -Version: 9.0.4 +Version: 9.1.1 Release: 2 %define pg_minor_version %(echo %version | sed -r 's/^([0-9]+\\.[0-9]+).*/\\1/') License: BSD3c(or similar) @@ -59,7 +60,6 @@ Patch1: postgresql-conf.patch Patch2: postgresql-regress.patch Patch3: postgresql-sle10-timestamptz.patch Patch4: postgresql-plperl.patch -Patch5: postgresql-perl514.patch Url: http://www.postgresql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: postgresql = %pg_minor_version @@ -278,6 +278,9 @@ and triggers. %prep %setup -q -n %_name-%version +# Keep the timestamp of configure, because patching it would otherwise +# confuse PostgreSQL's build system +touch -r configure tmp %patch1 %patch2 # apply the following patch only on SLE10 @@ -285,7 +288,8 @@ and triggers. %patch3 -p1 %endif %patch4 -%patch5 -p1 +touch -r tmp configure +rm tmp %build export CFLAGS="%optflags $SP" @@ -314,7 +318,7 @@ export CFLAGS="%optflags $SP" --with-krb5 \ %endif --with-system-tzdata=/usr/share/zoneinfo -make %{?jobs:-j%jobs} world +make %{?_smp_mflags} world %ifnarch %arm %if 0%{?suse_version} > 910 @@ -383,7 +387,7 @@ sed 's,@LIBDIR@,%_libdir,g' %{SOURCE15} > \ %buildroot/var/lib/pgsql/.bash_profile # Backup directory for old version binaries install -d %buildroot%_libdir/postgresql/backup -cp doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README* COPYRIGHT \ +cp doc/KNOWN_BUGS doc/MISSING_FEATURES 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 @@ -397,7 +401,7 @@ cat %libpq.lang %libecpg.lang > postgresql-libs.lang %find_lang ecpg-%{pg_minor_version} %_name-devel.lang %find_lang pg_config-%{pg_minor_version} %_name-devel.lang %endif -for serverapp in initdb postgres pg_controldata pg_ctl pg_resetxlog plpgsql;do +for serverapp in initdb postgres pg_controldata pg_ctl pg_resetxlog plpgsql pg_basebackup;do %find_lang $serverapp-%{pg_minor_version} %{name}-server.lang done for pl in plperl plpython pltcl; do @@ -475,6 +479,8 @@ rm -f %my_provides %doc %_mandir/man1/vacuumdb.1* %_bindir/reindexdb %doc %_mandir/man1/reindexdb.1.* +%_bindir/pg_basebackup +%doc %_mandir/man1/pg_basebackup.1.* %files docs %defattr(-,root,root) @@ -487,13 +493,12 @@ rm -f %my_provides %defattr(-,root,root) %docdir %_docdir/postgresql %dir %_docdir/postgresql -%_docdir/postgresql/contrib -%dir %_libdir/postgresql +%_docdir/postgresql/extension %dir %_datadir/postgresql -%dir %_datadir/postgresql/contrib %files server -f %{name}-server.lang %defattr(-,root,root) +%dir %extensiondir %config /etc/init.d/postgresql %config /var/adm/fillup-templates/sysconfig.postgresql %if 0%{?suse_version} > 1020 @@ -526,25 +531,26 @@ rm -f %my_provides %_libdir/postgresql/*_and_*.so %_libdir/postgresql/euc2004_sjis2004.so %_libdir/postgresql/libpqwalreceiver.so +%extensiondir/plpgsql* %attr(750,postgres,postgres) %dir /var/lib/pgsql %attr(700,postgres,postgres) %dir /var/lib/pgsql/data %attr(640,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile %files pltcl -f pltcl.lang %defattr(-,root,root) -%dir %_libdir/postgresql +%extensiondir/pltcl* %_libdir/postgresql/pltcl.so %_datadir/postgresql/*.pltcl %_bindir/pltcl* %files plperl -f plperl.lang %defattr(-,root,root) -%dir %_libdir/postgresql +%extensiondir/plperl* %_libdir/postgresql/plperl.so %files plpython -f plpython.lang %defattr(-,root,root) -%dir %_libdir/postgresql +%extensiondir/plpython* %_libdir/postgresql/plpython*.so %if %buildall diff --git a/postgresql.spec.in b/postgresql.spec.in index 9788b38..741e6a8 100644 --- a/postgresql.spec.in +++ b/postgresql.spec.in @@ -35,12 +35,13 @@ FI_POSTGRES %define libpq libpq5 %define libecpg libecpg6 %define buildall 0 +%define extensiondir %_datadir/postgresql/extension %if 0%{?suse_version} > 910 BuildRequires: krb5-devel libxslt-devel %endif BuildRequires: openldap2-devel openssl-devel Summary: Basic Clients and Utilities for PostgreSQL -Version: 9.0.4 +Version: 9.1.1 Release: 2 %define pg_minor_version %(echo %version | sed -r 's/^([0-9]+\\.[0-9]+).*/\\1/') License: BSD3c(or similar) @@ -60,7 +61,6 @@ Patch1: postgresql-conf.patch Patch2: postgresql-regress.patch Patch3: postgresql-sle10-timestamptz.patch Patch4: postgresql-plperl.patch -Patch5: postgresql-perl514.patch Url: http://www.postgresql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: postgresql = %pg_minor_version @@ -280,6 +280,9 @@ FI_POSTGRES %prep %setup -q -n %_name-%version +# Keep the timestamp of configure, because patching it would otherwise +# confuse PostgreSQL's build system +touch -r configure tmp %patch1 %patch2 # apply the following patch only on SLE10 @@ -287,7 +290,9 @@ FI_POSTGRES %patch3 -p1 %endif %patch4 -%patch5 -p1 +touch -r tmp configure +rm tmp + %build export CFLAGS="%optflags $SP" @@ -328,7 +333,7 @@ make -C src/port %{?jobs:-j%jobs} libpgport.a make -C src/bin/pg_config %{?jobs:-j%jobs} pg_config FI_LIBS IF_POSTGRES -make %{?jobs:-j%jobs} world +make %{?_smp_mflags} world %ifnarch %arm %if 0%{?suse_version} > 910 @@ -406,7 +411,7 @@ sed 's,@LIBDIR@,%_libdir,g' %{SOURCE15} > \ %buildroot/var/lib/pgsql/.bash_profile # Backup directory for old version binaries install -d %buildroot%_libdir/postgresql/backup -cp doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README* COPYRIGHT \ +cp doc/KNOWN_BUGS doc/MISSING_FEATURES 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 @@ -422,7 +427,7 @@ cat %libpq.lang %libecpg.lang > postgresql-libs.lang %find_lang pg_config-%{pg_minor_version} %_name-devel.lang IF_POSTGRES %endif -for serverapp in initdb postgres pg_controldata pg_ctl pg_resetxlog plpgsql;do +for serverapp in initdb postgres pg_controldata pg_ctl pg_resetxlog plpgsql pg_basebackup;do %find_lang $serverapp-%{pg_minor_version} %{name}-server.lang done for pl in plperl plpython pltcl; do @@ -496,6 +501,8 @@ IF_POSTGRES %doc %_mandir/man1/vacuumdb.1* %_bindir/reindexdb %doc %_mandir/man1/reindexdb.1.* +%_bindir/pg_basebackup +%doc %_mandir/man1/pg_basebackup.1.* %files docs %defattr(-,root,root) @@ -508,13 +515,12 @@ IF_POSTGRES %defattr(-,root,root) %docdir %_docdir/postgresql %dir %_docdir/postgresql -%_docdir/postgresql/contrib -%dir %_libdir/postgresql +%_docdir/postgresql/extension %dir %_datadir/postgresql -%dir %_datadir/postgresql/contrib %files server -f %{name}-server.lang %defattr(-,root,root) +%dir %extensiondir %config /etc/init.d/postgresql %config /var/adm/fillup-templates/sysconfig.postgresql %if 0%{?suse_version} > 1020 @@ -547,25 +553,26 @@ IF_POSTGRES %_libdir/postgresql/*_and_*.so %_libdir/postgresql/euc2004_sjis2004.so %_libdir/postgresql/libpqwalreceiver.so +%extensiondir/plpgsql* %attr(750,postgres,postgres) %dir /var/lib/pgsql %attr(700,postgres,postgres) %dir /var/lib/pgsql/data %attr(640,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile %files pltcl -f pltcl.lang %defattr(-,root,root) -%dir %_libdir/postgresql +%extensiondir/pltcl* %_libdir/postgresql/pltcl.so %_datadir/postgresql/*.pltcl %_bindir/pltcl* %files plperl -f plperl.lang %defattr(-,root,root) -%dir %_libdir/postgresql +%extensiondir/plperl* %_libdir/postgresql/plperl.so %files plpython -f plpython.lang %defattr(-,root,root) -%dir %_libdir/postgresql +%extensiondir/plpython* %_libdir/postgresql/plpython*.so %if %buildall