summaryrefslogtreecommitdiff
path: root/databases/postgresql74-server/files
diff options
context:
space:
mode:
authorAndreas Klemm <andreas@FreeBSD.org>1999-06-29 20:21:49 +0000
committerAndreas Klemm <andreas@FreeBSD.org>1999-06-29 20:21:49 +0000
commit78c0c17b372f9b1e2914ec119725811cc01ff060 (patch)
tree78a667c314f7e52dd8f73bd979f6acf2be0183ae /databases/postgresql74-server/files
parentUpdate Y2K URL (diff)
upgrade to postgresql 6.5
did some small modifications Obtained from: "Palle Girgensohn" <girgen@partitur.se>
Notes
Notes: svn path=/head/; revision=19901
Diffstat (limited to 'databases/postgresql74-server/files')
-rw-r--r--databases/postgresql74-server/files/patch-aj40
-rw-r--r--databases/postgresql74-server/files/patch-ar27
2 files changed, 30 insertions, 37 deletions
diff --git a/databases/postgresql74-server/files/patch-aj b/databases/postgresql74-server/files/patch-aj
index 0f7dc20db53d..480ecc4f5d64 100644
--- a/databases/postgresql74-server/files/patch-aj
+++ b/databases/postgresql74-server/files/patch-aj
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
#endif
@@ -9,17 +9,15 @@
+#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);
+ 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);
-@@ -148,7 +152,7 @@
+@@ -158,7 +162,7 @@
if (q != NULL)
*(q++) = '\0';
@@ -28,19 +26,19 @@
{
fprintf(stderr, "WARNING: %s: line %d: illegal password length.\n",
filename, npwds + 1);
-@@ -208,7 +212,7 @@
+@@ -222,7 +226,7 @@
}
- void
+ 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;
-@@ -242,9 +246,9 @@
- }
+@@ -254,9 +258,9 @@
- int
+ #ifdef NOT_USED
+ static int
-check_pwd(char key[9], char passwd[14])
+check_pwd(char key[9], char passwd[_PASSWORD_LEN+1])
{
@@ -49,16 +47,16 @@
char salt[3];
salt[0] = passwd[0];
-@@ -252,7 +256,7 @@
+@@ -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
- void
-@@ -326,7 +330,7 @@
+@@ -339,7 +343,7 @@
char salt[3];
char key[9],
key2[9];
diff --git a/databases/postgresql74-server/files/patch-ar b/databases/postgresql74-server/files/patch-ar
index a1fd3d50d464..bc54daf60a4a 100644
--- a/databases/postgresql74-server/files/patch-ar
+++ b/databases/postgresql74-server/files/patch-ar
@@ -1,16 +1,11 @@
---- Makefile.shlib.orig Wed Feb 3 19:16:02 1999
-+++ Makefile.shlib Wed Feb 3 19:18:28 1999
-@@ -59,10 +59,11 @@
- ifeq ($(PORTNAME), freebsd)
- ifdef BSD_SHLIB
- install-shlib-dep := install-shlib
-- shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
- ifdef ELF_SYSTEM
-- LDFLAGS_SL := -x -Bshareable
-+ shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
-+ LDFLAGS_SL := -x -shared -soname $(shlib)
- else
-+ shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
- LDFLAGS_SL := -x -Bshareable -Bforcearchive
- endif
- CFLAGS += $(CFLAGS_SL)
+--- configure~ Sun May 30 09:01:09 1999
++++ configure Mon Jun 21 16:52:53 1999
+@@ -663,7 +663,7 @@
+ exit;;
+ esac
+
+-if test "X$elf" = "Xyes"
++if test "X$PORTOBJFORMAT" = "Xelf"
+ then
+ ELF_SYS=true
+ else