Pullup ticket 126 - requested by Havard Eidnes

security and bug fixes for postgresql73

        Module Name:    pkgsrc
        Committed By:   jdolecek
        Date:           Sun Oct 10 15:58:03 UTC 2004

        Modified Files:
                pkgsrc/databases/postgresql73-client: Makefile

        Log Message:
        kill -O pax argument - it's not portable, and it's not needed here
        in first place

        fixes PR pkg/23829 by Michal Pasternak
---
        Module Name:    pkgsrc
        Committed By:   jdolecek
        Date:           Sun Oct 10 17:27:43 UTC 2004

        Modified Files:
                pkgsrc/databases/postgresql73: Makefile.common
        Added Files:
                pkgsrc/databases/postgresql73/files: netbsd.c netbsd.h

        Log Message:
        Update the NetBSD dynloader wrapper code to use straigh dl*() calls on all
        archs. This fixes support for dynamic loading on mips and also improves
        error reporting.

        Fixes PR pkg/25473 by Byron Servies.

        PKGREVISION not bumped, will ride update to 7.3.7
---
        Module Name:    pkgsrc
        Committed By:   jdolecek
        Date:           Sun Oct 10 17:46:07 UTC 2004

        Modified Files:
                pkgsrc/databases/postgresql73: Makefile.common distinfo
                pkgsrc/databases/postgresql73-client: Makefile
                pkgsrc/databases/postgresql73-lib: Makefile
                pkgsrc/databases/postgresql73-pltcl: Makefile
                pkgsrc/databases/postgresql73-server: Makefile
                pkgsrc/doc: CHANGES

        Log Message:
        Update to PostgreSQL 7.3.7.

        Changes:
             * Prevent possible loss of committed transactions during crash
               Due to insufficient interlocking between transaction commit and
               checkpointing, it was possible for transactions committed just
               before the most recent checkpoint to be lost, in whole or in part,
               following a database crash and restart. This is a serious bug that
               has existed since PostgreSQL 7.1.
             * Remove asymmetrical word processing in tsearch (Teodor)
             * Properly schema-qualify function names when pg_dump'ing a CAST
---
        Module Name:    pkgsrc
        Committed By:   jdolecek
        Date:           Sun Oct 10 17:48:34 UTC 2004

        Modified Files:
                pkgsrc/databases/jdbc-postgresql: Makefile distinfo
                pkgsrc/doc: CHANGES

        Log Message:
        Update to JDBC driver included with PostgreSQL 7.3.7.

        Notable change in 7.3.5:
             * Remove  ability  to bind a list of values to a single parameter in
               JDBC (prevents possible SQL-injection attacks)
---
        Module Name:    pkgsrc
        Committed By:   kristerw
        Date:           Thu Oct 14 17:58:43 UTC 2004

        Modified Files:
                pkgsrc/databases/postgresql73-docs: Makefile PLIST

        Log Message:
        Correct PLIST.
        Bump PKGREVISION.
---
        Module Name:    pkgsrc
        Committed By:   jdolecek
        Date:           Sun Oct 10 18:26:00 UTC 2004

        Modified Files:
                pkgsrc/databases/postgresql73: distinfo
                pkgsrc/databases/postgresql73/patches: patch-ad
        Added Files:
                pkgsrc/databases/postgresql73/patches: patch-aj

        Log Message:
        add patches to make it possible to compile PL/Python
---
        Module Name:    pkgsrc
        Committed By:   jdolecek
        Date:           Mon Oct 25 17:40:01 UTC 2004

        Modified Files:
                pkgsrc/databases/jdbc-postgresql: Makefile distinfo
                pkgsrc/databases/postgresql73: Makefile.common distinfo
                pkgsrc/databases/postgresql73-docs: Makefile
                pkgsrc/doc: CHANGES

        Log Message:
        Update all postgresql73 packages to 7.3.8. This fixes following two issues:

        * A vulnerability exists due to the insecure creation of temporary files,
          which could possibly let a malicious user overwrite arbitrary files

        * Repair possible failure to update hint bits on disk
          Under rare circumstances this oversight could lead to "could not access
          transaction status" failures, which qualifies it as a potential-data-loss bug.
---
        Module Name:    pkgsrc
        Committed By:   he
        Date:           Mon Nov  1 22:32:26 UTC 2004

        Modified Files:
                pkgsrc/databases/postgresql73-docs: PLIST

        Log Message:
        Correct PLIST after upgrade to postgresql 7.3.8.

11 files changed, 173 insertions, 21 deletions

diff --git a/databases/jdbc-postgresql/Makefile b/databases/jdbc-postgresql/Makefile
index f870ba228eb..f5a5603d551 100644
--- a/databases/jdbc-postgresql/Makefile
+++ b/databases/jdbc-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/22 08:02:15 grant Exp $
+# $NetBSD: Makefile,v 1.23.6.1 2004/11/08 16:43:29 salo Exp $
 #
 
 DISTNAME=		postgresql-${DIST_VERS}
