COMP/CMSDIST/castor-2.1.9.8-macosx.patch

diff --git a/castor-2.1.9/rfio/open.c b/castor-2.1.9/rfio/open.c
index d04975e..050dd6e 100644
--- a/castor-2.1.9/rfio/open.c
+++ b/castor-2.1.9/rfio/open.c
@@ -235,7 +235,7 @@ int rfio_open_ext(filepath, flags, mode,uid,gid,passwd,reqhost,vmstr)
   int      rt ;  /* daemon in site(0) or not (1) */
   int    bufsize ;  /* socket buffer size   */
   struct sockaddr_in      to;
-#if (defined(_AIX) || defined(linux))
+#if (defined(_AIX) || defined(linux) || defined(__APPLE__))
   socklen_t tolen;
 #else
   int     tolen;
diff --git a/castor-2.1.9/rfio/open64.c b/castor-2.1.9/rfio/open64.c
index a52900e..4a093ac 100644
--- a/castor-2.1.9/rfio/open64.c
+++ b/castor-2.1.9/rfio/open64.c
@@ -125,7 +125,7 @@ int rfio_open64_ext(filepath, flags, mode,uid,gid,passwd,reqhost)
   int     rt ;  /* daemon in site(0) or not (1) */
   int     bufsize ;  /* socket buffer size   */
   struct  sockaddr_in to;
-#if (defined(_AIX) || defined(linux))
+#if (defined(_AIX) || defined(linux) || defined(__APPLE__))
   socklen_t tolen;
 #else
   int     tolen;
diff --git a/castor-2.1.9/castor/db/newora/OraCnvSvc.cpp b/castor-2.1.9/castor/db/newora/OraCnvSvc.cpp
index 9e4fc9b..cc6beb2 100644
--- a/castor-2.1.9/castor/db/newora/OraCnvSvc.cpp
+++ b/castor-2.1.9/castor/db/newora/OraCnvSvc.cpp
@@ -98,6 +98,21 @@ const unsigned int castor::db::ora::OraCnvSvc::getPhysRepType() const {
   return castor::REP_ORACLE;
 }
 
+#if defined (__APPLE__) 
+#include <mach/mach.h> 
+#include <sys/resource.h> 
+#endif 
+static int gettid() 
+{ 
+#if defined(__APPLE__) 
+return mach_thread_self(); 
+#elif defined(linux) 
+ return syscall(__NR_gettid); 
+#else 
+return -ENOSYS; 
+#endif 
+} 
+
 //------------------------------------------------------------------------------
 // getConnection
 //------------------------------------------------------------------------------
@@ -224,7 +239,7 @@ oracle::occi::Connection* castor::db::ora::OraCnvSvc::getConnection()
     // for logging/debugging purposes, we set an identifier for this session
     std::ostringstream ss;
     ss << "BEGIN DBMS_APPLICATION_INFO.SET_CLIENT_INFO('CASTOR pid="
-       << getpid() << " tid=" << syscall(__NR_gettid) << "'); END;";    // gettid() is not defined???
+       << getpid() << " tid=" << gettid() << "'); END;";    // gettid() is not defined???
     stmt = m_connection->createStatement(ss.str());
     stmt->executeUpdate();
     m_connection->terminateStatement(stmt);
diff --git a/castor-2.1.9/dlf/dlf_lib.c b/castor-2.1.9/dlf/dlf_lib.c
index ab00541..ea3ad26 100644
--- a/castor-2.1.9/dlf/dlf_lib.c
+++ b/castor-2.1.9/dlf/dlf_lib.c
@@ -368,6 +368,21 @@ int DLL_DECL dlf_write(Cuuid_t reqid,
   return (rv);
 }
 
+#if defined (__APPLE__) 
+#include <mach/mach.h> 
+#include <sys/resource.h> 
+#endif 
+static int gettid() 
+{ 
+#if defined(__APPLE__) 
+return mach_thread_self(); 
+#elif defined(linux) 
+ return syscall(__NR_gettid); 
+#else 
+return -ENOSYS; 
+#endif 
+} 
+
 
 /*---------------------------------------------------------------------------
  * dlf_writep
@@ -426,7 +441,7 @@ int DLL_DECL dlf_writep(Cuuid_t reqid,
 
   buffer[0] = '\0';
   len = snprintf(buffer, maxmsglen - len, "LVL=%s TID=%d MSG=\"%s\" ",
-                 prioritylist[priority].text, (int)syscall(__NR_gettid),
+                 prioritylist[priority].text, gettid(),
                  messages[msgno]);
 
   /* Append the request uuid if defined */
diff --git a/castor-2.1.9/castor/io/biniostream.h b/castor-2.1.9/castor/io/biniostream.h
index 15771f1..10f9b8f 100644
--- a/castor-2.1.9/castor/io/biniostream.h
+++ b/castor-2.1.9/castor/io/biniostream.h
@@ -28,7 +28,12 @@
 #define IO_BINIOSTREAM_H 1
 
 #include <sstream>
+#if defined(__APPLE__)
+#include <machine/endian.h>
+#include <machine/byte_order.h>
+#else
 #include <byteswap.h>
+#endif
 #include "osdep.h"
 #include "castor/exception/OutOfMemory.hpp"
 #include <string.h>
