From 6311c6abbabc0e26b3d8d3c9c39dc9b279a56d28 Mon Sep 17 00:00:00 2001 From: Sergey Matveychuk Date: Sat, 17 Jul 2004 21:25:50 +0000 Subject: [PATCH] Add patches forgoten with previous commit. Approved by: krion (mentor) (implicit) --- databases/msql3/files/msql3.sh | 23 ++++++++++ databases/msql3/files/patch-Makefile.tmpl | 39 ++++++++++++++++ databases/msql3/files/patch-acl.c | 11 +++++ databases/msql3/files/patch-config.c | 25 +++++++++++ .../msql3/files/patch-libmsql::Makefile.tmpl | 11 +++++ databases/msql3/files/patch-main.c | 11 +++++ databases/msql3/files/patch-make-install | 27 +++++++++++ databases/msql3/files/patch-msql.conf | 27 +++++++++++ databases/msql3/files/patch-msqladmin.c | 11 +++++ .../files/patch-msqld::main::Makefile.tmpl | 11 +++++ .../files/patch-msqld::regexp::Makefile.tmpl | 13 ++++++ databases/msql3/files/patch-run-daemon | 45 +++++++++++++++++++ databases/msql3/files/patch-setup | 21 +++++++++ databases/msql3/files/patch-site.mm.in | 20 +++++++++ 14 files changed, 295 insertions(+) create mode 100644 databases/msql3/files/msql3.sh create mode 100644 databases/msql3/files/patch-Makefile.tmpl create mode 100644 databases/msql3/files/patch-acl.c create mode 100644 databases/msql3/files/patch-config.c create mode 100644 databases/msql3/files/patch-libmsql::Makefile.tmpl create mode 100644 databases/msql3/files/patch-main.c create mode 100644 databases/msql3/files/patch-make-install create mode 100644 databases/msql3/files/patch-msql.conf create mode 100644 databases/msql3/files/patch-msqladmin.c create mode 100644 databases/msql3/files/patch-msqld::main::Makefile.tmpl create mode 100644 databases/msql3/files/patch-msqld::regexp::Makefile.tmpl create mode 100644 databases/msql3/files/patch-run-daemon create mode 100644 databases/msql3/files/patch-setup create mode 100644 databases/msql3/files/patch-site.mm.in diff --git a/databases/msql3/files/msql3.sh b/databases/msql3/files/msql3.sh new file mode 100644 index 000000000000..100cef38f2ca --- /dev/null +++ b/databases/msql3/files/msql3.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then + echo "$0: Cannot determine the PREFIX" >&2 + exit 1 +fi + +case "$1" in +start) + if [ -x ${PREFIX}/sbin/msql3d ]; then + su -f msql -c "exec ${PREFIX}/sbin/msql3d" > /dev/null 2>&1 & + echo -n ' msql3' + fi + ;; +stop) + killall msql3d && echo -n ' msql3d' && rm -f ${PREFIX}/etc/msql3/msql3d.pid + ;; +*) + echo "Usage: `basename $0` {start|stop}" >&2 + ;; +esac + +exit 0 diff --git a/databases/msql3/files/patch-Makefile.tmpl b/databases/msql3/files/patch-Makefile.tmpl new file mode 100644 index 000000000000..b026f4430c9e --- /dev/null +++ b/databases/msql3/files/patch-Makefile.tmpl @@ -0,0 +1,39 @@ +--- src/Makefile.tmpl.orig Fri Aug 23 01:36:26 2002 ++++ src/Makefile.tmpl Sat May 29 04:12:49 2004 +@@ -35,22 +35,22 @@ + echo + + install :: +- @cp ../README* $(INST_DIR);\\ +- cp makegen/makegen makegen/*.cf makegen/*.mm $(INST_DIR)/makegen;\\ +- chmod 755 $(INST_DIR)/makegen/*;\\ +- cp site.mm $(INST_DIR)/makegen;\\ +- if test -f $(INST_DIR)/msql.conf;\ ++ @cp ../README $(INST_DIR)/share/doc/msql3;\\ ++ cp ../RELEASE_NOTES $(INST_DIR)/share/doc/msql3;\\ ++ cp ../BUGS $(INST_DIR)/share/doc/msql3;\\ ++ cp ../doc/License $(INST_DIR)/share/doc/msql3;\\ ++ cp ../doc/Manual $(INST_DIR)/share/doc/msql3;\\ ++ cp ../doc/Perl $(INST_DIR)/share/doc/msql3;\\ ++ cp ../doc/acl.txt $(INST_DIR)/share/doc/msql3;\\ ++ cp makegen/makegen makegen/*.cf makegen/*.mm $(INST_DIR)/share/msql3/makegen;\\ ++ chmod 755 $(INST_DIR)/share/msql3/makegen/*;\\ ++ cp site.mm $(INST_DIR)/share/msql3/makegen;\\ ++ if test -f $(INST_DIR)/etc/msql3/msql.conf;\ + then\ +- rm -f $(INST_DIR)/msql.conf.old;\ +- mv $(INST_DIR)/msql.conf $(INST_DIR)/msql.conf.old;\ ++ rm -f $(INST_DIR)/etc/msql3/msql.conf.old;\ ++ mv $(INST_DIR)/etc/msql3/msql.conf $(INST_DIR)/etc/msql3/msql.conf.old;\ + fi;\ +- sed "s,_INST_,$(INST_DIR),"< ../misc/msql.conf >$(INST_DIR)/msql.conf;\\ +- echo ;\\ +- echo ;\\ +- echo ;\\ +- echo "Setting directory ownership";\\ +- chown daemon $(INST_DIR);\\ +- chown -R daemon $(INST_DIR)/msqldb;\\ ++ sed "s,_INST_,$(INST_DIR),"< ../misc/msql.conf >$(INST_DIR)/etc/msql3/msql.conf;\\ + echo ;\\ + echo ;\\ + echo ;\\ diff --git a/databases/msql3/files/patch-acl.c b/databases/msql3/files/patch-acl.c new file mode 100644 index 000000000000..cbf21199540a --- /dev/null +++ b/databases/msql3/files/patch-acl.c @@ -0,0 +1,11 @@ +--- src/msqld/main/acl.c.old Tue May 4 17:41:51 2004 ++++ src/msqld/main/acl.c Tue May 4 17:42:14 2004 +@@ -304,7 +304,7 @@ + /* + ** Open the acl file + */ +- (void)snprintf(path,MSQL_PATH_LEN,"%s/msql.acl", ++ (void)snprintf(path,MSQL_PATH_LEN,"%s/etc/msql3/msql.acl", + (char *)configGetCharEntry("general", "inst_dir")); + fp = fopen(path,"r"); + if (!fp) diff --git a/databases/msql3/files/patch-config.c b/databases/msql3/files/patch-config.c new file mode 100644 index 000000000000..8334517ea7df --- /dev/null +++ b/databases/msql3/files/patch-config.c @@ -0,0 +1,25 @@ +--- src/common/config/config.c.orig Mon Nov 4 01:34:37 2002 ++++ src/common/config/config.c Tue May 4 17:12:15 2004 +@@ -407,11 +407,11 @@ + configLoaded = 1; + if (file) + { +- snprintf(buf,sizeof(buf),"%s/%s", INST_DIR, file); ++ snprintf(buf,sizeof(buf),"%s/etc/msql3/%s", INST_DIR, file); + fp = fopen(buf,"r"); + if (!fp) + { +- snprintf(buf,sizeof(buf),"%s/%s.conf",INST_DIR,file); ++ snprintf(buf,sizeof(buf),"%s/etc/msql3/%s.conf",INST_DIR,file); + fp = fopen(buf,"r"); + } + if (!fp) +@@ -425,7 +425,7 @@ + } + else + { +- snprintf(buf,sizeof(buf),"%s/msql.conf", INST_DIR); ++ snprintf(buf,sizeof(buf),"%s/etc/msql3/msql.conf", INST_DIR); + fp = fopen(buf,"r"); + } + diff --git a/databases/msql3/files/patch-libmsql::Makefile.tmpl b/databases/msql3/files/patch-libmsql::Makefile.tmpl new file mode 100644 index 000000000000..648604c19370 --- /dev/null +++ b/databases/msql3/files/patch-libmsql::Makefile.tmpl @@ -0,0 +1,11 @@ +--- src/libmsql/Makefile.tmpl.old Fri May 28 01:06:35 2004 ++++ src/libmsql/Makefile.tmpl Fri May 28 01:06:54 2004 +@@ -1,6 +1,6 @@ + + !library_unix libmsql.a libmsql.c,net_client.c,time.c ../common/libc_stuff/strlib.o,../common/libc_stuff/tmpnam.o,../common/libc_stuff/strerror.o,../common/libc_stuff/strptime.o,../common/libc_stuff/snprintf.o,../common/config/config.o,../common/types/type_time.o,../common/types/type_date.o + +-!libinstall libmsql.a $(INST_DIR)/lib/libmsql.a 744 $(ROOT) +-!install msql.h $(INST_DIR)/include/msql.h 0744 ++!libinstall libmsql.a $(INST_DIR)/lib/libmsql.a 644 $(ROOT) ++!install msql.h $(INST_DIR)/include/msql.h 0444 + diff --git a/databases/msql3/files/patch-main.c b/databases/msql3/files/patch-main.c new file mode 100644 index 000000000000..8de62ac6db29 --- /dev/null +++ b/databases/msql3/files/patch-main.c @@ -0,0 +1,11 @@ +--- src/msqld/main/main.c.old Tue May 4 17:21:52 2004 ++++ src/msqld/main/main.c Tue May 4 17:22:26 2004 +@@ -1033,7 +1033,7 @@ + + if (*confFile == 0) + { +- snprintf(confFile,sizeof(confFile),"%s/msql.conf", INST_DIR); ++ snprintf(confFile,sizeof(confFile),"%s/etc/msql3/msql.conf", INST_DIR); + } + printf("\tLoading configuration from '%s'.\n",confFile); + configLoadFile(confFile); diff --git a/databases/msql3/files/patch-make-install b/databases/msql3/files/patch-make-install new file mode 100644 index 000000000000..9e71142ca284 --- /dev/null +++ b/databases/msql3/files/patch-make-install @@ -0,0 +1,27 @@ +--- scripts/make-install.orig Mon Feb 5 13:37:55 2001 ++++ scripts/make-install Sat May 29 01:23:29 2004 +@@ -1,16 +1,12 @@ + #!/bin/sh + +-INST_DIR=$1 ++INST_DIR=$PREFIX + +-scripts/mkinstalldirs 0755 $INST_DIR/bin +-scripts/mkinstalldirs 0755 $INST_DIR/include + scripts/mkinstalldirs 0755 $INST_DIR/include/common +-scripts/mkinstalldirs 0755 $INST_DIR/lib +-scripts/mkinstalldirs 0755 $INST_DIR/msqldb +-scripts/mkinstalldirs 0755 $INST_DIR/msqldb/.tmp +-scripts/mkinstalldirs 0755 $INST_DIR/doc +-scripts/mkinstalldirs 0755 $INST_DIR/www +-scripts/mkinstalldirs 0755 $INST_DIR/misc +-scripts/mkinstalldirs 0755 $INST_DIR/makegen +-scripts/mkinstalldirs 0755 $INST_DIR/modules +- ++scripts/mkinstalldirs 0755 $INST_DIR/etc/msql3 ++scripts/mkinstalldirs 0755 /var/spool/msql3 ++scripts/mkinstalldirs 0700 /var/db/msql3db ++scripts/mkinstalldirs 0700 /var/db/msql3db/.tmp ++scripts/mkinstalldirs 0755 $INST_DIR/share/doc/msql3 ++scripts/mkinstalldirs 0755 $INST_DIR/share/msql3/makegen ++/usr/sbin/chown -R msql:msql /var/db/msql3db /var/spool/msql3 diff --git a/databases/msql3/files/patch-msql.conf b/databases/msql3/files/patch-msql.conf new file mode 100644 index 000000000000..c6ff1ff27aec --- /dev/null +++ b/databases/msql3/files/patch-msql.conf @@ -0,0 +1,27 @@ +--- misc/msql.conf.orig Mon Nov 4 01:34:36 2002 ++++ misc/msql.conf Tue May 4 17:34:38 2004 +@@ -18,12 +18,12 @@ + [general] + + Inst_Dir = _INST_ +-DB_Dir = %I/msqldb ++DB_Dir = /var/db/msql3db + mSQL_User = daemon + Admin_User = root +-Pid_File = %I/msql3d.pid ++Pid_File = /var/spool/msql/msql3d.pid + TCP_Port = 1114 +-UNIX_Port = %I/msql3.sock ++UNIX_Port = /var/spool/msql/msql3.sock + + [system] + +@@ -35,7 +35,7 @@ + Local_Access = True + Force_Munmap = False + Query_Log = False +-Query_Log_File = %I/query.log ++#Query_Log_File = /var/spool/msql/query.log + #Update_Log = False + #Update_Log_File = %I/update.log + Table_Cache = 8 diff --git a/databases/msql3/files/patch-msqladmin.c b/databases/msql3/files/patch-msqladmin.c new file mode 100644 index 000000000000..fe4e44bb3939 --- /dev/null +++ b/databases/msql3/files/patch-msqladmin.c @@ -0,0 +1,11 @@ +--- src/msqladmin/msqladmin.c.orig Mon Jan 13 10:16:02 1997 ++++ src/msqladmin/msqladmin.c Sun Jan 19 14:05:53 1997 +@@ -257,7 +257,7 @@ + printf("\tTarget platform \t%s\n\n",TARGET); + + printf("Configuration Details :-\n\n"); +- printf("\tDefault config file\t%s/msql.conf\n",INST_DIR); ++ printf("\tDefault config file\t%s/etc/msql3/msql.conf\n",INST_DIR); + printf("\tTCP socket \t%d\n", + msqlGetIntConf("tcp_port")); + printf("\tUNIX socket \t%s\n", diff --git a/databases/msql3/files/patch-msqld::main::Makefile.tmpl b/databases/msql3/files/patch-msqld::main::Makefile.tmpl new file mode 100644 index 000000000000..10965636e8d8 --- /dev/null +++ b/databases/msql3/files/patch-msqld::main::Makefile.tmpl @@ -0,0 +1,11 @@ +--- src/msqld/main/Makefile.tmpl.old Wed May 5 00:17:37 2004 ++++ src/msqld/main/Makefile.tmpl Wed May 5 00:18:06 2004 +@@ -35,7 +35,7 @@ + + !program msql3d yaccer.o,lexer.o,parse.o,process.o,index.o,table.o,regex.o,select.o,sysvar.o,varchar.o,compare.o,distinct.o,acl.o,sort.o,cache.o,util.o,net.o,main.o,funct.o,memory.o,tcp.o,../../common/debug/debug.o,../../common/config/config.o,../../common/libc_stuff/strtoul.o,../../common/libc_stuff/tmpnam.o,../regexp/libregexp.a,../index/libidx.a,../../common/types/libtypes.a,../broker/libbroker.a,../cra/libcra.a,../lock/liblock.a,../../libmsql/libmsql.a + +-!install msql3d $(INST_DIR)/bin/msql3d 0755 ++!install msql3d $(INST_DIR)/sbin/msql3d 0755 + !install msql3_broker $(INST_DIR)/bin/msql3_broker 0755 + + diff --git a/databases/msql3/files/patch-msqld::regexp::Makefile.tmpl b/databases/msql3/files/patch-msqld::regexp::Makefile.tmpl new file mode 100644 index 000000000000..6b5486e4f4c9 --- /dev/null +++ b/databases/msql3/files/patch-msqld::regexp::Makefile.tmpl @@ -0,0 +1,13 @@ +--- src/msqld/regexp/Makefile.tmpl.old Fri May 28 01:02:46 2004 ++++ src/msqld/regexp/Makefile.tmpl Fri May 28 01:03:44 2004 +@@ -21,8 +21,8 @@ + !library_unix libregexp.a regexp.c,regsub.c + !library_os2 libregexp.a regexp.c,regsub.c + +-!libinstall libregexp.a $(INST_DIR)/lib/libregexp.a 744 $(ROOT) +-!install regexp.h $(INST_DIR)/include/regexp.h 744 $(ROOT) ++!libinstall libregexp.a $(INST_DIR)/lib/libregexp.a 644 $(ROOT) ++!install regexp.h $(INST_DIR)/include/regexp.h 444 $(ROOT) + + + all : libregexp.a diff --git a/databases/msql3/files/patch-run-daemon b/databases/msql3/files/patch-run-daemon new file mode 100644 index 000000000000..09e6675f2872 --- /dev/null +++ b/databases/msql3/files/patch-run-daemon @@ -0,0 +1,45 @@ +--- scripts/run_daemon.orig Thu Aug 19 07:33:07 1999 ++++ scripts/run_daemon Sat Jan 27 11:08:59 2001 +@@ -9,24 +9,26 @@ + # + # bambi@Bond.edu.au + +-INST_DIR=/usr/local/Minerva +-ADMIN="you@some.machine" ++umask 077 ++ ++INST_DIR=%%PREFIX%% ++ADMIN="root@%%HOSTNAME%%" + PROG=$1 + +-if test ! -d "${INST_DIR}/debug" ++if test ! -d "/tmp/debug" + then +- mkdir ${INST_DIR}/debug ++ mkdir /tmp/debug + fi + +-if test ! -d "${INST_DIR}/debug/${PROG}" ++if test ! -d "/tmp/debug/${PROG}" + then +- mkdir ${INST_DIR}/debug/${PROG} ++ mkdir /tmp/debug/${PROG} + fi + + while : + do +- cd ${INST_DIR}/debug/${PROG} +- ${INST_DIR}/bin/${PROG} > output 2>&1 ++ cd /tmp/debug/${PROG} ++ ${INST_DIR}/sbin/${PROG} > output 2>&1 + echo "Program : ${PROG} + Time : `date` + Program Output +@@ -34,6 +36,6 @@ + + " > mail.tmp + cat output >> mail.tmp +- /usr/ucb/mail -s "Minerva Daemon Crash Report" ${ADMIN} < mail.tmp ++ /usr/bin/mail -s "Minerva Daemon Crash Report" ${ADMIN} < mail.tmp + sleep 15 + done diff --git a/databases/msql3/files/patch-setup b/databases/msql3/files/patch-setup new file mode 100644 index 000000000000..531724f3400f --- /dev/null +++ b/databases/msql3/files/patch-setup @@ -0,0 +1,21 @@ +--- setup.old Sat May 29 00:59:37 2004 ++++ setup Sat May 29 00:59:58 2004 +@@ -38,18 +38,6 @@ + FLEX="0" + fi + +- +-CC=cc +-for I in `echo $PATH | sed "s/:/ /g"` +-do +- if test -x "$I/gcc" +- then +- CC="$I/gcc" +- fi +-done +- +- +- + echo + echo "Using $CC for testing" + diff --git a/databases/msql3/files/patch-site.mm.in b/databases/msql3/files/patch-site.mm.in new file mode 100644 index 000000000000..138064196326 --- /dev/null +++ b/databases/msql3/files/patch-site.mm.in @@ -0,0 +1,20 @@ +--- conf/site.mm.in.old Tue May 4 16:50:06 2004 ++++ conf/site.mm.in Tue May 4 16:53:20 2004 +@@ -3,8 +3,8 @@ + # + + +-COMPILER= @CC@ @WALL@ +-INST_DIR= /usr/local/msql3 ++COMPILER= @CC@ ++INST_DIR= $(PREFIX) + HAVE_DYNAMIC= -DHAVE_DYNAMIC + CC_ONLY_FLAGS= + LINK_ONLY_FLAGS= @LINUX_DYNAMIC@ +@@ -33,5 +33,5 @@ + # Directory for pid file + PID_DIR= @PID_DIR@ + +-CFLAGS= -O -I$(TOP)/ $(EXTRA_CFLAGS) -D$(OS_TYPE) ++CFLAGS+= -I$(TOP)/ $(EXTRA_CFLAGS) -D$(OS_TYPE) -fpic -DPIC + LDLIBS= -L$(TOP)/lib $(EXTRA_LIB)