diff --git a/.gitignore b/.gitignore index f1360c1..d62a454 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/xrootd-3.0.2.tar.gz +/xrootd-3.0.3.tar.gz /xrootd-manpages.tar.gz diff --git a/cmsd.init b/cmsd.init deleted file mode 100644 index ce1c632..0000000 --- a/cmsd.init +++ /dev/null @@ -1,85 +0,0 @@ -#! /bin/sh -# -# cmsdd Start/Stop the CMSD daemon -# -# chkconfig: - 20 80 -# description: The cmsd daemon runs the XRD control network. -# -# processname: cmsd -# pidfile: /var/run/cmsd.pid -# config: - -CMSD=/usr/bin/cmsd - -# Source function library. -. /etc/init.d/functions - -# Get config. -. /etc/sysconfig/network - -# Get cmsd config -[ -f /etc/sysconfig/cmsd ] && . /etc/sysconfig/cmsd - -# Configure the environment -[ ! -z "$CMSDENVCONFIG" ] && [ -f "$CMSDENVCONFIG" ] && . $CMSDENVCONFIG - -# Check that networking is up. -if [ ${NETWORKING} = "no" ] -then - exit 0 -fi - -[ -x $CMSD ] || exit 0 - -RETVAL=0 -prog="cmsd" - -start() { - echo -n $"Starting $prog: " - # Options are specified in /etc/sysconfig/cmsd . - # $CMSDUSER *must* be the name of an existing non-privileged user. - daemon $CMSD -b -l $CMSDLOG -R $CMSDUSER -c $CMSDCF $CMSDDEBUG - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cmsd - return $RETVAL -} - -stop() { - [ ! -f /var/lock/subsys/cmsd ] && return 0 || true - echo -n $"Stopping $prog: " - killproc cmsd - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/cmsd - return $RETVAL -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status cmsd - RETVAL=$? - ;; - restart|reload) - stop - start - ;; - condrestart) - if [ -f /var/lock/subsys/cmsd ]; then - stop - start - fi - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 1 -esac - -exit $RETVAL diff --git a/cmsd.sysconfig b/cmsd.sysconfig deleted file mode 100644 index 842dde6..0000000 --- a/cmsd.sysconfig +++ /dev/null @@ -1,3 +0,0 @@ -CMSDLOG=/var/log/xrootd/cmsd.log -CMSDUSER=xrootd -CMSDCF=/etc/xrootd/cmsd.cf diff --git a/sources b/sources index 74d49ae..490f7f2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -98a30a9d84dc24da4cae51ed26965f5b xrootd-3.0.2.tar.gz -4c09bb53def37811f7dd523f9d27769a xrootd-manpages.tar.gz +f857ba6303f2e821420553f8e54ee188 xrootd-3.0.3.tar.gz +3b71baeaedb74599a3ba93888d56e0b6 xrootd-manpages.tar.gz diff --git a/xrootd-bonjour.patch b/xrootd-bonjour.patch index ff4bca6..d439635 100644 --- a/xrootd-bonjour.patch +++ b/xrootd-bonjour.patch @@ -1,7 +1,7 @@ -diff -ur xrootd.orig/configure.ac xrootd/configure.ac ---- xrootd.orig/configure.ac 2010-12-09 16:24:21.000000000 +0100 -+++ xrootd/configure.ac 2010-12-16 06:08:16.078935003 +0100 -@@ -1085,6 +1085,70 @@ +diff -ur xrootd-3.0.3.orig/configure.ac xrootd-3.0.3/configure.ac +--- xrootd-3.0.3.orig/configure.ac 2011-04-22 12:17:39.633403184 +0200 ++++ xrootd-3.0.3/configure.ac 2011-04-22 12:19:18.527396298 +0200 +@@ -1113,6 +1113,70 @@ AM_CONDITIONAL(ENABLE_SECSSL,test x"$activate_secssl" = xyes -o x"$activate_secssl" = xdefault_yes) @@ -72,9 +72,9 @@ diff -ur xrootd.orig/configure.ac xrootd/configure.ac # Record the extension of dynamic libraries on this platform LT_SYS_MODULE_EXT -diff -ur xrootd.orig/src/Xrd/Makefile.am xrootd/src/Xrd/Makefile.am ---- xrootd.orig/src/Xrd/Makefile.am 2010-12-16 06:00:10.348934620 +0100 -+++ xrootd/src/Xrd/Makefile.am 2010-12-16 06:00:49.273934990 +0100 +diff -ur xrootd-3.0.3.orig/src/Xrd/Makefile.am xrootd-3.0.3/src/Xrd/Makefile.am +--- xrootd-3.0.3.orig/src/Xrd/Makefile.am 2011-04-22 12:17:39.595402419 +0200 ++++ xrootd-3.0.3/src/Xrd/Makefile.am 2011-04-22 12:19:18.528396307 +0200 @@ -47,7 +47,8 @@ XrdScheduler.cc XrdScheduler.hh XrdJob.hh \ XrdStats.cc XrdStats.hh \ @@ -85,9 +85,9 @@ diff -ur xrootd.orig/src/Xrd/Makefile.am xrootd/src/Xrd/Makefile.am ../XrdOuc/libXrdOuc.la \ ../XrdNetUtil/libXrdNetUtil.la \ ../XrdSys/libXrdSys.la \ -diff -ur xrootd.orig/src/XrdOuc/Makefile.am xrootd/src/XrdOuc/Makefile.am ---- xrootd.orig/src/XrdOuc/Makefile.am 2010-12-16 06:00:10.470935000 +0100 -+++ xrootd/src/XrdOuc/Makefile.am 2010-12-16 06:00:49.322935001 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdOuc/Makefile.am xrootd-3.0.3/src/XrdOuc/Makefile.am +--- xrootd-3.0.3.orig/src/XrdOuc/Makefile.am 2011-04-22 12:17:39.608402681 +0200 ++++ xrootd-3.0.3/src/XrdOuc/Makefile.am 2011-04-22 12:19:18.529396317 +0200 @@ -8,7 +8,7 @@ ## Checked in by $Author$ ####################################################################### @@ -108,7 +108,7 @@ diff -ur xrootd.orig/src/XrdOuc/Makefile.am xrootd/src/XrdOuc/Makefile.am XrdOucHash.hh XrdOucHash.icc XrdOucLock.hh \ @@ -30,8 +30,18 @@ XrdOucPup.hh XrdOucCRC.hh XrdOucArgs.hh \ - XrdOucNSWalk.hh XrdOucSxeq.hh + XrdOucNSWalk.hh XrdOucSxeq.hh XrdOucXAttr.hh +if ENABLE_BONJOUR +xrootdoucinc_HEADERS = $(OUCHEADERS) XrdOucBonjour.hh diff --git a/xrootd-circular-deps.patch b/xrootd-circular-deps.patch index 95f9abc..abfdcdf 100644 --- a/xrootd-circular-deps.patch +++ b/xrootd-circular-deps.patch @@ -1,7 +1,7 @@ -diff -ur xrootd-3.0.2.orig/configure.ac xrootd-3.0.2/configure.ac ---- xrootd-3.0.2.orig/configure.ac 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/configure.ac 2011-01-29 08:58:59.333934025 +0100 -@@ -1121,6 +1121,7 @@ +diff -ur xrootd-3.0.3.orig/configure.ac xrootd-3.0.3/configure.ac +--- xrootd-3.0.3.orig/configure.ac 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/configure.ac 2011-04-22 09:05:09.381418838 +0200 +@@ -1147,6 +1147,7 @@ src/Makefile src/Makefile_include src/XrdSys/Makefile @@ -9,7 +9,7 @@ diff -ur xrootd-3.0.2.orig/configure.ac xrootd-3.0.2/configure.ac src/XrdOuc/Makefile src/XrdNet/Makefile src/XrdSec/Makefile -@@ -1144,6 +1145,7 @@ +@@ -1170,6 +1171,7 @@ src/XrdRootd/Makefile src/XrdXrootd/Makefile src/XrdFrm/Makefile @@ -17,9 +17,9 @@ diff -ur xrootd-3.0.2.orig/configure.ac xrootd-3.0.2/configure.ac src/XrdClient/Makefile src/XrdPosix/Makefile src/XrdPss/Makefile -diff -ur xrootd-3.0.2.orig/src/Makefile.am xrootd-3.0.2/src/Makefile.am ---- xrootd-3.0.2.orig/src/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/Makefile.am 2011-01-29 08:58:59.333934025 +0100 +diff -ur xrootd-3.0.3.orig/src/Makefile.am xrootd-3.0.3/src/Makefile.am +--- xrootd-3.0.3.orig/src/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/Makefile.am 2011-04-22 09:05:09.382418750 +0200 @@ -69,6 +69,7 @@ ####################################################################### @@ -40,9 +40,9 @@ diff -ur xrootd-3.0.2.orig/src/Makefile.am xrootd-3.0.2/src/Makefile.am XrdCms \ XrdOfs \ XrdRootd \ -diff -ur xrootd-3.0.2.orig/src/XrdFrm/Makefile.am xrootd-3.0.2/src/XrdFrm/Makefile.am ---- xrootd-3.0.2.orig/src/XrdFrm/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrm/Makefile.am 2011-01-29 09:00:22.359811392 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdFrm/Makefile.am xrootd-3.0.3/src/XrdFrm/Makefile.am +--- xrootd-3.0.3.orig/src/XrdFrm/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrm/Makefile.am 2011-04-22 09:56:18.207877090 +0200 @@ -16,7 +16,7 @@ # @@ -52,7 +52,7 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrm/Makefile.am xrootd-3.0.2/src/XrdFrm/Makefi ############################################################################# ## extra directory definitions -@@ -25,121 +25,34 @@ +@@ -25,124 +25,36 @@ ############################################################################# ## deliverables @@ -74,12 +74,13 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrm/Makefile.am xrootd-3.0.2/src/XrdFrm/Makefi XrdFrmTrace.hh \ - XrdFrmTSort.hh \ - XrdFrmTransfer.hh\ -- XrdFrmUtils.hh \ + XrdFrmUtils.hh \ + XrdFrmXAttr.hh \ - XrdFrmXfrAgent.hh\ - XrdFrmXfrDaemon.hh\ - XrdFrmXfrJob.hh \ -- XrdFrmXfrQueue.hh -+ XrdFrmUtils.hh +- XrdFrmXfrQueue.hh \ + XrdFrmXLock.hh lib_LTLIBRARIES = libXrdFrm.la @@ -131,6 +132,7 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrm/Makefile.am xrootd-3.0.2/src/XrdFrm/Makefi - XrdFrmAdminMain.cc \ - XrdFrmAdmin.cc \ - XrdFrmAdminAudit.cc \ +- XrdFrmAdminConvert.cc \ - XrdFrmAdminFiles.cc \ - XrdFrmAdminFind.cc \ - XrdFrmAdminQuery.cc \ @@ -178,10 +180,10 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrm/Makefile.am xrootd-3.0.2/src/XrdFrm/Makefi - -frm_xfrd_LDFLAGS = -static -export-dynamic -ldl - -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.2/src/XrdFrmUtil/Makefile.am ---- xrootd-3.0.2.orig/src/XrdFrmUtil/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/Makefile.am 2011-01-29 09:00:20.995829836 +0100 -@@ -19,38 +19,10 @@ +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.3/src/XrdFrmUtil/Makefile.am +--- xrootd-3.0.3.orig/src/XrdFrmUtil/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/Makefile.am 2011-04-22 10:32:55.411376079 +0200 +@@ -19,40 +19,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(READLINE_INCDIR) ############################################################################# @@ -209,10 +211,12 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.2/src/XrdFrmUti - XrdFrmTSort.hh \ - XrdFrmTransfer.hh\ - XrdFrmUtils.hh \ +- XrdFrmXAttr.hh \ - XrdFrmXfrAgent.hh\ - XrdFrmXfrDaemon.hh\ - XrdFrmXfrJob.hh \ -- XrdFrmXfrQueue.hh +- XrdFrmXfrQueue.hh \ +- XrdFrmXLock.hh - - -lib_LTLIBRARIES = libXrdFrm.la @@ -220,7 +224,7 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.2/src/XrdFrmUti # Convenience libs to use for objs common to multiple binaries in this dir noinst_LTLIBRARIES = libXrdFrmConv.la libXrdFrmConvAgent.la -@@ -59,7 +31,10 @@ +@@ -61,7 +31,10 @@ ## Build rules @@ -232,10 +236,11 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.2/src/XrdFrmUti libXrdFrmConvAgent_la_SOURCES = XrdFrmReqBoss.cc \ XrdFrmTransfer.cc \ -@@ -69,29 +44,6 @@ +@@ -70,30 +43,6 @@ + XrdFrmMigrate.cc \ XrdFrmXfrQueue.cc - +- -libXrdFrm_la_SOURCES = \ - XrdFrmCID.cc \ - XrdFrmFiles.cc \ @@ -262,7 +267,7 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.2/src/XrdFrmUti frm_admin_SOURCES = \ XrdFrmAdminMain.cc \ XrdFrmAdmin.cc \ -@@ -101,45 +53,46 @@ +@@ -104,45 +53,46 @@ XrdFrmAdminQuery.cc \ XrdFrmAdminUnlink.cc @@ -305,8 +310,8 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.2/src/XrdFrmUti - libXrdFrm.la \ - ../XrdOuc/libXrdOuc.la XrdFrmProxy.o +frm_xfragent_LDADD = libXrdFrmConvAgent.la \ -+ ../XrdOss/libXrdOss.la \ + libXrdFrmConv.la \ ++ ../XrdOss/libXrdOss.la \ + ../XrdFrm/libXrdFrm.la \ + ../XrdOuc/libXrdOuc.la @@ -321,18 +326,18 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.2/src/XrdFrmUti - libXrdFrm.la \ - ../XrdOuc/libXrdOuc.la XrdFrmProxy.o +frm_xfrd_LDADD = libXrdFrmConvAgent.la \ -+ ../XrdOss/libXrdOss.la \ + libXrdFrmConv.la \ ++ ../XrdOss/libXrdOss.la \ + ../XrdFrm/libXrdFrm.la \ + ../XrdOuc/libXrdOuc.la -frm_xfrd_LDFLAGS = -static -export-dynamic -ldl +frm_xfrd_LDFLAGS = -static -export-dynamic -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminAudit.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminAudit.cc 2011-01-29 08:58:59.434932659 +0100 -@@ -14,9 +14,9 @@ +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminAudit.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminAudit.cc 2011-04-22 09:05:10.105430591 +0200 +@@ -12,9 +12,9 @@ #include #include @@ -345,10 +350,10 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc xrootd-3.0.2/src/X #include "XrdFrm/XrdFrmTrace.hh" #include "XrdFrm/XrdFrmUtils.hh" #include "XrdOss/XrdOssPath.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdmin.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdmin.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdmin.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdmin.cc 2011-01-29 08:58:59.436932633 +0100 -@@ -21,8 +21,8 @@ +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdmin.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdmin.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdmin.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdmin.cc 2011-04-22 09:05:10.141431310 +0200 +@@ -19,8 +19,8 @@ #include #include @@ -359,10 +364,26 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdmin.cc xrootd-3.0.2/src/XrdFrm #include "XrdFrm/XrdFrmProxy.hh" #include "XrdFrm/XrdFrmTrace.hh" #include "XrdFrm/XrdFrmUtils.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminFiles.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminFiles.cc 2011-01-29 08:58:59.465932241 +0100 -@@ -22,9 +22,9 @@ +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminConvert.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminConvert.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminConvert.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminConvert.cc 2011-04-22 14:03:02.445775638 +0200 +@@ -14,9 +14,9 @@ + #include + #include + +-#include "XrdFrm/XrdFrmAdmin.hh" +-#include "XrdFrm/XrdFrmConfig.hh" +-#include "XrdFrm/XrdFrmFiles.hh" ++#include "XrdFrmUtil/XrdFrmAdmin.hh" ++#include "XrdFrmUtil/XrdFrmConfig.hh" ++#include "XrdFrmUtil/XrdFrmFiles.hh" + #include "XrdFrm/XrdFrmTrace.hh" + #include "XrdFrm/XrdFrmUtils.hh" + #include "XrdFrm/XrdFrmXAttr.hh" +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminFiles.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminFiles.cc 2011-04-22 09:05:10.142431336 +0200 +@@ -19,9 +19,9 @@ #include #include @@ -373,13 +394,13 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc xrootd-3.0.2/src/X +#include "XrdFrmUtil/XrdFrmConfig.hh" +#include "XrdFrmUtil/XrdFrmFiles.hh" #include "XrdFrm/XrdFrmUtils.hh" + #include "XrdFrm/XrdFrmXAttr.hh" - using namespace XrdFrm; -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminFind.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminFind.cc 2011-01-29 08:58:59.466932228 +0100 -@@ -15,9 +15,9 @@ - #include +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminFind.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminFind.cc 2011-04-22 09:05:10.143431364 +0200 +@@ -14,9 +14,9 @@ + #include #include -#include "XrdFrm/XrdFrmAdmin.hh" @@ -391,9 +412,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc xrootd-3.0.2/src/Xr #include "XrdFrm/XrdFrmTrace.hh" #include "XrdOuc/XrdOucArgs.hh" #include "XrdOuc/XrdOucNSWalk.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminMain.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminMain.cc 2011-01-29 08:58:59.490931903 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminMain.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminMain.cc 2011-04-22 09:05:10.143431364 +0200 @@ -53,8 +53,8 @@ #include #endif @@ -405,10 +426,10 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc xrootd-3.0.2/src/Xr #include "XrdFrm/XrdFrmTrace.hh" #include "XrdNet/XrdNetOpts.hh" #include "XrdNet/XrdNetSocket.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminQuery.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminQuery.cc 2011-01-29 08:58:59.491931889 +0100 -@@ -18,9 +18,9 @@ +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminQuery.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminQuery.cc 2011-04-22 09:05:10.144431402 +0200 +@@ -16,9 +16,9 @@ #include #include @@ -421,9 +442,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc xrootd-3.0.2/src/X #include "XrdFrm/XrdFrmProxy.hh" #include "XrdFrm/XrdFrmRequest.hh" #include "XrdFrm/XrdFrmTrace.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminReloc.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminReloc.cc 2011-01-29 08:58:59.491931889 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminReloc.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminReloc.cc 2011-04-22 09:05:10.145431428 +0200 @@ -23,8 +23,8 @@ #include #include @@ -435,10 +456,10 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc xrootd-3.0.2/src/X #include "XrdFrm/XrdFrmTrace.hh" #include "XrdOss/XrdOss.hh" #include "XrdOss/XrdOssOpaque.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminUnlink.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminUnlink.cc 2011-01-29 08:58:59.492931875 +0100 -@@ -18,8 +18,8 @@ +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminUnlink.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminUnlink.cc 2011-04-22 09:05:10.146431448 +0200 +@@ -14,8 +14,8 @@ #include #include @@ -449,10 +470,10 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc xrootd-3.0.2/src/ #include "XrdFrm/XrdFrmTrace.hh" #include "XrdFrm/XrdFrmUtils.hh" #include "XrdNet/XrdNetCmsNotify.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmConfig.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmConfig.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmConfig.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmConfig.cc 2011-01-29 09:14:32.637302174 +0100 -@@ -24,8 +24,8 @@ +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmConfig.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmConfig.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmConfig.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmConfig.cc 2011-04-22 09:05:10.147431466 +0200 +@@ -20,8 +20,8 @@ #include #include "Xrd/XrdInfo.hh" @@ -463,10 +484,10 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmConfig.cc xrootd-3.0.2/src/XrdFr #include "XrdFrm/XrdFrmTrace.hh" #include "XrdFrm/XrdFrmUtils.hh" #include "XrdNet/XrdNetCmsNotify.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmFiles.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmFiles.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmFiles.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmFiles.cc 2011-01-29 08:58:59.493931862 +0100 -@@ -19,8 +19,8 @@ +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmFiles.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmFiles.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmFiles.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmFiles.cc 2011-04-22 09:05:10.149431502 +0200 +@@ -17,8 +17,8 @@ #include #include @@ -477,10 +498,10 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmFiles.cc xrootd-3.0.2/src/XrdFrm #include "XrdFrm/XrdFrmTrace.hh" #include "XrdOuc/XrdOucTList.hh" #include "XrdSys/XrdSysPlatform.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmMigrate.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmMigrate.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmMigrate.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmMigrate.cc 2011-01-29 08:58:59.494931849 +0100 -@@ -23,13 +23,13 @@ +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmMigrate.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmMigrate.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmMigrate.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmMigrate.cc 2011-04-22 09:05:10.150431521 +0200 +@@ -19,13 +19,13 @@ #include "XrdOss/XrdOssPath.hh" #include "XrdOuc/XrdOucNSWalk.hh" #include "XrdOuc/XrdOucTList.hh" @@ -499,9 +520,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmMigrate.cc xrootd-3.0.2/src/XrdF #include "XrdSys/XrdSysPthread.hh" #include "XrdSys/XrdSysPlatform.hh" #include "XrdSys/XrdSysTimer.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmMonitor.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmMonitor.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmMonitor.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmMonitor.cc 2011-01-29 09:14:32.629302283 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmMonitor.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmMonitor.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmMonitor.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmMonitor.cc 2011-04-22 09:05:10.151431541 +0200 @@ -20,7 +20,7 @@ #include @@ -511,10 +532,10 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmMonitor.cc xrootd-3.0.2/src/XrdF #include "XrdNet/XrdNet.hh" #include "XrdNet/XrdNetDNS.hh" #include "XrdNet/XrdNetPeer.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurge.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurge.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurge.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurge.cc 2011-01-29 08:58:59.494931849 +0100 -@@ -27,9 +27,9 @@ +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmPurge.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmPurge.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmPurge.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmPurge.cc 2011-04-22 09:05:10.152431563 +0200 +@@ -23,9 +23,9 @@ #include "XrdOuc/XrdOucProg.hh" #include "XrdOuc/XrdOucStream.hh" #include "XrdOuc/XrdOucUtils.hh" @@ -527,21 +548,21 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurge.cc xrootd-3.0.2/src/XrdFrm #include "XrdFrm/XrdFrmTrace.hh" #include "XrdSys/XrdSysPlatform.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurge.hh xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurge.hh ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurge.hh 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurge.hh 2011-01-29 08:58:59.495931836 +0100 -@@ -15,7 +15,7 @@ +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmPurge.hh xrootd-3.0.3/src/XrdFrmUtil/XrdFrmPurge.hh +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmPurge.hh 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmPurge.hh 2011-04-22 09:05:10.153431586 +0200 +@@ -13,7 +13,7 @@ #include #include -#include "XrdFrm/XrdFrmTSort.hh" +#include "XrdFrmUtil/XrdFrmTSort.hh" #include "XrdOss/XrdOssSpace.hh" - #include "XrdOuc/XrdOucHash.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurgMain.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurgMain.cc 2011-01-29 08:58:59.496931822 +0100 + class XrdFrmFileset; +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmPurgMain.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmPurgMain.cc 2011-04-22 09:05:10.154431608 +0200 @@ -65,8 +65,8 @@ #include #include @@ -553,9 +574,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc xrootd-3.0.2/src/Xrd #include "XrdFrm/XrdFrmTrace.hh" #include "XrdNet/XrdNetOpts.hh" #include "XrdNet/XrdNetSocket.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmReqBoss.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmReqBoss.cc 2011-01-29 08:58:59.496931822 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmReqBoss.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmReqBoss.cc 2011-04-22 09:05:10.154431608 +0200 @@ -22,10 +22,10 @@ #include @@ -569,10 +590,10 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc xrootd-3.0.2/src/XrdF #include "XrdNet/XrdNetMsg.hh" #include "XrdOuc/XrdOucUtils.hh" #include "XrdSys/XrdSysHeaders.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmTransfer.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmTransfer.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmTransfer.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmTransfer.cc 2011-01-29 09:14:32.628302296 +0100 -@@ -24,14 +24,14 @@ +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmTransfer.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmTransfer.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmTransfer.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmTransfer.cc 2011-04-22 09:06:45.922426702 +0200 +@@ -20,14 +20,14 @@ #include #include "XrdFrm/XrdFrmCID.hh" @@ -589,12 +610,12 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmTransfer.cc xrootd-3.0.2/src/Xrd +#include "XrdFrmUtil/XrdFrmTransfer.hh" +#include "XrdFrmUtil/XrdFrmXfrJob.hh" +#include "XrdFrmUtil/XrdFrmXfrQueue.hh" + #include "XrdFrm/XrdFrmXAttr.hh" #include "XrdNet/XrdNetCmsNotify.hh" #include "XrdOss/XrdOss.hh" - #include "XrdOss/XrdOssLock.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmTSort.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmTSort.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmTSort.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmTSort.cc 2011-01-29 08:58:59.498931794 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmTSort.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmTSort.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmTSort.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmTSort.cc 2011-04-22 09:05:10.156431649 +0200 @@ -12,8 +12,8 @@ const char *XrdFrmTSortCVSID = "$Id$"; @@ -606,9 +627,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmTSort.cc xrootd-3.0.2/src/XrdFrm //#include "iostream.h" /******************************************************************************/ -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrAgent.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrAgent.cc 2011-01-29 08:58:59.498931794 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrAgent.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrAgent.cc 2011-04-22 09:05:10.157431669 +0200 @@ -20,11 +20,11 @@ #include #include @@ -623,9 +644,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc xrootd-3.0.2/src/Xrd #include "XrdOuc/XrdOucStream.hh" #include "XrdSys/XrdSysPlatform.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrDaemon.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrDaemon.cc 2011-01-29 08:58:59.499931781 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrDaemon.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrDaemon.cc 2011-04-22 09:05:10.157431669 +0200 @@ -21,14 +21,14 @@ #include #include @@ -646,9 +667,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc xrootd-3.0.2/src/Xr #include "XrdNet/XrdNetOpts.hh" #include "XrdNet/XrdNetSocket.hh" #include "XrdOuc/XrdOucStream.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrDaemon.hh ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrDaemon.hh 2011-01-29 08:58:59.499931781 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrDaemon.hh +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrDaemon.hh 2011-04-22 09:05:10.173431999 +0200 @@ -12,7 +12,7 @@ // $Id$ @@ -658,9 +679,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh xrootd-3.0.2/src/Xr class XrdFrmXfrDaemon { -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrMain.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrMain.cc 2011-01-29 08:58:59.500931768 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrMain.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrMain.cc 2011-04-22 09:05:10.174432023 +0200 @@ -59,10 +59,10 @@ #include #include @@ -675,9 +696,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc xrootd-3.0.2/src/XrdF #include "XrdSys/XrdSysError.hh" #include "XrdSys/XrdSysHeaders.hh" #include "XrdSys/XrdSysLogger.hh" -diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrQueue.cc ---- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrQueue.cc 2011-01-29 08:58:59.500931768 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrQueue.cc +--- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrQueue.cc 2011-04-22 09:05:10.174432023 +0200 @@ -22,11 +22,11 @@ #include #include @@ -693,9 +714,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc xrootd-3.0.2/src/Xrd #include "XrdNet/XrdNetMsg.hh" #include "XrdOuc/XrdOucTList.hh" #include "XrdSys/XrdSysError.hh" -diff -ur xrootd-3.0.2.orig/src/XrdNet/Makefile.am xrootd-3.0.2/src/XrdNet/Makefile.am ---- xrootd-3.0.2.orig/src/XrdNet/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdNet/Makefile.am 2011-01-29 08:58:59.501931754 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdNet/Makefile.am xrootd-3.0.3/src/XrdNet/Makefile.am +--- xrootd-3.0.3.orig/src/XrdNet/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdNet/Makefile.am 2011-04-22 09:05:10.175432046 +0200 @@ -18,7 +18,7 @@ ############################################################################# ## deliverables (to be built / installed) @@ -725,9 +746,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdNet/Makefile.am xrootd-3.0.2/src/XrdNet/Makefi + ../XrdNetUtil/libXrdNetUtil.la \ + ../XrdSys/libXrdSys.la \ + $(LIBSOCKET) $(LIBNSL) -diff -ur xrootd-3.0.2.orig/src/XrdNetUtil/Makefile.am xrootd-3.0.2/src/XrdNetUtil/Makefile.am ---- xrootd-3.0.2.orig/src/XrdNetUtil/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdNetUtil/Makefile.am 2011-01-29 08:58:59.501931754 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdNetUtil/Makefile.am xrootd-3.0.3/src/XrdNetUtil/Makefile.am +--- xrootd-3.0.3.orig/src/XrdNetUtil/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdNetUtil/Makefile.am 2011-04-22 09:05:10.175432046 +0200 @@ -11,44 +11,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/src diff --git a/xrootd-cryptoload.patch b/xrootd-cryptoload.patch index c837d1f..64fa25e 100644 --- a/xrootd-cryptoload.patch +++ b/xrootd-cryptoload.patch @@ -1,17 +1,6 @@ -diff -ur xrootd.orig/configure.ac xrootd/configure.ac ---- xrootd.orig/configure.ac 2010-12-09 16:24:21.000000000 +0100 -+++ xrootd/configure.ac 2010-12-16 17:49:38.379327002 +0100 -@@ -421,6 +421,7 @@ - activate_gsi=disabled - else - AC_DEFINE(R__SSL) -+ AC_DEFINE(HAVE_XRDCRYPTO) - # note: -DPERL5 is needed for resolving a clash between unistd.h and - # openssl/des.h regarding the crypt function on some older systems (e.g. RH7.3) - if test 0"$vernum" -lt 907 ; then -diff -ur xrootd.orig/src/XrdCrypto/XrdCryptoFactory.cc xrootd/src/XrdCrypto/XrdCryptoFactory.cc ---- xrootd.orig/src/XrdCrypto/XrdCryptoFactory.cc 2010-12-09 16:24:21.000000000 +0100 -+++ xrootd/src/XrdCrypto/XrdCryptoFactory.cc 2010-12-16 17:16:32.610327002 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdCrypto/XrdCryptoFactory.cc xrootd-3.0.3/src/XrdCrypto/XrdCryptoFactory.cc +--- xrootd-3.0.3.orig/src/XrdCrypto/XrdCryptoFactory.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdCrypto/XrdCryptoFactory.cc 2011-04-22 13:07:25.146104405 +0200 @@ -378,7 +378,7 @@ // diff --git a/xrootd-dso.patch b/xrootd-dso.patch index b8cb28c..3b0d5b1 100644 --- a/xrootd-dso.patch +++ b/xrootd-dso.patch @@ -1,6 +1,6 @@ -diff -ur xrootd-3.0.2.orig/src/Xrd/Makefile.am xrootd-3.0.2/src/Xrd/Makefile.am ---- xrootd-3.0.2.orig/src/Xrd/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/Xrd/Makefile.am 2011-01-29 06:50:37.843565642 +0100 +diff -ur xrootd-3.0.3.orig/src/Xrd/Makefile.am xrootd-3.0.3/src/Xrd/Makefile.am +--- xrootd-3.0.3.orig/src/Xrd/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/Xrd/Makefile.am 2011-04-23 07:47:43.799204731 +0200 @@ -47,6 +47,11 @@ XrdScheduler.cc XrdScheduler.hh XrdJob.hh \ XrdStats.cc XrdStats.hh \ @@ -13,9 +13,9 @@ diff -ur xrootd-3.0.2.orig/src/Xrd/Makefile.am xrootd-3.0.2/src/Xrd/Makefile.am ## Extra sources that should go into the tarball -diff -ur xrootd-3.0.2.orig/src/XrdAcc/Makefile.am xrootd-3.0.2/src/XrdAcc/Makefile.am ---- xrootd-3.0.2.orig/src/XrdAcc/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdAcc/Makefile.am 2011-01-29 06:50:37.844565628 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdAcc/Makefile.am xrootd-3.0.3/src/XrdAcc/Makefile.am +--- xrootd-3.0.3.orig/src/XrdAcc/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdAcc/Makefile.am 2011-04-23 07:47:43.799204731 +0200 @@ -38,11 +38,11 @@ XrdAccCapability.cc XrdAccCapability.hh \ XrdAccConfig.cc XrdAccConfig.hh XrdAccAuthDB.hh \ @@ -32,9 +32,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdAcc/Makefile.am xrootd-3.0.2/src/XrdAcc/Makefi - ../XrdNet/libXrdNetUtil.la \ - -ldl + ../XrdSys/libXrdSys.la -diff -ur xrootd-3.0.2.orig/src/XrdApps/Makefile.am xrootd-3.0.2/src/XrdApps/Makefile.am ---- xrootd-3.0.2.orig/src/XrdApps/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdApps/Makefile.am 2011-01-29 07:02:48.336500256 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdApps/Makefile.am xrootd-3.0.3/src/XrdApps/Makefile.am +--- xrootd-3.0.3.orig/src/XrdApps/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdApps/Makefile.am 2011-04-23 07:47:43.852205381 +0200 @@ -32,17 +32,17 @@ ../XrdClient/libXrdClient.la \ ../XrdPosix/libXrdPosix.la \ @@ -75,9 +75,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdApps/Makefile.am xrootd-3.0.2/src/XrdApps/Make ../XrdSys/libXrdSys.la wait41_LDFLAGS = -static -export-dynamic -diff -ur xrootd-3.0.2.orig/src/XrdBwm/Makefile.am xrootd-3.0.2/src/XrdBwm/Makefile.am ---- xrootd-3.0.2.orig/src/XrdBwm/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdBwm/Makefile.am 2011-01-29 06:50:37.852565518 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdBwm/Makefile.am xrootd-3.0.3/src/XrdBwm/Makefile.am +--- xrootd-3.0.3.orig/src/XrdBwm/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdBwm/Makefile.am 2011-04-23 07:47:43.853205406 +0200 @@ -37,4 +37,8 @@ libXrdBwm_la_LIBADD = ../XrdAcc/libXrdAcc.la \ ../XrdNet/libXrdNet.la \ @@ -88,10 +88,10 @@ diff -ur xrootd-3.0.2.orig/src/XrdBwm/Makefile.am xrootd-3.0.2/src/XrdBwm/Makefi + $(LIBPTHREAD) + +libXrdBwm_la_LDFLAGS = -module -diff -ur xrootd-3.0.2.orig/src/XrdClient/Makefile.am xrootd-3.0.2/src/XrdClient/Makefile.am ---- xrootd-3.0.2.orig/src/XrdClient/Makefile.am 2011-01-29 06:43:32.481425196 +0100 -+++ xrootd-3.0.2/src/XrdClient/Makefile.am 2011-01-29 06:50:37.852565518 +0100 -@@ -77,22 +77,19 @@ +diff -ur xrootd-3.0.3.orig/src/XrdClient/Makefile.am xrootd-3.0.3/src/XrdClient/Makefile.am +--- xrootd-3.0.3.orig/src/XrdClient/Makefile.am 2011-04-23 07:46:53.932211598 +0200 ++++ xrootd-3.0.3/src/XrdClient/Makefile.am 2011-04-23 07:47:43.854205431 +0200 +@@ -80,22 +80,19 @@ XrdcpXtremeRead.cc XrdcpXtremeRead.hh libXrdClient_la_LIBADD = $(LIBSUNMATH) \ @@ -102,7 +102,7 @@ diff -ur xrootd-3.0.2.orig/src/XrdClient/Makefile.am xrootd-3.0.2/src/XrdClient/ ../XrdOuc/libXrdOuc.la \ + ../XrdNetUtil/libXrdNetUtil.la \ ../XrdSys/libXrdSys.la \ -- ../XrdNet/libXrdNetUtil.la +- ../XrdNet/libXrdNetUtil.la -lpthread + $(LIBPTHREAD) -ldl -clientlibs = libXrdClient.la \ @@ -112,13 +112,13 @@ diff -ur xrootd-3.0.2.orig/src/XrdClient/Makefile.am xrootd-3.0.2/src/XrdClient/ xrdcp_SOURCES = Xrdcp.cc # Note: static is required for Darwin. Linux and Solaris nicely manage to integrate # all needed symbols with shared lib linking - xrdcp_LDFLAGS = -static -export-dynamic + #xrdcp_LDFLAGS = -static -export-dynamic -xrdcp_LDADD = $(clientlibs) +xrdcp_LDADD = $(clientlibs) ../XrdCrypto/libXrdCrypto.la -ldl $(LIBZ) -@@ -114,13 +111,11 @@ +@@ -117,13 +114,11 @@ xprep_SOURCES = XrdClientPrep.cc xprep_LDADD = $(clientlibs) @@ -132,9 +132,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdClient/Makefile.am xrootd-3.0.2/src/XrdClient/ if ENABLE_JAVAINT libXrdClientAdminJNI_la_SOURCES = XrdClientAdminJNI.cc -diff -ur xrootd-3.0.2.orig/src/XrdCms/Makefile.am xrootd-3.0.2/src/XrdCms/Makefile.am ---- xrootd-3.0.2.orig/src/XrdCms/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdCms/Makefile.am 2011-01-29 06:50:37.860565408 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdCms/Makefile.am xrootd-3.0.3/src/XrdCms/Makefile.am +--- xrootd-3.0.3.orig/src/XrdCms/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdCms/Makefile.am 2011-04-23 07:47:43.855205452 +0200 @@ -61,9 +61,12 @@ @@ -151,7 +151,7 @@ diff -ur xrootd-3.0.2.orig/src/XrdCms/Makefile.am xrootd-3.0.2/src/XrdCms/Makefi cmsd_SOURCES = \ XrdCmsAdmin.cc \ -@@ -92,14 +95,13 @@ +@@ -93,14 +96,13 @@ @@ -170,9 +170,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdCms/Makefile.am xrootd-3.0.2/src/XrdCms/Makefi cmsd_LDFLAGS = -static -export-dynamic -diff -ur xrootd-3.0.2.orig/src/XrdCns/Makefile.am xrootd-3.0.2/src/XrdCns/Makefile.am ---- xrootd-3.0.2.orig/src/XrdCns/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdCns/Makefile.am 2011-01-29 06:50:37.860565408 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdCns/Makefile.am xrootd-3.0.3/src/XrdCns/Makefile.am +--- xrootd-3.0.3.orig/src/XrdCns/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdCns/Makefile.am 2011-04-23 07:47:43.856205472 +0200 @@ -47,16 +47,15 @@ XrdCnsXref.cc @@ -210,9 +210,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdCns/Makefile.am xrootd-3.0.2/src/XrdCns/Makefi cns_ssi_LDFLAGS = -static -export-dynamic - -$(OBJECT_CNS_SSI) $(BINLIBS) $(LIBM) $(LIBS) -diff -ur xrootd-3.0.2.orig/src/XrdCrypto/Makefile.am xrootd-3.0.2/src/XrdCrypto/Makefile.am ---- xrootd-3.0.2.orig/src/XrdCrypto/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdCrypto/Makefile.am 2011-01-29 06:50:37.861565394 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdCrypto/Makefile.am xrootd-3.0.3/src/XrdCrypto/Makefile.am +--- xrootd-3.0.3.orig/src/XrdCrypto/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdCrypto/Makefile.am 2011-04-23 07:47:43.856205472 +0200 @@ -43,11 +43,8 @@ XrdCryptosslX509.cc XrdCryptosslX509.hh \ XrdCryptosslX509Crl.cc XrdCryptosslX509Crl.hh \ @@ -269,32 +269,45 @@ diff -ur xrootd-3.0.2.orig/src/XrdCrypto/Makefile.am xrootd-3.0.2/src/XrdCrypto/ $(OPENSSL_LIBDIR) -lssl -lcrypto libXrdCryptossl_la_LDFLAGS = -module libXrdCryptossl_la_CXXFLAGS = $(SSLCXXFLAGS) -diff -ur xrootd-3.0.2.orig/src/XrdFfs/Makefile.am xrootd-3.0.2/src/XrdFfs/Makefile.am ---- xrootd-3.0.2.orig/src/XrdFfs/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdFfs/Makefile.am 2011-01-29 06:50:37.861565394 +0100 -@@ -42,15 +42,12 @@ +diff -ur xrootd-3.0.3.orig/src/XrdFfs/Makefile.am xrootd-3.0.3/src/XrdFfs/Makefile.am +--- xrootd-3.0.3.orig/src/XrdFfs/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdFfs/Makefile.am 2011-04-23 07:47:43.857205492 +0200 +@@ -41,14 +41,12 @@ + XrdFfsPosix.cc \ XrdFfsQueue.cc \ XrdFfsWcache.cc - --libXrdFfs_la_LIBADD = ../XrdPosix/libXrdPosix.la \ +libXrdFfs_la_LIBADD = ../XrdSecsss/libXrdSecsssUtil.la \ + ../XrdPosix/libXrdPosix.la \ - ../XrdClient/libXrdClient.la \ -- ../XrdSec/libXrdSec.la \ -- ../XrdSecsss/libXrdSecsss.la \ -- ../XrdNet/libXrdNet.la \ -- ../XrdNet/libXrdNetUtil.la \ - ../XrdOuc/libXrdOuc.la \ - ../XrdSys/libXrdSys.la \ -- $(FUSELIB) ++ ../XrdClient/libXrdClient.la \ ++ ../XrdOuc/libXrdOuc.la \ ++ ../XrdSys/libXrdSys.la \ + $(LIBPTHREAD) xrootdfs_SOURCES = XrdFfsXrootdfs.cc --xrootdfs_LDADD = libXrdFfs.la +-xrootdfs_LDADD = libXrdFfs.la $(FUSELIB) \ +- ../XrdPosix/libXrdPosix.la \ +- ../XrdClient/libXrdClient.la \ +- ../XrdSec/libXrdSec.la \ +- ../XrdSecsss/libXrdSecsss.la \ +- ../XrdNet/libXrdNet.la \ +- ../XrdNet/libXrdNetUtil.la \ +- ../XrdOuc/libXrdOuc.la \ +- ../XrdSys/libXrdSys.la +xrootdfs_LDADD = libXrdFfs.la $(FUSELIB) -diff -ur xrootd-3.0.2.orig/src/XrdMon/Makefile.am xrootd-3.0.2/src/XrdMon/Makefile.am ---- xrootd-3.0.2.orig/src/XrdMon/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdMon/Makefile.am 2011-01-29 06:50:37.862565380 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdFrm/Makefile.am xrootd-3.0.3/src/XrdFrm/Makefile.am +--- xrootd-3.0.3.orig/src/XrdFrm/Makefile.am 2011-04-23 07:46:53.939211735 +0200 ++++ xrootd-3.0.3/src/XrdFrm/Makefile.am 2011-04-23 07:58:09.065642807 +0200 +@@ -54,7 +54,6 @@ + libXrdFrm_la_LIBADD = \ + ../XrdNet/libXrdNet.la \ + ../XrdOuc/libXrdOuc.la \ +- ../XrdNetUtil/libXrdNetUtil.la \ + ../XrdSys/libXrdSys.la + + libXrdFrm_la_LDFLAGS = -static +diff -ur xrootd-3.0.3.orig/src/XrdMon/Makefile.am xrootd-3.0.3/src/XrdMon/Makefile.am +--- xrootd-3.0.3.orig/src/XrdMon/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdMon/Makefile.am 2011-04-23 07:47:43.858205512 +0200 @@ -10,7 +10,7 @@ # global settings @@ -328,9 +341,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdMon/Makefile.am xrootd-3.0.2/src/XrdMon/Makefi - libXrdMonCommon.la \ No newline at end of file + libXrdMonCommon.la -diff -ur xrootd-3.0.2.orig/src/XrdMon/XrdMonArgParserConvert.hh xrootd-3.0.2/src/XrdMon/XrdMonArgParserConvert.hh ---- xrootd-3.0.2.orig/src/XrdMon/XrdMonArgParserConvert.hh 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdMon/XrdMonArgParserConvert.hh 2011-01-29 06:50:37.862565380 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdMon/XrdMonArgParserConvert.hh xrootd-3.0.3/src/XrdMon/XrdMonArgParserConvert.hh +--- xrootd-3.0.3.orig/src/XrdMon/XrdMonArgParserConvert.hh 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdMon/XrdMonArgParserConvert.hh 2011-04-23 07:47:43.859205532 +0200 @@ -12,6 +12,7 @@ #include "XrdMon/XrdMonException.hh" @@ -339,9 +352,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdMon/XrdMonArgParserConvert.hh xrootd-3.0.2/src #include /* atoi */ #include -diff -ur xrootd-3.0.2.orig/src/XrdOfs/Makefile.am xrootd-3.0.2/src/XrdOfs/Makefile.am ---- xrootd-3.0.2.orig/src/XrdOfs/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdOfs/Makefile.am 2011-01-29 06:50:37.863565366 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdOfs/Makefile.am xrootd-3.0.3/src/XrdOfs/Makefile.am +--- xrootd-3.0.3.orig/src/XrdOfs/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdOfs/Makefile.am 2011-04-23 07:47:43.864205631 +0200 @@ -18,11 +18,7 @@ XrdOfs.hh \ XrdOfsEvr.hh XrdOfsEvs.hh XrdOfsHandle.hh \ @@ -370,21 +383,21 @@ diff -ur xrootd-3.0.2.orig/src/XrdOfs/Makefile.am xrootd-3.0.2/src/XrdOfs/Makefi + ../XrdNetUtil/libXrdNetUtil.la \ + ../XrdSys/libXrdSys.la \ + $(LIBPTHREAD) -diff -ur xrootd-3.0.2.orig/src/XrdOss/Makefile.am xrootd-3.0.2/src/XrdOss/Makefile.am ---- xrootd-3.0.2.orig/src/XrdOss/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdOss/Makefile.am 2011-01-29 06:50:37.863565366 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdOss/Makefile.am xrootd-3.0.3/src/XrdOss/Makefile.am +--- xrootd-3.0.3.orig/src/XrdOss/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdOss/Makefile.am 2011-04-23 07:47:43.865205651 +0200 @@ -41,4 +41,7 @@ - XrdOssSpace.cc XrdOssSpace.hh \ XrdOssStat.cc \ XrdOssUnlink.cc + -libXrdOss_la_LIBADD = $(LIBRT) +libXrdOss_la_LIBADD = ../XrdFrm/libXrdFrm.la \ + ../XrdOuc/libXrdOuc.la \ + ../XrdSys/libXrdSys.la \ + $(LIBRT) $(LIBPTHREAD) -diff -ur xrootd-3.0.2.orig/src/XrdOuc/Makefile.am xrootd-3.0.2/src/XrdOuc/Makefile.am ---- xrootd-3.0.2.orig/src/XrdOuc/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdOuc/Makefile.am 2011-01-29 06:50:37.864565352 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdOuc/Makefile.am xrootd-3.0.3/src/XrdOuc/Makefile.am +--- xrootd-3.0.3.orig/src/XrdOuc/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdOuc/Makefile.am 2011-04-23 07:47:43.866205671 +0200 @@ -57,18 +57,10 @@ XrdOucTrace.cc XrdOucTrace.hh \ XrdOucUtils.cc XrdOucUtils.hh @@ -407,9 +420,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdOuc/Makefile.am xrootd-3.0.2/src/XrdOuc/Makefi -# XrdSys/XrdSysLogger.cc # TODO: again as in classic? REFAC libXrdOuc_la_CXXFLAGS = -prefer-pic # TODO: again as in classic? REFAC libXrdOuc_la_LDFLAGS = -static -diff -ur xrootd-3.0.2.orig/src/XrdPosix/Makefile.am xrootd-3.0.2/src/XrdPosix/Makefile.am ---- xrootd-3.0.2.orig/src/XrdPosix/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdPosix/Makefile.am 2011-01-29 06:50:37.864565352 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdPosix/Makefile.am xrootd-3.0.3/src/XrdPosix/Makefile.am +--- xrootd-3.0.3.orig/src/XrdPosix/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdPosix/Makefile.am 2011-04-23 07:47:43.866205671 +0200 @@ -41,10 +41,9 @@ XrdPosixXrootd.cc @@ -430,27 +443,31 @@ diff -ur xrootd-3.0.2.orig/src/XrdPosix/Makefile.am xrootd-3.0.2/src/XrdPosix/Ma -# ../XrdSec/libXrdSec.la \ # ../XrdSys/libXrdSys.la -diff -ur xrootd-3.0.2.orig/src/XrdPss/Makefile.am xrootd-3.0.2/src/XrdPss/Makefile.am ---- xrootd-3.0.2.orig/src/XrdPss/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdPss/Makefile.am 2011-01-29 06:50:37.865565338 +0100 -@@ -21,10 +21,9 @@ +diff -ur xrootd-3.0.3.orig/src/XrdPss/Makefile.am xrootd-3.0.3/src/XrdPss/Makefile.am +--- xrootd-3.0.3.orig/src/XrdPss/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdPss/Makefile.am 2011-04-23 07:47:43.866205671 +0200 +@@ -20,12 +20,11 @@ + XrdPssAio.cc \ XrdPssConfig.cc - libXrdPss_la_LIBADD = ../XrdFfs/libXrdFfs.la \ -- ../XrdClient/libXrdClient.la \ -- ../XrdSecsss//libXrdSecsss.la \ -- ../XrdSec//libXrdSec.la \ +-libXrdPss_la_LIBADD = ../XrdClient/libXrdClient.la \ ++libXrdPss_la_LIBADD = \ + ../XrdFfs/libXrdFfs.la \ - ../XrdNet/libXrdNet.la \ - ../XrdNet/libXrdNetUtil.la \ + ../XrdPosix/libXrdPosix.la \ ../XrdOuc/libXrdOuc.la \ +- ../XrdSec//libXrdSec.la \ +- ../XrdSecsss//libXrdSecsss.la \ +- ../XrdSys/libXrdSys.la \ +- ../XrdPosix/libXrdPosix.la + ../XrdNetUtil/libXrdNetUtil.la \ - ../XrdSys/libXrdSys.la ++ ../XrdSys/libXrdSys.la + +libXrdPss_la_LDFLAGS = -module -diff -ur xrootd-3.0.2.orig/src/XrdRootd/Makefile.am xrootd-3.0.2/src/XrdRootd/Makefile.am ---- xrootd-3.0.2.orig/src/XrdRootd/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdRootd/Makefile.am 2011-01-29 06:50:37.865565338 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdRootd/Makefile.am xrootd-3.0.3/src/XrdRootd/Makefile.am +--- xrootd-3.0.3.orig/src/XrdRootd/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdRootd/Makefile.am 2011-04-23 07:47:43.867205691 +0200 @@ -13,4 +13,5 @@ INCLUDES = -I$(top_srcdir)/src @@ -458,9 +475,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdRootd/Makefile.am xrootd-3.0.2/src/XrdRootd/Ma -libXrdRootd_la_LIBADD = ../XrdOuc/libXrdOuc.la +libXrdRootd_la_LIBADD = ../Xrd/libXrd.la ../XrdSys/libXrdSys.la +libXrdRootd_la_LDFLAGS = -module -diff -ur xrootd-3.0.2.orig/src/XrdSec/Makefile.am xrootd-3.0.2/src/XrdSec/Makefile.am ---- xrootd-3.0.2.orig/src/XrdSec/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdSec/Makefile.am 2011-01-29 06:50:37.866565325 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdSec/Makefile.am xrootd-3.0.3/src/XrdSec/Makefile.am +--- xrootd-3.0.3.orig/src/XrdSec/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdSec/Makefile.am 2011-04-23 07:47:43.867205691 +0200 @@ -16,47 +16,42 @@ ############################################################################# @@ -472,7 +489,7 @@ diff -ur xrootd-3.0.2.orig/src/XrdSec/Makefile.am xrootd-3.0.2/src/XrdSec/Makefi +noinst_LTLIBRARIES = libXrdSecUtil.la libXrdSecTLayer.la + - bin_PROGRAMS = testclient testserver + noinst_PROGRAMS = testclient testserver ############################################################################# # Build rules @@ -526,12 +543,12 @@ diff -ur xrootd-3.0.2.orig/src/XrdSec/Makefile.am xrootd-3.0.2/src/XrdSec/Makefi - ../XrdSys/libXrdSys.la \ - ../XrdNet/libXrdNetUtil.la + ../XrdSys/libXrdSys.la -diff -ur xrootd-3.0.2.orig/src/XrdSecgsi/Makefile.am xrootd-3.0.2/src/XrdSecgsi/Makefile.am ---- xrootd-3.0.2.orig/src/XrdSecgsi/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdSecgsi/Makefile.am 2011-01-29 06:50:37.866565325 +0100 -@@ -12,8 +12,7 @@ - +diff -ur xrootd-3.0.3.orig/src/XrdSecgsi/Makefile.am xrootd-3.0.3/src/XrdSecgsi/Makefile.am +--- xrootd-3.0.3.orig/src/XrdSecgsi/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdSecgsi/Makefile.am 2011-04-23 08:00:34.132591340 +0200 +@@ -13,8 +13,7 @@ bin_PROGRAMS = xrdgsiproxy + man1_MANS = xrdgsiproxy.1 -# TODO: xrdsecgsitest no longer builds -#check_PROGRAMS = xrdsecgsitest @@ -539,7 +556,7 @@ diff -ur xrootd-3.0.2.orig/src/XrdSecgsi/Makefile.am xrootd-3.0.2/src/XrdSecgsi/ INCLUDES = -I$(top_srcdir)/src -@@ -21,14 +20,15 @@ +@@ -22,14 +21,15 @@ XrdSecProtocolgsi.cc XrdSecProtocolgsi.hh XrdSecgsiTrace.hh libXrdSecgsi_la_LDFLAGS = -module @@ -556,12 +573,12 @@ diff -ur xrootd-3.0.2.orig/src/XrdSecgsi/Makefile.am xrootd-3.0.2/src/XrdSecgsi/ + ../XrdOuc/libXrdOuc.la \ + ../XrdNetUtil/libXrdNetUtil.la \ + ../XrdSys/libXrdSys.la \ -+ $(OPENSSL_LIBDIR) -lssl -lcrypto ++ $(OPENSSL_LIBDIR) -lcrypto +libXrdSecgsi_la_LIBTOOLFLAGS = --tag=disable-static # GridMAP function looking up an LDAP database libXrdSecgsiGMAPLADP_la_SOURCES = XrdSecgsiGMAPFunLDAP.cc -@@ -36,16 +36,15 @@ +@@ -37,16 +37,15 @@ xrdgsiproxy_SOURCES = XrdSecgsiProxy.cc xrdgsiproxy_LDFLAGS = -static @@ -587,9 +604,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdSecgsi/Makefile.am xrootd-3.0.2/src/XrdSecgsi/ +xrdsecgsitest_LDADD = ../XrdCrypto/libXrdSSLutil.la \ + ../XrdCrypto/libXrdCrypto.la \ + $(OPENSSL_LIBDIR) -lssl -lcrypto -diff -ur xrootd-3.0.2.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc xrootd-3.0.2/src/XrdSecgsi/XrdSecProtocolgsi.cc ---- xrootd-3.0.2.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdSecgsi/XrdSecProtocolgsi.cc 2011-01-29 06:50:37.868565298 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc xrootd-3.0.3/src/XrdSecgsi/XrdSecProtocolgsi.cc +--- xrootd-3.0.3.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdSecgsi/XrdSecProtocolgsi.cc 2011-04-23 07:47:43.869205731 +0200 @@ -150,6 +150,7 @@ XrdOucTrace *XrdSecProtocolgsi::GSITrace = 0; @@ -598,9 +615,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc xrootd-3.0.2/src/X /******************************************************************************/ /* S t a t i c F u n c t i o n s */ -diff -ur xrootd-3.0.2.orig/src/XrdSecgsi/XrdSecgsiProxy.cc xrootd-3.0.2/src/XrdSecgsi/XrdSecgsiProxy.cc ---- xrootd-3.0.2.orig/src/XrdSecgsi/XrdSecgsiProxy.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdSecgsi/XrdSecgsiProxy.cc 2011-01-29 06:50:37.869565284 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdSecgsi/XrdSecgsiProxy.cc xrootd-3.0.3/src/XrdSecgsi/XrdSecgsiProxy.cc +--- xrootd-3.0.3.orig/src/XrdSecgsi/XrdSecgsiProxy.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdSecgsi/XrdSecgsiProxy.cc 2011-04-23 07:47:43.871205770 +0200 @@ -94,6 +94,7 @@ static XrdSysLogger Logger; static XrdSysError eDest(0,"proxy_"); @@ -609,9 +626,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdSecgsi/XrdSecgsiProxy.cc xrootd-3.0.2/src/XrdS int main( int argc, char **argv ) { -diff -ur xrootd-3.0.2.orig/src/XrdSecgsi/XrdSecgsitest.cc xrootd-3.0.2/src/XrdSecgsi/XrdSecgsitest.cc ---- xrootd-3.0.2.orig/src/XrdSecgsi/XrdSecgsitest.cc 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdSecgsi/XrdSecgsitest.cc 2011-01-29 06:50:37.870565270 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdSecgsi/XrdSecgsitest.cc xrootd-3.0.3/src/XrdSecgsi/XrdSecgsitest.cc +--- xrootd-3.0.3.orig/src/XrdSecgsi/XrdSecgsitest.cc 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdSecgsi/XrdSecgsitest.cc 2011-04-23 07:47:43.872205790 +0200 @@ -52,6 +52,7 @@ static XrdSysLogger Logger; static XrdSysError eDest(0,"gsitest_"); @@ -620,9 +637,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdSecgsi/XrdSecgsitest.cc xrootd-3.0.2/src/XrdSe int main( int argc, char **argv ) { -diff -ur xrootd-3.0.2.orig/src/XrdSeckrb4/Makefile.am xrootd-3.0.2/src/XrdSeckrb4/Makefile.am ---- xrootd-3.0.2.orig/src/XrdSeckrb4/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdSeckrb4/Makefile.am 2011-01-29 06:50:37.870565270 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdSeckrb4/Makefile.am xrootd-3.0.3/src/XrdSeckrb4/Makefile.am +--- xrootd-3.0.3.orig/src/XrdSeckrb4/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdSeckrb4/Makefile.am 2011-04-23 07:47:43.872205790 +0200 @@ -13,6 +13,9 @@ INCLUDES = -I$(top_srcdir)/src $(KRB4_INCDIR) @@ -636,9 +653,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdSeckrb4/Makefile.am xrootd-3.0.2/src/XrdSeckrb -libXrdSeckrb4_la_LIBTOOLFLAGS = --tag=disable-static \ No newline at end of file +libXrdSeckrb4_la_LIBTOOLFLAGS = --tag=disable-static -diff -ur xrootd-3.0.2.orig/src/XrdSeckrb5/Makefile.am xrootd-3.0.2/src/XrdSeckrb5/Makefile.am ---- xrootd-3.0.2.orig/src/XrdSeckrb5/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdSeckrb5/Makefile.am 2011-01-29 06:50:37.871565256 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdSeckrb5/Makefile.am xrootd-3.0.3/src/XrdSeckrb5/Makefile.am +--- xrootd-3.0.3.orig/src/XrdSeckrb5/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdSeckrb5/Makefile.am 2011-04-23 07:47:43.873205810 +0200 @@ -22,9 +22,9 @@ libXrdSeckrb5_la_SOURCES = XrdSecProtocolkrb5.cc @@ -651,9 +668,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdSeckrb5/Makefile.am xrootd-3.0.2/src/XrdSeckrb $(KRB5_LIBDIR) -lkrb5 -lk5crypto -lcom_err libXrdSeckrb5_la_LDFLAGS = -module -diff -ur xrootd-3.0.2.orig/src/XrdSecpwd/Makefile.am xrootd-3.0.2/src/XrdSecpwd/Makefile.am ---- xrootd-3.0.2.orig/src/XrdSecpwd/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdSecpwd/Makefile.am 2011-01-29 06:50:37.871565256 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdSecpwd/Makefile.am xrootd-3.0.3/src/XrdSecpwd/Makefile.am +--- xrootd-3.0.3.orig/src/XrdSecpwd/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdSecpwd/Makefile.am 2011-04-23 07:47:43.873205810 +0200 @@ -20,7 +20,7 @@ ../XrdSut/libXrdSut.la \ ../XrdOuc/libXrdOuc.la \ @@ -672,9 +689,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdSecpwd/Makefile.am xrootd-3.0.2/src/XrdSecpwd/ - $(CRYPTLIB) $(OPENSSL_LIBDIR) -ldl -lcrypto + ../XrdOuc/libXrdOuc.la -diff -ur xrootd-3.0.2.orig/src/XrdSecsss/Makefile.am xrootd-3.0.2/src/XrdSecsss/Makefile.am ---- xrootd-3.0.2.orig/src/XrdSecsss/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdSecsss/Makefile.am 2011-01-29 06:50:37.871565256 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdSecsss/Makefile.am xrootd-3.0.3/src/XrdSecsss/Makefile.am +--- xrootd-3.0.3.orig/src/XrdSecsss/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdSecsss/Makefile.am 2011-04-23 07:47:43.874205830 +0200 @@ -19,34 +19,29 @@ ## deliverables (to be built / installed) lib_LTLIBRARIES = libXrdSecsss.la @@ -723,9 +740,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdSecsss/Makefile.am xrootd-3.0.2/src/XrdSecsss/ +xrdsssadmin_LDADD = libXrdSecsssUtil.la \ + ../XrdOuc/libXrdOuc.la \ + ../XrdSys/libXrdSys.la -diff -ur xrootd-3.0.2.orig/src/XrdSecunix/Makefile.am xrootd-3.0.2/src/XrdSecunix/Makefile.am ---- xrootd-3.0.2.orig/src/XrdSecunix/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdSecunix/Makefile.am 2011-01-29 06:50:37.872565242 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdSecunix/Makefile.am xrootd-3.0.3/src/XrdSecunix/Makefile.am +--- xrootd-3.0.3.orig/src/XrdSecunix/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdSecunix/Makefile.am 2011-04-23 07:47:43.875205850 +0200 @@ -13,9 +13,7 @@ INCLUDES = -I$(top_srcdir)/src $(KRB4_INCDIR) @@ -737,9 +754,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdSecunix/Makefile.am xrootd-3.0.2/src/XrdSecuni libXrdSecunix_la_LDFLAGS = -module libXrdSecunix_la_LIBTOOLFLAGS = --tag=disable-static -diff -ur xrootd-3.0.2.orig/src/XrdSut/Makefile.am xrootd-3.0.2/src/XrdSut/Makefile.am ---- xrootd-3.0.2.orig/src/XrdSut/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdSut/Makefile.am 2011-01-29 06:50:37.872565242 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdSut/Makefile.am xrootd-3.0.3/src/XrdSut/Makefile.am +--- xrootd-3.0.3.orig/src/XrdSut/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdSut/Makefile.am 2011-04-23 07:47:43.875205850 +0200 @@ -27,3 +27,6 @@ XrdSutPFile.cc XrdSutPFile.hh\ XrdSutPFEntry.cc XrdSutPFEntry.hh \ @@ -747,9 +764,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdSut/Makefile.am xrootd-3.0.2/src/XrdSut/Makefi + +libXrdSut_la_LIBADD = ../XrdOuc/libXrdOuc.la \ + ../XrdSys/libXrdSys.la -diff -ur xrootd-3.0.2.orig/src/XrdSys/Makefile.am xrootd-3.0.2/src/XrdSys/Makefile.am ---- xrootd-3.0.2.orig/src/XrdSys/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdSys/Makefile.am 2011-01-29 06:50:37.873565228 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdSys/Makefile.am xrootd-3.0.3/src/XrdSys/Makefile.am +--- xrootd-3.0.3.orig/src/XrdSys/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdSys/Makefile.am 2011-04-23 07:47:43.876205870 +0200 @@ -20,9 +20,6 @@ lib_LTLIBRARIES = libXrdSys.la @@ -758,9 +775,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdSys/Makefile.am xrootd-3.0.2/src/XrdSys/Makefi -noinst_LTLIBRARIES = libXrdSysErrLog.la - xrootdsysinc_HEADERS = \ - XrdSysDir.hh XrdSysLogger.hh XrdSysPlugin.hh \ - XrdSysPthread.hh XrdSysTimer.hh XrdWin32.hh \ -@@ -33,12 +30,10 @@ + XrdSysDir.hh XrdSysFAttr.hh XrdSysFAttrBsd.icc \ + XrdSysFAttrLnx.icc XrdSysFAttrMac.icc XrdSysFAttrSun.icc \ +@@ -35,12 +32,10 @@ ############################################################################# # Build rules @@ -772,10 +789,10 @@ diff -ur xrootd-3.0.2.orig/src/XrdSys/Makefile.am xrootd-3.0.2/src/XrdSys/Makefi XrdSysDir.cc XrdSysDir.hh \ + XrdSysError.cc XrdSysError.hh \ + XrdSysLogger.cc XrdSysLogger.hh \ + XrdSysFAttr.cc XrdSysFAttr.hh \ XrdSysPlugin.cc XrdSysPlugin.hh \ XrdSysPriv.cc XrdSysPriv.hh \ - XrdSysPlatform.cc \ -@@ -47,7 +42,7 @@ +@@ -50,7 +45,7 @@ XrdSysTimer.cc XrdSysTimer.hh \ XrdSysXSLock.cc XrdSysXSLock.hh @@ -784,9 +801,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdSys/Makefile.am xrootd-3.0.2/src/XrdSys/Makefi libXrdSys_la_CXXFLAGS = -prefer-pic # sources not named in rules that still need to get rolled into the distribution tarball -diff -ur xrootd-3.0.2.orig/src/XrdXrootd/Makefile.am xrootd-3.0.2/src/XrdXrootd/Makefile.am ---- xrootd-3.0.2.orig/src/XrdXrootd/Makefile.am 2011-01-26 17:44:32.000000000 +0100 -+++ xrootd-3.0.2/src/XrdXrootd/Makefile.am 2011-01-29 06:50:37.873565228 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdXrootd/Makefile.am xrootd-3.0.3/src/XrdXrootd/Makefile.am +--- xrootd-3.0.3.orig/src/XrdXrootd/Makefile.am 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdXrootd/Makefile.am 2011-04-23 07:47:43.876205870 +0200 @@ -39,21 +39,10 @@ xrootd_LDADD = -ldl \ ../Xrd/libXrd.la \ diff --git a/xrootd-gridsite.patch b/xrootd-gridsite.patch index 98cd6f5..890e660 100644 --- a/xrootd-gridsite.patch +++ b/xrootd-gridsite.patch @@ -1,6 +1,6 @@ -diff -ur xrootd.orig/src/XrdSecssl/libsslGridSite/Makefile.am xrootd/src/XrdSecssl/libsslGridSite/Makefile.am ---- xrootd.orig/src/XrdSecssl/libsslGridSite/Makefile.am 2010-12-09 16:24:21.000000000 +0100 -+++ xrootd/src/XrdSecssl/libsslGridSite/Makefile.am 2010-12-14 06:56:08.745850191 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdSecssl/libsslGridSite/Makefile.am xrootd-3.0.3/src/XrdSecssl/libsslGridSite/Makefile.am +--- xrootd-3.0.3.orig/src/XrdSecssl/libsslGridSite/Makefile.am 2011-04-23 08:41:53.482604721 +0200 ++++ xrootd-3.0.3/src/XrdSecssl/libsslGridSite/Makefile.am 2011-04-23 08:42:14.352038375 +0200 @@ -1,23 +1,6 @@ - - @@ -27,10 +27,10 @@ diff -ur xrootd.orig/src/XrdSecssl/libsslGridSite/Makefile.am xrootd/src/XrdSecs - - + grst_verifycallback.h -diff -ur xrootd.orig/src/XrdSecssl/Makefile.am xrootd/src/XrdSecssl/Makefile.am ---- xrootd.orig/src/XrdSecssl/Makefile.am 2010-12-09 16:24:21.000000000 +0100 -+++ xrootd/src/XrdSecssl/Makefile.am 2010-12-14 06:50:55.686850487 +0100 -@@ -14,38 +14,45 @@ +diff -ur xrootd-3.0.3.orig/src/XrdSecssl/Makefile.am xrootd-3.0.3/src/XrdSecssl/Makefile.am +--- xrootd-3.0.3.orig/src/XrdSecssl/Makefile.am 2011-04-23 08:41:53.482604721 +0200 ++++ xrootd-3.0.3/src/XrdSecssl/Makefile.am 2011-04-23 09:14:57.188690281 +0200 +@@ -14,38 +14,39 @@ lib_LTLIBRARIES = libXrdSecssl.la @@ -60,13 +60,13 @@ diff -ur xrootd.orig/src/XrdSecssl/Makefile.am xrootd/src/XrdSecssl/Makefile.am - -L${XROOTD_LIBDIR}/ \ - ../XrdSec/libXrdSec.la \ - ../XrdSys/libXrdSys.la \ -- ../XrdOuc/libXrdOuc.la \ +libXrdSecssl_la_SOURCES = +nodist_EXTRA_libXrdSecssl_la_SOURCES = dummy.cpp +libXrdSecssl_la_LIBADD = \ + libXrdSecsslUtil.la \ + ../XrdSec/libXrdSecTLayer.la \ - ../XrdNet/libXrdNet.la \ + ../XrdOuc/libXrdOuc.la \ +- ../XrdNet/libXrdNet.la \ - ${SSLLINKLIB} \ - libsslGridSite/libsslGridSite.la \ - ${OPENSSL_LIBDIR} \ @@ -75,11 +75,7 @@ diff -ur xrootd.orig/src/XrdSecssl/Makefile.am xrootd/src/XrdSecssl/Makefile.am - -module - -libXrdSecssl_la_CXXFLAGS = ${CXXFLAGS} -+ ../XrdOuc/libXrdOuc.la \ -+ ../XrdNetUtil/libXrdNetUtil.la \ -+ ../XrdSys/libXrdSys.la \ -+ $(LIBPTHREAD) \ -+ $(OPENSSL_LIBDIR) -lcrypto -lssl ++ $(OPENSSL_LIBDIR) -lssl -lcrypto +libXrdSecssl_la_LDFLAGS = -module xrdsecssltest_SOURCES = XrdSecProtocolsslTest.cc @@ -89,15 +85,13 @@ diff -ur xrootd.orig/src/XrdSecssl/Makefile.am xrootd/src/XrdSecssl/Makefile.am + ../XrdSec/libXrdSecTLayer.la \ + ../XrdNet/libXrdNet.la \ + ../XrdOuc/libXrdOuc.la \ -+ ../XrdNetUtil/libXrdNetUtil.la \ -+ ../XrdSys/libXrdSys.la \ + $(OPENSSL_LIBDIR) -lssl -lcrypto xrdsecssltest_LDFLAGS = -static -diff -ur xrootd.orig/src/XrdSecssl/XrdSecProtocolssl.cc xrootd/src/XrdSecssl/XrdSecProtocolssl.cc ---- xrootd.orig/src/XrdSecssl/XrdSecProtocolssl.cc 2010-12-09 16:24:21.000000000 +0100 -+++ xrootd/src/XrdSecssl/XrdSecProtocolssl.cc 2010-12-14 06:52:00.583850434 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdSecssl/XrdSecProtocolssl.cc xrootd-3.0.3/src/XrdSecssl/XrdSecProtocolssl.cc +--- xrootd-3.0.3.orig/src/XrdSecssl/XrdSecProtocolssl.cc 2011-04-23 08:41:53.481604703 +0200 ++++ xrootd-3.0.3/src/XrdSecssl/XrdSecProtocolssl.cc 2011-04-23 08:42:14.397038308 +0200 @@ -692,7 +692,7 @@ } @@ -115,9 +109,9 @@ diff -ur xrootd.orig/src/XrdSecssl/XrdSecProtocolssl.cc xrootd/src/XrdSecssl/Xrd } /*----------------------------------------------------------------------------*/ -diff -ur xrootd.orig/src/XrdSecssl/XrdSecProtocolssl.hh xrootd/src/XrdSecssl/XrdSecProtocolssl.hh ---- xrootd.orig/src/XrdSecssl/XrdSecProtocolssl.hh 2010-12-09 16:24:21.000000000 +0100 -+++ xrootd/src/XrdSecssl/XrdSecProtocolssl.hh 2010-12-14 06:50:55.694850487 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdSecssl/XrdSecProtocolssl.hh xrootd-3.0.3/src/XrdSecssl/XrdSecProtocolssl.hh +--- xrootd-3.0.3.orig/src/XrdSecssl/XrdSecProtocolssl.hh 2011-04-23 08:41:53.481604703 +0200 ++++ xrootd-3.0.3/src/XrdSecssl/XrdSecProtocolssl.hh 2011-04-23 08:42:14.399038382 +0200 @@ -52,7 +52,7 @@ #include "XrdSecssl/XrdSecProtocolsslTrace.hh" #include "XrdSecssl/XrdSecProtocolsslProc.hh" diff --git a/xrootd-headers.patch b/xrootd-headers.patch index d057e15..fb14470 100644 --- a/xrootd-headers.patch +++ b/xrootd-headers.patch @@ -1,6 +1,6 @@ -diff -ur xrootd-3.0.2.orig/src/XrdBwm/Makefile.am xrootd-3.0.2/src/XrdBwm/Makefile.am ---- xrootd-3.0.2.orig/src/XrdBwm/Makefile.am 2011-01-29 06:50:37.852565518 +0100 -+++ xrootd-3.0.2/src/XrdBwm/Makefile.am 2011-01-29 07:14:29.490860383 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdBwm/Makefile.am xrootd-3.0.3/src/XrdBwm/Makefile.am +--- xrootd-3.0.3.orig/src/XrdBwm/Makefile.am 2011-04-22 12:28:53.721992261 +0200 ++++ xrootd-3.0.3/src/XrdBwm/Makefile.am 2011-04-22 12:30:02.126371577 +0200 @@ -9,30 +9,20 @@ ####################################################################### @@ -38,9 +38,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdBwm/Makefile.am xrootd-3.0.2/src/XrdBwm/Makefi libXrdBwm_la_LIBADD = ../XrdAcc/libXrdAcc.la \ ../XrdNet/libXrdNet.la \ -diff -ur xrootd-3.0.2.orig/src/XrdCms/Makefile.am xrootd-3.0.2/src/XrdCms/Makefile.am ---- xrootd-3.0.2.orig/src/XrdCms/Makefile.am 2011-01-29 06:50:37.860565408 +0100 -+++ xrootd-3.0.2/src/XrdCms/Makefile.am 2011-01-30 10:34:26.344681405 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdCms/Makefile.am xrootd-3.0.3/src/XrdCms/Makefile.am +--- xrootd-3.0.3.orig/src/XrdCms/Makefile.am 2011-04-22 12:28:53.723992301 +0200 ++++ xrootd-3.0.3/src/XrdCms/Makefile.am 2011-04-22 12:40:49.906967849 +0200 @@ -22,19 +22,12 @@ xrootdcmsincdir = $(includedir)/xrootd/XrdCms @@ -49,7 +49,7 @@ diff -ur xrootd-3.0.2.orig/src/XrdCms/Makefile.am xrootd-3.0.2/src/XrdCms/Makefi -XrdCmsCache.hh XrdCmsManager.hh XrdCmsResp.hh \ -XrdCmsClient.hh XrdCmsMeter.hh XrdCmsRouting.hh \ -XrdCmsClientConfig.hh XrdCmsNash.hh XrdCmsNode.hh \ --XrdCmsKey.hh XrdCmsSecurity.hh \ +-XrdCmsKey.hh XrdCmsSecurity.hh XrdCmsBaseFS.hh \ -XrdCmsClientMan.hh XrdCmsPList.hh XrdCmsSelect.hh \ -XrdCmsClientMsg.hh XrdCmsParser.hh XrdCmsState.hh \ -XrdCmsCluster.hh XrdCmsPrepArgs.hh XrdCmsSupervisor.hh \ @@ -97,11 +97,12 @@ diff -ur xrootd-3.0.2.orig/src/XrdCms/Makefile.am xrootd-3.0.2/src/XrdCms/Makefi libXrdCms_la_LIBADD = libXrdCmsConv.la \ -@@ -69,29 +62,31 @@ +@@ -69,31 +62,32 @@ $(LIBPTHREAD) -ldl cmsd_SOURCES = \ - XrdCmsAdmin.cc \ +- XrdCmsBaseFS.cc \ - XrdCmsCache.cc \ - XrdCmsCluster.cc \ - XrdCmsConfig.cc \ @@ -124,7 +125,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdCms/Makefile.am xrootd-3.0.2/src/XrdCms/Makefi - XrdCmsState.cc \ - XrdCmsSupervisor.cc \ - XrdCmsXmiReq.cc +- + XrdCmsAdmin.cc XrdCmsAdmin.hh \ ++ XrdCmsBaseFS.cc XrdCmsBaseFS.hh \ + XrdCmsCache.cc XrdCmsCache.hh \ + XrdCmsCluster.cc XrdCmsCluster.hh \ + XrdCmsConfig.cc XrdCmsConfig.hh \ @@ -151,10 +154,10 @@ diff -ur xrootd-3.0.2.orig/src/XrdCms/Makefile.am xrootd-3.0.2/src/XrdCms/Makefi + XrdCmsXmiReq.cc XrdCmsXmiReq.hh - -diff -ur xrootd-3.0.2.orig/src/XrdCns/Makefile.am xrootd-3.0.2/src/XrdCns/Makefile.am ---- xrootd-3.0.2.orig/src/XrdCns/Makefile.am 2011-01-29 06:50:37.860565408 +0100 -+++ xrootd-3.0.2/src/XrdCns/Makefile.am 2011-01-29 07:28:23.379459198 +0100 + cmsd_LDADD = libXrdCms.la \ +diff -ur xrootd-3.0.3.orig/src/XrdCns/Makefile.am xrootd-3.0.3/src/XrdCns/Makefile.am +--- xrootd-3.0.3.orig/src/XrdCns/Makefile.am 2011-04-22 12:28:53.723992301 +0200 ++++ xrootd-3.0.3/src/XrdCns/Makefile.am 2011-04-22 12:30:02.182372759 +0200 @@ -9,42 +9,26 @@ ####################################################################### @@ -220,9 +223,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdCns/Makefile.am xrootd-3.0.2/src/XrdCns/Makefi cns_ssi_LDADD = \ ../XrdOuc/libXrdOuc.la \ -diff -ur xrootd-3.0.2.orig/src/XrdCrypto/Makefile.am xrootd-3.0.2/src/XrdCrypto/Makefile.am ---- xrootd-3.0.2.orig/src/XrdCrypto/Makefile.am 2011-01-29 06:50:37.861565394 +0100 -+++ xrootd-3.0.2/src/XrdCrypto/Makefile.am 2011-01-29 07:07:46.868386002 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdCrypto/Makefile.am xrootd-3.0.3/src/XrdCrypto/Makefile.am +--- xrootd-3.0.3.orig/src/XrdCrypto/Makefile.am 2011-04-22 12:28:53.724992321 +0200 ++++ xrootd-3.0.3/src/XrdCrypto/Makefile.am 2011-04-22 12:30:02.182372759 +0200 @@ -21,13 +21,22 @@ noinst_LTLIBRARIES = libXrdSSLutil.la @@ -253,9 +256,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdCrypto/Makefile.am xrootd-3.0.2/src/XrdCrypto/ check_PROGRAMS = xrdcryptotest -diff -ur xrootd-3.0.2.orig/src/XrdMon/Makefile.am xrootd-3.0.2/src/XrdMon/Makefile.am ---- xrootd-3.0.2.orig/src/XrdMon/Makefile.am 2011-01-29 06:50:37.862565380 +0100 -+++ xrootd-3.0.2/src/XrdMon/Makefile.am 2011-01-29 07:07:46.869385989 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdMon/Makefile.am xrootd-3.0.3/src/XrdMon/Makefile.am +--- xrootd-3.0.3.orig/src/XrdMon/Makefile.am 2011-04-22 12:28:53.726992361 +0200 ++++ xrootd-3.0.3/src/XrdMon/Makefile.am 2011-04-22 12:30:02.183372795 +0200 @@ -13,10 +13,6 @@ AM_LDFLAGS = -static @@ -290,9 +293,9 @@ diff -ur xrootd-3.0.2.orig/src/XrdMon/Makefile.am xrootd-3.0.2/src/XrdMon/Makefi ############################################################################# # Build rules -diff -ur xrootd-3.0.2.orig/src/XrdSecsss/Makefile.am xrootd-3.0.2/src/XrdSecsss/Makefile.am ---- xrootd-3.0.2.orig/src/XrdSecsss/Makefile.am 2011-01-29 06:50:37.871565256 +0100 -+++ xrootd-3.0.2/src/XrdSecsss/Makefile.am 2011-01-29 07:07:46.870385975 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdSecsss/Makefile.am xrootd-3.0.3/src/XrdSecsss/Makefile.am +--- xrootd-3.0.3.orig/src/XrdSecsss/Makefile.am 2011-04-22 12:28:53.747992785 +0200 ++++ xrootd-3.0.3/src/XrdSecsss/Makefile.am 2011-04-22 12:30:02.184372830 +0200 @@ -12,10 +12,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/src diff --git a/xrootd-init.patch b/xrootd-init.patch new file mode 100644 index 0000000..f232a95 --- /dev/null +++ b/xrootd-init.patch @@ -0,0 +1,54 @@ +diff -ur xrootd-3.0.3.orig/packaging/rhel/xrootd.functions xrootd-3.0.3/packaging/rhel/xrootd.functions +--- xrootd-3.0.3.orig/packaging/rhel/xrootd.functions 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/packaging/rhel/xrootd.functions 2011-04-23 06:58:54.770444143 +0200 +@@ -1,4 +1,3 @@ +-#!/bin/sh + #------------------------------------------------------------------------------- + # Library for handling xrootd daemons on RHEL + # Author: Lukasz Janyst (09.03.2011) +@@ -20,9 +19,6 @@ + + chown $XROOTD_USER:$XROOTD_GROUP -R /var/spool/xrootd + chown $XROOTD_USER:$XROOTD_GROUP -R /var/log/xrootd +- chown $XROOTD_USER:$XROOTD_GROUP -R /var/run/xrootd +- chown $XROOTD_USER:$XROOTD_GROUP -R /etc/xrootd +- chown $XROOTD_USER:$XROOTD_GROUP /etc/sysconfig/xrootd + } + + #------------------------------------------------------------------------------- +@@ -96,6 +92,8 @@ + chown $XROOTD_USER:$XROOTD_GROUP -R /var/spool/xrootd + fi + ++ mkdir -p /var/run/xrootd ++ chown $XROOTD_USER:$XROOTD_GROUP + checkDirectory /var/run/xrootd $XROOTD_USER $XROOTD_GROUP + if test $? -ne 0; then + chown $XROOTD_USER:$XROOTD_GROUP -R /var/run/xrootd +diff -ur xrootd-3.0.3.orig/packaging/rhel/xrootd.functions-slc4 xrootd-3.0.3/packaging/rhel/xrootd.functions-slc4 +--- xrootd-3.0.3.orig/packaging/rhel/xrootd.functions-slc4 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/packaging/rhel/xrootd.functions-slc4 2011-04-23 06:59:27.871088146 +0200 +@@ -1,4 +1,3 @@ +-#!/bin/sh + #------------------------------------------------------------------------------- + # Library for handling xrootd daemons on antique RHEL + # Author: Lukasz Janyst (18.03.2011) +@@ -20,9 +19,6 @@ + + chown $XROOTD_USER:$XROOTD_GROUP -R /var/spool/xrootd + chown $XROOTD_USER:$XROOTD_GROUP -R /var/log/xrootd +- chown $XROOTD_USER:$XROOTD_GROUP -R /var/run/xrootd +- chown $XROOTD_USER:$XROOTD_GROUP -R /etc/xrootd +- chown $XROOTD_USER:$XROOTD_GROUP /etc/sysconfig/xrootd + } + + #------------------------------------------------------------------------------- +@@ -96,6 +92,8 @@ + chown $XROOTD_USER:$XROOTD_GROUP -R /var/spool/xrootd + fi + ++ mkdir -p /var/run/xrootd ++ chown $XROOTD_USER:$XROOTD_GROUP + checkDirectory /var/run/xrootd $XROOTD_USER $XROOTD_GROUP + if test $? -ne 0; then + chown $XROOTD_USER:$XROOTD_GROUP -R /var/run/xrootd diff --git a/xrootd-man.patch b/xrootd-man.patch new file mode 100644 index 0000000..59ccdf3 --- /dev/null +++ b/xrootd-man.patch @@ -0,0 +1,12 @@ +diff -ur xrootd-3.0.3.orig/src/XrdClient/xrdcp.1 xrootd-3.0.3/src/XrdClient/xrdcp.1 +--- xrootd-3.0.3.orig/src/XrdClient/xrdcp.1 2011-04-11 13:24:37.000000000 +0200 ++++ xrootd-3.0.3/src/XrdClient/xrdcp.1 2011-04-22 23:07:39.364265045 +0200 +@@ -118,7 +118,7 @@ + .br + .TP + local file upload to a Castor instance using a specific service class and stager: +-.b ++.br + .B $ xrdcp /tmp/myfile root://.cern.ch//castor/cern.ch/data/myfile -ODstagerHost=$STAGE_HOST&svcClass=$STAGE_SVCCLASS + .br + [ you need to escape the '&' in the shell ] diff --git a/xrootd-xmi.patch b/xrootd-xmi.patch index 08a282d..cf6c950 100644 --- a/xrootd-xmi.patch +++ b/xrootd-xmi.patch @@ -1,6 +1,6 @@ -diff -ur xrootd-3.0.2.orig/src/XrdCms/Makefile.am xrootd-3.0.2/src/XrdCms/Makefile.am ---- xrootd-3.0.2.orig/src/XrdCms/Makefile.am 2011-01-30 10:34:26.344681405 +0100 -+++ xrootd-3.0.2/src/XrdCms/Makefile.am 2011-01-30 10:45:57.390201806 +0100 +diff -ur xrootd-3.0.3.orig/src/XrdCms/Makefile.am xrootd-3.0.3/src/XrdCms/Makefile.am +--- xrootd-3.0.3.orig/src/XrdCms/Makefile.am 2011-04-22 12:40:49.906967849 +0200 ++++ xrootd-3.0.3/src/XrdCms/Makefile.am 2011-04-22 13:15:57.854180302 +0200 @@ -25,9 +25,12 @@ XrdCmsClient.hh \ XrdCmsClientConfig.hh \ @@ -27,7 +27,7 @@ diff -ur xrootd-3.0.2.orig/src/XrdCms/Makefile.am xrootd-3.0.2/src/XrdCms/Makefi libXrdCms_la_LIBADD = libXrdCmsConv.la \ -@@ -78,15 +84,11 @@ +@@ -79,15 +85,11 @@ XrdCmsPrepArgs.cc XrdCmsPrepArgs.hh \ XrdCmsPrepare.cc XrdCmsPrepare.hh \ XrdCmsProtocol.cc XrdCmsProtocol.hh \ @@ -43,4 +43,4 @@ diff -ur xrootd-3.0.2.orig/src/XrdCms/Makefile.am xrootd-3.0.2/src/XrdCms/Makefi + XrdCmsSupervisor.cc XrdCmsSupervisor.hh - + cmsd_LDADD = libXrdCms.la \ diff --git a/xrootd.init b/xrootd.init deleted file mode 100644 index 8926044..0000000 --- a/xrootd.init +++ /dev/null @@ -1,86 +0,0 @@ -#! /bin/sh -# -# xrootd Start/Stop the XROOTD daemon -# -# chkconfig: - 20 80 -# description: The xrootd daemon is used to as file server and starter of -# the PROOF worker processes. -# -# processname: xrootd -# pidfile: /var/run/xrootd.pid -# config: - -XROOTD=/usr/bin/xrootd - -# Source function library. -. /etc/init.d/functions - -# Get config. -. /etc/sysconfig/network - -# Get xrootd config -[ -f /etc/sysconfig/xrootd ] && . /etc/sysconfig/xrootd - -# Configure the environment (optional) -[ ! -z "$XRDENVCONFIG" ] && [ -f "$XRDENVCONFIG" ] && . $XRDENVCONFIG - -# Check that networking is up. -if [ ${NETWORKING} = "no" ] -then - exit 0 -fi - -[ -x $XROOTD ] || exit 0 - -RETVAL=0 -prog="xrootd" - -start() { - echo -n $"Starting $prog: " - # Options are specified in /etc/sysconfig/xrootd . - # $XRDUSER *must* be the name of an existing non-privileged user. - daemon $XROOTD -b -l $XRDLOG -R $XRDUSER -c $XRDCF $XRDDEBUG - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xrootd - return $RETVAL -} - -stop() { - [ ! -f /var/lock/subsys/xrootd ] && return 0 || true - echo -n $"Stopping $prog: " - killproc xrootd - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xrootd - return $RETVAL -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status xrootd - RETVAL=$? - ;; - restart|reload) - stop - start - ;; - condrestart) - if [ -f /var/lock/subsys/xrootd ]; then - stop - start - fi - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 1 -esac - -exit $RETVAL diff --git a/xrootd.spec b/xrootd.spec index d2daa8b..1780362 100644 --- a/xrootd.spec +++ b/xrootd.spec @@ -4,8 +4,8 @@ Name: xrootd Epoch: 1 -Version: 3.0.2 -Release: 2%{?dist} +Version: 3.0.3 +Release: 1%{?dist} Summary: Extended ROOT file server Group: System Environment/Daemons @@ -17,11 +17,7 @@ Source0: http://xrootd.org/download/v%{version}/%{name}-%{version}.tar.gz # the root source archive: # ftp://root.cern.ch/root/root_v5.28.00.source.tar.gz Source1: xrootd-manpages.tar.gz -Source2: %{name}.init -Source3: %{name}.sysconfig -Source4: cmsd.init -Source5: cmsd.sysconfig -Source6: %{name}.logrotate +Source2: %{name}.logrotate Patch0: %{name}-jni.patch Patch1: %{name}-perl-java.patch Patch2: %{name}-circular-deps.patch @@ -33,6 +29,8 @@ Patch7: %{name}-headers.patch Patch8: %{name}-gridsite.patch Patch9: %{name}-cryptoload.patch Patch10: %{name}-xmi.patch +Patch11: %{name}-man.patch +Patch12: %{name}-init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf @@ -60,6 +58,8 @@ BuildRequires: graphviz BuildRequires: graphviz-gd %endif +Provides: %{name}-server = %{epoch}:%{version}-%{release} +Obsoletes: %{name}-server < %{epoch}:%{version}-%{release} Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires(pre): shadow-utils @@ -74,7 +74,7 @@ The Extended root file server consists of a file server called xrootd and a cluster management server called cmsd. The xrootd server was developed for the root analysis framework to -serve root files. However, the server is agnostic to filetypes and +serve root files. However, the server is agnostic to file types and provides POSIX-like access to any type of file. The cmsd server is the next generation version of the olbd server, @@ -114,7 +114,7 @@ Group: Applications/Internet Requires: %{name}-libs = %{epoch}:%{version}-%{release} %description fuse -This package contains the FUSE (filesystem in user space) xrootd mount +This package contains the FUSE (file system in user space) xrootd mount tool. %endif @@ -164,8 +164,8 @@ cp -p src/XrdNet/Makefile.am src/XrdNetUtil # Resolve libXrdFrm → libXrdOss → XrdFrm utilities circular dependencies mv src/XrdFrm src/XrdFrmUtil mkdir src/XrdFrm -for f in XrdFrmCID XrdFrmProxy XrdFrmReqAgent \ - XrdFrmReqFile XrdFrmRequest XrdFrmTrace XrdFrmUtils ; do +for f in XrdFrmCID XrdFrmProxy XrdFrmReqAgent XrdFrmReqFile XrdFrmRequest \ + XrdFrmTrace XrdFrmUtils XrdFrmXAttr XrdFrmXLock ; do mv src/XrdFrmUtil/$f.* src/XrdFrm done cp -p src/XrdFrmUtil/Makefile.am src/XrdFrm @@ -181,6 +181,8 @@ cp -p src/XrdFrmUtil/Makefile.am src/XrdFrm %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 # Turn off static linking find . -name Makefile.am -exec sed -e 's/ -static//g' -i {} ';' @@ -223,10 +225,6 @@ popd rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -# Names too generic -mv $RPM_BUILD_ROOT%{_bindir}/testclient $RPM_BUILD_ROOT%{_bindir}/xrdtestclient -mv $RPM_BUILD_ROOT%{_bindir}/testserver $RPM_BUILD_ROOT%{_bindir}/xrdtestserver - # Remove libtool archives rm $RPM_BUILD_ROOT%{_libdir}/*.la @@ -255,17 +253,42 @@ install -m 644 src/XrdClient/XrdClientAdminJNI.jar \ mkdir -p $RPM_BUILD_ROOT%{_initrddir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -install -p %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/%{name} -install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} -echo '# Put your xrootd configuration here' \ - > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.cf -install -p %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/cmsd -install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/cmsd -echo '# Put your cmsd configuration here' \ - > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cmsd.cf + +install -p packaging/rhel/cmsd.init \ + $RPM_BUILD_ROOT%{_initrddir}/cmsd +install -p packaging/rhel/frm_purged.init \ + $RPM_BUILD_ROOT%{_initrddir}/frm_purged +install -p packaging/rhel/frm_xfrd.init \ + $RPM_BUILD_ROOT%{_initrddir}/frm_xfrd +install -p packaging/rhel/%{name}.init \ + $RPM_BUILD_ROOT%{_initrddir}/%{name} + +sed s/%{name}.functions/%{name}-functions/ -i $RPM_BUILD_ROOT%{_initrddir}/* + +%if "%{?rhel}" == "4" +install -m 644 -p packaging/rhel/%{name}.functions-slc4 \ + $RPM_BUILD_ROOT%{_initrddir}/%{name}-functions +%else +install -m 644 -p packaging/rhel/%{name}.functions \ + $RPM_BUILD_ROOT%{_initrddir}/%{name}-functions +%endif + +sed -e 's/XROOTD_USER=daemon/XROOTD_USER=%{name}/g' \ + -e 's/XROOTD_GROUP=daemon/XROOTD_GROUP=%{name}/g' \ + packaging/rhel/%{name}.sysconfig > \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} +chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} + +install -m 644 packaging/common/%{name}-clustered.cfg \ + $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}-clustered.cfg +install -m 644 packaging/common/%{name}-standalone.cfg \ + $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}-standalone.cfg + mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name} + mkdir $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d -install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} +install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} # Man pages mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 @@ -285,8 +308,8 @@ rm -rf $RPM_BUILD_ROOT %pre getent group %{name} >/dev/null || groupadd -r %{name} -getent passwd %{name} >/dev/null || useradd -r -g %{name} \ - -d %{_sysconfdir}/%{name} -s /sbin/nologin -c "xrootd Server Account" %{name} +getent passwd %{name} >/dev/null || useradd -r -g %{name} -s /sbin/nologin \ + -d %{_localstatedir}/spool/%{name} -c "XRootD runtime user" %{name} # Remove obsolete service /sbin/service olbd stop >/dev/null 2>&1 || : @@ -296,34 +319,54 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} \ if [ $1 = 1 ]; then /sbin/chkconfig --add %{name} /sbin/chkconfig --add cmsd + /sbin/chkconfig --add frm_purged + /sbin/chkconfig --add frm_xfrd fi %preun if [ $1 = 0 ]; then /sbin/service %{name} stop >/dev/null 2>&1 || : /sbin/service cmsd stop >/dev/null 2>&1 || : + /sbin/service frm_purged stop >/dev/null 2>&1 || : + /sbin/service frm_xfrd stop >/dev/null 2>&1 || : /sbin/chkconfig --del %{name} /sbin/chkconfig --del cmsd + /sbin/chkconfig --del frm_purged + /sbin/chkconfig --del frm_xfrd fi %postun if [ $1 -ge 1 ]; then /sbin/service %{name} condrestart >/dev/null 2>&1 || : /sbin/service cmsd condrestart >/dev/null 2>&1 || : + /sbin/service frm_purged condrestart >/dev/null 2>&1 || : + /sbin/service frm_xfrd condrestart >/dev/null 2>&1 || : fi %files %defattr(-,root,root,-) +%{_bindir}/cconfig %{_bindir}/cmsd -%{_bindir}/%{name} +%{_bindir}/cns_ssi +%{_bindir}/frm_* +%{_bindir}/mpxstats +%{_bindir}/wait41 +%{_bindir}/xrdadler32 %{_bindir}/XrdCnsd +%{_bindir}/xrdmonAdmin +%{_bindir}/xrdmonCollector +%{_bindir}/xrdpwdadmin +%{_bindir}/xrdsssadmin +%{_bindir}/%{name} %{_mandir}/man1/cmsd.1* +%{_mandir}/man1/xrdpwdadmin.1* %{_mandir}/man1/%{name}.1* %{_initrddir}/* -%config(noreplace) %{_sysconfdir}/sysconfig/* %config(noreplace) %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %attr(-,xrootd,xrootd) %{_localstatedir}/log/%{name} +%attr(-,xrootd,xrootd) %{_localstatedir}/spool/%{name} %files libs %defattr(-,root,root,-) @@ -368,31 +411,15 @@ fi %files client %defattr(-,root,root,-) -%{_bindir}/TestXrdClient* -%{_bindir}/XrdAccTest -%{_bindir}/cconfig -%{_bindir}/cns_ssi -%{_bindir}/frm_* -%{_bindir}/mpxstats -%{_bindir}/wait41 %{_bindir}/xprep %{_bindir}/xrd -%{_bindir}/xrdadler32 %{_bindir}/xrdcp %{_bindir}/xrdgsiproxy -%{_bindir}/xrdmonAdmin -%{_bindir}/xrdmonCollector -%{_bindir}/xrdpwdadmin -%{_bindir}/xrdsecssltest -%{_bindir}/xrdsssadmin %{_bindir}/xrdstagetool -%{_bindir}/xrdtestclient -%{_bindir}/xrdtestserver %{_mandir}/man1/xprep.1* %{_mandir}/man1/xrd.1* %{_mandir}/man1/xrdcp.1* %{_mandir}/man1/xrdgsiproxy.1* -%{_mandir}/man1/xrdpwdadmin.1* %{_mandir}/man1/xrdstagetool.1* %if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 5 @@ -415,6 +442,11 @@ fi %doc %{_docdir}/%{name}-%{version} %changelog +* Fri Apr 22 2011 Mattias Ellert - 1:3.0.3-1 +- Update to version 3.0.3 +- Use upstream's manpages where available (new in this release) +- Use upstream's start-up scripts (new in this release) + * Tue Feb 08 2011 Fedora Release Engineering - 1:3.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/xrootd.sysconfig b/xrootd.sysconfig deleted file mode 100644 index 40ccaf4..0000000 --- a/xrootd.sysconfig +++ /dev/null @@ -1,3 +0,0 @@ -XRDLOG=/var/log/xrootd/xrootd.log -XRDUSER=xrootd -XRDCF=/etc/xrootd/xrootd.cf