- Lots of changes.

- Destdir patch added.
- Now it installs properly i am hope.
- splited into two packages.
- NFY arekm has to work on some security stuff.

Changed files:
    dqs-DESTDIR.patch -> 1.1
    dqs-PLD-conf_file -> 1.2
    dqs-PLD-def.h -> 1.2
    dqs-PLD-dqs.h -> 1.2
    dqs-PLD-resolve_file -> 1.2
    dqs-mq.patch -> 1.1

diff --git a/dqs-DESTDIR.patch b/dqs-DESTDIR.patch
new file mode 100644 (file)
index 0000000..927dead
--- /dev/null
+++ b/dqs-DESTDIR.patch
@@ -0,0 +1,121 @@
+diff -urN DQS3.orig/Makefile DQS3/Makefile
+--- DQS3.orig/Makefile Wed Oct 21 19:39:14 1998
++++ DQS3/Makefile      Thu May 10 12:49:46 2001
+@@ -1,10 +1,11 @@
+-INSTALL_DIR=/usr/local/DQS/bin
+-BIN_DIR=/usr/local/DQS/bin
+-CONF_DIR=/usr/local/DQS/common/conf
+-DOC_DIR=/usr/local/DQS/common/doc
+-LIB_DIR=/usr/local/DQS/local/lib
+-MAN1_DIR=/usr/local/DQS/man/man1
+-MAN3_DIR=/usr/local/DQS/man/man3
++INSTALL_DIR=$(DESTDIR)/usr/bin
++BIN_DIR=$(DESTDIR)/usr/bin
++SBIN_DIR=$(DESTDIR)/usr/sbin
++CONF_DIR=$(DESTDIR)/etc/dqs
++DOC_DIR=$(DESTDIR)/usr/share/doc/dqs-3.3.2
++LIB_DIR=$(DESTDIR)/usr/lib
++MAN1_DIR=$(DESTDIR)/usr/share/man/man1
++MAN3_DIR=$(DESTDIR)/usr/share/man/man3
+ ROOT=0
+ DQS_ROOT=0
+ SYSGRP=0
+@@ -24,7 +25,7 @@
+ # dirs - Make Install Directories
+ 
+ dirs:
+-      -mkdir -p $(INSTALL_DIR) $(ARC_DIR) $(BIN_DIR)
++      -mkdir -p $(INSTALL_DIR) $(ARC_DIR) $(BIN_DIR) $(SBIN_DIR)
+       -mkdir -p $(DOC_DIR) $(LIB_DIR) $(MAN1_DIR) $(MAN3_DIR)
+       -mkdir -p $(CONF_DIR)
+       -chmod 755 $(CONF_DIR)
+@@ -59,7 +60,7 @@
+ 
+ installbin: dirs
+       UTIL/make_arcs make CC=$(CC) -f Makefile $@ \
+-      BIN_DIR=$(BIN_DIR) DQS_ROOT=$(DQS_ROOT) \
++      BIN_DIR=$(BIN_DIR) SBIN_DIR=$(SBIN_DIR) DQS_ROOT=$(DQS_ROOT) \
+       DQS_SYSGRP=$(DQS_SYSGRP)
+ 
+ #******************************************************
+diff -urN DQS3.orig/SRC/Makefile DQS3/SRC/Makefile
+--- DQS3.orig/SRC/Makefile     Fri Jul  2 17:06:53 1999
++++ DQS3/SRC/Makefile  Thu May 10 12:36:19 2001
+@@ -115,7 +115,7 @@
+               rm -f Makefile.c
+               cp $(PROTO) Makefile.c
+               echo "#define `../UTIL/config.guess 1`" | sed s/\\./_/g | sed s/-/_/g > Makefile.h
+-              $(CC) -E Makefile.c | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ
++              $(CC) -E Makefile.c | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( SBIN_DIR )/(SBIN_DIR)/g'| sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ
+ #             rm -f Makefile.c
+               @$(MAKE) -f Makefile.typ $@
+ 
+@@ -123,14 +123,14 @@
+               rm -f Makefile.c
+               cp $(PROTO) Makefile.c
+               echo "#define `../UTIL/config.guess 1`" | sed s/\\./_/g | sed s/-/_/g > Makefile.h
+-              $(CC) -E Makefile.c | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ
++              $(CC) -E Makefile.c | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( SBIN_DIR )/(SBIN_DIR)/g'| sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ
+               @$(MAKE) -f Makefile.typ $@
+ 
+ .DEFAULT      : 
+               rm -f Makefile.c
+               cp $(PROTO) Makefile.c
+               echo "#define `../UTIL/config.guess`" | sed s/\\./_/g | sed s/-/_/g > Makefile.h
+-              $(CC) -E Makefile.c | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ
++              $(CC) -E Makefile.c | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( SBIN_DIR )/(SBIN_DIR)/g'| sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ
+ #             rm -f Makefile.c
+               @$(MAKE) -f Makefile.typ $@
+ 
+diff -urN DQS3.orig/SRC/Makefile.proto DQS3/SRC/Makefile.proto
+--- DQS3.orig/SRC/Makefile.proto       Mon Dec 11 04:02:19 2000
++++ DQS3/SRC/Makefile.proto    Thu May 10 12:37:33 2001
+@@ -764,7 +764,7 @@
+               -rm -f $(BIN_DIR)/QMASTER_BIN   $(BIN_DIR)/DSH_BIN
+               -rm -f $(BIN_DIR)/PVM_CLEAN 
+ 
+-installbin::    $(BIN_DIR)/QMASTER_BIN $(BIN_DIR)/QSUB_BIN $(BIN_DIR)/QSTAT_BIN
++installbin::    $(SBIN_DIR)/QMASTER_BIN $(BIN_DIR)/QSUB_BIN $(BIN_DIR)/QSTAT_BIN
+ 
+ installbin::  $(BIN_DIR)/DQS_EXECD_BIN $(BIN_DIR)/QDEL_BIN $(BIN_DIR)/QCONF_BIN
+ 
+@@ -785,8 +785,8 @@
+ $(BIN_DIR)/QALTER_BIN:                qalter
+       $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qalter $(BIN_DIR)/QALTER_BIN
+ 
+-$(BIN_DIR)/QMASTER_BIN:       qmaster
+-      $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0700 qmaster $(BIN_DIR)/QMASTER_BIN
++$(SBIN_DIR)/QMASTER_BIN:      qmaster
++      $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0700 qmaster $(SBIN_DIR)/QMASTER_BIN
+       
+ $(BIN_DIR)/QHOLD_BIN: qhold
+       $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qhold $(BIN_DIR)/QHOLD_BIN
+@@ -801,10 +801,10 @@
+       $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qstat $(BIN_DIR)/QSTAT_BIN
+ 
+ $(BIN_DIR)/QCONF_BIN:         qconf
+-      $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qconf $(BIN_DIR)/QCONF_BIN
++      $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qconf $(SBIN_DIR)/QCONF_BIN
+ 
+ $(BIN_DIR)/DQS_EXECD_BIN:     dqs_execd
+-      $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0755 dqs_execd $(BIN_DIR)/DQS_EXECD_BIN
++      $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0755 dqs_execd $(SBIN_DIR)/DQS_EXECD_BIN
+ 
+ $(BIN_DIR)/PVM_CLEAN: ../UTIL/pvmcleanup.sh
+       cp ../UTIL/pvmcleanup.sh .
+diff -urN DQS3.orig/UTIL/install DQS3/UTIL/install
+--- DQS3.orig/UTIL/install     Tue Aug 18 16:39:14 1998
++++ DQS3/UTIL/install  Wed May  9 23:42:13 2001
+@@ -29,12 +29,6 @@
+ 
+ echo "------------$CP $1 $2"
+ $CP $1 $2
+-echo "------------$CHOWN $2"
+-$CHOWN $2
+-echo "------------$CHGRP $2"
+-$CHGRP $2
+-echo "------------$CHMOD $2"
+-$CHMOD $2
+ 
+ exit 0
+ 

