upgrade postgresql to v 7.0 release

thanks for complete diffs ;-)
closed PR

PR:	18699
Obtained from:	Palle Girgensohn <girgen@partitur.se>

3 files changed, 47 insertions, 23 deletions

diff --git a/databases/postgresql90-server/files/patch-aj b/databases/postgresql90-server/files/patch-aj
index 480ecc4f5d6..4231fc94ede 100644
--- a/databases/postgresql90-server/files/patch-aj
+++ b/databases/postgresql90-server/files/patch-aj
@@ -1,6 +1,6 @@
---- bin/pg_passwd/pg_passwd.c.orig	Thu May 27 09:00:40 1999
-+++ bin/pg_passwd/pg_passwd.c	Mon Jun 21 16:34:27 1999
-@@ -26,11 +26,15 @@
+--- bin/pg_passwd/pg_passwd.c.orig	Mon Apr 17 05:45:18 2000
++++ bin/pg_passwd/pg_passwd.c	Sat May 20 17:54:59 2000
+@@ -18,11 +18,15 @@
  
  #endif
  
@@ -9,15 +9,15 @@
 +#endif
 +
  char	   *comname;
- static void	usage(FILE *stream);
- static void	read_pwd_file(char *filename);
- static void	write_pwd_file(char *filename, char *bkname);
--static void	encrypt_pwd(char key[9], char salt[3], char passwd[14]);
-+static void	encrypt_pwd(char key[9], char salt[3], char passwd[_PASSWORD_LEN+1]);
- static void	prompt_for_username(char *username);
- static void	prompt_for_password(char *prompt, char *password);
+ static void usage(FILE *stream);
+ static void read_pwd_file(char *filename);
+ static void write_pwd_file(char *filename, char *bkname);
+-static void encrypt_pwd(char key[9], char salt[3], char passwd[14]);
++static void encrypt_pwd(char key[9], char salt[3], char passwd[_PASSWORD_LEN+1]);
+ static void prompt_for_username(char *username);
+ static void prompt_for_password(char *prompt, char *password);
  
-@@ -158,7 +162,7 @@
+@@ -150,7 +154,7 @@
  
  		if (q != NULL)
  			*(q++) = '\0';
@@ -26,7 +26,7 @@
  		{
  			fprintf(stderr, "WARNING: %s: line %d: illegal password length.\n",
  					filename, npwds + 1);
-@@ -222,7 +226,7 @@
+@@ -214,7 +218,7 @@
  }
  
  static void
@@ -35,7 +35,7 @@
  {
  	int			n;
  
-@@ -254,9 +258,9 @@
+@@ -246,9 +250,9 @@
  
  #ifdef NOT_USED
  static int
@@ -47,16 +47,16 @@
  	char		salt[3];
  
  	salt[0] = passwd[0];
-@@ -264,7 +268,7 @@
+@@ -256,7 +260,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;
  }
- #endif
  
-@@ -339,7 +343,7 @@
+ #endif
+@@ -332,7 +336,7 @@
  	char		salt[3];
  	char		key[9],
  				key2[9];
diff --git a/databases/postgresql90-server/files/patch-bb b/databases/postgresql90-server/files/patch-bb
new file mode 100644
index 00000000000..21759027a23
--- /dev/null
+++ b/databases/postgresql90-server/files/patch-bb
@@ -0,0 +1,13 @@
+--- pl/tcl/Makefile~	Sat Apr 29 19:45:42 2000
++++ pl/tcl/Makefile	Sat May 20 22:42:22 2000
+@@ -71,7 +71,9 @@
+ CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
+ 
+ CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
+-        
++
++CFLAGS+= -I$(TCL_INCDIR)
++
+ #
+ # Uncomment the following to enable the unknown command lookup
+ # on the first of all calls to the call handler. See the doc
diff --git a/databases/postgresql90-server/files/pgsql.sh.tmpl b/databases/postgresql90-server/files/pgsql.sh.tmpl
index f3c673b6ade..4f3575cd23c 100644
--- a/databases/postgresql90-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql90-server/files/pgsql.sh.tmpl
@@ -14,12 +14,23 @@
 #   because the postmaster process, which starts up under the
 #   environment of the pgsql user, sets this with the PGDATA
 #   environment variable in !!PREFIX!!/pgsql/.profile
-#
+# - added (ugly) support for shutting down (girgen)
+# - moved 2>&1 to end of line, so it'll actually work [if -S is removed] (girgen)
 
-[ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib
-
-[ -x !!PREFIX!!/pgsql/bin/postmaster ] && {
+case $1 in
+start)
+    [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib
+    [ -x !!PREFIX!!/pgsql/bin/postmaster ] && {
 	su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster -i -S -o -F \
-		2>&1 > !!PREFIX!!/pgsql/errlog'
-	echo -n ' pgsql' 
-}
+	    > !!PREFIX!!/pgsql/errlog 2>&1'
+	echo -n ' pgsql'
+    }
+    ;;
+stop)
+    /usr/bin/killall postgres
+    ;;
+*)
+    echo "usage: `basename $0` {start|stop}" >&2
+    exit 64
+    ;;
+esac