diff --git a/castor-2.1.9/tape/getcompstat.c b/castor-2.1.9/tape/getcompstat.c
index 2214e32..41ffb49 100644
--- a/castor-2.1.9/tape/getcompstat.c
+++ b/castor-2.1.9/tape/getcompstat.c
@@ -24,7 +24,7 @@ char *path;
 char *devtype;
 COMPRESSION_STATS *comp_stats;
 {
-#if defined(ADSTAR) || defined(SOLARIS25) || defined(sgi) || defined(hpux) || (defined(__osf__) && defined(__alpha)) || defined(linux)
+#if defined(ADSTAR) || defined(SOLARIS25) || defined(sgi) || defined(hpux) || (defined(__osf__) && defined(__alpha)) || defined(linux) || defined(__APPLE__)
        unsigned long kbytes_from_host;
        unsigned long kbytes_to_tape;
        unsigned long kbytes_from_tape;
diff --git a/castor-2.1.9/tape/getcompstat.c b/castor-2.1.9/tape/getcompstat.c
index 41ffb49..83e701b 100644
--- a/castor-2.1.9/tape/getcompstat.c
+++ b/castor-2.1.9/tape/getcompstat.c
@@ -245,7 +245,7 @@ int tapefd;
 char *path;
 char *devtype;
 {
-#if defined(ADSTAR) || defined(SOLARIS25) || defined(sgi) || defined(hpux) || (defined(__osf__) && defined(__alpha)) || defined(linux)
+#if defined(ADSTAR) || defined(SOLARIS25) || defined(sgi) || defined(hpux) || (defined(__osf__) && defined(__alpha)) || defined(linux) || defined(__APPLE__)
 #if defined(ADSTAR)
        struct sc_iocmd sc_iocmd;
 
diff --git a/castor-2.1.9/vmgr/vmgr_modifytape.c b/castor-2.1.9/vmgr/vmgr_modifytape.c
index 33cc60a..3b1240a 100644
--- a/castor-2.1.9/vmgr/vmgr_modifytape.c
+++ b/castor-2.1.9/vmgr/vmgr_modifytape.c
@@ -21,7 +21,7 @@
 int vmgr_modifytape(const char *vid, char *vsn, char *library, char *density, char *lbltype, char *manufacturer, char *sn, char *poolname, int status)
 {
        int c;
-       char func[15];
+       char func[16];
        gid_t gid;
        int msglen;
        char *q;
diff --git a/castor-2.1.9/tape/rwndtape.c b/castor-2.1.9/tape/rwndtape.c
index 3cd0905..3d9feb2 100644
--- a/castor-2.1.9/tape/rwndtape.c
+++ b/castor-2.1.9/tape/rwndtape.c
@@ -20,7 +20,7 @@
 #else
 #if defined(_WIN32)
 #include <windows.h>
-#else
+#elif !defined(__APPLE__)
 #include <sys/ioctl.h>
 #include <sys/mtio.h>
 #endif
@@ -36,6 +36,7 @@ int tapefd;
 #endif
 char *path;
 {
+#if !defined(__APPLE__)
        char func[16];
 #if !defined(_WIN32)
        struct mtop mtop;
@@ -52,5 +53,6 @@ char *path;
                serrno = rpttperror (func, tapefd, path, "ioctl"); 
                RETURN (-1);
        }
+#endif
        RETURN (0);
 }
diff --git a/castor-2.1.9/tape/skiptape.c b/castor-2.1.9/tape/skiptape.c
index 16c747d..711ee01 100644
--- a/castor-2.1.9/tape/skiptape.c
+++ b/castor-2.1.9/tape/skiptape.c
@@ -5,11 +5,13 @@
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
+#if defined(linux)
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/mtio.h>
 #include <linux/version.h>
 #include <sys/utsname.h>
+#endif
 #include "Ctape.h"
 #include "Ctape_api.h"
 #include "serrno.h"
@@ -17,6 +19,7 @@
 extern int mt_rescnt;
 
 int skiptpfff(int tapefd, char *path, int n) {
+#if defined(linux)
 
        /* skip n files forward */
 
@@ -59,10 +62,13 @@ int skiptpfff(int tapefd, char *path, int n) {
                tobeskipped -= count;
        }
        RETURN (0);
+#else
+       return -1;
+#endif
 }
 
 int skiptpff(int tapefd, char *path, int n) {
-
+#if defined(linux)
        /* skip n files forward */
 
        int count;
@@ -83,10 +89,13 @@ int skiptpff(int tapefd, char *path, int n) {
                tobeskipped -= count;
        }
        RETURN (0);
+#else
+       return -1;
+#endif
 }
 
 int skiptpfb(int tapefd, char *path, int n) {
-
+#if defined(linux)
         /* skip n files backward */
 
        int count;
@@ -107,10 +116,13 @@ int skiptpfb(int tapefd, char *path, int n) {
                tobeskipped -= count;
        }
        RETURN (0);
+#else
+       return -1;
+#endif
 }
 
 int skiptprf(int tapefd, char *path, int n, int silent) {
-
+#if defined(linux)
        /* skip n blocks forward */
 
        int count;
@@ -133,10 +145,13 @@ int skiptprf(int tapefd, char *path, int n, int silent) {
                tobeskipped -= count;
        }
        RETURN (0);
+#else
+       return -1;
+#endif
 }
 
 int skiptprb(int tapefd, char *path, int n) {
-
+#if defined(linux)
         /* skip n blocks backward */
 
        int count;
@@ -157,10 +172,13 @@ int skiptprb(int tapefd, char *path, int n) {
                tobeskipped -= count;
        }
        RETURN (0);
+#else
+       return -1;
+#endif
 }
 
 int skip2eod(int tapefd, char *path) {
-        
+#if defined(linux) 
         /* Skip to the end of data. */
 
         char func[16];
@@ -175,4 +193,7 @@ int skip2eod(int tapefd, char *path) {
                RETURN (-1);
        }
        RETURN (0);
+#else
+       return -1;
+#endif
 }
diff --git a/castor-2.1.9/tape/unldtape.c b/castor-2.1.9/tape/unldtape.c
index 93c9b94..abb1686 100644
--- a/castor-2.1.9/tape/unldtape.c
+++ b/castor-2.1.9/tape/unldtape.c
@@ -36,6 +36,7 @@ int tapefd;
 #endif
 char *path;
 {
+#if !defined(__APPLE__)
        char func[16];
 #if !defined(_WIN32)
        struct mtop mtop;
@@ -57,5 +58,6 @@ char *path;
                serrno = rpttperror (func, tapefd, path, "ioctl");
                RETURN (-1);
        }
+#endif // !defined(__APPLE__)
        RETURN (0);
 }
diff --git a/castor-2.1.9/tape/wrttpmrk.c b/castor-2.1.9/tape/wrttpmrk.c
index e04e9df..6433554 100644
--- a/castor-2.1.9/tape/wrttpmrk.c
+++ b/castor-2.1.9/tape/wrttpmrk.c
@@ -37,6 +37,7 @@ int tapefd;
 char *path;
 int n;
 {
+#if !defined(__APPLE__)
        char func[16];
 #if !defined(_WIN32)
        struct mtop mtop;
@@ -53,5 +54,6 @@ int n;
                serrno = rpttperror (func, tapefd, path, "ioctl");
                RETURN (-1);
        }
+#endif // !defined(__APPLE__)
        RETURN (0);
 }