@@ -13,7 +13,7 @@ MASTER_SITES?=		http://www.postgresql.org/ftpsite/source/v${DIST_VERS}/ \
 			ftp://ftp.sunsite.auc.dk/mirrors/postgresql/source/v${DIST_VERS}/ \
 			ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/source/v${DIST_VERS}/
 
-DIST_VERS=		7.3.3
+DIST_VERS=		7.3.8
 MAINTAINER=		jwise@NetBSD.org
 HOMEPAGE=		http://www.postgresql.org/
 COMMENT=		100% Java JDBC driver for PostgreSQL
diff --git a/databases/jdbc-postgresql/distinfo b/databases/jdbc-postgresql/distinfo
index f62c86ff6ff..a65d621f4d2 100644
--- a/databases/jdbc-postgresql/distinfo
+++ b/databases/jdbc-postgresql/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2003/07/11 15:27:52 abs Exp $
+$NetBSD: distinfo,v 1.9.8.1 2004/11/08 16:43:29 salo Exp $
 
-SHA1 (postgresql-7.3.3.tar.gz) = 2df1b3907373fd7c4d03d0c62671fb5c14c06340
-Size (postgresql-7.3.3.tar.gz) = 11210071 bytes
+SHA1 (postgresql-7.3.8.tar.gz) = bd27703cbcc219d36521a0e57233408a6f70b342
+Size (postgresql-7.3.8.tar.gz) = 11293472 bytes
 SHA1 (patch-aa) = 4740338ad87748c6619eb674808c11e1b57826af
diff --git a/databases/postgresql73-client/Makefile b/databases/postgresql73-client/Makefile
index a1c1174c306..9ffdb6dfa9b 100644
--- a/databases/postgresql73-client/Makefile
+++ b/databases/postgresql73-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/24 22:15:50 recht Exp $
+# $NetBSD: Makefile,v 1.1.1.1.2.1 2004/11/08 16:43:29 salo Exp $
 
 PKGNAME=		postgresql73-client-${BASE_VERS}
 SVR4_PKGNAME=		pstgc
@@ -28,7 +28,7 @@ pre-build:
 
 post-install:
 	cd ${PREFIX}/man && 						\
-		${PAX} -O -crzf ${WRKSRC}/doc/man.tar.gz `${GREP} -v ^# ${FILESDIR}/exclude`
+		${PAX} -crzf ${WRKSRC}/doc/man.tar.gz `${GREP} -v ^# ${FILESDIR}/exclude`
 
 .include "../../databases/postgresql73-lib/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
diff --git a/databases/postgresql73-docs/Makefile b/databases/postgresql73-docs/Makefile
index 218a322bfd6..210ac9e24b7 100644
--- a/databases/postgresql73-docs/Makefile
+++ b/databases/postgresql73-docs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/24 22:16:56 recht Exp $
+# $NetBSD: Makefile,v 1.1.1.1.2.1 2004/11/08 16:43:29 salo Exp $
 
 PKGNAME=		postgresql73-docs-${BASE_VERS}
 SVR4_PKGNAME=		pstgd
+PKGREVISION=		1
 COMMENT=		PostgreSQL database system documentation
 
 USE_BUILDLINK3=		yes
diff --git a/databases/postgresql73-docs/PLIST b/databases/postgresql73-docs/PLIST
index 8122cb86729..189d6a558f3 100644
--- a/databases/postgresql73-docs/PLIST
+++ b/databases/postgresql73-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/24 22:16:58 recht Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2004/11/08 16:43:29 salo Exp $
 share/doc/html/postgresql/admin-preface.html
 share/doc/html/postgresql/admin.html
 share/doc/html/postgresql/app-clusterdb.html
@@ -192,10 +192,10 @@ share/doc/html/postgresql/libpq-threading.html
 share/doc/html/postgresql/libpq-trace.html
 share/doc/html/postgresql/libpq.html
 share/doc/html/postgresql/ln17989.html
-share/doc/html/postgresql/ln24842.html
-share/doc/html/postgresql/ln37286.html
-share/doc/html/postgresql/ln52002.html
+share/doc/html/postgresql/ln24945.html
 share/doc/html/postgresql/ln25.html
+share/doc/html/postgresql/ln37389.html
+share/doc/html/postgresql/ln52105.html
 share/doc/html/postgresql/ln659.html
 share/doc/html/postgresql/lo-funcs.html
 share/doc/html/postgresql/lo-implementation.html
@@ -385,12 +385,16 @@ share/doc/html/postgresql/release-7-2-1.html
 share/doc/html/postgresql/release-7-2-2.html
 share/doc/html/postgresql/release-7-2-3.html
 share/doc/html/postgresql/release-7-2-4.html
