From 328a054973254720cabb7c73016c0d0f8613cdd7 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 21 Feb 2006 20:23:49 +0000 Subject: Update PostgreSQL 7.4.x to 7.4.12. Take maintainership. The fix for locales and plperl in 7.4.11 might make an REINDEX necessary. Changes from 7.4.8 to 7.4.9: - Fix error that allowed VACUUM to remove ctid chains too soon, and add more checking in code that follows ctid links - Fix CHAR() to properly pad spaces to the specified length when using a multiple-byte character set (Yoshiyuki Asaba) - Fix the sense of the test for read-only transaction in COPY - Fix planning problem with outer-join ON clauses that reference only the inner-side relation - Further fixes for x FULL JOIN y ON true corner cases - Make array_in and array_recv more paranoid about validating their OID parameter - Fix missing rows in queries like UPDATE a=... WHERE a... with GiST index on column a - Improve robustness of datetime parsing - Improve checking for partially-written WAL pages - Improve robustness of signal handling when SSL is enabled - Don't try to open more than max_files_per_process files during postmaster startup - Various memory leakage fixes - Various portability improvements - Fix PL/PgSQL to handle var := var correctly when the variable is of pass-by-reference type - Update contrib/tsearch2 to use current Snowball code Changes from 7.4.9 to 7.4.10: - Fix race condition in transaction log management - Prevent failure if client sends Bind protocol message when current transaction is already aborted - /contrib/ltree fixes (Teodor) - AIX and HPUX compile fixes (Tom) - Fix longstanding planning error for outer joins - Prevent core dump in pg_autovacuum when a table has been dropped Changes from 7.4.10 to 7.4.11: - Fix for protocol-level Describe messages issued outside a transaction or in a failed transaction (Tom) - Fix character string comparison for locales that consider different character combinations as equal, such as Hungarian (Tom) - Set locale environment variables during postmaster startup to ensure that plperl won't change the locale later - Fix longstanding bug in strpos() and regular expression handling in certain rarely used Asian multi-byte character sets (Tatsuo) - Fix bug in /contrib/pgcrypto gen_salt, which caused it not to use all available salt space for MD5 and XDES algorithms (Marko Kreen, Solar Designer) - Fix /contrib/dblink to throw an error, rather than crashing, when the number of columns specified is different from what's actually returned by the query (Joe) Changes from 7.4.11 to 7.4.12: - Fix potential crash in SET SESSION AUTHORIZATION (CVE-2006-0553) - Fix bug with row visibility logic in self-inserted rows (Tom) - Fix race condition that could lead to "file already exists" errors during pg_clog file creation (Tom) - Properly check DOMAIN constraints for UNKNOWN parameters in prepared statements (Neil) - Fix to allow restoring dumps that have cross-schema references to custom operators (Tom) - Portability fix for testing presence of finite and isinf during configure (Tom) --- databases/postgresql74-client/Makefile | 3 +-- databases/postgresql74-contrib/Makefile | 3 +-- databases/postgresql74-docs/Makefile | 3 +-- databases/postgresql74-docs/PLIST | 10 +++++++++- databases/postgresql74-lib/Makefile | 3 +-- databases/postgresql74-plperl/Makefile | 3 +-- databases/postgresql74-plpython/Makefile | 3 +-- databases/postgresql74-server/Makefile | 3 +-- databases/postgresql74/Makefile | 3 +-- databases/postgresql74/Makefile.common | 6 +++--- databases/postgresql74/distinfo | 11 +++++------ databases/postgresql74/patches/patch-aa | 26 +++++++++++++------------- databases/postgresql74/patches/patch-al | 20 -------------------- databases/tcl-postgresql74/Makefile | 3 +-- 14 files changed, 39 insertions(+), 61 deletions(-) delete mode 100644 databases/postgresql74/patches/patch-al diff --git a/databases/postgresql74-client/Makefile b/databases/postgresql74-client/Makefile index 29bc4065627..f717be6de49 100644 --- a/databases/postgresql74-client/Makefile +++ b/databases/postgresql74-client/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:34 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2006/02/21 20:23:49 joerg Exp $ PKGNAME= postgresql74-client-${BASE_VERS} -PKGREVISION= 1 SVR4_PKGNAME= pstgc COMMENT= PostgreSQL database client programs diff --git a/databases/postgresql74-contrib/Makefile b/databases/postgresql74-contrib/Makefile index e304d227293..8cd5c0d831a 100644 --- a/databases/postgresql74-contrib/Makefile +++ b/databases/postgresql74-contrib/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:34 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2006/02/21 20:23:49 joerg Exp $ PKGNAME= postgresql74-contrib-${BASE_VERS} -PKGREVISION= 1 SVR4_PKGNAME= pstgc COMMENT= PostgreSQL database contrib programs diff --git a/databases/postgresql74-docs/Makefile b/databases/postgresql74-docs/Makefile index 57c9e655e41..2cf3d581a15 100644 --- a/databases/postgresql74-docs/Makefile +++ b/databases/postgresql74-docs/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:34 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2006/02/21 20:23:49 joerg Exp $ PKGNAME= postgresql74-docs-${BASE_VERS} -PKGREVISION= 1 SVR4_PKGNAME= pstgd COMMENT= PostgreSQL database system documentation diff --git a/databases/postgresql74-docs/PLIST b/databases/postgresql74-docs/PLIST index e9bf6880d79..c89f770cffb 100644 --- a/databases/postgresql74-docs/PLIST +++ b/databases/postgresql74-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2005/06/30 01:50:11 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5 2006/02/21 20:23:49 joerg Exp $ share/doc/postgresql/FAQ share/doc/postgresql/FAQ_AIX share/doc/postgresql/FAQ_DEV @@ -439,6 +439,10 @@ share/doc/postgresql/release-7-2-8.html share/doc/postgresql/release-7-2.html share/doc/postgresql/release-7-3-1.html share/doc/postgresql/release-7-3-10.html +share/doc/postgresql/release-7-3-11.html +share/doc/postgresql/release-7-3-12.html +share/doc/postgresql/release-7-3-13.html +share/doc/postgresql/release-7-3-14.html share/doc/postgresql/release-7-3-2.html share/doc/postgresql/release-7-3-3.html share/doc/postgresql/release-7-3-4.html @@ -449,12 +453,16 @@ share/doc/postgresql/release-7-3-8.html share/doc/postgresql/release-7-3-9.html share/doc/postgresql/release-7-3.html share/doc/postgresql/release-7-4-1.html +share/doc/postgresql/release-7-4-10.html +share/doc/postgresql/release-7-4-11.html share/doc/postgresql/release-7-4-2.html share/doc/postgresql/release-7-4-3.html share/doc/postgresql/release-7-4-4.html share/doc/postgresql/release-7-4-5.html share/doc/postgresql/release-7-4-6.html share/doc/postgresql/release-7-4-7.html +share/doc/postgresql/release-7-4-8.html +share/doc/postgresql/release-7-4-9.html share/doc/postgresql/release-7-4.html share/doc/postgresql/release.html share/doc/postgresql/resources.html diff --git a/databases/postgresql74-lib/Makefile b/databases/postgresql74-lib/Makefile index 71afdce6f9d..fd83bcac44a 100644 --- a/databases/postgresql74-lib/Makefile +++ b/databases/postgresql74-lib/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:35 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2006/02/21 20:23:49 joerg Exp $ PKGNAME= postgresql74-lib-${BASE_VERS} -PKGREVISION= 3 SVR4_PKGNAME= pstgl COMMENT= PostgreSQL database headers and libraries diff --git a/databases/postgresql74-plperl/Makefile b/databases/postgresql74-plperl/Makefile index 2cd6af842b8..81d30c8b665 100644 --- a/databases/postgresql74-plperl/Makefile +++ b/databases/postgresql74-plperl/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:35 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2006/02/21 20:23:49 joerg Exp $ PKGNAME= postgresql74-plperl-${BASE_VERS} -PKGREVISION= 3 COMMENT= PL/Perl procedural language for the PostgreSQL backend DEPENDS+= postgresql74-server>=${BASE_VERS}:../../databases/postgresql74-server diff --git a/databases/postgresql74-plpython/Makefile b/databases/postgresql74-plpython/Makefile index 54421da2f5d..7cf5ed9d817 100644 --- a/databases/postgresql74-plpython/Makefile +++ b/databases/postgresql74-plpython/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:35 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/02/21 20:23:49 joerg Exp $ PKGNAME= postgresql74-plpython-${BASE_VERS} -PKGREVISION= 1 COMMENT= PL/Python procedural language for the PostgreSQL backend diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index 8fbc3ee84a1..92606f80319 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:35 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2006/02/21 20:23:49 joerg Exp $ PKGNAME= postgresql74-server-${BASE_VERS} -PKGREVISION= 1 SVR4_PKGNAME= pstgs COMMENT= PostgreSQL database server programs diff --git a/databases/postgresql74/Makefile b/databases/postgresql74/Makefile index af9bab87b22..4a60be1c9e3 100644 --- a/databases/postgresql74/Makefile +++ b/databases/postgresql74/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:34 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/02/21 20:23:49 joerg Exp $ PKGNAME= postgresql74-${BASE_VERS} -PKGREVISION= 1 COMMENT= Robust, next generation, object-relational DBMS DEPENDS+= postgresql74-client>=${BASE_VERS}:../../databases/postgresql74-client diff --git a/databases/postgresql74/Makefile.common b/databases/postgresql74/Makefile.common index 02d6e035855..ffbd903039f 100644 --- a/databases/postgresql74/Makefile.common +++ b/databases/postgresql74/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.29 2006/01/08 13:41:29 abs Exp $ +# $NetBSD: Makefile.common,v 1.30 2006/02/21 20:23:49 joerg Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -21,7 +21,7 @@ MASTER_SITES?= \ EXTRACT_SUFX= .tar.bz2 -MAINTAINER?= recht@NetBSD.org +MAINTAINER?= joerg@NetBSD.org HOMEPAGE?= http://www.postgresql.org/ CONFLICTS+= postgresql-[0-9]* postgresql73-* postgresql80-* postgresql81-* @@ -36,7 +36,7 @@ PATCHDIR?= ${.CURDIR}/../postgresql74/patches # BASE_VERS pkgsrc-mangled version number (convert pl -> .) # # Note: Do not forget jdbc-postgresql when updating version -DIST_VERS?= 7.4.8 +DIST_VERS?= 7.4.12 BASE_VERS?= ${DIST_VERS} BUILDLINK_DEPENDS.postgresql74-lib?= postgresql74-lib>=${BASE_VERS} diff --git a/databases/postgresql74/distinfo b/databases/postgresql74/distinfo index a079e4ebefa..74faa972db3 100644 --- a/databases/postgresql74/distinfo +++ b/databases/postgresql74/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.19 2005/11/08 16:40:38 joerg Exp $ +$NetBSD: distinfo,v 1.20 2006/02/21 20:23:49 joerg Exp $ -SHA1 (postgresql-7.4.8.tar.bz2) = a565ff14e1a3b58a151b219bcffcf53dfc62ec41 -RMD160 (postgresql-7.4.8.tar.bz2) = 3ee8c70e0506e2a49bae20bc2282391513ee9d65 -Size (postgresql-7.4.8.tar.bz2) = 10235413 bytes -SHA1 (patch-aa) = a7d3a63bbef3ae0ad5086fe6a8915be67731deb9 +SHA1 (postgresql-7.4.12.tar.bz2) = fd4e1db4fa3bf1a22d0596337cb1456389ca03e0 +RMD160 (postgresql-7.4.12.tar.bz2) = 9a156c571383d666551439b49fd09ca3a96bed6e +Size (postgresql-7.4.12.tar.bz2) = 10246537 bytes +SHA1 (patch-aa) = 830a0789195aacd10094e35e7d0d79c5e201491f SHA1 (patch-ab) = f44a544c56452bad197a88cb827e88624c54656c SHA1 (patch-ac) = 8104ac7631dd8566eb455e479dd59da058b68c8f SHA1 (patch-ad) = fae5e82e0943ea982c9d3aace290b56c6a7629f9 @@ -14,4 +14,3 @@ SHA1 (patch-ah) = 1a9b565bf3a004da5fa33081bc3675cb938e7e5f SHA1 (patch-ai) = 158382638ee3380930d6c9fd9b6381e973ccedc2 SHA1 (patch-aj) = 629e38a0ca475834fb0bf1e03cc4efdfca4fb6ce SHA1 (patch-ak) = 12b4227149ebe4a3516b342c0931de78e3498b2e -SHA1 (patch-al) = 9c4b963c9f727c78c364f76e5146a4eeb1412638 diff --git a/databases/postgresql74/patches/patch-aa b/databases/postgresql74/patches/patch-aa index 2bb40e263df..e37415c6a91 100644 --- a/databases/postgresql74/patches/patch-aa +++ b/databases/postgresql74/patches/patch-aa @@ -1,8 +1,17 @@ -$NetBSD: patch-aa,v 1.3 2005/11/08 16:40:38 joerg Exp $ +$NetBSD: patch-aa,v 1.4 2006/02/21 20:23:49 joerg Exp $ --- src/Makefile.shlib.orig 2003-10-19 21:34:33.000000000 -0400 +++ src/Makefile.shlib -@@ -108,7 +108,7 @@ endif +@@ -66,7 +66,7 @@ LINK.static = $(AR) $(AROPT) + ifeq ($(enable_shared), yes) + + # Insert -L from LDFLAGS after any -L already present in SHLIB_LINK +-SHLIB_LINK := $(filter -L%, $(SHLIB_LINK)) $(filter -L%, $(LDFLAGS)) $(filter-out -L%, $(SHLIB_LINK)) ++SHLIB_LINK := $(LDFLAGS) $(SHLIB_LINK) + + # Need a -L-free version of LDFLAGS to use in combination with SHLIB_LINK + LDFLAGS_NO_L := $(filter-out -L%, $(LDFLAGS)) +@@ -114,7 +114,7 @@ endif ifeq ($(PORTNAME), freebsd) ifdef ELF_SYSTEM @@ -11,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/08 16:40:38 joerg Exp $ LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname) else shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) -@@ -125,8 +125,13 @@ ifeq ($(PORTNAME), netbsd) +@@ -131,8 +131,13 @@ ifeq ($(PORTNAME), netbsd) endif endif @@ -26,7 +35,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/08 16:40:38 joerg Exp $ LINK.shared = $(LD) +h $(soname) -b +b $(libdir) ifeq ($(GCC), yes) SHLIB_LINK += `$(CC) -print-libgcc-file-name` -@@ -134,7 +139,7 @@ ifeq ($(PORTNAME), hpux) +@@ -140,7 +145,7 @@ ifeq ($(PORTNAME), hpux) endif ifeq ($(PORTNAME), irix5) @@ -35,12 +44,3 @@ $NetBSD: patch-aa,v 1.3 2005/11/08 16:40:38 joerg Exp $ LINK.shared = $(COMPILER) -shared -Wl,-set_version,sgi$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) endif -@@ -207,7 +212,7 @@ ifeq ($(PORTNAME), beos) - SHLIB_LINK += -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86 - endif - --SHLIB_LINK := $(filter -L%, $(LDFLAGS)) $(SHLIB_LINK) -+SHLIB_LINK := $(LDFLAGS) $(SHLIB_LINK) - ifeq ($(enable_rpath), yes) - SHLIB_LINK += $(rpath) - endif diff --git a/databases/postgresql74/patches/patch-al b/databases/postgresql74/patches/patch-al deleted file mode 100644 index 35459d7a8ec..00000000000 --- a/databases/postgresql74/patches/patch-al +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-al,v 1.1 2005/11/08 16:40:38 joerg Exp $ - ---- contrib/seg/segparse.y.orig 2005-11-08 15:18:52.000000000 +0000 -+++ contrib/seg/segparse.y -@@ -3,6 +3,7 @@ - - #include "postgres.h" - -+#include - #include - - #include "segdata.h" -@@ -14,7 +15,6 @@ - #undef yylex /* falure to redefine yylex will result in calling the */ - #define yylex seg_yylex /* wrong scanner when running inside postgres backend */ - -- extern int errno; - extern int yylex(); /* defined as seg_yylex in segscan.c */ - extern int significant_digits( char *str ); /* defined in seg.c */ - diff --git a/databases/tcl-postgresql74/Makefile b/databases/tcl-postgresql74/Makefile index a011f34d05b..9bfb48f8750 100644 --- a/databases/tcl-postgresql74/Makefile +++ b/databases/tcl-postgresql74/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:38 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2006/02/21 20:23:49 joerg Exp $ PKGNAME= tcl-postgresql74-${BASE_VERS} COMMENT= Tcl interface to PostgreSQL -PKGREVISION= 1 .include "../../databases/postgresql74/Makefile.common" -- cgit v1.2.3