diff --git a/castor-2.1.9/tape/readlbl.c b/castor-2.1.9/tape/readlbl.c
index 8a73801..c68f3e5 100644
--- a/castor-2.1.9/tape/readlbl.c
+++ b/castor-2.1.9/tape/readlbl.c
@@ -16,8 +16,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdio.h>
+#if !defined(__APPLE__)
 #include <sys/mtio.h>
 #include <sys/utsname.h>
+#endif
 #include "Ctape.h"
 #include "Ctape_api.h"
 #include "serrno.h"
@@ -30,6 +32,7 @@ int tapefd;
 char *path;
 char *lblbuf;
 {
+#if !defined(__APPLE__)
        /* int errcat; */
        char func[16];
        char *msgaddr;
@@ -142,4 +145,7 @@ char *lblbuf;
                 RETURN (1); 
         }
        RETURN (0);
+#else
+       RETURN (-1);
+#endif
 }
diff --git a/castor-2.1.9/tape/tperror.c b/castor-2.1.9/tape/tperror.c
index 1d38749..a12c372 100644
--- a/castor-2.1.9/tape/tperror.c
+++ b/castor-2.1.9/tape/tperror.c
@@ -21,7 +21,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/types.h>
+#if !defined(__APPLE__)
 #include <sys/ioctl.h>
+#endif
 #include "Ctape.h"
 #include "Ctape_api.h"
 #include "serrno.h"
diff --git a/castor-2.1.9/tape/skiptape.c b/castor-2.1.9/tape/skiptape.c
index 711ee01..6c79d99 100644
--- a/castor-2.1.9/tape/skiptape.c
+++ b/castor-2.1.9/tape/skiptape.c
@@ -11,12 +11,12 @@
 #include <sys/mtio.h>
 #include <linux/version.h>
 #include <sys/utsname.h>
-#endif
 #include "Ctape.h"
 #include "Ctape_api.h"
 #include "serrno.h"
 
 extern int mt_rescnt;
+#endif
 
 int skiptpfff(int tapefd, char *path, int n) {
 #if defined(linux)
diff --git a/castor-2.1.9/tape/writelbl.c b/castor-2.1.9/tape/writelbl.c
index ab23c1f..6a891f0 100644
--- a/castor-2.1.9/tape/writelbl.c
+++ b/castor-2.1.9/tape/writelbl.c
@@ -14,15 +14,18 @@
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
+#if !defined(__APPLE__)
 #include <sys/types.h>
 #include "Ctape.h"
 #include "Ctape_api.h"
+#endif
 #include "serrno.h"
 int writelbl(tapefd, path, lblbuf)
 int tapefd;
 char *path;
 char *lblbuf;
 {
+#if !defined(__APPLE__)
        char func[16];
        int n;
 
@@ -32,4 +35,7 @@ char *lblbuf;
                RETURN (-1);
        }
        RETURN (n);
+#else
+       return -1;
+#endif
 }
diff --git a/castor-2.1.9/tape/tperror.c b/castor-2.1.9/tape/tperror.c
index a12c372..05484b8 100644
--- a/castor-2.1.9/tape/tperror.c
+++ b/castor-2.1.9/tape/tperror.c
@@ -28,7 +28,9 @@
 #include "Ctape_api.h"
 #include "serrno.h"
 
+#if defined(linux)
 #include <linux/mtio.h> 
+#endif
 #ifndef MTIOCSENSE
 #include "mtio_add.h"
 #endif
@@ -74,6 +76,7 @@ int tapefd;
 char *path;
 char **msgaddr;
 {
+#if !defined(__APPLE__)
 #ifndef NOTRACE
        extern char *devtype;
 #else
@@ -155,6 +158,9 @@ char **msgaddr;
 
        errno = save_errno;
        RETURN (rc);
+#else
+       return -1;
+#endif
 }
 
 
diff --git a/castor-2.1.9/tape/wrttpmrk.c b/castor-2.1.9/tape/wrttpmrk.c
index 6433554..8514a29 100644
--- a/castor-2.1.9/tape/wrttpmrk.c
+++ b/castor-2.1.9/tape/wrttpmrk.c
@@ -20,7 +20,7 @@
 #else
 #if defined(_WIN32)
 #include <windows.h>
-#else
+#elif !defined(__APPLE__)
 #include <sys/ioctl.h>
 #include <sys/mtio.h>
 #endif
diff --git a/castor-2.1.9/h/mtio_add.h b/castor-2.1.9/h/mtio_add.h
index 13c15fd..9bad12f 100644
--- a/castor-2.1.9/h/mtio_add.h
+++ b/castor-2.1.9/h/mtio_add.h
@@ -21,6 +21,12 @@
 #ifndef _MTIO_ADD_H
 #define _MTIO_ADD_H
 
+#if defined(__APPLE__)
+#include <stdint.h>
+#define __u16 uint16_t
+#define __u8  uint8_t
+#define __s32 uint32_t
+#endif
 /* structure for MTIOCSENSE - mag tape get sense data */
 #define MTIOCSENSE_SENSE_LENGTH 252
 #define MTIOCSENSE_CDB_LENGTH   16
diff --git a/castor-2.1.9/tape/tperror.c b/castor-2.1.9/tape/tperror.c
index 05484b8..ece28fc 100644
--- a/castor-2.1.9/tape/tperror.c
+++ b/castor-2.1.9/tape/tperror.c
@@ -35,6 +35,7 @@
 #include "mtio_add.h"
 #endif
 
+#if !defined(__APPLE__)
 static char bbot[] = "BOT hit";
 struct sk_info {
        char *text;
@@ -70,7 +71,7 @@ int mt_rescnt;
 static char tp_err_msgbuf[TPERRMSGBUSZ];
 
 int get_sk_msg(char *, int, int, int, char **);
-
+#endif
 int gettperror(tapefd, path, msgaddr)
 int tapefd;
 char *path;
diff --git a/castor-2.1.9/tape/tperror.c b/castor-2.1.9/tape/tperror.c
index ece28fc..24b09b0 100644
--- a/castor-2.1.9/tape/tperror.c
+++ b/castor-2.1.9/tape/tperror.c
@@ -172,6 +172,7 @@ int asc;
 int ascq;
 char **msgaddr;
 {
+#if !defined(__APPLE__)
        int rc;
        if (key >= 0 && key < 15) {
                if (asc == 0 && ascq == 0) {
@@ -194,6 +195,9 @@ char **msgaddr;
                rc = -1;
        }
        return (rc);
+#else
+       return (-1);
+#endif
 }
 
 int rpttperror(func, tapefd, path, cmd)
@@ -202,6 +206,7 @@ int tapefd;
 char *path;
 char *cmd;
 {
+#if !defined(__APPLE__)
        char *msgaddr;
        int rc;
 
@@ -213,4 +218,7 @@ char *cmd;
        }
        usrmsg (func, TP042, path, cmd, msgaddr);
        return (rc);
+#else
+       return (-1);
+#endif
 }
diff --git a/castor-2.1.9/common/sendscsicmd.c b/castor-2.1.9/common/sendscsicmd.c
index 0234960..fb28c63 100644
--- a/castor-2.1.9/common/sendscsicmd.c
+++ b/castor-2.1.9/common/sendscsicmd.c
@@ -12,7 +12,7 @@
  *              0      if successful with no data transfer
  *             >0      number of bytes transferred
  */
-
+#if !defined(__APPLE__)
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <stdio.h>
@@ -350,3 +350,27 @@ char **msgaddr;
                }
        }
 }
