From 17f621edb2de9aa038fee3150a905c2dffe218bb Mon Sep 17 00:00:00 2001
From: Jun Kuriyama <kuriyama@FreeBSD.org>
Date: Tue, 23 Nov 1999 11:04:43 +0000
Subject: Update to v6.5.3.

Submitted by:	Ichiro Fukuhara <ichiro@ichiro.org> (maintainer)
PR:		ports/14809
---
 japanese/postgresql/files/patch-aa | 14 ++++++++
 japanese/postgresql/files/patch-ab | 67 ++++++++++++++++++++++++++++++++++++++
 japanese/postgresql/files/patch-ac | 11 +++++++
 japanese/postgresql/files/patch-ad | 27 ++++++++-------
 4 files changed, 105 insertions(+), 14 deletions(-)
 create mode 100644 japanese/postgresql/files/patch-aa
 create mode 100644 japanese/postgresql/files/patch-ab
 create mode 100644 japanese/postgresql/files/patch-ac

(limited to 'japanese/postgresql/files')

diff --git a/japanese/postgresql/files/patch-aa b/japanese/postgresql/files/patch-aa
new file mode 100644
index 000000000000..45b29e125834
--- /dev/null
+++ b/japanese/postgresql/files/patch-aa
@@ -0,0 +1,14 @@
+--- template/freebsd.orig	Sat Sep 18 20:12:51 1998
++++ template/freebsd	at Wed 16 20:13:06 1999
+@@ -1,9 +1,9 @@
+ AROPT:cq
+ SHARED_LIB:-fpic -DPIC
+-CFLAGS:-O2 -m486 -pipe
++CFLAGS:-pipe -O2
+ SRCH_INC:
+ SRCH_LIB:
+-USE_LOCALE:no
++USE_LOCALE:yes
+ DLSUFFIX:.so
+ YFLAGS:-d
+ YACC:bison -y
diff --git a/japanese/postgresql/files/patch-ab b/japanese/postgresql/files/patch-ab
new file mode 100644
index 000000000000..cb53b5b7de93
--- /dev/null
+++ b/japanese/postgresql/files/patch-ab
@@ -0,0 +1,67 @@
+--- bin/pg_passwd/pg_passwd.c.orig	Thu May 27 16:00:40 1999
++++ bin/pg_passwd/pg_passwd.c	Tue Jun 15 19:27:47 1999
+@@ -26,11 +26,17 @@
+ 
+ #endif
+ 
++#ifndef _POSIX_SOURCE
++# define       _PASSWORD_LEN   128     /* max length, not containing NULL */
++#endif
++
++
+ char	   *comname;
+ static void	usage(FILE *stream);
+ static void	read_pwd_file(char *filename);
++static 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]);
+ static void	write_pwd_file(char *filename, char *bkname);
+-static void	encrypt_pwd(char key[9], char salt[3], char passwd[14]);
+ static void	prompt_for_username(char *username);
+ static void	prompt_for_password(char *prompt, char *password);
+ 
+@@ -158,7 +164,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);
+@@ -222,7 +228,7 @@
+ }
+ 
+ static 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;
+ 
+@@ -254,9 +260,7 @@
+ 
+ #ifdef NOT_USED
+ static int
+-check_pwd(char key[9], char passwd[14])
+ {
+-	char		shouldbe[14];
+ 	char		salt[3];
+ 
+ 	salt[0] = passwd[0];
+@@ -264,7 +268,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 @@
+ 	char		salt[3];
+ 	char		key[9],
+ 				key2[9];
+-	char		e_passwd[14];
++	char		e_passwd[_PASSWORD_LEN+1];
+ 	int			i;
+ 
+ 	comname = argv[0];
diff --git a/japanese/postgresql/files/patch-ac b/japanese/postgresql/files/patch-ac
new file mode 100644
index 000000000000..2a9e180e0958
--- /dev/null
+++ b/japanese/postgresql/files/patch-ac
@@ -0,0 +1,11 @@
+--- interfaces/libpgtcl/Makefile.in.orig	Mon Feb  8 07:10:45 1999
++++ interfaces/libpgtcl/Makefile.in	Tue Jun 15 19:32:36 1999
+@@ -27,7 +27,7 @@
+ 
+ OBJS= pgtcl.o pgtclCmds.o pgtclId.o
+ 
+-SHLIB_LINK+= -L../libpq -lpq
++SHLIB_LINK+= -L../libpq -lpq -lcrypt
+ 
+ # If crypt is a separate library, rather than part of libc, it may need
+ # to be referenced separately to keep (broken) linkers happy.  (This is
diff --git a/japanese/postgresql/files/patch-ad b/japanese/postgresql/files/patch-ad
index 56f482cd4dd8..ce5713717369 100644
--- a/japanese/postgresql/files/patch-ad
+++ b/japanese/postgresql/files/patch-ad
@@ -1,14 +1,13 @@
---- 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:
- SRCH_LIB:
--USE_LOCALE:no
-+USE_LOCALE:yes
- DLSUFFIX:.so
- YFLAGS:-d
- YACC:bison -y
+--- pl/tcl/Makefile.org	Mon Dec 14 08:47:17 1998
++++ pl/tcl/Makefile	Thu Feb 25 22:20:28 1999
+@@ -55,8 +55,8 @@
+ SHLIB_EXTRA_LIBS=
+ endif
+ 
+-%$(TCL_SHLIB_SUFFIX):	%.o
+-	$(TCL_SHLIB_LD) -o $@ $< $(TCL_LIB_SPEC) $(SHLIB_EXTRA_LIBS)
++#%$(TCL_SHLIB_SUFFIX):	%.o
++#	$(TCL_SHLIB_LD) -o $@ $< $(TCL_LIB_SPEC) $(SHLIB_EXTRA_LIBS)
+ 
+ 
+ #
-- 
cgit v1.2.3