diff --git a/dqs-PLD-conf_file b/dqs-PLD-conf_file
index 2684911ce9400b1c5a9ea69f9322b8f25227e97e..abfd6df1ce92184c167b705e7a338c6ac31d7eff 100755 (executable)
--- a/dqs-PLD-conf_file
+++ b/dqs-PLD-conf_file
@@ -1,10 +1,11 @@
  QMASTER_SPOOL_DIR         /var/spool/dqs
  EXECD_SPOOL_DIR           /var/spool/dqs
  QMASTER_SPOOL_DIR         /var/spool/dqs
  EXECD_SPOOL_DIR           /var/spool/dqs

+ DEFAULT_CELL              tqo.iqo.uni-hannover.de

  RESERVED_PORT             TRUE
  RESERVED_PORT             TRUE

- DEFAULT_CELL             localhost
- DQS_EXECD_SERVICE         dqs313_execd
- QMASTER_SERVICE           dqs313_qmaster
- INTERCELL_SERVICE         dqs313_intercell
+ DQS_EXECD_SERVICE         dqs33_dqs_execd
+ QMASTER_SERVICE           dqs33_qmaster
+ INTERCELL_SERVICE         dqs33_dqs_intercell
+ KLOG                      /usr/local/bin/klog

  REAUTH_TIME               60
  MAILER                    /bin/mail
  DQS_BIN                   /usr/bin
  REAUTH_TIME               60
  MAILER                    /bin/mail
  DQS_BIN                   /usr/bin