+#else
+// dummy implementation for unsupported platforms.
+// Maybe the if should just be inverted.
+void find_sgpath(char *sgpath, int maj, int min) {}
+int send_scsi_cmd (tapefd, path, do_not_open, cdb, cdblen, buffer, buflen, sense, senselen, timeout, flags, nb_sense_ret, msgaddr)
+int tapefd;
+char *path;
+int do_not_open;
+unsigned char *cdb;
+int cdblen;
+unsigned char *buffer;
+int buflen;
+char *sense;
+int senselen;
+int timeout;    /* in milliseconds */
+int flags;
+int *nb_sense_ret;
+char **msgaddr;
+{return -1;}
+void get_ss_msg(scsi_status, msgaddr)
+int scsi_status;
+char **msgaddr;
+{}
+#endif
diff --git a/castor-2.1.9/config/Imake.rules b/castor-2.1.9/config/Imake.rules
index 7d327c5..da40eb6 100644
--- a/castor-2.1.9/config/Imake.rules
+++ b/castor-2.1.9/config/Imake.rules
@@ -169,7 +169,7 @@ ProgramTarget(program,objects,deplibs,libs,mode,tape,tape)
 #define BuildRPathcastorns commonRPath securityRPath upvRPath
 #define BuildRPathcastorclient commonRPath securityRPath upvRPath dlfRPath nsRPath
 #define BuildRPathcastorexpert commonRPath upvRPath nsRPath vmgrRPath vdqmRPath
-#define BuildRPathcastorrtcopy commonRPath dlfRPath castorRPath 
+#define BuildRPathcastorrtcopy commonRPath rfioRPath dlfRPath castorRPath 
 #define BuildRPathcastorrfio commonRPath securityRPath castorRPath dlfRPath nsRPath
 #define BuildRPathcastortape commonRPath securityRPath rfioRPath vmgrRPath upvRPath castorRPath vdqmRPath nsRPath
 #define BuildRPathcastormonitor commonRPath castorRPath
diff --git a/castor-2.1.9/Imakefile b/castor-2.1.9/Imakefile
index 83e0d51..e3aba0b 100644
--- a/castor-2.1.9/Imakefile
+++ b/castor-2.1.9/Imakefile
@@ -34,7 +34,7 @@ doxygen: tools/doxyconfig
 .PHONY : client installclient tape installtape
 
 client: 
-       GotoSubdirs(upv ns client rfio vdqm vmgr security tape rtcopy shlib)
+       GotoSubdirs(upv ns client rfio vdqm vmgr security tape)
 
 installclient: checkDESTDIR checkVERSION client exportman
        GotoSubdirs(upv ns client rfio vdqm vmgr castor common tape rtcopy h shlib)
diff --git a/castor-2.1.9/Imakefile b/castor-2.1.9/Imakefile
index e3aba0b..0a30303 100644
--- a/castor-2.1.9/Imakefile
+++ b/castor-2.1.9/Imakefile
@@ -7,7 +7,7 @@ COMM
 COMM           Make CASTOR libraries and executables
 
 SUBDIRS = common dlf security upv ns rfio logprocessor \
-         expert rmc rtcopy client tape vdqm vmgr \
+         rmc client tape vdqm vmgr \
          hsmtools h castor gridftp2 shlib clips test
 
 clean: imakeclean
diff --git a/castor-2.1.9/shlib/Imakefile b/castor-2.1.9/shlib/Imakefile
index 1fb079d..7121b6f 100644
--- a/castor-2.1.9/shlib/Imakefile
+++ b/castor-2.1.9/shlib/Imakefile
@@ -15,7 +15,5 @@ DependsOnLibrary(tape,castortape)
 DependsOnLibrary(rfio,castorrfio)
 DependsOnLibrary(castor,castorclient)
 DependsOnLibrary(vdqm,castorvdqm)
-DependsOnLibrary(rtcopy,castorrtcopy)
 DependsOnLibrary(vmgr,castorvmgr)
-DependsOnLibrary(expert,castorexpert)
 ClientSharedLibraryTarget(shift,,$(DEPLIB),$(LIBS))
