rpmlint fixes

diff --git a/org.glite.lb.client-java/project/glite-lb-client-java.spec b/org.glite.lb.client-java/project/glite-lb-client-java.spec
index 48f932c..563212f 100644 (file)
--- a/org.glite.lb.client-java/project/glite-lb-client-java.spec
+++ b/org.glite.lb.client-java/project/glite-lb-client-java.spec
@@ -62,6 +62,12 @@ find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} >
 rm -rf $RPM_BUILD_ROOT
 
 
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root)
 /usr/%{_lib}/libglite_lb_sendviasocket.so

diff --git a/org.glite.lb.harvester/config/startup b/org.glite.lb.harvester/config/startup
index 3e374a3..7081626 100755 (executable)
--- a/org.glite.lb.harvester/config/startup
+++ b/org.glite.lb.harvester/config/startup
@@ -40,6 +40,7 @@ GLITE_LB_LOCATION_VAR=${GLITE_LB_LOCATION_VAR:-'@glite_var@'}
 
 pidfile=${GLITE_LB_HARVESTER_PIDFILE:-"$GLITE_LB_LOCATION_VAR/glite-lb-harvester.pid"}
 level=${GLITE_LB_HARVESTER_DEBUG_LEVEL:-"1"}
+lockfile=/var/lock/glite-lb-harvester
 
 # database or configuration file needed
 # (using the file as default)
@@ -89,7 +90,14 @@ start_daemon()
                fi
        fi
        echo -n "Starting $name ..."
-       su - $GLITE_USER -c "$log4c $cmd" && echo " done" || echo " FAILED"
+       su - $GLITE_USER -c "$log4c $cmd"
+
+       if [ $? -eq 0 ]; then
+               echo " done"
+               touch $lockfile
+       else
+               echo " FAILED"
+       fi
 }
 
 stop_daemon()
@@ -108,11 +116,13 @@ stop_daemon()
                        if [ $try = 20 ]; then
                                kill -9 $pid
                                echo " force quit after $try retries"
+                               rm -f $lockfile
                                return 1
                        fi
                done
                echo " done"
                rm -f $pidfile
+               rm -f $lockfile
        else
                echo $name not running
                return 1

diff --git a/org.glite.lb.harvester/project/glite-lb-harvester.spec b/org.glite.lb.harvester/project/glite-lb-harvester.spec
index 4a8ed2d..d774883 100644 (file)
--- a/org.glite.lb.harvester/project/glite-lb-harvester.spec
+++ b/org.glite.lb.harvester/project/glite-lb-harvester.spec
@@ -45,6 +45,7 @@ make check
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+sed -i 's,\(lockfile=/var/lock\),\1/subsys,' $RPM_BUILD_ROOT/etc/init.d/glite-lb-harvester
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
 
 

diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup
index 8c5b52b..5032daf 100755 (executable)
--- a/org.glite.lb.logger/config/startup
+++ b/org.glite.lb.logger/config/startup
@@ -42,6 +42,8 @@ LL_PIDFILE=${LL_PIDFILE:-$GLITE_LB_LOCATION_VAR/glite-lb-logd.pid}
 IL_PIDFILE=${IL_PIDFILE:-$GLITE_LB_LOCATION_VAR/glite-lb-interlogd.pid}
 IL_SOCKFILE=/tmp/interlogger.sock
 
+lockfile=/var/lock/glite-lb-locallogger
+
 unset creds port log4c
 
 start_daemon()
@@ -65,7 +67,14 @@ start_daemon()
                fi
        fi
        echo -n "Starting $name ..."
-       su - $GLITE_USER -c "$log4c $cmd" && echo " done" || echo " FAILED"
+       su - $GLITE_USER -c "$log4c $cmd"
+
+       if [ $? -eq 0 ]; then
+               echo " done"
+               touch $lockfile
+       else
+               echo " FAILED"
+       fi
 }
 
 status_daemon()
@@ -171,6 +180,8 @@ stop()
        if netstat -an --unix | grep "^unix .* LISTEN.* ${GLITE_LB_IL_SOCK:-$IL_SOCKFILE}$" >/dev/null 2>&1 ;then
                killall -9 glite-lb-interlogd
        fi
+
+       rm -f $lockfile
 }
 
 status()

diff --git a/org.glite.lb.logger/project/glite-lb-logger.spec b/org.glite.lb.logger/project/glite-lb-logger.spec
index 50b6977..df8004e 100644 (file)
--- a/org.glite.lb.logger/project/glite-lb-logger.spec
+++ b/org.glite.lb.logger/project/glite-lb-logger.spec
@@ -56,6 +56,7 @@ make check
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+sed -i 's,\(lockfile=/var/lock\),\1/subsys,' $RPM_BUILD_ROOT/etc/init.d/glite-lb-locallogger
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
 
 

