Initial import of Postgresql 6.2.1, an Object Relational Database

Management System, into the NetBSD packages collection, from the
FreeBSD port.

9 files changed, 235 insertions, 0 deletions

diff --git a/databases/postgresql/patches/patch-ab b/databases/postgresql/patches/patch-ab
new file mode 100644
index 00000000000..bbb6c6edc66
--- /dev/null
+++ b/databases/postgresql/patches/patch-ab
@@ -0,0 +1,10 @@
+--- bin/initdb/initdb.sh.orig	Wed Apr  2 07:09:13 1997
++++ bin/initdb/initdb.sh	Wed Apr  2 07:09:33 1997
+@@ -344,6 +344,5 @@
+ 
+ if [ $debug -eq 0 ]; then
+     echo "vacuuming template1"
+-    echo "vacuum" | postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
+-	 grep -v "^DEBUG:"
++    echo "vacuum" | postgres -o /dev/null -F -Q -D$PGDATA template1 > /dev/null 
+ fi
diff --git a/databases/postgresql/patches/patch-ac b/databases/postgresql/patches/patch-ac
new file mode 100644
index 00000000000..351699eff7f
--- /dev/null
+++ b/databases/postgresql/patches/patch-ac
@@ -0,0 +1,20 @@
+--- configure.orig	Sat Jun 14 20:05:55 1997
++++ configure	Sat Jun 14 20:06:34 1997
+@@ -685,7 +685,7 @@
+ echo "enter 'none' or new directories to override default"
+ echo ""
+ $ECHO_N "Additional directories to search for include files { $SRCH_INC }: $ECHO_C"
+-read a
++a=$SRCH_INC
+ if test "$a." = "none." 
+ then
+ 	SRCH_INC=
+@@ -702,7 +702,7 @@
+ echo "- setting CPPFLAGS=$CPPFLAGS"
+ 
+ $ECHO_N "Additional directories to search for library files { $SRCH_LIB }: $ECHO_C"
+-read a
++a=$SRCH_LIB
+ if test "$a." = "none."
+ then
+ 	SRCH_LIB=
diff --git a/databases/postgresql/patches/patch-ad b/databases/postgresql/patches/patch-ad
new file mode 100644
index 00000000000..3529936565a
--- /dev/null
+++ b/databases/postgresql/patches/patch-ad
@@ -0,0 +1,14 @@
+--- template/freebsd.orig	Sat Jun 14 20:12:51 1997
++++ template/freebsd	Sat Jun 14 20:13:06 1997
+@@ -1,9 +1,9 @@
+ AROPT:cq
+ SHARED_LIB:-fpic -DPIC
+-CFLAGS:-O2 -m486 -pipe
++CFLAGS:-pipe -O2
+ SRCH_INC:/usr/local/include
+ SRCH_LIB:/usr/local/lib
+-USE_LOCALE:no
++USE_LOCALE:yes
+ DLSUFFIX:.so
+ YFLAGS:-d
+ YACC:bison -y
diff --git a/databases/postgresql/patches/patch-ae b/databases/postgresql/patches/patch-ae
new file mode 100644
index 00000000000..b313473e231
--- /dev/null
+++ b/databases/postgresql/patches/patch-ae
@@ -0,0 +1,26 @@
+--- Makefile.global.in.orig	Sat Oct  4 23:21:46 1997
++++ Makefile.global.in	Sat Oct  4 23:27:22 1997
+@@ -162,15 +162,15 @@
+ # USE_TCL= true
+ # customize these to your site's needs
+ #
+-TCL_INCDIR= /home/tools/include
+-TCL_LIBDIR= /home/tools/lib
+-TCL_LIB= -ltcl7.5
+-TK_INCDIR= /home/tools/include
+-TK_LIBDIR= /home/tools/lib
+-TK_LIB= -ltk4.1
++TCL_INCDIR= /usr/local/include/tcl8.0
++TCL_LIBDIR= /usr/local/lib
++TCL_LIB= -ltcl80
++TK_INCDIR= /usr/local/include/tk8.0
++TK_LIBDIR= /usr/local/lib
++TK_LIB= -ltk80
+ 
+-X11_INCDIR= /usr/include
+-X11_LIBDIR= /usr/lib
++X11_INCDIR= /usr/X11R6/include
++X11_LIBDIR= /usr/X11R6/lib
+ X11_LIB= -lX11 @SOCKET_LIB@ @NSL_LIB@
+ 
+ 
diff --git a/databases/postgresql/patches/patch-af b/databases/postgresql/patches/patch-af
new file mode 100644
index 00000000000..17fa9b470ce
--- /dev/null
+++ b/databases/postgresql/patches/patch-af
@@ -0,0 +1,47 @@
+--- interfaces/libpgtcl/Makefile.orig	Mon Sep 29 23:02:46 1997
++++ interfaces/libpgtcl/Makefile	Sun Oct  5 02:12:00 1997
+@@ -39,6 +39,14 @@
+   endif
+ endif
+ 
++ifeq ($(PORTNAME), BSD44_derived)
++  CFLAGS += $(CFLAGS_SL)
++  shlib := libpgtcl.so.1.0
++  install-shlib-dep := install-shlib
++  LDFLAGS_SL = -x -Bshareable -Bforcearchive 
++  LDFLAGS += -L $(SRCDIR)/interfaces/libpq -lpq
++endif
++
+ ifeq ($(PORTNAME), i386_solaris)
+   CFLAGS+= -fPIC
+ endif
+@@ -56,10 +64,10 @@
+ endif
+ 	$(RANLIB) libpgtcl.a
+ 
+-libpgtcl.so.1: $(OBJS)
+-	$(CC) $(LDFLAGS) -shared $(OBJS) -o libpgtcl.so.1
++libpgtcl.so.1.0: $(OBJS)
++	$(CC) $(LDFLAGS) -shared $(OBJS) -o libpgtcl.so.1.0
+ 	rm -f libpgtcl.so
+-	ln -s libpgtcl.so.1 libpgtcl.so
++	ln -s libpgtcl.so.1.0 libpgtcl.so
+ 
+ .PHONY: beforeinstall-headers install-headers
+ .PHONY: install install-libpgtcl
+@@ -75,11 +83,11 @@
+ install-libpgtcl: libpgtcl.a
+ 	$(INSTALL) $(INSTL_LIB_OPTS) libpgtcl.a $(DESTDIR)$(LIBDIR)/libpgtcl.a
+ 
+-install-shlib: libpgtcl.so.1
+-	$(INSTALL) $(INSTL_LIB_OPTS) libpgtcl.so.1 \
+-		$(DESTDIR)$(LIBDIR)/libpgtcl.so.1
++install-shlib: libpgtcl.so.1.0
++	$(INSTALL) $(INSTL_LIB_OPTS) libpgtcl.so.1.0 \
++		$(DESTDIR)$(LIBDIR)/libpgtcl.so.1.0
+ 	rm -f $(DESTDIR)$(LIBDIR)/libpgtcl.so
+-	ln -s libpgtcl.so.1 $(DESTDIR)$(LIBDIR)/libpgtcl.so
++	ln -s libpgtcl.so.1.0 $(DESTDIR)$(LIBDIR)/libpgtcl.so
+ 
+ .PHONY: clean
+ clean: 
diff --git a/databases/postgresql/patches/patch-ag b/databases/postgresql/patches/patch-ag
new file mode 100644
index 00000000000..182772671c1
--- /dev/null
+++ b/databases/postgresql/patches/patch-ag
@@ -0,0 +1,11 @@
+--- interfaces/libpq/Makefile.orig	Sun Oct  5 02:00:11 1997
++++ interfaces/libpq/Makefile	Sun Oct  5 02:00:31 1997
+@@ -151,7 +151,7 @@
+ install-shlib: $(shlib)
+ 	$(INSTALL) $(INSTL_LIB_OPTS) $(shlib) $(DESTDIR)$(LIBDIR)/$(shlib)
+ 	rm -f $(DESTDIR)$(LIBDIR)/libpq.so
+-	ln -s libpq.so.1 $(DESTDIR)$(LIBDIR)/libpq.so
++	ln -s libpq.so.1.0 $(DESTDIR)$(LIBDIR)/libpq.so
+ 
+ depend dep:
+ 	$(CC) -MM $(INCLUDE_OPT) *.c >depend
diff --git a/databases/postgresql/patches/patch-ah b/databases/postgresql/patches/patch-ah
new file mode 100644
index 00000000000..9f6e3027330
--- /dev/null
+++ b/databases/postgresql/patches/patch-ah
@@ -0,0 +1,11 @@
+--- GNUmakefile.in.orig	Wed Oct  8 22:30:13 1997
++++ GNUmakefile.in	Wed Oct  8 22:31:14 1997
+@@ -65,7 +65,7 @@
+ ifneq ($(wildcard man), )
+ 	$(MAKE) -C man install
+ endif
+-	more -e ../register.txt
++	cat ../register.txt
+ 
+ clean:
+ 	@if test $(PORTNAME) = UNDEFINED; then \
diff --git a/databases/postgresql/patches/patch-ai b/databases/postgresql/patches/patch-ai
new file mode 100644
index 00000000000..c610380890a
--- /dev/null
+++ b/databases/postgresql/patches/patch-ai
@@ -0,0 +1,27 @@
+--- backend/libpq/password.c.orig	Sat Sep 13 07:20:14 1997
++++ backend/libpq/password.c	Sat Jan 31 17:02:42 1998
+@@ -24,7 +24,7 @@
+ 	char	   *p,
+ 			   *test_user,
+ 			   *test_pw;
+-	char		salt[3];
++	char		salt[10];
+ 
+ 	find_hba_entry(DataDir, port->raddr.sin_addr, database,
+ 				   &host_ok, &userauth, pw_file_name, true);
+@@ -90,7 +90,14 @@
+ 		if (test_pw[strlen(test_pw) - 1] == '\n')
+ 			test_pw[strlen(test_pw) - 1] = '\0';
+ 
+-		strNcpy(salt, test_pw, 2);
++                 if (strncmp(test_pw, "$1$", 3)) {
++                    /* DES */
++                    strNcpy(salt, test_pw, 2);
++                 }
++                 else {
++                    /* MD5 */
++                   strncpy(salt, test_pw, 9);
++                 }
+ 
+ 		if (strcmp(user, test_user) == 0)
+ 		{
diff --git a/databases/postgresql/patches/patch-aj b/databases/postgresql/patches/patch-aj
new file mode 100644
index 00000000000..0f7dc20db53
--- /dev/null
+++ b/databases/postgresql/patches/patch-aj
@@ -0,0 +1,69 @@
+--- bin/pg_passwd/pg_passwd.c.orig	Sat Jan 31 19:09:26 1998
++++ bin/pg_passwd/pg_passwd.c	Sat Jan 31 19:15:43 1998
+@@ -23,12 +23,16 @@
+ 
+ #endif
+ 
++#ifndef _POSIX_SOURCE
++# define	_PASSWORD_LEN	128	/* max length, not containing NULL */
++#endif
++
+ char	   *comname;
+ void		usage(FILE *stream);
+ void		read_pwd_file(char *filename);
+ void		write_pwd_file(char *filename, char *bkname);
+-void		encrypt_pwd(char key[9], char salt[3], char passwd[14]);
+-int			check_pwd(char key[9], char passwd[14]);
++void		encrypt_pwd(char key[9], char salt[3], char passwd[_PASSWORD_LEN+1]);
++int			check_pwd(char key[9], char passwd[_PASSWORD_LEN+1]);
+ void		prompt_for_username(char *username);
+ void		prompt_for_password(char *prompt, char *password);
+ 
+@@ -148,7 +152,7 @@
+ 
+ 		if (q != NULL)
+ 			*(q++) = '\0';
+-		if (strlen(p) != 13)
++		if (strlen(p) > _PASSWORD_LEN)
+ 		{
+ 			fprintf(stderr, "WARNING: %s: line %d: illegal password length.\n",
+ 					filename, npwds + 1);
+@@ -208,7 +212,7 @@
+ }
+ 
+ void
+-encrypt_pwd(char key[9], char salt[3], char passwd[14])
++encrypt_pwd(char key[9], char salt[3], char passwd[_PASSWORD_LEN+1])
+ {
+ 	int			n;
+ 
+@@ -242,9 +246,9 @@
+ }
+ 
+ int
+-check_pwd(char key[9], char passwd[14])
++check_pwd(char key[9], char passwd[_PASSWORD_LEN+1])
+ {
+-	char		shouldbe[14];
++	char		shouldbe[_PASSWORD_LEN+1];
+ 	char		salt[3];
+ 
+ 	salt[0] = passwd[0];
+@@ -252,7 +256,7 @@
+ 	salt[2] = '\0';
+ 	encrypt_pwd(key, salt, shouldbe);
+ 
+-	return strncmp(shouldbe, passwd, 13) == 0 ? 1 : 0;
++	return strncmp(shouldbe, passwd, _PASSWORD_LEN) == 0 ? 1 : 0;
+ }
+ 
+ void
+@@ -326,7 +330,7 @@
+ 	char		salt[3];
+ 	char		key[9],
+ 				key2[9];
+-	char		e_passwd[14];
++	char		e_passwd[_PASSWORD_LEN+1];
+ 	int			i;
+ 
+ 	comname = argv[0];