+share/doc/html/postgresql/release-7-2-5.html
+share/doc/html/postgresql/release-7-2-6.html
 share/doc/html/postgresql/release-7-2.html
 share/doc/html/postgresql/release-7-3-1.html
 share/doc/html/postgresql/release-7-3-2.html
 share/doc/html/postgresql/release-7-3-3.html
 share/doc/html/postgresql/release-7-3-4.html
 share/doc/html/postgresql/release-7-3-5.html
+share/doc/html/postgresql/release-7-3-6.html
+share/doc/html/postgresql/release-7-3-7.html
 share/doc/html/postgresql/release-7-3.html
 share/doc/html/postgresql/release.html
 share/doc/html/postgresql/resources.html
diff --git a/databases/postgresql73/Makefile.common b/databases/postgresql73/Makefile.common
index 0cb9d705e3a..36ff131f24c 100644
--- a/databases/postgresql73/Makefile.common
+++ b/databases/postgresql73/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/08/21 17:27:04 seb Exp $
+# $NetBSD: Makefile.common,v 1.2.2.1 2004/11/08 16:43:29 salo Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -33,7 +33,7 @@ PATCHDIR?=		${.CURDIR}/../postgresql73/patches
 # BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
 #
 # Note: Do not forget jdbc-postgresql when updating version