#	Content
1	diff --git a/castor-2.1.9/rfio/open.c b/castor-2.1.9/rfio/open.c
2	index d04975e..050dd6e 100644
3	--- a/castor-2.1.9/rfio/open.c
4	+++ b/castor-2.1.9/rfio/open.c
5	@@ -235,7 +235,7 @@ int rfio_open_ext(filepath, flags, mode,uid,gid,passwd,reqhost,vmstr)
6	int rt ; /* daemon in site(0) or not (1) */
7	int bufsize ; /* socket buffer size */
8	struct sockaddr_in to;
9	-#if (defined(_AIX) \|\| defined(linux))
10	+#if (defined(_AIX) \|\| defined(linux) \|\| defined(__APPLE__))
11	socklen_t tolen;
12	#else
13	int tolen;
14	diff --git a/castor-2.1.9/rfio/open64.c b/castor-2.1.9/rfio/open64.c
15	index a52900e..4a093ac 100644
16	--- a/castor-2.1.9/rfio/open64.c
17	+++ b/castor-2.1.9/rfio/open64.c
18	@@ -125,7 +125,7 @@ int rfio_open64_ext(filepath, flags, mode,uid,gid,passwd,reqhost)
19	int rt ; /* daemon in site(0) or not (1) */
20	int bufsize ; /* socket buffer size */
21	struct sockaddr_in to;
22	-#if (defined(_AIX) \|\| defined(linux))
23	+#if (defined(_AIX) \|\| defined(linux) \|\| defined(__APPLE__))
24	socklen_t tolen;
25	#else
26	int tolen;
27	diff --git a/castor-2.1.9/castor/db/newora/OraCnvSvc.cpp b/castor-2.1.9/castor/db/newora/OraCnvSvc.cpp
28	index 9e4fc9b..cc6beb2 100644
29	--- a/castor-2.1.9/castor/db/newora/OraCnvSvc.cpp
30	+++ b/castor-2.1.9/castor/db/newora/OraCnvSvc.cpp
31	@@ -98,6 +98,21 @@ const unsigned int castor::db::ora::OraCnvSvc::getPhysRepType() const {
32	return castor::REP_ORACLE;
33	}
34
35	+#if defined (__APPLE__)
36	+#include <mach/mach.h>
37	+#include <sys/resource.h>
38	+#endif
39	+static int gettid()
40	+{
41	+#if defined(__APPLE__)
42	+return mach_thread_self();
43	+#elif defined(linux)
44	+ return syscall(__NR_gettid);
45	+#else
46	+return -ENOSYS;
47	+#endif
48	+}
49	+
50	//------------------------------------------------------------------------------
51	// getConnection
52	//------------------------------------------------------------------------------
53	@@ -224,7 +239,7 @@ oracle::occi::Connection* castor::db::ora::OraCnvSvc::getConnection()
54	// for logging/debugging purposes, we set an identifier for this session
55	std::ostringstream ss;
56	ss << "BEGIN DBMS_APPLICATION_INFO.SET_CLIENT_INFO('CASTOR pid="
57	- << getpid() << " tid=" << syscall(__NR_gettid) << "'); END;"; // gettid() is not defined???
58	+ << getpid() << " tid=" << gettid() << "'); END;"; // gettid() is not defined???
59	stmt = m_connection->createStatement(ss.str());
60	stmt->executeUpdate();
61	m_connection->terminateStatement(stmt);
62	diff --git a/castor-2.1.9/dlf/dlf_lib.c b/castor-2.1.9/dlf/dlf_lib.c
63	index ab00541..ea3ad26 100644
64	--- a/castor-2.1.9/dlf/dlf_lib.c
65	+++ b/castor-2.1.9/dlf/dlf_lib.c
66	@@ -368,6 +368,21 @@ int DLL_DECL dlf_write(Cuuid_t reqid,
67	return (rv);
68	}
69
70	+#if defined (__APPLE__)
71	+#include <mach/mach.h>
72	+#include <sys/resource.h>
73	+#endif
74	+static int gettid()
75	+{
76	+#if defined(__APPLE__)
77	+return mach_thread_self();
78	+#elif defined(linux)
79	+ return syscall(__NR_gettid);
80	+#else
81	+return -ENOSYS;
82	+#endif
83	+}
84	+
85
86	/*---------------------------------------------------------------------------
87	* dlf_writep
88	@@ -426,7 +441,7 @@ int DLL_DECL dlf_writep(Cuuid_t reqid,
89
90	buffer[0] = '\0';
91	len = snprintf(buffer, maxmsglen - len, "LVL=%s TID=%d MSG=\"%s\" ",
92	- prioritylist[priority].text, (int)syscall(__NR_gettid),
93	+ prioritylist[priority].text, gettid(),
94	messages[msgno]);
95
96	/* Append the request uuid if defined */
97	diff --git a/castor-2.1.9/castor/io/biniostream.h b/castor-2.1.9/castor/io/biniostream.h
98	index 15771f1..10f9b8f 100644
99	--- a/castor-2.1.9/castor/io/biniostream.h
100	+++ b/castor-2.1.9/castor/io/biniostream.h
101	@@ -28,7 +28,12 @@
102	#define IO_BINIOSTREAM_H 1
103
104	#include <sstream>
105	+#if defined(__APPLE__)
106	+#include <machine/endian.h>
107	+#include <machine/byte_order.h>
108	+#else
109	#include <byteswap.h>
110	+#endif
111	#include "osdep.h"
112	#include "castor/exception/OutOfMemory.hpp"
113	#include <string.h>
114	diff --git a/castor-2.1.9/tape/getcompstat.c b/castor-2.1.9/tape/getcompstat.c
115	index 2214e32..41ffb49 100644
116	--- a/castor-2.1.9/tape/getcompstat.c
117	+++ b/castor-2.1.9/tape/getcompstat.c
118	@@ -24,7 +24,7 @@ char *path;
119	char *devtype;
120	COMPRESSION_STATS *comp_stats;
121	{
122	-#if defined(ADSTAR) \|\| defined(SOLARIS25) \|\| defined(sgi) \|\| defined(hpux) \|\| (defined(__osf__) && defined(__alpha)) \|\| defined(linux)
123	+#if defined(ADSTAR) \|\| defined(SOLARIS25) \|\| defined(sgi) \|\| defined(hpux) \|\| (defined(__osf__) && defined(__alpha)) \|\| defined(linux) \|\| defined(__APPLE__)
124	unsigned long kbytes_from_host;
125	unsigned long kbytes_to_tape;
126	unsigned long kbytes_from_tape;
127	diff --git a/castor-2.1.9/tape/getcompstat.c b/castor-2.1.9/tape/getcompstat.c
128	index 41ffb49..83e701b 100644
129	--- a/castor-2.1.9/tape/getcompstat.c
130	+++ b/castor-2.1.9/tape/getcompstat.c
131	@@ -245,7 +245,7 @@ int tapefd;
132	char *path;
133	char *devtype;
134	{
135	-#if defined(ADSTAR) \|\| defined(SOLARIS25) \|\| defined(sgi) \|\| defined(hpux) \|\| (defined(__osf__) && defined(__alpha)) \|\| defined(linux)
136	+#if defined(ADSTAR) \|\| defined(SOLARIS25) \|\| defined(sgi) \|\| defined(hpux) \|\| (defined(__osf__) && defined(__alpha)) \|\| defined(linux) \|\| defined(__APPLE__)
137	#if defined(ADSTAR)
138	struct sc_iocmd sc_iocmd;
139
140	diff --git a/castor-2.1.9/vmgr/vmgr_modifytape.c b/castor-2.1.9/vmgr/vmgr_modifytape.c
141	index 33cc60a..3b1240a 100644
142	--- a/castor-2.1.9/vmgr/vmgr_modifytape.c
143	+++ b/castor-2.1.9/vmgr/vmgr_modifytape.c
144	@@ -21,7 +21,7 @@
145	int vmgr_modifytape(const char vid, char vsn, char library, char density, char lbltype, char manufacturer, char sn, char poolname, int status)
146	{
147	int c;
148	- char func[15];
149	+ char func[16];
150	gid_t gid;
151	int msglen;
152	char *q;
153	diff --git a/castor-2.1.9/tape/rwndtape.c b/castor-2.1.9/tape/rwndtape.c
154	index 3cd0905..3d9feb2 100644
155	--- a/castor-2.1.9/tape/rwndtape.c
156	+++ b/castor-2.1.9/tape/rwndtape.c
157	@@ -20,7 +20,7 @@
158	#else
159	#if defined(_WIN32)
160	#include <windows.h>
161	-#else
162	+#elif !defined(__APPLE__)
163	#include <sys/ioctl.h>
164	#include <sys/mtio.h>
165	#endif
166	@@ -36,6 +36,7 @@ int tapefd;
167	#endif
168	char *path;
169	{
170	+#if !defined(__APPLE__)
171	char func[16];
172	#if !defined(_WIN32)
173	struct mtop mtop;
174	@@ -52,5 +53,6 @@ char *path;
175	serrno = rpttperror (func, tapefd, path, "ioctl");
176	RETURN (-1);
177	}
178	+#endif
179	RETURN (0);
180	}
181	diff --git a/castor-2.1.9/tape/skiptape.c b/castor-2.1.9/tape/skiptape.c
182	index 16c747d..711ee01 100644
183	--- a/castor-2.1.9/tape/skiptape.c
184	+++ b/castor-2.1.9/tape/skiptape.c
185	@@ -5,11 +5,13 @@
186	#include <errno.h>
187	#include <string.h>
188	#include <stdio.h>
189	+#if defined(linux)
190	#include <sys/types.h>
191	#include <sys/ioctl.h>
192	#include <sys/mtio.h>
193	#include <linux/version.h>
194	#include <sys/utsname.h>
195	+#endif
196	#include "Ctape.h"
197	#include "Ctape_api.h"
198	#include "serrno.h"
199	@@ -17,6 +19,7 @@
200	extern int mt_rescnt;
201
202	int skiptpfff(int tapefd, char *path, int n) {
203	+#if defined(linux)
204
205	/* skip n files forward */
206
207	@@ -59,10 +62,13 @@ int skiptpfff(int tapefd, char *path, int n) {
208	tobeskipped -= count;
209	}
210	RETURN (0);
211	+#else
212	+ return -1;
213	+#endif
214	}
215
216	int skiptpff(int tapefd, char *path, int n) {
217	-
218	+#if defined(linux)
219	/* skip n files forward */
220
221	int count;
222	@@ -83,10 +89,13 @@ int skiptpff(int tapefd, char *path, int n) {
223	tobeskipped -= count;
224	}
225	RETURN (0);
226	+#else
227	+ return -1;
228	+#endif
229	}
230
231	int skiptpfb(int tapefd, char *path, int n) {
232	-
233	+#if defined(linux)
234	/* skip n files backward */
235
236	int count;
237	@@ -107,10 +116,13 @@ int skiptpfb(int tapefd, char *path, int n) {
238	tobeskipped -= count;
239	}
240	RETURN (0);
241	+#else
242	+ return -1;
243	+#endif
244	}
245
246	int skiptprf(int tapefd, char *path, int n, int silent) {
247	-
248	+#if defined(linux)
249	/* skip n blocks forward */
250
251	int count;
252	@@ -133,10 +145,13 @@ int skiptprf(int tapefd, char *path, int n, int silent) {
253	tobeskipped -= count;
254	}
255	RETURN (0);
256	+#else
257	+ return -1;
258	+#endif
259	}
260
261	int skiptprb(int tapefd, char *path, int n) {
262	-
263	+#if defined(linux)
264	/* skip n blocks backward */
265
266	int count;
267	@@ -157,10 +172,13 @@ int skiptprb(int tapefd, char *path, int n) {
268	tobeskipped -= count;
269	}
270	RETURN (0);
271	+#else
272	+ return -1;
273	+#endif
274	}
275
276	int skip2eod(int tapefd, char *path) {
277	-
278	+#if defined(linux)
279	/* Skip to the end of data. */
280
281	char func[16];
282	@@ -175,4 +193,7 @@ int skip2eod(int tapefd, char *path) {
283	RETURN (-1);
284	}
285	RETURN (0);
286	+#else
287	+ return -1;
288	+#endif
289	}
290	diff --git a/castor-2.1.9/tape/unldtape.c b/castor-2.1.9/tape/unldtape.c
291	index 93c9b94..abb1686 100644
292	--- a/castor-2.1.9/tape/unldtape.c
293	+++ b/castor-2.1.9/tape/unldtape.c
294	@@ -36,6 +36,7 @@ int tapefd;
295	#endif
296	char *path;
297	{
298	+#if !defined(__APPLE__)
299	char func[16];
300	#if !defined(_WIN32)
301	struct mtop mtop;
302	@@ -57,5 +58,6 @@ char *path;
303	serrno = rpttperror (func, tapefd, path, "ioctl");
304	RETURN (-1);
305	}
306	+#endif // !defined(__APPLE__)
307	RETURN (0);
308	}
309	diff --git a/castor-2.1.9/tape/wrttpmrk.c b/castor-2.1.9/tape/wrttpmrk.c
310	index e04e9df..6433554 100644
311	--- a/castor-2.1.9/tape/wrttpmrk.c
312	+++ b/castor-2.1.9/tape/wrttpmrk.c
313	@@ -37,6 +37,7 @@ int tapefd;
314	char *path;
315	int n;
316	{
317	+#if !defined(__APPLE__)
318	char func[16];
319	#if !defined(_WIN32)
320	struct mtop mtop;
321	@@ -53,5 +54,6 @@ int n;
322	serrno = rpttperror (func, tapefd, path, "ioctl");
323	RETURN (-1);
324	}
325	+#endif // !defined(__APPLE__)
326	RETURN (0);
327	}
328	diff --git a/castor-2.1.9/tape/readlbl.c b/castor-2.1.9/tape/readlbl.c
329	index 8a73801..c68f3e5 100644
330	--- a/castor-2.1.9/tape/readlbl.c
331	+++ b/castor-2.1.9/tape/readlbl.c
332	@@ -16,8 +16,10 @@
333	#include <sys/types.h>
334	#include <unistd.h>
335	#include <stdio.h>
336	+#if !defined(__APPLE__)
337	#include <sys/mtio.h>
338	#include <sys/utsname.h>
339	+#endif
340	#include "Ctape.h"
341	#include "Ctape_api.h"
342	#include "serrno.h"
343	@@ -30,6 +32,7 @@ int tapefd;
344	char *path;
345	char *lblbuf;
346	{
347	+#if !defined(__APPLE__)
348	/* int errcat; */
349	char func[16];
350	char *msgaddr;
351	@@ -142,4 +145,7 @@ char *lblbuf;
352	RETURN (1);
353	}
354	RETURN (0);
355	+#else
356	+ RETURN (-1);
357	+#endif
358	}
359	diff --git a/castor-2.1.9/tape/tperror.c b/castor-2.1.9/tape/tperror.c
360	index 1d38749..a12c372 100644
361	--- a/castor-2.1.9/tape/tperror.c
362	+++ b/castor-2.1.9/tape/tperror.c
363	@@ -21,7 +21,9 @@
364	#include <stdlib.h>
365	#include <stdio.h>
366	#include <sys/types.h>
367	+#if !defined(__APPLE__)
368	#include <sys/ioctl.h>
369	+#endif
370	#include "Ctape.h"
371	#include "Ctape_api.h"
372	#include "serrno.h"
373	diff --git a/castor-2.1.9/tape/skiptape.c b/castor-2.1.9/tape/skiptape.c
374	index 711ee01..6c79d99 100644
375	--- a/castor-2.1.9/tape/skiptape.c
376	+++ b/castor-2.1.9/tape/skiptape.c
377	@@ -11,12 +11,12 @@
378	#include <sys/mtio.h>
379	#include <linux/version.h>
380	#include <sys/utsname.h>
381	-#endif
382	#include "Ctape.h"
383	#include "Ctape_api.h"
384	#include "serrno.h"
385
386	extern int mt_rescnt;
387	+#endif
388
389	int skiptpfff(int tapefd, char *path, int n) {
390	#if defined(linux)
391	diff --git a/castor-2.1.9/tape/writelbl.c b/castor-2.1.9/tape/writelbl.c
392	index ab23c1f..6a891f0 100644
393	--- a/castor-2.1.9/tape/writelbl.c
394	+++ b/castor-2.1.9/tape/writelbl.c
395	@@ -14,15 +14,18 @@
396	#include <errno.h>
397	#include <string.h>
398	#include <unistd.h>
399	+#if !defined(__APPLE__)
400	#include <sys/types.h>
401	#include "Ctape.h"
402	#include "Ctape_api.h"
403	+#endif
404	#include "serrno.h"
405	int writelbl(tapefd, path, lblbuf)
406	int tapefd;
407	char *path;
408	char *lblbuf;
409	{
410	+#if !defined(__APPLE__)
411	char func[16];
412	int n;
413
414	@@ -32,4 +35,7 @@ char *lblbuf;
415	RETURN (-1);
416	}
417	RETURN (n);
418	+#else
419	+ return -1;
420	+#endif
421	}
422	diff --git a/castor-2.1.9/tape/tperror.c b/castor-2.1.9/tape/tperror.c
423	index a12c372..05484b8 100644
424	--- a/castor-2.1.9/tape/tperror.c
425	+++ b/castor-2.1.9/tape/tperror.c
426	@@ -28,7 +28,9 @@
427	#include "Ctape_api.h"
428	#include "serrno.h"
429
430	+#if defined(linux)
431	#include <linux/mtio.h>
432	+#endif
433	#ifndef MTIOCSENSE
434	#include "mtio_add.h"
435	#endif
436	@@ -74,6 +76,7 @@ int tapefd;
437	char *path;
438	char **msgaddr;
439	{
440	+#if !defined(__APPLE__)
441	#ifndef NOTRACE
442	extern char *devtype;
443	#else
444	@@ -155,6 +158,9 @@ char **msgaddr;
445
446	errno = save_errno;
447	RETURN (rc);
448	+#else
449	+ return -1;
450	+#endif
451	}
452
453
454	diff --git a/castor-2.1.9/tape/wrttpmrk.c b/castor-2.1.9/tape/wrttpmrk.c
455	index 6433554..8514a29 100644
456	--- a/castor-2.1.9/tape/wrttpmrk.c
457	+++ b/castor-2.1.9/tape/wrttpmrk.c
458	@@ -20,7 +20,7 @@
459	#else
460	#if defined(_WIN32)
461	#include <windows.h>
462	-#else
463	+#elif !defined(__APPLE__)
464	#include <sys/ioctl.h>
465	#include <sys/mtio.h>
466	#endif
467	diff --git a/castor-2.1.9/h/mtio_add.h b/castor-2.1.9/h/mtio_add.h
468	index 13c15fd..9bad12f 100644
469	--- a/castor-2.1.9/h/mtio_add.h
470	+++ b/castor-2.1.9/h/mtio_add.h
471	@@ -21,6 +21,12 @@
472	#ifndef _MTIO_ADD_H
473	#define _MTIO_ADD_H
474
475	+#if defined(__APPLE__)
476	+#include <stdint.h>
477	+#define __u16 uint16_t
478	+#define __u8 uint8_t
479	+#define __s32 uint32_t
480	+#endif
481	/* structure for MTIOCSENSE - mag tape get sense data */
482	#define MTIOCSENSE_SENSE_LENGTH 252
483	#define MTIOCSENSE_CDB_LENGTH 16
484	diff --git a/castor-2.1.9/tape/tperror.c b/castor-2.1.9/tape/tperror.c
485	index 05484b8..ece28fc 100644
486	--- a/castor-2.1.9/tape/tperror.c
487	+++ b/castor-2.1.9/tape/tperror.c
488	@@ -35,6 +35,7 @@
489	#include "mtio_add.h"
490	#endif
491
492	+#if !defined(__APPLE__)
493	static char bbot[] = "BOT hit";
494	struct sk_info {
495	char *text;
496	@@ -70,7 +71,7 @@ int mt_rescnt;
497	static char tp_err_msgbuf[TPERRMSGBUSZ];
498
499	int get_sk_msg(char , int, int, int, char *);
500	-
501	+#endif
502	int gettperror(tapefd, path, msgaddr)
503	int tapefd;
504	char *path;
505	diff --git a/castor-2.1.9/tape/tperror.c b/castor-2.1.9/tape/tperror.c
506	index ece28fc..24b09b0 100644
507	--- a/castor-2.1.9/tape/tperror.c
508	+++ b/castor-2.1.9/tape/tperror.c
509	@@ -172,6 +172,7 @@ int asc;
510	int ascq;
511	char **msgaddr;
512	{
513	+#if !defined(__APPLE__)
514	int rc;
515	if (key >= 0 && key < 15) {
516	if (asc == 0 && ascq == 0) {
517	@@ -194,6 +195,9 @@ char **msgaddr;
518	rc = -1;
519	}
520	return (rc);
521	+#else
522	+ return (-1);
523	+#endif
524	}
525
526	int rpttperror(func, tapefd, path, cmd)
527	@@ -202,6 +206,7 @@ int tapefd;
528	char *path;
529	char *cmd;
530	{
531	+#if !defined(__APPLE__)
532	char *msgaddr;
533	int rc;
534
535	@@ -213,4 +218,7 @@ char *cmd;
536	}
537	usrmsg (func, TP042, path, cmd, msgaddr);
538	return (rc);
539	+#else
540	+ return (-1);
541	+#endif
542	}
543	diff --git a/castor-2.1.9/common/sendscsicmd.c b/castor-2.1.9/common/sendscsicmd.c
544	index 0234960..fb28c63 100644
545	--- a/castor-2.1.9/common/sendscsicmd.c
546	+++ b/castor-2.1.9/common/sendscsicmd.c
547	@@ -12,7 +12,7 @@
548	* 0 if successful with no data transfer
549	* >0 number of bytes transferred
550	*/
551	-
552	+#if !defined(__APPLE__)
553	#include <unistd.h>
554	#include <sys/ioctl.h>
555	#include <stdio.h>
556	@@ -350,3 +350,27 @@ char **msgaddr;
557	}
558	}
559	}
560	+#else
561	+// dummy implementation for unsupported platforms.
562	+// Maybe the if should just be inverted.
563	+void find_sgpath(char *sgpath, int maj, int min) {}
564	+int send_scsi_cmd (tapefd, path, do_not_open, cdb, cdblen, buffer, buflen, sense, senselen, timeout, flags, nb_sense_ret, msgaddr)
565	+int tapefd;
566	+char *path;
567	+int do_not_open;
568	+unsigned char *cdb;
569	+int cdblen;
570	+unsigned char *buffer;
571	+int buflen;
572	+char *sense;
573	+int senselen;
574	+int timeout; /* in milliseconds */
575	+int flags;
576	+int *nb_sense_ret;
577	+char **msgaddr;
578	+{return -1;}
579	+void get_ss_msg(scsi_status, msgaddr)
580	+int scsi_status;
581	+char **msgaddr;
582	+{}
583	+#endif
584	diff --git a/castor-2.1.9/config/Imake.rules b/castor-2.1.9/config/Imake.rules
585	index 7d327c5..da40eb6 100644
586	--- a/castor-2.1.9/config/Imake.rules
587	+++ b/castor-2.1.9/config/Imake.rules
588	@@ -169,7 +169,7 @@ ProgramTarget(program,objects,deplibs,libs,mode,tape,tape)
589	#define BuildRPathcastorns commonRPath securityRPath upvRPath
590	#define BuildRPathcastorclient commonRPath securityRPath upvRPath dlfRPath nsRPath
591	#define BuildRPathcastorexpert commonRPath upvRPath nsRPath vmgrRPath vdqmRPath
592	-#define BuildRPathcastorrtcopy commonRPath dlfRPath castorRPath
593	+#define BuildRPathcastorrtcopy commonRPath rfioRPath dlfRPath castorRPath
594	#define BuildRPathcastorrfio commonRPath securityRPath castorRPath dlfRPath nsRPath
595	#define BuildRPathcastortape commonRPath securityRPath rfioRPath vmgrRPath upvRPath castorRPath vdqmRPath nsRPath
596	#define BuildRPathcastormonitor commonRPath castorRPath
597	diff --git a/castor-2.1.9/Imakefile b/castor-2.1.9/Imakefile
598	index 83e0d51..e3aba0b 100644
599	--- a/castor-2.1.9/Imakefile
600	+++ b/castor-2.1.9/Imakefile
601	@@ -34,7 +34,7 @@ doxygen: tools/doxyconfig
602	.PHONY : client installclient tape installtape
603
604	client:
605	- GotoSubdirs(upv ns client rfio vdqm vmgr security tape rtcopy shlib)
606	+ GotoSubdirs(upv ns client rfio vdqm vmgr security tape)
607
608	installclient: checkDESTDIR checkVERSION client exportman
609	GotoSubdirs(upv ns client rfio vdqm vmgr castor common tape rtcopy h shlib)
610	diff --git a/castor-2.1.9/Imakefile b/castor-2.1.9/Imakefile
611	index e3aba0b..0a30303 100644
612	--- a/castor-2.1.9/Imakefile
613	+++ b/castor-2.1.9/Imakefile
614	@@ -7,7 +7,7 @@ COMM
615	COMM Make CASTOR libraries and executables
616
617	SUBDIRS = common dlf security upv ns rfio logprocessor \
618	- expert rmc rtcopy client tape vdqm vmgr \
619	+ rmc client tape vdqm vmgr \
620	hsmtools h castor gridftp2 shlib clips test
621
622	clean: imakeclean
623	diff --git a/castor-2.1.9/shlib/Imakefile b/castor-2.1.9/shlib/Imakefile
624	index 1fb079d..7121b6f 100644
625	--- a/castor-2.1.9/shlib/Imakefile
626	+++ b/castor-2.1.9/shlib/Imakefile
627	@@ -15,7 +15,5 @@ DependsOnLibrary(tape,castortape)
628	DependsOnLibrary(rfio,castorrfio)
629	DependsOnLibrary(castor,castorclient)
630	DependsOnLibrary(vdqm,castorvdqm)
631	-DependsOnLibrary(rtcopy,castorrtcopy)
632	DependsOnLibrary(vmgr,castorvmgr)
633	-DependsOnLibrary(expert,castorexpert)
634	ClientSharedLibraryTarget(shift,,$(DEPLIB),$(LIBS))