@@ -18,8 +19,8 @@
  LOGFACILITY               LOG_VIA_COMBO
  LOGLEVEL                  LOG_INFO
  MIN_UID                   1000
  LOGFACILITY               LOG_VIA_COMBO
  LOGLEVEL                  LOG_INFO
  MIN_UID                   1000

- MIN_GID                   100
- MAXUJOBS                  10
+ MIN_GID                   1000
+ MAXUJOBS                  100

  OUTPUT_HANDLING           LEAVE_OUTPUT_FILES
  ADDON_SCRIPT              NONE
  ADDON_INFO                NONE
  OUTPUT_HANDLING           LEAVE_OUTPUT_FILES
  ADDON_SCRIPT              NONE
  ADDON_INFO                NONE

diff --git a/dqs-PLD-def.h b/dqs-PLD-def.h
index dbec83a5ca5b0f70d6a3607f4b5ec3615b7210c0..0dd996f0184f09e59c44be953296272cb6f3e44b 100755 (executable)
--- a/dqs-PLD-def.h
+++ b/dqs-PLD-def.h
@@ -15,6 +15,10 @@ static char def_rcsid[]="$Id$";
  * implied warranty.
  *
  * $Log$
  * implied warranty.
  *
  * $Log$

+ * Revision 1.1  2001/03/19 20:45:31  dobrek
+ * -3f2839b879f378e29cfee71b2738b8ec  DQS-3.3.1.tgz
+ * -And related stuff
+ *

  * Revision 1.8  2000/03/09 03:56:07  chuck
  * Modified FLOCK macro for lockf on System 5 hosts and flock on
  * BSD hosts.  FLOCK now only locks.  New macro FUNLOCK is now used
  * Revision 1.8  2000/03/09 03:56:07  chuck
  * Modified FLOCK macro for lockf on System 5 hosts and flock on
  * BSD hosts.  FLOCK now only locks.  New macro FUNLOCK is now used


@@ -647,7 +651,7 @@ static char def_rcsid[]="$Id$";
 #define MPI                              2
 #define GENERIC_SLA                      3
 #define GENERIC_ALL                      4
 #define MPI                              2
 #define GENERIC_SLA                      3
 #define GENERIC_ALL                      4

-#define PVM                              5
+#define DQSPVM                           5

 #define TCGMSG                           6
 /********************************************************************************/
 
 #define TCGMSG                           6
 /********************************************************************************/
 

diff --git a/dqs-PLD-dqs.h b/dqs-PLD-dqs.h
index 241be83947fd7161098a89a0024d1ec90278b594..db7d3e5c9f081104c076f36286647d1f2a778160 100755 (executable)
--- a/dqs-PLD-dqs.h
+++ b/dqs-PLD-dqs.h
@@ -7,27 +7,27 @@
 #define LOG_FILE                  "/var/log/dqs/log_file"
 #define QMASTER_SPOOL_DIR         "/var/spool/dqs"
 #define EXECD_SPOOL_DIR           "/var/spool/dqs"
 #define LOG_FILE                  "/var/log/dqs/log_file"
 #define QMASTER_SPOOL_DIR         "/var/spool/dqs"
 #define EXECD_SPOOL_DIR           "/var/spool/dqs"

-#define DEFAULT_CELL              "localdomain"
+#define DEFAULT_CELL              ""

 #define RESERVED_PORT             TRUE
 #define RESERVED_PORT             TRUE

-#define DQS_EXECD_SERVICE         "dqs_execd"
-#define QMASTER_SERVICE           "dqs_qmaster"
-#define INTERCELL_SERVICE         "dqs_intercell"
+#define DQS_EXECD_SERVICE         "dqs33_dqs_execd"
+#define QMASTER_SERVICE           "dqs33_qmaster"
+#define INTERCELL_SERVICE         "dqs33_dqs_intercell"

 #define KLOG                      "/usr/local/bin/klog"
 #define REAUTH_TIME               60
 #define MAILER                    "/bin/mail"
 #define DQS_BIN                   "/usr/bin"
 #define KLOG                      "/usr/local/bin/klog"
 #define REAUTH_TIME               60
 #define MAILER                    "/bin/mail"
 #define DQS_BIN                   "/usr/bin"

