diff options
author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2002-10-19 13:40:37 +0000 |
---|---|---|
committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2002-10-19 13:40:37 +0000 |
commit | 73760e4490558347840d3662ed2430ffb797be45 (patch) | |
tree | 5a72cd3ea87457c845e6d3df4585fa028ac5fe29 /japanese/postgresql-tcltk/files | |
parent | FreeBSD has still no getpwuid_r() (diff) |
Update to slave of databases/postgresql7 after repocopy from
japanese/postgresql7.
PR: ports/43433
Submitted by: Saito Tomokatsu <saito@a2z.co.jp>
Notes
Notes:
svn path=/head/; revision=68340
Diffstat (limited to 'japanese/postgresql-tcltk/files')
-rw-r--r-- | japanese/postgresql-tcltk/files/dot.cshrc.in | 13 | ||||
-rw-r--r-- | japanese/postgresql-tcltk/files/dot.profile.in | 18 | ||||
-rw-r--r-- | japanese/postgresql-tcltk/files/patch-aj | 118 | ||||
-rw-r--r-- | japanese/postgresql-tcltk/files/patch-contrib-retep-build | 10 | ||||
-rw-r--r-- | japanese/postgresql-tcltk/files/patch-doc-makefile | 19 | ||||
-rw-r--r-- | japanese/postgresql-tcltk/files/patch-jdbc-build-xml | 10 | ||||
-rw-r--r-- | japanese/postgresql-tcltk/files/pgsql.sh.tmpl | 36 | ||||
-rw-r--r-- | japanese/postgresql-tcltk/files/post-install-notes | 22 | ||||
-rw-r--r-- | japanese/postgresql-tcltk/files/pre-install-notes | 21 |
9 files changed, 0 insertions, 267 deletions
diff --git a/japanese/postgresql-tcltk/files/dot.cshrc.in b/japanese/postgresql-tcltk/files/dot.cshrc.in deleted file mode 100644 index a326041bff7b..000000000000 --- a/japanese/postgresql-tcltk/files/dot.cshrc.in +++ /dev/null @@ -1,13 +0,0 @@ -set path = ( %%PREFIX%%/%%PG_PREFIX%%bin $path ) - -setenv PGLIB %%PREFIX%%/%%PG_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/japanese/postgresql-tcltk/files/dot.profile.in b/japanese/postgresql-tcltk/files/dot.profile.in deleted file mode 100644 index 4aca6aadd19a..000000000000 --- a/japanese/postgresql-tcltk/files/dot.profile.in +++ /dev/null @@ -1,18 +0,0 @@ -# both new and old layout's paths, but new path first... -PATH=%%PREFIX%%/%%PG_PREFIX%%bin:${PATH} - -PGLIB=%%PREFIX%%/%%PG_PREFIX%%lib - -# note: PGDATA can be overridden by the -D startup option -PGDATA=${HOME}/data - -export PATH PGLIB 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/japanese/postgresql-tcltk/files/patch-aj b/japanese/postgresql-tcltk/files/patch-aj deleted file mode 100644 index 94c0d6d79991..000000000000 --- a/japanese/postgresql-tcltk/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/japanese/postgresql-tcltk/files/patch-contrib-retep-build b/japanese/postgresql-tcltk/files/patch-contrib-retep-build deleted file mode 100644 index 30df3a0e72c9..000000000000 --- a/japanese/postgresql-tcltk/files/patch-contrib-retep-build +++ /dev/null @@ -1,10 +0,0 @@ ---- contrib/retep/build.xml~ Fri Mar 16 22:50:36 2001 -+++ contrib/retep/build.xml Wed Apr 18 09:24:20 2001 -@@ -38,6 +38,7 @@ - <target name="compile" depends="checks,prepare"> - <javac srcdir="${src}" destdir="${dest}"> - <include name="${package}/**" /> -+ <exclude name="${package}/**" unless="jdk1.2+" /> - </javac> - </target> - diff --git a/japanese/postgresql-tcltk/files/patch-doc-makefile b/japanese/postgresql-tcltk/files/patch-doc-makefile deleted file mode 100644 index fa27bed2af3f..000000000000 --- a/japanese/postgresql-tcltk/files/patch-doc-makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- doc/Makefile~ Sun Jan 7 03:03:22 2001 -+++ doc/Makefile Wed Apr 18 08:12:30 2001 -@@ -43,10 +43,13 @@ - gzip -d -c man.tar.gz | ( cd $(DESTDIR)$(mandir) && $(TAR) xf - ) - endif - -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(mandir) $(DESTDIR)$(docdir)/html -- -+ifdef found_html -+ $(mkinstalldirs) $(DESTDIR)$(docdir)/html -+endif -+ifdef found_man -+ $(mkinstalldirs) $(DESTDIR)$(mandir) -+endif - - uninstall: - ifdef found_html diff --git a/japanese/postgresql-tcltk/files/patch-jdbc-build-xml b/japanese/postgresql-tcltk/files/patch-jdbc-build-xml deleted file mode 100644 index b1c703a9c978..000000000000 --- a/japanese/postgresql-tcltk/files/patch-jdbc-build-xml +++ /dev/null @@ -1,10 +0,0 @@ ---- src/interfaces/jdbc/build.xml~ Fri Mar 16 22:50:43 2001 -+++ src/interfaces/jdbc/build.xml Wed Apr 18 08:57:57 2001 -@@ -120,6 +120,7 @@ - <javac srcdir="${src}" destdir="${dest}"> - <include name="example/**" /> - <exclude name="example/corba/**"/> -+ <exclude name="example/blobtest.java" unless="jdk1.2+"/> - </javac> - </target> - diff --git a/japanese/postgresql-tcltk/files/pgsql.sh.tmpl b/japanese/postgresql-tcltk/files/pgsql.sh.tmpl deleted file mode 100644 index cd78771219ed..000000000000 --- a/japanese/postgresql-tcltk/files/pgsql.sh.tmpl +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ -# -# For postmaster startup options, edit $PGDATA/postgresql.conf - -PGBIN=%%PREFIX%%/%%PG_PREFIX%%bin - -case $1 in -start) - [ -d %%PREFIX%%/%%PG_PREFIX%%lib ] && /sbin/ldconfig -m %%PREFIX%%/%%PG_PREFIX%%lib - [ -x ${PGBIN}/pg_ctl ] && { - su -l pgsql -c \ - '[ -d ${PGDATA} ] && exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl start -s -w -l ~pgsql/errlog' - echo -n ' pgsql' - } - ;; - -stop) - [ -x ${PGBIN}/pg_ctl ] && { - su -l pgsql -c 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl stop -s -m fast' - echo -n ' pgsql' - } - ;; - -status) - [ -x ${PGBIN}/pg_ctl ] && { - exec su -l pgsql -c 'exec %%PREFIX%%/%%PG_PREFIX%%bin/pg_ctl status' - } - ;; - -*) - echo "usage: `basename $0` {start|stop|status}" >&2 - exit 64 - ;; -esac diff --git a/japanese/postgresql-tcltk/files/post-install-notes b/japanese/postgresql-tcltk/files/post-install-notes deleted file mode 100644 index 6b7192b31895..000000000000 --- a/japanese/postgresql-tcltk/files/post-install-notes +++ /dev/null @@ -1,22 +0,0 @@ - -Now that PostgreSQL is installed, you should read the documentation and -implementation guides. These can be found at: - - http://www.PostgreSQL.org/docs - -You may wish to subscribe to the PostgreSQL user-support mailing list. -Send an e-mail to pgsql-questions-request@postgresql.org with the -text "subscribe" in the message body. - -If you built PostgreSQL with TCL/TK support, you can use the pgaccess -utility to get a TCL/TK based database frontend for database -operations. You do NOT need to install the pgaccess port separately. - -If you built in the TCL support, you can load the Pg package into your -TCL scripts as easily as ``package require Pgtcl''. - -If you built with Java support, add -/usr/local/share/java/classes/postgresql.jar to your classpath. - -If you have many tables and many clients running, consider raising -kern.maxfiles using sysctl(8). diff --git a/japanese/postgresql-tcltk/files/pre-install-notes b/japanese/postgresql-tcltk/files/pre-install-notes deleted file mode 100644 index 697ce3cedb79..000000000000 --- a/japanese/postgresql-tcltk/files/pre-install-notes +++ /dev/null @@ -1,21 +0,0 @@ - * IMPORTANT UPGRADE NOTICE * IMPORTANT UPGRADE NOTICE * - -The PostgreSQL port now obeys hier(7) by default, which means that it -installs into: - -%%PREFIX%%/bin -%%PREFIX%%/lib -%%PREFIX%%/include/pgsql - -You *must* move away your old installation to avoid problems with -ldconfig(8) and user's PATH:s. If you rather install using the -old-fashion layout, cancel at next screen and run make as: - -$ make -DWITH_OLD_LAYOUT - -As always, you *must* dump existing databases before stopping and -removing your old postgresql, as part of the update. This is *NOT* -done by this port! - -If you want JAVA support, I will try to determine your JAVA_HOME using -javavmwrapper. If you want a different JVM, please set JAVA_HOME. |