diff --git a/org.glite.lb.server/config/glite-lb-lcas.logrotate b/org.glite.lb.server/config/glite-lb-lcas.logrotate
index c485adb..cf17dfa 100644 (file)
--- a/org.glite.lb.server/config/glite-lb-lcas.logrotate
+++ b/org.glite.lb.server/config/glite-lb-lcas.logrotate
@@ -1,4 +1,4 @@
-/var/log/glite/glite-lb-lcas.log {
+/var/log/glite/glite-lb-server-lcas.log {
        daily
        rotate 4
        missingok

diff --git a/org.glite.lb.server/config/glite-lb-migrate_db2version20 b/org.glite.lb.server/config/glite-lb-migrate_db2version20
index a547fbf..1efdd42 100644 (file)
--- a/org.glite.lb.server/config/glite-lb-migrate_db2version20
+++ b/org.glite.lb.server/config/glite-lb-migrate_db2version20
@@ -1,9 +1,9 @@
+#!/bin/bash
+
 # This script is intendent to be used to extend bkserver database to 
 # to be able to hold both bkserver and lbproxy jobs.
 # The operation should be non-destructive, i.e. all data should persist
 # and continue to be fully usable.
-
-#!/bin/bash
  
 usage() {
 cat <<EOF

diff --git a/org.glite.lb.server/config/glite-lb-proxy-purge.cron b/org.glite.lb.server/config/glite-lb-proxy-purge.cron
index 016c0ef..edc1ea9 100644 (file)
--- a/org.glite.lb.server/config/glite-lb-proxy-purge.cron
+++ b/org.glite.lb.server/config/glite-lb-proxy-purge.cron
@@ -1 +1 @@
-31 1 * * *     glite   ( test -f /etc/profile.d/grid-env.sh || exit 0; . /etc/profile.d/grid-env.sh; export GLITE_LB_EXPORT_BKSERVER=$HOSTNAME; export GLITE_LB_PURGE_TARGET_RUNTIME=84600s; export GLITE_LB_PURGE_OTHER_OPTIONS="$GLITE_LB_PURGE_OTHER_OPTIONS -x"; printf "`date "+\%b \%e \%T"` `hostname -s` glite-lb-export.sh: "; @glite_prefix@/sbin/glite-lb-export.sh ) >> /var/log/glite/glite-lb-proxy-purge.log 2>&1
+31 1 * * *     glite   ( test -f /etc/profile.d/grid-env.sh || exit 0; . /etc/profile.d/grid-env.sh; export GLITE_LB_EXPORT_BKSERVER=$HOSTNAME; export GLITE_LB_PURGE_TARGET_RUNTIME=84600s; export GLITE_LB_PURGE_OTHER_OPTIONS="$GLITE_LB_PURGE_OTHER_OPTIONS -x"; printf "`date "+\%b \%e \%T"` `hostname -s` glite-lb-export.sh: "; @glite_prefix@/sbin/glite-lb-export.sh ) >> /var/log/glite/glite-lb-server-purge-proxy.log 2>&1

diff --git a/org.glite.lb.server/config/glite-lb-purge.logrotate b/org.glite.lb.server/config/glite-lb-purge.logrotate
index 908dec0..5f725ca 100644 (file)
--- a/org.glite.lb.server/config/glite-lb-purge.logrotate
+++ b/org.glite.lb.server/config/glite-lb-purge.logrotate
@@ -1,5 +1,5 @@
-/var/log/glite/glite-lb-server-purge.log /var/log/glite/glite-lb-proxy-purge.log {
+/var/log/glite/glite-lb-server-purge.log /var/log/glite-lb-server-purge-proxy.log {
        weekly
        rotate 4
        missingok
-}
\ No newline at end of file
+}

diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup
index 19b30b3..6a326c7 100755 (executable)
--- a/org.glite.lb.server/config/startup
+++ b/org.glite.lb.server/config/startup
@@ -55,6 +55,8 @@ NOTIF_IL_PIDFILE=$GLITE_LB_LOCATION_VAR/glite-lb-notif-interlogd.pid
 msgconf="$GLITE_LB_LOCATION_ETC/glite-lb/msg.conf"
 [ -f "$msgconf" ] && GLITE_LB_NOTIF_IL_OTHER_OPTIONS="$GLITE_LB_NOTIF_IL_OTHER_OPTIONS -F $msgconf"
 
+lockfile=/var/lock/glite-lb-bkserverd
+
 unset creds port log4c
 
 start_daemon()
@@ -78,7 +80,14 @@ start_daemon()
                fi
        fi
        echo -n "Starting $name ..."
-       su - $GLITE_USER -c "$log4c $cmd" && echo " done" || echo " FAILED"
+       su - $GLITE_USER -c "$log4c $cmd"
+
+       if [ $? -eq 0 ]; then
+               echo " done"
+               touch $lockfile
+       else
+               echo " FAILED"
+       fi
 }
 
 stop_daemon()
@@ -97,10 +106,12 @@ stop_daemon()
                        if [ $try = 20 ]; then
                                kill -9 $pid
                                echo " force quit after $try retries"
+                               rm -f $lockfile
                                return 1
                        fi
                done
                echo " done"
+               rm -f $lockfile
                rm -f $pidfile
        else
                echo $name not running
@@ -156,7 +167,7 @@ start()
        log4c="LOG4C_RCPATH='$GLITE_LB_LOCATION_ETC/glite-lb'"
 
        policy="$GLITE_LB_LOCATION_ETC/glite-lb/glite-lb-authz.conf"
-       lcas_log="LCAS_LOG_FILE='/var/log/glite/glite-lb-lcas.log' LCAS_ETC_DIR='$GLITE_LB_LOCATION_ETC/glite-lb'"
+       lcas_log="LCAS_LOG_FILE='/var/log/glite/glite-lb-server-lcas.log' LCAS_ETC_DIR='$GLITE_LB_LOCATION_ETC/glite-lb'"
        if test -f "$policy"; then
                # lcas not enabled by default yet
                policy="--policy '$policy'"

diff --git a/org.glite.lb.server/project/glite-lb-server.spec b/org.glite.lb.server/project/glite-lb-server.spec
index 03c3a52..1938f20 100644 (file)
--- a/org.glite.lb.server/project/glite-lb-server.spec
+++ b/org.glite.lb.server/project/glite-lb-server.spec
@@ -72,6 +72,7 @@ make check
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+sed -i 's,\(lockfile=/var/lock\),\1/subsys,' $RPM_BUILD_ROOT/etc/init.d/glite-lb-bkserverd
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
@@ -115,9 +116,9 @@ fi
 %dir /usr/include/glite/
 %dir /usr/include/glite/lb/
 %dir /usr/share/doc/%{name}-%{version}/
-%config /etc/logrotate.d/glite-lb-purge
-%config /etc/logrotate.d/glite-lb-lcas
-%config /etc/mysql/conf.d/glite-lb-server.cnf
+%config(noreplace) /etc/logrotate.d/glite-lb-purge
+%config(noreplace) /etc/logrotate.d/glite-lb-lcas
+%config(noreplace) /etc/mysql/conf.d/glite-lb-server.cnf
 /etc/cron.d/*
 /etc/glite-lb-index.conf.template
 /etc/glite-lb/*

diff --git a/org.glite.lb.utils/project/glite-lb-utils.spec b/org.glite.lb.utils/project/glite-lb-utils.spec
index 6498d73..e331998 100644 (file)
--- a/org.glite.lb.utils/project/glite-lb-utils.spec
+++ b/org.glite.lb.utils/project/glite-lb-utils.spec
@@ -42,6 +42,7 @@ make check
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
 
 
 %clean

diff --git a/org.glite.lb.ws-test/project/glite-lb-ws-test.spec b/org.glite.lb.ws-test/project/glite-lb-ws-test.spec
index 5b22876..950b16a 100644 (file)
--- a/org.glite.lb.ws-test/project/glite-lb-ws-test.spec
+++ b/org.glite.lb.ws-test/project/glite-lb-ws-test.spec
@@ -38,6 +38,7 @@ make check
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
 
 
 %clean

diff --git a/org.glite.px.proxyrenewal/config/startup b/org.glite.px.proxyrenewal/config/startup
index b04e6d7..707d2d7 100755 (executable)
--- a/org.glite.px.proxyrenewal/config/startup
+++ b/org.glite.px.proxyrenewal/config/startup
@@ -36,6 +36,8 @@ GLITE_PX_LOCATION_VAR=${GLITE_PX_LOCATION_VAR:-'@glite_var@'}
 
 PROXY_REPOSITORY="$GLITE_PX_LOCATION_VAR/spool/glite-renewd"
 
+lockfile=/var/lock/glite-proxy-renewald
+
 unset creds
 
 start()
@@ -77,7 +79,14 @@ start()
        
        su - $GLITE_USER -c "VOMS_USERCONF=$user_voms_config \
                $GLITE_PX_LOCATION/bin/glite-proxy-renewd \
-               -r $PROXY_REPOSITORY $creds -A" && echo " done"
+               -r $PROXY_REPOSITORY $creds -A"
+
+       if [ $? -eq 0 ]; then
+               echo " done"
+               touch $lockfile
+       else
+               echo " FAILED"
+       fi
 }
 
 stop()

diff --git a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec
index be9a289..0874d27 100644 (file)
--- a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec
+++ b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec
@@ -73,6 +73,7 @@ make check
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+sed -i 's,\(lockfile=/var/lock\),\1/subsys,' $RPM_BUILD_ROOT/etc/init.d/glite-proxy-renewald
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'