-DIST_VERS?=		7.3.6
+DIST_VERS?=		7.3.8
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_DEPENDS.postgresql73-lib?=	postgresql73-lib>=${BASE_VERS}
@@ -83,6 +83,11 @@ post-extract:
 		${CP} -f ${COMMON_FILESDIR}/GNUmakefile.libpgtcl	\
 			${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile;	\
 	fi
+	if [ -d ${WRKSRC}/src/backend/port/dynloader ]; then		\
+		${RM} -f ${WRKSRC}/src/backend/port/dynloader/netbsd.[ch];\
+		${CP} -f ${COMMON_FILESDIR}/netbsd.[ch]	\
+			${WRKSRC}/src/backend/port/dynloader/;	\
+	fi
 
 pre-configure:
 	cd ${WRKSRC} && ${AUTOCONF}
diff --git a/databases/postgresql73/distinfo b/databases/postgresql73/distinfo
index 215f6fa32f3..7caa24f98b3 100644
--- a/databases/postgresql73/distinfo
+++ b/databases/postgresql73/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/07/24 22:14:40 recht Exp $
+$NetBSD: distinfo,v 1.1.1.1.2.1 2004/11/08 16:43:29 salo Exp $
 
-SHA1 (postgresql-7.3.6.tar.gz) = 5135ed429a22f8290eece18d67a459716a80871a
-Size (postgresql-7.3.6.tar.gz) = 11288430 bytes
+SHA1 (postgresql-7.3.8.tar.gz) = bd27703cbcc219d36521a0e57233408a6f70b342
+Size (postgresql-7.3.8.tar.gz) = 11293472 bytes
 SHA1 (patch-aa) = 61fbeb664b0d89c83a36c79cca3fbdc78d6f5059
 SHA1 (patch-ac) = 5a647cc31873ae81a5bd5a6cf4ec6f44a43448e7
-SHA1 (patch-ad) = d9e010b38855bf9f1d7b85404ea6770066831093
+SHA1 (patch-ad) = a7bdfab69fdc9063d03adae7229f55ba356f2282
 SHA1 (patch-ae) = 5b46ea9782da574ee0c4b1c02534e0f74d640559
 SHA1 (patch-af) = 8268b66b062f0228e73ecaf928104f0c9bdc02f5
 SHA1 (patch-ag) = 6d12184b8401e63b8a05c620beb27f28248c22da
 SHA1 (patch-ah) = 210c0dda3c32481280fe5f2a9525d33f1d989c6d
 SHA1 (patch-ai) = d7889e05ab7963f2b93b46c953cbf1a44e9c0fe5
+SHA1 (patch-aj) = 4c46173cba1dd36296d8b3fcca8cdfebcc717162
diff --git a/databases/postgresql73/files/netbsd.c b/databases/postgresql73/files/netbsd.c
new file mode 100644
index 00000000000..d2ef8e70699
--- /dev/null
+++ b/databases/postgresql73/files/netbsd.c
@@ -0,0 +1,73 @@
+/*-
+ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *	  notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *	  notice, this list of conditions and the following disclaimer in the
+ *	  documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *	  must display the following acknowledgement:
+ *		This product includes software developed by the University of
+ *		California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *	  may be used to endorse or promote products derived from this software
+ *	  without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.	IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)dl.c	5.4 (Berkeley) 2/23/91";
+#endif   /* LIBC_SCCS and not lint */
+
+#include "postgres.h"
+
+#include <nlist.h>
+#include <link.h>
+#include <dlfcn.h>
+
+#include "dynloader.h"
+
+#ifndef HAVE_DLOPEN
+
+char *
+pg_dlerror(void)
+{
+	return "dynaloader unsupported";
+}
+
+void *
+pg_dlopen(const char *file, int num)
+{
+	elog(ERROR, "dynamic load not supported");
+	return NULL;
+}
+
+void *
+pg_dlsym(void *handle, const char *name)
+{
+	return NULL;
+}
+
+void
+pg_dlclose(void *handle)
+{
+}
+
+#endif /* ! HAVE_DLOPEN */
diff --git a/databases/postgresql73/files/netbsd.h b/databases/postgresql73/files/netbsd.h
new file mode 100644
index 00000000000..4d255856621
--- /dev/null
+++ b/databases/postgresql73/files/netbsd.h
@@ -0,0 +1,45 @@
+/*-------------------------------------------------------------------------
+ *
+ * netbsd.h
+ *	  port-specific prototypes for NetBSD
+ *
+ *
+ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * $Id: netbsd.h,v 1.1.2.2 2004/11/08 16:43:29 salo Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef PORT_PROTOS_H
+#define PORT_PROTOS_H
+
+#include <sys/types.h>
+#include <nlist.h>
+#include <link.h>
+#include <dlfcn.h>
+
+#include "utils/dynamic_loader.h"
+
+#ifdef HAVE_DLOPEN
+/*
+ * In some older systems, the RTLD_NOW flag isn't defined and the mode
+ * argument to dlopen must always be 1.  The RTLD_GLOBAL flag is wanted
+ * if available, but it doesn't exist everywhere.
+ * If it doesn't exist, set it to 0 so it has no effect.
+ */
+#ifndef RTLD_NOW
+#define RTLD_NOW 1
+#endif
+#ifndef RTLD_GLOBAL
+#define RTLD_GLOBAL 0
+#endif
+
+#define	   pg_dlopen(f)    dlopen((f), RTLD_NOW | RTLD_GLOBAL)
+#define	   pg_dlsym		   dlsym
+#define	   pg_dlclose	   dlclose
+#define	   pg_dlerror	   dlerror
+
+#endif /* HAVE_DLOPEN */
+
+#endif   /* PORT_PROTOS_H */
diff --git a/databases/postgresql73/patches/patch-ad b/databases/postgresql73/patches/patch-ad
index 6ce91a0ac71..c97414ad428 100644
--- a/databases/postgresql73/patches/patch-ad
+++ b/databases/postgresql73/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/07/24 22:14:40 recht Exp $
+$NetBSD: patch-ad,v 1.1.1.1.2.1 2004/11/08 16:43:29 salo Exp $
 
---- src/Makefile.global.in.orig	Thu Sep  5 07:54:18 2002
-+++ src/Makefile.global.in
+--- src/Makefile.global.in.orig	2002-09-05 00:54:18.000000000 +0200
++++ src/Makefile.global.in	2004-10-10 20:20:34.000000000 +0200
 @@ -111,6 +111,13 @@
  endif
  endif
@@ -24,6 +24,15 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/07/24 22:14:40 recht Exp $
  with_tcl	= @with_tcl@
  with_tk		= @with_tk@
  enable_shared	= @enable_shared@
+@@ -135,7 +143,7 @@
+ python_includespec	= @python_includespec@
+ python_moduledir	= @python_moduledir@
+ python_moduleexecdir	= @python_moduleexecdir@
+-python_libspec		= @python_libspec@
++python_libspec		= -Wl,-R${PREFIX}/lib -L${PREFIX}/lib @python_libspec@
+ python_configdir	= @python_configdir@
+ 
+ krb_srvtab = @krb_srvtab@
 @@ -285,13 +293,20 @@
  libpq_builddir = $(top_builddir)/src/interfaces/libpq
  libpq = -L$(libpq_builddir) -lpq
diff --git a/databases/postgresql73/patches/patch-aj b/databases/postgresql73/patches/patch-aj
new file mode 100644
index 00000000000..d652db5132f
--- /dev/null
+++ b/databases/postgresql73/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1.2.2 2004/11/08 16:43:29 salo Exp $
+
+--- src/pl/plpython/Makefile.orig	2004-10-10 20:14:13.000000000 +0200
++++ src/pl/plpython/Makefile	2004-10-10 20:14:20.000000000 +0200
+@@ -8,9 +8,7 @@
+ # On some platforms we can only build PL/Python if libpython is a
+ # shared library.  Since there is no official way to determine this,
+ # we see if there is a file that is named like a shared library.
+-ifneq (,$(wildcard $(python_configdir)/libpython*$(DLSUFFIX)*))
+ shared_libpython = yes
+-endif
+ 
+ # If we don't have a shared library and the platform doesn't allow it
+ # to work without, we have to skip it.