diff options
Diffstat (limited to 'databases/postgresql-devel/files')
| -rw-r--r-- | databases/postgresql-devel/files/dot.cshrc.in | 6 | ||||
| -rw-r--r-- | databases/postgresql-devel/files/dot.profile.in | 9 | ||||
| -rw-r--r-- | databases/postgresql-devel/files/patch-aj | 118 | ||||
| -rw-r--r-- | databases/postgresql-devel/files/patch-al | 23 | ||||
| -rw-r--r-- | databases/postgresql-devel/files/post-install-notes | 22 |
5 files changed, 29 insertions, 149 deletions
diff --git a/databases/postgresql-devel/files/dot.cshrc.in b/databases/postgresql-devel/files/dot.cshrc.in index 724212c70b23..f8e190c1613e 100644 --- a/databases/postgresql-devel/files/dot.cshrc.in +++ b/databases/postgresql-devel/files/dot.cshrc.in @@ -1,13 +1,7 @@ set path = ( %%PREFIX%%/bin $path ) -setenv PGLIB %%PREFIX%%/lib - # note: PGDATA can be overridden by the -D startup option setenv PGDATA $HOME/data #You might want to set some locale stuff here -#setenv PGDATESTYLE ISO #setenv LC_ALL sv_SE.ISO_8859-1 - -# if you want to make regression tests use this TZ -#setenv TZ PST8PDT diff --git a/databases/postgresql-devel/files/dot.profile.in b/databases/postgresql-devel/files/dot.profile.in index 96344d533921..b4b638f64eb4 100644 --- a/databases/postgresql-devel/files/dot.profile.in +++ b/databases/postgresql-devel/files/dot.profile.in @@ -1,18 +1,11 @@ # both new and old layout's paths, but new path first... PATH=%%PREFIX%%/bin:${PATH} -PGLIB=%%PREFIX%%/lib - # note: PGDATA can be overridden by the -D startup option PGDATA=${HOME}/data -export PATH PGLIB PGDATA +export PATH PGDATA #You might want to set some locale stuff here -#PGDATESTYLE=ISO #LC_ALL=sv_SE.ISO_8859-1 #export PGDATESTYLE LC_ALL - -# if you want to make regression tests use this TZ -#TZ=PST8PDT -#export TZ diff --git a/databases/postgresql-devel/files/patch-aj b/databases/postgresql-devel/files/patch-aj deleted file mode 100644 index 94c0d6d79991..000000000000 --- a/databases/postgresql-devel/files/patch-aj +++ /dev/null @@ -1,118 +0,0 @@ ---- src/bin/pg_passwd/pg_passwd.c.orig Sat Mar 24 01:54:55 2001 -+++ src/bin/pg_passwd/pg_passwd.c Wed Apr 18 04:54:14 2001 -@@ -7,6 +7,12 @@ - #include <errno.h> - #include <time.h> - #include <ctype.h> -+ -+#if defined(__FreeBSD__) -+#include <pwd.h> /* defines _PASSWORD_LEN, max # of characters in a password */ -+#include <sys/time.h> /* gettimeofday for password salt */ -+#endif -+ - #define issaltchar(c) (isalnum((unsigned char) (c)) || (c) == '.' || (c) == '/') - - #ifdef HAVE_TERMIOS_H -@@ -23,18 +29,31 @@ - * We assume that the output of crypt(3) is always 13 characters, - * and that at most 8 characters can usefully be sent to it. - * -+ * For FreeBSD, take these values from /usr/include/pwd.h - * Postgres usernames are assumed to be less than NAMEDATALEN chars long. - */ -+#if defined(__FreeBSD__) -+#define CLEAR_PASSWD_LEN _PASSWORD_LEN -+#define CRYPTED_PASSWD_LEN _PASSWORD_LEN /* max length, not containing NULL */ -+#define SALT_LEN 10 -+#else - #define CLEAR_PASSWD_LEN 8 /* not including null */ - #define CRYPTED_PASSWD_LEN 13 /* not including null */ -+#define SALT_LEN 3 -+#endif -+ -+static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ -+ "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -+ - - const char *progname; - - static void usage(void); -+static void to64(char *s, long v, int n); - static void read_pwd_file(char *filename); - static void write_pwd_file(char *filename, char *bkname); - static void encrypt_pwd(char key[CLEAR_PASSWD_LEN + 1], -- char salt[3], -+ char salt[SALT_LEN], - char passwd[CRYPTED_PASSWD_LEN + 1]); - static void prompt_for_username(char *username); - static void prompt_for_password(char *prompt, char *password); -@@ -47,6 +66,15 @@ - printf("Report bugs to <pgsql-bugs@postgresql.org>.\n"); - } - -+static void -+to64(char *s, long v, int n) -+{ -+ while (--n >= 0) { -+ *s++ = itoa64[v&0x3f]; -+ v >>= 6; -+ } -+} -+ - typedef struct - { - char *uname; -@@ -154,7 +182,7 @@ - if (q != NULL) - *(q++) = '\0'; - -- if (strlen(p) != CRYPTED_PASSWD_LEN && strcmp(p, "+") != 0) -+ if (strlen(p) > CRYPTED_PASSWD_LEN && strcmp(p, "+") != 0) - { - fprintf(stderr, "%s:%d: warning: invalid password length\n", - filename, npwds + 1); -@@ -221,15 +249,25 @@ - - static void - encrypt_pwd(char key[CLEAR_PASSWD_LEN + 1], -- char salt[3], -+ char salt[SALT_LEN], - char passwd[CRYPTED_PASSWD_LEN + 1]) - { -+#if !defined(__FreeBSD__) - int n; -- -+#endif - /* select a salt, if not already given */ - if (salt[0] == '\0') - { -+#if defined(__FreeBSD__) -+ struct timeval tv; -+ srandomdev(); -+ gettimeofday(&tv,0); -+ to64(&salt[0], random(), 3); -+ to64(&salt[3], tv.tv_usec, 3); -+ to64(&salt[6], tv.tv_sec, 2); -+ salt[8] = '\0'; - srand(time(NULL)); -+#else - do - { - n = rand() % 256; -@@ -241,6 +279,7 @@ - } while (!issaltchar(n)); - salt[1] = n; - salt[2] = '\0'; -+#endif - } - - /* get encrypted password */ -@@ -335,7 +374,7 @@ - char *filename; - char bkname[MAXPGPATH]; - char username[NAMEDATALEN]; -- char salt[3]; -+ char salt[SALT_LEN]; - char key[CLEAR_PASSWD_LEN + 1], - key2[CLEAR_PASSWD_LEN + 1]; - char e_passwd[CRYPTED_PASSWD_LEN + 1]; diff --git a/databases/postgresql-devel/files/patch-al b/databases/postgresql-devel/files/patch-al new file mode 100644 index 000000000000..8eeb1185872e --- /dev/null +++ b/databases/postgresql-devel/files/patch-al @@ -0,0 +1,23 @@ +--- src/bin/pg_config/Makefile.orig Fri Mar 29 09:32:55 2002 ++++ src/bin/pg_config/Makefile Mon Sep 23 10:45:24 2002 +@@ -7,13 +7,13 @@ + all: pg_config + + pg_config: pg_config.sh $(top_builddir)/src/Makefile.global Makefile +- sed -e 's,@bindir@,$(bindir),g' \ +- -e 's,@includedir@,$(includedir),g' \ +- -e 's,@includedir_server@,$(includedir_server),g' \ +- -e 's,@libdir@,$(libdir),g' \ +- -e 's,@pkglibdir@,$(pkglibdir),g' \ +- -e "s,@configure@,$(configure_args),g" \ +- -e 's,@version@,$(VERSION),g' \ ++ sed -e 's|@bindir@|$(bindir)|g' \ ++ -e 's|@includedir@|$(includedir)|g' \ ++ -e 's|@includedir_server@|$(includedir_server)|g' \ ++ -e 's|@libdir@|$(libdir)|g' \ ++ -e 's|@pkglibdir@|$(pkglibdir)|g' \ ++ -e "s|@configure@|$(configure_args)|g" \ ++ -e 's|@version@|$(VERSION)|g' \ + $< >$@ + chmod a+x $@ + diff --git a/databases/postgresql-devel/files/post-install-notes b/databases/postgresql-devel/files/post-install-notes index cdf343002074..557614dd1842 100644 --- a/databases/postgresql-devel/files/post-install-notes +++ b/databases/postgresql-devel/files/post-install-notes @@ -3,29 +3,20 @@ The PostgreSQL port has a collection of "side orders": postgresql-doc For all of the html documentation -p5-Pg - A perl5 API for client access to PostgreSQL databases. - postgresql-tcltk If you want tcl/tk client support. You get a neat GUI, pgaccess, as a bonus! -postgresql-jdbc - For Java JDBC support. - postgresql-odbc For client access from unix applications using ODBC as access - method. Not needed to access unix PostgreSQL servers from Win32 - using ODBC. See below. + method. -ruby-postgres, py-PyGreSQL - For client access to PostgreSQL databases using the ruby & python - languages. +ruby-postgres, py-PyGreSQL, p5-Pg, p5-DBD-Pg, postgresql-jdbc + For client access to PostgreSQL databases using the languages: ruby, + python, perl, perl DBI, and jdbc. postgresql-plperl, postgresql-pltcl & postgresql-plruby - For using perl5, tcl & ruby as procedural languages. - -etc etc... + For using perl5, tcl, and ruby as procedural languages. Note that many files have moved around compared to previous versions of PostgreSQL. For example, plpgsql.so and all other language modules @@ -52,6 +43,3 @@ postgresql.conf also needed, of course): options SEMUME=40 options SEMMNU=120 -If you plan to access your PostgreSQL server using ODBC, please -consider running the SQL script /usr/local/share/postgresql/odbc.sql -to get the functions required for ODBC compliance. |