--- lfc-1.7.4.1.orig/debian/liblcgdm-dev.install +++ lfc-1.7.4.1/debian/liblcgdm-dev.install @@ -0,0 +1,9 @@ +debian/tmp/usr/lib/liblcgdm.a +debian/tmp/usr/lib/liblcgdm.so +debian/tmp/usr/share/man/man3/C*.3 +debian/tmp/usr/share/man/man3/getconfent.3 +debian/tmp/usr/share/man/man3/netclose.3 +debian/tmp/usr/share/man/man3/netread.3 +debian/tmp/usr/share/man/man3/netwrite.3 +debian/tmp/usr/share/man/man3/serrno.3 +debian/tmp/usr/share/man/man4/Castor_limits.4 --- lfc-1.7.4.1.orig/debian/liblfc1.install +++ lfc-1.7.4.1/debian/liblfc1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/liblfc.so.* --- lfc-1.7.4.1.orig/debian/changelog +++ lfc-1.7.4.1/debian/changelog @@ -0,0 +1,74 @@ +lfc (1.7.4.1-2) unstable; urgency=low + + * More porting fixes for GNU/Hurd + + -- Mattias Ellert Wed, 06 Jan 2010 00:18:31 +0100 + +lfc (1.7.4.1-1) unstable; urgency=low + + * Update to version 1.7.4.1 + * More porting fixes for GNU/Hurd and kfreebsd + * Dropped patch lcgdm-missing-swig-includes.patch (fixed upstream) + + -- Mattias Ellert Tue, 05 Jan 2010 08:53:20 +0100 + +lfc (1.7.3.1-5) unstable; urgency=low + + * Fix porting issues for GNU/Hurd and kfreebsd + * Extend package descriptions (Closes: #561723) + + -- Mattias Ellert Sun, 27 Dec 2009 14:59:19 +0100 + +lfc (1.7.3.1-4) unstable; urgency=low + + * Add missing include statements in swig interface files (Closes: #557890) + * Use Debian's imake instead of bundled version + + -- Mattias Ellert Mon, 07 Dec 2009 14:38:11 +0100 + +lfc (1.7.3.1-3) unstable; urgency=low + + * Don't use /bin/false as shell - doesn't work with su + * Fix bad directory used for dlopening plugins + + -- Mattias Ellert Tue, 24 Nov 2009 17:27:52 +0100 + +lfc (1.7.3.1-2) unstable; urgency=low + + * Update copyright file (Closes: #515225) + + -- Mattias Ellert Wed, 18 Nov 2009 15:02:58 +0100 + +lfc (1.7.3.1-1) UNRELEASED; urgency=low + + * Update to version 1.7.3.1 + * Changed copyright file to reflect upsteam license change to Apache 2.0 + + -- Mattias Ellert Sat, 26 Sep 2009 05:18:22 +0200 + +lfc (1.7.2.5-1) UNRELEASED; urgency=low + + * Updated policy to 3.8.3 + * Update to version 1.7.2.5 + + -- Mattias Ellert Mon, 17 Aug 2009 16:57:38 +0200 + +lfc (1.7.0.6-3) UNRELEASED; urgency=low + + * Completed reaction to comments by ftpmasters + - renaming perl and python packages according to debian conventions + + -- Steffen Moeller Sun, 29 Mar 2009 23:44:08 +0200 + +lfc (1.7.0.6-2) UNRELEASED; urgency=low + + * Updated policy to 3.8.1 + * Initial reaction to comments + + -- Steffen Moeller Sun, 29 Mar 2009 23:44:08 +0200 + +lfc (1.7.0.6-1) UNRELEASED; urgency=low + + * Initial release + + -- Mattias Ellert Tue, 20 Jan 2009 10:43:25 +0100 --- lfc-1.7.4.1.orig/debian/lfc-mysql.lintian-overrides +++ lfc-1.7.4.1/debian/lfc-mysql.lintian-overrides @@ -0,0 +1,3 @@ +# The init.d script is handled by update-alternatives +lfc-mysql: init.d-script-not-marked-as-conffile /etc/init.d/lfcdaemon +lfc-mysql: init.d-script-not-included-in-package /etc/init.d/lfcdaemon --- lfc-1.7.4.1.orig/debian/liblfc-perl.install +++ lfc-1.7.4.1/debian/liblfc-perl.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/perl5/lfc.so +debian/tmp/usr/lib/perl5/lfc.pm +debian/tmp/usr/share/man/man3/lfc_perl.3 --- lfc-1.7.4.1.orig/debian/README.source +++ lfc-1.7.4.1/debian/README.source @@ -0,0 +1,5 @@ +The source is taken from cvs.glite.cern.ch - see the get-orig-source rule +in debian/rules for details. + +The debian/patches/series file presents an overview on the changes performed +on the upstream sources. --- lfc-1.7.4.1.orig/debian/lfc-client.install +++ lfc-1.7.4.1/debian/lfc-client.install @@ -0,0 +1,2 @@ +debian/tmp/usr/bin/lfc-* +debian/tmp/usr/share/man/man1/* --- lfc-1.7.4.1.orig/debian/lfc-mysql.README.Debian +++ lfc-1.7.4.1/debian/lfc-mysql.README.Debian @@ -0,0 +1,41 @@ +How to set up an LFC server with a mysql backend +================================================ + +The LFC server is run by the lfcmgr user. This user requires a copy of +the host certificate files: + + cp -p /etc/grid-security/hostcert.pem /etc/grid-security/lfcmgr/lfccert.pem + cp -p /etc/grid-security/hostkey.pem /etc/grid-security/lfcmgr/lfckey.pem + chown lfcmgr:lfcmgr /etc/grid-security/lfcmgr/lfc* + +Create the LFC database on the mysql server: + + mysql -u root < /usr/share/lfc/create_lfc_tables_mysql.sql + +Select a username and password for this mysql database table. Replace + and in the commands below with your choice, also +replace with the hostname of the LFC server: + + mysql -u root + mysql> use mysql + mysql> grant all on cns_db.* to @localhost identified by ; + mysql> grant all on cns_db.* to @ identified by ; + mysql> quit + +Let the LFC server know about the account information and make sure +only the lfcmgr user can read this information: + + touch /etc/NSCONFIG + chmod 600 /etc/NSCONFIG + chown lfcmgr:lfcmgr /etc/NSCONFIG + echo /@/ > /etc/NSCONFIG + +If the / part is omitted the database "cns_db" will be used. + +If you have a firewall, open the LFC server port (5010). + +Once the configuration is completed, change RUN_LFCDAEMON=no to +RUN_LFCDAEMON=yes in /etc/default/lfcdaemon, then start the LFC +server: + + invoke-rc.d lfcdaemon start --- lfc-1.7.4.1.orig/debian/README.Debian +++ lfc-1.7.4.1/debian/README.Debian @@ -0,0 +1,14 @@ +Large Hadron Collider Computing Grid File Catalog - for Debian +============================================================== + +CERN is where the World Wide Web was born. And that peculiar place +has a series of demands in which they are ahead of the remainder of +most parts of the world. + +The LFC infrastructure for the distributed access to an enormous +distributed data collection, i.e. the experiments run in the +collider, is used by researchers across Europe and from all the +visitors from throughout the world. + +Debian (and Fedora) are now spearheading the distribution of this +technology to the masses. --- lfc-1.7.4.1.orig/debian/compat +++ lfc-1.7.4.1/debian/compat @@ -0,0 +1 @@ +5 --- lfc-1.7.4.1.orig/debian/lfc-dli.postrm +++ lfc-1.7.4.1/debian/lfc-dli.postrm @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "$1" = "purge" ] ; then + update-rc.d lfc-dli remove >/dev/null || exit $? +fi + +#DEBHELPER# --- lfc-1.7.4.1.orig/debian/rules +++ lfc-1.7.4.1/debian/rules @@ -0,0 +1,281 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O0 +else +CFLAGS += -O2 +endif + +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +MAKEFLAGS += -j$(NUMJOBS) +endif + +include /usr/share/quilt/quilt.make + +INSTALLDIR = $(CURDIR)/debian/tmp + +_prefix = /usr +_bindir = $(_prefix)/bin +_sbindir = $(_prefix)/sbin +_libdir = $(_prefix)/lib +_includedir = $(_prefix)/include +_sysconfdir = /etc +_localstatedir = /var +_initrddir = $(_sysconfdir)/init.d +_datadir = $(_prefix)/share +_mandir = $(_datadir)/man +_docdir = $(_datadir)/doc + +VERSION=1.7.4.1 + +DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) + +configure: configure-stamp + : + +configure-stamp: $(QUILT_STAMPFN) + dh_testdir + + for f in config/site.def config/linux.cf ; do \ + [ ! -e $$f.save ] && cp -p $$f $$f.save || : ; \ + done + + 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 + # CFLAGS doesn't try to use them. + sed 's/^CC +=/& $(CFLAGS) -fno-strict-aliasing -Wl,-z,defs/' \ + -i config/linux.cf + + gsoapversion=`soapcpp2 -v 2>&1 | grep Compiler | sed 's/.* //'` && \ + ./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' + + make -f Makefile.ini Makefiles + + touch $@ + +build: build-stamp + : + +build-stamp: configure-stamp + dh_testdir + + $(MAKE) prefix=$(_prefix) + + touch $@ + +unpatch: cleanup + +clean: unpatch + : + +cleanup: + dh_testdir + dh_testroot + + if [ -r Makefile ] ; then $(MAKE) clobber ; fi + + for f in config/site.def config/linux.cf ; do \ + [ -e $$f.save ] && mv $$f.save $$f || : ; \ + done + + sed 's!$(_libdir)!@@LIBDIR@@!' -i security/Csec_api_loader.c + + rm -f imake/imake imake/imake.o imake/ccimake + + find . '(' -name Makefile -a '!' -path */scripts/* ')' -exec rm {} ';' + + rm -f config.status + + rm -f h/patchlevel.h + rm -f ns/lfc.pm ns/lfc_perlwrap.c + rm -f ns/lfc.py ns/lfc_wrap.c + rm -f ns/lfcthr.py ns/lfcthr_wrap.c + rm -f ns/lfc2.py ns/lfc2_wrap.c + rm -f ns/lfc2thr.py ns/lfc2thr_wrap.c + rm -f NSCONFIG + + rm -f build-stamp configure-stamp + + dh_clean + +install: build-stamp + dh_testdir + dh_testroot + mkdir -p debian/liblfc-dev$(_docdir) + ln -s liblfc1 debian/liblfc-dev$(_docdir)/liblfc-dev + mkdir -p debian/liblcgdm-dev$(_docdir) + ln -s liblcgdm1 debian/liblcgdm-dev$(_docdir)/liblgcdm-dev + dh_clean -k + + $(MAKE) prefix=$(INSTALLDIR)$(_prefix) install + $(MAKE) prefix=$(INSTALLDIR)$(_prefix) install.man + + mv $(INSTALLDIR)$(_datadir)/LFC $(INSTALLDIR)$(_datadir)/lfc + + mkdir -p $(INSTALLDIR)$(_sysconfdir)/init.d + mkdir -p $(INSTALLDIR)$(_sysconfdir)/default + mkdir -p $(INSTALLDIR)$(_sysconfdir)/logrotate.d + mkdir -p $(INSTALLDIR)$(_sbindir) + mkdir -p $(INSTALLDIR)$(_mandir)/man8 + + mkdir -p $(INSTALLDIR)$(_libdir)/lfc-mysql + mkdir -p $(INSTALLDIR)$(_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/ / /g' \ + $(INSTALLDIR)$(_datadir)/lfc/rc.lfcdaemon > \ + $(INSTALLDIR)$(_sysconfdir)/lfc-mysql/lfcdaemon.init + chmod 755 $(INSTALLDIR)$(_sysconfdir)/lfc-mysql/lfcdaemon.init + rm $(INSTALLDIR)$(_datadir)/lfc/rc.lfcdaemon + + # lfcdaemon configuration file + sed -e 's!/opt/lcg!!g' \ + -e 's/\(RUN_LFCDAEMON=\).*/\1"no"/' \ + $(INSTALLDIR)$(_sysconfdir)/lfcdaemon.conf.templ > \ + $(INSTALLDIR)$(_sysconfdir)/lfc-mysql/lfcdaemon.conf + rm $(INSTALLDIR)$(_sysconfdir)/lfcdaemon.conf.templ + + # lfcdaemon log directory and log rotation configuration + mkdir -p $(INSTALLDIR)$(_localstatedir)/log/lfc + install -m 644 ns/lfcdaemon.logrotate \ + $(INSTALLDIR)$(_sysconfdir)/lfc-mysql/lfcdaemon.logrotate + + # lfcdaemon binary and man page + mv $(INSTALLDIR)$(_bindir)/lfcdaemon \ + $(INSTALLDIR)$(_libdir)/lfc-mysql/lfcdaemon + sed -e 's/\(\.TH [^ ]* \)1/\18/' \ + -e 's!/opt/lcg!!g' \ + -e 's/lfc-shutdown(1)/lfc-shutdown(8)/g' \ + $(INSTALLDIR)$(_mandir)/man1/lfcdaemon.1 | gzip -9 -n -c > \ + $(INSTALLDIR)$(_libdir)/lfc-mysql/lfcdaemon.8.gz + rm $(INSTALLDIR)$(_mandir)/man1/lfcdaemon.1 + + mv $(INSTALLDIR)$(_sysconfdir)/NSCONFIG.templ \ + $(INSTALLDIR)$(_libdir)/lfc-mysql/NSCONFIG.templ + + # lfc-shutdown binary and man page + mv $(INSTALLDIR)$(_bindir)/lfc-shutdown \ + $(INSTALLDIR)$(_libdir)/lfc-mysql/lfc-shutdown + sed -e 's/\(\.TH [^ ]* \)1/\18/' \ + $(INSTALLDIR)$(_mandir)/man1/lfc-shutdown.1 | gzip -9 -n -c > \ + $(INSTALLDIR)$(_libdir)/lfc-mysql/lfc-shutdown.8.gz + rm $(INSTALLDIR)$(_mandir)/man1/lfc-shutdown.1 + + # 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!/var/log/dli!/var/log/lfc-dli!g' \ + -e 's/ / /g' \ + $(INSTALLDIR)$(_datadir)/lfc/rc.lfc-dli > \ + $(INSTALLDIR)$(_sysconfdir)/init.d/lfc-dli + chmod 755 $(INSTALLDIR)$(_sysconfdir)/init.d/lfc-dli + rm $(INSTALLDIR)$(_datadir)/lfc/rc.lfc-dli + + # lfc-dli configuration file + sed -e 's!/var/log/dli!/var/log/lfc-dli!g' \ + -e 's/\(LFC_HOST=\).*/\1`hostname -f`/' \ + -e 's/\(RUN_DLIDAEMON=\).*/\1"no"/' \ + $(INSTALLDIR)$(_sysconfdir)/lfc-dli.conf.templ > \ + $(INSTALLDIR)$(_sysconfdir)/default/lfc-dli + rm $(INSTALLDIR)$(_sysconfdir)/lfc-dli.conf.templ + + # lfc-dli log directory and log rotation configuration + mkdir -p $(INSTALLDIR)$(_localstatedir)/log/lfc-dli + sed -e 's!/var/log/dli!/var/log/lfc-dli!g' dli/lfc-dli.logrotate > \ + $(INSTALLDIR)$(_sysconfdir)/logrotate.d/lfc-dli + + # lfc-dli binary and man page + mv $(INSTALLDIR)$(_bindir)/lfc-dli $(INSTALLDIR)$(_sbindir)/lfc-dli + sed -e 's/\(\.TH [^ ]* \)1/\18/' \ + -e 's!/var/log/dli!/var/log/lfc-dli!g' \ + -e 's/lfcdaemon(1)/lfc-server(8)/g' \ + $(INSTALLDIR)$(_mandir)/man1/lfc-dli.1 > \ + $(INSTALLDIR)$(_mandir)/man8/lfc-dli.8 + rm $(INSTALLDIR)$(_mandir)/man1/lfc-dli.1 + + sed 's/\(^LFC_VERSION=\).*/\1$(VERSION)/' \ + scripts/lcg-info-provider-lfc > \ + $(INSTALLDIR)$(_datadir)/lfc/lcg-info-provider-lfc + chmod 755 $(INSTALLDIR)$(_datadir)/lfc/lcg-info-provider-lfc + + # Move plugins out of the default library search path + mkdir $(INSTALLDIR)$(_libdir)/lcgdm + mv $(INSTALLDIR)$(_libdir)/libCsec_plugin_* \ + $(INSTALLDIR)$(_libdir)/lcgdm + + # Create lfc user home and certificate directories + mkdir -p $(INSTALLDIR)$(_localstatedir)/lib/lfc + mkdir -p $(INSTALLDIR)$(_sysconfdir)/grid-security/lfcmgr + + # Remove due to name conflict + rm $(INSTALLDIR)$(_mandir)/man3/log.3 + + # Lintian overrides + mkdir -p $(INSTALLDIR)/usr/share/lintian/overrides + install -m 644 debian/lfc-mysql.lintian-overrides \ + $(INSTALLDIR)/usr/share/lintian/overrides/lfc-mysql + +binary-indep: + : + +binary-arch: install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_install --fail-missing + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_perl + dh_pysupport + dh_makeshlibs + dh_installdeb + dh_shlibdeps -l debian/liblcgdm1/usr/lib -l debian/liblfc1/usr/lib + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch + : + +get-orig-source: + dest="../lfc_$(VERSION).orig.tar.gz" ; \ + if [ -r "$$dest" ] ; then \ + echo "'$$dest' already exists." ; \ + else \ + uversion=LCG-DM_R_`echo $(VERSION)|tr "." "_"` ; \ + echo "Fetching upstream CVS version '$$uversion'" ; \ + rm -rf lfc-$(VERSION) ; \ + cvs -d:pserver:anonymous@glite.cvs.cern.ch:/cvs/glite co \ + -r $$uversion -d lfc-$(VERSION) LCG-DM ; \ + echo "Packing it up." ; \ + GZIP=-9 tar --exclude CVS --exclude debian \ + -z -c -f "$$dest" lfc-$(VERSION) ; \ + echo "Cleaning up." ; \ + rm -rf lfc-$(VERSION) ; \ + fi + +.PHONY: build clean binary-indep binary-arch binary install configure get-orig-source --- lfc-1.7.4.1.orig/debian/lfc-dli.postinst +++ lfc-1.7.4.1/debian/lfc-dli.postinst @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +chown lfcmgr:lfcmgr /var/log/lfc-dli + +if [ -x "/etc/init.d/lfc-dli" ]; then + update-rc.d lfc-dli defaults >/dev/null + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d lfc-dli start || exit $? + else + /etc/init.d/lfc-dli start || exit $? + fi +fi + +#DEBHELPER# --- lfc-1.7.4.1.orig/debian/lfc-mysql.postinst +++ lfc-1.7.4.1/debian/lfc-mysql.postinst @@ -0,0 +1,43 @@ +#!/bin/sh + +set -e + +getent group lfcmgr > /dev/null || \ + addgroup --quiet --system lfcmgr + +getent passwd lfcmgr > /dev/null || \ + adduser --quiet --system --home /var/lib/lfc --shell /bin/sh \ + --ingroup lfcmgr --disabled-password --disabled-login \ + --gecos "LFC manager" lfcmgr + +chown lfcmgr:lfcmgr /var/lib/lfc + +chown lfcmgr:lfcmgr /var/log/lfc + +update-alternatives --install /usr/sbin/lfcdaemon lfcdaemon \ + /usr/lib/lfc-mysql/lfcdaemon 20 \ + --slave /usr/share/man/man8/lfcdaemon.8.gz lfcdaemon.8.gz \ + /usr/lib/lfc-mysql/lfcdaemon.8.gz \ + --slave /usr/share/lfc/NSCONFIG.templ NSCONFIG.templ \ + /usr/lib/lfc-mysql/NSCONFIG.templ \ + --slave /etc/init.d/lfcdaemon lfcdaemon.init \ + /etc/lfc-mysql/lfcdaemon.init \ + --slave /etc/default/lfcdaemon lfcdaemon.conf \ + /etc/lfc-mysql/lfcdaemon.conf \ + --slave /etc/logrotate.d/lfcdaemon lfcdaemon.logrotate \ + /etc/lfc-mysql/lfcdaemon.logrotate \ + --slave /usr/sbin/lfc-shutdown lfc-shutdown \ + /usr/lib/lfc-mysql/lfc-shutdown \ + --slave /usr/share/man/man8/lfc-shutdown.8.gz lfc-shutdown.8.gz \ + /usr/lib/lfc-mysql/lfc-shutdown.8.gz + +if [ -x "/etc/init.d/lfcdaemon" ]; then + update-rc.d lfcdaemon defaults >/dev/null + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d lfcdaemon start || exit $? + else + /etc/init.d/lfcdaemon start || exit $? + fi +fi + +#DEBHELPER# --- lfc-1.7.4.1.orig/debian/lfc-mysql.install +++ lfc-1.7.4.1/debian/lfc-mysql.install @@ -0,0 +1,13 @@ +debian/tmp/usr/lib/lfc-mysql/lfcdaemon +debian/tmp/usr/lib/lfc-mysql/lfc-shutdown +debian/tmp/usr/lib/lfc-mysql/NSCONFIG.templ +debian/tmp/usr/lib/lfc-mysql/lfcdaemon.8* +debian/tmp/usr/lib/lfc-mysql/lfc-shutdown.8* +debian/tmp/etc/lfc-mysql/lfcdaemon.init +debian/tmp/etc/lfc-mysql/lfcdaemon.conf +debian/tmp/etc/lfc-mysql/lfcdaemon.logrotate +debian/tmp/usr/share/lfc/create_lfc_tables_mysql.sql +debian/tmp/var/log/lfc +debian/tmp/var/lib/lfc +debian/tmp/usr/share/lintian/overrides/lfc-mysql +debian/tmp/etc/grid-security/lfcmgr --- lfc-1.7.4.1.orig/debian/python-lfc.install +++ lfc-1.7.4.1/debian/python-lfc.install @@ -0,0 +1,10 @@ +debian/tmp/usr/lib/python*/*-packages/_lfc.so +debian/tmp/usr/lib/python*/*-packages/lfc.py* +debian/tmp/usr/lib/python*/*-packages/_lfcthr.so +debian/tmp/usr/lib/python*/*-packages/lfcthr.py* +debian/tmp/usr/lib/python*/*-packages/_lfc2.so +debian/tmp/usr/lib/python*/*-packages/lfc2.py* +debian/tmp/usr/lib/python*/*-packages/_lfc2thr.so +debian/tmp/usr/lib/python*/*-packages/lfc2thr.py* +debian/tmp/usr/share/man/man3/lfc_python.3 +debian/tmp/usr/share/man/man3/lfc2_python.3 --- lfc-1.7.4.1.orig/debian/lfc-mysql.prerm +++ lfc-1.7.4.1/debian/lfc-mysql.prerm @@ -0,0 +1,16 @@ +#!/bin/sh +set -e + +if [ -x "/etc/init.d/lfcdaemon" ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d lfcdaemon stop || exit $? + else + /etc/init.d/lfcdaemon stop || exit $? + fi +fi + +if [ "$1" = "remove" ] ; then + update-alternatives --remove lfcdaemon /usr/lib/lfc-mysql/lfcdaemon +fi + +#DEBHELPER# --- lfc-1.7.4.1.orig/debian/copyright +++ lfc-1.7.4.1/debian/copyright @@ -0,0 +1,61 @@ +Name: lfc +Source: glite.cvs.cern.ch + +Files: * +Upstream Author: Jean-Philippe Baud, CERN IT-GD/ITR +Copyright: Copyright 1990-2009 CERN and Members of the EGEE Collaboration +License: Apache-2.0 + +Files: common/Cgetopt.man, common/Cgetopt.c, win32/getopt.c, win32/inet_netof.c +Copyright: Copyright 1983-1996 The Regents of the University of California +License: BSD + +Files: debian/* +Copyright: © 2009, Mattias Ellert +License: Apache-2.0 + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. + + On Debian systems the full text of the Apache-2.0 license can be found in + the /usr/share/common-licenses/Apache-2.0 file. + +Licence: BSD + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the University of + California, Berkeley and its contributors. + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. --- lfc-1.7.4.1.orig/debian/liblfc1.docs +++ lfc-1.7.4.1/debian/liblfc1.docs @@ -0,0 +1 @@ +doc/lfc/README --- lfc-1.7.4.1.orig/debian/liblcgdm1.install +++ lfc-1.7.4.1/debian/liblcgdm1.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/liblcgdm.so.* +debian/tmp/usr/lib/lcgdm/libCsec_plugin_GSI.so +debian/tmp/usr/lib/lcgdm/libCsec_plugin_GSI_thread.so +debian/tmp/usr/lib/lcgdm/libCsec_plugin_ID.so --- lfc-1.7.4.1.orig/debian/lfc-dli.install +++ lfc-1.7.4.1/debian/lfc-dli.install @@ -0,0 +1,7 @@ +debian/tmp/usr/sbin/lfc-dli +debian/tmp/usr/share/man/man8/lfc-dli.8 +debian/tmp/etc/init.d/lfc-dli +debian/tmp/etc/default/lfc-dli +debian/tmp/etc/logrotate.d/lfc-dli +debian/tmp/usr/share/lfc/lcg-info-provider-lfc +debian/tmp/var/log/lfc-dli --- lfc-1.7.4.1.orig/debian/control +++ lfc-1.7.4.1/debian/control @@ -0,0 +1,93 @@ +Source: lfc +Priority: optional +Maintainer: Mattias Ellert +Build-Depends: debhelper (>= 5), quilt, libglobus-gssapi-gsi-dev, libglobus-gss-assist-dev, libglobus-gsi-credential-dev, libglobus-gsi-callback-dev, libglobus-common-dev, voms-dev, gsoap, libmysqlclient-dev | libmysqlclient16-dev | libmysqlclient15-dev | libmysqlclient12-dev | libmysqlclient10-dev, uuid-dev, swig, libperl-dev, perl, python-dev, python-support, xutils-dev +XS-Python-Version: current +Standards-Version: 3.8.3 +Section: libs +DM-Upload-Allowed: yes +Vcs-Browser: http://svn.nordugrid.org/trac/workarea/browser/T5.2/debian-distribution/lfc +Vcs-Svn: http://svn.nordugrid.org/repos/workarea/T5.2/debian-distribution/lfc +Homepage: http://glite.web.cern.ch/glite/ + +Package: liblfc1 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: LCG File Catalog (LFC) + The LCG File Catalog (LFC) keeps track of the locations of the physical + replicas of the logical files in a distributed storage system. + This package contains the runtime LFC client library. + +Package: liblfc-dev +Section: libdevel +Architecture: any +Depends: liblfc1 (= ${binary:Version}), liblcgdm-dev, ${misc:Depends} +Description: LFC development libraries and header files + The LCG File Catalog (LFC) keeps track of the locations of the physical + replicas of the logical files in a distributed storage system. + This package contains the development libraries and header files for LFC. + +Package: liblcgdm1 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: LCG Data Management common libraries + This package contains common libraries for the LCG Data Management + components: the LFC (LCG File Catalog) and the DPM (Disk Pool Manager). + +Package: liblcgdm-dev +Section: libdevel +Architecture: any +Depends: liblcgdm1 (= ${binary:Version}), ${misc:Depends} +Description: LCG Data Management common development files + This package contains common development libraries and header files + for LCG Data Management. + +Package: lfc-client +Section: net +Architecture: any +Depends: liblfc1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: LCG File Catalog (LFC) client + The LCG File Catalog (LFC) keeps track of the locations of the physical + replicas of the logical files in a distributed storage system. + This package provides the command line interfaces for the LFC. + +Package: liblfc-perl +Section: perl +Architecture: any +Depends: liblfc1 (= ${binary:Version}), ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends} +Description: LCG File Catalog (LFC) perl bindings + The LCG File Catalog (LFC) keeps track of the locations of the physical + replicas of the logical files in a distributed storage system. + This package provides Perl bindings for the LFC client library. + +Package: python-lfc +Provides: ${python:Provides} +Section: python +Architecture: any +Depends: liblfc1 (= ${binary:Version}), ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} +XB-Python-Version: ${python:Versions} +Description: LCG File Catalog (LFC) python bindings + The LCG File Catalog (LFC) keeps track of the locations of the physical + replicas of the logical files in a distributed storage system. + This package provides Python bindings for the LFC client library. + +Package: lfc-mysql +Provides: lfcdaemon +Section: net +Architecture: any +Depends: adduser, ${shlibs:Depends}, ${misc:Depends} +Description: LCG File Catalog (LFC) server with MySQL database backend + The LCG File Catalog (LFC) keeps track of the locations of the physical + replicas of the logical files in a distributed storage system. + This package provides an LFC server that uses MySQL as its database + backend. + +Package: lfc-dli +Section: net +Architecture: any +Depends: lfc-mysql | lfc-postgres, ${shlibs:Depends}, ${misc:Depends} +Description: LCG File Catalog (LFC) data location interface (dli) server + The LCG File Catalog (LFC) keeps track of the locations of the physical + replicas of the logical files in a distributed storage system. + This package provides the data location interface (dli) server for + the LFC. --- lfc-1.7.4.1.orig/debian/lfc-dli.prerm +++ lfc-1.7.4.1/debian/lfc-dli.prerm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +if [ -x "/etc/init.d/lfc-dli" ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d lfc-dli stop || exit $? + else + /etc/init.d/lfc-dli stop || exit $? + fi +fi + +#DEBHELPER# --- lfc-1.7.4.1.orig/debian/lfc-mysql.postrm +++ lfc-1.7.4.1/debian/lfc-mysql.postrm @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +if [ "$1" = "purge" ] ; then + update-alternatives --display lfcdaemon > /dev/null || \ + update-rc.d lfcdaemon remove >/dev/null || exit $? +fi + +#DEBHELPER# --- lfc-1.7.4.1.orig/debian/liblfc-dev.install +++ lfc-1.7.4.1/debian/liblfc-dev.install @@ -0,0 +1,6 @@ +debian/tmp/usr/include/lfc +debian/tmp/usr/lib/liblfc.a +debian/tmp/usr/lib/liblfc.so +debian/tmp/usr/share/man/man3/lfc_[a-o]*.3 +debian/tmp/usr/share/man/man3/lfc_ping.3 +debian/tmp/usr/share/man/man3/lfc_[q-z]*.3 --- lfc-1.7.4.1.orig/debian/patches/lcgdm-ld.patch +++ lfc-1.7.4.1/debian/patches/lcgdm-ld.patch @@ -0,0 +1,258 @@ +diff -ur LCG-DM-1.7.3.1.orig/config/Imake.rules LCG-DM-1.7.3.1/config/Imake.rules +--- LCG-DM-1.7.3.1.orig/config/Imake.rules 2009-01-09 11:48:32.000000000 +0100 ++++ LCG-DM-1.7.3.1/config/Imake.rules 2009-09-24 11:33:44.017118236 +0200 +@@ -91,7 +91,7 @@ + #ifndef NormalProgramTarget + #define NormalProgramTarget(program,objects,deplibs,libs) \ + ProgramTargetName(program): objects deplibs @@\ +- $(LD) -o $@ $(LDFLAGS) objects libs ++ $(CC) -o $@ $(LDFLAGS) objects libs + #endif + + #ifndef MakeSubdirs +diff -ur LCG-DM-1.7.3.1.orig/config/Win32.rules LCG-DM-1.7.3.1/config/Win32.rules +--- LCG-DM-1.7.3.1.orig/config/Win32.rules 2005-03-31 16:58:06.000000000 +0200 ++++ LCG-DM-1.7.3.1/config/Win32.rules 2009-09-24 11:33:44.018150491 +0200 +@@ -41,7 +41,7 @@ + + #define NormalProgramTarget(program,objects,deplibs,libs) \ + ProgramTargetName(program): objects deplibs @@\ +- $(LD) @<< @@\ ++ $(CC) @<< @@\ + /out:$@ $(LDFLAGS) objects libs @@\ + << + +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-08-24 12:43:49.000000000 +0200 ++++ LCG-DM-1.7.3.1/dicomcopy/Imakefile 2009-09-24 11:33:44.019119128 +0200 +@@ -142,7 +142,7 @@ + NormalLibraryTarget(dicomcopy,dicomcopy_inc_reqctr.Osuf send2dicomcopyd.Osuf) + + SharedLibraryTargetName(dpm_dicom): dpm_dicomcopyfile.Osuf +- $(LD) $(SHLIBLDFLAGS) -o $@ dpm_dicomcopyfile.Osuf ++ $(CC) $(SHLIBLDFLAGS) -o $@ dpm_dicomcopyfile.Osuf + + install: $(BIN) $(DPMSHAREDIR) $(SYSCONFDIR) $(IPROGS_D) $(SPOOL) + +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:32:35.308119240 +0200 ++++ LCG-DM-1.7.3.1/dpm/Imakefile 2009-09-24 11:33:44.020118491 +0200 +@@ -413,19 +413,19 @@ + RemoveFiles(dpm_wrap.o dpm_wrap.c) + $(SWIG) -perl -I$(INCLUDES) -DNSTYPE_DPNS dpm.i + $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PERL) -Dbool=char -D_GNU_SOURCE -DNSTYPE_DPNS dpm_wrap.c +- $(LD) $(SHLIBLDFLAGS) -o dpm.so dpm_wrap.o $(LIBS) -ldpm ++ $(CC) $(SHLIBLDFLAGS) -o dpm.so dpm_wrap.o $(LIBS) -ldpm + + _dpm.so dpm.py : 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 ++ $(CC) $(SHLIBLDFLAGS) -o _dpm.so dpm_wrap.o $(LIBS) -ldpm + + _dpm2.so dpm2.py : 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 ++ $(CC) $(SHLIBLDFLAGS) -o _dpm2.so dpm2_wrap.o $(LIBS) -ldpm + + InstallTarget(dpm.so,root,root,0755,$(PERLDIR)) + InstallTarget(dpm.pm,root,root,0644,$(PERLDIR)) +diff -ur LCG-DM-1.7.3.1.orig/ns/Imakefile.lfc LCG-DM-1.7.3.1/ns/Imakefile.lfc +--- LCG-DM-1.7.3.1.orig/ns/Imakefile.lfc 2009-09-24 11:32:35.314117621 +0200 ++++ LCG-DM-1.7.3.1/ns/Imakefile.lfc 2009-09-24 11:33:44.025118516 +0200 +@@ -461,13 +461,13 @@ + RemoveFiles(lfc_wrap.o lfc_wrap.c) + $(SWIG) -perl -I$(INCLUDES) -DNSTYPE_LFC lfc.i + $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PERL) -Dbool=char -D_GNU_SOURCE lfc_wrap.c +- $(LD) $(SHLIBLDFLAGS) -o lfc.so lfc_wrap.o $(LIBS) -llfc ++ $(CC) $(SHLIBLDFLAGS) -o lfc.so lfc_wrap.o $(LIBS) -llfc + + _lfc.so lfc.py : 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 ++ $(CC) $(SHLIBLDFLAGS) -o _lfc.so lfc_wrap.o $(LIBS) -llfc + + InstallTarget(lfc.so,root,root,0755,$(PERLDIR)) + InstallTarget(lfc.pm,root,root,0644,$(PERLDIR)) +@@ -478,7 +478,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 +- $(LD) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(LIBS) -llfc ++ $(CC) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(LIBS) -llfc + + InstallTarget(_lfc2.so,root,root,0755,$(PYTHONDIR)) + InstallTarget(lfc2.py,root,root,0644,$(PYTHONDIR)) +@@ -487,7 +487,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 +- $(LD) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(LIBS) -llfc ++ $(CC) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(LIBS) -llfc + + InstallTarget(_lfcthr.so,root,root,0755,$(PYTHONDIR)) + InstallTarget(lfcthr.py,root,root,0644,$(PYTHONDIR)) +@@ -496,7 +496,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 +- $(LD) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(LIBS) -llfc ++ $(CC) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(LIBS) -llfc + + InstallTarget(_lfc2thr.so,root,root,0755,$(PYTHONDIR)) + InstallTarget(lfc2thr.py,root,root,0644,$(PYTHONDIR)) +diff -ur LCG-DM-1.7.3.1.orig/scripts/RLS-Atlas-migration/bin/Makefile LCG-DM-1.7.3.1/scripts/RLS-Atlas-migration/bin/Makefile +--- LCG-DM-1.7.3.1.orig/scripts/RLS-Atlas-migration/bin/Makefile 2005-07-14 10:54:13.000000000 +0200 ++++ LCG-DM-1.7.3.1/scripts/RLS-Atlas-migration/bin/Makefile 2009-09-24 11:33:44.026118848 +0200 +@@ -41,11 +41,11 @@ + all: $(PROGS) + + migrate_info: migrate_info.o $(DEPLIBS) +- $(LD) -o $@ $(LDFLAGS) migrate_info.o $(LIBS) ++ $(CC) -o $@ $(LDFLAGS) migrate_info.o $(LIBS) + migrate_path: migrate_path.o $(DEPLIBS) +- $(LD) -o $@ $(LDFLAGS) migrate_path.o $(LIBS) ++ $(CC) -o $@ $(LDFLAGS) migrate_path.o $(LIBS) + migrate_files: migrate_files.o $(DEPLIBS) +- $(LD) -o $@ $(LDFLAGS) migrate_files.o $(LIBS) ++ $(CC) -o $@ $(LDFLAGS) migrate_files.o $(LIBS) + + ../../LCG-DM/ns/libns.a: FORCE + cd ../../LCG-DM/ns ; $(MAKE) libns.a +diff -ur LCG-DM-1.7.3.1.orig/scripts/RLS-Cms-migration/bin/Makefile LCG-DM-1.7.3.1/scripts/RLS-Cms-migration/bin/Makefile +--- LCG-DM-1.7.3.1.orig/scripts/RLS-Cms-migration/bin/Makefile 2005-12-15 12:13:37.000000000 +0100 ++++ LCG-DM-1.7.3.1/scripts/RLS-Cms-migration/bin/Makefile 2009-09-24 11:33:44.027117735 +0200 +@@ -41,11 +41,11 @@ + all: $(PROGS) + + migrate_info: migrate_info.o $(DEPLIBS) +- $(LD) -o $@ $(LDFLAGS) migrate_info.o $(LIBS) ++ $(CC) -o $@ $(LDFLAGS) migrate_info.o $(LIBS) + migrate_path: migrate_path.o $(DEPLIBS) +- $(LD) -o $@ $(LDFLAGS) migrate_path.o $(LIBS) ++ $(CC) -o $@ $(LDFLAGS) migrate_path.o $(LIBS) + migrate_files: migrate_files.o $(DEPLIBS) +- $(LD) -o $@ $(LDFLAGS) migrate_files.o $(LIBS) ++ $(CC) -o $@ $(LDFLAGS) migrate_files.o $(LIBS) + + ../../../ns/libns.a: FORCE + cd ../../../ns ; $(MAKE) libns.a +diff -ur LCG-DM-1.7.3.1.orig/scripts/RLS-migration/bin/Makefile LCG-DM-1.7.3.1/scripts/RLS-migration/bin/Makefile +--- LCG-DM-1.7.3.1.orig/scripts/RLS-migration/bin/Makefile 2005-04-06 22:50:21.000000000 +0200 ++++ LCG-DM-1.7.3.1/scripts/RLS-migration/bin/Makefile 2009-09-24 11:33:44.028118851 +0200 +@@ -39,9 +39,9 @@ + all: $(PROGS) + + migrate_path: migrate_path.o $(DEPLIBS) +- $(LD) -o $@ $(LDFLAGS) migrate_path.o $(LIBS) ++ $(CC) -o $@ $(LDFLAGS) migrate_path.o $(LIBS) + migrate_files: migrate_files.o $(DEPLIBS) +- $(LD) -o $@ $(LDFLAGS) migrate_files.o $(LIBS) ++ $(CC) -o $@ $(LDFLAGS) migrate_files.o $(LIBS) + + ../../../ns/libns.a: FORCE + cd ../../../ns ; $(MAKE) libns.a +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-01-09 11:48:32.000000000 +0100 ++++ LCG-DM-1.7.3.1/security/Imakefile 2009-09-24 11:33:44.030117560 +0200 +@@ -165,10 +165,10 @@ + + #if UseGSI + SharedLibraryTargetName(Csec_plugin_GSI_thread): Csec_plugin_GSI_pthr.Osuf Csec_plugin_GSI_pthr_mapper.Osuf +- $(LD) $(SHLIBLDFLAGS) -o $@ Csec_plugin_GSI_pthr.Osuf Csec_plugin_GSI_pthr_mapper.Osuf SecLibsGSIpthr $(SHLIBREQLIBS) ++ $(CC) $(SHLIBLDFLAGS) -o $@ Csec_plugin_GSI_pthr.Osuf Csec_plugin_GSI_pthr_mapper.Osuf SecLibsGSIpthr $(SHLIBREQLIBS) + + SharedLibraryTargetName(Csec_plugin_GSI): Csec_plugin_GSI.Osuf Csec_plugin_GSI_mapper.Osuf +- $(LD) $(SHLIBLDFLAGS) -o $@ Csec_plugin_GSI.Osuf Csec_plugin_GSI_mapper.Osuf SecLibsGSI $(SHLIBREQLIBS) ++ $(CC) $(SHLIBLDFLAGS) -o $@ Csec_plugin_GSI.Osuf Csec_plugin_GSI_mapper.Osuf SecLibsGSI $(SHLIBREQLIBS) + + Csec_plugin_GSI.Osuf: Csec_plugin_GSS.c + $(CC) $(CFLAGS) SecAuthMechGSI SecIncludeDirGSI -o $@ -c Csec_plugin_GSS.c +@@ -185,7 +185,7 @@ + + #if UseKRB5 + SharedLibraryTargetName(Csec_plugin_KRB5): Csec_plugin_KRB5.Osuf Csec_plugin_KRB5_mapper.Osuf +- $(LD) $(SHLIBLDFLAGS) -o $@ Csec_plugin_KRB5.Osuf Csec_plugin_KRB5_mapper.Osuf SecLibsKRB5 $(SHLIBREQLIBS) ++ $(CC) $(SHLIBLDFLAGS) -o $@ Csec_plugin_KRB5.Osuf Csec_plugin_KRB5_mapper.Osuf SecLibsKRB5 $(SHLIBREQLIBS) + + Csec_plugin_KRB5.Osuf: Csec_plugin_GSS.c + $(CC) $(CFLAGS) SecAuthMechKRB5 SecIncludeDirKRB5 -o $@ -c Csec_plugin_GSS.c +@@ -196,14 +196,14 @@ + + #if UseKRB4 + SharedLibraryTargetName(Csec_plugin_KRB4): Csec_plugin_KRB4.Osuf +- $(LD) $(SHLIBLDFLAGS) -o $@ Csec_plugin_KRB4.Osuf SecLibsKRB4 $(SHLIBREQLIBS) ++ $(CC) $(SHLIBLDFLAGS) -o $@ Csec_plugin_KRB4.Osuf SecLibsKRB4 $(SHLIBREQLIBS) + + Csec_plugin_KRB4.Osuf: Csec_plugin_KRB4.c + $(CC) $(CFLAGS) SecIncludeDirKRB4 -o $@ -c Csec_plugin_KRB4.c + #endif + + SharedLibraryTargetName(Csec_plugin_ID): Csec_plugin_ID.Osuf +- $(LD) $(SHLIBLDFLAGS) -o $@ Csec_plugin_ID.Osuf $(SHLIBREQLIBS) ++ $(CC) $(SHLIBLDFLAGS) -o $@ Csec_plugin_ID.Osuf $(SHLIBREQLIBS) + + Csec_plugin_ID.Osuf: Csec_plugin_ID.c + $(CC) $(CFLAGS) -o $@ -c Csec_plugin_ID.c +diff -ur LCG-DM-1.7.3.1.orig/shlib/Imakefile LCG-DM-1.7.3.1/shlib/Imakefile +--- LCG-DM-1.7.3.1.orig/shlib/Imakefile 2009-08-24 12:43:50.000000000 +0200 ++++ LCG-DM-1.7.3.1/shlib/Imakefile 2009-09-24 11:33:44.031119161 +0200 +@@ -60,7 +60,7 @@ + @mkdir tmp + @for i in $^ ;\ + do (cd tmp; case $$i in *.a) $(AR) x ../$$i; rm -f $(SYMTABNAM) ;; esac) done +- (cd tmp; ld $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) -L .. -llcgdm $(LIBCSEC)) ++ (cd tmp; $(CC) $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) -L .. -llcgdm $(LIBCSEC)) + @-rm -rf tmp + + liblcgdm.sl liblcgdm.so liblcgdm.dynlib: $(COMMONLIB) $(SECURITYLIB) +@@ -69,7 +69,7 @@ + @mkdir tmp + @for i in $^ ;\ + do (cd tmp; $(AR) x ../$$i; rm -f $(SYMTABNAM)) done +- (cd tmp; ld $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) $(LIBCSEC)) ++ (cd tmp; $(CC) $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) $(LIBCSEC)) + @-rm -rf tmp + + libdpm.dll: $(RFIOLIB) $(NSLIB) $(DPMLIB) +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 2008-04-14 22:54:51.000000000 +0200 ++++ LCG-DM-1.7.3.1/test/srmv1/Imakefile 2009-09-24 11:33:44.032119074 +0200 +@@ -64,7 +64,7 @@ + + $(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS) + ### @echo "========================g" $@ +- $(LD) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) ++ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) + + COMM###################### CLEANING 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 2008-04-14 22:54:51.000000000 +0200 ++++ LCG-DM-1.7.3.1/test/srmv2/Imakefile 2009-09-24 11:33:44.033118102 +0200 +@@ -65,7 +65,7 @@ + + $(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS) + ### @echo "========================g" $@ +- $(LD) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) ++ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) + + COMM###################### CLEANING 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 2008-04-14 22:54:51.000000000 +0200 ++++ LCG-DM-1.7.3.1/test/srmv2.2/Imakefile 2009-09-24 11:33:44.034118544 +0200 +@@ -64,7 +64,7 @@ + + $(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS) + ### @echo "========================g" $@ +- $(LD) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) ++ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) + + COMM###################### CLEANING RULES ######################## + --- lfc-1.7.4.1.orig/debian/patches/lcgdm-dlopen.patch +++ lfc-1.7.4.1/debian/patches/lcgdm-dlopen.patch @@ -0,0 +1,35 @@ +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 @@ + 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 @@ + filename_thread, + ctx->protocols[ctx->current_protocol].id); + handle = dlopen(filename_thread, RTLD_NOW); ++ if (handle == NULL) { ++ strcpy(fullpath, "@@LIBDIR@@/lcgdm/"); ++ strcat(fullpath, filename_thread); ++ handle = dlopen(fullpath, RTLD_NOW); ++ } + } + + if (handle == NULL) { +@@ -308,6 +314,11 @@ + filename, + ctx->protocols[ctx->current_protocol].id); + handle = dlopen(filename, RTLD_NOW); ++ if (handle == NULL) { ++ strcpy(fullpath, "@@LIBDIR@@/lcgdm/"); ++ strcat(fullpath, filename); ++ handle = dlopen(fullpath, RTLD_NOW); ++ } + } + + if (handle == NULL) { --- lfc-1.7.4.1.orig/debian/patches/lcgdm-initscripts.patch +++ lfc-1.7.4.1/debian/patches/lcgdm-initscripts.patch @@ -0,0 +1,4615 @@ +diff -ur lcgdm-1.7.4.1.orig/dicomcopy/dicomcopyd.scripts.mysql lcgdm-1.7.4.1/dicomcopy/dicomcopyd.scripts.mysql +--- lcgdm-1.7.4.1.orig/dicomcopy/dicomcopyd.scripts.mysql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/dicomcopy/dicomcopyd.scripts.mysql 2010-01-04 09:07:26.830770044 +0100 +@@ -2,9 +2,19 @@ + # + # dicomcopyd Start/Stop dicomcopyd + # +-# chkconfig: 345 93 17 ++# chkconfig: 2345 93 17 + # description: DPM DICOM server daemon + # ++### BEGIN INIT INFO ++# Provides: dicomcopyd ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: DPM DICOM server daemon ++# Description: DPM DICOM server daemon ++### END INIT INFO ++# + # $Id: dicomcopyd.scripts.mysql,v 1.2 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: dicomcopyd.scripts.mysql,v $ $Revision: 1.2 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -15,6 +25,8 @@ + # + GRIDMAPDIR=/etc/grid-security/gridmapdir + export GRIDMAPDIR ++GRIDMAP=/etc/grid-security/grid-mapfile ++export GRIDMAP + LD_LIBRARY_PATH=/opt/glite/lib:/opt/globus/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH + CSEC_MECH=ID +@@ -23,6 +35,7 @@ + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG + DPMUSER=dpmmgr + DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` + + sysname=`uname -s` + +@@ -101,7 +114,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "dicomcopyd already started: " + [ -n "$FAILURE" ] && $FAILURE "dicomcopyd already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGDICOMCOPYD" ]; then + # +@@ -111,33 +124,35 @@ + if [ "${RUN_DICOMCOPYDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGDICOMCOPYD says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGDICOMCOPYD says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPM_HOST +- export DPNS_HOST ++ export DPM_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : config file $DPMCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL ++ fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $DICOMCOPYDLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $DICOMCOPYDLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DICOMCOPYD -c $DPMCONFIGFILE -l $DICOMCOPYDLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/dicomcopy; cd /home/$DPMUSER/dicomcopy; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DICOMCOPYD \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DICOMCOPYD -c $DPMCONFIGFILE -l $DICOMCOPYDLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $DICOMCOPYDLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DICOMCOPYD -c $DPMCONFIGFILE -l $DICOMCOPYDLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/dicomcopy; cd $DPMUSERHOME/dicomcopy; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DICOMCOPYD \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DICOMCOPYD -c $DPMCONFIGFILE -l $DICOMCOPYDLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` +- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'` ++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'` + # The point of $PIDFILE is that it kills only + # the master daemon. + rm -f $PIDFILE +@@ -214,51 +229,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dicomcopyd already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "dicomcopyd already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 dicomcopyd$" | awk '{print $1}'` ++ sleep 1 ++ #Does not seem to work on SunOS ;-) ++ lpid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'` + done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 1 +- $0 start ++ sleep 1 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` + pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'` +diff -ur lcgdm-1.7.4.1.orig/dicomcopy/dicomcopyd.scripts.oracle lcgdm-1.7.4.1/dicomcopy/dicomcopyd.scripts.oracle +--- lcgdm-1.7.4.1.orig/dicomcopy/dicomcopyd.scripts.oracle 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/dicomcopy/dicomcopyd.scripts.oracle 2010-01-04 09:07:26.830770044 +0100 +@@ -2,9 +2,19 @@ + # + # dicomcopyd Start/Stop dicomcopyd + # +-# chkconfig: 345 93 17 ++# chkconfig: 2345 93 17 + # description: DPM DICOM server daemon + # ++### BEGIN INIT INFO ++# Provides: dicomcopyd ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: DPM DICOM server daemon ++# Description: DPM DICOM server daemon ++### END INIT INFO ++# + # $Id: dicomcopyd.scripts.oracle,v 1.3 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: dicomcopyd.scripts.oracle,v $ $Revision: 1.3 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -15,10 +25,6 @@ + # + ORACLE_HOME=/usr/lib/oracle/10.2.0.1/client + export ORACLE_HOME +-DPMUSER=dpmmgr +-DPMGROUP=dpmmgr +-TNS_ADMIN=/home/$DPMUSER/.tnsadmin +-export TNS_ADMIN + GRIDMAPDIR=/etc/grid-security/gridmapdir + export GRIDMAPDIR + GRIDMAP=/etc/grid-security/grid-mapfile +@@ -27,6 +33,11 @@ + export CSEC_MECH + DICOMCOPYDLOGFILE=/var/log/dicomcopy/log + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG ++DPMUSER=dpmmgr ++DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` ++TNS_ADMIN=$DPMUSERHOME/.tnsadmin ++export TNS_ADMIN + + sysname=`uname -s` + +@@ -105,7 +116,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "dicomcopyd already started: " + [ -n "$FAILURE" ] && $FAILURE "dicomcopyd already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGDICOMCOPYD" ]; then + # +@@ -115,57 +126,59 @@ + if [ "${RUN_DICOMCOPYDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGDICOMCOPYD says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGDICOMCOPYD says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPM_HOST +- export DPNS_HOST ++ export DPM_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : 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: " +- RETVAL=1 ++ echo $ECHOOPT "No Oracle Client found: " ++ $FAILURE "No Oracle Client found: " ++ RETVAL=1 + fi + + # get TWO_TASK or ORACLE_SID + if [ "${DB_IS_LOCAL}" != "yes" ]; then +- TWO_TASK=`head -1 $DPMCONFIGFILE | cut -f2 -d@` +- export TWO_TASK ++ TWO_TASK=`head -1 $DPMCONFIGFILE | cut -f2 -d@` ++ export TWO_TASK + else +- ORACLE_SID=`head -1 $DPMCONFIGFILE | cut -f2 -d@` +- export ORACLE_SID ++ ORACLE_SID=`head -1 $DPMCONFIGFILE | cut -f2 -d@` ++ export ORACLE_SID + fi + + LD_LIBRARY_PATH=$ORACLE_HOME/lib:/opt/glite/lib:/opt/globus/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH +- ORACLECLIENT=`ldconfig -p | grep libclntsh` +- if [ "x${ORACLECLIENT}" == "x" ]; then +- echo $ECHOOPT "No Oracle Client installed: " +- $FAILURE "No Oracle Client installed: " +- RETVAL=1 +- fi ++ ORACLECLIENT=`ldconfig -p | grep libclntsh` ++ if [ "x${ORACLECLIENT}" == "x" ]; then ++ echo $ECHOOPT "No Oracle Client installed: " ++ $FAILURE "No Oracle Client installed: " ++ RETVAL=1 ++ fi + + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $DICOMCOPYDLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $DICOMCOPYDLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DICOMCOPYD -c $DPMCONFIGFILE -l $DICOMCOPYDLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/dicomcopy; cd /home/$DPMUSER/dicomcopy; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DICOMCOPYD \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DICOMCOPYD -c $DPMCONFIGFILE -l $DICOMCOPYDLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $DICOMCOPYDLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DICOMCOPYD -c $DPMCONFIGFILE -l $DICOMCOPYDLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/dicomcopy; cd $DPMUSERHOME/dicomcopy; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DICOMCOPYD \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DICOMCOPYD -c $DPMCONFIGFILE -l $DICOMCOPYDLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` +- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'` ++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'` + # The point of $PIDFILE is that it kills only + # the master daemon. + rm -f $PIDFILE +@@ -242,51 +255,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dicomcopyd already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "dicomcopyd already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 dicomcopyd$" | awk '{print $1}'` ++ sleep 1 ++ #Does not seem to work on SunOS ;-) ++ lpid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'` + done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 1 +- $0 start ++ sleep 1 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` + pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'` +diff -ur lcgdm-1.7.4.1.orig/dicomcopy/dicomcopyd.scripts.postgresql lcgdm-1.7.4.1/dicomcopy/dicomcopyd.scripts.postgresql +--- lcgdm-1.7.4.1.orig/dicomcopy/dicomcopyd.scripts.postgresql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/dicomcopy/dicomcopyd.scripts.postgresql 2010-01-04 09:07:26.831769610 +0100 +@@ -2,9 +2,19 @@ + # + # dicomcopyd Start/Stop dicomcopyd + # +-# chkconfig: 345 93 17 ++# chkconfig: 2345 93 17 + # description: DPM DICOM server daemon + # ++### BEGIN INIT INFO ++# Provides: dicomcopyd ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: DPM DICOM server daemon ++# Description: DPM DICOM server daemon ++### END INIT INFO ++# + # $Id: dicomcopyd.scripts.postgresql,v 1.2 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: dicomcopyd.scripts.postgresql,v $ $Revision: 1.2 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -15,6 +25,8 @@ + # + GRIDMAPDIR=/etc/grid-security/gridmapdir + export GRIDMAPDIR ++GRIDMAP=/etc/grid-security/grid-mapfile ++export GRIDMAP + LD_LIBRARY_PATH=/opt/glite/lib:/opt/globus/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH + CSEC_MECH=ID +@@ -23,6 +35,7 @@ + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG + DPMUSER=dpmmgr + DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` + + sysname=`uname -s` + +@@ -101,7 +114,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "dicomcopyd already started: " + [ -n "$FAILURE" ] && $FAILURE "dicomcopyd already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGDICOMCOPYD" ]; then + # +@@ -111,33 +124,35 @@ + if [ "${RUN_DICOMCOPYDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGDICOMCOPYD says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGDICOMCOPYD says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPM_HOST +- export DPNS_HOST ++ export DPM_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : config file $DPMCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL ++ fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $DICOMCOPYDLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $DICOMCOPYDLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DICOMCOPYD -c $DPMCONFIGFILE -l $DICOMCOPYDLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/dicomcopy; cd /home/$DPMUSER/dicomcopy; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DICOMCOPYD \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DICOMCOPYD -c $DPMCONFIGFILE -l $DICOMCOPYDLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $DICOMCOPYDLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DICOMCOPYD -c $DPMCONFIGFILE -l $DICOMCOPYDLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/dicomcopy; cd $DPMUSERHOME/dicomcopy; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DICOMCOPYD \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DICOMCOPYD -c $DPMCONFIGFILE -l $DICOMCOPYDLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` +- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'` ++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'` + # The point of $PIDFILE is that it kills only + # the master daemon. + rm -f $PIDFILE +@@ -214,51 +229,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dicomcopyd already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "dicomcopyd already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 dicomcopyd$" | awk '{print $1}'` ++ sleep 1 ++ #Does not seem to work on SunOS ;-) ++ lpid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'` + done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 1 +- $0 start ++ sleep 1 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` + pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'` +diff -ur lcgdm-1.7.4.1.orig/dli/lfc-dli.scripts lcgdm-1.7.4.1/dli/lfc-dli.scripts +--- lcgdm-1.7.4.1.orig/dli/lfc-dli.scripts 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/dli/lfc-dli.scripts 2010-01-04 09:07:26.831769610 +0100 +@@ -2,9 +2,19 @@ + # + # lfc-dli Start/Stop lfc-dli + # +-# chkconfig: 345 67 38 ++# chkconfig: 2345 67 38 + # description: LFC Data Location Interface (DLI) server daemon + # ++### BEGIN INIT INFO ++# Provides: lfc-dli ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: LFC Data Location Interface (DLI) server daemon ++# Description: LFC Data Location Interface (DLI) server daemon ++### END INIT INFO ++# + # $Id: lfc-dli.scripts,v 1.10 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: lfc-dli.scripts,v $ $Revision: 1.10 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -102,7 +112,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "lfc-dli already started: " + [ -n "$FAILURE" ] && $FAILURE "lfc-dli already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGDLIDAEMON" ]; then + # +@@ -112,9 +122,11 @@ + if [ "${RUN_DLIDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGDLIDAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGDLIDAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export LFC_HOST ++ export LFC_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi +@@ -122,8 +134,8 @@ + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $DLIDAEMONLOGFILE` +- chown $LFCUSER:$LFCGROUP `dirname $DLIDAEMONLOGFILE` +- $DAEMON "su $LFCUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DLIDAEMON -l $DLIDAEMONLOGFILE\"" ++ chown $LFCUSER:$LFCGROUP `dirname $DLIDAEMONLOGFILE` ++ $DAEMON "su $LFCUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DLIDAEMON -l $DLIDAEMONLOGFILE\"" + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then +@@ -203,51 +215,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "lfc-dli already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "lfc-dli already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfc-dli$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/dpm/dpm.scripts.mysql lcgdm-1.7.4.1/dpm/dpm.scripts.mysql +--- lcgdm-1.7.4.1.orig/dpm/dpm.scripts.mysql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/dpm/dpm.scripts.mysql 2010-01-04 09:07:26.832769876 +0100 +@@ -2,9 +2,19 @@ + # + # dpm Start/Stop dpm + # +-# chkconfig: 345 93 17 ++# chkconfig: 2345 93 17 + # description: DPM server daemon + # ++### BEGIN INIT INFO ++# Provides: dpm ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: DPM server daemon ++# Description: DPM server daemon ++### END INIT INFO ++# + # $Id: dpm.scripts.mysql,v 1.32 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: dpm.scripts.mysql,v $ $Revision: 1.32 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -25,6 +35,7 @@ + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG + DPMUSER=dpmmgr + DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` + + sysname=`uname -s` + +@@ -103,7 +114,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "dpm already started: " + [ -n "$FAILURE" ] && $FAILURE "dpm already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGDPMDAEMON" ]; then + # +@@ -113,34 +124,36 @@ + if [ "${RUN_DPMDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGDPMDAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGDPMDAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi + export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : config file $DPMCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL ++ fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $DPMDAEMONLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $DPMDAEMONLOGFILE` +- ## For the DPM, umask must be set to 0 +- umask 0 +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMDAEMON -c $DPMCONFIGFILE -l $DPMDAEMONLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/dpm; cd /home/$DPMUSER/dpm; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPMDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMDAEMON -c $DPMCONFIGFILE -l $DPMDAEMONLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $DPMDAEMONLOGFILE` ++ ## For the DPM, umask must be set to 0 ++ umask 0 ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMDAEMON -c $DPMCONFIGFILE -l $DPMDAEMONLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/dpm; cd $DPMUSERHOME/dpm; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPMDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMDAEMON -c $DPMCONFIGFILE -l $DPMDAEMONLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` +- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'` ++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'` + # The point of $PIDFILE is that it kills only + # the master daemon. + rm -f $PIDFILE +@@ -217,51 +230,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpm already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "dpm already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 dpm$" | awk '{print $1}'` ++ sleep 1 ++ #Does not seem to work on SunOS ;-) ++ lpid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'` + done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 1 +- $0 start ++ sleep 1 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` + pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'` +diff -ur lcgdm-1.7.4.1.orig/dpm/dpm.scripts.oracle lcgdm-1.7.4.1/dpm/dpm.scripts.oracle +--- lcgdm-1.7.4.1.orig/dpm/dpm.scripts.oracle 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/dpm/dpm.scripts.oracle 2010-01-04 09:07:26.832769876 +0100 +@@ -2,9 +2,19 @@ + # + # dpm Start/Stop dpm + # +-# chkconfig: 345 93 17 ++# chkconfig: 2345 93 17 + # description: DPM server daemon + # ++### BEGIN INIT INFO ++# Provides: dpm ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: DPM server daemon ++# Description: DPM server daemon ++### END INIT INFO ++# + # $Id: dpm.scripts.oracle,v 1.34 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: dpm.scripts.oracle,v $ $Revision: 1.34 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -15,10 +25,6 @@ + # + ORACLE_HOME=/usr/lib/oracle/10.2.0.1/client + export ORACLE_HOME +-DPMUSER=dpmmgr +-DPMGROUP=dpmmgr +-TNS_ADMIN=/home/$DPMUSER/.tnsadmin +-export TNS_ADMIN + GRIDMAPDIR=/etc/grid-security/gridmapdir + export GRIDMAPDIR + GRIDMAP=/etc/grid-security/grid-mapfile +@@ -27,6 +33,11 @@ + export CSEC_MECH + DPMDAEMONLOGFILE=/var/log/dpm/log + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG ++DPMUSER=dpmmgr ++DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` ++TNS_ADMIN=$DPMUSERHOME/.tnsadmin ++export TNS_ADMIN + + sysname=`uname -s` + +@@ -105,7 +116,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "dpm already started: " + [ -n "$FAILURE" ] && $FAILURE "dpm already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGDPMDAEMON" ]; then + # +@@ -115,53 +126,55 @@ + if [ "${RUN_DPMDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGDPMDAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGDPMDAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPNS_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : 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: " +- RETVAL=1 ++ echo $ECHOOPT "No Oracle Client found: " ++ $FAILURE "No Oracle Client found: " ++ RETVAL=1 + fi + +- # get TWO_TASK or ORACLE_SID +- if [ "${DB_IS_LOCAL}" != "yes" ]; then +- TWO_TASK=`head -1 $DPMCONFIGFILE | cut -f2 -d@` +- export TWO_TASK +- else +- ORACLE_SID=`head -1 $DPMCONFIGFILE | cut -f2 -d@` +- export ORACLE_SID +- fi ++ # get TWO_TASK or ORACLE_SID ++ if [ "${DB_IS_LOCAL}" != "yes" ]; then ++ TWO_TASK=`head -1 $DPMCONFIGFILE | cut -f2 -d@` ++ export TWO_TASK ++ else ++ ORACLE_SID=`head -1 $DPMCONFIGFILE | cut -f2 -d@` ++ export ORACLE_SID ++ fi + + LD_LIBRARY_PATH=$ORACLE_HOME/lib:/opt/glite/lib:/opt/globus_lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH +- ORACLECLIENT=`ldconfig -p | grep libclntsh` +- if [ "x${ORACLECLIENT}" == "x" ]; then +- echo $ECHOOPT "No Oracle Client installed: " +- $FAILURE "No Oracle Client installed: " +- RETVAL=1 +- fi ++ ORACLECLIENT=`ldconfig -p | grep libclntsh` ++ if [ "x${ORACLECLIENT}" == "x" ]; then ++ echo $ECHOOPT "No Oracle Client installed: " ++ $FAILURE "No Oracle Client installed: " ++ RETVAL=1 ++ fi + + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $DPMDAEMONLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $DPMDAEMONLOGFILE` ++ chown $DPMUSER:$DPMGROUP `dirname $DPMDAEMONLOGFILE` + ## For the DPM, umask must be set to 0 + umask 0 +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMDAEMON -c $DPMCONFIGFILE -l $DPMDAEMONLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/dpm; cd /home/$DPMUSER/dpm; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPMDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMDAEMON -c $DPMCONFIGFILE -l $DPMDAEMONLOGFILE\"" +- fi ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMDAEMON -c $DPMCONFIGFILE -l $DPMDAEMONLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/dpm; cd $DPMUSERHOME/dpm; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPMDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMDAEMON -c $DPMCONFIGFILE -l $DPMDAEMONLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then +@@ -241,51 +254,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpm already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "dpm already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 dpm$" | awk '{print $1}'` ++ sleep 1 ++ #Does not seem to work on SunOS ;-) ++ lpid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'` + done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 1 +- $0 start ++ sleep 1 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/dpm/dpm.scripts.postgresql lcgdm-1.7.4.1/dpm/dpm.scripts.postgresql +--- lcgdm-1.7.4.1.orig/dpm/dpm.scripts.postgresql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/dpm/dpm.scripts.postgresql 2010-01-04 09:07:26.832769876 +0100 +@@ -2,9 +2,19 @@ + # + # dpm Start/Stop dpm + # +-# chkconfig: 345 93 17 ++# chkconfig: 2345 93 17 + # description: DPM server daemon + # ++### BEGIN INIT INFO ++# Provides: dpm ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: DPM server daemon ++# Description: DPM server daemon ++### END INIT INFO ++# + # $Id: dpm.scripts.postgresql,v 1.2 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: dpm.scripts.postgresql,v $ $Revision: 1.2 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -25,6 +35,7 @@ + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG + DPMUSER=dpmmgr + DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` + + sysname=`uname -s` + +@@ -103,7 +114,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "dpm already started: " + [ -n "$FAILURE" ] && $FAILURE "dpm already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGDPMDAEMON" ]; then + # +@@ -113,34 +124,36 @@ + if [ "${RUN_DPMDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGDPMDAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGDPMDAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi + export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : config file $DPMCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL ++ fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $DPMDAEMONLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $DPMDAEMONLOGFILE` +- ## For the DPM, umask must be set to 0 +- umask 0 +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMDAEMON -c $DPMCONFIGFILE -l $DPMDAEMONLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/dpm; cd /home/$DPMUSER/dpm; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPMDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMDAEMON -c $DPMCONFIGFILE -l $DPMDAEMONLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $DPMDAEMONLOGFILE` ++ ## For the DPM, umask must be set to 0 ++ umask 0 ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMDAEMON -c $DPMCONFIGFILE -l $DPMDAEMONLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/dpm; cd $DPMUSERHOME/dpm; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPMDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMDAEMON -c $DPMCONFIGFILE -l $DPMDAEMONLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` +- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'` ++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'` + # The point of $PIDFILE is that it kills only + # the master daemon. + rm -f $PIDFILE +@@ -217,51 +230,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpm already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "dpm already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 dpm$" | awk '{print $1}'` ++ sleep 1 ++ #Does not seem to work on SunOS ;-) ++ lpid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'` + done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 1 +- $0 start ++ sleep 1 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` + pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'` +diff -ur lcgdm-1.7.4.1.orig/dpmcopy/dpmcopyd.scripts.mysql lcgdm-1.7.4.1/dpmcopy/dpmcopyd.scripts.mysql +--- lcgdm-1.7.4.1.orig/dpmcopy/dpmcopyd.scripts.mysql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/dpmcopy/dpmcopyd.scripts.mysql 2010-01-04 09:07:26.834017238 +0100 +@@ -2,9 +2,19 @@ + # + # dpmcopyd Start/Stop dpmcopyd + # +-# chkconfig: 345 93 17 ++# chkconfig: 2345 93 17 + # description: DPM COPY server daemon + # ++### BEGIN INIT INFO ++# Provides: dpmcopyd ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: DPM COPY server daemon ++# Description: DPM COPY server daemon ++### END INIT INFO ++# + # $Id: dpmcopyd.scripts.mysql,v 1.2 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: dpmcopyd.scripts.mysql,v $ $Revision: 1.2 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -25,6 +35,7 @@ + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG + DPMUSER=dpmmgr + DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` + + sysname=`uname -s` + +@@ -103,7 +114,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "dpmcopyd already started: " + [ -n "$FAILURE" ] && $FAILURE "dpmcopyd already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGDPMCOPYD" ]; then + # +@@ -113,33 +124,35 @@ + if [ "${RUN_DPMCOPYDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGDPMCOPYD says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGDPMCOPYD says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPM_HOST +- export DPNS_HOST ++ export DPM_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : config file $DPMCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL ++ fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $DPMCOPYDLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $DPMCOPYDLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMCOPYD -c $DPMCONFIGFILE -l $DPMCOPYDLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/dpmcopy; cd /home/$DPMUSER/dpmcopy; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPMCOPYD \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMCOPYD -c $DPMCONFIGFILE -l $DPMCOPYDLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $DPMCOPYDLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMCOPYD -c $DPMCONFIGFILE -l $DPMCOPYDLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/dpmcopy; cd $DPMUSERHOME/dpmcopy; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPMCOPYD \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMCOPYD -c $DPMCONFIGFILE -l $DPMCOPYDLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` +- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'` ++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'` + # The point of $PIDFILE is that it kills only + # the master daemon. + rm -f $PIDFILE +@@ -216,51 +229,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpmcopyd already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "dpmcopyd already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 dpmcopyd$" | awk '{print $1}'` ++ sleep 1 ++ #Does not seem to work on SunOS ;-) ++ lpid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'` + done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 1 +- $0 start ++ sleep 1 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` + pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'` +diff -ur lcgdm-1.7.4.1.orig/dpmcopy/dpmcopyd.scripts.oracle lcgdm-1.7.4.1/dpmcopy/dpmcopyd.scripts.oracle +--- lcgdm-1.7.4.1.orig/dpmcopy/dpmcopyd.scripts.oracle 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/dpmcopy/dpmcopyd.scripts.oracle 2010-01-04 09:07:26.834017238 +0100 +@@ -2,9 +2,19 @@ + # + # dpmcopyd Start/Stop dpmcopyd + # +-# chkconfig: 345 93 17 ++# chkconfig: 2345 93 17 + # description: DPM COPY server daemon + # ++### BEGIN INIT INFO ++# Provides: dpmcopyd ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: DPM COPY server daemon ++# Description: DPM COPY server daemon ++### END INIT INFO ++# + # $Id: dpmcopyd.scripts.oracle,v 1.2 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: dpmcopyd.scripts.oracle,v $ $Revision: 1.2 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -15,10 +25,6 @@ + # + ORACLE_HOME=/usr/lib/oracle/10.2.0.1/client + export ORACLE_HOME +-DPMUSER=dpmmgr +-DPMGROUP=dpmmgr +-TNS_ADMIN=/home/$DPMUSER/.tnsadmin +-export TNS_ADMIN + GRIDMAPDIR=/etc/grid-security/gridmapdir + export GRIDMAPDIR + GRIDMAP=/etc/grid-security/grid-mapfile +@@ -27,6 +33,11 @@ + export CSEC_MECH + DPMCOPYDLOGFILE=/var/log/dpmcopy/log + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG ++DPMUSER=dpmmgr ++DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` ++TNS_ADMIN=$DPMUSERHOME/.tnsadmin ++export TNS_ADMIN + + sysname=`uname -s` + +@@ -86,6 +97,7 @@ + else + format4comm="comm" + fi ++fi + + case "$1" in + start) +@@ -104,7 +116,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "dpmcopyd already started: " + [ -n "$FAILURE" ] && $FAILURE "dpmcopyd already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGDPMCOPYD" ]; then + # +@@ -114,57 +126,59 @@ + if [ "${RUN_DPMCOPYDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGDPMCOPYD says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGDPMCOPYD says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPM_HOST +- export DPNS_HOST ++ export DPM_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : 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: " +- RETVAL=1 ++ echo $ECHOOPT "No Oracle Client found: " ++ $FAILURE "No Oracle Client found: " ++ RETVAL=1 + fi + + # get TWO_TASK or ORACLE_SID + if [ "${DB_IS_LOCAL}" != "yes" ]; then +- TWO_TASK=`head -1 $DPMCONFIGFILE | cut -f2 -d@` +- export TWO_TASK ++ TWO_TASK=`head -1 $DPMCONFIGFILE | cut -f2 -d@` ++ export TWO_TASK + else +- ORACLE_SID=`head -1 $DPMCONFIGFILE | cut -f2 -d@` +- export ORACLE_SID ++ ORACLE_SID=`head -1 $DPMCONFIGFILE | cut -f2 -d@` ++ export ORACLE_SID + fi + + LD_LIBRARY_PATH=$ORACLE_HOME/lib:/opt/glite/lib:/opt/globus/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH + ORACLECLIENT=`ldconfig -p | grep libclntsh` + if [ "x${ORACLECLIENT}" == "x" ]; then +- echo $ECHOOPT "No Oracle Client installed: " +- $FAILURE "No Oracle Client installed: " +- RETVAL=1 ++ echo $ECHOOPT "No Oracle Client installed: " ++ $FAILURE "No Oracle Client installed: " ++ RETVAL=1 + fi + + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $DPMCOPYDLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $DPMCOPYDLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMCOPYD -c $DPMCONFIGFILE -l $DPMCOPYDLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/dpmcopy; cd /home/$DPMUSER/dpmcopy; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPMCOPYD \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMCOPYD -c $DPMCONFIGFILE -l $DPMCOPYDLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $DPMCOPYDLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMCOPYD -c $DPMCONFIGFILE -l $DPMCOPYDLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/dpmcopy; cd $DPMUSERHOME/dpmcopy; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPMCOPYD \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMCOPYD -c $DPMCONFIGFILE -l $DPMCOPYDLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` +- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'` ++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'` + # The point of $PIDFILE is that it kills only + # the master daemon. + rm -f $PIDFILE +@@ -241,51 +255,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpmcopyd already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "dpmcopyd already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 dpmcopyd$" | awk '{print $1}'` ++ sleep 1 ++ #Does not seem to work on SunOS ;-) ++ lpid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'` + done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 1 +- $0 start ++ sleep 1 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` + pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'` +diff -ur lcgdm-1.7.4.1.orig/dpmcopy/dpmcopyd.scripts.postgresql lcgdm-1.7.4.1/dpmcopy/dpmcopyd.scripts.postgresql +--- lcgdm-1.7.4.1.orig/dpmcopy/dpmcopyd.scripts.postgresql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/dpmcopy/dpmcopyd.scripts.postgresql 2010-01-04 09:07:26.835017224 +0100 +@@ -2,9 +2,19 @@ + # + # dpmcopyd Start/Stop dpmcopyd + # +-# chkconfig: 345 93 17 ++# chkconfig: 2345 93 17 + # description: DPM COPY server daemon + # ++### BEGIN INIT INFO ++# Provides: dpmcopyd ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: DPM COPY server daemon ++# Description: DPM COPY server daemon ++### END INIT INFO ++# + # $Id: dpmcopyd.scripts.postgresql,v 1.2 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: dpmcopyd.scripts.postgresql,v $ $Revision: 1.2 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -25,6 +35,7 @@ + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG + DPMUSER=dpmmgr + DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` + + sysname=`uname -s` + +@@ -103,7 +114,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "dpmcopyd already started: " + [ -n "$FAILURE" ] && $FAILURE "dpmcopyd already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGDPMCOPYD" ]; then + # +@@ -113,33 +124,35 @@ + if [ "${RUN_DPMCOPYDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGDPMCOPYD says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGDPMCOPYD says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPM_HOST +- export DPNS_HOST ++ export DPM_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : config file $DPMCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL ++ fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $DPMCOPYDLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $DPMCOPYDLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMCOPYD -c $DPMCONFIGFILE -l $DPMCOPYDLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/dpmcopy; cd /home/$DPMUSER/dpmcopy; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPMCOPYD \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMCOPYD -c $DPMCONFIGFILE -l $DPMCOPYDLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $DPMCOPYDLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMCOPYD -c $DPMCONFIGFILE -l $DPMCOPYDLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/dpmcopy; cd $DPMUSERHOME/dpmcopy; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPMCOPYD \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPMCOPYD -c $DPMCONFIGFILE -l $DPMCOPYDLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` +- pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'` ++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'` + # The point of $PIDFILE is that it kills only + # the master daemon. + rm -f $PIDFILE +@@ -216,51 +229,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpmcopyd already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "dpmcopyd already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 dpmcopyd$" | awk '{print $1}'` ++ sleep 1 ++ #Does not seem to work on SunOS ;-) ++ lpid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'` + done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 1 +- $0 start ++ sleep 1 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + ##pid=`ps h -o pid -C $prog | awk '{print $1}'` + pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'` +diff -ur lcgdm-1.7.4.1.orig/ns/dpnsdaemon.scripts.mysql lcgdm-1.7.4.1/ns/dpnsdaemon.scripts.mysql +--- lcgdm-1.7.4.1.orig/ns/dpnsdaemon.scripts.mysql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/ns/dpnsdaemon.scripts.mysql 2010-01-04 09:07:26.835017224 +0100 +@@ -2,9 +2,19 @@ + # + # dpnsdaemon Start/Stop dpnsdaemon + # +-# chkconfig: 345 91 19 ++# chkconfig: 2345 91 19 + # description: DPNS server daemon + # ++### BEGIN INIT INFO ++# Provides: dpnsdaemon ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: DPNS server daemon ++# Description: DPNS server daemon ++### END INIT INFO ++# + # $Id: dpnsdaemon.scripts.mysql,v 1.26 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: dpnsdaemon.scripts.mysql,v $ $Revision: 1.26 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -19,6 +29,7 @@ + NSCONFIGFILE=/opt/lcg/etc/NSCONFIG + DPMUSER=dpmmgr + DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` + NB_THREADS=20 + + sysname=`uname -s` +@@ -98,7 +109,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "dpnsdaemon already started: " + [ -n "$FAILURE" ] && $FAILURE "dpnsdaemon already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGDPNSDAEMON" ]; then + # +@@ -108,26 +119,28 @@ + if [ "${RUN_DPNSDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGDPNSDAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGDPNSDAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$NSCONFIGFILE" ]; then +- echo "FAILED : config file $NSCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL ++ if [ ! -s "$NSCONFIGFILE" ]; then ++ echo "FAILED : config file $NSCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL + fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $DPNSDAEMONLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $DPNSDAEMONLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPNSDAEMON -t $NB_THREADS -c $NSCONFIGFILE -l $DPNSDAEMONLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/dpns; cd /home/$DPMUSER/dpns; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPNSDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPNSDAEMON -t $NB_THREADS -c $NSCONFIGFILE -l $DPNSDAEMONLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $DPNSDAEMONLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPNSDAEMON -t $NB_THREADS -c $NSCONFIGFILE -l $DPNSDAEMONLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/dpns; cd $DPMUSERHOME/dpns; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPNSDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPNSDAEMON -t $NB_THREADS -c $NSCONFIGFILE -l $DPNSDAEMONLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then +@@ -207,51 +220,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpnsdaemon already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "dpnsdaemon already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 dpnsdaemon$" | 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 dpnsdaemon$" | awk '{print $1}'` ++ done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpnsdaemon$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/ns/dpnsdaemon.scripts.oracle lcgdm-1.7.4.1/ns/dpnsdaemon.scripts.oracle +--- lcgdm-1.7.4.1.orig/ns/dpnsdaemon.scripts.oracle 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/ns/dpnsdaemon.scripts.oracle 2010-01-04 09:07:26.836017210 +0100 +@@ -2,9 +2,19 @@ + # + # dpnsdaemon Start/Stop dpnsdaemon + # +-# chkconfig: 345 91 19 ++# chkconfig: 2345 91 19 + # description: DPNS server daemon + # ++### BEGIN INIT INFO ++# Provides: dpnsdaemon ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: DPNS server daemon ++# Description: DPNS server daemon ++### END INIT INFO ++# + # $Id: dpnsdaemon.scripts.oracle,v 1.31 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: dpnsdaemon.scripts.oracle,v $ $Revision: 1.31 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -15,12 +25,13 @@ + # + ORACLE_HOME=/usr/lib/oracle/10.2.0.1/client + export ORACLE_HOME ++DPNSDAEMONLOGFILE=/var/log/dpns/log ++NSCONFIGFILE=/opt/lcg/etc/NSCONFIG + DPMUSER=dpmmgr + DPMGROUP=dpmmgr +-TNS_ADMIN=/home/$DPMUSER/.tnsadmin ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` ++TNS_ADMIN=$DPMUSERHOME/.tnsadmin + export TNS_ADMIN +-DPNSDAEMONLOGFILE=/var/log/dpns/log +-NSCONFIGFILE=/opt/lcg/etc/NSCONFIG + NB_THREADS=20 + + sysname=`uname -s` +@@ -100,7 +111,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "dpnsdaemon already started: " + [ -n "$FAILURE" ] && $FAILURE "dpnsdaemon already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGDPNSDAEMON" ]; then + # +@@ -110,50 +121,52 @@ + if [ "${RUN_DPNSDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGDPNSDAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGDPNSDAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$NSCONFIGFILE" ]; then +- echo "FAILED : config file $NSCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$NSCONFIGFILE" ]; then ++ echo "FAILED : 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: " +- RETVAL=1 ++ echo $ECHOOPT "No Oracle Client found: " ++ $FAILURE "No Oracle Client found: " ++ RETVAL=1 + fi + +- # get TWO_TASK or ORACLE_SID +- if [ "${DB_IS_LOCAL}" != "yes" ]; then +- TWO_TASK=`head -1 $NSCONFIGFILE | cut -f2 -d@` +- export TWO_TASK +- else +- ORACLE_SID=`head -1 $NSCONFIGFILE | cut -f2 -d@` +- export ORACLE_SID +- fi ++ # get TWO_TASK or ORACLE_SID ++ if [ "${DB_IS_LOCAL}" != "yes" ]; then ++ TWO_TASK=`head -1 $NSCONFIGFILE | cut -f2 -d@` ++ export TWO_TASK ++ else ++ ORACLE_SID=`head -1 $NSCONFIGFILE | cut -f2 -d@` ++ export ORACLE_SID ++ fi + + LD_LIBRARY_PATH=$ORACLE_HOME/lib:/opt/glite/lib:/opt/globus/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH +- ORACLECLIENT=`ldconfig -p | grep libclntsh` +- if [ "x${ORACLECLIENT}" == "x" ]; then +- echo $ECHOOPT "No Oracle Client installed: " +- $FAILURE "No Oracle Client installed: " +- RETVAL=1 +- fi ++ ORACLECLIENT=`ldconfig -p | grep libclntsh` ++ if [ "x${ORACLECLIENT}" == "x" ]; then ++ echo $ECHOOPT "No Oracle Client installed: " ++ $FAILURE "No Oracle Client installed: " ++ RETVAL=1 ++ fi + + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $DPNSDAEMONLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $DPNSDAEMONLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPNSDAEMON -t $NB_THREADS -c $NSCONFIGFILE -l $DPNSDAEMONLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/dpns; cd /home/$DPMUSER/dpns; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPNSDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPNSDAEMON -t $NB_THREADS -c $NSCONFIGFILE -l $DPNSDAEMONLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $DPNSDAEMONLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPNSDAEMON -t $NB_THREADS -c $NSCONFIGFILE -l $DPNSDAEMONLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/dpns; cd $DPMUSERHOME/dpns; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPNSDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPNSDAEMON -t $NB_THREADS -c $NSCONFIGFILE -l $DPNSDAEMONLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then +@@ -233,51 +246,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpnsdaemon already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "dpnsdaemon already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 dpnsdaemon$" | 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 dpnsdaemon$" | awk '{print $1}'` ++ done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpnsdaemon$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/ns/dpnsdaemon.scripts.postgresql lcgdm-1.7.4.1/ns/dpnsdaemon.scripts.postgresql +--- lcgdm-1.7.4.1.orig/ns/dpnsdaemon.scripts.postgresql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/ns/dpnsdaemon.scripts.postgresql 2010-01-04 09:07:26.836017210 +0100 +@@ -2,9 +2,19 @@ + # + # dpnsdaemon Start/Stop dpnsdaemon + # +-# chkconfig: 345 91 19 ++# chkconfig: 2345 91 19 + # description: DPNS server daemon + # ++### BEGIN INIT INFO ++# Provides: dpnsdaemon ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: DPNS server daemon ++# Description: DPNS server daemon ++### END INIT INFO ++# + # $Id: dpnsdaemon.scripts.postgresql,v 1.2 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: dpnsdaemon.scripts.postgresql,v $ $Revision: 1.2 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -19,6 +29,7 @@ + NSCONFIGFILE=/opt/lcg/etc/NSCONFIG + DPMUSER=dpmmgr + DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` + NB_THREADS=20 + + sysname=`uname -s` +@@ -98,7 +109,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "dpnsdaemon already started: " + [ -n "$FAILURE" ] && $FAILURE "dpnsdaemon already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGDPNSDAEMON" ]; then + # +@@ -108,26 +119,28 @@ + if [ "${RUN_DPNSDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGDPNSDAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGDPNSDAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$NSCONFIGFILE" ]; then +- echo "FAILED : config file $NSCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL ++ if [ ! -s "$NSCONFIGFILE" ]; then ++ echo "FAILED : config file $NSCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL + fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $DPNSDAEMONLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $DPNSDAEMONLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPNSDAEMON -t $NB_THREADS -c $NSCONFIGFILE -l $DPNSDAEMONLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/dpns; cd /home/$DPMUSER/dpns; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPNSDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPNSDAEMON -t $NB_THREADS -c $NSCONFIGFILE -l $DPNSDAEMONLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $DPNSDAEMONLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPNSDAEMON -t $NB_THREADS -c $NSCONFIGFILE -l $DPNSDAEMONLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/dpns; cd $DPMUSERHOME/dpns; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $DPNSDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $DPNSDAEMON -t $NB_THREADS -c $NSCONFIGFILE -l $DPNSDAEMONLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then +@@ -207,51 +220,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpnsdaemon already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "dpnsdaemon already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 dpnsdaemon$" | 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 dpnsdaemon$" | awk '{print $1}'` ++ done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpnsdaemon$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/ns/lfcdaemon.scripts.mysql lcgdm-1.7.4.1/ns/lfcdaemon.scripts.mysql +--- lcgdm-1.7.4.1.orig/ns/lfcdaemon.scripts.mysql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/ns/lfcdaemon.scripts.mysql 2010-01-04 09:07:26.837017196 +0100 +@@ -2,9 +2,19 @@ + # + # lfcdaemon Start/Stop lfcdaemon + # +-# chkconfig: 345 66 39 ++# chkconfig: 2345 66 39 + # description: LFC server daemon + # ++### BEGIN INIT INFO ++# Provides: lfcdaemon ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: LFC server daemon ++# Description: LFC server daemon ++### END INIT INFO ++# + # $Id: lfcdaemon.scripts.mysql,v 1.26 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: lfcdaemon.scripts.mysql,v $ $Revision: 1.26 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -19,6 +29,7 @@ + NSCONFIGFILE=/opt/lcg/etc/NSCONFIG + LFCUSER=lfcmgr + LFCGROUP=lfcmgr ++LFCUSERHOME=`getent passwd $LFCUSER | cut -f 6 -d :` + NB_THREADS=20 + + sysname=`uname -s` +@@ -98,7 +109,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "lfcdaemon already started: " + [ -n "$FAILURE" ] && $FAILURE "lfcdaemon already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGLFCDAEMON" ]; then + # +@@ -108,7 +119,9 @@ + if [ "${RUN_LFCDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGLFCDAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGLFCDAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi + if [ "${RUN_READONLY}" = "yes" ]; then + READONLY="-r" +@@ -124,19 +137,19 @@ + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$NSCONFIGFILE" ]; then +- echo "FAILED : config file $NSCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$NSCONFIGFILE" ]; then ++ echo "FAILED : config file $NSCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL ++ fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $LFCDAEMONLOGFILE` +- chown $LFCUSER:$LFCGROUP `dirname $LFCDAEMONLOGFILE` ++ chown $LFCUSER:$LFCGROUP `dirname $LFCDAEMONLOGFILE` + if [ "${ALLOW_COREDUMP}" != "yes" ]; then + $DAEMON "su $LFCUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $LFCDAEMON $READONLY $DISABLEAUTOVIDS -t $NB_THREADS -c $NSCONFIGFILE -l $LFCDAEMONLOGFILE\"" + else +- $DAEMON "su $LFCUSER -c \"mkdir -p /home/$LFCUSER/lfc; cd /home/$LFCUSER/lfc; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $LFCDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $LFCDAEMON $READONLY $DISABLEAUTOVIDS -t $NB_THREADS -c $NSCONFIGFILE -l $LFCDAEMONLOGFILE\"" ++ $DAEMON "su $LFCUSER -c \"mkdir -p $LFCUSERHOME/lfc; cd $LFCUSERHOME/lfc; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $LFCDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $LFCDAEMON $READONLY $DISABLEAUTOVIDS -t $NB_THREADS -c $NSCONFIGFILE -l $LFCDAEMONLOGFILE\"" + fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS +@@ -217,51 +230,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "lfcdaemon already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "lfcdaemon already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 lfcdaemon$" | 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 lfcdaemon$" | awk '{print $1}'` ++ done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfcdaemon$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/ns/lfcdaemon.scripts.oracle lcgdm-1.7.4.1/ns/lfcdaemon.scripts.oracle +--- lcgdm-1.7.4.1.orig/ns/lfcdaemon.scripts.oracle 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/ns/lfcdaemon.scripts.oracle 2010-01-04 09:07:26.837017196 +0100 +@@ -2,9 +2,19 @@ + # + # lfcdaemon Start/Stop lfcdaemon + # +-# chkconfig: 345 66 39 ++# chkconfig: 2345 66 39 + # description: LFC server daemon + # ++### BEGIN INIT INFO ++# Provides: lfcdaemon ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: LFC server daemon ++# Description: LFC server daemon ++### END INIT INFO ++# + # $Id: lfcdaemon.scripts.oracle,v 1.33 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: lfcdaemon.scripts.oracle,v $ $Revision: 1.33 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -15,12 +25,13 @@ + # + ORACLE_HOME=/usr/lib/oracle/10.2.0.1/client + export ORACLE_HOME ++LFCDAEMONLOGFILE=/var/log/lfc/log ++NSCONFIGFILE=/opt/lcg/etc/NSCONFIG + LFCUSER=lfcmgr + LFCGROUP=lfcmgr +-TNS_ADMIN=/home/$LFCUSER/.tnsadmin ++LFCUSERHOME=`getent passwd $LFCUSER | cut -f 6 -d :` ++TNS_ADMIN=$LFCUSERHOME/.tnsadmin + export TNS_ADMIN +-LFCDAEMONLOGFILE=/var/log/lfc/log +-NSCONFIGFILE=/opt/lcg/etc/NSCONFIG + NB_THREADS=20 + + sysname=`uname -s` +@@ -100,7 +111,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "lfcdaemon already started: " + [ -n "$FAILURE" ] && $FAILURE "lfcdaemon already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGLFCDAEMON" ]; then + # +@@ -110,7 +121,9 @@ + if [ "${RUN_LFCDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGLFCDAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGLFCDAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi + if [ "${RUN_READONLY}" = "yes" ]; then + READONLY="-r" +@@ -126,43 +139,43 @@ + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$NSCONFIGFILE" ]; then +- echo "FAILED : config file $NSCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$NSCONFIGFILE" ]; then ++ echo "FAILED : 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: " +- RETVAL=1 ++ echo $ECHOOPT "No Oracle Client found: " ++ $FAILURE "No Oracle Client found: " ++ RETVAL=1 + fi + +- # get TWO_TASK or ORACLE_SID +- if [ "${DB_IS_LOCAL}" != "yes" ]; then +- TWO_TASK=`head -1 $NSCONFIGFILE | cut -f2 -d@` +- export TWO_TASK +- else +- ORACLE_SID=`head -1 $NSCONFIGFILE | cut -f2 -d@` +- export ORACLE_SID +- fi ++ # get TWO_TASK or ORACLE_SID ++ if [ "${DB_IS_LOCAL}" != "yes" ]; then ++ TWO_TASK=`head -1 $NSCONFIGFILE | cut -f2 -d@` ++ export TWO_TASK ++ else ++ ORACLE_SID=`head -1 $NSCONFIGFILE | cut -f2 -d@` ++ export ORACLE_SID ++ fi + + LD_LIBRARY_PATH=$ORACLE_HOME/lib:/opt/glite/lib:/opt/globus/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH +- ORACLECLIENT=`ldconfig -p | grep libclntsh` +- if [ "x${ORACLECLIENT}" == "x" ]; then +- echo $ECHOOPT "No Oracle Client installed: " +- $FAILURE "No Oracle Client installed: " +- RETVAL=1 +- fi ++ ORACLECLIENT=`ldconfig -p | grep libclntsh` ++ if [ "x${ORACLECLIENT}" == "x" ]; then ++ echo $ECHOOPT "No Oracle Client installed: " ++ $FAILURE "No Oracle Client installed: " ++ RETVAL=1 ++ fi + + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $LFCDAEMONLOGFILE` +- chown $LFCUSER:$LFCGROUP `dirname $LFCDAEMONLOGFILE` ++ chown $LFCUSER:$LFCGROUP `dirname $LFCDAEMONLOGFILE` + if [ "${ALLOW_COREDUMP}" != "yes" ]; then + $DAEMON "su $LFCUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $LFCDAEMON $READONLY $DISABLEAUTOVIDS -t $NB_THREADS -c $NSCONFIGFILE -l $LFCDAEMONLOGFILE\"" + else +- $DAEMON "su $LFCUSER -c \"mkdir -p /home/$LFCUSER/lfc; cd /home/$LFCUSER/lfc; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $LFCDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $LFCDAEMON $READONLY $DISABLEAUTOVIDS -t $NB_THREADS -c $NSCONFIGFILE -l $LFCDAEMONLOGFILE\"" ++ $DAEMON "su $LFCUSER -c \"mkdir -p $LFCUSERHOME/lfc; cd $LFCUSERHOME/lfc; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $LFCDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $LFCDAEMON $READONLY $DISABLEAUTOVIDS -t $NB_THREADS -c $NSCONFIGFILE -l $LFCDAEMONLOGFILE\"" + fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS +@@ -243,51 +256,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "lfcdaemon already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "lfcdaemon already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 lfcdaemon$" | 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 lfcdaemon$" | awk '{print $1}'` ++ done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfcdaemon$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/ns/lfcdaemon.scripts.postgresql lcgdm-1.7.4.1/ns/lfcdaemon.scripts.postgresql +--- lcgdm-1.7.4.1.orig/ns/lfcdaemon.scripts.postgresql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/ns/lfcdaemon.scripts.postgresql 2010-01-04 09:07:26.838017111 +0100 +@@ -2,9 +2,19 @@ + # + # lfcdaemon Start/Stop lfcdaemon + # +-# chkconfig: 345 66 39 ++# chkconfig: 2345 66 39 + # description: LFC server daemon + # ++### BEGIN INIT INFO ++# Provides: lfcdaemon ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: LFC server daemon ++# Description: LFC server daemon ++### END INIT INFO ++# + # $Id: lfcdaemon.scripts.postgresql,v 1.2 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: lfcdaemon.scripts.postgresql,v $ $Revision: 1.2 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -19,6 +29,7 @@ + NSCONFIGFILE=/opt/lcg/etc/NSCONFIG + LFCUSER=lfcmgr + LFCGROUP=lfcmgr ++LFCUSERHOME=`getent passwd $LFCUSER | cut -f 6 -d :` + NB_THREADS=20 + + sysname=`uname -s` +@@ -98,7 +109,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "lfcdaemon already started: " + [ -n "$FAILURE" ] && $FAILURE "lfcdaemon already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGLFCDAEMON" ]; then + # +@@ -108,7 +119,9 @@ + if [ "${RUN_LFCDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGLFCDAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGLFCDAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi + if [ "${RUN_READONLY}" = "yes" ]; then + READONLY="-r" +@@ -124,19 +137,19 @@ + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$NSCONFIGFILE" ]; then +- echo "FAILED : config file $NSCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$NSCONFIGFILE" ]; then ++ echo "FAILED : config file $NSCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL ++ fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $LFCDAEMONLOGFILE` +- chown $LFCUSER:$LFCGROUP `dirname $LFCDAEMONLOGFILE` ++ chown $LFCUSER:$LFCGROUP `dirname $LFCDAEMONLOGFILE` + if [ "${ALLOW_COREDUMP}" != "yes" ]; then + $DAEMON "su $LFCUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $LFCDAEMON $READONLY $DISABLEAUTOVIDS -t $NB_THREADS -c $NSCONFIGFILE -l $LFCDAEMONLOGFILE\"" + else +- $DAEMON "su $LFCUSER -c \"mkdir -p /home/$LFCUSER/lfc; cd /home/$LFCUSER/lfc; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $LFCDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $LFCDAEMON $READONLY $DISABLEAUTOVIDS -t $NB_THREADS -c $NSCONFIGFILE -l $LFCDAEMONLOGFILE\"" ++ $DAEMON "su $LFCUSER -c \"mkdir -p $LFCUSERHOME/lfc; cd $LFCUSERHOME/lfc; hostname -f >> logstart; date >> logstart; umask 0; umask >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $LFCDAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $LFCDAEMON $READONLY $DISABLEAUTOVIDS -t $NB_THREADS -c $NSCONFIGFILE -l $LFCDAEMONLOGFILE\"" + fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS +@@ -217,51 +230,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "lfcdaemon already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "lfcdaemon already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 lfcdaemon$" | 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 lfcdaemon$" | awk '{print $1}'` ++ done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfcdaemon$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/ns/nsdaemon.scripts lcgdm-1.7.4.1/ns/nsdaemon.scripts +--- lcgdm-1.7.4.1.orig/ns/nsdaemon.scripts 2003-11-04 10:39:14.000000000 +0100 ++++ lcgdm-1.7.4.1/ns/nsdaemon.scripts 2010-01-04 09:07:26.838017111 +0100 +@@ -2,9 +2,19 @@ + # + # nsdaemon Start/Stop nsdaemon + # +-# chkconfig: 345 66 39 ++# chkconfig: 2345 66 39 + # description: NS server daemon + # ++### BEGIN INIT INFO ++# Provides: nsdaemon ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: NS server daemon ++# Description: NS server daemon ++### END INIT INFO ++# + # $Id: nsdaemon.scripts,v 1.1.1.1 2003/11/04 09:39:14 baud Exp $ + # + # @(#)$RCSfile: nsdaemon.scripts,v $ $Revision: 1.1.1.1 $ $Date: 2003/11/04 09:39:14 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -33,7 +43,7 @@ + ECHOOPT=-n + fi + else +- DAEMON= ++ DAEMON=eval + FAILURE= + ECHO_FAILURE= + SUCCESS= +@@ -83,7 +93,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "nsdaemon already started: " + [ -n "$FAILURE" ] && $FAILURE "nsdaemon already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -r $SYSCONFIGNSDAEMON ]; then + # +@@ -93,7 +103,9 @@ + if [ "${RUN_NSDAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGNSDAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGNSDAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} +@@ -182,42 +194,34 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "nsdaemon already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "nsdaemon already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + fi + fi + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- $0 start ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 nsdaemon" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/rfio/rfiod.scripts lcgdm-1.7.4.1/rfio/rfiod.scripts +--- lcgdm-1.7.4.1.orig/rfio/rfiod.scripts 2009-12-17 11:54:33.000000000 +0100 ++++ lcgdm-1.7.4.1/rfio/rfiod.scripts 2010-01-04 09:27:25.989017611 +0100 +@@ -2,9 +2,19 @@ + # + # rfiod Start/Stop rfiod. + # +-# chkconfig: 345 92 18 ++# chkconfig: 2345 92 18 + # description: RFIO server daemon + # ++### BEGIN INIT INFO ++# Provides: rfiod ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: RFIO server daemon ++# Description: RFIO server daemon ++### END INIT INFO ++# + # $Id: rfiod.scripts,v 1.18 2009/12/17 10:54:33 dhsmith Exp $ + # + # @(#)$RCSfile: rfiod.scripts,v $ $Revision: 1.18 $ $Date: 2009/12/17 10:54:33 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -37,7 +47,7 @@ + ECHOOPT=-n + fi + else +- DAEMON= ++ DAEMON=eval + FAILURE= + ECHO_FAILURE= + SUCCESS= +@@ -48,7 +58,7 @@ + + RETVAL=0 + prog="rfiod" +-NOMORERFIO=/home/operator/nomorerfio ++NOMORERFIO=/etc/nomorerfio + PIDFILE=/var/run/rfiod.pid + PIDDIR=/var/run + SUBSYS=/var/lock/subsys/rfiod +@@ -87,9 +97,9 @@ + start) + echo $ECHOOPT "Starting $prog: " + if [ -f ${NOMORERFIO} ]; then +- echo $ECHOOPT "${NOMORERFIO} exists: " ++ echo $ECHOOPT "${NOMORERFIO} exists: " + [ -n "$FAILURE" ] && $FAILURE "${NOMORERFIO} exists: " +- RETVAL=1 ++ RETVAL=0 + else + if [ $sysname = "Linux" -a `whoami` = "root" ]; then + netstat -ap | egrep '\*:5001|\*:rfio' | grep LISTEN | grep rfiod > /dev/null +@@ -100,18 +110,20 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "rfiod already started: " + [ -n "$FAILURE" ] && $FAILURE "rfiod already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGRFIOD" ]; then + # + ## Source the configuration + # + . $SYSCONFIGRFIOD +- export DPNS_HOST ++ export DPNS_HOST + if [ "${RUN_RFIOD}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGRFIOD says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGRFIOD says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} +@@ -119,8 +131,8 @@ + fi + if [ $RETVAL -eq 0 ]; then + cd / +- mkdir -p `dirname $RFIOLOGFILE` +- touch $RFIOLOGFILE ++ mkdir -p `dirname $RFIOLOGFILE` ++ touch $RFIOLOGFILE + $DAEMON $RFIOD $OPTIONS -f $RFIOLOGFILE + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS +@@ -178,14 +190,14 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "rfiod already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "rfiod already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + fi + fi + +@@ -202,29 +214,21 @@ + [ -n "$ECHO_END" ] && $ECHO_END + fi + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 -o $SILENTSTOP -eq 0 ]; then +- $0 start ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 rfiod$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/srmv1/srmv1.scripts.mysql lcgdm-1.7.4.1/srmv1/srmv1.scripts.mysql +--- lcgdm-1.7.4.1.orig/srmv1/srmv1.scripts.mysql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/srmv1/srmv1.scripts.mysql 2010-01-04 09:07:26.840017152 +0100 +@@ -2,9 +2,19 @@ + # + # srmv1 Start/Stop srmv1 + # +-# chkconfig: 345 94 16 ++# chkconfig: 2345 94 16 + # description: SRMV1 server daemon + # ++### BEGIN INIT INFO ++# Provides: srmv1 ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: SRMV1 server daemon ++# Description: SRMV1 server daemon ++### END INIT INFO ++# + # $Id: srmv1.scripts.mysql,v 1.22 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: srmv1.scripts.mysql,v $ $Revision: 1.22 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -23,6 +33,7 @@ + export CSEC_MECH + DPMUSER=dpmmgr + DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` + SRMV1DAEMONLOGFILE=/var/log/srmv1/log + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG + +@@ -103,7 +114,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "srmv1 already started: " + [ -n "$FAILURE" ] && $FAILURE "srmv1 already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGSRMV1DAEMON" ]; then + # +@@ -113,28 +124,30 @@ + if [ "${RUN_SRMV1DAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGSRMV1DAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGSRMV1DAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPM_HOST +- export DPNS_HOST ++ export DPM_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : config file $DPMCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL ++ fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $SRMV1DAEMONLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $SRMV1DAEMONLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV1DAEMON -c $DPMCONFIGFILE -l $SRMV1DAEMONLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/srmv1; cd /home/$DPMUSER/srmv1; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV1DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV1DAEMON -c $DPMCONFIGFILE -l $SRMV1DAEMONLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $SRMV1DAEMONLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV1DAEMON -c $DPMCONFIGFILE -l $SRMV1DAEMONLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/srmv1; cd $DPMUSERHOME/srmv1; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV1DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV1DAEMON -c $DPMCONFIGFILE -l $SRMV1DAEMONLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then +@@ -214,51 +227,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv1 already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "srmv1 already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 srmv1$" | 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 srmv1$" | awk '{print $1}'` ++ done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/srmv1/srmv1.scripts.oracle lcgdm-1.7.4.1/srmv1/srmv1.scripts.oracle +--- lcgdm-1.7.4.1.orig/srmv1/srmv1.scripts.oracle 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/srmv1/srmv1.scripts.oracle 2010-01-04 09:07:26.840017152 +0100 +@@ -2,9 +2,19 @@ + # + # srmv1 Start/Stop srmv1 + # +-# chkconfig: 345 94 16 ++# chkconfig: 2345 94 16 + # description: SRMV1 server daemon + # ++### BEGIN INIT INFO ++# Provides: srmv1 ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: SRMV1 server daemon ++# Description: SRMV1 server daemon ++### END INIT INFO ++# + # $Id: srmv1.scripts.oracle,v 1.29 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: srmv1.scripts.oracle,v $ $Revision: 1.29 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -15,16 +25,17 @@ + # + ORACLE_HOME=/usr/lib/oracle/10.2.0.1/client + export ORACLE_HOME +-DPMUSER=dpmmgr +-DPMGROUP=dpmmgr +-TNS_ADMIN=/home/$DPMUSER/.tnsadmin +-export TNS_ADMIN + GRIDMAPDIR=/etc/grid-security/gridmapdir + export GRIDMAPDIR + GRIDMAP=/etc/grid-security/grid-mapfile + export GRIDMAP + CSEC_MECH=ID + export CSEC_MECH ++DPMUSER=dpmmgr ++DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` ++TNS_ADMIN=$DPMUSERHOME/.tnsadmin ++export TNS_ADMIN + SRMV1DAEMONLOGFILE=/var/log/srmv1/log + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG + +@@ -105,7 +116,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "srmv1 already started: " + [ -n "$FAILURE" ] && $FAILURE "srmv1 already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGSRMV1DAEMON" ]; then + # +@@ -115,53 +126,55 @@ + if [ "${RUN_SRMV1DAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGSRMV1DAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGSRMV1DAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPM_HOST +- export DPNS_HOST ++ export DPM_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : 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: " +- RETVAL=1 ++ echo $ECHOOPT "No Oracle Client found: " ++ $FAILURE "No Oracle Client found: " ++ RETVAL=1 + fi + +- # get TWO_TASK or ORACLE_SID +- if [ "${DB_IS_LOCAL}" != "yes" ]; then +- TWO_TASK=`head -1 $DPMCONFIGFILE | cut -f2 -d@` +- export TWO_TASK +- else +- ORACLE_SID=`head -1 $DPMCONFIGFILE | cut -f2 -d@` +- export ORACLE_SID +- fi ++ # get TWO_TASK or ORACLE_SID ++ if [ "${DB_IS_LOCAL}" != "yes" ]; then ++ TWO_TASK=`head -1 $DPMCONFIGFILE | cut -f2 -d@` ++ export TWO_TASK ++ else ++ ORACLE_SID=`head -1 $DPMCONFIGFILE | cut -f2 -d@` ++ export ORACLE_SID ++ fi + + LD_LIBRARY_PATH=$ORACLE_HOME/lib:/opt/glite/lib:/opt/globus/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH +- ORACLECLIENT=`ldconfig -p | grep libclntsh` +- if [ "x${ORACLECLIENT}" == "x" ]; then +- echo $ECHOOPT "No Oracle Client installed: " +- $FAILURE "No Oracle Client installed: " +- RETVAL=1 +- fi ++ ORACLECLIENT=`ldconfig -p | grep libclntsh` ++ if [ "x${ORACLECLIENT}" == "x" ]; then ++ echo $ECHOOPT "No Oracle Client installed: " ++ $FAILURE "No Oracle Client installed: " ++ RETVAL=1 ++ fi + + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $SRMV1DAEMONLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $SRMV1DAEMONLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV1DAEMON -c $DPMCONFIGFILE -l $SRMV1DAEMONLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/srmv1; cd /home/$DPMUSER/srmv1; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV1DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV1DAEMON -c $DPMCONFIGFILE -l $SRMV1DAEMONLOGFILE\"" +- fi +- if [ $? -eq 0 ]; then ++ chown $DPMUSER:$DPMGROUP `dirname $SRMV1DAEMONLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV1DAEMON -c $DPMCONFIGFILE -l $SRMV1DAEMONLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/srmv1; cd $DPMUSERHOME/srmv1; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV1DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV1DAEMON -c $DPMCONFIGFILE -l $SRMV1DAEMONLOGFILE\"" ++ fi ++ if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then + pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'` +@@ -240,51 +253,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv1 already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "srmv1 already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 srmv1$" | 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 srmv1$" | awk '{print $1}'` ++ done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/srmv1/srmv1.scripts.postgresql lcgdm-1.7.4.1/srmv1/srmv1.scripts.postgresql +--- lcgdm-1.7.4.1.orig/srmv1/srmv1.scripts.postgresql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/srmv1/srmv1.scripts.postgresql 2010-01-04 09:07:26.841017138 +0100 +@@ -2,9 +2,19 @@ + # + # srmv1 Start/Stop srmv1 + # +-# chkconfig: 345 94 16 ++# chkconfig: 2345 94 16 + # description: SRMV1 server daemon + # ++### BEGIN INIT INFO ++# Provides: srmv1 ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: SRMV1 server daemon ++# Description: SRMV1 server daemon ++### END INIT INFO ++# + # $Id: srmv1.scripts.postgresql,v 1.2 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: srmv1.scripts.postgresql,v $ $Revision: 1.2 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -23,6 +33,7 @@ + export CSEC_MECH + DPMUSER=dpmmgr + DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` + SRMV1DAEMONLOGFILE=/var/log/srmv1/log + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG + +@@ -103,7 +114,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "srmv1 already started: " + [ -n "$FAILURE" ] && $FAILURE "srmv1 already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGSRMV1DAEMON" ]; then + # +@@ -113,28 +124,30 @@ + if [ "${RUN_SRMV1DAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGSRMV1DAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGSRMV1DAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPM_HOST +- export DPNS_HOST ++ export DPM_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : config file $DPMCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL ++ fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $SRMV1DAEMONLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $SRMV1DAEMONLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV1DAEMON -c $DPMCONFIGFILE -l $SRMV1DAEMONLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/srmv1; cd /home/$DPMUSER/srmv1; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV1DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV1DAEMON -c $DPMCONFIGFILE -l $SRMV1DAEMONLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $SRMV1DAEMONLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV1DAEMON -c $DPMCONFIGFILE -l $SRMV1DAEMONLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/srmv1; cd $DPMUSERHOME/srmv1; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV1DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV1DAEMON -c $DPMCONFIGFILE -l $SRMV1DAEMONLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then +@@ -214,51 +227,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv1 already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "srmv1 already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 srmv1$" | 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 srmv1$" | awk '{print $1}'` ++ done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/srmv2/srmv2.scripts.mysql lcgdm-1.7.4.1/srmv2/srmv2.scripts.mysql +--- lcgdm-1.7.4.1.orig/srmv2/srmv2.scripts.mysql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/srmv2/srmv2.scripts.mysql 2010-01-04 09:07:26.841017138 +0100 +@@ -2,9 +2,19 @@ + # + # srmv2 Start/Stop srmv2 + # +-# chkconfig: 345 94 16 ++# chkconfig: 2345 94 16 + # description: SRMV2 server daemon + # ++### BEGIN INIT INFO ++# Provides: srmv2 ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: SRMV2 server daemon ++# Description: SRMV2 server daemon ++### END INIT INFO ++# + # $Id: srmv2.scripts.mysql,v 1.22 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: srmv2.scripts.mysql,v $ $Revision: 1.22 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -23,6 +33,7 @@ + export CSEC_MECH + DPMUSER=dpmmgr + DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` + SRMV2DAEMONLOGFILE=/var/log/srmv2/log + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG + +@@ -103,7 +114,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "srmv2 already started: " + [ -n "$FAILURE" ] && $FAILURE "srmv2 already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGSRMV2DAEMON" ]; then + # +@@ -113,28 +124,30 @@ + if [ "${RUN_SRMV2DAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGSRMV2DAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGSRMV2DAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPM_HOST +- export DPNS_HOST ++ export DPM_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : config file $DPMCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL ++ fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $SRMV2DAEMONLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/srmv2; cd /home/$DPMUSER/srmv2; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV2DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/srmv2; cd $DPMUSERHOME/srmv2; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV2DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then +@@ -214,51 +227,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2 already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "srmv2 already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 srmv2$" | 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 srmv2$" | awk '{print $1}'` ++ done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/srmv2/srmv2.scripts.oracle lcgdm-1.7.4.1/srmv2/srmv2.scripts.oracle +--- lcgdm-1.7.4.1.orig/srmv2/srmv2.scripts.oracle 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/srmv2/srmv2.scripts.oracle 2010-01-04 09:07:26.842017124 +0100 +@@ -2,9 +2,19 @@ + # + # srmv2 Start/Stop srmv2 + # +-# chkconfig: 345 94 16 ++# chkconfig: 2345 94 16 + # description: SRMV2 server daemon + # ++### BEGIN INIT INFO ++# Provides: srmv2 ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: SRMV2 server daemon ++# Description: SRMV2 server daemon ++### END INIT INFO ++# + # $Id: srmv2.scripts.oracle,v 1.27 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: srmv2.scripts.oracle,v $ $Revision: 1.27 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -15,16 +25,17 @@ + # + ORACLE_HOME=/usr/lib/oracle/10.2.0.1/client + export ORACLE_HOME +-DPMUSER=dpmmgr +-DPMUSER=dpmmgr +-TNS_ADMIN=/home/$DPMUSER/.tnsadmin +-export TNS_ADMIN + GRIDMAPDIR=/etc/grid-security/gridmapdir + export GRIDMAPDIR + GRIDMAP=/etc/grid-security/grid-mapfile + export GRIDMAP + CSEC_MECH=ID + export CSEC_MECH ++DPMUSER=dpmmgr ++DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` ++TNS_ADMIN=$DPMUSERHOME/.tnsadmin ++export TNS_ADMIN + SRMV2DAEMONLOGFILE=/var/log/srmv2/log + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG + +@@ -105,7 +116,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "srmv2 already started: " + [ -n "$FAILURE" ] && $FAILURE "srmv2 already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGSRMV2DAEMON" ]; then + # +@@ -115,52 +126,54 @@ + if [ "${RUN_SRMV2DAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGSRMV2DAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGSRMV2DAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPM_HOST +- export DPNS_HOST ++ export DPM_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : 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: " +- RETVAL=1 ++ echo $ECHOOPT "No Oracle Client found: " ++ $FAILURE "No Oracle Client found: " ++ RETVAL=1 + fi + +- # get TWO_TASK or ORACLE_SID +- if [ "${DB_IS_LOCAL}" != "yes" ]; then +- TWO_TASK=`head -1 $DPMCONFIGFILE | cut -f2 -d@` +- export TWO_TASK +- else +- ORACLE_SID=`head -1 $DPMCONFIGFILE | cut -f2 -d@` +- export ORACLE_SID +- fi ++ # get TWO_TASK or ORACLE_SID ++ if [ "${DB_IS_LOCAL}" != "yes" ]; then ++ TWO_TASK=`head -1 $DPMCONFIGFILE | cut -f2 -d@` ++ export TWO_TASK ++ else ++ ORACLE_SID=`head -1 $DPMCONFIGFILE | cut -f2 -d@` ++ export ORACLE_SID ++ fi + + LD_LIBRARY_PATH=$ORACLE_HOME/lib:/opt/glite/lib:/opt/globus/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH +- ORACLECLIENT=`ldconfig -p | grep libclntsh` +- if [ "x${ORACLECLIENT}" == "x" ]; then +- echo $ECHOOPT "No Oracle Client installed: " +- $FAILURE "No Oracle Client installed: " +- RETVAL=1 +- fi ++ ORACLECLIENT=`ldconfig -p | grep libclntsh` ++ if [ "x${ORACLECLIENT}" == "x" ]; then ++ echo $ECHOOPT "No Oracle Client installed: " ++ $FAILURE "No Oracle Client installed: " ++ RETVAL=1 ++ fi + + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $SRMV2DAEMONLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/srmv2; cd /home/$DPMUSER/srmv2; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV2DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/srmv2; cd $DPMUSERHOME/srmv2; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV2DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then +@@ -240,51 +253,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2 already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "srmv2 already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 srmv2$" | 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 srmv2$" | awk '{print $1}'` ++ done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/srmv2/srmv2.scripts.postgresql lcgdm-1.7.4.1/srmv2/srmv2.scripts.postgresql +--- lcgdm-1.7.4.1.orig/srmv2/srmv2.scripts.postgresql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/srmv2/srmv2.scripts.postgresql 2010-01-04 09:07:26.842017124 +0100 +@@ -2,9 +2,19 @@ + # + # srmv2 Start/Stop srmv2 + # +-# chkconfig: 345 94 16 ++# chkconfig: 2345 94 16 + # description: SRMV2 server daemon + # ++### BEGIN INIT INFO ++# Provides: srmv2 ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: SRMV2 server daemon ++# Description: SRMV2 server daemon ++### END INIT INFO ++# + # $Id: srmv2.scripts.postgresql,v 1.2 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: srmv2.scripts.postgresql,v $ $Revision: 1.2 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -23,6 +33,7 @@ + export CSEC_MECH + DPMUSER=dpmmgr + DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` + SRMV2DAEMONLOGFILE=/var/log/srmv2/log + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG + +@@ -103,7 +114,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "srmv2 already started: " + [ -n "$FAILURE" ] && $FAILURE "srmv2 already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGSRMV2DAEMON" ]; then + # +@@ -113,28 +124,30 @@ + if [ "${RUN_SRMV2DAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGSRMV2DAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGSRMV2DAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPM_HOST +- export DPNS_HOST ++ export DPM_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : config file $DPMCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL ++ fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $SRMV2DAEMONLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/srmv2; cd /home/$DPMUSER/srmv2; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV2DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/srmv2; cd $DPMUSERHOME/srmv2; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV2DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then +@@ -214,51 +227,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2 already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "srmv2 already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 srmv2$" | 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 srmv2$" | awk '{print $1}'` ++ done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/srmv2.2/srmv2.2.scripts.mysql lcgdm-1.7.4.1/srmv2.2/srmv2.2.scripts.mysql +--- lcgdm-1.7.4.1.orig/srmv2.2/srmv2.2.scripts.mysql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/srmv2.2/srmv2.2.scripts.mysql 2010-01-04 09:07:26.843017249 +0100 +@@ -2,9 +2,19 @@ + # + # srmv2.2 Start/Stop srmv2.2 + # +-# chkconfig: 345 94 16 ++# chkconfig: 2345 94 16 + # description: SRMV2.2 server daemon + # ++### BEGIN INIT INFO ++# Provides: srmv2.2 ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: SRMV2.2 server daemon ++# Description: SRMV2.2 server daemon ++### END INIT INFO ++# + # $Id: srmv2.2.scripts.mysql,v 1.2 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: srmv2.2.scripts.mysql,v $ $Revision: 1.2 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -23,6 +33,7 @@ + export CSEC_MECH + DPMUSER=dpmmgr + DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` + SRMV2DAEMONLOGFILE=/var/log/srmv2.2/log + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG + +@@ -103,7 +114,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "srmv2.2 already started: " + [ -n "$FAILURE" ] && $FAILURE "srmv2.2 already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGSRMV2DAEMON" ]; then + # +@@ -113,28 +124,30 @@ + if [ "${RUN_SRMV2DAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGSRMV2DAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGSRMV2DAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPM_HOST +- export DPNS_HOST ++ export DPM_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : config file $DPMCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL ++ fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $SRMV2DAEMONLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/srmv2.2; cd /home/$DPMUSER/srmv2.2; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV2DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/srmv2.2; cd $DPMUSERHOME/srmv2.2; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV2DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then +@@ -214,51 +227,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2.2 already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "srmv2.2 already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 srmv2.2$" | 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 srmv2.2$" | awk '{print $1}'` ++ done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2.2$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/srmv2.2/srmv2.2.scripts.oracle lcgdm-1.7.4.1/srmv2.2/srmv2.2.scripts.oracle +--- lcgdm-1.7.4.1.orig/srmv2.2/srmv2.2.scripts.oracle 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/srmv2.2/srmv2.2.scripts.oracle 2010-01-04 09:07:26.843017249 +0100 +@@ -2,9 +2,19 @@ + # + # srmv2.2 Start/Stop srmv2.2 + # +-# chkconfig: 345 94 16 ++# chkconfig: 2345 94 16 + # description: SRMV2.2 server daemon + # ++### BEGIN INIT INFO ++# Provides: srmv2.2 ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: SRMV2.2 server daemon ++# Description: SRMV2.2 server daemon ++### END INIT INFO ++# + # $Id: srmv2.2.scripts.oracle,v 1.5 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: srmv2.2.scripts.oracle,v $ $Revision: 1.5 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -15,16 +25,17 @@ + # + ORACLE_HOME=/usr/lib/oracle/10.2.0.1/client + export ORACLE_HOME +-DPMUSER=dpmmgr +-DPMUSER=dpmmgr +-TNS_ADMIN=/home/$DPMUSER/.tnsadmin +-export TNS_ADMIN + GRIDMAPDIR=/etc/grid-security/gridmapdir + export GRIDMAPDIR + GRIDMAP=/etc/grid-security/grid-mapfile + export GRIDMAP + CSEC_MECH=ID + export CSEC_MECH ++DPMUSER=dpmmgr ++DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` ++TNS_ADMIN=$DPMUSERHOME/.tnsadmin ++export TNS_ADMIN + SRMV2DAEMONLOGFILE=/var/log/srmv2.2/log + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG + +@@ -105,7 +116,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "srmv2.2 already started: " + [ -n "$FAILURE" ] && $FAILURE "srmv2.2 already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGSRMV2DAEMON" ]; then + # +@@ -115,52 +126,54 @@ + if [ "${RUN_SRMV2DAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGSRMV2DAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGSRMV2DAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPM_HOST +- export DPNS_HOST ++ export DPM_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : 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: " +- RETVAL=1 ++ echo $ECHOOPT "No Oracle Client found: " ++ $FAILURE "No Oracle Client found: " ++ RETVAL=1 + fi + +- # get TWO_TASK or ORACLE_SID +- if [ "${DB_IS_LOCAL}" != "yes" ]; then +- TWO_TASK=`head -1 $DPMCONFIGFILE | cut -f2 -d@` +- export TWO_TASK +- else +- ORACLE_SID=`head -1 $DPMCONFIGFILE | cut -f2 -d@` +- export ORACLE_SID +- fi ++ # get TWO_TASK or ORACLE_SID ++ if [ "${DB_IS_LOCAL}" != "yes" ]; then ++ TWO_TASK=`head -1 $DPMCONFIGFILE | cut -f2 -d@` ++ export TWO_TASK ++ else ++ ORACLE_SID=`head -1 $DPMCONFIGFILE | cut -f2 -d@` ++ export ORACLE_SID ++ fi + + LD_LIBRARY_PATH=$ORACLE_HOME/lib:/opt/glite/lib:/opt/globus/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH +- ORACLECLIENT=`ldconfig -p | grep libclntsh` +- if [ "x${ORACLECLIENT}" == "x" ]; then +- echo $ECHOOPT "No Oracle Client installed: " +- $FAILURE "No Oracle Client installed: " +- RETVAL=1 +- fi ++ ORACLECLIENT=`ldconfig -p | grep libclntsh` ++ if [ "x${ORACLECLIENT}" == "x" ]; then ++ echo $ECHOOPT "No Oracle Client installed: " ++ $FAILURE "No Oracle Client installed: " ++ RETVAL=1 ++ fi + + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $SRMV2DAEMONLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/srmv2.2; cd /home/$DPMUSER/srmv2.2; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV2DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/srmv2.2; cd $DPMUSERHOME/srmv2.2; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV2DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then +@@ -240,51 +253,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2.2 already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "srmv2.2 already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 srmv2.2$" | 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 srmv2.2$" | awk '{print $1}'` ++ done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2.2$" | awk '{print $1}'` + if [ -n "$pid" ]; then +diff -ur lcgdm-1.7.4.1.orig/srmv2.2/srmv2.2.scripts.postgresql lcgdm-1.7.4.1/srmv2.2/srmv2.2.scripts.postgresql +--- lcgdm-1.7.4.1.orig/srmv2.2/srmv2.2.scripts.postgresql 2009-01-26 00:21:52.000000000 +0100 ++++ lcgdm-1.7.4.1/srmv2.2/srmv2.2.scripts.postgresql 2010-01-04 09:07:26.844017235 +0100 +@@ -2,9 +2,19 @@ + # + # srmv2.2 Start/Stop srmv2.2 + # +-# chkconfig: 345 94 16 ++# chkconfig: 2345 94 16 + # description: SRMV2.2 server daemon + # ++### BEGIN INIT INFO ++# Provides: srmv2.2 ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: SRMV2.2 server daemon ++# Description: SRMV2.2 server daemon ++### END INIT INFO ++# + # $Id: srmv2.2.scripts.postgresql,v 1.2 2009/01/25 23:21:52 szamsu Exp $ + # + # @(#)$RCSfile: srmv2.2.scripts.postgresql,v $ $Revision: 1.2 $ $Date: 2009/01/25 23:21:52 $ CERN/IT/ADC/CA Jean-Damien Durand +@@ -23,6 +33,7 @@ + export CSEC_MECH + DPMUSER=dpmmgr + DPMGROUP=dpmmgr ++DPMUSERHOME=`getent passwd $DPMUSER | cut -f 6 -d :` + SRMV2DAEMONLOGFILE=/var/log/srmv2.2/log + DPMCONFIGFILE=/opt/lcg/etc/DPMCONFIG + +@@ -103,7 +114,7 @@ + if [ $? -eq 0 ]; then + echo $ECHOOPT "srmv2.2 already started: " + [ -n "$FAILURE" ] && $FAILURE "srmv2.2 already started: " +- RETVAL=1 ++ RETVAL=0 + else + if [ -n "$SYSCONFIGSRMV2DAEMON" ]; then + # +@@ -113,28 +124,30 @@ + if [ "${RUN_SRMV2DAEMON}" != "yes" ]; then + echo $ECHOOPT "$SYSCONFIGSRMV2DAEMON says NO: " + [ -n "$FAILURE" ] && $FAILURE "$SYSCONFIGSRMV2DAEMON says NO: " +- RETVAL=1 ++ RETVAL=0 ++ $ECHO_END ++ exit $RETVAL + fi +- export DPM_HOST +- export DPNS_HOST ++ export DPM_HOST ++ export DPNS_HOST + if [ -n "${ULIMIT_N}" ]; then + ulimit -n ${ULIMIT_N} + fi + fi +- if [ ! -s "$DPMCONFIGFILE" ]; then +- echo "FAILED : config file $DPMCONFIGFILE empty" +- RETVAL=1 +- exit $RETVAL +- fi ++ if [ ! -s "$DPMCONFIGFILE" ]; then ++ echo "FAILED : config file $DPMCONFIGFILE empty" ++ RETVAL=1 ++ exit $RETVAL ++ fi + if [ $RETVAL -eq 0 ]; then + cd / + mkdir -p `dirname $SRMV2DAEMONLOGFILE` +- chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE` +- if [ "${ALLOW_COREDUMP}" != "yes" ]; then +- $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" +- else +- $DAEMON "su $DPMUSER -c \"mkdir -p /home/$DPMUSER/srmv2.2; cd /home/$DPMUSER/srmv2.2; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV2DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" +- fi ++ chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE` ++ if [ "${ALLOW_COREDUMP}" != "yes" ]; then ++ $DAEMON "su $DPMUSER -c \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" ++ else ++ $DAEMON "su $DPMUSER -c \"mkdir -p $DPMUSERHOME/srmv2.2; cd $DPMUSERHOME/srmv2.2; hostname -f >> logstart; date >> logstart; ulimit -c unlimited; pwd >> logstart; ulimit -c >> logstart; echo DAEMON $SRMV2DAEMON \`hostname -f\` >> logstart; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $SRMV2DAEMON -c $DPMCONFIGFILE -l $SRMV2DAEMONLOGFILE\"" ++ fi + if [ $? -eq 0 ]; then + [ -d $SUBSYSDIR ] && touch $SUBSYS + if [ -d $PIDDIR ]; then +@@ -214,51 +227,43 @@ + else + [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2.2 already stopped: " + [ $SILENTSTOP -eq 0 -a -n "$FAILURE" ] && $FAILURE "srmv2.2 already stopped: " +- RETVAL=1 ++ RETVAL=0 + fi + fi + if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then + if [ $RETVAL -eq 0 ]; then +- $ECHO_SUCCESS ++ $ECHO_SUCCESS + else +- $ECHO_FAILURE ++ $ECHO_FAILURE + 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 srmv2.2$" | 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 srmv2.2$" | awk '{print $1}'` ++ done + + [ -d $SUBSYSDIR ] && rm -f $SUBSYS + [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END + ;; +- restart) ++ restart | force-reload) + $0 stop +- if [ $? -eq 0 ]; then +- sleep 5 +- $0 start ++ sleep 5 ++ $0 start ++ RETVAL=$? ++ ;; ++ reload) ++ ;; ++ condrestart | try-restart) ++ if [ -f $PIDFILE ]; then ++ $0 restart + 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) +- SILENTSTOP=1 +- export SILENTSTOP +- $0 restart +- RETVAL=$? +- ;; + status) + pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2.2$" | awk '{print $1}'` + if [ -n "$pid" ]; then --- lfc-1.7.4.1.orig/debian/patches/lcgdm-porting.patch +++ lfc-1.7.4.1/debian/patches/lcgdm-porting.patch @@ -0,0 +1,278 @@ +diff -ur lcgdm-1.7.4.1.orig/common/solveln.c lcgdm-1.7.4.1/common/solveln.c +--- lcgdm-1.7.4.1.orig/common/solveln.c 2005-03-29 11:27:19.000000000 +0200 ++++ lcgdm-1.7.4.1/common/solveln.c 2010-01-06 00:02:26.132021071 +0100 +@@ -19,6 +19,9 @@ + #include + #endif + #endif ++#ifndef MAXHOSTNAMELEN ++#define MAXHOSTNAMELEN 64 ++#endif + #include + #if defined(_WIN32) + #include +diff -ur lcgdm-1.7.4.1.orig/config/Imake.tmpl lcgdm-1.7.4.1/config/Imake.tmpl +--- lcgdm-1.7.4.1.orig/config/Imake.tmpl 2009-02-17 07:19:30.000000000 +0100 ++++ lcgdm-1.7.4.1/config/Imake.tmpl 2010-01-06 00:02:26.133020498 +0100 +@@ -19,7 +19,7 @@ + #if hpux + #include + #endif +-#if linux ++#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__) + #include + #endif + #if __Lynx__ +diff -ur lcgdm-1.7.4.1.orig/config/linux.cf lcgdm-1.7.4.1/config/linux.cf +--- lcgdm-1.7.4.1.orig/config/linux.cf 2006-05-10 15:04:49.000000000 +0200 ++++ lcgdm-1.7.4.1/config/linux.cf 2010-01-06 00:02:26.133020498 +0100 +@@ -10,7 +10,7 @@ + GSOAP_PLATFORM = linux + #define linux 1 + #define HasRanlib YES +-CC += -fPIC -D_LARGEFILE64_SOURCE ++CC += -fPIC -D_LARGEFILE64_SOURCE -Dlinux + MTCCFLAGS = -pthread -DCTHREAD_LINUX -D_THREAD_SAFE -D_REENTRANT + MTLDLIBS = + MTLDFLAGS = -pthread +diff -ur lcgdm-1.7.4.1.orig/dpm/dpm.i lcgdm-1.7.4.1/dpm/dpm.i +--- lcgdm-1.7.4.1.orig/dpm/dpm.i 2009-12-08 17:19:03.000000000 +0100 ++++ lcgdm-1.7.4.1/dpm/dpm.i 2010-01-06 00:02:26.134020902 +0100 +@@ -1530,7 +1530,6 @@ + %include "dpm_struct.h" + struct dirent { + long d_ino; +- long d_off; + unsigned short d_reclen; + char d_name[256]; + }; +Endast i lcgdm-1.7.4.1/dpm: dpm.i.orig +diff -ur lcgdm-1.7.4.1.orig/ns/Cns.i lcgdm-1.7.4.1/ns/Cns.i +--- lcgdm-1.7.4.1.orig/ns/Cns.i 2009-12-08 17:19:03.000000000 +0100 ++++ lcgdm-1.7.4.1/ns/Cns.i 2010-01-06 00:02:26.134020902 +0100 +@@ -182,7 +182,6 @@ + + struct dirent { + long d_ino; +- long d_off; + unsigned short d_reclen; + char d_name[256]; + }; +diff -ur lcgdm-1.7.4.1.orig/ns/Cns_readdir.c lcgdm-1.7.4.1/ns/Cns_readdir.c +--- lcgdm-1.7.4.1.orig/ns/Cns_readdir.c 2008-02-04 13:08:52.000000000 +0100 ++++ lcgdm-1.7.4.1/ns/Cns_readdir.c 2010-01-06 00:02:26.134020902 +0100 +@@ -120,7 +120,7 @@ + #endif + while (nbentries--) { + dp->d_ino = 0; +-#if defined(linux) || defined(sgi) || defined(SOLARIS) ++#if defined(__linux__) || defined(sgi) || defined(SOLARIS) + dp->d_off = 0; + #endif + #if defined(_AIX) +@@ -131,7 +131,7 @@ + #endif + unmarshall_STRING (rbp, dp->d_name); + n = strlen (dp->d_name); +-#if defined(_AIX) || (defined(__alpha) && defined(__osf__)) || defined(hpux) || defined(__APPLE__) ++#if defined(_AIX) || (defined(__alpha) && defined(__osf__)) || defined(hpux) || defined(__APPLE__) || defined(__GNU__) || defined(__FreeBSD_kernel__) + dp->d_namlen = n; + #endif + dp->d_reclen = ((direntsz + n + 8) / 8) * 8; +@@ -174,10 +174,15 @@ + namlen = strlen (dp64->d_name); + dp32 = (struct dirent *) dp64; + dp32->d_ino = dp64->d_ino; ++#if defined(SOLARIS) || defined(__linux__) + dp32->d_off = dp64->d_off; ++#endif + #if defined(linux) + dp32->d_type = dp64->d_type; + #endif ++#if defined(__GNU__) || defined(__FreeBSD_kernel__) ++ dp32->d_namlen = dp64->d_namlen; ++#endif + strcpy (dp32->d_name, dp64->d_name); + dp32->d_reclen = ((&dp32->d_name[0] - (char *) dp32 + namlen + 8) / 8) * 8; + return (dp32); +diff -ur lcgdm-1.7.4.1.orig/ns/lfc.i lcgdm-1.7.4.1/ns/lfc.i +--- lcgdm-1.7.4.1.orig/ns/lfc.i 2009-05-28 11:41:03.000000000 +0200 ++++ lcgdm-1.7.4.1/ns/lfc.i 2010-01-06 00:02:26.135025079 +0100 +@@ -1339,7 +1339,6 @@ + %include "Cns_struct.h" + struct dirent { + long d_ino; +- long d_off; + unsigned short d_reclen; + char d_name[256]; + }; +diff -ur lcgdm-1.7.4.1.orig/rfio/popen.c lcgdm-1.7.4.1/rfio/popen.c +--- lcgdm-1.7.4.1.orig/rfio/popen.c 2008-11-25 11:16:47.000000000 +0100 ++++ lcgdm-1.7.4.1/rfio/popen.c 2010-01-06 00:04:29.499764326 +0100 +@@ -23,6 +23,9 @@ + #else + #include /* For MAXHOSTNAMELEN definition */ + #endif ++#ifndef MAXHOSTNAMELEN ++#define MAXHOSTNAMELEN 64 ++#endif + #include + #include + #include +diff -ur lcgdm-1.7.4.1.orig/rfio/readdir.c lcgdm-1.7.4.1/rfio/readdir.c +--- lcgdm-1.7.4.1.orig/rfio/readdir.c 2005-03-31 15:13:01.000000000 +0200 ++++ lcgdm-1.7.4.1/rfio/readdir.c 2010-01-06 00:02:26.135767211 +0100 +@@ -133,7 +133,7 @@ + dirp->offset++; + dirp->dp.dd_loc = dirp->offset; + de->d_reclen = sizeof(struct dirent) + namlen; +-#if !defined(SOLARIS) && !defined(sgi) && !defined(linux) ++#if !defined(SOLARIS) && !defined(sgi) && !defined(__linux__) + de->d_namlen = namlen; + #endif + #ifdef SOLARIS +@@ -165,18 +165,27 @@ + struct dirent *de32; + ino_t ino; + short namlen; ++#if defined(SOLARIS) || defined(__linux__) + off_t offset; ++#endif + + if ((de32 = rfio_readdir(dirp)) == NULL) + return(NULL); + + ino = de32->d_ino; ++#if defined(SOLARIS) || defined(__linux__) + offset = de32->d_off; ++#endif + namlen = strlen(de32->d_name); + de = (struct dirent64 *) de32; + memmove (de->d_name, de32->d_name, namlen + 1); + de->d_ino = ino; ++#if defined(SOLARIS) || defined(__linux__) + de->d_off = offset; ++#endif ++#if defined(__GNU__) || defined(__FreeBSD_kernel__) ++ de->d_namlen = namlen; ++#endif + de->d_reclen = ((&de->d_name[0] - (char *) de + namlen + 8) / 8) * 8; + return(de); + } +diff -ur lcgdm-1.7.4.1.orig/rfio/rename.c lcgdm-1.7.4.1/rfio/rename.c +--- lcgdm-1.7.4.1.orig/rfio/rename.c 2005-03-31 15:13:01.000000000 +0200 ++++ lcgdm-1.7.4.1/rfio/rename.c 2010-01-06 00:06:07.588017513 +0100 +@@ -19,6 +19,9 @@ + #else + #include + #endif ++#ifndef MAXHOSTNAMELEN ++#define MAXHOSTNAMELEN 64 ++#endif + #include "rfio.h" /* Remote File I/O general definitions */ + + /* +diff -ur lcgdm-1.7.4.1.orig/rfio/rfio_call64.c lcgdm-1.7.4.1/rfio/rfio_call64.c +--- lcgdm-1.7.4.1.orig/rfio/rfio_call64.c 2008-09-24 13:25:01.000000000 +0200 ++++ lcgdm-1.7.4.1/rfio/rfio_call64.c 2010-01-06 00:14:50.749766412 +0100 +@@ -27,6 +27,9 @@ + #include /* System logger */ + #include + #endif ++#ifndef MAXHOSTNAMELEN ++#define MAXHOSTNAMELEN 64 ++#endif + #if defined(_AIX) || defined(hpux) || defined(SOLARIS) || defined(linux) + #include + #endif +diff -ur lcgdm-1.7.4.1.orig/rfio/rfio_callhandlers.c lcgdm-1.7.4.1/rfio/rfio_callhandlers.c +--- lcgdm-1.7.4.1.orig/rfio/rfio_callhandlers.c 2009-03-17 10:36:49.000000000 +0100 ++++ lcgdm-1.7.4.1/rfio/rfio_callhandlers.c 2010-01-06 00:08:24.536017381 +0100 +@@ -23,6 +23,9 @@ + #include + #include /* For MAXHOSTNAMELEN definition */ + #endif ++#ifndef MAXHOSTNAMELEN ++#define MAXHOSTNAMELEN 64 ++#endif + #include + #if defined(_WIN32) + #define R_OK 4 +diff -ur lcgdm-1.7.4.1.orig/rfio/rfio_calls.c lcgdm-1.7.4.1/rfio/rfio_calls.c +--- lcgdm-1.7.4.1.orig/rfio/rfio_calls.c 2008-09-24 13:25:01.000000000 +0200 ++++ lcgdm-1.7.4.1/rfio/rfio_calls.c 2010-01-06 00:15:21.597766408 +0100 +@@ -27,6 +27,9 @@ + #include /* System logger */ + #include + #endif ++#ifndef MAXHOSTNAMELEN ++#define MAXHOSTNAMELEN 64 ++#endif + #if defined(_AIX) || defined(hpux) || defined(SOLARIS) || defined(linux) + #include + #endif +diff -ur lcgdm-1.7.4.1.orig/rfio/rfio_fcalls.c lcgdm-1.7.4.1/rfio/rfio_fcalls.c +--- lcgdm-1.7.4.1.orig/rfio/rfio_fcalls.c 2008-01-10 09:27:59.000000000 +0100 ++++ lcgdm-1.7.4.1/rfio/rfio_fcalls.c 2010-01-06 00:15:35.918768018 +0100 +@@ -27,6 +27,9 @@ + #else + #include /* System parameters */ + #endif ++#ifndef MAXHOSTNAMELEN ++#define MAXHOSTNAMELEN 64 ++#endif + #include + + #if defined(HPSS) +diff -ur lcgdm-1.7.4.1.orig/rfio/rfio_rdirfdt.c lcgdm-1.7.4.1/rfio/rfio_rdirfdt.c +--- lcgdm-1.7.4.1.orig/rfio/rfio_rdirfdt.c 2005-03-31 15:13:03.000000000 +0200 ++++ lcgdm-1.7.4.1/rfio/rfio_rdirfdt.c 2010-01-06 00:10:11.552017944 +0100 +@@ -15,6 +15,9 @@ + #else + #include /* For MAXHOSTNAMELEN definition */ + #endif ++#ifndef MAXHOSTNAMELEN ++#define MAXHOSTNAMELEN 64 ++#endif + #include + #include "rfio.h" + #include "rfio_rdirfdt.h" +diff -ur lcgdm-1.7.4.1.orig/rfio/rfio_rfilefdt.c lcgdm-1.7.4.1/rfio/rfio_rfilefdt.c +--- lcgdm-1.7.4.1.orig/rfio/rfio_rfilefdt.c 2005-03-31 15:13:03.000000000 +0200 ++++ lcgdm-1.7.4.1/rfio/rfio_rfilefdt.c 2010-01-06 00:10:23.741017616 +0100 +@@ -15,6 +15,9 @@ + #else + #include /* For MAXHOSTNAMELEN definition */ + #endif ++#ifndef MAXHOSTNAMELEN ++#define MAXHOSTNAMELEN 64 ++#endif + #include + #include "rfio.h" + #include "rfio_rfilefdt.h" +diff -ur lcgdm-1.7.4.1.orig/rfio/rfio_serv.c lcgdm-1.7.4.1/rfio/rfio_serv.c +--- lcgdm-1.7.4.1.orig/rfio/rfio_serv.c 2009-03-17 10:36:49.000000000 +0100 ++++ lcgdm-1.7.4.1/rfio/rfio_serv.c 2010-01-06 00:11:28.708018033 +0100 +@@ -35,6 +35,9 @@ + #include /* time definitions */ + #include /* System parameters */ + #endif ++#ifndef MAXHOSTNAMELEN ++#define MAXHOSTNAMELEN 64 ++#endif + #ifndef _WIN32 + #include /* wait, wait3, wait4 (BSD) */ + #endif +diff -ur lcgdm-1.7.4.1.orig/rfio/xyopen.c lcgdm-1.7.4.1/rfio/xyopen.c +--- lcgdm-1.7.4.1.orig/rfio/xyopen.c 2005-03-31 15:13:05.000000000 +0200 ++++ lcgdm-1.7.4.1/rfio/xyopen.c 2010-01-06 00:11:49.302018383 +0100 +@@ -36,6 +36,9 @@ + #else + #include + #endif ++#ifndef MAXHOSTNAMELEN ++#define MAXHOSTNAMELEN 64 ++#endif + #include + #include + #include --- lfc-1.7.4.1.orig/debian/patches/series +++ lfc-1.7.4.1/debian/patches/series @@ -0,0 +1,52 @@ +# Fix non-standard installation path +# https://savannah.cern.ch/bugs/?57526 +lcgdm-paths.patch + +# Link using $(CC) +# https://savannah.cern.ch/bugs/?57527 +lcgdm-ld.patch + +# Fix soname issues +# https://savannah.cern.ch/bugs/?57528 +lcgdm-withsoname.patch + +# Link binaries using shared libraries +# https://savannah.cern.ch/bugs/?57529 +lcgdm-shliblink.patch + +# Link to gsoap library, fix parallel build +# https://savannah.cern.ch/bugs/?57530 +lcgdm-gsoap.patch + +# Fix non-standard install permissions +# https://savannah.cern.ch/bugs/?57531 +lcgdm-installpermissions.patch + +# Fix init script issues +# https://savannah.cern.ch/bugs/?57532 +lcgdm-initscripts.patch + +# Fix man page installation +# https://savannah.cern.ch/bugs/?57533 +lcgdm-man.patch + +# Fix parallel build and other makefile glitches +# https://savannah.cern.ch/bugs/?57534 +lcgdm-rules.patch + +# Postgres include path +# https://savannah.cern.ch/bugs/?57535 +lcgdm-posinc.patch + +# Porting fixes for GNU/Hurd and GNU/kFreeBSD +# https://savannah.cern.ch/bugs/?61071 +lcgdm-porting.patch + +# Adapt upstream's hardcoded include and library paths for Debian +lcgdm-usr.patch + +# Allow moving plugins out of default library search path +lcgdm-dlopen.patch + +# Use Debian's imake instead of bundled version +lcgdm-imake.patch --- lfc-1.7.4.1.orig/debian/patches/lcgdm-posinc.patch +++ lfc-1.7.4.1/debian/patches/lcgdm-posinc.patch @@ -0,0 +1,140 @@ +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-08-24 12:43:49.000000000 +0200 ++++ LCG-DM-1.7.3.1/dicomcopy/Imakefile 2009-09-26 17:28:05.203114831 +0200 +@@ -48,6 +48,7 @@ + #if UsePostgres + DBOBJS = dpm_libpq_ifce.Osuf dicomcopy_libpq_ifce.Osuf + POSFLG = -DUSE_POSTGRES ++POSINC = -I/usr/include/postgresql + LIBPOS = -lpq + DBCREAT = create_dicomcopy_tables_postgres.sql + #endif +@@ -60,7 +61,7 @@ + -DLOGFILE=\"$(LOGFILE)\" \ + $(ORAFLG) $(MYSFLG) $(POSFLG) $(CSECFLAG) $(VIDFLAG) $(VOMSFLAG) + +-CFLAGS = -g -I$(INCLUDES) $(DFLAGS) $(ORAINC) $(MYSINC) ++CFLAGS = -g -I$(INCLUDES) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC) + + 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-08-25 11:27:18.000000000 +0200 ++++ LCG-DM-1.7.3.1/dpm/Imakefile 2009-09-26 17:28:49.987112513 +0200 +@@ -86,6 +86,7 @@ + DBOBJS += dicomcopy_libpq_ifce.Osuf + #endif + POSFLG = -DUSE_POSTGRES ++POSINC = -I/usr/include/postgresql + LIBPOS = -lpq + DBCREAT = create_dpm_tables_postgres.sql + #endif +@@ -105,7 +106,7 @@ + $(CNS_ROOT) $(STAGERSUPERUSER) $(STAGERSUPERGROUP) \ + $(ORAFLG) $(MYSFLG) $(POSFLG) $(CSECFLAG) $(VIDFLAG) $(VOMSFLAG) $(DICOMFLAG) + +-CFLAGS = -g -I$(INCLUDES) $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) ++CFLAGS = -g -I$(INCLUDES) $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC) + + COMM######################### RULES ############################## + +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-08-25 11:27:18.000000000 +0200 ++++ LCG-DM-1.7.3.1/dpmcopy/Imakefile 2009-09-26 17:26:57.073112754 +0200 +@@ -58,6 +58,7 @@ + #if UsePostgres + DBOBJS = dpm_libpq_ifce.Osuf + POSFLG = -DUSE_POSTGRES ++POSINC = -I/usr/include/postgresql + LIBPOS = -lpq + #endif + #endif +@@ -69,7 +70,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) ++CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC) + + COMM######################### DEPENDENCY LIBRARIES ############### + +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-08-25 11:27:18.000000000 +0200 ++++ LCG-DM-1.7.3.1/ns/Imakefile 2009-09-26 17:25:16.450112075 +0200 +@@ -103,6 +103,7 @@ + #if UsePostgres + DBOBJS = Cns_libpq_ifce.Osuf + POSFLG = -DUSE_POSTGRES ++POSINC = -I/usr/include/postgresql + LIBPOS = -lpq + #endif + #endif +@@ -118,7 +119,7 @@ + $(ACCTFLAG) $(ACCTFILE) $(NSTYPE) $(ORAFLG) $(MYSFLG) $(POSFLG) $(CSECFLAG) \ + $(VIDFLAG) $(VOMSFLAG) + +-CFLAGS = -g -I$(INCLUDES) $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) ++CFLAGS = -g -I$(INCLUDES) $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC) + + COMM######################### RULES ############################## + +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-08-25 11:27:18.000000000 +0200 ++++ LCG-DM-1.7.3.1/srmv1/Imakefile 2009-09-26 17:29:19.786113853 +0200 +@@ -65,6 +65,7 @@ + #if UsePostgres + DBOBJS = ../dpm/dpm_libpq_ifce.Osuf + POSFLG = -DUSE_POSTGRES ++POSINC = -I/usr/include/postgresql + LIBPOS = -lpq + #endif + #endif +@@ -76,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) ++CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(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-08-25 11:27:18.000000000 +0200 ++++ LCG-DM-1.7.3.1/srmv2/Imakefile 2009-09-26 17:29:47.929113912 +0200 +@@ -65,6 +65,7 @@ + #if UsePostgres + DBOBJS = ../dpm/dpm_libpq_ifce.Osuf + POSFLG = -DUSE_POSTGRES ++POSINC = -I/usr/include/postgresql + LIBPOS = -lpq + #endif + #endif +@@ -76,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) ++CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(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-08-25 11:27:18.000000000 +0200 ++++ LCG-DM-1.7.3.1/srmv2.2/Imakefile 2009-09-26 17:30:34.686115308 +0200 +@@ -66,6 +66,7 @@ + #if UsePostgres + DBOBJS = ../dpm/dpm_libpq_ifce.Osuf + POSFLG = -DUSE_POSTGRES ++POSINC = -I/usr/include/postgresql + LIBPOS = -lpq + #endif + #endif +@@ -77,7 +78,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) ++CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC) + + COMM######################### DEPENDENCY LIBRARIES ############### + --- lfc-1.7.4.1.orig/debian/patches/lcgdm-imake.patch +++ lfc-1.7.4.1/debian/patches/lcgdm-imake.patch @@ -0,0 +1,44 @@ +diff -ur LCG-DM-1.7.3.1.orig/Imakefile LCG-DM-1.7.3.1/Imakefile +--- LCG-DM-1.7.3.1.orig/Imakefile 2009-02-19 00:14:09.000000000 +0100 ++++ LCG-DM-1.7.3.1/Imakefile 2009-12-07 13:00:29.682188046 +0100 +@@ -111,10 +111,9 @@ + (cd test; $(MAKE) all) + + Makefiles: +- @. ./setosflags ;\ + for i in $(SUBDIRS) test ;\ + do (echo " $$i:" ; cd $$i ;\ +- ../imake/imake -I../config -DOSMajorVersion="$$OSMAJNO" -DOSMinorVersion="$$OSMINNO" ;\ ++ imake -Ui386 -I../config ;\ + $(MAKE) $(MFLAGS) $@ \ + ) ; done ; + +diff -ur LCG-DM-1.7.3.1.orig/Makefile.ini LCG-DM-1.7.3.1/Makefile.ini +--- LCG-DM-1.7.3.1.orig/Makefile.ini 1999-10-22 11:44:58.000000000 +0200 ++++ LCG-DM-1.7.3.1/Makefile.ini 2009-12-07 12:59:47.138188149 +0100 +@@ -15,7 +15,5 @@ + test: Makefiles + (cd test; $(MAKE) all) + Makefiles: +- @. ./setosflags ;\ +- (cd imake; $(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$$BOOTSTRAPCFLAGS") ;\ +- imake/imake -v -Iconfig -DOSMajorVersion=$$OSMAJNO -DOSMinorVersion=$$OSMINNO ++ imake -Ui386 -Iconfig + $(MAKE) $@ +diff -ur LCG-DM-1.7.3.1.orig/test/Imakefile LCG-DM-1.7.3.1/test/Imakefile +--- LCG-DM-1.7.3.1.orig/test/Imakefile 2008-09-24 13:25:01.000000000 +0200 ++++ LCG-DM-1.7.3.1/test/Imakefile 2009-12-07 13:01:10.579186477 +0100 +@@ -27,12 +27,11 @@ + @echo Not supported on this platform + #else + Makefiles: +- @. ../setosflags ;\ + for i in $(SUBDIRS) ;\ + do (if [ -d $$i ] ;\ + then \ + (echo " $$i:" ; cd $$i ;\ +- ../../imake/imake -I../../config -DOSMajorVersion="$$OSMAJNO" -DOSMinorVersion="$$OSMINNO" ;\ ++ imake -Ui386 -I../../config ;\ + $(MAKE) $(MFLAGS) $@) ;\ + else \ + (echo "ERROR : No directory $$i" ;\ --- lfc-1.7.4.1.orig/debian/patches/lcgdm-gsoap.patch +++ lfc-1.7.4.1/debian/patches/lcgdm-gsoap.patch @@ -0,0 +1,301 @@ +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-29 18:22:41.361114265 +0200 ++++ LCG-DM-1.7.3.1/dli/Imakefile 2009-09-29 19:04:34.501115962 +0200 +@@ -48,21 +48,18 @@ + SRV_OBJS = dli.Osuf \ + dlilogit.Osuf \ + dliC.Osuf \ +- dliServer.Osuf \ +- stdsoap2.Osuf ++ dliServer.Osuf + + 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 + +-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c +- $(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,$(SRV_OBJS),, $(MTLDFLAGS) $(LIBS) $(MTLDLIBS) -lgsoap) ++NormalProgramTarget(lfc-dli-client, lfc-dli-client.Osuf dliC.Osuf dliClient.Osuf,, $(LIBS) -lgsoap) + rc.lfc-dli: lfc-dli.scripts + $(CP) $? $@ + lfc-dli.conf.templ: lfc-dli.sysconfig +@@ -110,5 +107,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 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-29 18:22:41.364115917 +0200 ++++ LCG-DM-1.7.3.1/dpmcopy/Imakefile 2009-09-29 19:25:18.581114503 +0200 +@@ -96,8 +96,7 @@ + ../dpm/dpmlogit.Osuf \ + ../dpm/sendrep.Osuf \ + srmv2C.Osuf \ +- srmv2Client.Osuf \ +- stdsoap2.Osuf ++ srmv2Client.Osuf + + all: $(SERVER) + +@@ -119,7 +118,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 +@@ -130,14 +130,12 @@ + $(CC) -c -g -I$(INCLUDES) $(MTCCFLAGS) $(CSECFLAG) dpmcopy_inc_reqctr.c + send2dpmcopyd.Osuf: send2dpmcopyd.c + $(CC) -c -g -I$(INCLUDES) $(MTCCFLAGS) $(CSECFLAG) send2dpmcopyd.c +-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c +- $(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c + + #if UseOracle && !defined(_WIN32) + dpmcopyd: $(SRV_OBJS) $(DEPLIB) +- $(MAKE) -f oralink.mk dpmcopyd SRV_OBJS="$(SRV_OBJS)" LIBS="$(GGC_LIB) $(LIBS) $(SECLIB)" ++ $(MAKE) -f oralink.mk dpmcopyd SRV_OBJS="$(SRV_OBJS)" LIBS="$(GGC_LIB) $(LIBS) $(SECLIB) -lgsoap" + #else +-NormalProgramTarget(dpmcopyd,$(SRV_OBJS),, $(GGC_LIB) $(LIBS) $(SECLIB) $(LIBORA) $(LIBMYS) $(LIBPOS)) ++NormalProgramTarget(dpmcopyd,$(SRV_OBJS),, $(GGC_LIB) $(LIBS) $(SECLIB) $(LIBORA) $(LIBMYS) $(LIBPOS) -lgsoap) + #endif + #if UseOracle + rc.dpmcopyd: dpmcopyd.scripts.oracle +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-29 18:22:41.375115240 +0200 ++++ LCG-DM-1.7.3.1/srmv1/Imakefile 2009-09-29 19:27:47.246113523 +0200 +@@ -100,24 +100,21 @@ + ../dpm/dpm_util.Osuf \ + ../dpm/dpmlogit.Osuf \ + srmv1C.Osuf \ +- srmv1Server.Osuf \ +- stdsoap2.Osuf ++ srmv1Server.Osuf + + 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 + +-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c +- $(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c +- + #if UseOracle && !defined(_WIN32) + srmv1: $(SRV_OBJS) $(DEPLIB) +- $(MAKE) -f oralink.mk srmv1 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(SECLIB) $(MTLDLIBS)" ++ $(MAKE) -f oralink.mk srmv1 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(SECLIB) $(MTLDLIBS) -lgsoap" + #else +-NormalProgramTarget(srmv1,$(SRV_OBJS),, $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS)) ++NormalProgramTarget(srmv1,$(SRV_OBJS),, $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) -lgsoap) + #endif + #if UseOracle + rc.srmv1: srmv1.scripts.oracle +@@ -180,5 +177,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 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-29 18:22:41.377112996 +0200 ++++ LCG-DM-1.7.3.1/srmv2/Imakefile 2009-09-29 19:28:43.817114986 +0200 +@@ -104,24 +104,21 @@ + ../dpm/dpm_util.Osuf \ + ../dpm/dpmlogit.Osuf \ + srmv2C.Osuf \ +- srmv2Server.Osuf \ +- stdsoap2.Osuf ++ srmv2Server.Osuf + + 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 + +-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c +- $(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c +- + #if UseOracle && !defined(_WIN32) + srmv2: $(SRV_OBJS) $(DEPLIB) +- $(MAKE) -f oralink.mk srmv2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(SECLIB) $(MTLDLIBS)" ++ $(MAKE) -f oralink.mk srmv2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(SECLIB) $(MTLDLIBS) -lgsoap" + #else +-NormalProgramTarget(srmv2,$(SRV_OBJS),, $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS)) ++NormalProgramTarget(srmv2,$(SRV_OBJS),, $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) -lgsoap) + #endif + #if UseOracle + rc.srmv2: srmv2.scripts.oracle +@@ -184,5 +181,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 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-29 18:22:41.378114558 +0200 ++++ LCG-DM-1.7.3.1/srmv2.2/Imakefile 2009-09-29 19:29:16.066114331 +0200 +@@ -106,24 +106,21 @@ + ../dpm/dpm_util.Osuf \ + ../dpm/dpmlogit.Osuf \ + srmv2C.Osuf \ +- srmv2Server.Osuf \ +- stdsoap2.Osuf ++ srmv2Server.Osuf + + 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 + +-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c +- $(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c +- + #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="$(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS) -lgsoap" + #else +-NormalProgramTarget(srmv2.2,$(SRV_OBJS), $(BACKEND_LIBS), $(MTLDFLAGS) $(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS)) ++NormalProgramTarget(srmv2.2,$(SRV_OBJS), $(BACKEND_LIBS), $(MTLDFLAGS) $(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) -lgsoap) + #endif + #if UseOracle + rc.srmv2.2: srmv2.2.scripts.oracle +@@ -188,5 +185,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 -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-29 18:22:31.370112383 +0200 ++++ LCG-DM-1.7.3.1/test/srmv1/Imakefile 2009-09-29 18:23:27.096113816 +0200 +@@ -40,8 +40,7 @@ + srmv1Stress + + SOAP_OBJS = srmv1C.Osuf \ +- srmv1Client.Osuf \ +- stdsoap2.Osuf ++ srmv1Client.Osuf + + PROGSBIN = $(addprefix $(prefixsrmv1),$(PROGS) $(SCRIPTS)) + +@@ -52,9 +51,6 @@ + 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 + +-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c +- $(CC) -c -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c +- + install: $(PROGSBIN) + + install.man: +@@ -64,7 +60,7 @@ + + $(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS) + ### @echo "========================g" $@ +- $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) ++ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) -lgsoap + + COMM###################### CLEANING 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-29 18:22:31.371113951 +0200 ++++ LCG-DM-1.7.3.1/test/srmv2/Imakefile 2009-09-29 18:23:27.097113699 +0200 +@@ -40,8 +40,7 @@ + srmv2Stress + + SOAP_OBJS = srmv2C.Osuf \ +- srmv2Client.Osuf \ +- stdsoap2.Osuf ++ srmv2Client.Osuf + + PROGSBIN = $(addprefix $(prefixsrmv2),$(PROGS) $(SCRIPTS)) + +@@ -52,10 +51,6 @@ + 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 + +-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c +- $(CC) -c -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c +- +- + install: $(PROGSBIN) + + install.man: +@@ -65,7 +60,7 @@ + + $(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS) + ### @echo "========================g" $@ +- $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) ++ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) -lgsoap + + COMM###################### CLEANING 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-29 18:22:31.373114255 +0200 ++++ LCG-DM-1.7.3.1/test/srmv2.2/Imakefile 2009-09-29 18:23:27.098114879 +0200 +@@ -40,8 +40,7 @@ + srmv2Stress + + SOAP_OBJS = srmv2C.Osuf \ +- srmv2Client.Osuf \ +- stdsoap2.Osuf ++ srmv2Client.Osuf + + PROGSBIN = $(addprefix $(prefixsrmv2.2),$(PROGS) $(SCRIPTS)) + +@@ -52,9 +51,6 @@ + srm.v2.2.h: srm.v2.2.wsdl + $(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.2.wsdl + +-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c +- $(CC) -c -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c +- + install: $(PROGSBIN) + + install.man: +@@ -64,7 +60,7 @@ + + $(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS) + ### @echo "========================g" $@ +- $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) ++ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) -lgsoap + + COMM###################### CLEANING RULES ######################## + --- lfc-1.7.4.1.orig/debian/patches/lcgdm-withsoname.patch +++ lfc-1.7.4.1/debian/patches/lcgdm-withsoname.patch @@ -0,0 +1,74 @@ +diff -ur LCG-DM-1.7.3.1.orig/config/Imake.rules LCG-DM-1.7.3.1/config/Imake.rules +--- LCG-DM-1.7.3.1.orig/config/Imake.rules 2009-09-26 11:26:50.095112437 +0200 ++++ LCG-DM-1.7.3.1/config/Imake.rules 2009-09-26 11:27:12.522113078 +0200 +@@ -156,7 +156,16 @@ + dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\ + cp $? $@.rev @@\ + -rm $@ @@\ +- ln -s $?.rev $@ ++ ln -s $?.rev $@ @@\ ++ -rm $@.`echo rev|cut -f1 -d.` @@\ ++ ln -s $?.rev $@.`echo rev|cut -f1 -d.` ++#endif ++ ++#ifndef InstallPlugin ++#define InstallPlugin(libname,rev,dest) @@\ ++dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\ ++ -mv $@ dest/OLD$? @@\ ++ cp $? $@ + #endif + + #ifndef MakeDir +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-26 11:26:50.105114271 +0200 ++++ LCG-DM-1.7.3.1/security/Imakefile 2009-09-26 11:27:12.523114634 +0200 +@@ -214,11 +214,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,$(VERSION),$(LIB)) ++InstallPlugin(Csec_plugin_GSI,$(VERSION),$(LIB)) ++InstallPlugin(Csec_plugin_GSI_thread,$(VERSION),$(LIB)) ++InstallPlugin(Csec_plugin_KRB5,$(VERSION),$(LIB)) ++InstallPlugin(Csec_plugin_KRB4,$(VERSION),$(LIB)) + + MakeDir($(LIBMANDIR),root,bin,0755) + +diff -ur LCG-DM-1.7.3.1.orig/shlib/Imakefile LCG-DM-1.7.3.1/shlib/Imakefile +--- LCG-DM-1.7.3.1.orig/shlib/Imakefile 2009-09-26 11:26:50.106115448 +0200 ++++ LCG-DM-1.7.3.1/shlib/Imakefile 2009-09-26 11:27:38.631113134 +0200 +@@ -60,7 +60,9 @@ + @mkdir tmp + @for i in $^ ;\ + do (cd tmp; case $$i in *.a) $(AR) x ../$$i; rm -f $(SYMTABNAM) ;; esac) done +- (cd tmp; $(CC) $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) -L .. -llcgdm $(LIBCSEC)) ++ (cd tmp; $(CC) $(SHLIBLDFLAGS) -Wl,-soname,$@.`echo $(VERSION)|cut -f1 -d.` -o ../$@ *.o $(SHLIBREQLIBS) -L .. -llcgdm $(LIBCSEC)) ++ @-rm $@.`echo $(VERSION)|cut -f1 -d.` ++ @-ln -s $@ $@.`echo $(VERSION)|cut -f1 -d.` + @-rm -rf tmp + + liblcgdm.sl liblcgdm.so liblcgdm.dynlib: $(COMMONLIB) $(SECURITYLIB) +@@ -69,7 +71,9 @@ + @mkdir tmp + @for i in $^ ;\ + do (cd tmp; $(AR) x ../$$i; rm -f $(SYMTABNAM)) done +- (cd tmp; $(CC) $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) $(LIBCSEC)) ++ (cd tmp; $(CC) $(SHLIBLDFLAGS) -Wl,-soname,$@.`echo $(VERSION)|cut -f1 -d.` -o ../$@ *.o $(SHLIBREQLIBS) $(LIBCSEC)) ++ @-rm $@.`echo $(VERSION)|cut -f1 -d.` ++ @-ln -s $@ $@.`echo $(VERSION)|cut -f1 -d.` + @-rm -rf tmp + + libdpm.dll: $(RFIOLIB) $(NSLIB) $(DPMLIB) +@@ -101,6 +105,7 @@ + @echo cleaning in CurDir + -@RemoveFiles(FilesToClean) + -@rm -rf tmp > /dev/null 2>&1 ++ -@rm -f *.so.* + #endif + clobber: clean + --- lfc-1.7.4.1.orig/debian/patches/lcgdm-paths.patch +++ lfc-1.7.4.1/debian/patches/lcgdm-paths.patch @@ -0,0 +1,185 @@ +diff -ur lcgdm-1.7.4.1.orig/config/site.def lcgdm-1.7.4.1/config/site.def +--- lcgdm-1.7.4.1.orig/config/site.def 2009-11-18 15:48:47.000000000 +0100 ++++ lcgdm-1.7.4.1/config/site.def 2010-01-04 09:03:51.069024168 +0100 +@@ -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 + #if defined(_WIN32) + #define InstallPythonDir \\cern.ch\dfs\Applications\CERN\LFC\lib\python + #else +-#define InstallPythonDir $(prefix)/$(_lib)/python ++#define InstallPythonDir $(shell python -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,'$(prefix)')") + #endif + #define LibManDir $(prefix)/share/man/man3 + #define LibManSuffix 3 +@@ -119,7 +119,7 @@ + #define RemoteHostsList /etc/shift.remhosts + #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.1.orig/configure lcgdm-1.7.4.1/configure +--- lcgdm-1.7.4.1.orig/configure 2009-04-23 13:07:11.000000000 +0200 ++++ lcgdm-1.7.4.1/configure 2010-01-04 09:00:55.183020176 +0100 +@@ -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.1.orig/dpm/Imakefile lcgdm-1.7.4.1/dpm/Imakefile +--- lcgdm-1.7.4.1.orig/dpm/Imakefile 2009-08-25 11:27:18.000000000 +0200 ++++ lcgdm-1.7.4.1/dpm/Imakefile 2010-01-04 09:00:55.183020176 +0100 +@@ -238,14 +238,14 @@ + _dpm2.so \ + dpm2.py + IDPM_IFCE = $(PERLDIR) \ +- $(PYTHONDIR)$(PYTHON_VERSION)/site-packages \ ++ $(PYTHONDIR) \ + FileName($(BIN),ProgramTargetName(dpm-listspaces)) \ + FileName($(PERLDIR),dpm.so) \ + FileName($(PERLDIR),dpm.pm) \ +- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_dpm.so) \ +- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,dpm.py) \ +- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_dpm2.so) \ +- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,dpm2.py) ++ FileName($(PYTHONDIR),_dpm.so) \ ++ FileName($(PYTHONDIR),dpm.py) \ ++ FileName($(PYTHONDIR),_dpm2.so) \ ++ FileName($(PYTHONDIR),dpm2.py) + #endif + + DPMLIB_OBJS = dpm_abortfiles.Osuf \ +@@ -429,10 +429,10 @@ + + InstallTarget(dpm.so,root,root,0755,$(PERLDIR)) + InstallTarget(dpm.pm,root,root,0644,$(PERLDIR)) +-InstallTarget(_dpm.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages) +-InstallTarget(dpm.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages) +-InstallTarget(_dpm2.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages) +-InstallTarget(dpm2.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages) ++InstallTarget(_dpm.so,root,root,0755,$(PYTHONDIR)) ++InstallTarget(dpm.py,root,root,0644,$(PYTHONDIR)) ++InstallTarget(_dpm2.so,root,root,0755,$(PYTHONDIR)) ++InstallTarget(dpm2.py,root,root,0644,$(PYTHONDIR)) + InstallProgram(dpm-listspaces,$(BIN),root,bin,755) + + MakeDir($(BIN),root,bin,0755) +@@ -445,7 +445,7 @@ + + #if BuildInterfaces + MakeDir($(PERLDIR),root,root,0755) +-MakeDir($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,root,root,0755) ++MakeDir($(PYTHONDIR),root,root,0755) + #endif + + install.man: $(MANDIRS) $(MANPAGESCLIENT) $(MANPAGESSERVER) $(MANPAGESIFCE) +diff -ur lcgdm-1.7.4.1.orig/ns/Imakefile.lfc lcgdm-1.7.4.1/ns/Imakefile.lfc +--- lcgdm-1.7.4.1.orig/ns/Imakefile.lfc 2009-08-19 15:57:26.000000000 +0200 ++++ lcgdm-1.7.4.1/ns/Imakefile.lfc 2010-01-04 09:00:55.184020930 +0100 +@@ -236,17 +236,17 @@ + _lfc2thr.so\ + lfc2thr.py + ILFC_IFCE = $(PERLDIR) \ +- $(PYTHONDIR)$(PYTHON_VERSION)/site-packages \ ++ $(PYTHONDIR) \ + FileName($(PERLDIR),lfc.so) \ + FileName($(PERLDIR),lfc.pm) \ +- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_lfc.so) \ +- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,lfc.py) \ +- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_lfcthr.so) \ +- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,lfcthr.py) \ +- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_lfc2.so) \ +- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,lfc2.py) \ +- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_lfc2thr.so) \ +- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,lfc2thr.py) ++ FileName($(PYTHONDIR),_lfc.so) \ ++ FileName($(PYTHONDIR),lfc.py) \ ++ FileName($(PYTHONDIR),_lfcthr.so) \ ++ FileName($(PYTHONDIR),lfcthr.py) \ ++ FileName($(PYTHONDIR),_lfc2.so) \ ++ FileName($(PYTHONDIR),lfc2.py) \ ++ FileName($(PYTHONDIR),_lfc2thr.so) \ ++ FileName($(PYTHONDIR),lfc2thr.py) + #endif + + NSDAEMON_OBJS = Cns_main.Osuf \ +@@ -471,8 +471,8 @@ + + InstallTarget(lfc.so,root,root,0755,$(PERLDIR)) + InstallTarget(lfc.pm,root,root,0644,$(PERLDIR)) +-InstallTarget(_lfc.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages) +-InstallTarget(lfc.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages) ++InstallTarget(_lfc.so,root,root,0755,$(PYTHONDIR)) ++InstallTarget(lfc.py,root,root,0644,$(PYTHONDIR)) + + _lfc2.so lfc2.py : lfc2.i ../h/lfc_api.h ../h/Cns_api.h + RemoveFiles(lfc2_wrap.o lfc2_wrap.c) +@@ -480,8 +480,8 @@ + $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2_wrap.c + $(LD) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(LIBS) -llfc + +-InstallTarget(_lfc2.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages) +-InstallTarget(lfc2.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages) ++InstallTarget(_lfc2.so,root,root,0755,$(PYTHONDIR)) ++InstallTarget(lfc2.py,root,root,0644,$(PYTHONDIR)) + + _lfcthr.so lfcthr.py : lfcthr.i ../h/lfc_api.h ../h/Cns_api.h + RemoveFiles(lfcthr_wrap.o lfcthr_wrap.c) +@@ -489,8 +489,8 @@ + $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfcthr_wrap.c + $(LD) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(LIBS) -llfc + +-InstallTarget(_lfcthr.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages) +-InstallTarget(lfcthr.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages) ++InstallTarget(_lfcthr.so,root,root,0755,$(PYTHONDIR)) ++InstallTarget(lfcthr.py,root,root,0644,$(PYTHONDIR)) + + _lfc2thr.so lfc2thr.py : lfc2thr.i ../h/lfc_api.h ../h/Cns_api.h + RemoveFiles(lfc2thr_wrap.o lfc2thr_wrap.c) +@@ -498,12 +498,12 @@ + $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2thr_wrap.c + $(LD) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(LIBS) -llfc + +-InstallTarget(_lfc2thr.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages) +-InstallTarget(lfc2thr.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages) ++InstallTarget(_lfc2thr.so,root,root,0755,$(PYTHONDIR)) ++InstallTarget(lfc2thr.py,root,root,0644,$(PYTHONDIR)) + + #if BuildInterfaces + MakeDir($(PERLDIR),root,root,0755) +-MakeDir($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,root,root,0755) ++MakeDir($(PYTHONDIR),root,root,0755) + #endif + + install.man: $(MANDIRS) $(MANPAGESCLIENT) $(MANPAGESLIBRARY) $(MANPAGESSERVER) $(MANPAGESIFCE) --- lfc-1.7.4.1.orig/debian/patches/lcgdm-usr.patch +++ lfc-1.7.4.1/debian/patches/lcgdm-usr.patch @@ -0,0 +1,334 @@ +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 +@@ -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) ++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) ++GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common ++GGC_LIB=-lglobus_gass_copy -lglobus_ftp_client + 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 @@ + 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) ++GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common ++GGC_LIB=-lglobus_gass_copy -lglobus_ftp_client + 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 = -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 @@ + #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 + 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 + #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_LIB=-lvomsapi + #endif + #define GSIMech GSI + #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 + #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 + 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 = -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 + 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 = -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 + 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 = -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 @@ + #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 ############################## + --- lfc-1.7.4.1.orig/debian/patches/lcgdm-shliblink.patch +++ lfc-1.7.4.1/debian/patches/lcgdm-shliblink.patch @@ -0,0 +1,519 @@ +diff -ur LCG-DM-1.7.3.1.orig/config/Imake.rules LCG-DM-1.7.3.1/config/Imake.rules +--- LCG-DM-1.7.3.1.orig/config/Imake.rules 2009-09-28 12:54:22.901113800 +0200 ++++ LCG-DM-1.7.3.1/config/Imake.rules 2009-09-28 12:54:45.590114010 +0200 +@@ -91,7 +91,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 + #endif + + #ifndef MakeSubdirs +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-28 12:54:19.843114544 +0200 ++++ LCG-DM-1.7.3.1/dicomcopy/Imakefile 2009-09-28 12:56:04.060111626 +0200 +@@ -27,7 +27,7 @@ + #if SOLARIS + LIBS = -L../shlib -ldpm -llcgdm -lsocket -lnsl -ldl + #else +-LIBS = -L../shlib -ldpm -llcgdm $(LIBCSEC) -ldl ++LIBS = -L../shlib -ldpm -llcgdm -ldl + #endif + SPOOL = DicomcopySpool + LOGFILE = FileName($(SPOOL),log) +@@ -42,7 +42,7 @@ + MYSFLG = -DUSE_MYSQL + MYSQL_LOCATION = MySQLLocation + MYSINC = -I$(MYSQL_LOCATION)/include/mysql +-LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm ++LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient + DBCREAT = create_dicomcopy_tables_mysql.sql + #else + #if UsePostgres +@@ -142,7 +142,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 + + install: $(BIN) $(DPMSHAREDIR) $(SYSCONFDIR) $(IPROGS_D) $(SPOOL) + +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-08-25 11:27:18.000000000 +0200 ++++ LCG-DM-1.7.3.1/dli/Imakefile 2009-09-28 12:54:45.591115172 +0200 +@@ -20,9 +20,9 @@ + SOAPFLG = -DWITH_IPV6 + INCLUDES = FileName(..,h) + #if SOLARIS +-LIBS = -L../lib -llfc -ldl -lsocket -lnsl ++LIBS = -L../shlib -llfc -ldl -lsocket -lnsl + #else +-LIBS = -L../lib -llfc -ldl ++LIBS = -L../shlib -llfc + #endif + SPOOL = DliSpool + LOGFILE = FileName($(SPOOL),log) +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-28 12:54:19.844114936 +0200 ++++ LCG-DM-1.7.3.1/dpm/Imakefile 2009-09-28 14:13:49.889114235 +0200 +@@ -10,8 +10,9 @@ + 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}')") ++PYTHON_LIB=-L$(shell python -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBDEST')")/config -lpython$(PYTHON_VERSION) $(shell python -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBS'), sysconfig.get_config_var('SYSLIBS')") + INCLUDE_PERL=-I$(shell perl -MConfig -e 'print $$Config{archlibexp}, "/CORE";') ++PERL_LIB=-L$(shell perl -MConfig -e 'print $$Config{archlibexp}, "/CORE";') -lperl $(shell perl -MConfig -e 'print $$Config{perllibs};') + SWIG_LOCATION = SwigLocation + SWIG = SWIG_LIB=SwigLib $(SWIG_LOCATION)/bin/swig + #endif +@@ -41,12 +42,12 @@ + #endif + INCLUDES = FileName(..,h) + #if SOLARIS +-LIBS = -L../lib -ldpm $(LIBCSEC) -lsocket -lnsl ++LIBS = -L../shlib -ldpm $(LIBCSEC) -lsocket -lnsl + #else + #if _WIN32 + LIBS = ..\lib\dpm.lib wsock32.lib advapi32.lib + #else +-LIBS = -L../lib -ldpm $(LIBCSEC) ++LIBS = -L../shlib -ldpm + #endif + #endif + LIBUUID = +@@ -77,7 +78,7 @@ + MYSFLG = -DUSE_MYSQL + MYSQL_LOCATION = MySQLLocation + MYSINC = -I$(MYSQL_LOCATION)/include/mysql +-LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm ++LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient + DBCREAT = create_dpm_tables_mysql.sql + #else + #if UsePostgres +@@ -413,19 +414,19 @@ + RemoveFiles(dpm_wrap.o dpm_wrap.c) + $(SWIG) -perl -I$(INCLUDES) -DNSTYPE_DPNS dpm.i + $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PERL) -Dbool=char -D_GNU_SOURCE -DNSTYPE_DPNS dpm_wrap.c +- $(CC) $(SHLIBLDFLAGS) -o dpm.so dpm_wrap.o $(LIBS) -ldpm ++ $(CC) $(SHLIBLDFLAGS) -o dpm.so dpm_wrap.o $(PERL_LIB) $(LIBS) -llcgdm + + _dpm.so dpm.py : 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) -llcgdm + + _dpm2.so dpm2.py : 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) -llcgdm + + InstallTarget(dpm.so,root,root,0755,$(PERLDIR)) + InstallTarget(dpm.pm,root,root,0644,$(PERLDIR)) +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-08-25 11:27:18.000000000 +0200 ++++ LCG-DM-1.7.3.1/dpmcopy/Imakefile 2009-09-28 12:54:45.594113319 +0200 +@@ -37,9 +37,9 @@ + SOAPFLG = -DWITH_IPV6 + INCLUDES = FileName(..,h) + #if SOLARIS +-LIBS = -L../lib -ldpm $(LIBCSEC) -lsocket -lnsl ++LIBS = -L../shlib -ldpm $(LIBCSEC) -lsocket -lnsl + #else +-LIBS = -L../lib -ldpm $(LIBCSEC) ++LIBS = -L../shlib -ldpm + #endif + SPOOL = DpmcopySpool + LOGFILE = FileName($(SPOOL),log) +@@ -53,7 +53,7 @@ + MYSFLG = -DUSE_MYSQL + MYSQL_LOCATION = MySQLLocation + MYSINC = -I$(MYSQL_LOCATION)/include/mysql +-LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm ++LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient + #else + #if UsePostgres + DBOBJS = dpm_libpq_ifce.Osuf +@@ -137,7 +137,7 @@ + dpmcopyd: $(SRV_OBJS) $(DEPLIB) + $(MAKE) -f oralink.mk dpmcopyd SRV_OBJS="$(SRV_OBJS)" LIBS="$(GGC_LIB) $(LIBS) $(SECLIB)" + #else +-NormalProgramTarget(dpmcopyd,$(SRV_OBJS), $(DEPLIB), $(GGC_LIB) $(LIBS) $(SECLIB) $(LIBORA) $(LIBMYS) $(LIBPOS)) ++NormalProgramTarget(dpmcopyd,$(SRV_OBJS),, $(GGC_LIB) $(LIBS) $(SECLIB) $(LIBORA) $(LIBMYS) $(LIBPOS)) + #endif + #if UseOracle + rc.dpmcopyd: dpmcopyd.scripts.oracle +diff -ur LCG-DM-1.7.3.1.orig/lib/Imakefile LCG-DM-1.7.3.1/lib/Imakefile +--- LCG-DM-1.7.3.1.orig/lib/Imakefile 2009-08-25 11:27:18.000000000 +0200 ++++ LCG-DM-1.7.3.1/lib/Imakefile 2009-09-28 12:54:45.604114261 +0200 +@@ -34,7 +34,9 @@ + install: $(LIB) FileName($(LIB),LibraryTargetName(dpm)) + + export: $(EXPORTLIB)/libdpm.a +-#else ++#endif ++#endif ++ + COMM Libraries to include in LibraryTargetame(lcgdm) + + all: LibraryTargetName(lcgdm) +@@ -42,16 +44,14 @@ + install: $(LIB) FileName($(LIB),LibraryTargetName(lcgdm)) + + export: $(EXPORTLIB)/liblcgdm.a +-#endif +-#endif + + exportman: + + exportshr: + +-liblfc.a: $(COMMONLIB) $(NSLIB) $(SECURITYLIB) ++liblfc.a: $(NSLIB) + +-libdpm.a: $(COMMONLIB) $(RFIOLIB) $(NSLIB) $(DPMLIB) $(SECURITYLIB) ++libdpm.a: $(RFIOLIB) $(NSLIB) $(DPMLIB) + + liblcgdm.a: $(COMMONLIB) $(SECURITYLIB) + +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-08-25 11:27:18.000000000 +0200 ++++ LCG-DM-1.7.3.1/ns/Imakefile 2009-09-28 12:54:45.605114226 +0200 +@@ -36,27 +36,27 @@ + INCLUDES = FileName(..,h) + TOPLIBRARYNAME = TopLibraryName + #if _AIX +-LIBS = -L../lib -l$(TOPLIBRARYNAME) ++LIBS = -L../shlib -l$(TOPLIBRARYNAME) + #else + #if defined(__alpha) && defined(__osf__) +-LIBS = -no_so -L../lib -l$(TOPLIBRARYNAME) -so_archive ++LIBS = -no_so -L../shlib -l$(TOPLIBRARYNAME) -so_archive + #else + #if hpux +-LIBS = -L../lib -l$(TOPLIBRARYNAME) ++LIBS = -L../shlib -l$(TOPLIBRARYNAME) + #else + #if linux +-LIBS = -L../lib -l$(TOPLIBRARYNAME) $(LIBCSEC) -lnsl ++LIBS = -L../shlib -l$(TOPLIBRARYNAME) + #else + #if sgi +-LIBS = -L../lib -l$(TOPLIBRARYNAME) ++LIBS = -L../shlib -l$(TOPLIBRARYNAME) + #else + #if SOLARIS +-LIBS = -L../lib -l$(TOPLIBRARYNAME) -lsocket -lnsl ++LIBS = -L../shlib -l$(TOPLIBRARYNAME) -lsocket -lnsl + #else + #if _WIN32 + LIBS = ..\lib\$(TOPLIBRARYNAME).lib wsock32.lib advapi32.lib + #else +-LIBS = -L../lib -l$(TOPLIBRARYNAME) ++LIBS = -L../shlib -l$(TOPLIBRARYNAME) + #endif + #endif + #endif +@@ -71,7 +71,7 @@ + #if _WIN32 + NSLIB = ns.lib + #else +-NSLIB = -L. -lns ++NSLIB = + #endif + SPOOL = NsSpool + LOGFILE = FileName($(SPOOL),log) +@@ -98,7 +98,7 @@ + MYSFLG = -DUSE_MYSQL + MYSQL_LOCATION = MySQLLocation + MYSINC = -I$(MYSQL_LOCATION)/include/mysql +-LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm ++LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient + #else + #if UsePostgres + DBOBJS = Cns_libpq_ifce.Osuf +diff -ur LCG-DM-1.7.3.1.orig/ns/Imakefile.lfc LCG-DM-1.7.3.1/ns/Imakefile.lfc +--- LCG-DM-1.7.3.1.orig/ns/Imakefile.lfc 2009-09-28 12:54:19.846114046 +0200 ++++ LCG-DM-1.7.3.1/ns/Imakefile.lfc 2009-09-28 14:25:26.831112579 +0200 +@@ -24,9 +24,10 @@ + 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}')") ++PYTHON_LIB=-L$(shell python -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBDEST')")/config -lpython$(PYTHON_VERSION) $(shell python -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBS'), sysconfig.get_config_var('SYSLIBS')") + INCLUDE_PERL=-I$(shell perl -MConfig -e 'print $$Config{archlibexp}, "/CORE";') + SWIG_LOCATION = SwigLocation ++PERL_LIB=-L$(shell perl -MConfig -e 'print $$Config{archlibexp}, "/CORE";') -lperl $(shell perl -MConfig -e 'print $$Config{perllibs};') + SWIG = SWIG_LIB=SwigLib $(SWIG_LOCATION)/bin/swig + #endif + +@@ -362,9 +363,9 @@ + NormalProgramTarget(lfc-chown,nschown.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS)) + #if UseOracle && !defined(_WIN32) + lfcdaemon: $(NSDAEMON_OBJS) $(DEPLIB) +- $(MAKE) -f oralink.mk lfcdaemon NSDAEMON_OBJS="$(NSDAEMON_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(MTLDLIBS) $(LIBUUID)" ++ $(MAKE) -f oralink.mk lfcdaemon NSDAEMON_OBJS="$(NSDAEMON_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="-L../shlib -llcgdm $(MTLDLIBS) $(LIBUUID)" + #else +-NormalProgramTarget(lfcdaemon,$(NSDAEMON_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) $(LIBUUID)) ++NormalProgramTarget(lfcdaemon,$(NSDAEMON_OBJS), $(DEPLIB), $(MTLDFLAGS) -L../shlib -llcgdm $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) $(LIBUUID)) + #endif + NormalProgramTarget(lfc-delcomment,nsdelcomment.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS)) + NormalProgramTarget(lfc-entergrpmap,nsentergrpmap.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS)) +@@ -461,13 +462,13 @@ + RemoveFiles(lfc_wrap.o lfc_wrap.c) + $(SWIG) -perl -I$(INCLUDES) -DNSTYPE_LFC lfc.i + $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PERL) -Dbool=char -D_GNU_SOURCE lfc_wrap.c +- $(CC) $(SHLIBLDFLAGS) -o lfc.so lfc_wrap.o $(LIBS) -llfc ++ $(CC) $(SHLIBLDFLAGS) -o lfc.so lfc_wrap.o $(PERL_LIB) $(LIBS) -llcgdm + + _lfc.so lfc.py : 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) -llcgdm + + InstallTarget(lfc.so,root,root,0755,$(PERLDIR)) + InstallTarget(lfc.pm,root,root,0644,$(PERLDIR)) +@@ -478,7 +479,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) -llcgdm + + InstallTarget(_lfc2.so,root,root,0755,$(PYTHONDIR)) + InstallTarget(lfc2.py,root,root,0644,$(PYTHONDIR)) +@@ -487,7 +488,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) -llcgdm + + InstallTarget(_lfcthr.so,root,root,0755,$(PYTHONDIR)) + InstallTarget(lfcthr.py,root,root,0644,$(PYTHONDIR)) +@@ -496,7 +497,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) -llcgdm + + InstallTarget(_lfc2thr.so,root,root,0755,$(PYTHONDIR)) + InstallTarget(lfc2thr.py,root,root,0644,$(PYTHONDIR)) +diff -ur LCG-DM-1.7.3.1.orig/rfio/Imakefile LCG-DM-1.7.3.1/rfio/Imakefile +--- LCG-DM-1.7.3.1.orig/rfio/Imakefile 2009-08-25 11:27:18.000000000 +0200 ++++ LCG-DM-1.7.3.1/rfio/Imakefile 2009-09-28 12:54:45.608112847 +0200 +@@ -118,24 +118,24 @@ + #endif + FFLAGS = $(FFOPTFLAGS) $(FPPUFL) + #if defined(__alpha) && defined(__osf__) +-LDLIBS = -no_so -L../lib -l$(TOPLIBRARYNAME) -so_archive ++LDLIBS = -no_so -L../shlib -l$(TOPLIBRARYNAME) -so_archive + #else + #if linux +-LDLIBS = -L../lib -l$(TOPLIBRARYNAME) $(LIBCSEC) -lnsl $(MTLDLIBS) ++LDLIBS = -L../shlib -l$(TOPLIBRARYNAME) $(MTLDLIBS) + #else + #if SOLARIS +-LDLIBS = -L../lib -l$(TOPLIBRARYNAME) -lsocket -lnsl ++LDLIBS = -L../shlib -l$(TOPLIBRARYNAME) -lsocket -lnsl + #else + #if sgi +-LDLIBS = -L../lib -l$(TOPLIBRARYNAME) $(MTLDLIBS) ++LDLIBS = -L../shlib -l$(TOPLIBRARYNAME) $(MTLDLIBS) + #else + #if __Lynx__ +-LDLIBS = -L../lib -l$(TOPLIBRARYNAME) -lnsl -lbsd ++LDLIBS = -L../shlib -l$(TOPLIBRARYNAME) -lnsl -lbsd + #else + #if _WIN32 + LDLIBS = ..\lib\$(TOPLIBRARYNAME).lib ws2_32.lib advapi32.lib mpr.lib + #else +-LDLIBS = -L../lib -l$(TOPLIBRARYNAME) $(MTLDLIBS) ++LDLIBS = -L../shlib -l$(TOPLIBRARYNAME) $(MTLDLIBS) + #endif + #endif + #endif +@@ -145,7 +145,7 @@ + #if _WIN32 + RFIOLIB = rfio.lib + #else +-RFIOLIB = -L. -lrfio ++RFIOLIB = + #endif + LIBS = $(OPTLIBS) + +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-28 12:54:22.902113991 +0200 ++++ LCG-DM-1.7.3.1/security/Imakefile 2009-09-28 15:21:59.544112450 +0200 +@@ -49,9 +49,9 @@ + #define GSIMech GSI + #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) $(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 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 + #else + #define GSIMech + #endif +diff -ur LCG-DM-1.7.3.1.orig/shlib/Imakefile LCG-DM-1.7.3.1/shlib/Imakefile +--- LCG-DM-1.7.3.1.orig/shlib/Imakefile 2009-09-28 12:54:22.903114885 +0200 ++++ LCG-DM-1.7.3.1/shlib/Imakefile 2009-09-28 12:54:45.609112925 +0200 +@@ -35,7 +35,6 @@ + install: $(LIB) FileName($(LIB),SharedLibraryTargetName(dpm)) + + export: $(EXPORTLIB)/SharedLibraryTargetName(dpm) +-#else + #endif + #endif + +@@ -60,7 +59,7 @@ + @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.` + @-rm -rf tmp +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 2006-12-19 21:17:29.000000000 +0100 ++++ LCG-DM-1.7.3.1/socket/dpmcli/module.mk 2009-09-28 12:54:45.619110223 +0200 +@@ -73,7 +73,7 @@ + ##6LIBDPM := dpmmain/../lib/libdpm.a + ##6LIBPROG := goputils/libgoputils.a + ##??LD_DPM += -pthread +-##CSECLD_DPM += -Lgoputils -lgoputils -L../lib -ldpm -L/usr/local/lib -lCsec -lshift ++##CSECLD_DPM += -Lgoputils -lgoputils -L../shlib -ldpm -L/usr/local/lib -lCsec -lshift + ##CSECLD_DPM += -lCsec -ldl + + GLOBUS_LOCATION=/opt/globus +@@ -88,8 +88,8 @@ + + LIBCSEC += -L/usr/local/lib -ldl + +-OLD_DPM += -Lgoputils -lgoputils -L../lib -ldpm -L/usr/local/lib -ldl +-LD_DPM += -Lgoputils -lgoputils -L../lib -ldpm $(LIBCSEC) ++OLD_DPM += -Lgoputils -lgoputils -L../shlib -ldpm ++LD_DPM += -Lgoputils -lgoputils -L../shlib -ldpm + + ##??LD_DPM += -lnsl -luuid + LIBDPM := ../lib/libdpm.a +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-08-25 11:27:18.000000000 +0200 ++++ LCG-DM-1.7.3.1/srmv1/Imakefile 2009-09-28 12:54:45.620115020 +0200 +@@ -41,9 +41,9 @@ + SOAPFLG = -DWITH_IPV6 + INCLUDES = FileName(..,h) + #if SOLARIS +-LIBS = -L../lib -ldpm $(LIBCSEC) -lsocket -lnsl ++LIBS = -L../shlib -ldpm $(LIBCSEC) -lsocket -lnsl + #else +-LIBS = -L../lib -ldpm $(LIBCSEC) ++LIBS = -L../shlib -ldpm + #endif + #ifndef darwin + LIBS += -luuid +@@ -60,7 +60,7 @@ + MYSFLG = -DUSE_MYSQL + MYSQL_LOCATION = MySQLLocation + MYSINC = -I$(MYSQL_LOCATION)/include/mysql +-LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm ++LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient + #else + #if UsePostgres + DBOBJS = ../dpm/dpm_libpq_ifce.Osuf +@@ -117,7 +117,7 @@ + srmv1: $(SRV_OBJS) $(DEPLIB) + $(MAKE) -f oralink.mk srmv1 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(SECLIB) $(MTLDLIBS)" + #else +-NormalProgramTarget(srmv1,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS)) ++NormalProgramTarget(srmv1,$(SRV_OBJS),, $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS)) + #endif + #if UseOracle + rc.srmv1: srmv1.scripts.oracle +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-08-25 11:27:18.000000000 +0200 ++++ LCG-DM-1.7.3.1/srmv2/Imakefile 2009-09-28 12:54:45.621114520 +0200 +@@ -41,9 +41,9 @@ + SOAPFLG = -DWITH_IPV6 + INCLUDES = FileName(..,h) + #if SOLARIS +-LIBS = -L../lib -ldpm $(LIBCSEC) -lsocket -lnsl ++LIBS = -L../shlib -ldpm $(LIBCSEC) -lsocket -lnsl + #else +-LIBS = -L../lib -ldpm $(LIBCSEC) ++LIBS = -L../shlib -ldpm + #endif + #ifndef darwin + LIBS += -luuid +@@ -60,7 +60,7 @@ + MYSFLG = -DUSE_MYSQL + MYSQL_LOCATION = MySQLLocation + MYSINC = -I$(MYSQL_LOCATION)/include/mysql +-LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm ++LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient + #else + #if UsePostgres + DBOBJS = ../dpm/dpm_libpq_ifce.Osuf +@@ -121,7 +121,7 @@ + srmv2: $(SRV_OBJS) $(DEPLIB) + $(MAKE) -f oralink.mk srmv2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(SECLIB) $(MTLDLIBS)" + #else +-NormalProgramTarget(srmv2,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS)) ++NormalProgramTarget(srmv2,$(SRV_OBJS),, $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS)) + #endif + #if UseOracle + rc.srmv2: srmv2.scripts.oracle +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-08-25 11:27:18.000000000 +0200 ++++ LCG-DM-1.7.3.1/srmv2.2/Imakefile 2009-09-28 12:54:45.623112868 +0200 +@@ -42,9 +42,9 @@ + INCLUDES = FileName(..,h) + BACKEND_LIBS = DepLibraryTargetName(dpmcopy,dpmcopy) + #if SOLARIS +-LIBS = -L../lib -ldpm $(LIBCSEC) -lsocket -lnsl ++LIBS = -L../shlib -ldpm $(LIBCSEC) -lsocket -lnsl + #else +-LIBS = -L../lib -ldpm $(LIBCSEC) ++LIBS = -L../shlib -ldpm + #endif + #ifndef darwin + LIBS += -luuid +@@ -61,7 +61,7 @@ + MYSFLG = -DUSE_MYSQL + MYSQL_LOCATION = MySQLLocation + MYSINC = -I$(MYSQL_LOCATION)/include/mysql +-LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm ++LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient + #else + #if UsePostgres + DBOBJS = ../dpm/dpm_libpq_ifce.Osuf +@@ -123,7 +123,7 @@ + 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)" + #else +-NormalProgramTarget(srmv2.2,$(SRV_OBJS), $(DEPLIB) $(BACKEND_LIBS), $(MTLDFLAGS) $(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS)) ++NormalProgramTarget(srmv2.2,$(SRV_OBJS), $(BACKEND_LIBS), $(MTLDFLAGS) $(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS)) + #endif + #if UseOracle + rc.srmv2.2: srmv2.2.scripts.oracle --- lfc-1.7.4.1.orig/debian/patches/lcgdm-rules.patch +++ lfc-1.7.4.1/debian/patches/lcgdm-rules.patch @@ -0,0 +1,129 @@ +diff -ur LCG-DM-1.7.3.1.orig/config/Imake.rules LCG-DM-1.7.3.1/config/Imake.rules +--- LCG-DM-1.7.3.1.orig/config/Imake.rules 2009-09-30 06:22:41.070112081 +0200 ++++ LCG-DM-1.7.3.1/config/Imake.rules 2009-09-30 06:22:50.713111985 +0200 +@@ -172,7 +172,7 @@ + #define MakeDir(dirname,owner,group,mode) @@\ + dirname: @@\ + -mkdir -p $@ @@\ +- if [ `$(IDCMD) -u` = 0 ]; then \ @@\ ++ -if [ `$(IDCMD) -u` = 0 ]; then \ @@\ + chown owner $@ ; \ @@\ + chgrp group $@ ; \ @@\ + fi @@\ +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-30 06:22:41.319113299 +0200 ++++ LCG-DM-1.7.3.1/dpm/Imakefile 2009-09-30 06:22:50.715114216 +0200 +@@ -410,19 +410,22 @@ + InstallTarget($(DBCREAT),root,bin,0644,$(DPMSHAREDIR)) + + COMM# -D_GNU_SOURCE is required by Perl using glibc (LGPL v2.1) +-dpm.so dpm.pm : dpm.i ../h/dpm_api.h ../h/dpns_api.h ../h/Cns_api.h +- RemoveFiles(dpm_wrap.o dpm_wrap.c) +- $(SWIG) -perl -I$(INCLUDES) -DNSTYPE_DPNS dpm.i +- $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) $(INCLUDE_PERL) -Dbool=char -D_GNU_SOURCE -DNSTYPE_DPNS dpm_wrap.c +- $(CC) $(SHLIBLDFLAGS) -o dpm.so dpm_wrap.o $(PERL_LIB) $(LIBS) -llcgdm ++dpm.pm : dpm.so ++dpm.so : dpm.i ../h/dpm_api.h ../h/dpns_api.h ../h/Cns_api.h ++ 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 $(PERL_LIB) $(LIBS) -llcgdm + +-_dpm.so dpm.py : dpm.i ../h/dpm_api.h ../h/dpns_api.h ../h/Cns_api.h ++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 $(PYTHON_LIB) $(LIBS) -llcgdm + +-_dpm2.so dpm2.py : dpm2.i ../h/dpm_api.h ../h/dpns_api.h ../h/Cns_api.h ++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 +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-30 06:22:41.215113122 +0200 ++++ LCG-DM-1.7.3.1/dpmcopy/Imakefile 2009-09-30 06:22:50.716114850 +0200 +@@ -180,7 +180,7 @@ + COMM###################### CLEANING RULES ######################## + + clean: +- -@RemoveFiles(*.Osuf *H.h *Object.h *Proxy.h *Stub.h *C.c *Client.c *Lib.c *Server.c *.nsmap *.xml srm.v2.2.h) ++ -@RemoveFiles(FilesToClean *H.h *Object.h *Proxy.h *Stub.h *C.c *Client.c *Lib.c *Server.c *.nsmap *.xml srm.v2.2.h) + + clobber: clean + -@RemoveFiles($(SERVER)) +diff -ur LCG-DM-1.7.3.1.orig/ns/Imakefile.lfc LCG-DM-1.7.3.1/ns/Imakefile.lfc +--- LCG-DM-1.7.3.1.orig/ns/Imakefile.lfc 2009-09-30 06:22:41.155114252 +0200 ++++ LCG-DM-1.7.3.1/ns/Imakefile.lfc 2009-09-30 06:22:50.717115259 +0200 +@@ -458,13 +458,15 @@ + InstallTarget($(DBCREAT),root,bin,0644,$(NSSHAREDIR)) + + COMM# -D_GNU_SOURCE is required by Perl using glibc (LGPL v2.1) +-lfc.so lfc.pm : lfc.i ../h/lfc_api.h ../h/Cns_api.h +- RemoveFiles(lfc_wrap.o lfc_wrap.c) +- $(SWIG) -perl -I$(INCLUDES) -DNSTYPE_LFC lfc.i +- $(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PERL) -Dbool=char -D_GNU_SOURCE lfc_wrap.c +- $(CC) $(SHLIBLDFLAGS) -o lfc.so lfc_wrap.o $(PERL_LIB) $(LIBS) -llcgdm ++lfc.pm : lfc.so ++lfc.so : lfc.i ../h/lfc_api.h ../h/Cns_api.h ++ 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 $(PERL_LIB) $(LIBS) -llcgdm + +-_lfc.so lfc.py : lfc.i ../h/lfc_api.h ../h/Cns_api.h ++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 +@@ -475,7 +477,8 @@ + InstallTarget(_lfc.so,root,root,0755,$(PYTHONDIR)) + InstallTarget(lfc.py,root,root,0644,$(PYTHONDIR)) + +-_lfc2.so lfc2.py : lfc2.i ../h/lfc_api.h ../h/Cns_api.h ++lfc2.py : _lfc2.so ++_lfc2.so : lfc2.i ../h/lfc_api.h ../h/Cns_api.h + 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 +@@ -484,7 +487,8 @@ + InstallTarget(_lfc2.so,root,root,0755,$(PYTHONDIR)) + InstallTarget(lfc2.py,root,root,0644,$(PYTHONDIR)) + +-_lfcthr.so lfcthr.py : lfcthr.i ../h/lfc_api.h ../h/Cns_api.h ++lfcthr.py : _lfcthr.so ++_lfcthr.so : lfcthr.i ../h/lfc_api.h ../h/Cns_api.h + 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 +@@ -493,7 +497,8 @@ + InstallTarget(_lfcthr.so,root,root,0755,$(PYTHONDIR)) + InstallTarget(lfcthr.py,root,root,0644,$(PYTHONDIR)) + +-_lfc2thr.so lfc2thr.py : lfc2thr.i ../h/lfc_api.h ../h/Cns_api.h ++lfc2thr.py : _lfc2thr.so ++_lfc2thr.so : lfc2thr.i ../h/lfc_api.h ../h/Cns_api.h + 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 +diff -ur LCG-DM-1.7.3.1.orig/rfio/Imakefile LCG-DM-1.7.3.1/rfio/Imakefile +--- LCG-DM-1.7.3.1.orig/rfio/Imakefile 2009-09-30 06:22:41.274112041 +0200 ++++ LCG-DM-1.7.3.1/rfio/Imakefile 2009-09-30 06:23:47.387114033 +0200 +@@ -622,12 +622,7 @@ + + clobber: clean + @echo clobbering in CurDir +- -@RemoveFiles(ProgramTargetName(rfcat) ProgramTargetName(rfchmod)) +- -@RemoveFiles(ProgramTargetName(rfcp) ProgramTargetName(rfstat)) +- -@RemoveFiles(ProgramTargetName(rfrm) ProgramTargetName(rfdf)) +- -@RemoveFiles(ProgramTargetName(rfdir)) +- -@RemoveFiles(ProgramTargetName(rfmkdir) ProgramTargetName(rfrename)) +- -@RemoveFiles(ProgramTargetName(rfiod) $(DUMPLOG)) ++ -@RemoveFiles($(CLIENT) $(SERVER) $(DUMPLOG)) + + #if _WIN32 + depend: --- lfc-1.7.4.1.orig/debian/patches/lcgdm-installpermissions.patch +++ lfc-1.7.4.1/debian/patches/lcgdm-installpermissions.patch @@ -0,0 +1,138 @@ +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-30 06:27:54.379113669 +0200 ++++ LCG-DM-1.7.3.1/dicomcopy/Imakefile 2009-09-30 06:28:48.267113392 +0200 +@@ -146,7 +146,7 @@ + + install: $(BIN) $(DPMSHAREDIR) $(SYSCONFDIR) $(IPROGS_D) $(SPOOL) + +-InstallProgram(dicomcopyd,$(BIN),root,bin,750) ++InstallProgram(dicomcopyd,$(BIN),root,bin,755) + InstallTarget(rc.dicomcopyd,root,bin,0644,$(DPMSHAREDIR)) + InstallTarget(dicomcopyd.conf.templ,root,bin,0644,$(SYSCONFDIR)) + InstallTarget($(DBCREAT),root,bin,0644,$(DPMSHAREDIR)) +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-30 06:28:10.800113279 +0200 ++++ LCG-DM-1.7.3.1/dli/Imakefile 2009-09-30 06:28:48.268114915 +0200 +@@ -67,8 +67,8 @@ + + install: $(BIN) $(LFCSHAREDIR) $(SYSCONFDIR) $(IPROGS_C) $(IPROGS_D) $(SPOOL) + +-InstallProgram(lfc-dli,$(BIN),root,bin,750) +-InstallProgram(lfc-dli-client,$(BIN),root,bin,750) ++InstallProgram(lfc-dli,$(BIN),root,bin,755) ++InstallProgram(lfc-dli-client,$(BIN),root,bin,755) + InstallTarget(rc.lfc-dli,root,bin,0644,$(LFCSHAREDIR)) + InstallTarget(lfc-dli.conf.templ,root,bin,0644,$(SYSCONFDIR)) + +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-30 06:27:54.381114643 +0200 ++++ LCG-DM-1.7.3.1/dpm/Imakefile 2009-09-30 06:28:48.269114028 +0200 +@@ -402,8 +402,8 @@ + InstallProgram(dpm-rmfs,$(BIN),root,bin,755) + InstallProgram(dpm-rmpool,$(BIN),root,bin,755) + InstallProgram(dpm-updatespace,$(BIN),root,bin,755) +-InstallProgram(dpm-shutdown,$(BIN),root,bin,750) +-InstallProgram(dpm,$(BIN),root,bin,750) ++InstallProgram(dpm-shutdown,$(BIN),root,bin,755) ++InstallProgram(dpm,$(BIN),root,bin,755) + InstallTarget(DPMCONFIG.templ,root,bin,0644,$(SYSCONFDIR)) + InstallTarget(rc.dpm,root,bin,0644,$(DPMSHAREDIR)) + InstallTarget(dpm.conf.templ,root,bin,0644,$(SYSCONFDIR)) +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-30 06:28:10.801113749 +0200 ++++ LCG-DM-1.7.3.1/dpmcopy/Imakefile 2009-09-30 06:28:48.270114795 +0200 +@@ -162,7 +162,7 @@ + + install: $(BIN) $(DPMSHAREDIR) $(SYSCONFDIR) $(IPROGS_D) $(SPOOL) + +-InstallProgram(dpmcopyd,$(BIN),root,bin,750) ++InstallProgram(dpmcopyd,$(BIN),root,bin,755) + InstallTarget(rc.dpmcopyd,root,bin,0644,$(DPMSHAREDIR)) + InstallTarget(dpmcopyd.conf.templ,root,bin,0644,$(SYSCONFDIR)) + +diff -ur LCG-DM-1.7.3.1.orig/ns/Imakefile.cns LCG-DM-1.7.3.1/ns/Imakefile.cns +--- LCG-DM-1.7.3.1.orig/ns/Imakefile.cns 2009-01-25 23:11:44.000000000 +0100 ++++ LCG-DM-1.7.3.1/ns/Imakefile.cns 2009-09-30 06:28:48.271115342 +0200 +@@ -356,8 +356,8 @@ + InstallProgram(nschown,$(BIN),root,bin,755) + IEXPORT(nschown,$(EXPORTBIN),755); + +-InstallProgram(nsdaemon,$(BIN),root,bin,750) +-IEXPORT(nsdaemon,$(EXPORTBIN),750); ++InstallProgram(nsdaemon,$(BIN),root,bin,755) ++IEXPORT(nsdaemon,$(EXPORTBIN),755); + + InstallProgram(nsdelcomment,$(BIN),root,bin,755) + IEXPORT(nsdelcomment,$(EXPORTBIN),755); +diff -ur LCG-DM-1.7.3.1.orig/ns/Imakefile.dpns LCG-DM-1.7.3.1/ns/Imakefile.dpns +--- LCG-DM-1.7.3.1.orig/ns/Imakefile.dpns 2009-04-06 10:30:13.000000000 +0200 ++++ LCG-DM-1.7.3.1/ns/Imakefile.dpns 2009-09-30 06:28:48.272114492 +0200 +@@ -362,7 +362,7 @@ + InstallProgram(dpns-chgrp,$(BIN),root,bin,755) + InstallProgram(dpns-chmod,$(BIN),root,bin,755) + InstallProgram(dpns-chown,$(BIN),root,bin,755) +-InstallProgram(dpnsdaemon,$(BIN),root,bin,750) ++InstallProgram(dpnsdaemon,$(BIN),root,bin,755) + InstallProgram(dpns-entergrpmap,$(BIN),root,bin,755) + InstallProgram(dpns-enterusrmap,$(BIN),root,bin,755) + InstallProgram(dpns-getacl,$(BIN),root,bin,755) +diff -ur LCG-DM-1.7.3.1.orig/ns/Imakefile.lfc LCG-DM-1.7.3.1/ns/Imakefile.lfc +--- LCG-DM-1.7.3.1.orig/ns/Imakefile.lfc 2009-09-30 06:27:54.387112877 +0200 ++++ LCG-DM-1.7.3.1/ns/Imakefile.lfc 2009-09-30 06:28:48.274114730 +0200 +@@ -432,7 +432,7 @@ + InstallProgram(lfc-chgrp,$(BIN),root,bin,755) + InstallProgram(lfc-chmod,$(BIN),root,bin,755) + InstallProgram(lfc-chown,$(BIN),root,bin,755) +-InstallProgram(lfcdaemon,$(BIN),root,bin,750) ++InstallProgram(lfcdaemon,$(BIN),root,bin,755) + InstallProgram(lfc-delcomment,$(BIN),root,bin,755) + InstallProgram(lfc-entergrpmap,$(BIN),root,bin,755) + InstallProgram(lfc-enterusrmap,$(BIN),root,bin,755) +diff -ur LCG-DM-1.7.3.1.orig/rfio/Imakefile LCG-DM-1.7.3.1/rfio/Imakefile +--- LCG-DM-1.7.3.1.orig/rfio/Imakefile 2009-09-30 06:27:54.388115830 +0200 ++++ LCG-DM-1.7.3.1/rfio/Imakefile 2009-09-30 06:28:48.276114833 +0200 +@@ -365,7 +365,7 @@ + -mkdir -p $(@D) + -mv $(@D)/$? $(@D)/OLD$? + cp $? $@ +- chmod 750 $@ ++ chmod 755 $@ + + NormalLibraryTarget(rfio,$(RFIOLIB_OBJS)) + +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-30 06:28:10.802116190 +0200 ++++ LCG-DM-1.7.3.1/srmv1/Imakefile 2009-09-30 06:28:48.278113119 +0200 +@@ -139,7 +139,7 @@ + + install: $(BIN) $(DPMSHAREDIR) $(SYSCONFDIR) $(IPROGS_D) $(SPOOL) + +-InstallProgram(srmv1,$(BIN),root,bin,750) ++InstallProgram(srmv1,$(BIN),root,bin,755) + InstallTarget(rc.srmv1,root,bin,0644,$(DPMSHAREDIR)) + InstallTarget(srmv1.conf.templ,root,bin,0644,$(SYSCONFDIR)) + +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-30 06:28:10.803114672 +0200 ++++ LCG-DM-1.7.3.1/srmv2/Imakefile 2009-09-30 06:28:48.279114633 +0200 +@@ -143,7 +143,7 @@ + + install: $(BIN) $(DPMSHAREDIR) $(SYSCONFDIR) $(IPROGS_D) $(SPOOL) + +-InstallProgram(srmv2,$(BIN),root,bin,750) ++InstallProgram(srmv2,$(BIN),root,bin,755) + InstallTarget(rc.srmv2,root,bin,0644,$(DPMSHAREDIR)) + InstallTarget(srmv2.conf.templ,root,bin,0644,$(SYSCONFDIR)) + +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-30 06:28:10.805114153 +0200 ++++ LCG-DM-1.7.3.1/srmv2.2/Imakefile 2009-09-30 06:28:48.280113889 +0200 +@@ -145,7 +145,7 @@ + + install: $(BIN) $(DPMSHAREDIR) $(SYSCONFDIR) $(IPROGS_D) $(SPOOL) + +-InstallProgram(srmv2.2,$(BIN),root,bin,750) ++InstallProgram(srmv2.2,$(BIN),root,bin,755) + InstallTarget(rc.srmv2.2,root,bin,0644,$(DPMSHAREDIR)) + InstallTarget(srmv2.2.conf.templ,root,bin,0644,$(SYSCONFDIR)) + --- lfc-1.7.4.1.orig/debian/patches/lcgdm-man.patch +++ lfc-1.7.4.1/debian/patches/lcgdm-man.patch @@ -0,0 +1,588 @@ +diff -ur lcgdm-1.7.4.1.orig/common/Cgetopt.man lcgdm-1.7.4.1/common/Cgetopt.man +--- lcgdm-1.7.4.1.orig/common/Cgetopt.man 2005-03-29 11:27:18.000000000 +0200 ++++ lcgdm-1.7.4.1/common/Cgetopt.man 2010-01-04 21:05:22.675017661 +0100 +@@ -49,9 +49,9 @@ + The + .B Cgetopt + function incrementally parses a command line argument list +-.BI argv ++.I argv + and returns the next known option character. An option character is known if it has been specified in the string of accepted option characters, +-.BI optstring . ++.IR optstring . + .P + The + .B Cgetopt_long +@@ -60,44 +60,45 @@ + but it accepts options in two forms: words and characters. The + .B Cgetopt_long + function provides a superset of the functionality of +-.B Cgetopt ++.BR Cgetopt . + The additional functionality is described in the section CGETOPT_LONG. + .P + The option string +-.BI optstring ++.I optstring + may contain the following elements: individual characters, and characters followed by a colon to indicate an option argument is to follow. For example, an option string + .B x + recognizes an option +-.B x , ++.BR -x , + and an option string + .B x: + recognizes an option and argument +-.B x argument . ++.B -x ++.IR argument . + It does not matter to + .B Cgetopt + if a following argument has leading white space. + .P + On return from +-.BI Cgetopt , +-.BI Coptarg ++.BR Cgetopt , ++.I Coptarg + points to an option argument, if it is anticipated, and the variable +-.BI Coptind ++.I Coptind + contains the index to the next +-.BI argv ++.I argv + argument for a subsequent call to +-.B Cgetopt . ++.BR Cgetopt . + The variable +-.BI Coptopt ++.I Coptopt + saves the last known option character returned by +-.B Cgetopt . ++.BR Cgetopt . + .P +-The variable +-.BI Copterr ++The variables ++.I Copterr + and +-.BI Coptind ++.I Coptind + are both initialized to 1. + The +-.BI Coptind ++.I Coptind + variable may be set to another value before a set of calls to + .B Cgetopt + in order to skip over more or less argv entries. +@@ -105,11 +106,11 @@ + In order to use + .B Cgetopt + to evaluate multiple sets of arguments, or to evaluate a single set of arguments multiple times, the variable +-.BI Coptreset ++.I Coptreset + must be set to 1 before the second and each additional set of calls to +-.B Cgetopt , ++.BR Cgetopt , + and the variable +-.BI Coptind ++.I Coptind + must be reinitialized. + .P + The +@@ -128,13 +129,13 @@ + can be used in two ways. In the first way, every long option understood by the program has a coresponding short option, and the option structure is only used to translate from long option to short options. When used in this fashion, + .B Cgetopt_long + behaves identically to +-.B Cgetopt. ++.BR Cgetopt . + This is good way to add long option processing to an existing program with the minimum of rewriting. + .P + In the second mechanism, a long option set a flag in the +-.BI option ++.I Coptions_t + structure passed, or will store a pointer to the command line argument in the +-.BI option ++.I Coptions_t + structure passed to it for options that take arguments. Additionally, the long option's argument may be specified as a single argument with an equal sign, e.g + .B myprogram --myoption=somevalue + .P +@@ -165,31 +166,31 @@ + + .P + The +-.BI name ++.I name + field should contain the option name without the leading double dash. + .P + The +-.BI has_arg +-field should be one of +-.B NO_ARGUMENT +-no argument to the option is expect. +-.B REQUIRED_ARGUMENT ++.I has_arg ++field should be one of: ++.BR NO_ARGUMENT , ++no argument to the option is expected. ++.BR REQUIRED_ARGUMENT , + an argument to the option is required. +-.B OPTIONAL_ARGUMENT ++.BR OPTIONAL_ARGUMENT , + an argument to the option may be presented. + .P + If +-.BI flag ++.I flag + is non-NULL, then the integer pointed to by it will set to the value in the +-.BI val ++.I val + field. If the +-.BI flag ++.I flag + field is NULL, then the +-.BI val ++.I val + field will be returned. Setting +-.BI flag ++.I flag + to NULL and setting +-.BI val ++.I val + to the corresponding short option will make this function act just + like + .B Cgetopt. +@@ -197,16 +198,16 @@ + If the + .B Cgetopt + function encounters a character not found in the string +-.BI optstring ++.I optstring + or detects a missing option argument it writes an error message to + .B stderr + and returns +-.B ? . ++.BR ? . + Setting +-.BI Copterr ++.I Copterr + to a zero will disable these error messages. + If +-.BI optstring ++.I optstring + has a leading + .B : + then a missing option argument causes a +@@ -218,7 +219,7 @@ + ; this is reasonable but reduces the amount of error checking possible. + .SH CGETOPT_LONG EXTENSIONS + The +-.BI Coptreset ++.I Coptreset + variable was added to make it possible to call the + .B Cgetopt + function multiple times. +@@ -272,7 +273,7 @@ + {"buffy", NO_ARGUMENT, NULL, 'b'}, + {"floride", REQUIRED_ARGUMENT, NULL, 'f'}, + {"daggerset", NO_ARGUMENT, &daggerset, 1}, +- {NULL, 0, NULL, 0} ++ {NULL, 0, NULL, 0} + }; + + Coptind = 1; /* Required */ +@@ -310,9 +311,7 @@ + .SH HISTORY + The + .B Cgetopt +-function appeared +-.Bx 4.3 . +-The ++function appeared in BSD 4.3. The + .B Cgetopt_long + function first appeared in GNU libiberty. This implementation was imported to NetBSD from a Kerberos distribution. + .SH BUGS +@@ -324,12 +323,12 @@ + .B -p1003.2-92 + to decouple + .B Cgetopt +-from . ++from . + .P + A single dash + .B - + may be specified as an character in +-.BI optstring , ++.IR optstring , + however it should + .B never + have an argument associated with it. +@@ -340,7 +339,7 @@ + as an option flag. + This practice is wrong, and should not be used in any current development. + It is provided for backward compatibility +-.B only . ++.BR only . + By default, a single dash causes + .B Cgetopt + to return -1. +@@ -354,7 +353,7 @@ + as an option. + This practice is wrong, and should not be used in any current development. + It is provided for backward compatibility +-.B only . ++.BR only . + The following code fragment works in most cases. + .ft CW + .nf +@@ -382,7 +381,7 @@ + .fi + .P + The +-.BI OPTIONAL_ARGUMENT ++.B OPTIONAL_ARGUMENT + always eats the following argument unless the argument is included via the + .B --option=argument + notation. +diff -ur lcgdm-1.7.4.1.orig/common/Cglobals.man lcgdm-1.7.4.1/common/Cglobals.man +--- lcgdm-1.7.4.1.orig/common/Cglobals.man 2005-03-29 11:27:18.000000000 +0200 ++++ lcgdm-1.7.4.1/common/Cglobals.man 2010-01-04 11:27:11.419019882 +0100 +@@ -45,7 +45,7 @@ + .br + a \fB#define\fP macro that replaces all occurences of any global variable that needs to be thread-specific to this Cglobal's function. + .RE +-In order to satisfy packages not compiled with threads turned on, or that do not initialize \fBCASTOR\fP Thread Interface's \fBCthread\fP, any such global variable is also explicitely defined in \fBCglobals\fP. ++In order to satisfy packages not compiled with threads turned on, or that do not initialize \fBCASTOR\fP Thread Interface's \fBCthread\fP, any such global variable is also explicitly defined in \fBCglobals\fP. + .P + For example, taking the global error variable \fBserrno\fP, \fBCglobals\fP source code contains: + .RS +@@ -55,7 +55,7 @@ + .RS + if \fBCglobals_init\fP was not (successfully) called, return the address of the global variable \fBserrno\fP + .br +-else return the adress of a thread-safe specific memory, instanciated at the first call to this function, that holds the content of the current instance of the thread-specific value of \fBserrno\fP ++else return the address of a thread-safe specific memory, instanciated at the first call to this function, that holds the content of the current instance of the thread-specific value of \fBserrno\fP + .RE + .RE + .P +@@ -67,11 +67,11 @@ + .I getspec + function address that, given a static + .I key +-adress, returns the adress of a Thread-Specific memory into ++address, returns the address of a Thread-Specific memory into + .I addr + content. This uses an internal structure inside \fBCthread\fP, allocated on the heap, that is associated bijectively to + .I key +-address. \fBCthread\fP always explicitely allocates such internal structure to any ++address. \fBCthread\fP always explicitly allocates such internal structure to any + .I key + address if it is unknown at the moment of the call to + .I getspec. +@@ -97,7 +97,7 @@ + .I addr + value, previously instanciated with a + .I getspec +-call, and possibly allocated on the heap by \fBCglobals\fP if necessary, will internally explicitely call the Operating System Thread-Specific functions that will put the value of ++call, and possibly allocated on the heap by \fBCglobals\fP if necessary, will internally explicitly call the Operating System Thread-Specific functions that will put the value of + .I address + as something thread-specific, bijectively associated to another member of the internal structure of \fBCthread\fP, itself bijective to + .I key. +@@ -119,7 +119,7 @@ + .I addr + content, at return of \fBCglobals_get\fP, is not NULL, you can safely fill this memory with any value, provided you does not exceed the + .I size +-bytes length speficied in your previous call to \fBCglobals_get\fP. Because of applications that are \fBnot\fP multi-threaded, the initial value of ++bytes length specified in your previous call to \fBCglobals_get\fP. Because of applications that are \fBnot\fP multi-threaded, the initial value of + .I key + has then an importance, that's why it is necessary to always declare it with an initial value of -1. + .P +diff -ur lcgdm-1.7.4.1.orig/common/Cmutex.man lcgdm-1.7.4.1/common/Cmutex.man +--- lcgdm-1.7.4.1.orig/common/Cmutex.man 2005-03-29 11:27:18.000000000 +0200 ++++ lcgdm-1.7.4.1/common/Cmutex.man 2010-01-04 11:26:17.660019722 +0100 +@@ -28,7 +28,7 @@ + .P + Please note that the \fBCmutex\fP package is initially meant to be interfaced with \fBCthread\fP only. + .P +-\fBCmutex_lock\fP takes as argument the adress ++\fBCmutex_lock\fP takes as argument the address + .BI addr + of anything that is static in your userspace, such as a 'static int variable;' address (see \fBEXAMPLE\fP section below), and a + .BI timeout +@@ -117,7 +117,7 @@ + .nf + /* + * Here follows an example. The call to \fBCthread_init\fP routine shows +- * that multi-threaded mode is explicitely activated by the application ++ * that multi-threaded mode is explicitly activated by the application + * (you will then have to link with the thread library). Neverthless, + * you can very well call some other external library, and leave as it is + * the \fBCmutex\fP calls. +diff -ur lcgdm-1.7.4.1.orig/common/Cpool.man lcgdm-1.7.4.1/common/Cpool.man +--- lcgdm-1.7.4.1.orig/common/Cpool.man 2005-03-29 11:27:18.000000000 +0200 ++++ lcgdm-1.7.4.1/common/Cpool.man 2010-01-04 11:23:28.789769967 +0100 +@@ -24,7 +24,7 @@ + + \fBCpool\fP is a layer built upon \fBCthread\fP, the \fPCASTOR Thread\fP interface. It allows the user to create dedicated pools, and then to assign to one of them a given routine to execute. + .P +-The created processes or threads will remain alive, unless the routines assigned to are crashing, or explicitely calling an exit statement, like exit() or pthread_exit(). ++The created processes or threads will remain alive, unless the routines assigned to are crashing, or explicitly calling an exit statement, like exit() or pthread_exit(). + .P + Typical use might be writing a server, with a bunch of pre-created processes or pools (depending on the environment with which \fBCthread\fP has been compiled), and assign to a given pool a routine with the socket file descriptor as argument address. + .P +diff -ur lcgdm-1.7.4.1.orig/common/Csched.man lcgdm-1.7.4.1/common/Csched.man +--- lcgdm-1.7.4.1.orig/common/Csched.man 2005-03-29 11:27:18.000000000 +0200 ++++ lcgdm-1.7.4.1/common/Csched.man 2010-01-04 11:25:25.786770693 +0100 +@@ -98,7 +98,7 @@ + .B not + mean that all those schedulings are supported on the platform you are running on. In particular, only + .I CSCHED_OTHER +-is officially supported everywhere. The other scheduling policies are totally system dependant and do not conform to any standardisation. Please be aware, also, that using a scheduling other than ++is officially supported everywhere. The other scheduling policies are totally system dependent and do not conform to any standardisation. Please be aware, also, that using a scheduling other than + .I CSCHED_OTHER + is an opendoor to processor deadlock... + .P +diff -ur lcgdm-1.7.4.1.orig/config/Imake.rules lcgdm-1.7.4.1/config/Imake.rules +--- lcgdm-1.7.4.1.orig/config/Imake.rules 2009-01-09 11:48:32.000000000 +0100 ++++ lcgdm-1.7.4.1/config/Imake.rules 2010-01-04 11:18:35.365020535 +0100 +@@ -16,12 +16,12 @@ + #else + #define IMANPAGE(name,dir,suffix) \ + dir/name.suffix: name.man @@\ +- cp name.cat dir/name.suffix ++ cp name.man dir/name.suffix + #endif + + #define FILTERMANPAGE(new_command,command,dir,suffix) \ + dir/new_command.suffix: command.man @@\ +- ../scripts/filter-manpage.sh new_command command dir suffix ++ ../scripts/filter-manpage-nroff.sh new_command command dir suffix + + #define EMANPAGE(name,dir,suffix) \ + dir/name.suffix: name.man @@\ +diff -ur lcgdm-1.7.4.1.orig/config/site.def lcgdm-1.7.4.1/config/site.def +--- lcgdm-1.7.4.1.orig/config/site.def 2009-11-18 15:48:47.000000000 +0100 ++++ lcgdm-1.7.4.1/config/site.def 2010-01-04 11:18:35.365020535 +0100 +@@ -162,7 +162,7 @@ + #define BuildTest NO + + #define Accounting YES +-#define HasNroff YES ++#define HasNroff NO + #define UseCupv NO + #define UseGSI YES + #define UseKRB4 NO +diff -ur lcgdm-1.7.4.1.orig/ns/Cns_access.man lcgdm-1.7.4.1/ns/Cns_access.man +--- lcgdm-1.7.4.1.orig/ns/Cns_access.man 2001-10-04 14:12:41.000000000 +0200 ++++ lcgdm-1.7.4.1/ns/Cns_access.man 2010-01-04 11:23:28.791016981 +0100 +@@ -46,7 +46,7 @@ + .I amode + the bit pattern is built by an OR of the constants defined in + .RB < unistd.h > +-under Unix or to be explicitely defined under Windows/NT: ++under Unix or to be explicitly defined under Windows/NT: + .RS + .TP + .B R_OK +diff -ur lcgdm-1.7.4.1.orig/ns/Cns_accessr.man lcgdm-1.7.4.1/ns/Cns_accessr.man +--- lcgdm-1.7.4.1.orig/ns/Cns_accessr.man 2007-07-12 14:46:56.000000000 +0200 ++++ lcgdm-1.7.4.1/ns/Cns_accessr.man 2010-01-04 11:23:28.792017246 +0100 +@@ -45,7 +45,7 @@ + .I amode + the bit pattern is built by an OR of the constants defined in + .RB < unistd.h > +-under Unix or to be explicitely defined under Windows/NT: ++under Unix or to be explicitly defined under Windows/NT: + .RS + .TP + .B R_OK +diff -ur lcgdm-1.7.4.1.orig/ns/Cns_startsess.man lcgdm-1.7.4.1/ns/Cns_startsess.man +--- lcgdm-1.7.4.1.orig/ns/Cns_startsess.man 2005-06-30 07:26:29.000000000 +0200 ++++ lcgdm-1.7.4.1/ns/Cns_startsess.man 2010-01-04 11:24:06.905021184 +0100 +@@ -17,12 +17,12 @@ + starts session. + The connection to the Name Server is kept open until + .B Cns_endsess +-is explicitely called. ++is explicitly called. + Requests issued between + .B Cns_startsess + and + .B Cns_endsess +-are independant from each other and are individually committed or rolled back. ++are independent from each other and are individually committed or rolled back. + The + .I comment + is logged in the server log. +diff -ur lcgdm-1.7.4.1.orig/ns/Cns_starttrans.man lcgdm-1.7.4.1/ns/Cns_starttrans.man +--- lcgdm-1.7.4.1.orig/ns/Cns_starttrans.man 2005-06-30 07:29:26.000000000 +0200 ++++ lcgdm-1.7.4.1/ns/Cns_starttrans.man 2010-01-04 11:23:28.793017232 +0100 +@@ -20,7 +20,7 @@ + .B Cns_aborttrans + or + .B Cns_endtrans +-is explicitely called. ++is explicitly called. + If all the DB update operations between + .B Cns_starttrans + and +diff -ur lcgdm-1.7.4.1.orig/ns/nsentergrpmap.man lcgdm-1.7.4.1/ns/nsentergrpmap.man +--- lcgdm-1.7.4.1.orig/ns/nsentergrpmap.man 2006-01-12 17:46:48.000000000 +0100 ++++ lcgdm-1.7.4.1/ns/nsentergrpmap.man 2010-01-04 11:18:35.366019963 +0100 +@@ -2,7 +2,7 @@ + .\" Copyright (C) 2006 by CERN/IT/GD/ITR + .\" All rights reserved + .\" +-.TH NSENTERGRPMAP 3 "$Date: 2006/01/12 16:46:48 $" CASTOR "Cns Administrator Commands" ++.TH NSENTERGRPMAP 1 "$Date: 2006/01/12 16:46:48 $" CASTOR "Cns Administrator Commands" + .SH NAME + nsentergrpmap \- define a new group entry in Virtual Id table + .SH SYNOPSIS +diff -ur lcgdm-1.7.4.1.orig/ns/nsenterusrmap.man lcgdm-1.7.4.1/ns/nsenterusrmap.man +--- lcgdm-1.7.4.1.orig/ns/nsenterusrmap.man 2006-01-12 17:46:49.000000000 +0100 ++++ lcgdm-1.7.4.1/ns/nsenterusrmap.man 2010-01-04 11:18:35.366019963 +0100 +@@ -2,7 +2,7 @@ + .\" Copyright (C) 2006 by CERN/IT/GD/ITR + .\" All rights reserved + .\" +-.TH NSENTERUSRMAP 3 "$Date: 2006/01/12 16:46:49 $" CASTOR "Cns Administrator Commands" ++.TH NSENTERUSRMAP 1 "$Date: 2006/01/12 16:46:49 $" CASTOR "Cns Administrator Commands" + .SH NAME + nsenterusrmap \- define a new user entry in Virtual Id table + .SH SYNOPSIS +diff -ur lcgdm-1.7.4.1.orig/ns/nsmodifygrpmap.man lcgdm-1.7.4.1/ns/nsmodifygrpmap.man +--- lcgdm-1.7.4.1.orig/ns/nsmodifygrpmap.man 2005-10-19 07:31:52.000000000 +0200 ++++ lcgdm-1.7.4.1/ns/nsmodifygrpmap.man 2010-01-04 11:18:35.366019963 +0100 +@@ -2,7 +2,7 @@ + .\" Copyright (C) 2005 by CERN/IT/GD/SC + .\" All rights reserved + .\" +-.TH NSMODIFYGRPMAP 3 "$Date: 2005/10/19 05:31:52 $" CASTOR "Cns Administrator Commands" ++.TH NSMODIFYGRPMAP 1 "$Date: 2005/10/19 05:31:52 $" CASTOR "Cns Administrator Commands" + .SH NAME + nsmodifygrpmap \- modify group entry corresponding to a given virtual gid + .SH SYNOPSIS +diff -ur lcgdm-1.7.4.1.orig/ns/nsmodifyusrmap.man lcgdm-1.7.4.1/ns/nsmodifyusrmap.man +--- lcgdm-1.7.4.1.orig/ns/nsmodifyusrmap.man 2005-10-19 07:31:52.000000000 +0200 ++++ lcgdm-1.7.4.1/ns/nsmodifyusrmap.man 2010-01-04 11:18:35.366019963 +0100 +@@ -2,7 +2,7 @@ + .\" Copyright (C) 2005 by CERN/IT/GD/SC + .\" All rights reserved + .\" +-.TH NSMODIFYUSRMAP 3 "$Date: 2005/10/19 05:31:52 $" CASTOR "Cns Administrator Commands" ++.TH NSMODIFYUSRMAP 1 "$Date: 2005/10/19 05:31:52 $" CASTOR "Cns Administrator Commands" + .SH NAME + nsmodifyusrmap \- modify user entry corresponding to a given virtual uid + .SH SYNOPSIS +diff -ur lcgdm-1.7.4.1.orig/ns/nsrmgrpmap.man lcgdm-1.7.4.1/ns/nsrmgrpmap.man +--- lcgdm-1.7.4.1.orig/ns/nsrmgrpmap.man 2005-10-19 07:31:52.000000000 +0200 ++++ lcgdm-1.7.4.1/ns/nsrmgrpmap.man 2010-01-04 11:18:35.366766634 +0100 +@@ -2,7 +2,7 @@ + .\" Copyright (C) 2005 by CERN/IT/GD/SC + .\" All rights reserved + .\" +-.TH NSRMGRPMAP 3 "$Date: 2005/10/19 05:31:52 $" CASTOR "Cns Administrator Commands" ++.TH NSRMGRPMAP 1 "$Date: 2005/10/19 05:31:52 $" CASTOR "Cns Administrator Commands" + .SH NAME + nsrmgrpmap \- suppress group entry corresponding to a given virtual gid or group name + .SH SYNOPSIS +diff -ur lcgdm-1.7.4.1.orig/ns/nsrmusrmap.man lcgdm-1.7.4.1/ns/nsrmusrmap.man +--- lcgdm-1.7.4.1.orig/ns/nsrmusrmap.man 2005-10-19 07:31:52.000000000 +0200 ++++ lcgdm-1.7.4.1/ns/nsrmusrmap.man 2010-01-04 11:18:35.366766634 +0100 +@@ -2,7 +2,7 @@ + .\" Copyright (C) 2005 by CERN/IT/GD/SC + .\" All rights reserved + .\" +-.TH NSRMUSRMAP 3 "$Date: 2005/10/19 05:31:52 $" CASTOR "Cns Administrator Commands" ++.TH NSRMUSRMAP 1 "$Date: 2005/10/19 05:31:52 $" CASTOR "Cns Administrator Commands" + .SH NAME + nsrmusrmap \- suppress user entry corresponding to a given virtual uid or user name + .SH SYNOPSIS +diff -ur lcgdm-1.7.4.1.orig/rfio/Imakefile lcgdm-1.7.4.1/rfio/Imakefile +--- lcgdm-1.7.4.1.orig/rfio/Imakefile 2009-08-25 11:27:18.000000000 +0200 ++++ lcgdm-1.7.4.1/rfio/Imakefile 2010-01-04 11:18:35.366766634 +0100 +@@ -151,8 +151,12 @@ + + .PRECIOUS: LibraryTargetName(rfio) + +-MANPAGES = FileName($(MANDIR),rfiod.$(MANSUFFIX)) \ +- FileName($(MANDIR),rfcat.$(MANSUFFIX)) \ ++#if BuildRfioServer ++MANPAGESSERVER = FileName($(MANDIR),rfiod.$(MANSUFFIX)) ++#endif ++ ++#if BuildRfioClient ++MANPAGESCLIENT = FileName($(MANDIR),rfcat.$(MANSUFFIX)) \ + FileName($(MANDIR),rfchmod.$(MANSUFFIX)) \ + FileName($(MANDIR),rfcp.$(MANSUFFIX)) \ + FileName($(MANDIR),rfdf.$(MANSUFFIX)) \ +@@ -218,6 +222,7 @@ + FileName($(LIBMANDIR),rfio_write.$(LIBMANSUFFIX)) \ + FileName($(LIBMANDIR),rfioreadopt.$(LIBMANSUFFIX)) \ + FileName($(LIBMANDIR),rfiosetopt.$(LIBMANSUFFIX)) ++#endif + + EXPORTMANPAGES = FileName($(EXPORTMAN),FileName(man$(MANSUFFIX),rfiod.$(MANSUFFIX))) \ + FileName($(EXPORTMAN),FileName(man$(MANSUFFIX),rfcat.$(MANSUFFIX))) \ +@@ -471,7 +476,7 @@ + MakeDir($(SPOOL),root,bin,0755) + MakeDir($(SYSCONFDIR),root,bin,0755) + +-install.man: $(MANDIR) $(LIBMANDIR) $(MANPAGES) ++install.man: $(MANDIR) $(LIBMANDIR) $(MANPAGESSERVER) $(MANPAGESCLIENT) + + MakeDir($(MANDIR),root,bin,0755) + MakeDir($(LIBMANDIR),root,bin,0755) +diff -ur lcgdm-1.7.4.1.orig/rfio/rfio_access.man lcgdm-1.7.4.1/rfio/rfio_access.man +--- lcgdm-1.7.4.1.orig/rfio/rfio_access.man 2005-03-31 15:13:02.000000000 +0200 ++++ lcgdm-1.7.4.1/rfio/rfio_access.man 2010-01-04 11:23:28.794017148 +0100 +@@ -48,7 +48,7 @@ + .I amode + the bit pattern is built by an OR of the constants defined in + .RB < unistd.h > +-under Unix or to be explicitely defined under Windows/NT: ++under Unix or to be explicitly defined under Windows/NT: + .RS + .TP + .B R_OK +diff -ur lcgdm-1.7.4.1.orig/rfio/rfio_fstat64.man lcgdm-1.7.4.1/rfio/rfio_fstat64.man +--- lcgdm-1.7.4.1.orig/rfio/rfio_fstat64.man 2005-03-31 15:13:02.000000000 +0200 ++++ lcgdm-1.7.4.1/rfio/rfio_fstat64.man 2010-01-04 11:18:35.366766634 +0100 +@@ -1,2 +1,2 @@ +-.so ./rfio_fstat.man ++.so ./rfio_stat.man + .\" @(#)$RCSfile: rfio_fstat64.man,v $ $Revision: 1.1 $ $Date: 2005/03/31 13:13:02 $ CERN IT-PDP/DM Jean-Philippe Baud +diff -ur lcgdm-1.7.4.1.orig/rfio/rfio_readdir.man lcgdm-1.7.4.1/rfio/rfio_readdir.man +--- lcgdm-1.7.4.1.orig/rfio/rfio_readdir.man 2005-03-31 15:13:03.000000000 +0200 ++++ lcgdm-1.7.4.1/rfio/rfio_readdir.man 2010-01-04 11:20:03.288767523 +0100 +@@ -20,8 +20,8 @@ + .SH DESCRIPTION + .B rfio_readdir + reads the directory opened by +-.B rfio_opendir +-. This routine returns a pointer to a structure containing the current directory ++.BR rfio_opendir . ++This routine returns a pointer to a structure containing the current directory + entry. + .TP + .I dirp +diff -ur lcgdm-1.7.4.1.orig/security/Csec_api.man lcgdm-1.7.4.1/security/Csec_api.man +--- lcgdm-1.7.4.1.orig/security/Csec_api.man 2008-01-10 09:28:00.000000000 +0100 ++++ lcgdm-1.7.4.1/security/Csec_api.man 2010-01-04 11:52:40.577767628 +0100 +@@ -76,7 +76,7 @@ + framework for errors. + .sp + .TP +-.B "Csec_client_initContext,Csec_server_initContext,Csec_server_reinitContext ++.B Csec_client_initContext, Csec_server_initContext, Csec_server_reinitContext + Allow to initialize the + .B Csec_context_t + structure. The service type parameter defines which type of key will be used by the service. Its value can be: +@@ -96,7 +96,7 @@ + A CASTOR tape host type key (e.g. castortape/machine_name@DOMAIN for KRB5) will be used + .RE + .TP +-.B Csec_client_establishContext,Csec_server_establishContext ++.B Csec_client_establishContext, Csec_server_establishContext + Given a initialized context and an opened socket, establishes a security context according to the chosen security mechanism. + .TP + .B Csec_client_setSecurityOpts, Csec_server_setSecurityOpts