-#define ADMINISTRATOR             "postmater@localhost"
+#define ADMINISTRATOR             "postmaster@localhost"

 #define DEFAULT_ACCOUNT           "GENERAL"
 #define DEFAULT_ACCOUNT           "GENERAL"

-#define DEFAULT_HOST              "localhost"
+#define DEFAULT_HOST              "NONE"

 #define LOGMAIL                   FALSE
 #define DEFAULT_RERUN             FALSE
 #define DEFAULT_SORT_SEQ_NO       FALSE
 #define SYNC_IO                   FALSE
 #define USER_ACCESS               ACCESS_FREE
 #define LOGMAIL                   FALSE
 #define DEFAULT_RERUN             FALSE
 #define DEFAULT_SORT_SEQ_NO       FALSE
 #define SYNC_IO                   FALSE
 #define USER_ACCESS               ACCESS_FREE

-#define LOGFACILITY               LOG_VIA_SYSLOG
+#define LOGFACILITY               LOG_VIA_COMBO

 #define LOGLEVEL                  LOG_INFO
 #define MIN_UID                   1000
 #define LOGLEVEL                  LOG_INFO
 #define MIN_UID                   1000

-#define MIN_GID                   100
+#define MIN_GID                   1000

 #define MAXUJOBS                  100
 #define OUTPUT_HANDLING           LEAVE_OUTPUT_FILES
 #define ADDON_SCRIPT              NONE
 #define MAXUJOBS                  100
 #define OUTPUT_HANDLING           LEAVE_OUTPUT_FILES
 #define ADDON_SCRIPT              NONE


@@ -46,9 +46,9 @@
 #define volatile
 #define labs abs
 #endif
 #define volatile
 #define labs abs
 #endif

-#define SLAVE_LOOP_TIME           "200"
-#define LINK_FILE_PATH            ""
-#define COPY_FILE_DELAY           "300"
+#define SLAVE_LOOP_TIME                 "200"
+#define LINK_FILE_PATH                  ""
+#define COPY_FILE_DELAY                 "300"

 /* To use the link strategy you must ensure, that                  */
 /* (1) a file with the value of TMP_LINK_OUTPUT_FILES exists in    */
 /*     the directory EXECD_SPOOL_DIR and contains the required     */
 /* To use the link strategy you must ensure, that                  */
 /* (1) a file with the value of TMP_LINK_OUTPUT_FILES exists in    */
 /*     the directory EXECD_SPOOL_DIR and contains the required     */

diff --git a/dqs-PLD-resolve_file b/dqs-PLD-resolve_file
index 4ca629a593a8f4f4c71270acb40943ca7f588404..20cc2a3e05741a42cc3975aa744b894f69ede460 100755 (executable)
--- a/dqs-PLD-resolve_file
+++ b/dqs-PLD-resolve_file
@@ -5,4 +5,4 @@
 # 3rd field = primary qmaster alias
 # 4th field = secondary qmaster
 # 5th field = secondary qmaster alias
 # 3rd field = primary qmaster alias
 # 4th field = secondary qmaster
 # 5th field = secondary qmaster alias

-# scri.fsu.edu lnx4 lnx4.scri.fsu.edu NONE NONE
+# tqo.iqo.uni-hannover.de pele pele.iqo.uni-hannover.de NONE NONE

diff --git a/dqs-mq.patch b/dqs-mq.patch
new file mode 100644 (file)
index 0000000..14668ba
--- /dev/null
+++ b/dqs-mq.patch
@@ -0,0 +1,12 @@
+diff -urN DQS3-orig/SRC/dqs_parse_qconf.c DQS3/SRC/dqs_parse_qconf.c
+--- DQS3-orig/SRC/dqs_parse_qconf.c    Fri Dec  1 05:42:01 2000
++++ DQS3/SRC/dqs_parse_qconf.c Sat Apr 28 17:21:37 2001
+@@ -920,7 +920,7 @@
+     
+     if (!strcmp("-Mq",sp->str0))
+       {
+-         dqs_validate_option(Mq_OPT,sp->str0);
++         dqs_validate_option(mq_OPT,sp->str0);
+          sp=dqs_parser_get_next(sp,sp->str0);
+ 
+          listel_ptr->type=QCONF;