[lcgdm/el4: 9/9] Update to version 1.8.1.2 Drop patches lcgdm-withsoname.patch and lcgdm-gsoap.patch (upstream)
Mattias Ellert
ellert at fedoraproject.org
Sun Sep 4 14:17:54 UTC 2011
commit 64c0333653ccd52359f458d03b408e083fb010d9
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sun Sep 4 16:14:33 2011 +0200
Update to version 1.8.1.2
Drop patches lcgdm-withsoname.patch and lcgdm-gsoap.patch (upstream)
.gitignore | 2 +-
lcgdm-condrestart.patch | 4662 +----------------------------------------------
lcgdm-dlopen.patch | 76 +-
lcgdm-gsoap.patch | 301 ---
lcgdm-ld.patch | 261 ---
lcgdm-paths.patch | 159 +-
lcgdm-race.patch | 118 ++-
lcgdm-shliblink.patch | 343 ++---
lcgdm-usr.patch | 400 ++---
lcgdm-withsoname.patch | 74 -
lcgdm.spec | 194 +--
sources | 2 +-
12 files changed, 672 insertions(+), 5920 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 37181ba..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/lcgdm-1.8.0.1.tar.gz
+/*.tar.gz
diff --git a/lcgdm-condrestart.patch b/lcgdm-condrestart.patch
index 783310d..48c1918 100644
--- a/lcgdm-condrestart.patch
+++ b/lcgdm-condrestart.patch
@@ -1,7 +1,7 @@
-diff -ur lcgdm-1.8.0.1.orig/dicomcopy/dicomcopyd.scripts.mysql lcgdm-1.8.0.1/dicomcopy/dicomcopyd.scripts.mysql
---- lcgdm-1.8.0.1.orig/dicomcopy/dicomcopyd.scripts.mysql 2010-12-20 11:39:59.000000000 +0100
-+++ lcgdm-1.8.0.1/dicomcopy/dicomcopyd.scripts.mysql 2010-12-29 13:03:04.995912975 +0100
-@@ -43,7 +43,7 @@
+diff -ur lcgdm-1.8.1.2.orig/rfio/rfiod.scripts lcgdm-1.8.1.2/rfio/rfiod.scripts
+--- lcgdm-1.8.1.2.orig/rfio/rfiod.scripts 2011-05-31 12:22:46.000000000 +0200
++++ lcgdm-1.8.1.2/rfio/rfiod.scripts 2011-09-03 10:10:32.937315657 +0200
+@@ -40,7 +40,7 @@
. /etc/rc.d/init.d/functions
DAEMON=daemon
FAILURE=failure
@@ -10,4563 +10,65 @@ diff -ur lcgdm-1.8.0.1.orig/dicomcopy/dicomcopyd.scripts.mysql lcgdm-1.8.0.1/dic
SUCCESS=success
ECHO_SUCCESS=echo_success
ECHO_END=echo
-@@ -102,14 +102,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5016|\*:dicomcopyd' | grep LISTEN | grep dicomcopyd > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5016|\*[:.]dicomcopyd' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dicomcopyd' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "dicomcopyd already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd already started: "
- RETVAL=0
-@@ -133,11 +127,12 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $DICOMCOPYDLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $DICOMCOPYDLOGFILE`
-@@ -155,10 +150,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "dicomcopyd not started: "
-- [ -n "$FAILURE" ] && $FAILURE "dicomcopyd not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -167,72 +162,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DICOMCOPYSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DICOMCOPYSHUTDOWN -f -h `hostname`
-- else
-- $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # dicomcopyd might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DICOMCOPYSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DICOMCOPYSHUTDOWN -f -h `hostname`
-- else
-- $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dicomcopyd already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "dicomcopyd already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -244,7 +216,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -253,15 +225,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/dicomcopy/dicomcopyd.scripts.oracle lcgdm-1.8.0.1/dicomcopy/dicomcopyd.scripts.oracle
---- lcgdm-1.8.0.1.orig/dicomcopy/dicomcopyd.scripts.oracle 2010-12-20 11:39:59.000000000 +0100
-+++ lcgdm-1.8.0.1/dicomcopy/dicomcopyd.scripts.oracle 2010-12-29 13:02:47.638152322 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -104,14 +104,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5016|\*:dicomcopyd' | grep LISTEN | grep dicomcopyd > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5016|\*[:.]dicomcopyd' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dicomcopyd' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "dicomcopyd already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd already started: "
- RETVAL=0
-@@ -135,13 +129,13 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ ! -d $ORACLE_HOME ]; then
- echo $ECHOOPT "No Oracle Client found: "
-- $FAILURE "No Oracle Client found: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
- RETVAL=1
- fi
-
-@@ -159,10 +153,11 @@
- ORACLECLIENT=`ldconfig -p | grep libclntsh`
- if [ "x${ORACLECLIENT}" == "x" ]; then
- echo $ECHOOPT "No Oracle Client installed: "
-- $FAILURE "No Oracle Client installed: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
- RETVAL=1
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $DICOMCOPYDLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $DICOMCOPYDLOGFILE`
-@@ -180,10 +175,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "dicomcopyd not started: "
-- [ -n "$FAILURE" ] && $FAILURE "dicomcopyd not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -192,72 +187,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DICOMCOPYSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DICOMCOPYSHUTDOWN -f -h `hostname`
-- else
-- $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # dicomcopyd might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DICOMCOPYSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DICOMCOPYSHUTDOWN -f -h `hostname`
-- else
-- $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dicomcopyd already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "dicomcopyd already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -269,7 +241,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -278,15 +250,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/dicomcopy/dicomcopyd.scripts.postgresql lcgdm-1.8.0.1/dicomcopy/dicomcopyd.scripts.postgresql
---- lcgdm-1.8.0.1.orig/dicomcopy/dicomcopyd.scripts.postgresql 2010-12-20 11:39:59.000000000 +0100
-+++ lcgdm-1.8.0.1/dicomcopy/dicomcopyd.scripts.postgresql 2010-12-29 13:02:28.751412751 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -102,14 +102,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5016|\*:dicomcopyd' | grep LISTEN | grep dicomcopyd > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5016|\*[:.]dicomcopyd' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dicomcopyd' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "dicomcopyd already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd already started: "
- RETVAL=0
-@@ -133,11 +127,12 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $DICOMCOPYDLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $DICOMCOPYDLOGFILE`
-@@ -155,10 +150,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "dicomcopyd not started: "
-- [ -n "$FAILURE" ] && $FAILURE "dicomcopyd not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -167,72 +162,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DICOMCOPYSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DICOMCOPYSHUTDOWN -f -h `hostname`
-- else
-- $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # dicomcopyd might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DICOMCOPYSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DICOMCOPYSHUTDOWN -f -h `hostname`
-- else
-- $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dicomcopyd already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "dicomcopyd already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -244,7 +216,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -253,15 +225,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/dli/lfc-dli.scripts lcgdm-1.8.0.1/dli/lfc-dli.scripts
---- lcgdm-1.8.0.1.orig/dli/lfc-dli.scripts 2010-12-20 11:40:00.000000000 +0100
-+++ lcgdm-1.8.0.1/dli/lfc-dli.scripts 2010-12-29 13:02:15.189599754 +0100
-@@ -42,7 +42,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -100,14 +100,8 @@
- X509_USER_KEY=/etc/grid-security/$LFCUSER/lfckey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:8085|\*:lfc-dli' | grep LISTEN | grep lfc-dli > /dev/null
-- else
-- netstat -a | egrep '\*[:.]8085|\*[:.]lfc-dli' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 lfc-dli' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfc-dli$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "lfc-dli already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfc-dli already started: "
- RETVAL=0
-@@ -130,6 +124,7 @@
- fi
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $DLIDAEMONLOGFILE`
- chown $LFCUSER:$LFCGROUP `dirname $DLIDAEMONLOGFILE`
-@@ -143,10 +138,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "lfc-dli not started: "
-- [ -n "$FAILURE" ] && $FAILURE "lfc-dli not started: "
-++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -155,84 +150,61 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DLISHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DLISHUTDOWN -f -h `hostname`
-- else
-- $DLISHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DLISHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # lfc-dli might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfc-dli$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DLISHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DLISHUTDOWN -f -h `hostname`
-- else
-- $DLISHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DLISHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "lfc-dli already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfc-dli already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "lfc-dli already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfc-dli already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-- lpid="X"
-- while [ "x$lpid" != "x" ]; do
-- sleep 1
-- #Does not seem to work on SunOS ;-)
-- lpid=`ps -eo pid,ppid,$format4comm | grep " 1 lfc-dli$" | awk '{print $1}'`
-- done
-+ lpid="X"
-+ while [ "x$lpid" != "x" ]; do
-+ sleep 1
-+ #Does not seem to work on SunOS ;-)
-+ lpid=`ps -eo pid,ppid,$format4comm | grep " 1 lfc-dli$" | awk '{print $1}'`
-+ done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -241,15 +213,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/dpm/dpm.scripts.mysql lcgdm-1.8.0.1/dpm/dpm.scripts.mysql
---- lcgdm-1.8.0.1.orig/dpm/dpm.scripts.mysql 2010-12-20 11:39:52.000000000 +0100
-+++ lcgdm-1.8.0.1/dpm/dpm.scripts.mysql 2010-12-29 13:01:03.351590305 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -102,14 +102,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5015|\*:dpm' | grep LISTEN | grep dpm > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5015|\*[:.]dpm' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpm' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "dpm already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm already started: "
- RETVAL=0
-@@ -132,11 +126,12 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $DPMDAEMONLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $DPMDAEMONLOGFILE`
-@@ -156,10 +151,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "dpm not started: "
-- [ -n "$FAILURE" ] && $FAILURE "dpm not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -168,72 +163,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPMSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPMSHUTDOWN -f -h `hostname`
-- else
-- $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # dpm might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPMSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPMSHUTDOWN -f -h `hostname`
-- else
-- $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpm already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "dpm already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -245,7 +217,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -254,15 +226,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/dpm/dpm.scripts.oracle lcgdm-1.8.0.1/dpm/dpm.scripts.oracle
---- lcgdm-1.8.0.1.orig/dpm/dpm.scripts.oracle 2010-12-20 11:39:52.000000000 +0100
-+++ lcgdm-1.8.0.1/dpm/dpm.scripts.oracle 2010-12-29 13:00:50.246770998 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -104,14 +104,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5015|\*:dpm' | grep LISTEN | grep dpm > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5015|\*[:.]dpm' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpm' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "dpm already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm already started: "
- RETVAL=0
-@@ -134,13 +128,13 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ ! -d $ORACLE_HOME ]; then
- echo $ECHOOPT "No Oracle Client found: "
-- $FAILURE "No Oracle Client found: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
- RETVAL=1
- fi
-
-@@ -158,10 +152,11 @@
- ORACLECLIENT=`ldconfig -p | grep libclntsh`
- if [ "x${ORACLECLIENT}" == "x" ]; then
- echo $ECHOOPT "No Oracle Client installed: "
-- $FAILURE "No Oracle Client installed: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
- RETVAL=1
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $DPMDAEMONLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $DPMDAEMONLOGFILE`
-@@ -181,10 +176,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "dpm not started: "
-- [ -n "$FAILURE" ] && $FAILURE "dpm not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -193,72 +188,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPMSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPMSHUTDOWN -f -h `hostname`
-- else
-- $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # dpm might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPMSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPMSHUTDOWN -f -h `hostname`
-- else
-- $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpm already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "dpm already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -270,7 +242,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -279,15 +251,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/dpm/dpm.scripts.postgresql lcgdm-1.8.0.1/dpm/dpm.scripts.postgresql
---- lcgdm-1.8.0.1.orig/dpm/dpm.scripts.postgresql 2010-12-20 11:39:52.000000000 +0100
-+++ lcgdm-1.8.0.1/dpm/dpm.scripts.postgresql 2010-12-29 13:00:35.979967717 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -102,14 +102,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5015|\*:dpm' | grep LISTEN | grep dpm > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5015|\*[:.]dpm' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpm' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "dpm already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm already started: "
- RETVAL=0
-@@ -132,11 +126,12 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $DPMDAEMONLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $DPMDAEMONLOGFILE`
-@@ -156,10 +151,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "dpm not started: "
-- [ -n "$FAILURE" ] && $FAILURE "dpm not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -168,72 +163,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPMSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPMSHUTDOWN -f -h `hostname`
-- else
-- $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # dpm might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPMSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPMSHUTDOWN -f -h `hostname`
-- else
-- $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpm already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "dpm already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -245,7 +217,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -254,15 +226,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/dpmcopy/dpmcopyd.scripts.mysql lcgdm-1.8.0.1/dpmcopy/dpmcopyd.scripts.mysql
---- lcgdm-1.8.0.1.orig/dpmcopy/dpmcopyd.scripts.mysql 2010-12-20 11:39:55.000000000 +0100
-+++ lcgdm-1.8.0.1/dpmcopy/dpmcopyd.scripts.mysql 2010-12-29 13:01:59.767812401 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -102,14 +102,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5017|\*:dpmcopyd' | grep LISTEN | grep dpmcopyd > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5017|\*[:.]dpmcopyd' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpmcopyd' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "dpmcopyd already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd already started: "
- RETVAL=0
-@@ -133,11 +127,12 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $DPMCOPYDLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $DPMCOPYDLOGFILE`
-@@ -155,10 +150,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "dpmcopyd not started: "
-- [ -n "$FAILURE" ] && $FAILURE "dpmcopyd not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -167,72 +162,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPMCOPYSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPMCOPYSHUTDOWN -f -h `hostname`
-- else
-- $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # dpmcopyd might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPMCOPYSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPMCOPYSHUTDOWN -f -h `hostname`
-- else
-- $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpmcopyd already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "dpmcopyd already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -244,7 +216,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -253,15 +225,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/dpmcopy/dpmcopyd.scripts.oracle lcgdm-1.8.0.1/dpmcopy/dpmcopyd.scripts.oracle
---- lcgdm-1.8.0.1.orig/dpmcopy/dpmcopyd.scripts.oracle 2010-12-20 11:39:55.000000000 +0100
-+++ lcgdm-1.8.0.1/dpmcopy/dpmcopyd.scripts.oracle 2010-12-29 13:01:44.989016181 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -104,14 +104,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5017|\*:dpmcopyd' | grep LISTEN | grep dpmcopyd > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5017|\*[:.]dpmcopyd' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpmcopyd' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "dpmcopyd already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd already started: "
- RETVAL=0
-@@ -135,13 +129,13 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ ! -d $ORACLE_HOME ]; then
- echo $ECHOOPT "No Oracle Client found: "
-- $FAILURE "No Oracle Client found: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
- RETVAL=1
- fi
-
-@@ -159,11 +153,12 @@
- ORACLECLIENT=`ldconfig -p | grep libclntsh`
- if [ "x${ORACLECLIENT}" == "x" ]; then
- echo $ECHOOPT "No Oracle Client installed: "
-- $FAILURE "No Oracle Client installed: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
- RETVAL=1
- fi
-
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $DPMCOPYDLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $DPMCOPYDLOGFILE`
-@@ -181,10 +176,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "dpmcopyd not started: "
-- [ -n "$FAILURE" ] && $FAILURE "dpmcopyd not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -193,72 +188,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPMCOPYSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPMCOPYSHUTDOWN -f -h `hostname`
-- else
-- $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # dpmcopyd might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPMCOPYSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPMCOPYSHUTDOWN -f -h `hostname`
-- else
-- $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpmcopyd already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "dpmcopyd already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -270,7 +242,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -279,15 +251,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/dpmcopy/dpmcopyd.scripts.postgresql lcgdm-1.8.0.1/dpmcopy/dpmcopyd.scripts.postgresql
---- lcgdm-1.8.0.1.orig/dpmcopy/dpmcopyd.scripts.postgresql 2010-12-20 11:39:55.000000000 +0100
-+++ lcgdm-1.8.0.1/dpmcopy/dpmcopyd.scripts.postgresql 2010-12-29 13:01:20.062359887 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -102,14 +102,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5017|\*:dpmcopyd' | grep LISTEN | grep dpmcopyd > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5017|\*[:.]dpmcopyd' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpmcopyd' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "dpmcopyd already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd already started: "
- RETVAL=0
-@@ -133,11 +127,12 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $DPMCOPYDLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $DPMCOPYDLOGFILE`
-@@ -155,10 +150,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "dpmcopyd not started: "
-- [ -n "$FAILURE" ] && $FAILURE "dpmcopyd not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -167,72 +162,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPMCOPYSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPMCOPYSHUTDOWN -f -h `hostname`
-- else
-- $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # dpmcopyd might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPMCOPYSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPMCOPYSHUTDOWN -f -h `hostname`
-- else
-- $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpmcopyd already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "dpmcopyd already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -244,7 +216,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -253,15 +225,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/ns/dpnsdaemon.scripts.mysql lcgdm-1.8.0.1/ns/dpnsdaemon.scripts.mysql
---- lcgdm-1.8.0.1.orig/ns/dpnsdaemon.scripts.mysql 2010-12-20 11:39:59.000000000 +0100
-+++ lcgdm-1.8.0.1/ns/dpnsdaemon.scripts.mysql 2010-12-29 12:58:39.514573554 +0100
-@@ -38,7 +38,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -97,14 +97,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5010|\*:dpns' | grep LISTEN | grep dpnsdaemon > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5010|\*[:.]dpns' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpnsdaemon' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpnsdaemon$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "dpnsdaemon already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon already started: "
- RETVAL=0
-@@ -126,11 +120,12 @@
- fi
- fi
- if [ ! -s "$NSCONFIGFILE" ]; then
-- echo "FAILED : config file $NSCONFIGFILE empty"
-+ echo $ECHOOPT "config file $NSCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $NSCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $DPNSDAEMONLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $DPNSDAEMONLOGFILE`
-@@ -148,10 +143,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "dpnsdaemon not started: "
-- [ -n "$FAILURE" ] && $FAILURE "dpnsdaemon not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -160,72 +155,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPNSSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPNSSHUTDOWN -f -h `hostname`
-- else
-- $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # dpnsdaemon might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpnsdaemon$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPNSSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPNSSHUTDOWN -f -h `hostname`
-- else
-- $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpnsdaemon already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "dpnsdaemon already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -237,7 +209,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -246,15 +218,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/ns/dpnsdaemon.scripts.oracle lcgdm-1.8.0.1/ns/dpnsdaemon.scripts.oracle
---- lcgdm-1.8.0.1.orig/ns/dpnsdaemon.scripts.oracle 2010-12-20 11:39:59.000000000 +0100
-+++ lcgdm-1.8.0.1/ns/dpnsdaemon.scripts.oracle 2010-12-29 12:58:22.389809665 +0100
-@@ -38,7 +38,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -99,14 +99,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5010|\*:dpns' | grep LISTEN | grep dpnsdaemon > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5010|\*[:.]dpns' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpnsdaemon' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpnsdaemon$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "dpnsdaemon already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon already started: "
- RETVAL=0
-@@ -128,13 +122,13 @@
- fi
- fi
- if [ ! -s "$NSCONFIGFILE" ]; then
-- echo "FAILED : config file $NSCONFIGFILE empty"
-+ echo $ECHOOPT "config file $NSCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $NSCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ ! -d $ORACLE_HOME ]; then
- echo $ECHOOPT "No Oracle Client found: "
-- $FAILURE "No Oracle Client found: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
- RETVAL=1
- fi
-
-@@ -152,11 +146,12 @@
- ORACLECLIENT=`ldconfig -p | grep libclntsh`
- if [ "x${ORACLECLIENT}" == "x" ]; then
- echo $ECHOOPT "No Oracle Client installed: "
-- $FAILURE "No Oracle Client installed: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
- RETVAL=1
- fi
-
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $DPNSDAEMONLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $DPNSDAEMONLOGFILE`
-@@ -174,10 +169,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "dpnsdaemon not started: "
-- [ -n "$FAILURE" ] && $FAILURE "dpnsdaemon not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -186,72 +181,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPNSSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPNSSHUTDOWN -f -h `hostname`
-- else
-- $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # dpnsdaemon might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpnsdaemon$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPNSSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPNSSHUTDOWN -f -h `hostname`
-- else
-- $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpnsdaemon already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "dpnsdaemon already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -263,7 +235,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -272,15 +244,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/ns/dpnsdaemon.scripts.postgresql lcgdm-1.8.0.1/ns/dpnsdaemon.scripts.postgresql
---- lcgdm-1.8.0.1.orig/ns/dpnsdaemon.scripts.postgresql 2010-12-20 11:39:59.000000000 +0100
-+++ lcgdm-1.8.0.1/ns/dpnsdaemon.scripts.postgresql 2010-12-29 12:57:55.867175350 +0100
-@@ -38,7 +38,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -97,14 +97,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5010|\*:dpns' | grep LISTEN | grep dpnsdaemon > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5010|\*[:.]dpns' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpnsdaemon' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpnsdaemon$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "dpnsdaemon already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon already started: "
- RETVAL=0
-@@ -126,11 +120,12 @@
- fi
- fi
- if [ ! -s "$NSCONFIGFILE" ]; then
-- echo "FAILED : config file $NSCONFIGFILE empty"
-+ echo $ECHOOPT "config file $NSCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $NSCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $DPNSDAEMONLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $DPNSDAEMONLOGFILE`
-@@ -148,10 +143,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "dpnsdaemon not started: "
-- [ -n "$FAILURE" ] && $FAILURE "dpnsdaemon not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -160,72 +155,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPNSSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPNSSHUTDOWN -f -h `hostname`
-- else
-- $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # dpnsdaemon might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpnsdaemon$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $DPNSSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $DPNSSHUTDOWN -f -h `hostname`
-- else
-- $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpnsdaemon already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "dpnsdaemon already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -237,7 +209,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -246,15 +218,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/ns/lfcdaemon.scripts.mysql lcgdm-1.8.0.1/ns/lfcdaemon.scripts.mysql
---- lcgdm-1.8.0.1.orig/ns/lfcdaemon.scripts.mysql 2010-12-20 11:39:59.000000000 +0100
-+++ lcgdm-1.8.0.1/ns/lfcdaemon.scripts.mysql 2010-12-29 12:57:38.233418478 +0100
-@@ -38,7 +38,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -97,14 +97,8 @@
- X509_USER_KEY=/etc/grid-security/$LFCUSER/lfckey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5010|\*:lfc' | grep LISTEN | grep lfcdaemon > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5010|\*[:.]lfc' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 lfcdaemon' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfcdaemon$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "lfcdaemon already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon already started: "
- RETVAL=0
-@@ -136,11 +130,12 @@
- fi
- fi
- if [ ! -s "$NSCONFIGFILE" ]; then
-- echo "FAILED : config file $NSCONFIGFILE empty"
-+ echo $ECHOOPT "config file $NSCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $NSCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $LFCDAEMONLOGFILE`
- chown $LFCUSER:$LFCGROUP `dirname $LFCDAEMONLOGFILE`
-@@ -158,10 +153,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "lfcdaemon not started: "
-- [ -n "$FAILURE" ] && $FAILURE "lfcdaemon not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -170,72 +165,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $LFCSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $LFCSHUTDOWN -f -h `hostname`
-- else
-- $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # lfcdaemon might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfcdaemon$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $LFCSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $LFCSHUTDOWN -f -h `hostname`
-- else
-- $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "lfcdaemon already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "lfcdaemon already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -247,7 +219,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -256,15 +228,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/ns/lfcdaemon.scripts.oracle lcgdm-1.8.0.1/ns/lfcdaemon.scripts.oracle
---- lcgdm-1.8.0.1.orig/ns/lfcdaemon.scripts.oracle 2010-12-20 11:39:59.000000000 +0100
-+++ lcgdm-1.8.0.1/ns/lfcdaemon.scripts.oracle 2010-12-29 12:57:22.746632001 +0100
-@@ -38,7 +38,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -99,14 +99,8 @@
- X509_USER_KEY=/etc/grid-security/$LFCUSER/lfckey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5010|\*:lfc' | grep LISTEN | grep lfcdaemon > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5010|\*[:.]lfc' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 lfcdaemon' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfcdaemon$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "lfcdaemon already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon already started: "
- RETVAL=0
-@@ -138,13 +132,13 @@
- fi
- fi
- if [ ! -s "$NSCONFIGFILE" ]; then
-- echo "FAILED : config file $NSCONFIGFILE empty"
-+ echo $ECHOOPT "config file $NSCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $NSCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ ! -d $ORACLE_HOME ]; then
- echo $ECHOOPT "No Oracle Client found: "
-- $FAILURE "No Oracle Client found: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
- RETVAL=1
- fi
-
-@@ -162,11 +156,12 @@
- ORACLECLIENT=`ldconfig -p | grep libclntsh`
- if [ "x${ORACLECLIENT}" == "x" ]; then
- echo $ECHOOPT "No Oracle Client installed: "
-- $FAILURE "No Oracle Client installed: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
- RETVAL=1
- fi
-
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $LFCDAEMONLOGFILE`
- chown $LFCUSER:$LFCGROUP `dirname $LFCDAEMONLOGFILE`
-@@ -184,10 +179,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "lfcdaemon not started: "
-- [ -n "$FAILURE" ] && $FAILURE "lfcdaemon not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -196,72 +191,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $LFCSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $LFCSHUTDOWN -f -h `hostname`
-- else
-- $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # lfcdaemon might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfcdaemon$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $LFCSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $LFCSHUTDOWN -f -h `hostname`
-- else
-- $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "lfcdaemon already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "lfcdaemon already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -273,7 +245,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -282,15 +254,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/ns/lfcdaemon.scripts.postgresql lcgdm-1.8.0.1/ns/lfcdaemon.scripts.postgresql
---- lcgdm-1.8.0.1.orig/ns/lfcdaemon.scripts.postgresql 2010-12-20 11:39:59.000000000 +0100
-+++ lcgdm-1.8.0.1/ns/lfcdaemon.scripts.postgresql 2010-12-29 12:57:05.606868315 +0100
-@@ -38,7 +38,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -97,14 +97,8 @@
- X509_USER_KEY=/etc/grid-security/$LFCUSER/lfckey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5010|\*:lfc' | grep LISTEN | grep lfcdaemon > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5010|\*[:.]lfc' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 lfcdaemon' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfcdaemon$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "lfcdaemon already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon already started: "
- RETVAL=0
-@@ -136,11 +130,12 @@
- fi
- fi
- if [ ! -s "$NSCONFIGFILE" ]; then
-- echo "FAILED : config file $NSCONFIGFILE empty"
-+ echo $ECHOOPT "config file $NSCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $NSCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $LFCDAEMONLOGFILE`
- chown $LFCUSER:$LFCGROUP `dirname $LFCDAEMONLOGFILE`
-@@ -158,10 +153,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "lfcdaemon not started: "
-- [ -n "$FAILURE" ] && $FAILURE "lfcdaemon not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -170,72 +165,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $LFCSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $LFCSHUTDOWN -f -h `hostname`
-- else
-- $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # lfcdaemon might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfcdaemon$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $LFCSHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $LFCSHUTDOWN -f -h `hostname`
-- else
-- $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "lfcdaemon already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "lfcdaemon already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -247,7 +219,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -256,15 +228,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/rfio/rfiod.scripts lcgdm-1.8.0.1/rfio/rfiod.scripts
---- lcgdm-1.8.0.1.orig/rfio/rfiod.scripts 2010-12-20 11:39:54.000000000 +0100
-+++ lcgdm-1.8.0.1/rfio/rfiod.scripts 2010-12-29 12:55:02.893560170 +0100
-@@ -39,7 +39,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -93,19 +93,13 @@
-
- case "$1" in
- start)
-- echo $ECHOOPT "Starting $prog: "
- if [ -f ${NOMORERFIO} ]; then
- echo $ECHOOPT "${NOMORERFIO} exists: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "${NOMORERFIO} exists: "
- RETVAL=0
- else
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:5001|\*:rfio' | grep LISTEN | grep rfiod > /dev/null
-- else
-- netstat -a | egrep '\*[:.]5001|\*[:.]rfio' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 rfiod' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 rfiod$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "rfiod already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "rfiod already started: "
- RETVAL=0
-@@ -128,6 +122,7 @@
- fi
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $RFIOLOGFILE`
- touch $RFIOLOGFILE
-@@ -141,10 +136,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "rfiod not started: "
-- [ -n "$FAILURE" ] && $FAILURE "rfiod not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -154,63 +149,46 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- #
- ## We just attempt to kill the main daemon
- ## Remaining child are allowed to continue transfer up to
- ## the end
- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -9 `cat $PIDFILE`
-- else
-- kill -9 `cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -9 `cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # rfio might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 rfiod$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- #
- ## We just attempt to kill the main daemon
- ## Remaining child are allowed to continue transfer up to
- ## the end
- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -9 $pid
-+ kill -9 $pid > /dev/null 2>&1
-+ RETVAL=$?
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
- else
-- kill -9 $pid > /dev/null 2>&1
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
-- RETVAL=$?
-- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "rfiod already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "rfiod already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "rfiod already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "rfiod already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-- #
-- ## Basically: if SILENTSTOP is not 0 when we never print something
-- ## But if the stop is successful... One might want to see stop: OK
-- ## anyway ?
-- #
-- if [ $SILENTSTOP -ne 0 -a $RETVAL -eq 0 ]; then
-- echo $ECHOOPT "Stopping $prog: "
-- [ $sysname = "Linux" ] && $ECHO_SUCCESS
-- [ -n "$ECHO_END" ] && $ECHO_END
-- fi
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -218,15 +196,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/srmv1/srmv1.scripts.mysql lcgdm-1.8.0.1/srmv1/srmv1.scripts.mysql
---- lcgdm-1.8.0.1.orig/srmv1/srmv1.scripts.mysql 2010-12-20 11:40:00.000000000 +0100
-+++ lcgdm-1.8.0.1/srmv1/srmv1.scripts.mysql 2010-12-29 12:54:42.311843924 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -102,14 +102,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:8443|\*:srmv1' | grep LISTEN | grep srmv1 > /dev/null
-- else
-- netstat -a | egrep '\*[:.]8443|\*[:.]srmv1' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv1' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "srmv1 already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 already started: "
- RETVAL=0
-@@ -133,11 +127,12 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $SRMV1DAEMONLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $SRMV1DAEMONLOGFILE`
-@@ -155,10 +150,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "srmv1 not started: "
-- [ -n "$FAILURE" ] && $FAILURE "srmv1 not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -167,72 +162,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV1SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV1SHUTDOWN -f -h `hostname`
-- else
-- $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # srmv1 might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV1SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV1SHUTDOWN -f -h `hostname`
-- else
-- $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv1 already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "srmv1 already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -244,7 +216,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -253,15 +225,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/srmv1/srmv1.scripts.oracle lcgdm-1.8.0.1/srmv1/srmv1.scripts.oracle
---- lcgdm-1.8.0.1.orig/srmv1/srmv1.scripts.oracle 2010-12-20 11:40:01.000000000 +0100
-+++ lcgdm-1.8.0.1/srmv1/srmv1.scripts.oracle 2010-12-29 12:54:21.233134526 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -104,14 +104,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:8443|\*:srmv1' | grep LISTEN | grep srmv1 > /dev/null
-- else
-- netstat -a | egrep '\*[:.]8443|\*[:.]srmv1' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv1' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "srmv1 already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 already started: "
- RETVAL=0
-@@ -135,13 +129,13 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ ! -d $ORACLE_HOME ]; then
- echo $ECHOOPT "No Oracle Client found: "
-- $FAILURE "No Oracle Client found: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
- RETVAL=1
- fi
-
-@@ -159,11 +153,12 @@
- ORACLECLIENT=`ldconfig -p | grep libclntsh`
- if [ "x${ORACLECLIENT}" == "x" ]; then
- echo $ECHOOPT "No Oracle Client installed: "
-- $FAILURE "No Oracle Client installed: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
- RETVAL=1
- fi
-
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $SRMV1DAEMONLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $SRMV1DAEMONLOGFILE`
-@@ -181,10 +176,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "srmv1 not started: "
-- [ -n "$FAILURE" ] && $FAILURE "srmv1 not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -193,72 +188,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV1SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV1SHUTDOWN -f -h `hostname`
-- else
-- $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # srmv1 might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV1SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV1SHUTDOWN -f -h `hostname`
-- else
-- $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv1 already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "srmv1 already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -270,7 +242,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -279,15 +251,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/srmv1/srmv1.scripts.postgresql lcgdm-1.8.0.1/srmv1/srmv1.scripts.postgresql
---- lcgdm-1.8.0.1.orig/srmv1/srmv1.scripts.postgresql 2010-12-20 11:40:00.000000000 +0100
-+++ lcgdm-1.8.0.1/srmv1/srmv1.scripts.postgresql 2010-12-29 12:53:33.765788931 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -102,14 +102,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:8443|\*:srmv1' | grep LISTEN | grep srmv1 > /dev/null
-- else
-- netstat -a | egrep '\*[:.]8443|\*[:.]srmv1' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv1' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "srmv1 already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 already started: "
- RETVAL=0
-@@ -133,11 +127,12 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $SRMV1DAEMONLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $SRMV1DAEMONLOGFILE`
-@@ -155,10 +150,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "srmv1 not started: "
-- [ -n "$FAILURE" ] && $FAILURE "srmv1 not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -167,72 +162,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV1SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV1SHUTDOWN -f -h `hostname`
-- else
-- $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # srmv1 might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV1SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV1SHUTDOWN -f -h `hostname`
-- else
-- $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv1 already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "srmv1 already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -244,7 +216,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -253,15 +225,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/srmv2/srmv2.scripts.mysql lcgdm-1.8.0.1/srmv2/srmv2.scripts.mysql
---- lcgdm-1.8.0.1.orig/srmv2/srmv2.scripts.mysql 2010-12-20 11:40:01.000000000 +0100
-+++ lcgdm-1.8.0.1/srmv2/srmv2.scripts.mysql 2010-12-29 13:10:10.640043339 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -102,14 +102,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:8444|\*:srmv2' | grep LISTEN | grep srmv2 > /dev/null
-- else
-- netstat -a | egrep '\*[:.]8444|\*[:.]srmv2' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv2' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "srmv2 already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 already started: "
- RETVAL=0
-@@ -133,11 +127,12 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $SRMV2DAEMONLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE`
-@@ -155,10 +150,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "srmv2 not started: "
-- [ -n "$FAILURE" ] && $FAILURE "srmv2 not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -167,72 +162,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV2SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV2SHUTDOWN -f -h `hostname`
-- else
-- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # srmv2 might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV2SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV2SHUTDOWN -f -h `hostname`
-- else
-- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2 already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "srmv2 already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -244,7 +216,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -253,15 +225,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/srmv2/srmv2.scripts.oracle lcgdm-1.8.0.1/srmv2/srmv2.scripts.oracle
---- lcgdm-1.8.0.1.orig/srmv2/srmv2.scripts.oracle 2010-12-20 11:40:01.000000000 +0100
-+++ lcgdm-1.8.0.1/srmv2/srmv2.scripts.oracle 2010-12-29 12:51:59.251091913 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -104,14 +104,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:8444|\*:srmv2' | grep LISTEN | grep srmv2 > /dev/null
-- else
-- netstat -a | egrep '\*[:.]8444|\*[:.]srmv2' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv2' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "srmv2 already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 already started: "
- RETVAL=0
-@@ -135,13 +129,13 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ ! -d $ORACLE_HOME ]; then
- echo $ECHOOPT "No Oracle Client found: "
-- $FAILURE "No Oracle Client found: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
- RETVAL=1
- fi
-
-@@ -159,11 +153,12 @@
- ORACLECLIENT=`ldconfig -p | grep libclntsh`
- if [ "x${ORACLECLIENT}" == "x" ]; then
- echo $ECHOOPT "No Oracle Client installed: "
-- $FAILURE "No Oracle Client installed: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
- RETVAL=1
- fi
-
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $SRMV2DAEMONLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE`
-@@ -181,10 +176,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "srmv2 not started: "
-- [ -n "$FAILURE" ] && $FAILURE "srmv2 not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -193,72 +188,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV2SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV2SHUTDOWN -f -h `hostname`
-- else
-- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # srmv2 might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV2SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV2SHUTDOWN -f -h `hostname`
-- else
-- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2 already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "srmv2 already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -270,7 +242,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -279,15 +251,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/srmv2/srmv2.scripts.postgresql lcgdm-1.8.0.1/srmv2/srmv2.scripts.postgresql
---- lcgdm-1.8.0.1.orig/srmv2/srmv2.scripts.postgresql 2010-12-20 11:40:01.000000000 +0100
-+++ lcgdm-1.8.0.1/srmv2/srmv2.scripts.postgresql 2010-12-29 12:51:31.100479991 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -102,14 +102,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:8444|\*:srmv2' | grep LISTEN | grep srmv2 > /dev/null
-- else
-- netstat -a | egrep '\*[:.]8444|\*[:.]srmv2' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv2' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "srmv2 already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 already started: "
- RETVAL=0
-@@ -133,11 +127,12 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $SRMV2DAEMONLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE`
-@@ -155,10 +150,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "srmv2 not started: "
-- [ -n "$FAILURE" ] && $FAILURE "srmv2 not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -167,72 +162,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV2SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV2SHUTDOWN -f -h `hostname`
-- else
-- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # srmv2 might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV2SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV2SHUTDOWN -f -h `hostname`
-- else
-- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2 already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "srmv2 already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -244,7 +216,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -253,15 +225,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
-- else
-- RETVAL=0
-- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/srmv2.2/srmv2.2.scripts.mysql lcgdm-1.8.0.1/srmv2.2/srmv2.2.scripts.mysql
---- lcgdm-1.8.0.1.orig/srmv2.2/srmv2.2.scripts.mysql 2010-12-20 11:39:55.000000000 +0100
-+++ lcgdm-1.8.0.1/srmv2.2/srmv2.2.scripts.mysql 2010-12-29 12:53:17.269016360 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -102,14 +102,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
+@@ -94,18 +94,12 @@
+ case "$1" in
+ start)
- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:8446|\*:srmv2.2' | grep LISTEN | grep srmv2.2 > /dev/null
-- else
-- netstat -a | egrep '\*[:.]8446|\*[:.]srmv2.2' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv2.2' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2.2$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "srmv2.2 already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 already started: "
+ if [ -f ${NOMORERFIO} ]; then
+ echo $ECHOOPT "${NOMORERFIO} exists: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "${NOMORERFIO} exists: "
RETVAL=0
-@@ -133,11 +127,12 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $SRMV2DAEMONLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE`
-@@ -155,10 +150,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "srmv2.2 not started: "
-- [ -n "$FAILURE" ] && $FAILURE "srmv2.2 not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -167,72 +162,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV2SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV2SHUTDOWN -f -h `hostname`
-- else
-- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # srmv2.2 might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2.2$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV2SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV2SHUTDOWN -f -h `hostname`
-- else
-- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2.2 already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "srmv2.2 already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -244,7 +216,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -253,15 +225,7 @@
- $0 start
- RETVAL=$?
else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
-- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5001|\*:rfio' | grep LISTEN | grep rfiod > /dev/null
- else
-- RETVAL=0
+- netstat -a | egrep '\*[:.]5001|\*[:.]rfio' | egrep 'LISTEN *$' > /dev/null
- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/srmv2.2/srmv2.2.scripts.oracle lcgdm-1.8.0.1/srmv2.2/srmv2.2.scripts.oracle
---- lcgdm-1.8.0.1.orig/srmv2.2/srmv2.2.scripts.oracle 2010-12-20 11:39:55.000000000 +0100
-+++ lcgdm-1.8.0.1/srmv2.2/srmv2.2.scripts.oracle 2010-12-29 12:53:00.877242340 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -104,14 +104,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:8446|\*:srmv2.2' | grep LISTEN | grep srmv2.2 > /dev/null
-- else
-- netstat -a | egrep '\*[:.]8446|\*[:.]srmv2.2' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv2.2' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2.2$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "srmv2.2 already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 already started: "
- RETVAL=0
-@@ -135,13 +129,13 @@
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 rfiod' > /dev/null
++ netstat -an | egrep '[:.]5001' | egrep 'LISTEN *$' > /dev/null
+ if [ $? -eq 0 ]; then
+ echo $ECHOOPT "rfiod already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "rfiod already started: "
+@@ -129,6 +123,7 @@
+ fi
fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ ! -d $ORACLE_HOME ]; then
- echo $ECHOOPT "No Oracle Client found: "
-- $FAILURE "No Oracle Client found: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
- RETVAL=1
- fi
-
-@@ -159,11 +153,12 @@
- ORACLECLIENT=`ldconfig -p | grep libclntsh`
- if [ "x${ORACLECLIENT}" == "x" ]; then
- echo $ECHOOPT "No Oracle Client installed: "
-- $FAILURE "No Oracle Client installed: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
- RETVAL=1
- fi
-
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $SRMV2DAEMONLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE`
-@@ -181,10 +176,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $RFIOLOGFILE`
+ touch $RFIOLOGFILE
+@@ -142,10 +137,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "rfiod not started: "
+- [ -n "$FAILURE" ] && $FAILURE "rfiod not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "srmv2.2 not started: "
-- [ -n "$FAILURE" ] && $FAILURE "srmv2.2 not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
fi
- fi
-@@ -193,72 +188,49 @@
+@@ -155,63 +150,46 @@
;;
stop)
if [ -f $PIDFILE ]; then
- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV2SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV2SHUTDOWN -f -h `hostname`
-- else
-- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
- rm -f $PIDFILE
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
- fi
- else
- # srmv2.2 might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2.2$" | awk '{print $1}'`
- if [ -n "$pid" ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV2SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV2SHUTDOWN -f -h `hostname`
-- else
-- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
-+ if [ $RETVAL -eq 0 ]; then
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2.2 already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 already stopped: "
-- RETVAL=0
-- fi
-- fi
-- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-- if [ $RETVAL -eq 0 ]; then
-- $ECHO_SUCCESS
-- else
-- $ECHO_FAILURE
-+ echo $ECHOOPT "srmv2.2 already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 already stopped: "
-+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
- fi
- fi
-
-@@ -270,7 +242,7 @@
- done
-
- [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-+ $ECHO_END
- ;;
- restart | force-reload)
- $0 stop
-@@ -279,15 +251,7 @@
- $0 start
- RETVAL=$?
- else
-- #
-- ## It is legal to return zero it if was
-- ## a conditional restart
-- #
+ #
+ ## We just attempt to kill the main daemon
+ ## Remaining child are allowed to continue transfer up to
+ ## the end
+ #
- if [ $SILENTSTOP -eq 0 ]; then
-- RETVAL=1
+- kill -9 `cat $PIDFILE`
- else
-- RETVAL=0
+- kill -9 `cat $PIDFILE` > /dev/null 2>&1
- fi
-+ RETVAL=0
- fi
- ;;
- condrestart | try-restart)
-diff -ur lcgdm-1.8.0.1.orig/srmv2.2/srmv2.2.scripts.postgresql lcgdm-1.8.0.1/srmv2.2/srmv2.2.scripts.postgresql
---- lcgdm-1.8.0.1.orig/srmv2.2/srmv2.2.scripts.postgresql 2010-12-20 11:39:55.000000000 +0100
-+++ lcgdm-1.8.0.1/srmv2.2/srmv2.2.scripts.postgresql 2010-12-29 12:52:43.203485992 +0100
-@@ -43,7 +43,7 @@
- . /etc/rc.d/init.d/functions
- DAEMON=daemon
- FAILURE=failure
-- ECHO_FAILURE=failure
-+ ECHO_FAILURE=echo_failure
- SUCCESS=success
- ECHO_SUCCESS=echo_success
- ECHO_END=echo
-@@ -102,14 +102,8 @@
- X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
- export X509_USER_KEY
-
-- echo $ECHOOPT "Starting $prog: "
-- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-- netstat -ap | egrep '\*:8446|\*:srmv2.2' | grep LISTEN | grep srmv2.2 > /dev/null
-- else
-- netstat -a | egrep '\*[:.]8446|\*[:.]srmv2.2' | egrep 'LISTEN *$' > /dev/null
-- fi
-- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv2.2' > /dev/null
-- if [ $? -eq 0 ]; then
-+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2.2$" | awk '{print $1}'`
-+ if [ -n "$pid" ]; then
- echo $ECHOOPT "srmv2.2 already started: "
- [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 already started: "
- RETVAL=0
-@@ -133,11 +127,12 @@
- fi
- fi
- if [ ! -s "$DPMCONFIGFILE" ]; then
-- echo "FAILED : config file $DPMCONFIGFILE empty"
-+ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
- RETVAL=1
-- exit $RETVAL
- fi
- if [ $RETVAL -eq 0 ]; then
-+ echo $ECHOOPT "Starting $prog: "
- cd /
- mkdir -p `dirname $SRMV2DAEMONLOGFILE`
- chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE`
-@@ -155,10 +150,10 @@
- rm -f $PIDFILE
- echo $pid > $PIDFILE
- fi
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
- RETVAL=0
- else
-- echo $ECHOOPT "srmv2.2 not started: "
-- [ -n "$FAILURE" ] && $FAILURE "srmv2.2 not started: "
-+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
- RETVAL=1
- fi
- fi
-@@ -167,72 +162,49 @@
- ;;
- stop)
- if [ -f $PIDFILE ]; then
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
-+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV2SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV2SHUTDOWN -f -h `hostname`
-- else
-- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -`cat $PIDFILE`
-- else
-- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
-- fi
-+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
- RETVAL=$?
- fi
++ kill -9 `cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
if [ $RETVAL -eq 0 ]; then
rm -f $PIDFILE
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
@@ -4574,69 +76,61 @@ diff -ur lcgdm-1.8.0.1.orig/srmv2.2/srmv2.2.scripts.postgresql lcgdm-1.8.0.1/srm
+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
fi
else
- # srmv2.2 might have been started by hand
- pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2.2$" | awk '{print $1}'`
+ # rfio might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 rfiod$" | awk '{print $1}'`
if [ -n "$pid" ]; then
- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
+ echo $ECHOOPT "Stopping $prog: "
- if [ -x $SRMV2SHUTDOWN ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- $SRMV2SHUTDOWN -f -h `hostname`
-- else
-- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
-- fi
-+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
- RETVAL=$?
- if [ $RETVAL -ne 0 ]; then
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
- else
-- if [ $SILENTSTOP -eq 0 ]; then
-- kill -2 -$pid
-- else
-- kill -2 -$pid > /dev/null 2>&1
-- fi
-+ kill -2 -$pid > /dev/null 2>&1
- RETVAL=$?
- fi
+ #
+ ## We just attempt to kill the main daemon
+ ## Remaining child are allowed to continue transfer up to
+ ## the end
+ #
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -9 $pid
++ kill -9 $pid > /dev/null 2>&1
++ RETVAL=$?
+ if [ $RETVAL -eq 0 ]; then
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
-+ else
+ else
+- kill -9 $pid > /dev/null 2>&1
+ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
-+ fi
- else
-- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2.2 already stopped: "
-- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 already stopped: "
+ fi
+- RETVAL=$?
+- else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "rfiod already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "rfiod already stopped: "
- RETVAL=0
- fi
- fi
- if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
- if [ $RETVAL -eq 0 ]; then
- $ECHO_SUCCESS
-- else
+ else
- $ECHO_FAILURE
-+ echo $ECHOOPT "srmv2.2 already stopped: "
-+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 already stopped: "
++ echo $ECHOOPT "rfiod already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "rfiod already stopped: "
+ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
fi
fi
-@@ -244,7 +216,7 @@
- done
-
[ -d $SUBSYSDIR ] && rm -f $SUBSYS
- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
+- #
+- ## Basically: if SILENTSTOP is not 0 when we never print something
+- ## But if the stop is successful... One might want to see stop: OK
+- ## anyway ?
+- #
+- if [ $SILENTSTOP -ne 0 -a $RETVAL -eq 0 ]; then
+- echo $ECHOOPT "Stopping $prog: "
+- [ $sysname = "Linux" ] && $ECHO_SUCCESS
+- [ -n "$ECHO_END" ] && $ECHO_END
+- fi
+ $ECHO_END
;;
restart | force-reload)
$0 stop
-@@ -253,15 +225,7 @@
+@@ -219,15 +197,7 @@
$0 start
RETVAL=$?
else
diff --git a/lcgdm-dlopen.patch b/lcgdm-dlopen.patch
index d8429a1..fcfa657 100644
--- a/lcgdm-dlopen.patch
+++ b/lcgdm-dlopen.patch
@@ -1,35 +1,93 @@
-diff -ur LCG-DM-1.7.3.1.orig/security/Csec_api_loader.c LCG-DM-1.7.3.1/security/Csec_api_loader.c
---- LCG-DM-1.7.3.1.orig/security/Csec_api_loader.c 2008-10-01 16:02:10.000000000 +0200
-+++ LCG-DM-1.7.3.1/security/Csec_api_loader.c 2009-12-07 14:54:56.007186981 +0100
-@@ -221,6 +221,7 @@
+diff -ur lcgdm-1.8.1.2.orig/config/Imake.rules lcgdm-1.8.1.2/config/Imake.rules
+--- lcgdm-1.8.1.2.orig/config/Imake.rules 2011-05-31 12:22:47.516887874 +0200
++++ lcgdm-1.8.1.2/config/Imake.rules 2011-09-02 11:17:40.409077859 +0200
+@@ -165,6 +165,13 @@
+ ln -s SharedLibraryTargetName(libname).rev $@.`echo rev|cut -f1 -d.`
+ #endif
+
++#ifndef InstallPlugin
++#define InstallPlugin(libname,dest) @@\
++dest/SharedLibraryTargetName(libname): dest SharedLibraryTargetName(libname) @@\
++ -mv $@ dest/OLD/**/SharedLibraryTargetName(libname) @@\
++ cp SharedLibraryTargetName(libname) $@
++#endif
++
+ #ifndef MakeDir
+ #define MakeDir(dirname,owner,group,mode) @@\
+ dirname: @@\
+diff -ur lcgdm-1.8.1.2.orig/security/Csec_api_loader.c lcgdm-1.8.1.2/security/Csec_api_loader.c
+--- lcgdm-1.8.1.2.orig/security/Csec_api_loader.c 2011-05-31 12:22:47.560887292 +0200
++++ lcgdm-1.8.1.2/security/Csec_api_loader.c 2011-09-02 11:37:45.353365158 +0200
+@@ -224,6 +224,7 @@
void *Csec_get_shlib(Csec_context_t *ctx) {
char filename[CA_MAXNAMELEN];
char filename_thread[CA_MAXNAMELEN];
+ char fullpath[CA_MAXNAMELEN];
char suffix[CA_MAXNAMELEN];
char symname[256];
- void *handle;
-@@ -301,6 +302,11 @@
+ char symname_pthr[256];
+@@ -305,6 +306,12 @@
filename_thread,
ctx->protocols[ctx->current_protocol].id);
handle = dlopen(filename_thread, RTLD_NOW);
+ if (handle == NULL) {
-+ strcpy(fullpath, "@@LIBDIR@@/lcgdm/");
++ strcpy(fullpath, LIBDIR);
++ strcat(fullpath, "/");
+ strcat(fullpath, filename_thread);
+ handle = dlopen(fullpath, RTLD_NOW);
+ }
}
if (handle == NULL) {
-@@ -308,6 +314,11 @@
+@@ -313,6 +320,12 @@
filename,
ctx->protocols[ctx->current_protocol].id);
handle = dlopen(filename, RTLD_NOW);
+ if (handle == NULL) {
-+ strcpy(fullpath, "@@LIBDIR@@/lcgdm/");
++ strcpy(fullpath, LIBDIR);
++ strcat(fullpath, "/");
+ strcat(fullpath, filename);
+ handle = dlopen(fullpath, RTLD_NOW);
+ }
}
if (handle == NULL) {
+diff -ur lcgdm-1.8.1.2.orig/security/Imakefile lcgdm-1.8.1.2/security/Imakefile
+--- lcgdm-1.8.1.2.orig/security/Imakefile 2011-05-31 12:22:47.556887347 +0200
++++ lcgdm-1.8.1.2/security/Imakefile 2011-09-02 11:48:42.616788053 +0200
+@@ -13,7 +13,8 @@
+ include FileName(..,VERSION)
+
+ INCLUDES = FileName(..,h)
+-LIB = InstallLibDir
++LIBBASE = InstallLibDir
++LIB = $(LIBBASE)/lcgdm
+
+ #if UseKRB5
+ #define KRB5Mech KRB5
+@@ -179,7 +180,7 @@
+ NormalLibraryTarget(security,$(SECLIB_OBJS))
+
+ Csec_api_loader.Osuf: Csec_api_loader.c
+- $(CC) $(CFLAGS) -c -o Csec_api_loader.Osuf Csec_api_loader.c
++ $(CC) $(CFLAGS) -DLIBDIR='"$(LIB)"' -c -o Csec_api_loader.Osuf Csec_api_loader.c
+
+ #if UseGSI
+ SharedLibraryTargetName(Csec_plugin_GSI_thread): Csec_plugin_GSI_pthr.Osuf Csec_plugin_GSI_pthr_mapper.Osuf
+@@ -232,11 +233,11 @@
+
+ MakeDir($(LIB),root,bin,0755)
+
+-InstallSharedLibrary(Csec_plugin_ID,$(VERSION),$(LIB))
+-InstallSharedLibrary(Csec_plugin_GSI,$(VERSION),$(LIB))
+-InstallSharedLibrary(Csec_plugin_GSI_thread,$(VERSION),$(LIB))
+-InstallSharedLibrary(Csec_plugin_KRB5,$(VERSION),$(LIB))
+-InstallSharedLibrary(Csec_plugin_KRB4,$(VERSION),$(LIB))
++InstallPlugin(Csec_plugin_ID,$(LIB))
++InstallPlugin(Csec_plugin_GSI,$(LIB))
++InstallPlugin(Csec_plugin_GSI_thread,$(LIB))
++InstallPlugin(Csec_plugin_KRB5,$(LIB))
++InstallPlugin(Csec_plugin_KRB4,$(LIB))
+
+ MakeDir($(LIBMANDIR),root,bin,0755)
+
diff --git a/lcgdm-paths.patch b/lcgdm-paths.patch
index e26993d..28c7938 100644
--- a/lcgdm-paths.patch
+++ b/lcgdm-paths.patch
@@ -1,22 +1,7 @@
-diff -ur lcgdm-1.7.4.4.orig/config/site.def lcgdm-1.7.4.4/config/site.def
---- lcgdm-1.7.4.4.orig/config/site.def 2010-03-29 16:21:47.000000000 +0200
-+++ lcgdm-1.7.4.4/config/site.def 2010-03-29 19:27:36.803627866 +0200
-@@ -29,7 +29,7 @@
- #define CupvConfigFile /etc/CUPVCONFIG
- #endif
- #define CupvHost "UNUSED"
--#define CupvSpool /usr/spool/upv
-+#define CupvSpool /var/spool/upv
- #define DicomcopySpool /var/log/dicomcopy
- #define DliSpool /var/log/dli
- #define DomainName cern.ch
-@@ -73,12 +73,12 @@
- #if defined(_WIN32)
- #define InstallPerlDir \\cern.ch\dfs\Applications\CERN\LFC\lib\perl
- #else
--#define InstallPerlDir $(prefix)/$(_lib)/perl
-+#define InstallPerlDir $(shell perl -MConfig -e '$$x = $$Config{vendorarchexp}; $$x =~ s!$$Config{prefix}!$(prefix)! ; print $$x')
- #endif
+diff -ur lcgdm-1.8.1.2.orig/config/site.def lcgdm-1.8.1.2/config/site.def
+--- lcgdm-1.8.1.2.orig/config/site.def 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/config/site.def 2011-09-03 11:06:17.993504727 +0200
+@@ -81,7 +81,7 @@
#if defined(_WIN32)
#define InstallPythonDir \\cern.ch\dfs\Applications\CERN\LFC\lib\python
#else
@@ -25,42 +10,26 @@ diff -ur lcgdm-1.7.4.4.orig/config/site.def lcgdm-1.7.4.4/config/site.def
#endif
#define LibManDir $(prefix)/share/man/man3
#define LibManSuffix 3
-@@ -119,7 +119,7 @@
- #define RemoteHostsList /etc/shift.remhosts
+diff -ur lcgdm-1.8.1.2.orig/dpm/Imakefile lcgdm-1.8.1.2/dpm/Imakefile
+--- lcgdm-1.8.1.2.orig/dpm/Imakefile 2011-05-31 12:22:45.000000000 +0200
++++ lcgdm-1.8.1.2/dpm/Imakefile 2011-09-03 11:06:17.995504701 +0200
+@@ -8,11 +8,10 @@
+
+ #if BuildInterfaces
+ PYTHON=PythonProgram
+-PYTHON_VERSION=$(shell $(PYTHON) -c "import sys; print sys.version[:3]")
+-PYTHON_PREFIX=$(shell $(PYTHON) -c "import os; import sys; print os.path.normpath(sys.prefix)")
+-INCLUDE_PYTHON=-I$(shell $(PYTHON) -c "from distutils import sysconfig; print sysconfig.get_python_inc(0,prefix='${PYTHON_PREFIX}')")
+-PYTHON_LIB=$(shell $(PYTHON) -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1,prefix='${PYTHON_PREFIX}')")
+-INCLUDE_PERL=-I$(shell perl -MConfig -e 'print $$Config{archlibexp}, "/CORE";')
++INCLUDE_PYTHON=$(shell $(PYTHON) -c "from distutils import sysconfig; print('-I' + sysconfig.get_python_inc(0))")
++PYTHON_LIB=$(shell $(PYTHON) -c "from distutils import sysconfig; import sys; print('-L' + sysconfig.get_config_var('LIBDEST') + '/config -lpython' + sys.version[:3] + ' ' + sysconfig.get_config_var('LIBS') + ' ' + sysconfig.get_config_var('SYSLIBS'))")
++INCLUDE_PERL=$(shell perl -MConfig -e 'print "-I", $$Config{archlibexp}, "/CORE";')
++PERL_LIB=$(shell perl -MConfig -e 'print "-L", $$Config{archlibexp}, "/CORE -lperl ", $$Config{perllibs};')
+ SWIG_LOCATION = SwigLocation
+ SWIG = SWIG_LIB=SwigLib $(SWIG_LOCATION)/bin/swig
#endif
- #define RfioSpool /var/log/rfio
--#define SacctDir /usr/spool/sacct
-+#define SacctDir /var/spool/sacct
- #if defined(_WIN32)
- #define ShiftConfigFile %%SystemRoot%%\\system32\\drivers\\etc\\shift.conf
- #else
-diff -ur lcgdm-1.7.4.4.orig/configure lcgdm-1.7.4.4/configure
---- lcgdm-1.7.4.4.orig/configure 2010-03-29 16:21:47.000000000 +0200
-+++ lcgdm-1.7.4.4/configure 2010-03-29 19:27:36.804794633 +0200
-@@ -177,6 +177,19 @@
- $SITE_DEF >$SITE_DEF.new
- mv $SITE_DEF.new $SITE_DEF
- ;;
-+ --with-sysconf-dir*)
-+ if [ '--with-sysconf-dir' = "$1" ]; then
-+ location="$2"
-+ shift
-+ else
-+ location=`echo $1 | cut -d= -f 2`
-+ fi
-+ shift
-+ [ 'yes' = "$VERBOSE" ] && echo "Sysconf dir: $location"
-+ sed -e "s# SysconfDir\ .*\$# SysconfDir $location#" \
-+ $SITE_DEF >$SITE_DEF.new
-+ mv $SITE_DEF.new $SITE_DEF
-+ ;;
- --with-gsoap-location*)
- if [ '--with-gsoap-location' = "$1" ]; then
- location="$2"
-diff -ur lcgdm-1.7.4.4.orig/dpm/Imakefile lcgdm-1.7.4.4/dpm/Imakefile
---- lcgdm-1.7.4.4.orig/dpm/Imakefile 2010-03-29 16:21:44.000000000 +0200
-+++ lcgdm-1.7.4.4/dpm/Imakefile 2010-03-29 19:27:36.804794633 +0200
-@@ -242,14 +242,14 @@
+@@ -246,14 +245,14 @@
_dpm2.so \
dpm2.py
IDPM_IFCE = $(PERLDIR) \
@@ -80,7 +49,28 @@ diff -ur lcgdm-1.7.4.4.orig/dpm/Imakefile lcgdm-1.7.4.4/dpm/Imakefile
#endif
DPMLIB_OBJS = dpm_abortfiles.Osuf \
-@@ -436,10 +436,10 @@
+@@ -424,28 +423,28 @@
+ RemoveFiles(dpm_perlwrap.o dpm_perlwrap.c)
+ $(SWIG) -perl -I$(INCLUDES) -DNSTYPE_DPNS -o dpm_perlwrap.c dpm.i
+ $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PERL) -Dbool=char -D_GNU_SOURCE -DNSTYPE_DPNS dpm_perlwrap.c
+- $(LD) $(SHLIBLDFLAGS) -o dpm.so dpm_perlwrap.o $(LIBS) -ldpm
++ $(LD) $(SHLIBLDFLAGS) -o dpm.so dpm_perlwrap.o $(PERL_LIB) $(LIBS)
+
+ dpm.py : _dpm.so
+ _dpm.so : dpm.i ../h/dpm_api.h ../h/dpns_api.h ../h/Cns_api.h
+ RemoveFiles(dpm_wrap.o dpm_wrap.c)
+ $(SWIG) -python -I$(INCLUDES) -DNSTYPE_DPNS dpm.i
+ $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PYTHON) -DNSTYPE_DPNS dpm_wrap.c
+- $(LD) $(SHLIBLDFLAGS) -o _dpm.so dpm_wrap.o $(LIBS) -ldpm
++ $(LD) $(SHLIBLDFLAGS) -o _dpm.so dpm_wrap.o $(PYTHON_LIB) $(LIBS)
+
+ dpm2.py : _dpm2.so
+ _dpm2.so : dpm2.i ../h/dpm_api.h ../h/dpns_api.h ../h/Cns_api.h
+ RemoveFiles(dpm2_wrap.o dpm2_wrap.c)
+ $(SWIG) -python -I$(INCLUDES) -I../ns -DNSTYPE_DPNS dpm2.i
+ $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PYTHON) -DNSTYPE_DPNS dpm2_wrap.c
+- $(LD) $(SHLIBLDFLAGS) -o _dpm2.so dpm2_wrap.o $(LIBS) -ldpm
++ $(LD) $(SHLIBLDFLAGS) -o _dpm2.so dpm2_wrap.o $(PYTHON_LIB) $(LIBS)
InstallTarget(dpm.so,root,root,0755,$(PERLDIR))
InstallTarget(dpm.pm,root,root,0644,$(PERLDIR))
@@ -95,7 +85,7 @@ diff -ur lcgdm-1.7.4.4.orig/dpm/Imakefile lcgdm-1.7.4.4/dpm/Imakefile
InstallProgram(dpm-listspaces,$(BIN),root,bin,755)
MakeDir($(BIN),root,bin,0755)
-@@ -452,7 +452,7 @@
+@@ -458,7 +457,7 @@
#if BuildInterfaces
MakeDir($(PERLDIR),root,root,0755)
@@ -104,10 +94,26 @@ diff -ur lcgdm-1.7.4.4.orig/dpm/Imakefile lcgdm-1.7.4.4/dpm/Imakefile
#endif
install.man: $(MANDIRS) $(MANPAGESCLIENT) $(MANPAGESSERVER) $(MANPAGESIFCE)
-diff -ur lcgdm-1.7.4.4.orig/ns/Imakefile.lfc lcgdm-1.7.4.4/ns/Imakefile.lfc
---- lcgdm-1.7.4.4.orig/ns/Imakefile.lfc 2010-03-29 16:21:47.000000000 +0200
-+++ lcgdm-1.7.4.4/ns/Imakefile.lfc 2010-03-29 19:27:36.805795737 +0200
-@@ -240,17 +240,17 @@
+diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile.lfc lcgdm-1.8.1.2/ns/Imakefile.lfc
+--- lcgdm-1.8.1.2.orig/ns/Imakefile.lfc 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/ns/Imakefile.lfc 2011-09-03 11:06:17.996504688 +0200
+@@ -22,11 +22,10 @@
+
+ #if BuildInterfaces
+ PYTHON=PythonProgram
+-PYTHON_VERSION=$(shell $(PYTHON) -c "import sys; print sys.version[:3]")
+-PYTHON_PREFIX=$(shell $(PYTHON) -c "import os; import sys; print os.path.normpath(sys.prefix)")
+-INCLUDE_PYTHON=-I$(shell $(PYTHON) -c "from distutils import sysconfig; print sysconfig.get_python_inc(0,prefix='${PYTHON_PREFIX}')")
+-PYTHON_LIB=$(shell $(PYTHON) -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1,prefix='${PYTHON_PREFIX}')")
+-INCLUDE_PERL=-I$(shell perl -MConfig -e 'print $$Config{archlibexp}, "/CORE";')
++INCLUDE_PYTHON=$(shell $(PYTHON) -c "from distutils import sysconfig; print('-I' + sysconfig.get_python_inc(0))")
++PYTHON_LIB=$(shell $(PYTHON) -c "from distutils import sysconfig; import sys; print('-L' + sysconfig.get_config_var('LIBDEST') + '/config -lpython' + sys.version[:3] + ' ' + sysconfig.get_config_var('LIBS') + ' ' + sysconfig.get_config_var('SYSLIBS'))")
++INCLUDE_PERL=$(shell perl -MConfig -e 'print "-I", $$Config{archlibexp}, "/CORE";')
++PERL_LIB=$(shell perl -MConfig -e 'print "-L", $$Config{archlibexp}, "/CORE -lperl ", $$Config{perllibs};')
+ SWIG_LOCATION = SwigLocation
+ SWIG = SWIG_LIB=SwigLib $(SWIG_LOCATION)/bin/swig
+ #endif
+@@ -247,17 +246,17 @@
_lfc2thr.so\
lfc2thr.py
ILFC_IFCE = $(PERLDIR) \
@@ -134,7 +140,20 @@ diff -ur lcgdm-1.7.4.4.orig/ns/Imakefile.lfc lcgdm-1.7.4.4/ns/Imakefile.lfc
#endif
NSDAEMON_OBJS = Cns_main.Osuf \
-@@ -477,8 +477,8 @@
+@@ -484,53 +483,53 @@
+ RemoveFiles(lfc_perlwrap.o lfc_perlwrap.c)
+ $(SWIG) -perl -I$(INCLUDES) -DNSTYPE_LFC -o lfc_perlwrap.c lfc.i
+ $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PERL) -Dbool=char -D_GNU_SOURCE lfc_perlwrap.c
+- $(LD) $(SHLIBLDFLAGS) -o lfc.so lfc_perlwrap.o $(LIBS) -llfc
++ $(LD) $(SHLIBLDFLAGS) -o lfc.so lfc_perlwrap.o $(PERL_LIB) $(LIBS)
+
+ lfc.py : _lfc.so
+ _lfc.so : lfc.i ../h/lfc_api.h ../h/Cns_api.h
+ RemoveFiles(lfc_wrap.o lfc_wrap.c)
+ $(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfc.i
+ $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc_wrap.c
+- $(LD) $(SHLIBLDFLAGS) -o _lfc.so lfc_wrap.o $(LIBS) -llfc
++ $(LD) $(SHLIBLDFLAGS) -o _lfc.so lfc_wrap.o $(PYTHON_LIB) $(LIBS)
InstallTarget(lfc.so,root,root,0755,$(PERLDIR))
InstallTarget(lfc.pm,root,root,0644,$(PERLDIR))
@@ -145,9 +164,11 @@ diff -ur lcgdm-1.7.4.4.orig/ns/Imakefile.lfc lcgdm-1.7.4.4/ns/Imakefile.lfc
lfc2.py : _lfc2.so
_lfc2.so : lfc2.i ../h/lfc_api.h ../h/Cns_api.h
-@@ -487,8 +487,8 @@
+ RemoveFiles(lfc2_wrap.o lfc2_wrap.c)
+ $(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfc2.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2_wrap.c
- $(LD) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(LIBS) -llfc
+- $(LD) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(LIBS) -llfc
++ $(LD) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(PYTHON_LIB) $(LIBS)
-InstallTarget(_lfc2.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(lfc2.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
@@ -156,9 +177,11 @@ diff -ur lcgdm-1.7.4.4.orig/ns/Imakefile.lfc lcgdm-1.7.4.4/ns/Imakefile.lfc
lfcthr.py : _lfcthr.so
_lfcthr.so : lfcthr.i ../h/lfc_api.h ../h/Cns_api.h
-@@ -497,8 +497,8 @@
+ RemoveFiles(lfcthr_wrap.o lfcthr_wrap.c)
+ $(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfcthr.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfcthr_wrap.c
- $(LD) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(LIBS) -llfc
+- $(LD) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(LIBS) -llfc
++ $(LD) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(PYTHON_LIB) $(LIBS)
-InstallTarget(_lfcthr.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(lfcthr.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
@@ -167,9 +190,11 @@ diff -ur lcgdm-1.7.4.4.orig/ns/Imakefile.lfc lcgdm-1.7.4.4/ns/Imakefile.lfc
lfc2thr.py : _lfc2thr.so
_lfc2thr.so : lfc2thr.i ../h/lfc_api.h ../h/Cns_api.h
-@@ -507,12 +507,12 @@
+ RemoveFiles(lfc2thr_wrap.o lfc2thr_wrap.c)
+ $(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfc2thr.i
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2thr_wrap.c
- $(LD) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(LIBS) -llfc
+- $(LD) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(LIBS) -llfc
++ $(LD) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(PYTHON_LIB) $(LIBS)
-InstallTarget(_lfc2thr.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(lfc2thr.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
diff --git a/lcgdm-race.patch b/lcgdm-race.patch
index 78ef938..d447372 100644
--- a/lcgdm-race.patch
+++ b/lcgdm-race.patch
@@ -1,6 +1,6 @@
-diff -ur lcgdm-1.7.4.7.orig/config/Imake.rules lcgdm-1.7.4.7/config/Imake.rules
---- lcgdm-1.7.4.7.orig/config/Imake.rules 2010-06-24 18:29:56.813553853 +0200
-+++ lcgdm-1.7.4.7/config/Imake.rules 2010-06-24 19:02:09.600554203 +0200
+diff -ur lcgdm-1.8.1.2.orig/config/Imake.rules lcgdm-1.8.1.2/config/Imake.rules
+--- lcgdm-1.8.1.2.orig/config/Imake.rules 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/config/Imake.rules 2011-09-02 16:59:34.197572637 +0200
@@ -11,19 +11,19 @@
#if UseNroff
@@ -53,7 +53,7 @@ diff -ur lcgdm-1.7.4.7.orig/config/Imake.rules lcgdm-1.7.4.7/config/Imake.rules
if [ `$(IDCMD) -u` = 0 ]; then \ @@\
chown owner $@ ; \ @@\
chgrp group $@ ; \ @@\
-@@ -157,19 +157,19 @@
+@@ -157,12 +157,12 @@
#ifndef InstallSharedLibrary
#define InstallSharedLibrary(libname,rev,dest) @@\
@@ -69,14 +69,104 @@ diff -ur lcgdm-1.7.4.7.orig/config/Imake.rules lcgdm-1.7.4.7/config/Imake.rules
+ ln -s SharedLibraryTargetName(libname).rev $@.`echo rev|cut -f1 -d.`
#endif
- #ifndef InstallPlugin
- #define InstallPlugin(libname,rev,dest) @@\
--dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\
-- -mv $@ dest/OLD$? @@\
-- cp $? $@
-+dest/SharedLibraryTargetName(libname): dest SharedLibraryTargetName(libname) @@\
-+ -mv $@ dest/OLD/**/SharedLibraryTargetName(libname) @@\
-+ cp SharedLibraryTargetName(libname) $@
- #endif
-
#ifndef MakeDir
+diff -ur lcgdm-1.8.1.2.orig/dli/Imakefile lcgdm-1.8.1.2/dli/Imakefile
+--- lcgdm-1.8.1.2.orig/dli/Imakefile 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/dli/Imakefile 2011-09-02 17:02:05.716604006 +0200
+@@ -51,7 +51,8 @@
+
+ all: $(SERVER) $(CLIENT)
+
+-dliH.h dliStub.h dliC.c dliClient.c dliServer.c DataLocationInterface.nsmap: DataLocationInterface.h
++dliStub.h dliC.c dliClient.c dliServer.c DataLocationInterface.nsmap: dliH.h
++dliH.h: DataLocationInterface.h
+ $(GSOAP_LOCATION)/bin/soapcpp2 -c -p dli DataLocationInterface.h
+ DataLocationInterface.h: DataLocationInterface.wsdl
+ $(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -t typemap.dat DataLocationInterface.wsdl
+@@ -109,5 +110,6 @@
+ COMM###################### DEPENDENCIES ##########################
+
+ dli.Osuf: dliH.h DataLocationInterface.nsmap
++lfc-dli-client.Osuf: dliH.h DataLocationInterface.nsmap
+
+ COMM DO NOT DELETE THIS LINE -- make depend depends on it.
+diff -ur lcgdm-1.8.1.2.orig/dpmcopy/Imakefile lcgdm-1.8.1.2/dpmcopy/Imakefile
+--- lcgdm-1.8.1.2.orig/dpmcopy/Imakefile 2011-05-31 12:22:46.000000000 +0200
++++ lcgdm-1.8.1.2/dpmcopy/Imakefile 2011-09-02 17:03:30.340507341 +0200
+@@ -134,7 +134,8 @@
+ proc INAME=dpm_oracle_ifce INCLUDE=$(INCLUDES) CHAR_MAP=STRING PARSE=FULL $(WNT_SYS_INCLUDE)
+ #define YES 1
+
+-srmv2H.h srmv2Stub.h srmv2C.c srmv2Client.c srmSoapBinding.nsmap: srm.v2.2.h
++srmv2Stub.h srmv2C.c srmv2Client.c srmSoapBinding.nsmap: srmv2H.h
++srmv2H.h: srm.v2.2.h
+ $(GSOAP_LOCATION)/bin/soapcpp2 -c -p srmv2 srm.v2.2.h
+ srm.v2.2.h: srm.v2.2.wsdl
+ $(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.2.wsdl
+diff -ur lcgdm-1.8.1.2.orig/srmv1/Imakefile lcgdm-1.8.1.2/srmv1/Imakefile
+--- lcgdm-1.8.1.2.orig/srmv1/Imakefile 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/srmv1/Imakefile 2011-09-02 17:04:34.996672064 +0200
+@@ -117,7 +117,8 @@
+
+ all: $(SERVER)
+
+-srmv1H.h srmv1Stub.h srmv1C.c srmv1Server.c ISRM.nsmap: srm.v1.1.h
++srmv1Stub.h srmv1C.c srmv1Server.c ISRM.nsmap: srmv1H.h
++srmv1H.h: srm.v1.1.h
+ $(GSOAP_LOCATION)/bin/soapcpp2 -c -p srmv1 srm.v1.1.h
+ srm.v1.1.h: srm.v1.1.wsdl
+ $(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -w -y -t typemap.dat srm.v1.1.wsdl
+@@ -195,5 +196,6 @@
+ COMM###################### DEPENDENCIES ##########################
+
+ srmv1.Osuf: srmv1H.h ISRM.nsmap
++srmv1_procreq.Osuf: srmv1H.h
+
+ COMM DO NOT DELETE THIS LINE -- make depend depends on it.
+diff -ur lcgdm-1.8.1.2.orig/srmv2/Imakefile lcgdm-1.8.1.2/srmv2/Imakefile
+--- lcgdm-1.8.1.2.orig/srmv2/Imakefile 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/srmv2/Imakefile 2011-09-02 17:05:45.268764203 +0200
+@@ -121,7 +121,8 @@
+
+ all: $(SERVER)
+
+-srmv2H.h srmv2Stub.h srmv2C.c srmv2Server.c srmSoapBinding.nsmap: srm.v2.1.1.h
++srmv2Stub.h srmv2C.c srmv2Server.c srmSoapBinding.nsmap: srmv2H.h
++srmv2H.h: srm.v2.1.1.h
+ $(GSOAP_LOCATION)/bin/soapcpp2 -c -p srmv2 srm.v2.1.1.h
+ srm.v2.1.1.h: srm.v2.1.1.wsdl
+ $(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.1.1.wsdl
+@@ -199,5 +200,9 @@
+ COMM###################### DEPENDENCIES ##########################
+
+ srmv2.Osuf: srmv2H.h srmSoapBinding.nsmap
++srmv2_dirreq.Osuf: srmv2H.h
++srmv2_permreq.Osuf: srmv2H.h
++srmv2_spacereq.Osuf: srmv2H.h
++srmv2_xferreq.Osuf: srmv2H.h
+
+ COMM DO NOT DELETE THIS LINE -- make depend depends on it.
+diff -ur lcgdm-1.8.1.2.orig/srmv2.2/Imakefile lcgdm-1.8.1.2/srmv2.2/Imakefile
+--- lcgdm-1.8.1.2.orig/srmv2.2/Imakefile 2011-05-31 12:22:46.000000000 +0200
++++ lcgdm-1.8.1.2/srmv2.2/Imakefile 2011-09-02 17:06:49.942928633 +0200
+@@ -123,7 +123,8 @@
+
+ all: $(SERVER)
+
+-srmv2H.h srmv2Stub.h srmv2C.c srmv2Server.c srmSoapBinding.nsmap: srm.v2.2.h
++srmv2Stub.h srmv2C.c srmv2Server.c srmSoapBinding.nsmap: srmv2H.h
++srmv2H.h: srm.v2.2.h
+ $(GSOAP_LOCATION)/bin/soapcpp2 -c -p srmv2 srm.v2.2.h
+ srm.v2.2.h: srm.v2.2.wsdl
+ $(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.2.wsdl
+@@ -203,5 +204,10 @@
+ COMM###################### DEPENDENCIES ##########################
+
+ srmv2.Osuf: srmv2H.h srmSoapBinding.nsmap
++srmv2_dirreq.Osuf: srmv2H.h
++srmv2_discovreq.Osuf: srmv2H.h
++srmv2_permreq.Osuf: srmv2H.h
++srmv2_spacereq.Osuf: srmv2H.h
++srmv2_xferreq.Osuf: srmv2H.h
+
+ COMM DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/lcgdm-shliblink.patch b/lcgdm-shliblink.patch
index b716e05..7d1288b 100644
--- a/lcgdm-shliblink.patch
+++ b/lcgdm-shliblink.patch
@@ -1,19 +1,31 @@
-diff -ur lcgdm-1.7.4.7.orig/config/Imake.rules lcgdm-1.7.4.7/config/Imake.rules
---- lcgdm-1.7.4.7.orig/config/Imake.rules 2010-06-25 18:35:08.685803663 +0200
-+++ lcgdm-1.7.4.7/config/Imake.rules 2010-06-25 18:36:34.765803696 +0200
+diff -ur lcgdm-1.8.1.2.orig/config/Imake.rules lcgdm-1.8.1.2/config/Imake.rules
+--- lcgdm-1.8.1.2.orig/config/Imake.rules 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/config/Imake.rules 2011-09-03 23:03:33.188011657 +0200
@@ -95,7 +95,7 @@
#ifndef NormalProgramTarget
#define NormalProgramTarget(program,objects,deplibs,libs) \
ProgramTargetName(program): objects deplibs @@\
-- $(CC) -o $@ $(LDFLAGS) objects libs
-+ LD_LIBRARY_PATH=../shlib $(CC) -o $@ $(LDFLAGS) objects libs
+- $(LD) -o $@ $(LDFLAGS) objects libs
++ LD_LIBRARY_PATH=../shlib $(LD) -o $@ $(LDFLAGS) objects libs
#endif
#ifndef MakeSubdirs
-diff -ur lcgdm-1.7.4.7.orig/dicomcopy/Imakefile lcgdm-1.7.4.7/dicomcopy/Imakefile
---- lcgdm-1.7.4.7.orig/dicomcopy/Imakefile 2010-06-25 18:34:58.732553639 +0200
-+++ lcgdm-1.7.4.7/dicomcopy/Imakefile 2010-06-25 18:36:34.766803822 +0200
-@@ -27,7 +27,7 @@
+diff -ur lcgdm-1.8.1.2.orig/config/Imake.tmpl lcgdm-1.8.1.2/config/Imake.tmpl
+--- lcgdm-1.8.1.2.orig/config/Imake.tmpl 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/config/Imake.tmpl 2011-09-03 23:04:51.455986760 +0200
+@@ -59,7 +59,7 @@
+ CP = cp
+ #if !defined(SOLARIS)
+ IDCMD = id
+-LD = cc
++LD = $(CC)
+ #else
+ IDCMD = /usr/xpg4/bin/id
+ #endif
+diff -ur lcgdm-1.8.1.2.orig/dicomcopy/Imakefile lcgdm-1.8.1.2/dicomcopy/Imakefile
+--- lcgdm-1.8.1.2.orig/dicomcopy/Imakefile 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/dicomcopy/Imakefile 2011-09-03 23:03:33.188011657 +0200
+@@ -31,7 +31,7 @@
#if SOLARIS
LIBS = -L../shlib -ldpm -llcgdm -lsocket -lnsl -ldl
#else
@@ -22,7 +34,7 @@ diff -ur lcgdm-1.7.4.7.orig/dicomcopy/Imakefile lcgdm-1.7.4.7/dicomcopy/Imakefil
#endif
SPOOL = DicomcopySpool
LOGFILE = FileName($(SPOOL),log)
-@@ -42,7 +42,7 @@
+@@ -46,7 +46,7 @@
MYSFLG = -DUSE_MYSQL
MYSQL_LOCATION = MySQLLocation
MYSINC = -I$(MYSQL_LOCATION)/include/mysql
@@ -31,7 +43,7 @@ diff -ur lcgdm-1.7.4.7.orig/dicomcopy/Imakefile lcgdm-1.7.4.7/dicomcopy/Imakefil
DBCREAT = create_dicomcopy_tables_mysql.sql
#else
#if UsePostgres
-@@ -64,7 +64,7 @@
+@@ -68,7 +68,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
@@ -40,19 +52,19 @@ diff -ur lcgdm-1.7.4.7.orig/dicomcopy/Imakefile lcgdm-1.7.4.7/dicomcopy/Imakefil
COMM######################### RULES ##############################
-@@ -146,7 +146,7 @@
+@@ -153,7 +153,7 @@
NormalLibraryTarget(dicomcopy,dicomcopy_inc_reqctr.Osuf send2dicomcopyd.Osuf)
SharedLibraryTargetName(dpm_dicom): dpm_dicomcopyfile.Osuf
-- $(CC) $(SHLIBLDFLAGS) -o $@ dpm_dicomcopyfile.Osuf
-+ $(CC) $(SHLIBLDFLAGS) -o $@ dpm_dicomcopyfile.Osuf -L../shlib -ldpm -llcgdm
+- $(LD) $(SHLIBLDFLAGS) -o $@ dpm_dicomcopyfile.Osuf
++ $(LD) $(SHLIBLDFLAGS) -o $@ dpm_dicomcopyfile.Osuf -L../shlib -ldpm -llcgdm
install: $(BIN) $(DPMSHAREDIR) $(SYSCONFDIR) $(IPROGS_D) $(SPOOL)
-diff -ur lcgdm-1.7.4.7.orig/dli/Imakefile lcgdm-1.7.4.7/dli/Imakefile
---- lcgdm-1.7.4.7.orig/dli/Imakefile 2010-06-06 13:49:40.000000000 +0200
-+++ lcgdm-1.7.4.7/dli/Imakefile 2010-06-25 18:36:34.766803822 +0200
-@@ -20,9 +20,9 @@
+diff -ur lcgdm-1.8.1.2.orig/dli/Imakefile lcgdm-1.8.1.2/dli/Imakefile
+--- lcgdm-1.8.1.2.orig/dli/Imakefile 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/dli/Imakefile 2011-09-03 23:03:33.189011644 +0200
+@@ -13,9 +13,9 @@
SOAPFLG = -DWITH_IPV6
INCLUDES = FileName(..,h)
#if SOLARIS
@@ -64,44 +76,19 @@ diff -ur lcgdm-1.7.4.7.orig/dli/Imakefile lcgdm-1.7.4.7/dli/Imakefile
#endif
SPOOL = DliSpool
LOGFILE = FileName($(SPOOL),log)
-@@ -62,7 +62,7 @@
+@@ -60,7 +60,7 @@
$(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
- NormalProgramTarget(lfc-dli,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(MTLDLIBS))
--NormalProgramTarget(lfc-dli-client,lfc-dli-client.Osuf dliC.Osuf dliClient.Osuf stdsoap2.Osuf,$(DEPLIB),$(LIBS))
-+NormalProgramTarget(lfc-dli-client,lfc-dli-client.Osuf dliC.Osuf dliClient.Osuf stdsoap2.Osuf,$(DEPLIB),)
+ NormalProgramTarget(lfc-dli,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(SOAPLIB) $(LIBS) $(MTLDLIBS))
+-NormalProgramTarget(lfc-dli-client,lfc-dli-client.Osuf $(STDSOAP_OBJS) dliC.Osuf dliClient.Osuf,$(DEPLIB),$(SOAPLIB) $(LIBS))
++NormalProgramTarget(lfc-dli-client,lfc-dli-client.Osuf $(STDSOAP_OBJS) dliC.Osuf dliClient.Osuf,$(DEPLIB),$(SOAPLIB))
rc.lfc-dli: lfc-dli.scripts
- $(CP) $? $@
- lfc-dli.conf.templ: lfc-dli.sysconfig
-diff -ur lcgdm-1.7.4.7.orig/dpm/Imakefile lcgdm-1.7.4.7/dpm/Imakefile
---- lcgdm-1.7.4.7.orig/dpm/Imakefile 2010-06-25 18:34:58.733553835 +0200
-+++ lcgdm-1.7.4.7/dpm/Imakefile 2010-06-26 07:19:14.933553056 +0200
-@@ -7,11 +7,10 @@
- COMM Make Disk Pool Manager
-
- #if BuildInterfaces
--PYTHON_VERSION=$(shell python -c "import sys; print sys.version[:3]")
--PYTHON_PREFIX=$(shell python -c "import os; import sys; print os.path.normpath(sys.prefix)")
--INCLUDE_PYTHON=-I$(shell python -c "from distutils import sysconfig; print sysconfig.get_python_inc(0,prefix='${PYTHON_PREFIX}')")
--PYTHON_LIB=$(shell python -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1,prefix='${PYTHON_PREFIX}')")
--INCLUDE_PERL=-I$(shell perl -MConfig -e 'print $$Config{archlibexp}, "/CORE";')
-+INCLUDE_PYTHON=$(shell python -c "from distutils import sysconfig; print('-I' + sysconfig.get_python_inc(0))")
-+PYTHON_LIB=$(shell python -c "from distutils import sysconfig; import sys; print('-L' + sysconfig.get_config_var('LIBDEST') + '/config -lpython' + sys.version[:3] + ' ' + sysconfig.get_config_var('LIBS') + ' ' + sysconfig.get_config_var('SYSLIBS'))")
-+INCLUDE_PERL=$(shell perl -MConfig -e 'print "-I", $$Config{archlibexp}, "/CORE";')
-+PERL_LIB=$(shell perl -MConfig -e 'print "-L", $$Config{archlibexp}, "/CORE -lperl ", $$Config{perllibs};')
- SWIG_LOCATION = SwigLocation
- SWIG = SWIG_LIB=SwigLib $(SWIG_LOCATION)/bin/swig
- #endif
-@@ -28,7 +27,7 @@
- GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
- #endif
- GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
--GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR)
-+GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
- LIBCSEC += $(GLOBUS_LIBS)
- #endif
- LIBCSEC += -ldl
-@@ -41,12 +40,12 @@
+ sed -e 's#DPMCONFIGFILE=.*#DPMCONFIGFILE=$(DPMCONFIG)#' \
+ -e 's#PREFIX=.*#PREFIX=$(prefix)#' $? > $@
+diff -ur lcgdm-1.8.1.2.orig/dpm/Imakefile lcgdm-1.8.1.2/dpm/Imakefile
+--- lcgdm-1.8.1.2.orig/dpm/Imakefile 2011-05-31 12:22:45.000000000 +0200
++++ lcgdm-1.8.1.2/dpm/Imakefile 2011-09-03 23:03:33.190011631 +0200
+@@ -45,12 +45,12 @@
#endif
INCLUDES = FileName(..,h)
#if SOLARIS
@@ -116,7 +103,7 @@ diff -ur lcgdm-1.7.4.7.orig/dpm/Imakefile lcgdm-1.7.4.7/dpm/Imakefile
#endif
#endif
LIBUUID =
-@@ -77,7 +76,7 @@
+@@ -81,7 +81,7 @@
MYSFLG = -DUSE_MYSQL
MYSQL_LOCATION = MySQLLocation
MYSINC = -I$(MYSQL_LOCATION)/include/mysql
@@ -125,7 +112,7 @@ diff -ur lcgdm-1.7.4.7.orig/dpm/Imakefile lcgdm-1.7.4.7/dpm/Imakefile
DBCREAT = create_dpm_tables_mysql.sql
#else
#if UsePostgres
-@@ -109,7 +108,7 @@
+@@ -113,7 +113,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
@@ -134,44 +121,28 @@ diff -ur lcgdm-1.7.4.7.orig/dpm/Imakefile lcgdm-1.7.4.7/dpm/Imakefile
COMM######################### RULES ##############################
-@@ -420,21 +419,21 @@
- RemoveFiles(dpm_perlwrap.o dpm_perlwrap.c)
- $(SWIG) -perl -I$(INCLUDES) -DNSTYPE_DPNS -o dpm_perlwrap.c dpm.i
- $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PERL) -Dbool=char -D_GNU_SOURCE -DNSTYPE_DPNS dpm_perlwrap.c
-- $(CC) $(SHLIBLDFLAGS) -o dpm.so dpm_perlwrap.o $(LIBS) -ldpm
-+ $(CC) $(SHLIBLDFLAGS) -o dpm.so dpm_perlwrap.o $(PERL_LIB) $(LIBS)
-
- dpm.py : _dpm.so
- _dpm.so : dpm.i ../h/dpm_api.h ../h/dpns_api.h ../h/Cns_api.h
- RemoveFiles(dpm_wrap.o dpm_wrap.c)
- $(SWIG) -python -I$(INCLUDES) -DNSTYPE_DPNS dpm.i
- $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PYTHON) -DNSTYPE_DPNS dpm_wrap.c
-- $(CC) $(SHLIBLDFLAGS) -o _dpm.so dpm_wrap.o $(LIBS) -ldpm
-+ $(CC) $(SHLIBLDFLAGS) -o _dpm.so dpm_wrap.o $(PYTHON_LIB) $(LIBS)
-
- dpm2.py : _dpm2.so
- _dpm2.so : dpm2.i ../h/dpm_api.h ../h/dpns_api.h ../h/Cns_api.h
- RemoveFiles(dpm2_wrap.o dpm2_wrap.c)
- $(SWIG) -python -I$(INCLUDES) -I../ns -DNSTYPE_DPNS dpm2.i
- $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PYTHON) -DNSTYPE_DPNS dpm2_wrap.c
-- $(CC) $(SHLIBLDFLAGS) -o _dpm2.so dpm2_wrap.o $(LIBS) -ldpm
-+ $(CC) $(SHLIBLDFLAGS) -o _dpm2.so dpm2_wrap.o $(PYTHON_LIB) $(LIBS)
-
- InstallTarget(dpm.so,root,root,0755,$(PERLDIR))
- InstallTarget(dpm.pm,root,root,0644,$(PERLDIR))
-diff -ur lcgdm-1.7.4.7.orig/dpmcopy/Imakefile lcgdm-1.7.4.7/dpmcopy/Imakefile
---- lcgdm-1.7.4.7.orig/dpmcopy/Imakefile 2010-06-06 13:49:34.000000000 +0200
-+++ lcgdm-1.7.4.7/dpmcopy/Imakefile 2010-06-25 18:36:34.767803529 +0200
-@@ -23,7 +23,7 @@
- GLOBUS_FLAVOUR=GlobusFlavour
+diff -ur lcgdm-1.8.1.2.orig/dpmcopy/Imakefile lcgdm-1.8.1.2/dpmcopy/Imakefile
+--- lcgdm-1.8.1.2.orig/dpmcopy/Imakefile 2011-05-31 12:22:46.000000000 +0200
++++ lcgdm-1.8.1.2/dpmcopy/Imakefile 2011-09-03 23:03:33.190011631 +0200
+@@ -27,7 +27,7 @@
+ #if EMIBuild
+ GLOBUS_INCLUDES=-I$(GLOBUS_LOCATION)/include/globus -I$(GLOBUS_LOCATION)/$(_lib)/globus/include
+ GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common
+-GGC_LIB=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gass_copy -lglobus_ftp_client
++GGC_LIB=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gass_copy -lglobus_ftp_client -lglobus_common
+ #if UseVOMS
+ VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi
+ SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION) $(VOMS_LIB) $(GLOBUS_LIBS)
+@@ -40,7 +40,7 @@
VOMS_FLAVOUR=GlobusFlavour
+ GLOBUS_INCLUDES=-I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR)
GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
-GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR)
+GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
- GSOAP_LOCATION=GsoapLocation
- GSOAP_VERSION=GsoapVersion
- WSDL2H_FLAGS=GsoapWsdl2hFlags
-@@ -37,9 +37,9 @@
+ #if UseVOMS
+ VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR)
+ SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR) $(VOMS_LIB) $(GLOBUS_LIBS)
+@@ -52,9 +52,9 @@
SOAPFLG = -DWITH_IPV6
INCLUDES = FileName(..,h)
#if SOLARIS
@@ -183,7 +154,7 @@ diff -ur lcgdm-1.7.4.7.orig/dpmcopy/Imakefile lcgdm-1.7.4.7/dpmcopy/Imakefile
#endif
SPOOL = DpmcopySpool
LOGFILE = FileName($(SPOOL),log)
-@@ -53,7 +53,7 @@
+@@ -68,7 +68,7 @@
MYSFLG = -DUSE_MYSQL
MYSQL_LOCATION = MySQLLocation
MYSINC = -I$(MYSQL_LOCATION)/include/mysql
@@ -192,7 +163,7 @@ diff -ur lcgdm-1.7.4.7.orig/dpmcopy/Imakefile lcgdm-1.7.4.7/dpmcopy/Imakefile
#else
#if UsePostgres
DBOBJS = dpm_libpq_ifce.Osuf
-@@ -73,7 +73,7 @@
+@@ -88,7 +88,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
@@ -201,9 +172,9 @@ diff -ur lcgdm-1.7.4.7.orig/dpmcopy/Imakefile lcgdm-1.7.4.7/dpmcopy/Imakefile
COMM######################### RULES ##############################
-diff -ur lcgdm-1.7.4.7.orig/lib/Imakefile lcgdm-1.7.4.7/lib/Imakefile
---- lcgdm-1.7.4.7.orig/lib/Imakefile 2010-06-06 13:49:33.000000000 +0200
-+++ lcgdm-1.7.4.7/lib/Imakefile 2010-06-25 18:36:34.767803529 +0200
+diff -ur lcgdm-1.8.1.2.orig/lib/Imakefile lcgdm-1.8.1.2/lib/Imakefile
+--- lcgdm-1.8.1.2.orig/lib/Imakefile 2011-05-31 12:22:46.000000000 +0200
++++ lcgdm-1.8.1.2/lib/Imakefile 2011-09-03 23:03:33.191011618 +0200
@@ -34,7 +34,9 @@
install: $(LIB) FileName($(LIB),LibraryTargetName(dpm))
@@ -234,10 +205,10 @@ diff -ur lcgdm-1.7.4.7.orig/lib/Imakefile lcgdm-1.7.4.7/lib/Imakefile
liblcgdm.a: $(COMMONLIB) $(SECURITYLIB)
-diff -ur lcgdm-1.7.4.7.orig/ns/Imakefile lcgdm-1.7.4.7/ns/Imakefile
---- lcgdm-1.7.4.7.orig/ns/Imakefile 2010-06-06 13:49:38.000000000 +0200
-+++ lcgdm-1.7.4.7/ns/Imakefile 2010-06-25 18:36:34.768802677 +0200
-@@ -36,27 +36,27 @@
+diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile lcgdm-1.8.1.2/ns/Imakefile
+--- lcgdm-1.8.1.2.orig/ns/Imakefile 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/ns/Imakefile 2011-09-03 23:03:33.192011604 +0200
+@@ -45,27 +45,27 @@
INCLUDES = FileName(..,h)
TOPLIBRARYNAME = TopLibraryName
#if _AIX
@@ -272,7 +243,7 @@ diff -ur lcgdm-1.7.4.7.orig/ns/Imakefile lcgdm-1.7.4.7/ns/Imakefile
#endif
#endif
#endif
-@@ -71,7 +71,7 @@
+@@ -80,7 +80,7 @@
#if _WIN32
NSLIB = ns.lib
#else
@@ -281,7 +252,7 @@ diff -ur lcgdm-1.7.4.7.orig/ns/Imakefile lcgdm-1.7.4.7/ns/Imakefile
#endif
SPOOL = NsSpool
LOGFILE = FileName($(SPOOL),log)
-@@ -98,7 +98,7 @@
+@@ -107,7 +107,7 @@
MYSFLG = -DUSE_MYSQL
MYSQL_LOCATION = MySQLLocation
MYSINC = -I$(MYSQL_LOCATION)/include/mysql
@@ -290,9 +261,9 @@ diff -ur lcgdm-1.7.4.7.orig/ns/Imakefile lcgdm-1.7.4.7/ns/Imakefile
#else
#if UsePostgres
DBOBJS = Cns_libpq_ifce.Osuf
-diff -ur lcgdm-1.7.4.7.orig/ns/Imakefile.dpns lcgdm-1.7.4.7/ns/Imakefile.dpns
---- lcgdm-1.7.4.7.orig/ns/Imakefile.dpns 2010-06-06 13:49:38.000000000 +0200
-+++ lcgdm-1.7.4.7/ns/Imakefile.dpns 2010-06-25 18:36:34.768802677 +0200
+diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile.dpns lcgdm-1.8.1.2/ns/Imakefile.dpns
+--- lcgdm-1.8.1.2.orig/ns/Imakefile.dpns 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/ns/Imakefile.dpns 2011-09-03 23:03:33.192011604 +0200
@@ -22,7 +22,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
@@ -302,7 +273,7 @@ diff -ur lcgdm-1.7.4.7.orig/ns/Imakefile.dpns lcgdm-1.7.4.7/ns/Imakefile.dpns
COMM######################### RULES ##############################
-@@ -299,9 +299,9 @@
+@@ -307,9 +307,9 @@
NormalProgramTarget(dpns-chown,nschown.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS))
#if UseOracle && !defined(_WIN32)
dpnsdaemon: $(NSDAEMON_OBJS) $(DEPLIB)
@@ -314,25 +285,10 @@ diff -ur lcgdm-1.7.4.7.orig/ns/Imakefile.dpns lcgdm-1.7.4.7/ns/Imakefile.dpns
#endif
NormalProgramTarget(dpns-entergrpmap,nsentergrpmap.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS))
NormalProgramTarget(dpns-enterusrmap,nsenterusrmap.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS))
-diff -ur lcgdm-1.7.4.7.orig/ns/Imakefile.lfc lcgdm-1.7.4.7/ns/Imakefile.lfc
---- lcgdm-1.7.4.7.orig/ns/Imakefile.lfc 2010-06-25 18:34:58.734552913 +0200
-+++ lcgdm-1.7.4.7/ns/Imakefile.lfc 2010-06-26 07:18:05.562553157 +0200
-@@ -21,18 +21,17 @@
- #endif
-
- #if BuildInterfaces
--PYTHON_VERSION=$(shell python -c "import sys; print sys.version[:3]")
--PYTHON_PREFIX=$(shell python -c "import os; import sys; print os.path.normpath(sys.prefix)")
--INCLUDE_PYTHON=-I$(shell python -c "from distutils import sysconfig; print sysconfig.get_python_inc(0,prefix='${PYTHON_PREFIX}')")
--PYTHON_LIB=$(shell python -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1,prefix='${PYTHON_PREFIX}')")
--INCLUDE_PERL=-I$(shell perl -MConfig -e 'print $$Config{archlibexp}, "/CORE";')
-+INCLUDE_PYTHON=$(shell python -c "from distutils import sysconfig; print('-I' + sysconfig.get_python_inc(0))")
-+PYTHON_LIB=$(shell python -c "from distutils import sysconfig; import sys; print('-L' + sysconfig.get_config_var('LIBDEST') + '/config -lpython' + sys.version[:3] + ' ' + sysconfig.get_config_var('LIBS') + ' ' + sysconfig.get_config_var('SYSLIBS'))")
-+INCLUDE_PERL=$(shell perl -MConfig -e 'print "-I", $$Config{archlibexp}, "/CORE";')
-+PERL_LIB=$(shell perl -MConfig -e 'print "-L", $$Config{archlibexp}, "/CORE -lperl ", $$Config{perllibs};')
- SWIG_LOCATION = SwigLocation
- SWIG = SWIG_LIB=SwigLib $(SWIG_LOCATION)/bin/swig
- #endif
+diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile.lfc lcgdm-1.8.1.2/ns/Imakefile.lfc
+--- lcgdm-1.8.1.2.orig/ns/Imakefile.lfc 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/ns/Imakefile.lfc 2011-09-03 23:03:33.193011590 +0200
+@@ -33,7 +33,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
@@ -341,7 +297,7 @@ diff -ur lcgdm-1.7.4.7.orig/ns/Imakefile.lfc lcgdm-1.7.4.7/ns/Imakefile.lfc
COMM######################### RULES ##############################
-@@ -368,9 +367,9 @@
+@@ -378,9 +378,9 @@
NormalProgramTarget(lfc-chown,nschown.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS))
#if UseOracle && !defined(_WIN32)
lfcdaemon: $(NSDAEMON_OBJS) $(DEPLIB)
@@ -353,53 +309,9 @@ diff -ur lcgdm-1.7.4.7.orig/ns/Imakefile.lfc lcgdm-1.7.4.7/ns/Imakefile.lfc
#endif
NormalProgramTarget(lfc-delcomment,nsdelcomment.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS))
NormalProgramTarget(lfc-entergrpmap,nsentergrpmap.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS))
-@@ -470,14 +469,14 @@
- RemoveFiles(lfc_perlwrap.o lfc_perlwrap.c)
- $(SWIG) -perl -I$(INCLUDES) -DNSTYPE_LFC -o lfc_perlwrap.c lfc.i
- $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PERL) -Dbool=char -D_GNU_SOURCE lfc_perlwrap.c
-- $(CC) $(SHLIBLDFLAGS) -o lfc.so lfc_perlwrap.o $(LIBS) -llfc
-+ $(CC) $(SHLIBLDFLAGS) -o lfc.so lfc_perlwrap.o $(PERL_LIB) $(LIBS)
-
- lfc.py : _lfc.so
- _lfc.so : lfc.i ../h/lfc_api.h ../h/Cns_api.h
- RemoveFiles(lfc_wrap.o lfc_wrap.c)
- $(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfc.i
- $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc_wrap.c
-- $(CC) $(SHLIBLDFLAGS) -o _lfc.so lfc_wrap.o $(LIBS) -llfc
-+ $(CC) $(SHLIBLDFLAGS) -o _lfc.so lfc_wrap.o $(PYTHON_LIB) $(LIBS)
-
- InstallTarget(lfc.so,root,root,0755,$(PERLDIR))
- InstallTarget(lfc.pm,root,root,0644,$(PERLDIR))
-@@ -489,7 +488,7 @@
- RemoveFiles(lfc2_wrap.o lfc2_wrap.c)
- $(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfc2.i
- $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2_wrap.c
-- $(CC) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(LIBS) -llfc
-+ $(CC) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(PYTHON_LIB) $(LIBS)
-
- InstallTarget(_lfc2.so,root,root,0755,$(PYTHONDIR))
- InstallTarget(lfc2.py,root,root,0644,$(PYTHONDIR))
-@@ -499,7 +498,7 @@
- RemoveFiles(lfcthr_wrap.o lfcthr_wrap.c)
- $(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfcthr.i
- $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfcthr_wrap.c
-- $(CC) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(LIBS) -llfc
-+ $(CC) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(PYTHON_LIB) $(LIBS)
-
- InstallTarget(_lfcthr.so,root,root,0755,$(PYTHONDIR))
- InstallTarget(lfcthr.py,root,root,0644,$(PYTHONDIR))
-@@ -509,7 +508,7 @@
- RemoveFiles(lfc2thr_wrap.o lfc2thr_wrap.c)
- $(SWIG) -python -I$(INCLUDES) -DNSTYPE_LFC lfc2thr.i
- $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2thr_wrap.c
-- $(CC) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(LIBS) -llfc
-+ $(CC) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(PYTHON_LIB) $(LIBS)
-
- InstallTarget(_lfc2thr.so,root,root,0755,$(PYTHONDIR))
- InstallTarget(lfc2thr.py,root,root,0644,$(PYTHONDIR))
-diff -ur lcgdm-1.7.4.7.orig/rfio/Imakefile lcgdm-1.7.4.7/rfio/Imakefile
---- lcgdm-1.7.4.7.orig/rfio/Imakefile 2010-06-06 13:49:33.000000000 +0200
-+++ lcgdm-1.7.4.7/rfio/Imakefile 2010-06-25 18:36:34.769805876 +0200
+diff -ur lcgdm-1.8.1.2.orig/rfio/Imakefile lcgdm-1.8.1.2/rfio/Imakefile
+--- lcgdm-1.8.1.2.orig/rfio/Imakefile 2011-05-31 12:22:45.000000000 +0200
++++ lcgdm-1.8.1.2/rfio/Imakefile 2011-09-03 23:03:33.194011577 +0200
@@ -94,24 +94,24 @@
#endif
FFLAGS = $(FFOPTFLAGS) $(FPPUFL)
@@ -440,24 +352,28 @@ diff -ur lcgdm-1.7.4.7.orig/rfio/Imakefile lcgdm-1.7.4.7/rfio/Imakefile
#endif
LIBS = $(OPTLIBS)
-diff -ur lcgdm-1.7.4.7.orig/security/Imakefile lcgdm-1.7.4.7/security/Imakefile
---- lcgdm-1.7.4.7.orig/security/Imakefile 2010-06-25 18:35:08.686803720 +0200
-+++ lcgdm-1.7.4.7/security/Imakefile 2010-06-25 18:36:34.770803557 +0200
-@@ -49,9 +49,9 @@
- #define GSIMech GSI
+diff -ur lcgdm-1.8.1.2.orig/security/Imakefile lcgdm-1.8.1.2/security/Imakefile
+--- lcgdm-1.8.1.2.orig/security/Imakefile 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/security/Imakefile 2011-09-03 23:03:33.195011564 +0200
+@@ -57,12 +57,12 @@
#define SecAuthMechGSI -DGSI
+ #if EMIBuild
+ #define SecIncludeDirGSI -I$(GLOBUS_LOCATION)/include/globus -I$(GLOBUS_LOCATION)/$(_lib)/globus/include $(VOMS_INCLUDE)
+-#define SecLibsGSI -L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist $(VOMS_LIB)
++#define SecLibsGSI -L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_gsi_credential -lglobus_gsi_callback -lglobus_gsi_cert_utils -lglobus_common $(VOMS_LIB) -lssl -lcrypto
+ #else
#define SecIncludeDirGSI -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_INCLUDE)
-#define SecLibsGSI -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_LIB)
-+#define SecLibsGSI -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_credential_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_callback_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_common_$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_LIB) -lssl -lcrypto
++#define SecLibsGSI -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_credential_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_callback_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_cert_utils_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_common_$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_LIB) -lssl -lcrypto
#define SecIncludeDirGSIpthr -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR) $(VOMS_INCLUDE)
-#define SecLibsGSIpthr -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) $(VOMS_LIB)
-+#define SecLibsGSIpthr -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_gsi_credential_$(GLOBUS_FLAVOUR) -lglobus_gsi_callback_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR) $(VOMS_LIB) -lssl -lcrypto
++#define SecLibsGSIpthr -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_gsi_credential_$(GLOBUS_FLAVOUR) -lglobus_gsi_callback_$(GLOBUS_FLAVOUR) -lglobus_gsi_cert_utils_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR) $(VOMS_LIB) -lssl -lcrypto
+ #endif
#else
#define GSIMech
- #endif
-diff -ur lcgdm-1.7.4.7.orig/shlib/Imakefile lcgdm-1.7.4.7/shlib/Imakefile
---- lcgdm-1.7.4.7.orig/shlib/Imakefile 2010-06-25 18:35:08.686803720 +0200
-+++ lcgdm-1.7.4.7/shlib/Imakefile 2010-06-25 18:36:34.770803557 +0200
+diff -ur lcgdm-1.8.1.2.orig/shlib/Imakefile lcgdm-1.8.1.2/shlib/Imakefile
+--- lcgdm-1.8.1.2.orig/shlib/Imakefile 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/shlib/Imakefile 2011-09-03 23:03:33.195011564 +0200
@@ -35,7 +35,6 @@
install: $(LIB) FileName($(LIB),SharedLibraryTargetName(dpm))
@@ -470,24 +386,15 @@ diff -ur lcgdm-1.7.4.7.orig/shlib/Imakefile lcgdm-1.7.4.7/shlib/Imakefile
@mkdir tmp
@for i in $^ ;\
do (cd tmp; case $$i in *.a) $(AR) x ../$$i; rm -f $(SYMTABNAM) ;; esac) done
-- (cd tmp; $(CC) $(SHLIBLDFLAGS) -Wl,-soname,$@.`echo $(VERSION)|cut -f1 -d.` -o ../$@ *.o $(SHLIBREQLIBS) -L .. -llcgdm $(LIBCSEC))
-+ (cd tmp; $(CC) $(SHLIBLDFLAGS) -Wl,-soname,$@.`echo $(VERSION)|cut -f1 -d.` -o ../$@ *.o -L .. -llcgdm $(LIBCSEC))
- @-rm $@.`echo $(VERSION)|cut -f1 -d.`
- @-ln -s $@ $@.`echo $(VERSION)|cut -f1 -d.`
- @-rm -rf tmp
-@@ -71,7 +70,7 @@
- @mkdir tmp
- @for i in $^ ;\
- do (cd tmp; $(AR) x ../$$i; rm -f $(SYMTABNAM)) done
-- (cd tmp; $(CC) $(SHLIBLDFLAGS) -Wl,-soname,$@.`echo $(VERSION)|cut -f1 -d.` -o ../$@ *.o $(SHLIBREQLIBS) $(LIBCSEC))
-+ (cd tmp; $(CC) $(SHLIBLDFLAGS) -Wl,-soname,$@.`echo $(VERSION)|cut -f1 -d.` -o ../$@ *.o $(SHLIBREQLIBS) -ldl $(LIBCSEC))
- @-rm $@.`echo $(VERSION)|cut -f1 -d.`
- @-ln -s $@ $@.`echo $(VERSION)|cut -f1 -d.`
+- (cd tmp; $(CC) $(SHLIBLDFLAGS) SonameOption($@,`echo $(VERSION)|cut -f1 -d.`) -o ../$@ *.o $(SHLIBREQLIBS) -L.. -llcgdm $(LIBCSEC))
++ (cd tmp; $(CC) $(SHLIBLDFLAGS) SonameOption($@,`echo $(VERSION)|cut -f1 -d.`) -o ../$@ *.o -L.. -llcgdm $(LIBCSEC))
@-rm -rf tmp
-diff -ur lcgdm-1.7.4.7.orig/srmv1/Imakefile lcgdm-1.7.4.7/srmv1/Imakefile
---- lcgdm-1.7.4.7.orig/srmv1/Imakefile 2010-06-06 13:49:41.000000000 +0200
-+++ lcgdm-1.7.4.7/srmv1/Imakefile 2010-06-25 18:36:34.770803557 +0200
-@@ -41,9 +41,9 @@
+
+ liblcgdm.sl liblcgdm.so liblcgdm.dylib: $(COMMONLIB) $(SECURITYLIB)
+diff -ur lcgdm-1.8.1.2.orig/srmv1/Imakefile lcgdm-1.8.1.2/srmv1/Imakefile
+--- lcgdm-1.8.1.2.orig/srmv1/Imakefile 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/srmv1/Imakefile 2011-09-03 23:03:33.196011551 +0200
+@@ -53,9 +53,9 @@
SOAPFLG = -DWITH_IPV6
INCLUDES = FileName(..,h)
#if SOLARIS
@@ -499,7 +406,7 @@ diff -ur lcgdm-1.7.4.7.orig/srmv1/Imakefile lcgdm-1.7.4.7/srmv1/Imakefile
#endif
#ifndef darwin
LIBS += -luuid
-@@ -60,7 +60,7 @@
+@@ -72,7 +72,7 @@
MYSFLG = -DUSE_MYSQL
MYSQL_LOCATION = MySQLLocation
MYSINC = -I$(MYSQL_LOCATION)/include/mysql
@@ -508,7 +415,7 @@ diff -ur lcgdm-1.7.4.7.orig/srmv1/Imakefile lcgdm-1.7.4.7/srmv1/Imakefile
#else
#if UsePostgres
DBOBJS = ../dpm/dpm_libpq_ifce.Osuf
-@@ -80,7 +80,7 @@
+@@ -92,7 +92,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
@@ -517,10 +424,10 @@ diff -ur lcgdm-1.7.4.7.orig/srmv1/Imakefile lcgdm-1.7.4.7/srmv1/Imakefile
COMM######################### RULES ##############################
-diff -ur lcgdm-1.7.4.7.orig/srmv2/Imakefile lcgdm-1.7.4.7/srmv2/Imakefile
---- lcgdm-1.7.4.7.orig/srmv2/Imakefile 2010-06-06 13:49:41.000000000 +0200
-+++ lcgdm-1.7.4.7/srmv2/Imakefile 2010-06-25 18:36:34.771803334 +0200
-@@ -41,9 +41,9 @@
+diff -ur lcgdm-1.8.1.2.orig/srmv2/Imakefile lcgdm-1.8.1.2/srmv2/Imakefile
+--- lcgdm-1.8.1.2.orig/srmv2/Imakefile 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/srmv2/Imakefile 2011-09-03 23:03:33.197011538 +0200
+@@ -53,9 +53,9 @@
SOAPFLG = -DWITH_IPV6
INCLUDES = FileName(..,h)
#if SOLARIS
@@ -532,7 +439,7 @@ diff -ur lcgdm-1.7.4.7.orig/srmv2/Imakefile lcgdm-1.7.4.7/srmv2/Imakefile
#endif
#ifndef darwin
LIBS += -luuid
-@@ -60,7 +60,7 @@
+@@ -72,7 +72,7 @@
MYSFLG = -DUSE_MYSQL
MYSQL_LOCATION = MySQLLocation
MYSINC = -I$(MYSQL_LOCATION)/include/mysql
@@ -541,7 +448,7 @@ diff -ur lcgdm-1.7.4.7.orig/srmv2/Imakefile lcgdm-1.7.4.7/srmv2/Imakefile
#else
#if UsePostgres
DBOBJS = ../dpm/dpm_libpq_ifce.Osuf
-@@ -80,7 +80,7 @@
+@@ -92,7 +92,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
@@ -550,10 +457,10 @@ diff -ur lcgdm-1.7.4.7.orig/srmv2/Imakefile lcgdm-1.7.4.7/srmv2/Imakefile
COMM######################### RULES ##############################
-diff -ur lcgdm-1.7.4.7.orig/srmv2.2/Imakefile lcgdm-1.7.4.7/srmv2.2/Imakefile
---- lcgdm-1.7.4.7.orig/srmv2.2/Imakefile 2010-06-06 13:49:34.000000000 +0200
-+++ lcgdm-1.7.4.7/srmv2.2/Imakefile 2010-06-25 18:36:34.771803334 +0200
-@@ -42,9 +42,9 @@
+diff -ur lcgdm-1.8.1.2.orig/srmv2.2/Imakefile lcgdm-1.8.1.2/srmv2.2/Imakefile
+--- lcgdm-1.8.1.2.orig/srmv2.2/Imakefile 2011-05-31 12:22:46.000000000 +0200
++++ lcgdm-1.8.1.2/srmv2.2/Imakefile 2011-09-03 23:03:33.198011525 +0200
+@@ -54,9 +54,9 @@
INCLUDES = FileName(..,h)
BACKEND_LIBS = DepLibraryTargetName(dpmcopy,dpmcopy)
#if SOLARIS
@@ -565,7 +472,7 @@ diff -ur lcgdm-1.7.4.7.orig/srmv2.2/Imakefile lcgdm-1.7.4.7/srmv2.2/Imakefile
#endif
#ifndef darwin
LIBS += -luuid
-@@ -61,7 +61,7 @@
+@@ -73,7 +73,7 @@
MYSFLG = -DUSE_MYSQL
MYSQL_LOCATION = MySQLLocation
MYSINC = -I$(MYSQL_LOCATION)/include/mysql
@@ -574,7 +481,7 @@ diff -ur lcgdm-1.7.4.7.orig/srmv2.2/Imakefile lcgdm-1.7.4.7/srmv2.2/Imakefile
#else
#if UsePostgres
DBOBJS = ../dpm/dpm_libpq_ifce.Osuf
-@@ -81,7 +81,7 @@
+@@ -93,7 +93,7 @@
COMM######################### DEPENDENCY LIBRARIES ###############
@@ -583,15 +490,15 @@ diff -ur lcgdm-1.7.4.7.orig/srmv2.2/Imakefile lcgdm-1.7.4.7/srmv2.2/Imakefile
COMM######################### RULES ##############################
-@@ -121,9 +121,9 @@
+@@ -133,9 +133,9 @@
#if UseOracle && !defined(_WIN32)
srmv2.2: $(SRV_OBJS) $(DEPLIB) $(BACKEND_LIBS)
-- $(MAKE) -f oralink.mk srmv2.2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS)"
-+ $(MAKE) -f oralink.mk srmv2.2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(BACKEND_LIBS) $(LIBS) $(SECLIB) $(MTLDLIBS)"
+- $(MAKE) -f oralink.mk srmv2.2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(SOAPLIB) $(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS)"
++ $(MAKE) -f oralink.mk srmv2.2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(SOAPLIB) $(BACKEND_LIBS) $(LIBS) $(SECLIB) $(MTLDLIBS)"
#else
--NormalProgramTarget(srmv2.2,$(SRV_OBJS), $(DEPLIB) $(BACKEND_LIBS), $(MTLDFLAGS) $(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS))
-+NormalProgramTarget(srmv2.2,$(SRV_OBJS), $(DEPLIB) $(BACKEND_LIBS), $(MTLDFLAGS) $(BACKEND_LIBS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS))
+-NormalProgramTarget(srmv2.2,$(SRV_OBJS), $(DEPLIB) $(BACKEND_LIBS), $(MTLDFLAGS) $(SOAPLIB) $(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS))
++NormalProgramTarget(srmv2.2,$(SRV_OBJS), $(DEPLIB) $(BACKEND_LIBS), $(MTLDFLAGS) $(SOAPLIB) $(BACKEND_LIBS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS))
#endif
#if UseOracle
rc.srmv2.2: srmv2.2.scripts.oracle
diff --git a/lcgdm-usr.patch b/lcgdm-usr.patch
index c03beb5..39af01d 100644
--- a/lcgdm-usr.patch
+++ b/lcgdm-usr.patch
@@ -1,334 +1,162 @@
-diff -ur LCG-DM-1.7.3.1.orig/dicomcopy/Imakefile LCG-DM-1.7.3.1/dicomcopy/Imakefile
---- LCG-DM-1.7.3.1.orig/dicomcopy/Imakefile 2009-09-24 11:39:03.731117679 +0200
-+++ LCG-DM-1.7.3.1/dicomcopy/Imakefile 2009-09-24 11:39:46.617121785 +0200
+diff -ur lcgdm-1.8.1.2.orig/configure lcgdm-1.8.1.2/configure
+--- lcgdm-1.8.1.2.orig/configure 2011-05-31 12:22:47.000000000 +0200
++++ lcgdm-1.8.1.2/configure 2011-09-03 11:20:10.782557144 +0200
+@@ -215,6 +215,19 @@
+ $SITE_DEF >$SITE_DEF.new
+ mv $SITE_DEF.new $SITE_DEF
+ ;;
++ --with-sysconf-dir*)
++ if [ '--with-sysconf-dir' = "$1" ]; then
++ location="$2"
++ shift
++ else
++ location=`echo $1 | cut -d= -f 2`
++ fi
++ shift
++ [ 'yes' = "$VERBOSE" ] && echo "Sysconf dir: $location"
++ sed -e "s# SysconfDir\ .*\$# SysconfDir $location#" \
++ $SITE_DEF >$SITE_DEF.new
++ mv $SITE_DEF.new $SITE_DEF
++ ;;
+ --with-gsoap-location*)
+ if [ '--with-gsoap-location' = "$1" ]; then
+ location="$2"
+diff -ur lcgdm-1.8.1.2.orig/dicomcopy/Imakefile lcgdm-1.8.1.2/dicomcopy/Imakefile
+--- lcgdm-1.8.1.2.orig/dicomcopy/Imakefile 2011-09-03 11:19:24.694163404 +0200
++++ lcgdm-1.8.1.2/dicomcopy/Imakefile 2011-09-03 11:20:10.776557224 +0200
@@ -12,7 +12,7 @@
#if UseGSI
GLOBUS_LOCATION=GlobusLocation
- GLOBUS_FLAVOUR=GlobusFlavour
--GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
+ #if EMIBuild
+-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
- LIBCSEC += $(GLOBUS_LIBS)
- #endif
- #if UseVirtualIds
-diff -ur LCG-DM-1.7.3.1.orig/dli/Imakefile LCG-DM-1.7.3.1/dli/Imakefile
---- LCG-DM-1.7.3.1.orig/dli/Imakefile 2009-09-24 11:39:03.732119266 +0200
-+++ LCG-DM-1.7.3.1/dli/Imakefile 2009-09-24 11:39:46.618118396 +0200
-@@ -13,7 +13,7 @@
#else
- GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
- #endif
--GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
-+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
- GSOAP_LOCATION=GsoapLocation
- GSOAP_VERSION=GsoapVersion
- WSDL2H_FLAGS=GsoapWsdl2hFlags
-@@ -31,7 +31,7 @@
-
- DFLAGS = -DLOGFILE=\"$(LOGFILE)\" $(SOAPFLG)
-
--CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(VOMS_LOCATION)/include $(MTCCFLAGS) $(DFLAGS)
-+CFLAGS = -g -I$(INCLUDES) -I$(VOMS_LOCATION)/include/voms $(MTCCFLAGS) $(DFLAGS)
-
- COMM######################### RULES ##############################
-
-diff -ur LCG-DM-1.7.3.1.orig/dpm/Imakefile LCG-DM-1.7.3.1/dpm/Imakefile
---- LCG-DM-1.7.3.1.orig/dpm/Imakefile 2009-09-24 11:39:03.733118892 +0200
-+++ LCG-DM-1.7.3.1/dpm/Imakefile 2009-09-24 11:39:46.619119351 +0200
-@@ -27,8 +27,8 @@
- #else
- GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
- #endif
--GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
--GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
+ GLOBUS_FLAVOUR=GlobusFlavour
+ GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
+diff -ur lcgdm-1.8.1.2.orig/dpm/Imakefile lcgdm-1.8.1.2/dpm/Imakefile
+--- lcgdm-1.8.1.2.orig/dpm/Imakefile 2011-09-03 11:19:24.695163391 +0200
++++ lcgdm-1.8.1.2/dpm/Imakefile 2011-09-03 11:20:10.777557211 +0200
+@@ -24,7 +24,7 @@
+ #if UseGSI
+ GLOBUS_LOCATION=GlobusLocation
+ #if EMIBuild
+-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common
-+GGC_LIB=-lglobus_gass_copy -lglobus_ftp_client -lglobus_common
- LIBCSEC += $(GLOBUS_LIBS)
- #endif
- LIBCSEC += -ldl
-@@ -301,7 +301,7 @@
- all: $(CLIENT) $(SERVER) $(DPM_IFCE)
-
- dpm_copyfile.o: dpm_copyfile.c
-- $(CC) $(CFLAGS) -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR) -c dpm_copyfile.c
-+ $(CC) $(CFLAGS) -I/usr/include/globus -I/usr/$(_lib)/globus/include -c dpm_copyfile.c
-
- dicomcopy_libpq_ifce.c: DepSourceName(dicomcopy,dicomcopy_libpq_ifce.c)
- RemoveFile(dicomcopy_libpq_ifce.c)
-diff -ur LCG-DM-1.7.3.1.orig/dpmcopy/Imakefile LCG-DM-1.7.3.1/dpmcopy/Imakefile
---- LCG-DM-1.7.3.1.orig/dpmcopy/Imakefile 2009-09-24 11:39:26.762119985 +0200
-+++ LCG-DM-1.7.3.1/dpmcopy/Imakefile 2009-09-24 11:40:25.107118597 +0200
-@@ -22,17 +22,17 @@
+ #else
+ #if defined(__STDC__)
+ GLOBUS_FLAVOUR=GlobusFlavour##pthr
+diff -ur lcgdm-1.8.1.2.orig/dpmcopy/Imakefile lcgdm-1.8.1.2/dpmcopy/Imakefile
+--- lcgdm-1.8.1.2.orig/dpmcopy/Imakefile 2011-09-03 11:19:24.696163378 +0200
++++ lcgdm-1.8.1.2/dpmcopy/Imakefile 2011-09-03 11:20:10.778557198 +0200
+@@ -26,13 +26,13 @@
GLOBUS_LOCATION=GlobusLocation
- GLOBUS_FLAVOUR=GlobusFlavour
- VOMS_FLAVOUR=GlobusFlavour
--GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
--GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR)
+ #if EMIBuild
+ GLOBUS_INCLUDES=-I$(GLOBUS_LOCATION)/include/globus -I$(GLOBUS_LOCATION)/$(_lib)/globus/include
+-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common
+-GGC_LIB=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gass_copy -lglobus_ftp_client -lglobus_common
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common
+GGC_LIB=-lglobus_gass_copy -lglobus_ftp_client -lglobus_common
- GSOAP_LOCATION=GsoapLocation
- GSOAP_VERSION=GsoapVersion
- WSDL2H_FLAGS=GsoapWsdl2hFlags
- CGSI_GSOAP_LOCATION=CgsiGsoapLocation
#if UseVOMS
--VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR)
--SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR) $(VOMS_LIB) $(GLOBUS_LIBS)
+-VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi
+-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION) $(VOMS_LIB) $(GLOBUS_LIBS)
+VOMS_LIB = -lvomsapi
+SECLIB = -lcgsi_plugin_voms
#else
-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS)
+SECLIB = -lcgsi_plugin
#endif
- SOAPFLG = -DWITH_IPV6
- INCLUDES = FileName(..,h)
-@@ -69,7 +69,7 @@
- -DLOGFILE=\"$(LOGFILE)\" \
- $(ORAFLG) $(MYSFLG) $(POSFLG) $(CSECFLAG) $(VIDFLAG) $(VOMSFLAG) $(SOAPFLG)
-
--CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
-+CFLAGS = -g -I$(INCLUDES) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
-
- COMM######################### DEPENDENCY LIBRARIES ###############
-
-@@ -124,7 +124,7 @@
- $(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.2.wsdl
-
- dpm_copyfile.Osuf: dpm_copyfile.c
-- $(CC) $(CFLAGS) -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR) -c dpm_copyfile.c
-+ $(CC) $(CFLAGS) -I/usr/include/globus -I/usr/$(_lib)/globus/include -c dpm_copyfile.c
- dpmcopy_inc_reqctr.Osuf: dpmcopy_inc_reqctr.c
- $(CC) -c -g -I$(INCLUDES) $(MTCCFLAGS) $(CSECFLAG) dpmcopy_inc_reqctr.c
- send2dpmcopyd.Osuf: send2dpmcopyd.c
-diff -ur LCG-DM-1.7.3.1.orig/ns/Imakefile LCG-DM-1.7.3.1/ns/Imakefile
---- LCG-DM-1.7.3.1.orig/ns/Imakefile 2009-09-24 11:38:54.638117192 +0200
-+++ LCG-DM-1.7.3.1/ns/Imakefile 2009-09-24 11:39:46.622118368 +0200
-@@ -22,7 +22,7 @@
+ SOAPLIB = -lgsoap
#else
- GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
- #endif
--GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
+diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile lcgdm-1.8.1.2/ns/Imakefile
+--- lcgdm-1.8.1.2.orig/ns/Imakefile 2011-09-03 11:19:24.697163365 +0200
++++ lcgdm-1.8.1.2/ns/Imakefile 2011-09-03 11:20:10.778557198 +0200
+@@ -23,7 +23,7 @@
+ #if UseGSI
+ GLOBUS_LOCATION=GlobusLocation
+ #if EMIBuild
+-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist
+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
- LIBCSEC += $(GLOBUS_LIBS)
- #endif
- LIBCSEC += -ldl
-diff -ur LCG-DM-1.7.3.1.orig/security/Imakefile LCG-DM-1.7.3.1/security/Imakefile
---- LCG-DM-1.7.3.1.orig/security/Imakefile 2009-09-24 11:38:50.587119335 +0200
-+++ LCG-DM-1.7.3.1/security/Imakefile 2009-09-24 11:39:46.637118113 +0200
-@@ -43,15 +43,15 @@
- VOMS_FLAVOUR=GlobusFlavour/**/pthr
- #endif
+ #else
+ #if defined(__STDC__)
+ GLOBUS_FLAVOUR=GlobusFlavour##pthr
+diff -ur lcgdm-1.8.1.2.orig/security/Imakefile lcgdm-1.8.1.2/security/Imakefile
+--- lcgdm-1.8.1.2.orig/security/Imakefile 2011-09-03 11:19:24.700163326 +0200
++++ lcgdm-1.8.1.2/security/Imakefile 2011-09-03 11:20:10.779557185 +0200
+@@ -36,7 +36,7 @@
+ #if EMIBuild
#if UseVOMS
--VOMS_INCLUDE=-I$(VOMS_LOCATION)/include/glite/security/voms -DUSE_VOMS
--VOMS_LIB=-L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR)
-+VOMS_INCLUDE=-I$(VOMS_LOCATION)/include/voms -DUSE_VOMS
+ VOMS_INCLUDE=-I$(VOMS_LOCATION)/include/voms -DUSE_VOMS
+-VOMS_LIB=-L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi
+VOMS_LIB=-lvomsapi
#endif
- #define GSIMech GSI
+ #else
+ GLOBUS_FLAVOUR_NONPTHR=GlobusFlavour
+@@ -57,7 +57,7 @@
#define SecAuthMechGSI -DGSI
--#define SecIncludeDirGSI -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_INCLUDE)
--#define SecLibsGSI -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_credential_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_callback_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_common_$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_LIB) -lssl -lcrypto
--#define SecIncludeDirGSIpthr -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR) $(VOMS_INCLUDE)
--#define SecLibsGSIpthr -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_gsi_credential_$(GLOBUS_FLAVOUR) -lglobus_gsi_callback_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR) $(VOMS_LIB) -lssl -lcrypto
-+#define SecIncludeDirGSI -I/usr/include/globus -I/usr/$(_lib)/globus/include -I/usr/kerberos/include $(VOMS_INCLUDE)
-+#define SecLibsGSI -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_gsi_credential -lglobus_gsi_callback -lglobus_common $(VOMS_LIB) -lssl -lcrypto
-+#define SecIncludeDirGSIpthr -I/usr/include/globus -I/usr/$(_lib)/globus/include -I/usr/kerberos/include $(VOMS_INCLUDE)
-+#define SecLibsGSIpthr -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_gsi_credential -lglobus_gsi_callback -lglobus_common $(VOMS_LIB) -lssl -lcrypto
+ #if EMIBuild
+ #define SecIncludeDirGSI -I$(GLOBUS_LOCATION)/include/globus -I$(GLOBUS_LOCATION)/$(_lib)/globus/include $(VOMS_INCLUDE)
+-#define SecLibsGSI -L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_gsi_credential -lglobus_gsi_callback -lglobus_gsi_cert_utils -lglobus_common $(VOMS_LIB) -lssl -lcrypto
++#define SecLibsGSI -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_gsi_credential -lglobus_gsi_callback -lglobus_gsi_cert_utils -lglobus_common $(VOMS_LIB) -lssl -lcrypto
#else
- #define GSIMech
- #endif
-diff -ur LCG-DM-1.7.3.1.orig/socket/dpmcli/module.mk LCG-DM-1.7.3.1/socket/dpmcli/module.mk
---- LCG-DM-1.7.3.1.orig/socket/dpmcli/module.mk 2009-09-24 11:38:54.640119152 +0200
-+++ LCG-DM-1.7.3.1/socket/dpmcli/module.mk 2009-09-24 11:39:46.637118113 +0200
-@@ -80,8 +80,8 @@
-
- GLOBUS_FLAVOUR=gcc32dbgpthr
-
--GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
--GGC_LIB=-L$(GLOBUS_LOCATION)/lib -lglobus_gass_copy_$(GLOBUS_FLAVOUR)
-+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
-+GGC_LIB=-lglobus_gass_copy
-
- CSECFLAG = -DCSEC
- LIBCSEC += $(GLOBUS_LIBS)
-diff -ur LCG-DM-1.7.3.1.orig/srmv1/Imakefile LCG-DM-1.7.3.1/srmv1/Imakefile
---- LCG-DM-1.7.3.1.orig/srmv1/Imakefile 2009-09-24 11:39:03.741119734 +0200
-+++ LCG-DM-1.7.3.1/srmv1/Imakefile 2009-09-24 11:40:48.437118837 +0200
-@@ -27,16 +27,16 @@
- GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
- VOMS_FLAVOUR=GlobusFlavour/**/pthr
- #endif
--GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
-+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
- GSOAP_LOCATION=GsoapLocation
- GSOAP_VERSION=GsoapVersion
- WSDL2H_FLAGS=GsoapWsdl2hFlags
+ #define SecIncludeDirGSI -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_INCLUDE)
+ #define SecLibsGSI -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_credential_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_callback_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_cert_utils_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_common_$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_LIB) -lssl -lcrypto
+diff -ur lcgdm-1.8.1.2.orig/srmv1/Imakefile lcgdm-1.8.1.2/srmv1/Imakefile
+--- lcgdm-1.8.1.2.orig/srmv1/Imakefile 2011-09-03 11:19:24.701163313 +0200
++++ lcgdm-1.8.1.2/srmv1/Imakefile 2011-09-03 11:20:10.779557186 +0200
+@@ -25,12 +25,12 @@
CGSI_GSOAP_LOCATION=CgsiGsoapLocation
+ GLOBUS_LOCATION=GlobusLocation
+ #if EMIBuild
+-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist
++GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
#if UseVOMS
--VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR)
--SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR) $(VOMS_LIB) $(GLOBUS_LIBS)
+-VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi
+-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION) $(VOMS_LIB) $(GLOBUS_LIBS)
+VOMS_LIB = -lvomsapi
+SECLIB = -lcgsi_plugin_voms
#else
-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS)
+SECLIB = -lcgsi_plugin
#endif
- SOAPFLG = -DWITH_IPV6
- INCLUDES = FileName(..,h)
-@@ -76,7 +76,7 @@
- -DLOGFILE=\"$(LOGFILE)\" \
- $(ORAFLG) $(MYSFLG) $(POSFLG) $(CSECFLAG) $(VIDFLAG) $(VOMSFLAG) $(SOAPFLG)
-
--CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
-+CFLAGS = -g -I$(INCLUDES) $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
-
- COMM######################### DEPENDENCY LIBRARIES ###############
-
-diff -ur LCG-DM-1.7.3.1.orig/srmv2/Imakefile LCG-DM-1.7.3.1/srmv2/Imakefile
---- LCG-DM-1.7.3.1.orig/srmv2/Imakefile 2009-09-24 11:39:03.742120361 +0200
-+++ LCG-DM-1.7.3.1/srmv2/Imakefile 2009-09-24 11:41:08.123118066 +0200
-@@ -27,16 +27,16 @@
- GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
- VOMS_FLAVOUR=GlobusFlavour/**/pthr
- #endif
--GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
-+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
- GSOAP_LOCATION=GsoapLocation
- GSOAP_VERSION=GsoapVersion
- WSDL2H_FLAGS=GsoapWsdl2hFlags
+ SOAPLIB = -lgsoap
+ #else
+diff -ur lcgdm-1.8.1.2.orig/srmv2/Imakefile lcgdm-1.8.1.2/srmv2/Imakefile
+--- lcgdm-1.8.1.2.orig/srmv2/Imakefile 2011-09-03 11:19:24.702163300 +0200
++++ lcgdm-1.8.1.2/srmv2/Imakefile 2011-09-03 11:20:10.780557172 +0200
+@@ -25,12 +25,12 @@
CGSI_GSOAP_LOCATION=CgsiGsoapLocation
+ GLOBUS_LOCATION=GlobusLocation
+ #if EMIBuild
+-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist
++GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
#if UseVOMS
--VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR)
--SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR) $(VOMS_LIB) $(GLOBUS_LIBS)
+-VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi
+-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION) $(VOMS_LIB) $(GLOBUS_LIBS)
+VOMS_LIB = -lvomsapi
+SECLIB = -lcgsi_plugin_voms
#else
-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS)
+SECLIB = -lcgsi_plugin
#endif
- SOAPFLG = -DWITH_IPV6
- INCLUDES = FileName(..,h)
-@@ -76,7 +76,7 @@
- -DLOGFILE=\"$(LOGFILE)\" \
- $(ORAFLG) $(MYSFLG) $(POSFLG) $(CSECFLAG) $(VIDFLAG) $(VOMSFLAG) $(SOAPFLG)
-
--CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
-+CFLAGS = -g -I$(INCLUDES) $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
-
- COMM######################### DEPENDENCY LIBRARIES ###############
-
-diff -ur LCG-DM-1.7.3.1.orig/srmv2.2/Imakefile LCG-DM-1.7.3.1/srmv2.2/Imakefile
---- LCG-DM-1.7.3.1.orig/srmv2.2/Imakefile 2009-09-24 11:39:03.742120361 +0200
-+++ LCG-DM-1.7.3.1/srmv2.2/Imakefile 2009-09-24 11:41:46.008118414 +0200
-@@ -27,16 +27,16 @@
- GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
- VOMS_FLAVOUR=GlobusFlavour/**/pthr
- #endif
--GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
-+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
- GSOAP_LOCATION=GsoapLocation
- GSOAP_VERSION=GsoapVersion
- WSDL2H_FLAGS=GsoapWsdl2hFlags
+ SOAPLIB = -lgsoap
+ #else
+diff -ur lcgdm-1.8.1.2.orig/srmv2.2/Imakefile lcgdm-1.8.1.2/srmv2.2/Imakefile
+--- lcgdm-1.8.1.2.orig/srmv2.2/Imakefile 2011-09-03 11:19:24.703163286 +0200
++++ lcgdm-1.8.1.2/srmv2.2/Imakefile 2011-09-03 11:20:10.780557172 +0200
+@@ -25,12 +25,12 @@
CGSI_GSOAP_LOCATION=CgsiGsoapLocation
+ GLOBUS_LOCATION=GlobusLocation
+ #if EMIBuild
+-GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist
++GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
#if UseVOMS
--VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR)
--SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR) $(VOMS_LIB) $(GLOBUS_LIBS)
+-VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi
+-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION) $(VOMS_LIB) $(GLOBUS_LIBS)
+VOMS_LIB = -lvomsapi
+SECLIB = -lcgsi_plugin_voms
#else
-SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS)
+SECLIB = -lcgsi_plugin
#endif
- SOAPFLG = -DWITH_IPV6
- INCLUDES = FileName(..,h)
-@@ -77,7 +77,7 @@
- -DLOGFILE=\"$(LOGFILE)\" \
- $(ORAFLG) $(MYSFLG) $(POSFLG) $(CSECFLAG) $(VIDFLAG) $(VOMSFLAG) $(SOAPFLG)
-
--CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
-+CFLAGS = -g -I$(INCLUDES) $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC)
-
- COMM######################### DEPENDENCY LIBRARIES ###############
-
-diff -ur LCG-DM-1.7.3.1.orig/test/srmv1/Imakefile LCG-DM-1.7.3.1/test/srmv1/Imakefile
---- LCG-DM-1.7.3.1.orig/test/srmv1/Imakefile 2009-09-24 11:38:58.823117551 +0200
-+++ LCG-DM-1.7.3.1/test/srmv1/Imakefile 2009-09-24 11:39:46.645117549 +0200
-@@ -13,13 +13,13 @@
- #else
- GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
- #endif
--GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
-+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
- GSOAP_LOCATION=GsoapLocation
- GSOAP_VERSION=GsoapVersion
- WSDL2H_FLAGS=GsoapWsdl2hFlags
- CGSI_GSOAP_LOCATION=CgsiGsoapLocation
- SECFLG = -DGFAL_SECURE
--SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS)
-+SECLIB = -lcgsi_plugin
- SOAPFLG = -DWITH_IPV6
- RFIOFLG = -DGFAL_ENABLE_RFIO
-
-@@ -29,7 +29,7 @@
-
- COMM######################### FLAGS ##############################
-
--CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAPFLG) -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include
-+CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAPFLG) -I$(INCLUDES)
-
- COMM######################### RULES ##############################
-
-diff -ur LCG-DM-1.7.3.1.orig/test/srmv2/Imakefile LCG-DM-1.7.3.1/test/srmv2/Imakefile
---- LCG-DM-1.7.3.1.orig/test/srmv2/Imakefile 2009-09-24 11:38:58.823117551 +0200
-+++ LCG-DM-1.7.3.1/test/srmv2/Imakefile 2009-09-24 11:39:46.646117565 +0200
-@@ -13,13 +13,13 @@
- #else
- GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
- #endif
--GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
-+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
- GSOAP_LOCATION=GsoapLocation
- GSOAP_VERSION=GsoapVersion
- WSDL2H_FLAGS=GsoapWsdl2hFlags
- CGSI_GSOAP_LOCATION=CgsiGsoapLocation
- SECFLG = -DGFAL_SECURE
--SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS)
-+SECLIB = -lcgsi_plugin
- SOAPFLG = -DWITH_IPV6
- RFIOFLG = -DGFAL_ENABLE_RFIO
-
-@@ -29,7 +29,7 @@
-
- COMM######################### FLAGS ##############################
-
--CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAP_FLG) -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include
-+CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAP_FLG) -I$(INCLUDES)
-
- COMM######################### RULES ##############################
-
-diff -ur LCG-DM-1.7.3.1.orig/test/srmv2.2/Imakefile LCG-DM-1.7.3.1/test/srmv2.2/Imakefile
---- LCG-DM-1.7.3.1.orig/test/srmv2.2/Imakefile 2009-09-24 11:38:58.824119466 +0200
-+++ LCG-DM-1.7.3.1/test/srmv2.2/Imakefile 2009-09-24 11:39:46.647117997 +0200
-@@ -13,13 +13,13 @@
+ SOAPLIB = -lgsoap
#else
- GLOBUS_FLAVOUR=GlobusFlavour/**/pthr
- #endif
--GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR)
-+GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist
- GSOAP_LOCATION=GsoapLocation
- GSOAP_VERSION=GsoapVersion
- WSDL2H_FLAGS=GsoapWsdl2hFlags
- CGSI_GSOAP_LOCATION=CgsiGsoapLocation
- SECFLG = -DGFAL_SECURE
--SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS)
-+SECLIB = -lcgsi_plugin
- SOAPFLG = -DWITH_IPV6
- RFIOFLG = -DGFAL_ENABLE_RFIO
-
-@@ -29,7 +29,7 @@
-
- COMM######################### FLAGS ##############################
-
--CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAPFLG) -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include
-+CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAPFLG) -I$(INCLUDES)
-
- COMM######################### RULES ##############################
-
diff --git a/lcgdm.spec b/lcgdm.spec
index aaac189..53347c8 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -26,15 +26,15 @@
%endif
Name: lcgdm
-Version: 1.8.0.1
-Release: 8%{?dist}
+Version: 1.8.1.2
+Release: 1%{?dist}
Summary: LHC Computing Grid Data Management
Group: System Environment/Libraries
License: ASL 2.0
URL: http://glite.web.cern.ch/glite/
-# LANG=C svn co http://svnweb.cern.ch/guest/lcgdm/lcg-dm/tags/LCG-DM_R_1_8_0_1 lcgdm-1.8.0.1
-# tar --exclude .svn -z -c -f lcgdm-1.8.0.1.tar.gz lcgdm-1.8.0.1
+# LANG=C svn co http://svnweb.cern.ch/guest/lcgdm/lcg-dm/tags/LCG-DM_R_1_8_1_2_emi lcgdm-1.8.1.2
+# tar --exclude .svn -z -c -f lcgdm-1.8.1.2.tar.gz lcgdm-1.8.1.2
Source0: %{name}-%{version}.tar.gz
Source1: README.Fedora.lfc-mysql
Source2: README.Fedora.lfc-postgres
@@ -42,38 +42,29 @@ Source3: README.Fedora.dpm-mysql
Source4: README.Fedora.dpns-mysql
Source5: README.Fedora.dpm-postgres
Source6: README.Fedora.dpns-postgres
-# Fix non-standard installation path
-# https://savannah.cern.ch/bugs/?57526
-Patch0: %{name}-paths.patch
-# Link using $(CC)
-# https://savannah.cern.ch/bugs/?57527
-Patch1: %{name}-ld.patch
-# Fix soname issues
-# https://savannah.cern.ch/bugs/?57528
-Patch2: %{name}-withsoname.patch
# Link binaries using shared libraries
# https://savannah.cern.ch/bugs/?57529
-Patch3: %{name}-shliblink.patch
-# Link to gsoap library, fix parallel build
-# https://savannah.cern.ch/bugs/?57530
-Patch4: %{name}-gsoap.patch
+Patch0: %{name}-shliblink.patch
# Fix build on GNU/Hurd and GNU/kFreeBSD
# https://savannah.cern.ch/bugs/?61071
-Patch5: %{name}-porting.patch
+Patch1: %{name}-porting.patch
# Fix race conditions in Makefile install rules:
# https://savannah.cern.ch/bugs/?69233
-Patch6: %{name}-race.patch
+Patch2: %{name}-race.patch
# Remove deprecated python function:
# https://savannah.cern.ch/bugs/?69232
-Patch7: %{name}-python-exception.patch
+Patch3: %{name}-python-exception.patch
# Make condrestart work as expected
-Patch8: %{name}-condrestart.patch
-# Adapt upstream's hardcoded include and library paths for Fedora
-Patch9: %{name}-usr.patch
+# https://savannah.cern.ch/bugs/?76695
+Patch4: %{name}-condrestart.patch
+# Get rid of -L/usr/lib(64)
+Patch5: %{name}-usr.patch
+# Fix python and perl installation paths and linking
+Patch6: %{name}-paths.patch
# Allow moving plugins out of default library search path
-Patch10: %{name}-dlopen.patch
+Patch7: %{name}-dlopen.patch
# Use Fedora's imake instead of bundled version
-Patch11: %{name}-imake.patch
+Patch8: %{name}-imake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
@@ -575,17 +566,12 @@ pushd $d/%{name}-%{version}
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
chmod 644 security/globus_gsi_gss_constants.h \
security/globus_i_gsi_credential.h \
security/gssapi_openssl.h
chmod 644 doc/lfc/INSTALL-*
-sed 's!@@LIBDIR@@!%{_libdir}!' -i security/Csec_api_loader.c
-
# The code violates the strict aliasing rules all over the place...
# Need to use -fnostrict-aliasing so that the -O2 optimization in
# optflags doesn't try to use them.
@@ -609,16 +595,16 @@ pushd lfc-mysql/%{name}-%{version}
./configure lfc --with-mysql \
--libdir=%{_lib} \
- --with-gsoap-location=%{_prefix} \
--with-gsoap-version=$gsoapversion \
- --with-voms-location=%{_prefix} \
--with-id-map-file=%{_sysconfdir}/lcgdm-mapfile \
--with-ns-config-file=%{_sysconfdir}/NSCONFIG \
- --with-sysconf-dir='$(prefix)/../etc'
+ --with-sysconf-dir='$(prefix)/../etc' \
+ --with-emi \
+ --without-argus
make -f Makefile.ini Makefiles
-make %{?_smp_mflags} prefix=%{_prefix}
+make %{?_smp_mflags} SOAPFLG="`pkg-config --cflags gsoap`"
popd
@@ -626,12 +612,12 @@ pushd lfc-postgres/%{name}-%{version}
./configure lfc --with-postgres \
--libdir=%{_lib} \
- --with-gsoap-location=%{_prefix} \
--with-gsoap-version=$gsoapversion \
- --with-voms-location=%{_prefix} \
--with-id-map-file=%{_sysconfdir}/lcgdm-mapfile \
--with-ns-config-file=%{_sysconfdir}/NSCONFIG \
- --with-sysconf-dir='$(prefix)/../etc'
+ --with-sysconf-dir='$(prefix)/../etc' \
+ --with-emi \
+ --without-argus
# Disable building things already built above
sed -e 's/\(BuildDLI *\)YES/\1NO/' \
@@ -648,7 +634,7 @@ ln -s ../../../lfc-mysql/%{name}-%{version}/shlib/liblcgdm.so* .
ln -s ../../../lfc-mysql/%{name}-%{version}/shlib/liblfc.so* .
popd
-make %{?_smp_mflags} prefix=%{_prefix}
+make %{?_smp_mflags} SOAPFLG="`pkg-config --cflags gsoap`"
popd
@@ -656,13 +642,13 @@ pushd dpm-mysql/%{name}-%{version}
./configure dpm --with-mysql \
--libdir=%{_lib} \
- --with-gsoap-location=%{_prefix} \
--with-gsoap-version=$gsoapversion \
- --with-voms-location=%{_prefix} \
--with-dpm-config-file=%{_sysconfdir}/DPMCONFIG \
--with-id-map-file=%{_sysconfdir}/lcgdm-mapfile \
--with-ns-config-file=%{_sysconfdir}/DPNSCONFIG \
- --with-sysconf-dir='$(prefix)/../etc'
+ --with-sysconf-dir='$(prefix)/../etc' \
+ --with-emi \
+ --without-argus
# Disable building things already built above
sed -e '/^SECURITYDIR =/d' -e '/^COMMONDIR =/d' -i config/Project.tmpl
@@ -675,7 +661,7 @@ pushd shlib
ln -s ../../../lfc-mysql/%{name}-%{version}/shlib/liblcgdm.so* .
popd
-make %{?_smp_mflags} prefix=%{_prefix}
+make %{?_smp_mflags} SOAPFLG="`pkg-config --cflags gsoap`"
popd
@@ -683,13 +669,13 @@ pushd dpm-postgres/%{name}-%{version}
./configure dpm --with-postgres \
--libdir=%{_lib} \
- --with-gsoap-location=%{_prefix} \
--with-gsoap-version=$gsoapversion \
- --with-voms-location=%{_prefix} \
--with-dpm-config-file=%{_sysconfdir}/DPMCONFIG \
--with-id-map-file=%{_sysconfdir}/lcgdm-mapfile \
--with-ns-config-file=%{_sysconfdir}/DPNSCONFIG \
- --with-sysconf-dir='$(prefix)/../etc'
+ --with-sysconf-dir='$(prefix)/../etc' \
+ --with-emi \
+ --without-argus
# Disable building things already built above
sed -e 's/\(BuildDPMClient *\)YES/\1NO/' \
@@ -708,7 +694,7 @@ ln -s ../../../lfc-mysql/%{name}-%{version}/shlib/liblcgdm.so* .
ln -s ../../../dpm-mysql/%{name}-%{version}/shlib/libdpm.so* .
popd
-make %{?_smp_mflags} prefix=%{_prefix}
+make %{?_smp_mflags} SOAPFLG="`pkg-config --cflags gsoap`"
popd
@@ -725,13 +711,13 @@ PYTHON_LIB=`%{__altpython} \
import sys; \
sys.stdout.write('-L' + sysconfig.get_config_var('LIBDEST') + \
'/config -lpython' + sys.version[:3] \
- + sys.abiflags if hasattr(sys, 'abiflags') else '' \
- + ' ' + \
+ + sys.abiflags if hasattr(sys, 'abiflags') else '' \
+ + ' ' + \
sysconfig.get_config_var('LIBS') + ' ' + \
sysconfig.get_config_var('SYSLIBS'))"`
PYTHON_MODULE_SUFFIX=`%{__altpython} \
-c "from distutils import sysconfig; \
- print(sysconfig.get_config_var('SO'))"`
+ print(sysconfig.get_config_var('SO'))"`
for module in lfc lfcthr lfc2 lfc2thr ; do
@@ -765,8 +751,8 @@ rm -rf ${RPM_BUILD_ROOT}
pushd lfc-mysql/%{name}-%{version}
-make prefix=${RPM_BUILD_ROOT}%{_prefix} install
-make prefix=${RPM_BUILD_ROOT}%{_prefix} install.man
+make SOAPFLG="`pkg-config --cflags gsoap`" \
+ prefix=${RPM_BUILD_ROOT}%{_prefix} install install.man
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/lfc
mv ${RPM_BUILD_ROOT}%{_datadir}/LFC/* ${RPM_BUILD_ROOT}%{_datadir}/lfc
@@ -784,7 +770,8 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-mysql
# lfcdaemon startup script
sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-e '/LD_LIBRARY_PATH/d' \
- -e 's!/opt/lcg/bin!/usr/sbin!g' -e 's!/opt/lcg!!g' \
+ -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
+ -e 's!\$PREFIX/etc!/etc!' \
-e 's!\(/var/lock/subsys/\).*!\1lfc-mysql!' \
${RPM_BUILD_ROOT}%{_datadir}/lfc/rc.lfcdaemon > \
${RPM_BUILD_ROOT}%{_initrddir}/lfc-mysql
@@ -792,9 +779,8 @@ chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/lfc-mysql
rm ${RPM_BUILD_ROOT}%{_datadir}/lfc/rc.lfcdaemon
# lfcdaemon configuration file
-sed -e 's!/opt/lcg!!g' \
- ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ > \
- ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-mysql/lfcdaemon.conf
+cp -p ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ \
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-mysql/lfcdaemon.conf
rm ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ
touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/lfcdaemon
@@ -835,7 +821,8 @@ touch ${RPM_BUILD_ROOT}%{_mandir}/man8/lfc-shutdown.8
# lfc-dli startup script
sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-e '/LD_LIBRARY_PATH/d' \
- -e 's!/opt/lcg/bin!/usr/sbin!g' -e 's!/opt/lcg!!g' \
+ -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
+ -e 's!\$PREFIX/etc!/etc!' \
-e 's!/var/log/dli!/var/log/lfc-dli!g' \
${RPM_BUILD_ROOT}%{_datadir}/lfc/rc.lfc-dli > \
${RPM_BUILD_ROOT}%{_initrddir}/lfc-dli
@@ -864,13 +851,8 @@ sed -e 's/\(\.TH [^ ]* \)1/\18/' \
rm ${RPM_BUILD_ROOT}%{_mandir}/man1/lfc-dli.1
sed 's/\(^LFC_VERSION=\).*/\1%{version}/' scripts/lcg-info-provider-lfc > \
- ${RPM_BUILD_ROOT}%{_datadir}/lfc/lcg-info-provider-lfc
-chmod 755 ${RPM_BUILD_ROOT}%{_datadir}/lfc/lcg-info-provider-lfc
-
-# Move plugins out of the default library search path
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}
-mv ${RPM_BUILD_ROOT}%{_libdir}/libCsec_plugin_* \
- ${RPM_BUILD_ROOT}%{_libdir}/%{name}
+ ${RPM_BUILD_ROOT}%{_datadir}/lfc/lcg-info-provider-lfc
+chmod 755 ${RPM_BUILD_ROOT}%{_datadir}/lfc/lcg-info-provider-lfc
# Create lfc user home and certificate directories
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/lib/lfc
@@ -894,8 +876,8 @@ popd
pushd lfc-postgres/%{name}-%{version}
-make prefix=${RPM_BUILD_ROOT}%{_prefix} install
-make prefix=${RPM_BUILD_ROOT}%{_prefix} install.man
+make SOAPFLG="`pkg-config --cflags gsoap`" \
+ prefix=${RPM_BUILD_ROOT}%{_prefix} install install.man
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/lfc
mv ${RPM_BUILD_ROOT}%{_datadir}/LFC/* ${RPM_BUILD_ROOT}%{_datadir}/lfc
@@ -913,7 +895,8 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-postgres
# lfcdaemon startup script
sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-e '/LD_LIBRARY_PATH/d' \
- -e 's!/opt/lcg/bin!/usr/sbin!g' -e 's!/opt/lcg!!g' \
+ -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
+ -e 's!\$PREFIX/etc!/etc!' \
-e 's!\(/var/lock/subsys/\).*!\1lfc-postgres!' \
${RPM_BUILD_ROOT}%{_datadir}/lfc/rc.lfcdaemon > \
${RPM_BUILD_ROOT}%{_initrddir}/lfc-postgres
@@ -921,9 +904,8 @@ chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/lfc-postgres
rm ${RPM_BUILD_ROOT}%{_datadir}/lfc/rc.lfcdaemon
# lfcdaemon configuration file
-sed -e 's!/opt/lcg!!g' \
- ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ > \
- ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-postgres/lfcdaemon.conf
+cp -p ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ \
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-postgres/lfcdaemon.conf
rm ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ
touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/lfcdaemon
@@ -979,8 +961,8 @@ popd
pushd dpm-mysql/%{name}-%{version}
-make prefix=${RPM_BUILD_ROOT}%{_prefix} install
-make prefix=${RPM_BUILD_ROOT}%{_prefix} install.man
+make SOAPFLG="`pkg-config --cflags gsoap`" \
+ prefix=${RPM_BUILD_ROOT}%{_prefix} install install.man
sed 's!/usr/bin/env python!/usr/bin/python!' \
-i ${RPM_BUILD_ROOT}%{_bindir}/dpm-listspaces
@@ -1001,7 +983,8 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql
# dpm startup script
sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-e '/LD_LIBRARY_PATH/d' \
- -e 's!/opt/lcg/bin!/usr/sbin!g' -e 's!/opt/lcg!!g' \
+ -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
+ -e 's!\$PREFIX/etc!/etc!' \
-e 's!\(/var/lock/subsys/\).*!\1dpm-mysql!' \
${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpm > \
${RPM_BUILD_ROOT}%{_initrddir}/dpm-mysql
@@ -1009,8 +992,7 @@ chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpm-mysql
rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpm
# dpm configuration file
-sed -e 's!/opt/lcg!!g' \
- -e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
+sed -e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpm.conf.templ > \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpm.conf
rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm.conf.templ
@@ -1052,7 +1034,8 @@ touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm-shutdown.8
# dpnsdaemon startup script
sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-e '/LD_LIBRARY_PATH/d' \
- -e 's!/opt/lcg/bin!/usr/sbin!g' -e 's!/opt/lcg!!g' \
+ -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
+ -e 's!\$PREFIX/etc!/etc!' \
-e 's!\(/var/lock/subsys/\).*!\1dpm-mysql-nameserver!' \
-e 's!/etc/NSCONFIG!/etc/DPNSCONFIG!g' \
${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpnsdaemon > \
@@ -1061,8 +1044,7 @@ chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpm-mysql-nameserver
rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpnsdaemon
# dpnsdaemon configuration file
-sed -e 's!/opt/lcg!!g' \
- -e 's!/etc/NSCONFIG!/etc/DPNSCONFIG!g' \
+sed -e 's!/etc/NSCONFIG!/etc/DPNSCONFIG!g' \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpnsdaemon.conf.templ > \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpnsdaemon.conf
rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpnsdaemon.conf.templ
@@ -1106,7 +1088,8 @@ touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpns-shutdown.8
# dpmcopyd startup script
sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-e '/LD_LIBRARY_PATH/d' \
- -e 's!/opt/lcg/bin!/usr/sbin!g' -e 's!/opt/lcg!!g' \
+ -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
+ -e 's!\$PREFIX/etc!/etc!' \
-e 's!\(/var/lock/subsys/\).*!\1dpm-mysql-copyd!' \
${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpmcopyd > \
${RPM_BUILD_ROOT}%{_initrddir}/dpm-mysql-copyd
@@ -1114,8 +1097,7 @@ chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpm-mysql-copyd
rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpmcopyd
# dpmcopyd configuration file
-sed -e 's!/opt/lcg!!g' \
- -e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
+sed -e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
-e 's/\(^DPM_HOST=\).*/\1`hostname -f`/' \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpmcopyd.conf.templ > \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpmcopyd.conf
@@ -1134,7 +1116,6 @@ mv ${RPM_BUILD_ROOT}%{_bindir}/dpmcopyd \
touch ${RPM_BUILD_ROOT}%{_sbindir}/dpmcopyd
chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpmcopyd
sed -e 's/\(\.TH [^ ]*\) 1/\1 8/' \
- -e 's!/opt/lcg/lib/!!g' \
${RPM_BUILD_ROOT}%{_mandir}/man1/dpmcopyd.1 | gzip -9 -n -c > \
${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpmcopyd.8.gz
rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpmcopyd.1
@@ -1145,7 +1126,8 @@ for svc in srmv1 srmv2 srmv2.2 ; do
# startup script
sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-e '/LD_LIBRARY_PATH/d' \
- -e 's!/opt/lcg/bin!/usr/sbin!g' -e 's!/opt/lcg!!g' \
+ -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
+ -e 's!\$PREFIX/etc!/etc!' \
-e "s/${svc}/dpm-${svc}/g" \
-e "s!\(/var/lock/subsys/\).*!\1dpm-mysql-${ssvc}!" \
${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.${svc} > \
@@ -1154,7 +1136,7 @@ for svc in srmv1 srmv2 srmv2.2 ; do
rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.${svc}
# configuration file
- sed -e "s/${svc}/dpm-${svc}/g" -e 's!/opt/lcg!!g' \
+ sed -e "s/${svc}/dpm-${svc}/g" \
-e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
-e 's/\(^DPM_HOST=\).*/\1`hostname -f`/' \
-e 's/\(^RUN_SRMV2DAEMON=\).*/\1"yes"/' \
@@ -1169,7 +1151,7 @@ for svc in srmv1 srmv2 srmv2.2 ; do
${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpm-${svc}.logrotate
touch ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/dpm-${svc}
- # binary and makefile
+ # binary and man page
mv ${RPM_BUILD_ROOT}%{_bindir}/${svc} \
${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpm-${svc}
touch ${RPM_BUILD_ROOT}%{_sbindir}/dpm-${svc}
@@ -1185,7 +1167,8 @@ done
# dpm-rfiod startup script
sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-e '/LD_LIBRARY_PATH/d' \
- -e 's!/opt/lcg/bin!/usr/sbin!g' -e 's!/opt/lcg!!g' \
+ -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
+ -e 's!\$PREFIX/etc!/etc!' \
-e 's/rfiod/dpm-rfiod/g' \
-e 's!/var/log/rfio!/var/log/dpm-rfio!g' \
${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.rfiod > \
@@ -1194,7 +1177,7 @@ chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpm-rfiod
rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.rfiod
# dpm-rfiod configuration file
-sed -e 's/rfiod/dpm-rfiod/g' -e 's!/opt/lcg!!g' \
+sed -e 's/rfiod/dpm-rfiod/g' \
-e 's!/var/log/rfio!/var/log/dpm-rfio!g' \
-e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
-e 's/\(^DPM_HOST=\).*/\1`hostname -f`/' \
@@ -1235,8 +1218,8 @@ popd
pushd dpm-postgres/%{name}-%{version}
-make prefix=${RPM_BUILD_ROOT}%{_prefix} install
-make prefix=${RPM_BUILD_ROOT}%{_prefix} install.man
+make SOAPFLG="`pkg-config --cflags gsoap`" \
+ prefix=${RPM_BUILD_ROOT}%{_prefix} install install.man
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/dpm
mv ${RPM_BUILD_ROOT}%{_datadir}/DPM/* ${RPM_BUILD_ROOT}%{_datadir}/dpm
@@ -1254,7 +1237,8 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres
# dpm startup script
sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-e '/LD_LIBRARY_PATH/d' \
- -e 's!/opt/lcg/bin!/usr/sbin!g' -e 's!/opt/lcg!!g' \
+ -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
+ -e 's!\$PREFIX/etc!/etc!' \
-e 's!\(/var/lock/subsys/\).*!\1dpm-postgres!' \
${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpm > \
${RPM_BUILD_ROOT}%{_initrddir}/dpm-postgres
@@ -1262,8 +1246,7 @@ chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpm-postgres
rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpm
# dpm configuration file
-sed -e 's!/opt/lcg!!g' \
- -e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
+sed -e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpm.conf.templ > \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpm.conf
rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm.conf.templ
@@ -1305,7 +1288,8 @@ touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm-shutdown.8
# dpnsdaemon startup script
sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-e '/LD_LIBRARY_PATH/d' \
- -e 's!/opt/lcg/bin!/usr/sbin!g' -e 's!/opt/lcg!!g' \
+ -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
+ -e 's!\$PREFIX/etc!/etc!' \
-e 's!\(/var/lock/subsys/\).*!\1dpm-postgres-nameserver!' \
-e 's!/etc/NSCONFIG!/etc/DPNSCONFIG!g' \
${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpnsdaemon > \
@@ -1314,8 +1298,7 @@ chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpm-postgres-nameserver
rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpnsdaemon
# dpnsdaemon configuration file
-sed -e 's!/opt/lcg!!g' \
- -e 's!/etc/NSCONFIG!/etc/DPNSCONFIG!g' \
+sed -e 's!/etc/NSCONFIG!/etc/DPNSCONFIG!g' \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpnsdaemon.conf.templ > \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpnsdaemon.conf
rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpnsdaemon.conf.templ
@@ -1359,7 +1342,8 @@ touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpns-shutdown.8
# dpmcopyd startup script
sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-e '/LD_LIBRARY_PATH/d' \
- -e 's!/opt/lcg/bin!/usr/sbin!g' -e 's!/opt/lcg!!g' \
+ -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
+ -e 's!\$PREFIX/etc!/etc!' \
-e 's!\(/var/lock/subsys/\).*!\1dpm-postgres-copyd!' \
${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpmcopyd > \
${RPM_BUILD_ROOT}%{_initrddir}/dpm-postgres-copyd
@@ -1367,8 +1351,7 @@ chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpm-postgres-copyd
rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpmcopyd
# dpmcopyd configuration file
-sed -e 's!/opt/lcg!!g' \
- -e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
+sed -e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
-e 's/\(^DPM_HOST=\).*/\1`hostname -f`/' \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpmcopyd.conf.templ > \
${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpmcopyd.conf
@@ -1387,7 +1370,6 @@ mv ${RPM_BUILD_ROOT}%{_bindir}/dpmcopyd \
touch ${RPM_BUILD_ROOT}%{_sbindir}/dpmcopyd
chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpmcopyd
sed -e 's/\(\.TH [^ ]*\) 1/\1 8/' \
- -e 's!/opt/lcg/lib/!!g' \
${RPM_BUILD_ROOT}%{_mandir}/man1/dpmcopyd.1 | gzip -9 -n -c > \
${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpmcopyd.8.gz
rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpmcopyd.1
@@ -1398,7 +1380,8 @@ for svc in srmv1 srmv2 srmv2.2 ; do
# startup script
sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-e '/LD_LIBRARY_PATH/d' \
- -e 's!/opt/lcg/bin!/usr/sbin!g' -e 's!/opt/lcg!!g' \
+ -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
+ -e 's!\$PREFIX/etc!/etc!' \
-e "s/${svc}/dpm-${svc}/g" \
-e "s!\(/var/lock/subsys/\).*!\1dpm-postgres-${ssvc}!" \
${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.${svc} > \
@@ -1407,7 +1390,7 @@ for svc in srmv1 srmv2 srmv2.2 ; do
rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.${svc}
# configuration file
- sed -e "s/${svc}/dpm-${svc}/g" -e 's!/opt/lcg!!g' \
+ sed -e "s/${svc}/dpm-${svc}/g" \
-e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
-e 's/\(^DPM_HOST=\).*/\1`hostname -f`/' \
-e 's/\(^RUN_SRMV2DAEMON=\).*/\1"yes"/' \
@@ -1422,7 +1405,7 @@ for svc in srmv1 srmv2 srmv2.2 ; do
${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpm-${svc}.logrotate
touch ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/dpm-${svc}
- # binary and makefile
+ # binary and man page
mv ${RPM_BUILD_ROOT}%{_bindir}/${svc} \
${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpm-${svc}
touch ${RPM_BUILD_ROOT}%{_sbindir}/dpm-${svc}
@@ -1464,7 +1447,7 @@ install %{altpython}/*.so ${RPM_BUILD_ROOT}%{altpython_sitearch}
%{__python} -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT"'", 10, "%{python_sitearch}", 1)' > /dev/null
%{__python} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT"'", 10, "%{python_sitearch}", 1)' > /dev/null
%if %{?altpython:1}%{!?altpython:0}
-%{__altpython} -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{altpython_sitearch}"'", 10, "%{altpython_sitearch}", 1)' > /dev/null
+%{__altpython} -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{altpython_sitearch}"'", 10, "%{altpython_sitearch}", 1)' > /dev/null
%{__altpython} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{altpython_sitearch}"'", 10, "%{altpython_sitearch}", 1)' > /dev/null
%endif
%endif
@@ -2272,7 +2255,6 @@ fi
%{_libdir}/liblcgdm.so.*
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/libCsec_plugin_GSI.so
-%{_libdir}/%{name}/libCsec_plugin_GSI_thread.so
%{_libdir}/%{name}/libCsec_plugin_ID.so
%doc lfc-mysql/%{name}-%{version}/LICENSE
@@ -2670,6 +2652,10 @@ fi
%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv2.2
%changelog
+* Fri Sep 02 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.1.2-1
+- Update to version 1.8.1.2
+- Drop patches lcgdm-withsoname.patch and lcgdm-gsoap.patch (upstream)
+
* Mon Jun 20 2011 Petr Sabata <contyk at redhat.com> - 1.8.0.1-8
- Perl mass rebuild
@@ -2768,7 +2754,7 @@ fi
* Tue Apr 02 2008 Anders Wäänänen <waananen at nbi.dk> - 1.6.9.1-4ng
- Added patch from Mattias Ellert <mattias.ellert at fysast.uu.se>:
- LFC-shliblink.patch - Make clients link dynamically against library
+ LFC-shliblink.patch - Make clients link dynamically against library
* Tue Mar 18 2008 Anders Wäänänen <waananen at nbi.dk> - 1.6.9.1-3ng
- Added ng to release tag
diff --git a/sources b/sources
index 569754e..f08b6db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e729fe3f0cd1f690c2f6dd05e0c9bb0 lcgdm-1.8.0.1.tar.gz
+6f25bb284d8f8464770314da1a409545 lcgdm-1.8.1.2.tar.gz
More information about the scm-commits
mailing list