From 49173a66a2d94fe68487a94b9a06f20dc3361e6f Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Dec 16 2010 18:03:50 +0000 Subject: - Update to version 3.0.0 - New subpackage - xrootd-fuse - New version scheme inroduced by upstream - add epoch --- diff --git a/.gitignore b/.gitignore index 6ad112e..016280a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -xrootd-20100315-1007.src.tgz -xrootd-manpages.tar.gz +/xrootd-v3.0.0.src.tgz +/xrootd-manpages.tar.gz diff --git a/olbd.init b/olbd.init deleted file mode 100644 index f893878..0000000 --- a/olbd.init +++ /dev/null @@ -1,85 +0,0 @@ -#! /bin/sh -# -# olbdd Start/Stop the OLBD daemon -# -# chkconfig: - 20 80 -# description: The olbd daemon runs the XRD control network. -# -# processname: olbd -# pidfile: /var/run/olbd.pid -# config: - -OLBD=/usr/bin/olbd - -# Source function library. -. /etc/init.d/functions - -# Get config. -. /etc/sysconfig/network - -# Get olbd config -[ -f /etc/sysconfig/olbd ] && . /etc/sysconfig/olbd - -# Configure the environment -[ ! -z "$OLBDENVCONFIG" ] && [ -f "$OLBDENVCONFIG" ] && . $OLBDENVCONFIG - -# Check that networking is up. -if [ ${NETWORKING} = "no" ] -then - exit 0 -fi - -[ -x $OLBD ] || exit 0 - -RETVAL=0 -prog="olbd" - -start() { - echo -n $"Starting $prog: " - # Options are specified in /etc/sysconfig/olbd . - # $OLBDUSER *must* be the name of an existing non-privileged user. - daemon $OLBD -b -l $OLBDLOG -R $OLBDUSER -c $OLBDCF $OLBDDEBUG - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/olbd - return $RETVAL -} - -stop() { - [ ! -f /var/lock/subsys/olbd ] && return 0 || true - echo -n $"Stopping $prog: " - killproc olbd - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/olbd - return $RETVAL -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status olbd - RETVAL=$? - ;; - restart|reload) - stop - start - ;; - condrestart) - if [ -f /var/lock/subsys/olbd ]; then - stop - start - fi - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 1 -esac - -exit $RETVAL diff --git a/olbd.sysconfig b/olbd.sysconfig deleted file mode 100644 index 4330d45..0000000 --- a/olbd.sysconfig +++ /dev/null @@ -1,3 +0,0 @@ -OLBDLOG=/var/log/xrootd/olbd.log -OLBDUSER=xrootd -OLBDCF=/etc/xrootd/olbd.cf diff --git a/sources b/sources index 8ca50c6..8c12161 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -099fc80474b8df5a36bf52bea7276f8b xrootd-20100315-1007.src.tgz -76b4eef20618c2c75eb6c25cb428f1cd xrootd-manpages.tar.gz +de4eda3ab7f6b146e133d18427c10f43 xrootd-v3.0.0.src.tgz +4c09bb53def37811f7dd523f9d27769a xrootd-manpages.tar.gz diff --git a/xrootd-bonjour.patch b/xrootd-bonjour.patch new file mode 100644 index 0000000..ff4bca6 --- /dev/null +++ b/xrootd-bonjour.patch @@ -0,0 +1,147 @@ +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 @@ + + AM_CONDITIONAL(ENABLE_SECSSL,test x"$activate_secssl" = xyes -o x"$activate_secssl" = xdefault_yes) + ++########################################### ++# bonjour checks ++ACX_LIBOPTION(bonjour, [bonjour support], yes) ++ ++if test x"$activate_bonjour" = xyes -o x"$activate_bonjour" = xdefault_yes; then ++ if test x"$acx_bonjour_incdir" != x; then ++ searchpath=$acx_bonjour_incdir ++ else ++ searchpath="$std_inc_path" ++ fi ++ ++ ACX_LOCATEFILE([dns_sd.h],[$searchpath], ++ [BONJOUR_INCDIR="-I$acx_founddir" ++ AC_MSG_NOTICE([bonjour header dir set to: $dir ]) ], ++ [activate_bonjour=no] ++ ) ++ ++ CPPFLAGS_BUP="$CPPFLAGS" ++ LDFLAGS_BUP=$LDFLAGS ++ ++ CPPFLAGS="$BONJOUR_INCDIR $CPPFLAGS" ++ ++ AC_CHECK_HEADER([dns_sd.h], ++ [],[activate_bonjour=no] ++ ) ++ ++ LDFLAGS="$BONJOUR_LIBDIR $LDFLAGS" ++ AC_CHECK_LIB([dns_sd],[TXTRecordCreate], ++ [:],[activate_bonjour=no],[] ++ ) ++ ++ CPPFLAGS="$CPPFLAGS_BUP" ++ LDFLAGS=$LDFLAGS_BUP ++ ++ AC_SUBST(BONJOUR_INCDIR) ++ AC_SUBST(BONJOUR_LIBDIR) ++ AC_SUBST(BONJOUR_LIBS) ++fi ++ ++rm -f src/XrdOuc/XrdOucFactoryBonjour.hh ++rm -f src/XrdOuc/XrdOucFactoryBonjour.cc ++if test x"$activate_bonjour" = xyes -o x"$activate_bonjour" = xdefault_yes; then ++case "$target_os" in ++ linux*) ++ ln -s XrdOucAvahiBonjour.hh src/XrdOuc/XrdOucFactoryBonjour.hh ++ ln -s XrdOucAvahiBonjour.cc src/XrdOuc/XrdOucFactoryBonjour.cc ++ BONJOUR_LIBS="-ldns_sd -lavahi-client -lavahi-common" ++ ;; ++ darwin*) ++ ln -s XrdOucFactoryBonjour.hh src/XrdOuc/XrdOucFactoryBonjour.hh ++ ln -s XrdOucFactoryBonjour.cc src/XrdOuc/XrdOucFactoryBonjour.cc ++ BONJOUR_LIBS="-ldns_sd" ++ ;; ++ *) ++ if test "x$activate_bonjour" = "xyes" ; then ++ echo "Sorry, the Bonjour/Avahi interface currently supported only for Linux/MacOsX - disabling ... (target: $target_os)" ++ fi ++ activate_bonjour=no ++ ;; ++esac ++fi ++ ++AM_CONDITIONAL(ENABLE_BONJOUR,test x"$activate_bonjour" = xyes -o x"$activate_bonjour" = xdefault_yes) ++ + # 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 +@@ -47,7 +47,8 @@ + XrdScheduler.cc XrdScheduler.hh XrdJob.hh \ + XrdStats.cc XrdStats.hh \ + XrdTrace.hh +-libXrd_la_LIBADD = ../XrdNet/libXrdNet.la \ ++libXrd_la_LIBADD = ../XrdOuc/libXrdOucBonjour.la \ ++ ../XrdNet/libXrdNet.la \ + ../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 +@@ -8,7 +8,7 @@ + ## Checked in by $Author$ + ####################################################################### + +-AM_CPPFLAGS = -I$(top_srcdir)/src ++AM_CPPFLAGS = -I$(top_srcdir)/src $(BONJOUR_INCDIR) + + ############################################################################# + ## extra installation directory definitions +@@ -18,7 +18,7 @@ + ############################################################################# + ## deliverables (to be built / installed) + +-xrootdoucinc_HEADERS = \ ++OUCHEADERS = \ + XrdOuca2x.hh XrdOucChain.hh XrdOucDLlist.hh \ + XrdOucEnv.hh XrdOucErrInfo.hh XrdOucExport.hh \ + XrdOucHash.hh XrdOucHash.icc XrdOucLock.hh \ +@@ -30,8 +30,18 @@ + XrdOucPup.hh XrdOucCRC.hh XrdOucArgs.hh \ + XrdOucNSWalk.hh XrdOucSxeq.hh + ++if ENABLE_BONJOUR ++xrootdoucinc_HEADERS = $(OUCHEADERS) XrdOucBonjour.hh ++nodist_xrootdoucinc_HEADERS = XrdOucFactoryBonjour.hh ++else ++xrootdoucinc_HEADERS = $(OUCHEADERS) ++nodist_xrootdoucinc_HEADERS = ++endif ++ + lib_LTLIBRARIES = libXrdOuc.la + ++noinst_LTLIBRARIES = libXrdOucBonjour.la ++ + + ############################################################################# + # Build rules +@@ -61,6 +71,19 @@ + ../XrdSys/libXrdSys.la \ + $(LIBPTHREAD) $(SEM_LIBRT) $(LIBNSL) + ++if ENABLE_BONJOUR ++libXrdOucBonjour_la_SOURCES = XrdOucBonjour.cc ++nodist_libXrdOucBonjour_la_SOURCES = XrdOucFactoryBonjour.cc ++else ++libXrdOucBonjour_la_SOURCES = ++nodist_libXrdOucBonjour_la_SOURCES = ++endif ++libXrdOucBonjour_la_LIBADD = $(BONJOUR_LIBDIR) $(BONJOUR_LIBS) ++ ++# sources not named in rules that still need to get rolled into the ++# distribution tarball ++EXTRA_DIST = XrdOucAppleBonjour.cc XrdOucAppleBonjour.hh \ ++ XrdOucAvahiBonjour.cc XrdOucAvahiBonjour.hh + + # TODO: again as in classic? REFAC libXrdOuc_la_CXXFLAGS = -prefer-pic + # TODO: again as in classic? REFAC libXrdOuc_la_LDFLAGS = -static diff --git a/xrootd-circular-deps.patch b/xrootd-circular-deps.patch new file mode 100644 index 0000000..a586d5a --- /dev/null +++ b/xrootd-circular-deps.patch @@ -0,0 +1,762 @@ +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-12 10:39:26.343645458 +0100 +@@ -1121,6 +1121,7 @@ + src/Makefile + src/Makefile_include + src/XrdSys/Makefile ++ src/XrdNetUtil/Makefile + src/XrdOuc/Makefile + src/XrdNet/Makefile + src/XrdSec/Makefile +@@ -1144,6 +1145,7 @@ + src/XrdRootd/Makefile + src/XrdXrootd/Makefile + src/XrdFrm/Makefile ++ src/XrdFrmUtil/Makefile + src/XrdClient/Makefile + src/XrdPosix/Makefile + src/XrdPss/Makefile +diff -ur xrootd.orig/src/Makefile.am xrootd/src/Makefile.am +--- xrootd.orig/src/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/Makefile.am 2010-12-12 10:39:26.343645458 +0100 +@@ -69,6 +69,7 @@ + ####################################################################### + + SUBDIRS = XrdSys \ ++ XrdNetUtil \ + XrdOuc \ + XrdNet \ + XrdSec \ +@@ -83,9 +84,10 @@ + XrdSfs \ + XrdAcc \ + XrdBwm \ ++ XrdFrm \ + XrdOss \ + Xrd \ +- XrdFrm \ ++ XrdFrmUtil \ + XrdCms \ + XrdOfs \ + XrdRootd \ +diff -ur xrootd.orig/src/XrdFrm/Makefile.am xrootd/src/XrdFrm/Makefile.am +--- xrootd.orig/src/XrdFrm/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrm/Makefile.am 2010-12-12 10:39:26.352645354 +0100 +@@ -16,7 +16,7 @@ + # + + +-AM_CPPFLAGS = -I$(top_srcdir)/src $(READLINE_INCDIR) ++AM_CPPFLAGS = -I$(top_srcdir)/src + + ############################################################################# + ## extra directory definitions +@@ -25,121 +25,36 @@ + ############################################################################# + ## deliverables + +-bin_PROGRAMS = frm_admin frm_purged frm_xfragent frm_xfrd +- +-xrootdfrminc_HEADERS = XrdFrmAdmin.hh \ +- XrdFrmCID.hh \ +- XrdFrmConfig.hh \ +- XrdFrmFiles.hh \ +- XrdFrmMigrate.hh \ ++xrootdfrminc_HEADERS = XrdFrmCID.hh \ + XrdFrmMonitor.hh \ + XrdFrmProxy.hh \ +- XrdFrmPurge.hh \ + XrdFrmReqAgent.hh \ +- XrdFrmReqBoss.hh \ + XrdFrmReqFile.hh \ + XrdFrmRequest.hh \ + XrdFrmTrace.hh \ +- XrdFrmTSort.hh \ +- XrdFrmTransfer.hh\ +- XrdFrmUtils.hh \ +- XrdFrmXfrAgent.hh\ +- XrdFrmXfrDaemon.hh\ +- XrdFrmXfrJob.hh \ +- XrdFrmXfrQueue.hh ++ XrdFrmUtils.hh + + + lib_LTLIBRARIES = libXrdFrm.la + +-# Convenience libs to use for objs common to multiple binaries in this dir +-noinst_LTLIBRARIES = libXrdFrmConv.la libXrdFrmConvAgent.la +- + + ############################################################################# + ## Build rules + + +-libXrdFrmConv_la_SOURCES = XrdFrmConfig.cc +- +-libXrdFrmConvAgent_la_SOURCES = XrdFrmReqBoss.cc \ +- XrdFrmTransfer.cc \ +- XrdFrmXfrAgent.cc \ +- XrdFrmXfrDaemon.cc \ +- XrdFrmMigrate.cc \ +- XrdFrmXfrQueue.cc +- +- + libXrdFrm_la_SOURCES = \ + XrdFrmCID.cc \ +- XrdFrmFiles.cc \ + XrdFrmMonitor.cc\ + XrdFrmProxy.cc \ + XrdFrmReqAgent.cc \ + XrdFrmReqFile.cc \ + XrdFrmTrace.cc \ +- XrdFrmTSort.cc \ + XrdFrmUtils.cc + + libXrdFrm_la_LIBADD = \ + ../XrdNet/libXrdNet.la \ + ../XrdOuc/libXrdOuc.la \ +- ../XrdSys/libXrdSys.la \ +- ../XrdNet/libXrdNetUtil.la \ +- ../XrdOss/libXrdOss.la \ +- ../Xrd/libXrd.la $(READLINE_LIBDIR) $(READLINE_LIBS) ++ ../XrdNetUtil/libXrdNetUtil.la \ ++ ../XrdSys/libXrdSys.la + + libXrdFrm_la_LDFLAGS = -static +- +- +-# $(ECHO)$(LD) $(LDOP) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINADMIN) +-frm_admin_SOURCES = \ +- XrdFrmAdminMain.cc \ +- XrdFrmAdmin.cc \ +- XrdFrmAdminAudit.cc \ +- XrdFrmAdminFiles.cc \ +- XrdFrmAdminFind.cc \ +- XrdFrmAdminQuery.cc \ +- XrdFrmAdminUnlink.cc +- +- +-frm_admin_LDADD = ../XrdOss/libXrdOss.la \ +- libXrdFrmConv.la \ +- libXrdFrm.la +- +-frm_admin_LDFLAGS = -static -export-dynamic -ldl +- +- +-# $(ECHO)$(LD) $(LDOP) $(OBJPURG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPURGD) +-frm_purged_SOURCES = \ +- XrdFrmPurgMain.cc \ +- XrdFrmPurge.cc +- +-frm_purged_LDADD = libXrdFrmConv.la \ +- libXrdFrm.la \ +- ../XrdOuc/libXrdOuc.la XrdFrmProxy.o +- +-frm_purged_LDFLAGS = -static -export-dynamic -ldl +- +-# Note: The build rules for xfragent and xfrd are identical. The programs +-# behave differently based on their invocation name +- +-#$(ECHO)$(LD) $(LDOP) $(OBJXFR) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINXFRD) +-frm_xfragent_SOURCES = XrdFrmXfrMain.cc +- +-frm_xfragent_LDADD = libXrdFrmConv.la \ +- libXrdFrmConvAgent.la \ +- libXrdFrm.la \ +- ../XrdOuc/libXrdOuc.la XrdFrmProxy.o +- +-frm_xfragent_LDFLAGS = -static -export-dynamic -ldl +- +- +-frm_xfrd_SOURCES = XrdFrmXfrMain.cc +- +-frm_xfrd_LDADD = libXrdFrmConv.la \ +- libXrdFrmConvAgent.la \ +- libXrdFrm.la \ +- ../XrdOuc/libXrdOuc.la XrdFrmProxy.o +- +-frm_xfrd_LDFLAGS = -static -export-dynamic -ldl +- +diff -ur xrootd.orig/src/XrdFrmUtil/Makefile.am xrootd/src/XrdFrmUtil/Makefile.am +--- xrootd.orig/src/XrdFrmUtil/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/Makefile.am 2010-12-12 10:43:03.965645433 +0100 +@@ -19,38 +19,10 @@ + AM_CPPFLAGS = -I$(top_srcdir)/src $(READLINE_INCDIR) + + ############################################################################# +-## extra directory definitions +-xrootdfrmincdir = $(includedir)/xrootd/XrdFrm +- +-############################################################################# + ## deliverables + + bin_PROGRAMS = frm_admin frm_purged frm_xfragent frm_xfrd + +-xrootdfrminc_HEADERS = XrdFrmAdmin.hh \ +- XrdFrmCID.hh \ +- XrdFrmConfig.hh \ +- XrdFrmFiles.hh \ +- XrdFrmMigrate.hh \ +- XrdFrmMonitor.hh \ +- XrdFrmProxy.hh \ +- XrdFrmPurge.hh \ +- XrdFrmReqAgent.hh \ +- XrdFrmReqBoss.hh \ +- XrdFrmReqFile.hh \ +- XrdFrmRequest.hh \ +- XrdFrmTrace.hh \ +- XrdFrmTSort.hh \ +- XrdFrmTransfer.hh\ +- XrdFrmUtils.hh \ +- XrdFrmXfrAgent.hh\ +- XrdFrmXfrDaemon.hh\ +- XrdFrmXfrJob.hh \ +- XrdFrmXfrQueue.hh +- +- +-lib_LTLIBRARIES = libXrdFrm.la +- + # Convenience libs to use for objs common to multiple binaries in this dir + noinst_LTLIBRARIES = libXrdFrmConv.la libXrdFrmConvAgent.la + +@@ -59,7 +31,9 @@ + ## Build rules + + +-libXrdFrmConv_la_SOURCES = XrdFrmConfig.cc ++libXrdFrmConv_la_SOURCES = XrdFrmConfig.cc \ ++ XrdFrmFiles.cc \ ++ XrdFrmTSort.cc + + libXrdFrmConvAgent_la_SOURCES = XrdFrmReqBoss.cc \ + XrdFrmTransfer.cc \ +@@ -69,29 +43,6 @@ + XrdFrmXfrQueue.cc + + +-libXrdFrm_la_SOURCES = \ +- XrdFrmCID.cc \ +- XrdFrmFiles.cc \ +- XrdFrmMonitor.cc\ +- XrdFrmProxy.cc \ +- XrdFrmReqAgent.cc \ +- XrdFrmReqFile.cc \ +- XrdFrmTrace.cc \ +- XrdFrmTSort.cc \ +- XrdFrmUtils.cc +- +-libXrdFrm_la_LIBADD = \ +- ../XrdNet/libXrdNet.la \ +- ../XrdOuc/libXrdOuc.la \ +- ../XrdSys/libXrdSys.la \ +- ../XrdNet/libXrdNetUtil.la \ +- ../XrdOss/libXrdOss.la \ +- ../Xrd/libXrd.la $(READLINE_LIBDIR) $(READLINE_LIBS) +- +-libXrdFrm_la_LDFLAGS = -static +- +- +-# $(ECHO)$(LD) $(LDOP) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINADMIN) + frm_admin_SOURCES = \ + XrdFrmAdminMain.cc \ + XrdFrmAdmin.cc \ +@@ -101,45 +52,46 @@ + XrdFrmAdminQuery.cc \ + XrdFrmAdminUnlink.cc + ++frm_admin_LDADD = libXrdFrmConv.la \ ++ ../XrdOss/libXrdOss.la \ ++ ../XrdFrm/libXrdFrm.la \ ++ $(READLINE_LIBDIR) $(READLINE_LIBS) + +-frm_admin_LDADD = ../XrdOss/libXrdOss.la \ +- libXrdFrmConv.la \ +- libXrdFrm.la +- +-frm_admin_LDFLAGS = -static -export-dynamic -ldl ++frm_admin_LDFLAGS = -static -export-dynamic + + +-# $(ECHO)$(LD) $(LDOP) $(OBJPURG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPURGD) + frm_purged_SOURCES = \ + XrdFrmPurgMain.cc \ + XrdFrmPurge.cc + + frm_purged_LDADD = libXrdFrmConv.la \ +- libXrdFrm.la \ +- ../XrdOuc/libXrdOuc.la XrdFrmProxy.o ++ ../XrdOss/libXrdOss.la \ ++ ../XrdFrm/libXrdFrm.la \ ++ ../XrdOuc/libXrdOuc.la + +-frm_purged_LDFLAGS = -static -export-dynamic -ldl ++frm_purged_LDFLAGS = -static -export-dynamic + + # Note: The build rules for xfragent and xfrd are identical. The programs + # behave differently based on their invocation name + +-#$(ECHO)$(LD) $(LDOP) $(OBJXFR) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINXFRD) + frm_xfragent_SOURCES = XrdFrmXfrMain.cc + +-frm_xfragent_LDADD = libXrdFrmConv.la \ +- libXrdFrmConvAgent.la \ +- libXrdFrm.la \ +- ../XrdOuc/libXrdOuc.la XrdFrmProxy.o ++frm_xfragent_LDADD = libXrdFrmConvAgent.la \ ++ ../XrdOss/libXrdOss.la \ ++ libXrdFrmConv.la \ ++ ../XrdFrm/libXrdFrm.la \ ++ ../XrdOuc/libXrdOuc.la + +-frm_xfragent_LDFLAGS = -static -export-dynamic -ldl ++frm_xfragent_LDFLAGS = -static -export-dynamic + + + frm_xfrd_SOURCES = XrdFrmXfrMain.cc + +-frm_xfrd_LDADD = libXrdFrmConv.la \ +- libXrdFrmConvAgent.la \ +- libXrdFrm.la \ +- ../XrdOuc/libXrdOuc.la XrdFrmProxy.o ++frm_xfrd_LDADD = libXrdFrmConvAgent.la \ ++ ../XrdOss/libXrdOss.la \ ++ libXrdFrmConv.la \ ++ ../XrdFrm/libXrdFrm.la \ ++ ../XrdOuc/libXrdOuc.la + +-frm_xfrd_LDFLAGS = -static -export-dynamic -ldl ++frm_xfrd_LDFLAGS = -static -export-dynamic + +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc xrootd/src/XrdFrmUtil/XrdFrmAdminAudit.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmAdminAudit.cc 2010-12-12 10:39:26.361645355 +0100 +@@ -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 "XrdOss/XrdOssPath.hh" +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdmin.cc xrootd/src/XrdFrmUtil/XrdFrmAdmin.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmAdmin.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmAdmin.cc 2010-12-12 10:39:26.362645354 +0100 +@@ -21,8 +21,8 @@ + #include + #include + +-#include "XrdFrm/XrdFrmAdmin.hh" +-#include "XrdFrm/XrdFrmConfig.hh" ++#include "XrdFrmUtil/XrdFrmAdmin.hh" ++#include "XrdFrmUtil/XrdFrmConfig.hh" + #include "XrdFrm/XrdFrmProxy.hh" + #include "XrdFrm/XrdFrmTrace.hh" + #include "XrdFrm/XrdFrmUtils.hh" +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc xrootd/src/XrdFrmUtil/XrdFrmAdminFiles.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmAdminFiles.cc 2010-12-12 10:39:26.362645354 +0100 +@@ -22,9 +22,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/XrdFrmUtils.hh" + + using namespace XrdFrm; +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc xrootd/src/XrdFrmUtil/XrdFrmAdminFind.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmAdminFind.cc 2010-12-12 10:39:26.363645352 +0100 +@@ -15,9 +15,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 "XrdOuc/XrdOucArgs.hh" + #include "XrdOuc/XrdOucNSWalk.hh" +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc xrootd/src/XrdFrmUtil/XrdFrmAdminMain.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmAdminMain.cc 2010-12-12 10:39:26.363645352 +0100 +@@ -53,8 +53,8 @@ + #include + #endif + +-#include "XrdFrm/XrdFrmAdmin.hh" +-#include "XrdFrm/XrdFrmConfig.hh" ++#include "XrdFrmUtil/XrdFrmAdmin.hh" ++#include "XrdFrmUtil/XrdFrmConfig.hh" + #include "XrdFrm/XrdFrmTrace.hh" + #include "XrdNet/XrdNetOpts.hh" + #include "XrdNet/XrdNetSocket.hh" +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc xrootd/src/XrdFrmUtil/XrdFrmAdminQuery.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmAdminQuery.cc 2010-12-12 10:39:26.364645351 +0100 +@@ -18,9 +18,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/XrdFrmProxy.hh" + #include "XrdFrm/XrdFrmRequest.hh" + #include "XrdFrm/XrdFrmTrace.hh" +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc xrootd/src/XrdFrmUtil/XrdFrmAdminReloc.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmAdminReloc.cc 2010-12-12 10:39:26.364645351 +0100 +@@ -23,8 +23,8 @@ + #include + #include + +-#include "XrdFrm/XrdFrmAdmin.hh" +-#include "XrdFrm/XrdFrmConfig.hh" ++#include "XrdFrmUtil/XrdFrmAdmin.hh" ++#include "XrdFrmUtil/XrdFrmConfig.hh" + #include "XrdFrm/XrdFrmTrace.hh" + #include "XrdOss/XrdOss.hh" + #include "XrdOss/XrdOssOpaque.hh" +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc xrootd/src/XrdFrmUtil/XrdFrmAdminUnlink.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmAdminUnlink.cc 2010-12-12 10:39:26.365645351 +0100 +@@ -18,8 +18,8 @@ + #include + #include + +-#include "XrdFrm/XrdFrmAdmin.hh" +-#include "XrdFrm/XrdFrmConfig.hh" ++#include "XrdFrmUtil/XrdFrmAdmin.hh" ++#include "XrdFrmUtil/XrdFrmConfig.hh" + #include "XrdFrm/XrdFrmTrace.hh" + #include "XrdFrm/XrdFrmUtils.hh" + #include "XrdNet/XrdNetCmsNotify.hh" +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmConfig.cc xrootd/src/XrdFrmUtil/XrdFrmConfig.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmConfig.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmConfig.cc 2010-12-12 10:39:26.366645352 +0100 +@@ -24,7 +24,7 @@ + #include + + #include "Xrd/XrdInfo.hh" +-#include "XrdFrm/XrdFrmConfig.hh" ++#include "XrdFrmUtil/XrdFrmConfig.hh" + #include "XrdFrm/XrdFrmMonitor.hh" + #include "XrdFrm/XrdFrmTrace.hh" + #include "XrdFrm/XrdFrmUtils.hh" +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmFiles.cc xrootd/src/XrdFrmUtil/XrdFrmFiles.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmFiles.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmFiles.cc 2010-12-12 10:39:26.366645352 +0100 +@@ -19,8 +19,8 @@ + #include + #include + +-#include "XrdFrm/XrdFrmConfig.hh" +-#include "XrdFrm/XrdFrmFiles.hh" ++#include "XrdFrmUtil/XrdFrmConfig.hh" ++#include "XrdFrmUtil/XrdFrmFiles.hh" + #include "XrdFrm/XrdFrmTrace.hh" + #include "XrdOuc/XrdOucTList.hh" + #include "XrdSys/XrdSysPlatform.hh" +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmMigrate.cc xrootd/src/XrdFrmUtil/XrdFrmMigrate.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmMigrate.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmMigrate.cc 2010-12-12 10:39:26.367645352 +0100 +@@ -23,13 +23,13 @@ + #include "XrdOss/XrdOssPath.hh" + #include "XrdOuc/XrdOucNSWalk.hh" + #include "XrdOuc/XrdOucTList.hh" +-#include "XrdFrm/XrdFrmFiles.hh" +-#include "XrdFrm/XrdFrmConfig.hh" +-#include "XrdFrm/XrdFrmMigrate.hh" ++#include "XrdFrmUtil/XrdFrmFiles.hh" ++#include "XrdFrmUtil/XrdFrmConfig.hh" ++#include "XrdFrmUtil/XrdFrmMigrate.hh" + #include "XrdFrm/XrdFrmRequest.hh" + #include "XrdFrm/XrdFrmTrace.hh" +-#include "XrdFrm/XrdFrmTransfer.hh" +-#include "XrdFrm/XrdFrmXfrQueue.hh" ++#include "XrdFrmUtil/XrdFrmTransfer.hh" ++#include "XrdFrmUtil/XrdFrmXfrQueue.hh" + #include "XrdSys/XrdSysPthread.hh" + #include "XrdSys/XrdSysPlatform.hh" + #include "XrdSys/XrdSysTimer.hh" +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmPurge.cc xrootd/src/XrdFrmUtil/XrdFrmPurge.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmPurge.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmPurge.cc 2010-12-12 10:39:26.368645352 +0100 +@@ -27,9 +27,9 @@ + #include "XrdOuc/XrdOucProg.hh" + #include "XrdOuc/XrdOucStream.hh" + #include "XrdOuc/XrdOucUtils.hh" +-#include "XrdFrm/XrdFrmFiles.hh" +-#include "XrdFrm/XrdFrmConfig.hh" +-#include "XrdFrm/XrdFrmPurge.hh" ++#include "XrdFrmUtil/XrdFrmFiles.hh" ++#include "XrdFrmUtil/XrdFrmConfig.hh" ++#include "XrdFrmUtil/XrdFrmPurge.hh" + #include "XrdFrm/XrdFrmTrace.hh" + #include "XrdSys/XrdSysPlatform.hh" + +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmPurge.hh xrootd/src/XrdFrmUtil/XrdFrmPurge.hh +--- xrootd.orig/src/XrdFrmUtil/XrdFrmPurge.hh 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmPurge.hh 2010-12-12 10:39:26.368645352 +0100 +@@ -15,7 +15,7 @@ + #include + #include + +-#include "XrdFrm/XrdFrmTSort.hh" ++#include "XrdFrmUtil/XrdFrmTSort.hh" + #include "XrdOss/XrdOssSpace.hh" + #include "XrdOuc/XrdOucHash.hh" + +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc xrootd/src/XrdFrmUtil/XrdFrmPurgMain.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmPurgMain.cc 2010-12-12 10:39:26.369645352 +0100 +@@ -65,8 +65,8 @@ + #include + #include + +-#include "XrdFrm/XrdFrmConfig.hh" +-#include "XrdFrm/XrdFrmPurge.hh" ++#include "XrdFrmUtil/XrdFrmConfig.hh" ++#include "XrdFrmUtil/XrdFrmPurge.hh" + #include "XrdFrm/XrdFrmTrace.hh" + #include "XrdNet/XrdNetOpts.hh" + #include "XrdNet/XrdNetSocket.hh" +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc xrootd/src/XrdFrmUtil/XrdFrmReqBoss.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmReqBoss.cc 2010-12-12 10:39:26.370645352 +0100 +@@ -22,10 +22,10 @@ + #include + + #include "XrdFrm/XrdFrmCID.hh" +-#include "XrdFrm/XrdFrmReqBoss.hh" ++#include "XrdFrmUtil/XrdFrmReqBoss.hh" + #include "XrdFrm/XrdFrmTrace.hh" + #include "XrdFrm/XrdFrmUtils.hh" +-#include "XrdFrm/XrdFrmXfrQueue.hh" ++#include "XrdFrmUtil/XrdFrmXfrQueue.hh" + #include "XrdNet/XrdNetMsg.hh" + #include "XrdOuc/XrdOucUtils.hh" + #include "XrdSys/XrdSysHeaders.hh" +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmTransfer.cc xrootd/src/XrdFrmUtil/XrdFrmTransfer.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmTransfer.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmTransfer.cc 2010-12-12 10:39:26.371645352 +0100 +@@ -24,14 +24,14 @@ + #include + + #include "XrdFrm/XrdFrmCID.hh" +-#include "XrdFrm/XrdFrmConfig.hh" ++#include "XrdFrmUtil/XrdFrmConfig.hh" + #include "XrdFrm/XrdFrmMonitor.hh" + #include "XrdFrm/XrdFrmReqFile.hh" + #include "XrdFrm/XrdFrmRequest.hh" + #include "XrdFrm/XrdFrmTrace.hh" +-#include "XrdFrm/XrdFrmTransfer.hh" +-#include "XrdFrm/XrdFrmXfrJob.hh" +-#include "XrdFrm/XrdFrmXfrQueue.hh" ++#include "XrdFrmUtil/XrdFrmTransfer.hh" ++#include "XrdFrmUtil/XrdFrmXfrJob.hh" ++#include "XrdFrmUtil/XrdFrmXfrQueue.hh" + #include "XrdNet/XrdNetCmsNotify.hh" + #include "XrdOss/XrdOss.hh" + #include "XrdOss/XrdOssLock.hh" +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmTSort.cc xrootd/src/XrdFrmUtil/XrdFrmTSort.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmTSort.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmTSort.cc 2010-12-12 10:39:26.372645352 +0100 +@@ -12,8 +12,8 @@ + + const char *XrdFrmTSortCVSID = "$Id$"; + +-#include "XrdFrm/XrdFrmFiles.hh" +-#include "XrdFrm/XrdFrmTSort.hh" ++#include "XrdFrmUtil/XrdFrmFiles.hh" ++#include "XrdFrmUtil/XrdFrmTSort.hh" + //#include "iostream.h" + + /******************************************************************************/ +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc xrootd/src/XrdFrmUtil/XrdFrmXfrAgent.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmXfrAgent.cc 2010-12-12 10:39:26.373645352 +0100 +@@ -20,11 +20,11 @@ + #include + #include + +-#include "XrdFrm/XrdFrmConfig.hh" ++#include "XrdFrmUtil/XrdFrmConfig.hh" + #include "XrdFrm/XrdFrmRequest.hh" + #include "XrdFrm/XrdFrmTrace.hh" + #include "XrdFrm/XrdFrmUtils.hh" +-#include "XrdFrm/XrdFrmXfrAgent.hh" ++#include "XrdFrmUtil/XrdFrmXfrAgent.hh" + #include "XrdOuc/XrdOucStream.hh" + #include "XrdSys/XrdSysPlatform.hh" + +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc xrootd/src/XrdFrmUtil/XrdFrmXfrDaemon.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmXfrDaemon.cc 2010-12-12 10:39:26.374645352 +0100 +@@ -21,14 +21,14 @@ + #include + #include + +-#include "XrdFrm/XrdFrmConfig.hh" +-#include "XrdFrm/XrdFrmMigrate.hh" ++#include "XrdFrmUtil/XrdFrmConfig.hh" ++#include "XrdFrmUtil/XrdFrmMigrate.hh" + #include "XrdFrm/XrdFrmRequest.hh" + #include "XrdFrm/XrdFrmTrace.hh" +-#include "XrdFrm/XrdFrmTransfer.hh" ++#include "XrdFrmUtil/XrdFrmTransfer.hh" + #include "XrdFrm/XrdFrmUtils.hh" +-#include "XrdFrm/XrdFrmXfrAgent.hh" +-#include "XrdFrm/XrdFrmXfrDaemon.hh" ++#include "XrdFrmUtil/XrdFrmXfrAgent.hh" ++#include "XrdFrmUtil/XrdFrmXfrDaemon.hh" + #include "XrdNet/XrdNetOpts.hh" + #include "XrdNet/XrdNetSocket.hh" + #include "XrdOuc/XrdOucStream.hh" +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh xrootd/src/XrdFrmUtil/XrdFrmXfrDaemon.hh +--- xrootd.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmXfrDaemon.hh 2010-12-12 10:39:26.375645352 +0100 +@@ -12,7 +12,7 @@ + + // $Id$ + +-#include "XrdFrm/XrdFrmReqBoss.hh" ++#include "XrdFrmUtil/XrdFrmReqBoss.hh" + + class XrdFrmXfrDaemon + { +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc xrootd/src/XrdFrmUtil/XrdFrmXfrMain.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmXfrMain.cc 2010-12-12 10:39:26.376645352 +0100 +@@ -59,10 +59,10 @@ + #include + #include + +-#include "XrdFrm/XrdFrmConfig.hh" ++#include "XrdFrmUtil/XrdFrmConfig.hh" + #include "XrdFrm/XrdFrmTrace.hh" +-#include "XrdFrm/XrdFrmXfrAgent.hh" +-#include "XrdFrm/XrdFrmXfrDaemon.hh" ++#include "XrdFrmUtil/XrdFrmXfrAgent.hh" ++#include "XrdFrmUtil/XrdFrmXfrDaemon.hh" + #include "XrdSys/XrdSysError.hh" + #include "XrdSys/XrdSysHeaders.hh" + #include "XrdSys/XrdSysLogger.hh" +diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc xrootd/src/XrdFrmUtil/XrdFrmXfrQueue.cc +--- xrootd.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFrmUtil/XrdFrmXfrQueue.cc 2010-12-12 10:39:26.376645352 +0100 +@@ -22,11 +22,11 @@ + #include + #include + +-#include "XrdFrm/XrdFrmConfig.hh" ++#include "XrdFrmUtil/XrdFrmConfig.hh" + #include "XrdFrm/XrdFrmReqFile.hh" + #include "XrdFrm/XrdFrmTrace.hh" +-#include "XrdFrm/XrdFrmXfrJob.hh" +-#include "XrdFrm/XrdFrmXfrQueue.hh" ++#include "XrdFrmUtil/XrdFrmXfrJob.hh" ++#include "XrdFrmUtil/XrdFrmXfrQueue.hh" + #include "XrdNet/XrdNetMsg.hh" + #include "XrdOuc/XrdOucTList.hh" + #include "XrdSys/XrdSysError.hh" +diff -ur xrootd.orig/src/XrdNet/Makefile.am xrootd/src/XrdNet/Makefile.am +--- xrootd.orig/src/XrdNet/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdNet/Makefile.am 2010-12-12 10:39:26.377645352 +0100 +@@ -18,7 +18,7 @@ + ############################################################################# + ## deliverables (to be built / installed) + +-lib_LTLIBRARIES = libXrdNet.la libXrdNetUtil.la ++lib_LTLIBRARIES = libXrdNet.la + + + xrootdnetinc_HEADERS = XrdNet.hh XrdNetOpts.hh XrdNetPeer.hh \ +@@ -40,15 +40,7 @@ + XrdNetSocket.cc XrdNetSocket.hh \ + XrdNetWork.cc XrdNetWork.hh + +-libXrdNet_la_LIBADD = $(LIBSOCKET) $(LIBNSL) +- +- +-libXrdNetUtil_la_SOURCES = \ +- XrdNetDNS.cc XrdNetDNS.hh +- +-libXrdNetUtil_la_LIBADD = $(LIBSOCKET) $(LIBNSL) +- +- +-#REFAC libXrdNet_la_CXXFLAGS = -prefer-pic +-#REFAC libXrdNet_la_LDFLAGS = -static +- ++libXrdNet_la_LIBADD = ../XrdOuc/libXrdOuc.la \ ++ ../XrdNetUtil/libXrdNetUtil.la \ ++ ../XrdSys/libXrdSys.la \ ++ $(LIBSOCKET) $(LIBNSL) +diff -ur xrootd.orig/src/XrdNetUtil/Makefile.am xrootd/src/XrdNetUtil/Makefile.am +--- xrootd.orig/src/XrdNetUtil/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdNetUtil/Makefile.am 2010-12-12 10:39:26.377645352 +0100 +@@ -11,44 +11,13 @@ + AM_CPPFLAGS = -I$(top_srcdir)/src + + ############################################################################# +-## extra installation directory definitions +- +-xrootdnetincdir = $(includedir)/xrootd/XrdNet +- +-############################################################################# + ## deliverables (to be built / installed) + +-lib_LTLIBRARIES = libXrdNet.la libXrdNetUtil.la +- +- +-xrootdnetinc_HEADERS = XrdNet.hh XrdNetOpts.hh XrdNetPeer.hh \ +- XrdNetBuffer.hh XrdNetConnect.hh XrdNetDNS.hh \ +- XrdNetLink.hh XrdNetSecurity.hh XrdNetSocket.hh \ +- XrdNetWork.hh XrdNetCmsNotify.hh ++lib_LTLIBRARIES = libXrdNetUtil.la + + ############################################################################# + # Build rules + +-libXrdNet_la_SOURCES = \ +- XrdNet.cc XrdNet.hh XrdNetOpts.hh XrdNetPeer.hh \ +- XrdNetBuffer.cc XrdNetBuffer.hh \ +- XrdNetCmsNotify.cc XrdNetCmsNotify.hh \ +- XrdNetConnect.cc XrdNetConnect.hh \ +- XrdNetLink.cc XrdNetLink.hh \ +- XrdNetMsg.cc XrdNetMsg.hh \ +- XrdNetSecurity.cc XrdNetSecurity.hh \ +- XrdNetSocket.cc XrdNetSocket.hh \ +- XrdNetWork.cc XrdNetWork.hh +- +-libXrdNet_la_LIBADD = $(LIBSOCKET) $(LIBNSL) +- +- +-libXrdNetUtil_la_SOURCES = \ +- XrdNetDNS.cc XrdNetDNS.hh +- +-libXrdNetUtil_la_LIBADD = $(LIBSOCKET) $(LIBNSL) +- +- +-#REFAC libXrdNet_la_CXXFLAGS = -prefer-pic +-#REFAC libXrdNet_la_LDFLAGS = -static ++libXrdNetUtil_la_SOURCES = XrdNetDNS.cc + ++libXrdNetUtil_la_LIBADD = ../XrdSys/libXrdSys.la $(LIBSOCKET) $(LIBNSL) diff --git a/xrootd-cryptoload.patch b/xrootd-cryptoload.patch new file mode 100644 index 0000000..c837d1f --- /dev/null +++ b/xrootd-cryptoload.patch @@ -0,0 +1,58 @@ +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 +@@ -378,7 +378,7 @@ + + // + // Form library name +- snprintf(libfn, sizeof(libfn)-1, "libXrdCrypto%s", LT_MODULE_EXT); ++ snprintf(libfn, sizeof(libfn)-1, "libXrdCrypto%s%s", factoryid, LT_MODULE_EXT); + libfn[sizeof(libfn)-1] = '\0'; + + // +@@ -397,32 +397,8 @@ + // + // Get the factory object creator + if (!(efact = (XrdCryptoFactory *(*)())dlsym(libhandle, factobjname))) { +- +- // +- // Try also specific library name +- snprintf(libfn, sizeof(libfn)-1, "libXrdCrypto%s%s", factoryid, LT_MODULE_EXT); +- libfn[sizeof(libfn)-1] = '\0'; +- +- // +- // Determine path +- libloc = libfn; +- DEBUG("loading " < - #include - -+#include "XrdSys/XrdSysError.hh" - #include "Xrd/XrdProtocol.hh" - - /******************************************************************************/ -@@ -55,3 +56,24 @@ - WANPort = rhs.WANPort; - WANWSize = rhs.WANWSize; - } -+ -+// Dummy implementations to allow creation of shared library. -+// These should not be used. -+ -+extern "C" -+ -+{ -+XrdProtocol *XrdgetProtocol(const char *pname, char *parms, -+ XrdProtocol_Config *pi) -+{ -+ pi->eDest->Say("XrdgetProtocol - this version should not be used."); -+ return NULL; -+} -+ -+int XrdgetProtocolPort(const char *pname, char *parms, XrdProtocol_Config *pi) -+{ -+ pi->eDest->Say("XrdgetProtocolPort - this version should not be used."); -+ return 0; -+} -+ -+} ++ $(LIBPTHREAD) + + + ## Extra sources that should go into the tarball diff -ur xrootd.orig/src/XrdAcc/Makefile.am xrootd/src/XrdAcc/Makefile.am ---- xrootd.orig/src/XrdAcc/Makefile.am 2007-08-02 17:34:58.000000000 +0200 -+++ xrootd/src/XrdAcc/Makefile.am 2010-06-08 17:02:29.596842140 +0200 -@@ -29,6 +29,8 @@ +--- xrootd.orig/src/XrdAcc/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdAcc/Makefile.am 2010-12-16 06:00:10.348934620 +0100 +@@ -38,11 +38,11 @@ XrdAccCapability.cc XrdAccCapability.hh \ XrdAccConfig.cc XrdAccConfig.hh XrdAccAuthDB.hh \ XrdAccGroups.cc XrdAccGroups.hh XrdAccPrivs.hh -+libXrdAcc_la_LIBADD = ../XrdSys/libXrdSys.la \ -+ ../XrdOuc/libXrdOuc.la ++libXrdAcc_la_LIBADD = ../XrdOuc/libXrdOuc.la \ ++ ../XrdSys/libXrdSys.la \ ++ $(LIBPTHREAD) XrdAccTest_SOURCES = XrdAccTest.cc XrdAccAuthorize.hh XrdAccTest_LDADD = libXrdAcc.la \ + ../XrdOuc/libXrdOuc.la \ +- ../XrdNet/libXrdNet.la \ +- ../XrdSys/libXrdSys.la \ +- ../XrdNet/libXrdNetUtil.la \ +- -ldl ++ ../XrdSys/libXrdSys.la +diff -ur xrootd.orig/src/XrdApps/Makefile.am xrootd/src/XrdApps/Makefile.am +--- xrootd.orig/src/XrdApps/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdApps/Makefile.am 2010-12-16 06:00:10.460935054 +0100 +@@ -32,24 +32,23 @@ + ../XrdClient/libXrdClient.la \ + ../XrdPosix/libXrdPosix.la \ + ../XrdOuc/libXrdOuc.la \ +- ../XrdSys/libXrdSys.la ++ $(LIBZ) + +-xrdadler32_LDFLAGS = -static -export-dynamic -ldl -lz ++xrdadler32_LDFLAGS = -static -export-dynamic + + mpxstats_SOURCES = XrdMpxStats.cc + + mpxstats_LDADD = \ + ../XrdNet/libXrdNet.la \ + ../XrdOuc/libXrdOuc.la \ +- ../XrdSys/libXrdSys.la \ +- ../XrdNet/libXrdNetUtil.la ++ ../XrdNetUtil/libXrdNetUtil.la \ ++ ../XrdSys/libXrdSys.la + + mpxstats_LDFLAGS = -static -export-dynamic + + wait41_SOURCES = XrdWait41.cc + + wait41_LDADD = \ +- ../XrdOuc/libXrdOuc.la \ + ../XrdSys/libXrdSys.la + + wait41_LDFLAGS = -static -export-dynamic +diff -ur xrootd.orig/src/XrdBwm/Makefile.am xrootd/src/XrdBwm/Makefile.am +--- xrootd.orig/src/XrdBwm/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdBwm/Makefile.am 2010-12-16 06:00:10.461935045 +0100 +@@ -37,4 +37,8 @@ + libXrdBwm_la_LIBADD = ../XrdAcc/libXrdAcc.la \ + ../XrdNet/libXrdNet.la \ + ../XrdOuc/libXrdOuc.la \ +- ../XrdSys/libXrdSys.la ++ ../XrdNetUtil/libXrdNetUtil.la \ ++ ../XrdSys/libXrdSys.la \ ++ $(LIBPTHREAD) ++ ++libXrdBwm_la_LDFLAGS = -module +diff -ur xrootd.orig/src/XrdClient/Makefile.am xrootd/src/XrdClient/Makefile.am +--- xrootd.orig/src/XrdClient/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdClient/Makefile.am 2010-12-16 06:49:09.726935000 +0100 +@@ -77,22 +77,19 @@ + XrdcpXtremeRead.cc XrdcpXtremeRead.hh + + libXrdClient_la_LIBADD = $(LIBSUNMATH) \ +- ../XrdSys/libXrdSys.la \ +- ../XrdCrypto/libXrdCrypto.la \ +- ../XrdSut/libXrdSut.la \ + ../XrdNet/libXrdNet.la \ + ../XrdOuc/libXrdOuc.la \ ++ ../XrdNetUtil/libXrdNetUtil.la \ + ../XrdSys/libXrdSys.la \ +- ../XrdNet/libXrdNetUtil.la ++ $(LIBPTHREAD) -ldl + +-clientlibs = libXrdClient.la \ +- -ldl $(LIBZ) ++clientlibs = libXrdClient.la + + 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_LDADD = $(clientlibs) ++xrdcp_LDADD = $(clientlibs) ../XrdCrypto/libXrdCrypto.la -ldl $(LIBZ) + + + +@@ -114,13 +111,11 @@ + xprep_SOURCES = XrdClientPrep.cc + xprep_LDADD = $(clientlibs) + +-$(OBJECT_XPREP) $(BINLIBS) $(LIBM) $(LIBS) + + + xrdstagetool_SOURCES = XrdStageTool.cc + xrdstagetool_LDADD = $(clientlibs) + +-$(OBJECT_STAGETOOL) $(BINLIBS) $(LIBM) $(LIBS) + + if ENABLE_JAVAINT + libXrdClientAdminJNI_la_SOURCES = XrdClientAdminJNI.cc diff -ur xrootd.orig/src/XrdCms/Makefile.am xrootd/src/XrdCms/Makefile.am ---- xrootd.orig/src/XrdCms/Makefile.am 2009-11-19 04:28:11.000000000 +0100 -+++ xrootd/src/XrdCms/Makefile.am 2010-06-08 17:11:51.802591088 +0200 -@@ -62,6 +62,7 @@ +--- xrootd.orig/src/XrdCms/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdCms/Makefile.am 2010-12-16 06:26:19.292935186 +0100 +@@ -61,9 +61,12 @@ libXrdCms_la_LIBADD = libXrdCmsConv.la \ -+ ../Xrd/libXrd.la \ - ../XrdNet/libXrdNet.la \ - ../XrdOuc/libXrdOuc.la \ - ../XrdOdc/libXrdOdc.la \ -diff -ur xrootd.orig/src/XrdCms/XrdCmsClientMan.cc xrootd/src/XrdCms/XrdCmsClientMan.cc ---- xrootd.orig/src/XrdCms/XrdCmsClientMan.cc 2010-01-16 02:38:03.000000000 +0100 -+++ xrootd/src/XrdCms/XrdCmsClientMan.cc 2010-06-08 17:02:29.597589231 +0200 -@@ -35,7 +35,7 @@ - /* G l o b a l s */ - /******************************************************************************/ - --extern XrdInet *XrdXrootdNetwork; -+ XrdInet *XrdXrootdNetwork = 0; - - XrdNetBufferQ XrdCmsClientMan::BuffQ(2048,64); - -diff -ur xrootd.orig/src/XrdCms/XrdCmsConfig.cc xrootd/src/XrdCms/XrdCmsConfig.cc ---- xrootd.orig/src/XrdCms/XrdCmsConfig.cc 2010-02-18 23:45:17.000000000 +0100 -+++ xrootd/src/XrdCms/XrdCmsConfig.cc 2010-06-08 17:02:29.598589287 +0200 -@@ -135,11 +135,11 @@ - // of the following symbol being non-zero. On the server side, we have no - // such symbol and need to provide one initialized to zero. - // -- XrdSecProtocol *(*XrdXrootdSecGetProtocol) -+extern XrdSecProtocol *(*XrdXrootdSecGetProtocol) - (const char *hostname, - const struct sockaddr &netaddr, - const XrdSecParameters &parms, -- XrdOucErrInfo *einfo)=0; -+ XrdOucErrInfo *einfo); - - /******************************************************************************/ - /* E x t e r n a l T h r e a d I n t e r f a c e s */ -diff -ur xrootd.orig/src/XrdCms/XrdCmsSecurity.cc xrootd/src/XrdCms/XrdCmsSecurity.cc ---- xrootd.orig/src/XrdCms/XrdCmsSecurity.cc 2008-06-10 04:00:42.000000000 +0200 -+++ xrootd/src/XrdCms/XrdCmsSecurity.cc 2010-06-08 17:02:29.599589203 +0200 -@@ -48,11 +48,11 @@ - /* G l o b a l S y m b o l s */ - /******************************************************************************/ - --extern XrdSecProtocol *(*XrdXrootdSecGetProtocol) -+XrdSecProtocol *(*XrdXrootdSecGetProtocol) - (const char *hostname, - const struct sockaddr &netaddr, - const XrdSecParameters &parms, -- XrdOucErrInfo *einfo); -+ XrdOucErrInfo *einfo) = 0; +- ../XrdNet/libXrdNet.la \ +- ../XrdOuc/libXrdOuc.la \ +- ../XrdSys/libXrdSys.la ++ ../Xrd/libXrd.la \ ++ ../XrdNet/libXrdNet.la \ ++ ../XrdOuc/libXrdOuc.la \ ++ ../XrdNetUtil/libXrdNetUtil.la \ ++ ../XrdSys/libXrdSys.la \ ++ $(LIBPTHREAD) -ldl - /******************************************************************************/ - /* S t a t i c S y m b o l s */ + cmsd_SOURCES = \ + XrdCmsAdmin.cc \ +@@ -92,14 +95,13 @@ + + + +-cmsd_LDADD = libXrdCmsConv.la \ +- ../XrdNet/libXrdNet.la \ ++cmsd_LDADD = libXrdCms.la \ ++ ../Xrd/libXrd.la \ + ../XrdOss/libXrdOss.la \ + ../XrdFrm/libXrdFrm.la \ ++ ../XrdNet/libXrdNet.la \ + ../XrdOuc/libXrdOuc.la \ +- ../XrdSys/libXrdSys.la \ +- ../Xrd/libXrd.la \ +- -ldl ++ ../XrdSys/libXrdSys.la + + cmsd_LDFLAGS = -static -export-dynamic + +diff -ur xrootd.orig/src/XrdCns/Makefile.am xrootd/src/XrdCns/Makefile.am +--- xrootd.orig/src/XrdCns/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdCns/Makefile.am 2010-12-16 06:00:10.464935021 +0100 +@@ -47,16 +47,15 @@ + XrdCnsXref.cc + + XrdCnsd_LDADD = \ +- ../Xrd/libXrd.la \ + ../XrdOss/libXrdOss.la \ +- ../XrdOuc/libXrdOuc.la \ ++ ../XrdClient/libXrdClient.la \ + ../XrdNet/libXrdNet.la \ +- ../XrdSys/libXrdSys.la \ +- ../XrdClient/libXrdClient.la ++ ../XrdOuc/libXrdOuc.la \ ++ ../XrdNetUtil/libXrdNetUtil.la \ ++ ../XrdSys/libXrdSys.la + + XrdCnsd_LDFLAGS = -static -export-dynamic + +-$(OBJECT_XRDCNSD) $(BINLIBS) $(LIBM) $(LIBS) + + cns_ssi_SOURCES = \ + XrdCnsLog.cc \ +@@ -67,13 +66,8 @@ + XrdCnsSsiMain.cc + + cns_ssi_LDADD = \ +- ../Xrd/libXrd.la \ +- ../XrdOss/libXrdOss.la \ + ../XrdOuc/libXrdOuc.la \ +- ../XrdNet/libXrdNet.la \ +- ../XrdSys/libXrdSys.la \ +- ../XrdClient/libXrdClient.la ++ ../XrdNetUtil/libXrdNetUtil.la \ ++ ../XrdSys/libXrdSys.la + + cns_ssi_LDFLAGS = -static -export-dynamic +- +-$(OBJECT_CNS_SSI) $(BINLIBS) $(LIBM) $(LIBS) diff -ur xrootd.orig/src/XrdCrypto/Makefile.am xrootd/src/XrdCrypto/Makefile.am ---- xrootd.orig/src/XrdCrypto/Makefile.am 2008-10-12 12:25:41.000000000 +0200 -+++ xrootd/src/XrdCrypto/Makefile.am 2010-06-08 17:02:29.599589203 +0200 -@@ -70,7 +70,10 @@ +--- xrootd.orig/src/XrdCrypto/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdCrypto/Makefile.am 2010-12-16 06:00:10.465935016 +0100 +@@ -43,11 +43,8 @@ + XrdCryptosslX509.cc XrdCryptosslX509.hh \ + XrdCryptosslX509Crl.cc XrdCryptosslX509Crl.hh \ + XrdCryptosslX509Req.cc XrdCryptosslX509Req.hh \ +- XrdCryptosslFactory.cc XrdCryptosslFactory.hh \ + XrdCryptosslgsiAux.cc XrdCryptosslgsiAux.hh \ + XrdCryptosslgsiX509Chain.cc XrdCryptosslgsiX509Chain.hh +-libXrdSSLutil_la_LIBADD = ../XrdSut/libXrdSut.la \ +- $(OPENSSL_LIBDIR) -lssl -lcrypto + libXrdSSLutil_la_CXXFLAGS = $(SSLCXXFLAGS) + + libXrdCrypto_la_SOURCES = \ +@@ -65,33 +62,24 @@ + XrdCryptoX509Req.cc XrdCryptoX509Req.hh \ + XrdCryptolocalCipher.cc XrdCryptolocalCipher.hh \ + XrdCryptolocalFactory.cc XrdCryptolocalFactory.hh +-libXrdCrypto_la_LIBADD = libXrdSSLutil.la \ ++libXrdCrypto_la_LIBADD = ../XrdSut/libXrdSut.la \ + ../XrdOuc/libXrdOuc.la \ +- ../XrdSys/libXrdSys.la \ +- ../XrdNet/libXrdNet.la \ +- ../XrdNet/libXrdNetUtil.la +-libXrdCrypto_la_LDFLAGS = -module ++ ../XrdSys/libXrdSys.la -ldl + + libXrdCryptoLite_la_SOURCES = \ XrdCryptoLite.hh \ XrdCryptoLite.cc \ XrdCryptoLite_bf32.cc --libXrdCrytoLite_la_CXXFLAGS = $(SSLCXXFLAGS) -+libXrdCryptoLite_la_CXXFLAGS = $(SSLCXXFLAGS) -+libXrdCryptoLite_la_LIBADD = ../XrdSys/libXrdSys.la \ -+ ../XrdOuc/libXrdOuc.la \ +-libXrdCryptoLite_la_LDFLAGS = -module + libXrdCryptoLite_la_CXXFLAGS = $(SSLCXXFLAGS) +-libXrdCryptoLite_la_LIBADD = $(OPENSSL_LIBDIR) -lcrypto ++libXrdCryptoLite_la_LIBADD = ../XrdOuc/libXrdOuc.la \ + $(OPENSSL_LIBDIR) -lcrypto - - libXrdCryptossl_la_SOURCES = \ -@@ -84,7 +87,8 @@ - XrdCryptosslX509Req.cc \ - XrdCryptosslgsiAux.cc \ - XrdCryptosslgsiX509Chain.cc +-libXrdCryptossl_la_SOURCES = \ +- XrdCryptosslAux.cc \ +- XrdCryptosslCipher.cc \ +- XrdCryptosslFactory.cc \ +- XrdCryptosslMsgDigest.cc \ +- XrdCryptosslRSA.cc \ +- XrdCryptosslX509.cc \ +- XrdCryptosslX509Crl.cc \ +- XrdCryptosslX509Req.cc \ +- XrdCryptosslgsiAux.cc \ +- XrdCryptosslgsiX509Chain.cc -libXrdCryptossl_la_LIBADD = ../XrdSut/libXrdSut.la \ -+libXrdCryptossl_la_LIBADD = libXrdCrypto.la \ ++libXrdCryptossl_la_SOURCES = XrdCryptosslFactory.cc XrdCryptosslFactory.hh ++libXrdCryptossl_la_LIBADD = libXrdSSLutil.la \ ++ libXrdCrypto.la \ + ../XrdSut/libXrdSut.la \ ++ ../XrdOuc/libXrdOuc.la \ ++ ../XrdSys/libXrdSys.la \ $(OPENSSL_LIBDIR) -lssl -lcrypto + libXrdCryptossl_la_LDFLAGS = -module libXrdCryptossl_la_CXXFLAGS = $(SSLCXXFLAGS) +diff -ur xrootd.orig/src/XrdFfs/Makefile.am xrootd/src/XrdFfs/Makefile.am +--- xrootd.orig/src/XrdFfs/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdFfs/Makefile.am 2010-12-16 07:15:28.437933903 +0100 +@@ -42,15 +42,12 @@ + 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) ++ $(LIBPTHREAD) + xrootdfs_SOURCES = XrdFfsXrootdfs.cc +-xrootdfs_LDADD = libXrdFfs.la ++xrootdfs_LDADD = libXrdFfs.la $(FUSELIB) diff -ur xrootd.orig/src/XrdMon/Makefile.am xrootd/src/XrdMon/Makefile.am ---- xrootd.orig/src/XrdMon/Makefile.am 2008-11-27 10:46:33.000000000 +0100 -+++ xrootd/src/XrdMon/Makefile.am 2010-06-08 17:02:29.600589049 +0200 +--- xrootd.orig/src/XrdMon/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdMon/Makefile.am 2010-12-16 06:00:10.467935006 +0100 @@ -10,7 +10,7 @@ # global settings @@ -150,151 +293,509 @@ diff -ur xrootd.orig/src/XrdMon/Makefile.am xrootd/src/XrdMon/Makefile.am ############################################################################# ## extra directory definitions for install tree -diff -ur xrootd.orig/src/XrdNet/Makefile.am xrootd/src/XrdNet/Makefile.am ---- xrootd.orig/src/XrdNet/Makefile.am 2007-11-16 02:07:38.000000000 +0100 -+++ xrootd/src/XrdNet/Makefile.am 2010-06-08 17:02:29.600589049 +0200 -@@ -29,7 +29,9 @@ - XrdNetSecurity.cc XrdNetSecurity.hh \ - XrdNetSocket.cc XrdNetSocket.hh \ - XrdNetWork.cc XrdNetWork.hh --libXrdNet_la_LIBADD = $(LIBSOCKET) $(LIBNSL) -+libXrdNet_la_LIBADD = ../XrdSys/libXrdSys.la \ -+ ../XrdOuc/libXrdOuc.la \ -+ $(LIBSOCKET) $(LIBNSL) - #REFAC libXrdNet_la_CXXFLAGS = -prefer-pic - #REFAC libXrdNet_la_LDFLAGS = -static - -diff -ur xrootd.orig/src/XrdOdc/Makefile.am xrootd/src/XrdOdc/Makefile.am ---- xrootd.orig/src/XrdOdc/Makefile.am 2007-06-07 12:44:41.000000000 +0200 -+++ xrootd/src/XrdOdc/Makefile.am 2010-06-08 17:02:29.600589049 +0200 -@@ -28,6 +28,8 @@ - XrdOdcManager.cc XrdOdcManager.hh \ - XrdOdcMsg.cc XrdOdcMsg.hh XrdOdcTrace.hh \ - XrdOdcResp.cc XrdOdcResp.hh -+libXrdOdc_la_LIBADD = ../XrdNet/libXrdNet.la \ -+ ../XrdSys/libXrdSys.la +@@ -105,14 +105,11 @@ + xrdmonCollector_LDADD = libXrdMonCollector.la \ + libXrdMonDecoder.la \ + libXrdMonCommon.la \ +- ../XrdOuc/libXrdOuc.la \ + ../XrdSys/libXrdSys.la + + xrdmonDecoder_SOURCES = XrdMonDecMainApp.cc + xrdmonDecoder_LDADD = libXrdMonDecoder.la \ +- libXrdMonCommon.la \ +- ../XrdOuc/libXrdOuc.la \ +- ../XrdSys/libXrdSys.la ++ libXrdMonCommon.la + + xrdmonDummySender_SOURCES = XrdMonSndDummyXrootdApp.cc + xrdmonDummySender_LDADD = libXrdMonDummySender.la \ +@@ -140,5 +137,4 @@ + + xrdmonCout2file_SOURCES = XrdMonCout2FileApp.cc + xrdmonCout2file_LDADD = libXrdMonDecoder.la \ +- ../XrdOuc/libXrdOuc.la \ +- libXrdMonCommon.la +\ No newline at end of file ++ libXrdMonCommon.la +diff -ur xrootd.orig/src/XrdMon/XrdMonArgParserConvert.hh xrootd/src/XrdMon/XrdMonArgParserConvert.hh +--- xrootd.orig/src/XrdMon/XrdMonArgParserConvert.hh 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdMon/XrdMonArgParserConvert.hh 2010-12-16 06:00:10.469935000 +0100 +@@ -12,6 +12,7 @@ - ## XrdOdcTest_SOURCES = XrdOdcTest.cc - ## XrdOdcTest_LDADD = libXrdOdc.la \ + #include "XrdMon/XrdMonException.hh" + #include "XrdMon/XrdMonErrors.hh" ++#include + #include /* atoi */ + #include + +diff -ur xrootd.orig/src/XrdOfs/Makefile.am xrootd/src/XrdOfs/Makefile.am +--- xrootd.orig/src/XrdOfs/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdOfs/Makefile.am 2010-12-16 06:35:41.344934862 +0100 +@@ -18,11 +18,7 @@ + XrdOfs.hh \ + XrdOfsEvr.hh XrdOfsEvs.hh XrdOfsHandle.hh \ + XrdOfsSecurity.hh XrdOfsTrace.hh XrdOfsConfig.hh \ +- XrdOfsConfig.cc XrdOfsEvs.cc XrdOfsEvr.cc XrdOfsHandle.cc XrdOfs.cc \ + XrdOfsPoscq.hh XrdOfsStats.hh +-# Note: the source files above also get installed in the headers directory, +-# so that derived objects of the Ofs can be built. This was originally +-# needed for the ALICE tokenauthz extension. + + libXrdOfs_la_SOURCES = \ + XrdOfs.cc XrdOfs.hh XrdOfsSecurity.hh XrdOfsTrace.hh XrdOfsFS.cc \ +@@ -32,7 +28,11 @@ + XrdOfsHandle.cc XrdOfsHandle.hh \ + XrdOfsPoscq.cc XrdOfsStats.cc + +-libXrdOfs_la_LIBTOOLFLAGS = --tag=disable-static +-libXrdOfs_la_LDFLAGS = +- +-libXrdOfs_la_LIBADD = ++libXrdOfs_la_LIBADD = ../XrdCms/libXrdCms.la \ ++ ../XrdOss/libXrdOss.la \ ++ ../XrdAcc/libXrdAcc.la \ ++ ../XrdNet/libXrdNet.la \ ++ ../XrdOuc/libXrdOuc.la \ ++ ../XrdNetUtil/libXrdNetUtil.la \ ++ ../XrdSys/libXrdSys.la \ ++ $(LIBPTHREAD) diff -ur xrootd.orig/src/XrdOss/Makefile.am xrootd/src/XrdOss/Makefile.am ---- xrootd.orig/src/XrdOss/Makefile.am 2009-05-22 03:04:24.000000000 +0200 -+++ xrootd/src/XrdOss/Makefile.am 2010-06-08 17:02:29.601589314 +0200 +--- xrootd.orig/src/XrdOss/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdOss/Makefile.am 2010-12-16 06:00:10.470935000 +0100 @@ -41,4 +41,7 @@ XrdOssSpace.cc XrdOssSpace.hh \ XrdOssStat.cc \ XrdOssUnlink.cc -libXrdOss_la_LIBADD = $(LIBRT) -+libXrdOss_la_LIBADD = ../XrdNet/libXrdNet.la \ -+ ../XrdSys/libXrdSys.la \ ++libXrdOss_la_LIBADD = ../XrdFrm/libXrdFrm.la \ + ../XrdOuc/libXrdOuc.la \ -+ $(LIBRT) ++ ../XrdSys/libXrdSys.la \ ++ $(LIBRT) $(LIBPTHREAD) diff -ur xrootd.orig/src/XrdOuc/Makefile.am xrootd/src/XrdOuc/Makefile.am ---- xrootd.orig/src/XrdOuc/Makefile.am 2009-08-19 15:51:46.000000000 +0200 -+++ xrootd/src/XrdOuc/Makefile.am 2010-06-08 17:02:29.601589314 +0200 -@@ -50,7 +50,8 @@ - XrdOucCRC.cc XrdOucCRC.hh \ - XrdOucHash.icc - --libXrdOuc_la_LIBADD = $(LIBPTHREAD) $(SEM_LIBRT) $(LIBNSL) -+libXrdOuc_la_LIBADD = ../XrdSys/libXrdSys.la \ +--- xrootd.orig/src/XrdOuc/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdOuc/Makefile.am 2010-12-16 06:00:10.470935000 +0100 +@@ -57,18 +57,10 @@ + XrdOucTrace.cc XrdOucTrace.hh \ + XrdOucUtils.cc XrdOucUtils.hh + +-# XrdOucCRC.cc XrdOucCRC.hh \ +-# XrdOucHash.icc ++libXrdOuc_la_LIBADD = ../XrdNetUtil/libXrdNetUtil.la \ ++ ../XrdSys/libXrdSys.la \ + $(LIBPTHREAD) $(SEM_LIBRT) $(LIBNSL) - #REFAC libXrdOuc_la_CXXFLAGS = -prefer-pic - #REFAC libXrdOuc_la_LDFLAGS = -static + + +-libXrdOuc_la_LIBADD = $(LIBPTHREAD) $(SEM_LIBRT) $(LIBNSL) ../XrdSys/libXrdSysErrLog.la +- +-# sources not named in rules that still need to get rolled into the distribution tarball +-EXTRA_DIST = XrdOucRash.hh XrdOucRash.icc +- +- +-# TODO: (DEREK) why are these compiled in the classic GNUmakefile instead of making a lib? +-# XrdSys/XrdSysError.cc XrdSys/XrdSysError.hh \ +-# 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.orig/src/XrdPosix/Makefile.am xrootd/src/XrdPosix/Makefile.am +--- xrootd.orig/src/XrdPosix/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdPosix/Makefile.am 2010-12-16 07:08:35.222934713 +0100 +@@ -41,10 +41,9 @@ + XrdPosixXrootd.cc + + libXrdPosix_la_LIBADD = ../XrdClient/libXrdClient.la \ +- ../XrdSec/libXrdSec.la \ +- ../XrdNet/libXrdNet.la \ + ../XrdOuc/libXrdOuc.la \ +- ../XrdSys/libXrdSys.la ++ ../XrdSys/libXrdSys.la \ ++ $(LIBPTHREAD) -ldl + + #libXrdPosixPreload_la_SOURCES = \ + # XrdPosixPreload32.cc \ +@@ -57,6 +56,5 @@ + # ../XrdClient/libXrdClient.la \ + # ../XrdNet/libXrdNet.la \ + # ../XrdOuc/libXrdOuc.la \ +-# ../XrdSec/libXrdSec.la \ + # ../XrdSys/libXrdSys.la diff -ur xrootd.orig/src/XrdPss/Makefile.am xrootd/src/XrdPss/Makefile.am ---- xrootd.orig/src/XrdPss/Makefile.am 2007-06-01 12:29:53.000000000 +0200 -+++ xrootd/src/XrdPss/Makefile.am 2010-06-08 17:02:29.602588812 +0200 -@@ -20,7 +20,8 @@ - XrdPssAio.cc \ +--- xrootd.orig/src/XrdPss/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdPss/Makefile.am 2010-12-16 06:00:10.471935001 +0100 +@@ -21,10 +21,9 @@ XrdPssConfig.cc --libXrdProxy_la_LIBADD = ../XrdClient/libXrdClient.la \ -+libXrdProxy_la_LIBADD = ../XrdPosix/libXrdPosix.la \ -+ ../XrdClient/libXrdClient.la \ - ../XrdNet/libXrdNet.la \ + libXrdPss_la_LIBADD = ../XrdFfs/libXrdFfs.la \ +- ../XrdClient/libXrdClient.la \ +- ../XrdSecsss//libXrdSecsss.la \ +- ../XrdSec//libXrdSec.la \ +- ../XrdNet/libXrdNet.la \ +- ../XrdNet/libXrdNetUtil.la \ ++ ../XrdPosix/libXrdPosix.la \ ../XrdOuc/libXrdOuc.la \ ++ ../XrdNetUtil/libXrdNetUtil.la \ ../XrdSys/libXrdSys.la ++ ++libXrdPss_la_LDFLAGS = -module diff -ur xrootd.orig/src/XrdRootd/Makefile.am xrootd/src/XrdRootd/Makefile.am ---- xrootd.orig/src/XrdRootd/Makefile.am 2005-10-06 17:30:22.000000000 +0200 -+++ xrootd/src/XrdRootd/Makefile.am 2010-06-08 17:02:29.602588812 +0200 +--- xrootd.orig/src/XrdRootd/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdRootd/Makefile.am 2010-12-16 06:00:10.472935002 +0100 @@ -13,4 +13,5 @@ INCLUDES = -I$(top_srcdir)/src libXrdRootd_la_SOURCES = XrdRootdProtocol.cc XrdRootdProtocol.hh -libXrdRootd_la_LIBADD = ../XrdOuc/libXrdOuc.la -+libXrdRootd_la_LIBADD = ../Xrd/libXrd.la \ -+ ../XrdOuc/libXrdOuc.la ++libXrdRootd_la_LIBADD = ../Xrd/libXrd.la ../XrdSys/libXrdSys.la ++libXrdRootd_la_LDFLAGS = -module diff -ur xrootd.orig/src/XrdSec/Makefile.am xrootd/src/XrdSec/Makefile.am ---- xrootd.orig/src/XrdSec/Makefile.am 2010-01-12 16:04:06.000000000 +0100 -+++ xrootd/src/XrdSec/Makefile.am 2010-06-08 17:02:29.603588588 +0200 -@@ -25,6 +25,9 @@ - XrdSecTLayer.cc XrdSecTLayer.hh \ +--- xrootd.orig/src/XrdSec/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdSec/Makefile.am 2010-12-16 06:00:10.473935003 +0100 +@@ -16,47 +16,42 @@ + + ############################################################################# + ## deliverables (to be built / installed) +-xrootdsecinc_HEADERS = XrdSecInterface.hh XrdSecEntity.hh XrdSecTLayer.hh ++xrootdsecinc_HEADERS = XrdSecInterface.hh XrdSecEntity.hh + + lib_LTLIBRARIES = libXrdSec.la + ++noinst_LTLIBRARIES = libXrdSecUtil.la libXrdSecTLayer.la ++ + bin_PROGRAMS = testclient testserver + + ############################################################################# + # Build rules + +-libXrdSec_la_SOURCES = \ ++libXrdSecUtil_la_SOURCES = \ + XrdSecClient.cc XrdSecInterface.hh XrdSecEntity.hh \ + XrdSecPManager.cc XrdSecPManager.hh \ + XrdSecProtocolhost.cc XrdSecProtocolhost.hh \ + XrdSecServer.cc XrdSecServer.hh \ +- XrdSecTLayer.cc XrdSecTLayer.hh \ XrdSecTrace.hh ++ ++libXrdSec_la_SOURCES = ++nodist_EXTRA_libXrdSec_la_SOURCES = dummy.cpp libXrdSec_la_LDFLAGS = -module -+libXrdSec_la_LIBADD = ../XrdSys/libXrdSys.la \ ++libXrdSec_la_LIBTOOLFLAGS = --tag=disable-static ++libXrdSec_la_LIBADD = libXrdSecUtil.la \ + ../XrdOuc/libXrdOuc.la \ -+ ../XrdNet/libXrdNet.la ++ ../XrdNetUtil/libXrdNetUtil.la \ ++ ../XrdSys/libXrdSys.la -ldl + +-# Note: the next option leads to problems at least on Darwin +-#libXrdSec_la_LIBTOOLFLAGS = --tag=disable-static +-# loadable modules are not equal to shared libraries, even though +-# this holds true for many systems +-# So, the testclient linking is actually not portable. Libtool can go +-# around this problem, if a static library for libXrdSec is available. +-# The clean way would be to either build a module and a library, or +-# make the testclient load the loadable module. ++libXrdSecTLayer_la_SOURCES = XrdSecTLayer.cc XrdSecTLayer.hh + + testclient_SOURCES = XrdSectestClient.cc + testclient_LDFLAGS = -static +-testclient_LDADD = libXrdSec.la \ +- -ldl \ +- ../XrdOuc/libXrdOuc.la \ +- ../XrdNet/libXrdNet.la \ +- ../XrdSys/libXrdSys.la \ +- ../XrdNet/libXrdNetUtil.la ++testclient_LDADD = libXrdSecUtil.la \ ++ ../XrdSys/libXrdSys.la + + testserver_SOURCES = XrdSectestServer.cc + testserver_LDFLAGS = -static +-testserver_LDADD = libXrdSec.la \ +- -ldl \ ++testserver_LDADD = libXrdSecUtil.la \ + ../XrdOuc/libXrdOuc.la \ +- ../XrdNet/libXrdNet.la \ +- ../XrdSys/libXrdSys.la \ +- ../XrdNet/libXrdNetUtil.la ++ ../XrdSys/libXrdSys.la +diff -ur xrootd.orig/src/XrdSecgsi/Makefile.am xrootd/src/XrdSecgsi/Makefile.am +--- xrootd.orig/src/XrdSecgsi/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdSecgsi/Makefile.am 2010-12-16 06:00:10.473935003 +0100 +@@ -12,8 +12,7 @@ + + bin_PROGRAMS = xrdgsiproxy + +-# TODO: xrdsecgsitest no longer builds +-#check_PROGRAMS = xrdsecgsitest ++check_PROGRAMS = xrdsecgsitest + + INCLUDES = -I$(top_srcdir)/src + +@@ -21,14 +20,15 @@ + XrdSecProtocolgsi.cc XrdSecProtocolgsi.hh XrdSecgsiTrace.hh + libXrdSecgsi_la_LDFLAGS = -module + +-libXrdSecgsi_la_LIBADD = ../XrdCrypto/libXrdCryptossl.la \ ++libXrdSecgsi_la_LIBADD = ../XrdCrypto/libXrdSSLutil.la \ + ../XrdCrypto/libXrdCrypto.la \ +- ../XrdSec/libXrdSec.la \ +- ../XrdOuc/libXrdOuc.la \ ++ ../XrdSut/libXrdSut.la \ + ../XrdNet/libXrdNet.la \ +- ../XrdSys/libXrdSys.la +-# following line disabled. Look for reason in XrdSec/Makefile.am +-#libXrdSecgsi_la_LIBTOOLFLAGS = --tag=disable-static ++ ../XrdOuc/libXrdOuc.la \ ++ ../XrdNetUtil/libXrdNetUtil.la \ ++ ../XrdSys/libXrdSys.la \ ++ $(OPENSSL_LIBDIR) -lssl -lcrypto ++libXrdSecgsi_la_LIBTOOLFLAGS = --tag=disable-static + + # GridMAP function looking up an LDAP database + libXrdSecgsiGMAPLADP_la_SOURCES = XrdSecgsiGMAPFunLDAP.cc +@@ -36,16 +36,15 @@ + + xrdgsiproxy_SOURCES = XrdSecgsiProxy.cc + xrdgsiproxy_LDFLAGS = -static +-xrdgsiproxy_LDADD = libXrdSecgsi.la \ +- ../XrdSec/libXrdSec.la \ +- ../XrdOuc/libXrdOuc.la \ ++xrdgsiproxy_LDADD = ../XrdCrypto/libXrdSSLutil.la \ ++ ../XrdCrypto/libXrdCrypto.la \ + ../XrdNet/libXrdNet.la \ +- ../XrdSys/libXrdSys.la +- ++ ../XrdOuc/libXrdOuc.la \ ++ ../XrdSys/libXrdSys.la \ ++ $(OPENSSL_LIBDIR) -lssl -lcrypto + +-#xrdsecgsitest_SOURCES = XrdSecgsitest.cc +-#xrdsecgsitest_LDADD = libXrdSecgsi.la \ +-# ../XrdSec/libXrdSec.la \ +-# ../XrdOuc/libXrdOuc.la \ +-# ../XrdNet/libXrdNet.la + ++xrdsecgsitest_SOURCES = XrdSecgsitest.cc ++xrdsecgsitest_LDADD = ../XrdCrypto/libXrdSSLutil.la \ ++ ../XrdCrypto/libXrdCrypto.la \ ++ $(OPENSSL_LIBDIR) -lssl -lcrypto +diff -ur xrootd.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc xrootd/src/XrdSecgsi/XrdSecProtocolgsi.cc +--- xrootd.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdSecgsi/XrdSecProtocolgsi.cc 2010-12-16 06:00:10.475935003 +0100 +@@ -150,6 +150,7 @@ + XrdOucTrace *XrdSecProtocolgsi::GSITrace = 0; + + XrdOucTrace *gsiTrace = 0; ++XrdOucTrace *sslTrace = 0; + + /******************************************************************************/ + /* S t a t i c F u n c t i o n s */ +diff -ur xrootd.orig/src/XrdSecgsi/XrdSecgsiProxy.cc xrootd/src/XrdSecgsi/XrdSecgsiProxy.cc +--- xrootd.orig/src/XrdSecgsi/XrdSecgsiProxy.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdSecgsi/XrdSecgsiProxy.cc 2010-12-16 06:00:10.477935003 +0100 +@@ -94,6 +94,7 @@ + static XrdSysLogger Logger; + static XrdSysError eDest(0,"proxy_"); + XrdOucTrace *gsiTrace = 0; ++XrdOucTrace *sslTrace = 0; - # Note: the next option leads to problems at least on Darwin - #libXrdSec_la_LIBTOOLFLAGS = --tag=disable-static + int main( int argc, char **argv ) + { +diff -ur xrootd.orig/src/XrdSecgsi/XrdSecgsitest.cc xrootd/src/XrdSecgsi/XrdSecgsitest.cc +--- xrootd.orig/src/XrdSecgsi/XrdSecgsitest.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdSecgsi/XrdSecgsitest.cc 2010-12-16 06:00:10.478935003 +0100 +@@ -52,6 +52,7 @@ + static XrdSysLogger Logger; + static XrdSysError eDest(0,"gsitest_"); + XrdOucTrace *gsiTrace = 0; ++XrdOucTrace *sslTrace = 0; + + int main( int argc, char **argv ) + { +diff -ur xrootd.orig/src/XrdSeckrb4/Makefile.am xrootd/src/XrdSeckrb4/Makefile.am +--- xrootd.orig/src/XrdSeckrb4/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdSeckrb4/Makefile.am 2010-12-16 06:00:10.478935003 +0100 +@@ -13,6 +13,9 @@ + INCLUDES = -I$(top_srcdir)/src $(KRB4_INCDIR) + + libXrdSeckrb4_la_SOURCES = XrdSecProtocolkrb4.cc +-libXrdSeckrb4_la_LIBADD = $(KRB5_LIBDIR) -lkrb4 -lkrb5 -ldes425 -lk5crypto -lcom_err ++libXrdSeckrb4_la_LIBADD = \ ++ ../XrdOuc/libXrdOuc.la \ ++ ../XrdSys/libXrdSys.la \ ++ $(KRB5_LIBDIR) -lkrb4 -lkrb5 -ldes425 -lk5crypto -lcom_err + libXrdSeckrb4_la_LDFLAGS = -module +-libXrdSeckrb4_la_LIBTOOLFLAGS = --tag=disable-static +\ No newline at end of file ++libXrdSeckrb4_la_LIBTOOLFLAGS = --tag=disable-static +diff -ur xrootd.orig/src/XrdSeckrb5/Makefile.am xrootd/src/XrdSeckrb5/Makefile.am +--- xrootd.orig/src/XrdSeckrb5/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdSeckrb5/Makefile.am 2010-12-16 06:00:10.478935003 +0100 +@@ -22,9 +22,9 @@ + + libXrdSeckrb5_la_SOURCES = XrdSecProtocolkrb5.cc + libXrdSeckrb5_la_LIBADD = \ +- ../XrdSys/libXrdSys.la \ + ../XrdOuc/libXrdOuc.la \ +- ../XrdNet/libXrdNet.la \ ++ ../XrdNetUtil/libXrdNetUtil.la \ ++ ../XrdSys/libXrdSys.la \ + $(KRB5_LIBDIR) -lkrb5 -lk5crypto -lcom_err + + libXrdSeckrb5_la_LDFLAGS = -module +diff -ur xrootd.orig/src/XrdSecpwd/Makefile.am xrootd/src/XrdSecpwd/Makefile.am +--- xrootd.orig/src/XrdSecpwd/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdSecpwd/Makefile.am 2010-12-16 06:00:10.479935003 +0100 +@@ -20,7 +20,7 @@ + ../XrdSut/libXrdSut.la \ + ../XrdOuc/libXrdOuc.la \ + ../XrdSys/libXrdSys.la \ +- $(CRYPTLIB) $(OPENSSL_LIBDIR) -ldl -lcrypto ++ $(CRYPTLIB) + libXrdSecpwd_la_LDFLAGS = -module + libXrdSecpwd_la_LIBTOOLFLAGS = --tag=disable-static + +@@ -28,7 +28,5 @@ + xrdpwdadmin_LDFLAGS = -static + xrdpwdadmin_LDADD = ../XrdCrypto/libXrdCrypto.la \ + ../XrdSut/libXrdSut.la \ +- ../XrdOuc/libXrdOuc.la \ +- ../XrdSys/libXrdSys.la \ +- $(CRYPTLIB) $(OPENSSL_LIBDIR) -ldl -lcrypto ++ ../XrdOuc/libXrdOuc.la + +diff -ur xrootd.orig/src/XrdSecsss/Makefile.am xrootd/src/XrdSecsss/Makefile.am +--- xrootd.orig/src/XrdSecsss/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdSecsss/Makefile.am 2010-12-16 06:00:10.479935003 +0100 +@@ -19,34 +19,29 @@ + ## deliverables (to be built / installed) + lib_LTLIBRARIES = libXrdSecsss.la + ++noinst_LTLIBRARIES = libXrdSecsssUtil.la ++ + bin_PROGRAMS = xrdsssadmin + + Secsssinc_HEADERS = XrdSecProtocolsss.hh XrdSecsssID.hh XrdSecsssKT.hh XrdSecsssRR.hh + + ############################################################################# + ## Build rules +-libXrdSecsss_la_SOURCES = \ +- XrdSecProtocolsss.cc \ ++libXrdSecsssUtil_la_SOURCES = \ + XrdSecsssID.cc \ + XrdSecsssKT.cc + +-libXrdSecsss_la_LIBADD = ../XrdCrypto/libXrdCryptoLite.la \ +- ../XrdOuc/libXrdOuc.la \ +- ../XrdNet/libXrdNet.la \ +- ../XrdSys/libXrdSys.la \ +- ../XrdNet/libXrdNetUtil.la ++libXrdSecsss_la_SOURCES = XrdSecProtocolsss.cc ++libXrdSecsss_la_LIBADD = libXrdSecsssUtil.la \ ++ ../XrdCrypto/libXrdCryptoLite.la \ ++ ../XrdOuc/libXrdOuc.la \ ++ ../XrdNetUtil/libXrdNetUtil.la \ ++ ../XrdSys/libXrdSys.la + +-libXrdSecsss_la_LDFLAGS = -module $(CRYPTLIB) $(OPENSSL_LIBDIR) ++libXrdSecsss_la_LDFLAGS = -module + + xrdsssadmin_SOURCES = XrdSecsssAdmin.cc + xrdsssadmin_LDFLAGS = -static +-xrdsssadmin_LDADD = libXrdSecsss.la +- +-# ../XrdCrypto/libXrdCryptoLite.la \ +-# ../XrdOuc/libXrdOuc.la \ +-# ../XrdNet/libXrdNet.la \ +-# ../XrdSys/libXrdSys.la \ +-# ../XrdNet/libXrdNetUtil.la \ +-# $(CRYPTLIB) $(OPENSSL_LIBDIR) -lcrypto +- +- ++xrdsssadmin_LDADD = libXrdSecsssUtil.la \ ++ ../XrdOuc/libXrdOuc.la \ ++ ../XrdSys/libXrdSys.la +diff -ur xrootd.orig/src/XrdSecunix/Makefile.am xrootd/src/XrdSecunix/Makefile.am +--- xrootd.orig/src/XrdSecunix/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdSecunix/Makefile.am 2010-12-16 06:00:10.480935003 +0100 +@@ -13,9 +13,7 @@ + INCLUDES = -I$(top_srcdir)/src $(KRB4_INCDIR) + + libXrdSecunix_la_SOURCES = XrdSecProtocolunix.cc +-libXrdSecunix_la_LIBADD = ../XrdSec/libXrdSec.la \ +- ../XrdOuc/libXrdOuc.la \ +- ../XrdSys/libXrdSys.la ++libXrdSecunix_la_LIBADD = ../XrdSys/libXrdSys.la + + libXrdSecunix_la_LDFLAGS = -module + libXrdSecunix_la_LIBTOOLFLAGS = --tag=disable-static diff -ur xrootd.orig/src/XrdSut/Makefile.am xrootd/src/XrdSut/Makefile.am ---- xrootd.orig/src/XrdSut/Makefile.am 2007-02-26 10:40:00.000000000 +0100 -+++ xrootd/src/XrdSut/Makefile.am 2010-06-08 17:02:29.603588588 +0200 -@@ -27,3 +27,5 @@ +--- xrootd.orig/src/XrdSut/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdSut/Makefile.am 2010-12-16 06:00:10.480935003 +0100 +@@ -27,3 +27,6 @@ XrdSutPFile.cc XrdSutPFile.hh\ XrdSutPFEntry.cc XrdSutPFEntry.hh \ XrdSutRndm.cc XrdSutRndm.hh -+libXrdSut_la_LIBADD = ../XrdSys/libXrdSys.la \ -+ ../XrdOuc/libXrdOuc.la ++ ++libXrdSut_la_LIBADD = ../XrdOuc/libXrdOuc.la \ ++ ../XrdSys/libXrdSys.la diff -ur xrootd.orig/src/XrdSys/Makefile.am xrootd/src/XrdSys/Makefile.am ---- xrootd.orig/src/XrdSys/Makefile.am 2008-06-13 15:19:39.000000000 +0200 -+++ xrootd/src/XrdSys/Makefile.am 2010-06-08 17:05:49.355590040 +0200 -@@ -32,7 +32,7 @@ +--- xrootd.orig/src/XrdSys/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdSys/Makefile.am 2010-12-16 06:00:10.481935003 +0100 +@@ -20,9 +20,6 @@ + + lib_LTLIBRARIES = libXrdSys.la + +-# convenience lib since these files are also used for builds in other dirs +-noinst_LTLIBRARIES = libXrdSysErrLog.la +- + xrootdsysinc_HEADERS = \ + XrdSysDir.hh XrdSysLogger.hh XrdSysPlugin.hh \ + XrdSysPthread.hh XrdSysTimer.hh XrdWin32.hh \ +@@ -33,12 +30,10 @@ + ############################################################################# + # Build rules + +-libXrdSysErrLog_la_SOURCES = \ +- XrdSysError.cc XrdSysError.hh \ +- XrdSysLogger.cc XrdSysLogger.hh +- + libXrdSys_la_SOURCES = \ + XrdSysDir.cc XrdSysDir.hh \ ++ XrdSysError.cc XrdSysError.hh \ ++ XrdSysLogger.cc XrdSysLogger.hh \ + XrdSysPlugin.cc XrdSysPlugin.hh \ + XrdSysPriv.cc XrdSysPriv.hh \ + XrdSysPlatform.cc \ +@@ -47,7 +42,7 @@ XrdSysTimer.cc XrdSysTimer.hh \ XrdSysXSLock.cc XrdSysXSLock.hh --libXrdSys_la_LIBADD = $(LIBPTHREAD) $(SEM_LIBRT) $(LIBNSL) +-libXrdSys_la_LIBADD = $(LIBPTHREAD) $(SEM_LIBRT) $(LIBNSL) libXrdSysErrLog.la +libXrdSys_la_LIBADD = -ldl $(LIBPTHREAD) $(SEM_LIBRT) $(LIBNSL) libXrdSys_la_CXXFLAGS = -prefer-pic - EXTRA_DIST = XrdWin32.cc XrdWin32.hh + # sources not named in rules that still need to get rolled into the distribution tarball diff -ur xrootd.orig/src/XrdXrootd/Makefile.am xrootd/src/XrdXrootd/Makefile.am ---- xrootd.orig/src/XrdXrootd/Makefile.am 2007-08-02 17:35:34.000000000 +0200 -+++ xrootd/src/XrdXrootd/Makefile.am 2010-06-08 17:02:29.603588588 +0200 -@@ -40,6 +40,7 @@ +--- xrootd.orig/src/XrdXrootd/Makefile.am 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdXrootd/Makefile.am 2010-12-16 06:00:10.481935003 +0100 +@@ -39,21 +39,10 @@ + xrootd_LDADD = -ldl \ ../Xrd/libXrd.la \ + ../XrdOfs/libXrdOfs.la \ +- ../XrdAcc/libXrdAcc.la \ +- ../XrdOss/libXrdOss.la \ +- ../XrdFrm/libXrdFrm.la \ + ../XrdCms/libXrdCms.la \ ../XrdNet/libXrdNet.la \ +- ../XrdNet/libXrdNetUtil.la \ ../XrdOuc/libXrdOuc.la \ -+ ../XrdCms/libXrdCms.la \ - ../XrdSfs/libXrdSfs.la \ ++ ../XrdNetUtil/libXrdNetUtil.la \ ../XrdSys/libXrdSys.la - xrootd_LDFLAGS = -static -export-dynamic -diff -ur xrootd.orig/src/XrdXrootd/XrdXrootdConfig.cc xrootd/src/XrdXrootd/XrdXrootdConfig.cc ---- xrootd.orig/src/XrdXrootd/XrdXrootdConfig.cc 2010-02-19 04:36:35.000000000 +0100 -+++ xrootd/src/XrdXrootd/XrdXrootdConfig.cc 2010-06-08 17:02:29.605589188 +0200 -@@ -90,7 +90,7 @@ - - const char *XrdXrootdInstance; - -- XrdInet *XrdXrootdNetwork; -+extern XrdInet *XrdXrootdNetwork; - - int XrdXrootdPort; -diff -ur xrootd.orig/src/XrdXrootd/XrdXrootdLoadLib.cc xrootd/src/XrdXrootd/XrdXrootdLoadLib.cc ---- xrootd.orig/src/XrdXrootd/XrdXrootdLoadLib.cc 2009-07-31 05:47:51.000000000 +0200 -+++ xrootd/src/XrdXrootd/XrdXrootdLoadLib.cc 2010-06-08 17:33:03.242590414 +0200 -@@ -37,10 +37,11 @@ - /* G l o b a l S y m b o l s */ - /******************************************************************************/ - --XrdSecProtocol *(*XrdXrootdSecGetProtocol)(const char *hostname, -+extern XrdSecProtocol *(*XrdXrootdSecGetProtocol) -+ (const char *hostname, - const struct sockaddr &netaddr, - const XrdSecParameters &parms, -- XrdOucErrInfo *einfo) = 0; -+ XrdOucErrInfo *einfo); - - /******************************************************************************/ - /* x r o o t d _ l o a d F i l e s y s t e m */ + xrootd_LDFLAGS = -static -export-dynamic +- +-#if IS_GCC +-#xrootd_CXXFLAGS = -fPIC +-# the program should export its symbol table so that a module's +-# unresolved functions can be satisfied by it: +-# -export-dynamic +-#xrootd_LDFLAGS += -static -export-dynamic -fPIC +-#endif diff --git a/xrootd-gridsite.patch b/xrootd-gridsite.patch new file mode 100644 index 0000000..98cd6f5 --- /dev/null +++ b/xrootd-gridsite.patch @@ -0,0 +1,129 @@ +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 +@@ -1,23 +1,6 @@ +- +- + noinst_LTLIBRARIES = libsslGridSite.la +-INCLUDES = ${OPENSSL_INCDIR} -I. ${XML2_INCDIR} +- +-libsslGridSite_la_CFLAGS = -DOPENSSL_NO_KRB5 -U_FORTIFY_SOURCE ${CFLAGS} ++INCLUDES = $(OPENSSL_INCDIR) -I. $(XML2_INCDIR) + + libsslGridSite_la_SOURCES = \ +- grst_err.c \ +- grst_asn1.c \ +- grst_x509.c \ +- grst_gacl.c \ +- grst_xacml.c \ +- grst_http.c \ + grst_verifycallback.c \ +- grst_verifycallback.h \ +- gridsite.h +- +- +- +- +- +- ++ 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 @@ + + lib_LTLIBRARIES = libXrdSecssl.la + ++noinst_LTLIBRARIES = libXrdSecsslUtil.la ++ + INCLUDES = \ + -I$(top_srcdir)/src \ +- -I${XROOTD_INCDIR}/ \ + -IlibsslGridSite \ +- ${OPENSSL_INCDIR} \ +- ${XML2_INCDIR} ++ $(OPENSSL_INCDIR) \ ++ $(XML2_INCDIR) + +-libXrdSecssl_la_SOURCES = \ ++libXrdSecsslUtil_la_SOURCES = \ + XrdSecProtocolssl.cc \ + XrdSecProtocolssl.hh \ + XrdSecProtocolsslTrace.hh \ + XrdSecProtocolsslProc.cc \ + XrdSecProtocolsslProc.hh ++libXrdSecsslUtil_la_LIBADD = \ ++ libsslGridSite/libsslGridSite.la -lgridsite + +-libXrdSecssl_la_LIBADD = +-libXrdSecssl_la_LDFLAGS = \ +- -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 \ +- ${SSLLINKLIB} \ +- libsslGridSite/libsslGridSite.la \ +- ${OPENSSL_LIBDIR} \ +- -lcrypto -lssl \ +- ${XML2_LIBDIR} -lxml2 \ +- -module +- +-libXrdSecssl_la_CXXFLAGS = ${CXXFLAGS} ++ ../XrdOuc/libXrdOuc.la \ ++ ../XrdNetUtil/libXrdNetUtil.la \ ++ ../XrdSys/libXrdSys.la \ ++ $(LIBPTHREAD) \ ++ $(OPENSSL_LIBDIR) -lcrypto -lssl ++libXrdSecssl_la_LDFLAGS = -module + + xrdsecssltest_SOURCES = XrdSecProtocolsslTest.cc +-xrdsecssltest_LDADD = ${OPENSSL_LIBDIR} libXrdSecssl.la ../XrdNet/libXrdNetUtil.la ../XrdOuc/libXrdOuc.la -lssl -lcrypto ++xrdsecssltest_LDADD = \ ++ libXrdSecsslUtil.la \ ++ ../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 +@@ -692,7 +692,7 @@ + } + + /*----------------------------------------------------------------------------*/ +-void MyGRSTerrorLogFunc (char *lfile, int lline, int llevel, char *fmt, ...) { ++int MyGRSTerrorLogFunc (char *lfile, int lline, int llevel, char *fmt, ...) { + EPNAME("grst"); + va_list args; + char fullmessage[4096]; +@@ -713,6 +713,7 @@ + } else { + DEBUG(" ("<< lfile << ":" << lline <<"): " << sfullmessage); + } ++ return 0; + } + + /*----------------------------------------------------------------------------*/ +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 +@@ -52,7 +52,7 @@ + #include "XrdSecssl/XrdSecProtocolsslTrace.hh" + #include "XrdSecssl/XrdSecProtocolsslProc.hh" + #include "libsslGridSite/grst_verifycallback.h" +-#include "libsslGridSite/gridsite.h" ++#include "gridsite.h" + + #define EXPORTKEYSTRENGTH 10 + diff --git a/xrootd-headers.patch b/xrootd-headers.patch new file mode 100644 index 0000000..3f3b8f8 --- /dev/null +++ b/xrootd-headers.patch @@ -0,0 +1,293 @@ +diff -ur xrootd.orig/src/XrdBwm/Makefile.am xrootd/src/XrdBwm/Makefile.am +--- xrootd.orig/src/XrdBwm/Makefile.am 2010-12-14 23:38:38.315570001 +0100 ++++ xrootd/src/XrdBwm/Makefile.am 2010-12-14 23:44:13.990569984 +0100 +@@ -9,30 +9,21 @@ + ####################################################################### + + ############################################################################# +-## extra directory definitions +-xrootdbwmincdir = $(includedir)/xrootd/XrdBwm +- +-############################################################################# + ## deliverables + lib_LTLIBRARIES = libXrdBwm.la + +-xrootdbwminc_HEADERS = XrdBwm.hh \ +- XrdBwmHandle.hh \ +- XrdBwmLogger.hh \ +- XrdBwmPolicy.hh \ +- XrdBwmPolicy1.hh \ +- XrdBwmTrace.hh +- + ############################################################################# + ## Build rules + AM_CPPFLAGS = -I$(top_srcdir)/src + + libXrdBwm_la_SOURCES = \ +- XrdBwm.cc \ +- XrdBwmConfig.cc \ +- XrdBwmHandle.cc \ +- XrdBwmLogger.cc \ +- XrdBwmPolicy1.cc ++ XrdBwm.cc XrdBwm.hh \ ++ XrdBwmConfig.cc \ ++ XrdBwmHandle.cc XrdBwmHandle.hh \ ++ XrdBwmLogger.cc XrdBwmLogger.hh \ ++ XrdBwmPolicy1.cc XrdBwmPolicy1.hh \ ++ XrdBwmPolicy.hh XrdBwmTrace.hh ++ + + libXrdBwm_la_LIBADD = ../XrdAcc/libXrdAcc.la \ + ../XrdNet/libXrdNet.la \ +diff -ur xrootd.orig/src/XrdCms/Makefile.am xrootd/src/XrdCms/Makefile.am +--- xrootd.orig/src/XrdCms/Makefile.am 2010-12-14 23:38:38.317570004 +0100 ++++ xrootd/src/XrdCms/Makefile.am 2010-12-14 23:39:34.478569854 +0100 +@@ -22,19 +22,21 @@ + xrootdcmsincdir = $(includedir)/xrootd/XrdCms + + xrootdcmsinc_HEADERS = \ +-XrdCmsAdmin.hh XrdCmsManTree.hh XrdCmsReq.hh \ +-XrdCmsCache.hh XrdCmsManager.hh XrdCmsResp.hh \ +-XrdCmsClient.hh XrdCmsMeter.hh XrdCmsRouting.hh \ +-XrdCmsClientConfig.hh XrdCmsNash.hh XrdCmsNode.hh \ +-XrdCmsKey.hh XrdCmsSecurity.hh \ +-XrdCmsClientMan.hh XrdCmsPList.hh XrdCmsSelect.hh \ +-XrdCmsClientMsg.hh XrdCmsParser.hh XrdCmsState.hh \ +-XrdCmsCluster.hh XrdCmsPrepArgs.hh XrdCmsSupervisor.hh \ +-XrdCmsConfig.hh XrdCmsPrepare.hh XrdCmsTalk.hh \ +-XrdCmsFinder.hh XrdCmsProtocol.hh XrdCmsTrace.hh \ +-XrdCmsJob.hh XrdCmsRRData.hh XrdCmsTypes.hh \ +-XrdCmsLogin.hh XrdCmsRRQ.hh XrdCmsXmi.hh \ +-XrdCmsManList.hh XrdCmsRTable.hh XrdCmsXmiReq.hh ++ XrdCmsClient.hh \ ++ XrdCmsClientConfig.hh \ ++ XrdCmsClientMan.hh \ ++ XrdCmsClientMsg.hh \ ++ XrdCmsFinder.hh \ ++ XrdCmsLogin.hh \ ++ XrdCmsParser.hh \ ++ XrdCmsResp.hh \ ++ XrdCmsRRData.hh \ ++ XrdCmsSecurity.hh \ ++ XrdCmsSelect.hh \ ++ XrdCmsTalk.hh \ ++ XrdCmsTrace.hh \ ++ XrdCmsTypes.hh \ ++ XrdCmsXmi.hh + + + +@@ -67,29 +69,29 @@ + $(LIBPTHREAD) -ldl + + cmsd_SOURCES = \ +- XrdCmsAdmin.cc \ +- XrdCmsCache.cc \ +- XrdCmsCluster.cc \ +- XrdCmsConfig.cc \ +- XrdCmsJob.cc \ +- XrdCmsKey.cc \ +- XrdCmsManList.cc \ +- XrdCmsManTree.cc \ +- XrdCmsManager.cc \ +- XrdCmsMeter.cc \ +- XrdCmsNash.cc \ +- XrdCmsNode.cc \ +- XrdCmsPList.cc \ +- XrdCmsPrepArgs.cc \ +- XrdCmsPrepare.cc \ +- XrdCmsProtocol.cc \ +- XrdCmsReq.cc \ +- XrdCmsRouting.cc \ +- XrdCmsRRQ.cc \ +- XrdCmsRTable.cc \ +- XrdCmsState.cc \ +- XrdCmsSupervisor.cc \ +- XrdCmsXmiReq.cc ++ XrdCmsAdmin.cc XrdCmsAdmin.hh \ ++ XrdCmsCache.cc XrdCmsCache.hh \ ++ XrdCmsCluster.cc XrdCmsCluster.hh \ ++ XrdCmsConfig.cc XrdCmsConfig.hh \ ++ XrdCmsJob.cc XrdCmsJob.hh \ ++ XrdCmsKey.cc XrdCmsKey.hh \ ++ XrdCmsManList.cc XrdCmsManList.hh \ ++ XrdCmsManTree.cc XrdCmsManTree.hh \ ++ XrdCmsManager.cc XrdCmsManager.hh \ ++ XrdCmsMeter.cc XrdCmsMeter.hh \ ++ XrdCmsNash.cc XrdCmsNash.hh \ ++ XrdCmsNode.cc XrdCmsNode.hh \ ++ XrdCmsPList.cc XrdCmsPList.hh \ ++ XrdCmsPrepArgs.cc XrdCmsPrepArgs.hh \ ++ XrdCmsPrepare.cc XrdCmsPrepare.hh \ ++ XrdCmsProtocol.cc XrdCmsProtocol.hh \ ++ XrdCmsReq.cc XrdCmsReq.hh \ ++ XrdCmsRouting.cc XrdCmsRouting.hh \ ++ XrdCmsRRQ.cc XrdCmsRRQ.hh \ ++ XrdCmsRTable.cc XrdCmsRTable.hh \ ++ XrdCmsState.cc XrdCmsState.hh \ ++ XrdCmsSupervisor.cc XrdCmsSupervisor.hh \ ++ XrdCmsXmiReq.cc XrdCmsXmiReq.hh + + + +diff -ur xrootd.orig/src/XrdCns/Makefile.am xrootd/src/XrdCns/Makefile.am +--- xrootd.orig/src/XrdCns/Makefile.am 2010-12-14 23:38:38.318570004 +0100 ++++ xrootd/src/XrdCns/Makefile.am 2010-12-14 23:39:34.479569876 +0100 +@@ -9,42 +9,26 @@ + ####################################################################### + + ############################################################################# +-## extra directory definitions +-xrootdcnsincdir = $(includedir)/xrootd/XrdCns +- +-############################################################################# + ## deliverables + bin_PROGRAMS = XrdCnsd cns_ssi + + INCLUDES = -I$(top_srcdir)/src + +-xrootdcnsinc_HEADERS = XrdCnsConfig.hh \ +- XrdCnsDaemon.hh \ +- XrdCnsInventory.hh \ +- XrdCnsLog.hh \ +- XrdCnsLogClient.hh \ +- XrdCnsLogFile.hh \ +- XrdCnsLogRec.hh \ +- XrdCnsLogServer.hh \ +- XrdCnsSsi.hh \ +- XrdCnsSsiCfg.hh \ +- XrdCnsSsiSay.hh \ +- XrdCnsXref.hh + + ############################################################################# + ## Build rules + + XrdCnsd_SOURCES = \ +- XrdCnsConfig.cc \ +- XrdCnsDaemon.cc \ +- XrdCnsInventory.cc \ +- XrdCnsLogClient.cc \ +- XrdCnsLogFile.cc \ +- XrdCnsLogServer.cc \ ++ XrdCnsConfig.cc XrdCnsConfig.hh \ ++ XrdCnsDaemon.cc XrdCnsDaemon.hh \ ++ XrdCnsInventory.cc XrdCnsInventory.hh \ ++ XrdCnsLogClient.cc XrdCnsLogClient.hh \ ++ XrdCnsLogFile.cc XrdCnsLogFile.hh \ ++ XrdCnsLogServer.cc XrdCnsLogServer.hh \ + XrdCnsMain.cc \ +- XrdCnsLog.cc \ +- XrdCnsLogRec.cc \ +- XrdCnsXref.cc ++ XrdCnsLog.cc XrdCnsLog.hh \ ++ XrdCnsLogRec.cc XrdCnsLogRec.hh \ ++ XrdCnsXref.cc XrdCnsXref.hh + + XrdCnsd_LDADD = \ + ../XrdOss/libXrdOss.la \ +@@ -60,9 +44,9 @@ + XrdCnsLog.cc \ + XrdCnsLogRec.cc \ + XrdCnsXref.cc \ +- XrdCnsSsi.cc \ +- XrdCnsSsiCfg.cc \ +- XrdCnsSsiMain.cc ++ XrdCnsSsi.cc XrdCnsSsi.hh \ ++ XrdCnsSsiCfg.cc XrdCnsSsiCfg.hh \ ++ XrdCnsSsiMain.cc XrdCnsSsiSay.hh + + cns_ssi_LDADD = \ + ../XrdOuc/libXrdOuc.la \ +diff -ur xrootd.orig/src/XrdCrypto/Makefile.am xrootd/src/XrdCrypto/Makefile.am +--- xrootd.orig/src/XrdCrypto/Makefile.am 2010-12-14 23:38:38.320570003 +0100 ++++ xrootd/src/XrdCrypto/Makefile.am 2010-12-14 23:39:34.507570001 +0100 +@@ -21,13 +21,22 @@ + noinst_LTLIBRARIES = libXrdSSLutil.la + + xrdcryptoinc_HEADERS = \ +- PC1.hh XrdCryptolocalFactory.hh XrdCryptosslgsiX509Chain.hh XrdCryptosslX509Store.hh \ +- PC3.hh XrdCryptoMsgDigest.hh XrdCryptosslMsgDigest.hh XrdCryptoTrace.hh \ +- XrdCryptoAux.hh XrdCryptoRSA.hh XrdCryptosslRSA.hh XrdCryptoX509Chain.hh \ +- XrdCryptoBasic.hh XrdCryptosslAux.hh XrdCryptosslTrace.hh XrdCryptoX509Crl.hh \ +- XrdCryptoCipher.hh XrdCryptosslCipher.hh XrdCryptosslX509Crl.hh XrdCryptoX509.hh \ +- XrdCryptoFactory.hh XrdCryptosslFactory.hh XrdCryptosslX509.hh XrdCryptoX509Req.hh \ +- XrdCryptolocalCipher.hh XrdCryptosslgsiAux.hh XrdCryptosslX509Req.hh XrdCryptoLite.hh ++ PC1.hh \ ++ PC3.hh \ ++ XrdCryptoAux.hh \ ++ XrdCryptoBasic.hh \ ++ XrdCryptoCipher.hh \ ++ XrdCryptoFactory.hh \ ++ XrdCryptolocalCipher.hh \ ++ XrdCryptolocalFactory.hh \ ++ XrdCryptoMsgDigest.hh \ ++ XrdCryptoRSA.hh \ ++ XrdCryptoTrace.hh \ ++ XrdCryptoX509Chain.hh \ ++ XrdCryptoX509Crl.hh \ ++ XrdCryptoX509.hh \ ++ XrdCryptoX509Req.hh \ ++ XrdCryptoLite.hh + + + check_PROGRAMS = xrdcryptotest +diff -ur xrootd.orig/src/XrdMon/Makefile.am xrootd/src/XrdMon/Makefile.am +--- xrootd.orig/src/XrdMon/Makefile.am 2010-12-14 23:38:38.322570002 +0100 ++++ xrootd/src/XrdMon/Makefile.am 2010-12-14 23:39:34.508569999 +0100 +@@ -13,10 +13,6 @@ + AM_LDFLAGS = -static + + ############################################################################# +-## extra directory definitions for install tree +-xrootdxrdmonincdir = $(includedir)/xrootd/XrdMon +- +-############################################################################# + ## deliverables + + bin_PROGRAMS = \ +@@ -37,22 +33,6 @@ + xrdmonCout2file \ + testParser + +-xrootdxrdmoninc_HEADERS = \ +-XrdMonArgParser.hh XrdMonDecOnePacket.hh XrdMonSndDebug.hh \ +-XrdMonArgParserConvert.hh XrdMonDecPacketDecoder.hh XrdMonSndDictEntry.hh \ +-XrdMonBufferedOutput.hh XrdMonDecPreProcess.hh XrdMonSndDummyXrootd.hh \ +-XrdMonCommon.hh XrdMonDecSink.hh XrdMonSndPacket.hh \ +-XrdMonCtrAdmin.hh XrdMonDecStageInfo.hh XrdMonSndStageEntry.hh \ +-XrdMonCtrArchiver.hh XrdMonDecTraceInfo.hh XrdMonSndTraceCache.hh \ +-XrdMonCtrBuffer.hh XrdMonDecUserInfo.hh XrdMonSndTraceEntry.hh \ +-XrdMonCtrCollector.hh XrdMonErrors.hh XrdMonSndTransmitter.hh \ +-XrdMonCtrDebug.hh XrdMonException.hh XrdMonTimer.hh \ +-XrdMonCtrPacket.hh XrdMonHeader.hh XrdMonTypes.hh \ +-XrdMonCtrWriter.hh XrdMonSenderInfo.hh XrdMonUtils.hh \ +-XrdMonDecArgParser.hh XrdMonSndAdminEntry.hh \ +-XrdMonDecDictInfo.hh XrdMonSndCoder.hh \ +-XrdMonArgParser.icc XrdMonTimer.icc +- + + ############################################################################# + # Build rules +diff -ur xrootd.orig/src/XrdSecsss/Makefile.am xrootd/src/XrdSecsss/Makefile.am +--- xrootd.orig/src/XrdSecsss/Makefile.am 2010-12-14 23:38:38.342570002 +0100 ++++ xrootd/src/XrdSecsss/Makefile.am 2010-12-14 23:39:34.509570000 +0100 +@@ -12,10 +12,6 @@ + AM_CPPFLAGS = -I$(top_srcdir)/src + + ############################################################################# +-## extra directory definitions for install area +-Secsssincdir = $(includedir)/xrootd/XrdSecsss +- +-############################################################################# + ## deliverables (to be built / installed) + lib_LTLIBRARIES = libXrdSecsss.la + +@@ -23,8 +19,6 @@ + + bin_PROGRAMS = xrdsssadmin + +-Secsssinc_HEADERS = XrdSecProtocolsss.hh XrdSecsssID.hh XrdSecsssKT.hh XrdSecsssRR.hh +- + ############################################################################# + ## Build rules + libXrdSecsssUtil_la_SOURCES = \ diff --git a/xrootd-nsl-link.patch b/xrootd-nsl-link.patch new file mode 100644 index 0000000..381ad17 --- /dev/null +++ b/xrootd-nsl-link.patch @@ -0,0 +1,14 @@ +--- xrootd.orig/configure.ac 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/configure.ac 2010-12-10 19:25:41.443408001 +0100 +@@ -920,9 +920,11 @@ + + # note: needed for solaris (network services library. many systems still have these + # functions still in the libc) ++AC_CHECK_FUNC(gethostbyname,,[ + AC_CHECK_LIB([nsl],[gethostbyname], + [AC_SUBST(LIBNSL,[-lnsl])] + ) ++]) + + AC_CHECK_FUNC(sigwaitinfo,[AC_DEFINE(HAVE_SIGWTI)], + [AC_CHECK_LIB([rt],[sigwaitinfo], diff --git a/xrootd-perl-java.patch b/xrootd-perl-java.patch index f40a435..f0e9d99 100644 --- a/xrootd-perl-java.patch +++ b/xrootd-perl-java.patch @@ -1,6 +1,6 @@ diff -ur xrootd.orig/src/XrdClient/Makefile.am xrootd/src/XrdClient/Makefile.am ---- xrootd.orig/src/XrdClient/Makefile.am 2009-11-19 04:25:11.000000000 +0100 -+++ xrootd/src/XrdClient/Makefile.am 2010-06-08 07:31:33.633596571 +0200 +--- xrootd.orig/src/XrdClient/Makefile.am 2010-12-16 13:28:33.145327002 +0100 ++++ xrootd/src/XrdClient/Makefile.am 2010-12-16 13:37:06.285327001 +0100 @@ -28,7 +28,7 @@ endif @@ -10,18 +10,19 @@ diff -ur xrootd.orig/src/XrdClient/Makefile.am xrootd/src/XrdClient/Makefile.am endif lib_LTLIBRARIES = libXrdClient.la $(BUILDPERL) $(BUILDJAVA) -@@ -123,7 +123,9 @@ +@@ -119,7 +119,10 @@ if ENABLE_JAVAINT libXrdClientAdminJNI_la_SOURCES = XrdClientAdminJNI.cc -libXrdClientAdminJNI_la_LIBADD = $(clientlibs) -+libXrdClientAdminJNI_la_LIBADD = $(clientlibs) ++libXrdClientAdminJNI_la_LIBADD = $(clientlibs) \ ++ ../XrdOuc/libXrdOuc.la +libXrdClientAdminJNI_la_LDFLAGS = -module -avoid-version + all-local: XrdClientAdminJNI.class XrdClientAdminJNI.class: XrdClientAdminJNI.java $(JAVAC) -d ./ $(srcdir)/XrdClientAdminJNI.java -@@ -165,12 +167,14 @@ +@@ -162,12 +165,16 @@ if ENABLE_PERLINT @@ -31,7 +32,9 @@ diff -ur xrootd.orig/src/XrdClient/Makefile.am xrootd/src/XrdClient/Makefile.am +XrdClientAdmin_la_SOURCES = XrdClientAdmin_c.cc \ + XrdClientAdmin_c_wrap.cc +PERLLIB = $(shell perl -MConfig -e 'print $$Config{archlibexp}, "/CORE";') -+XrdClientAdmin_la_LIBADD = $(clientlibs) -L$(PERLLIB) -lperl ++XrdClientAdmin_la_LIBADD = $(clientlibs) \ ++ ../XrdOuc/libXrdOuc.la \ ++ $(LIBPTHREAD) -L$(PERLLIB) -lperl +XrdClientAdmin_la_LDFLAGS = -module -avoid-version -libXrdClientAdmin_la_CXXFLAGS = $(PERL_CCOPTS) diff --git a/xrootd-undef.patch b/xrootd-undef.patch new file mode 100644 index 0000000..6676cb6 --- /dev/null +++ b/xrootd-undef.patch @@ -0,0 +1,109 @@ +diff -ur xrootd.orig/src/Xrd/XrdProtLoad.cc xrootd/src/Xrd/XrdProtLoad.cc +--- xrootd.orig/src/Xrd/XrdProtLoad.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/Xrd/XrdProtLoad.cc 2010-12-10 19:25:41.485408000 +0100 +@@ -79,7 +79,7 @@ + // Obtain an instance of this protocol + // + if (lname) xp = getProtocol(lname, pname, parms, pi); +- else xp = XrdgetProtocol(pname, parms, pi); ++ else xp = getProtocol("", pname, parms, pi); + if (!xp) {XrdLog.Emsg("Protocol","Protocol", pname, "could not be loaded"); + return 0; + } +@@ -126,7 +126,7 @@ + // Obtain the port number to be used by this protocol + // + if (lname) port = getProtocolPort(lname, pname, parms, pi); +- else port = XrdgetProtocolPort(pname, parms, pi); ++ else port = getProtocolPort("", pname, parms, pi); + if (port < 0) XrdLog.Emsg("Protocol","Protocol", pname, + "port number could not be determined"); + return port; +@@ -256,7 +256,11 @@ + {XrdLog.Emsg("Protocol", "Too many protocols have been defined."); + return -1; + } +- if (!(libhndl[i] = new XrdSysPlugin(&XrdLog, lname))) return -1; ++ if (!strcmp(lname, "")) ++ libhndl[i] = new XrdSysPlugin(&XrdLog, NULL); ++ else ++ libhndl[i] = new XrdSysPlugin(&XrdLog, lname); ++ if (!libhndl[i]) return -1; + liblist[i] = strdup(lname); + libcnt++; + } +diff -ur xrootd.orig/src/XrdCms/XrdCmsClientMan.cc xrootd/src/XrdCms/XrdCmsClientMan.cc +--- xrootd.orig/src/XrdCms/XrdCmsClientMan.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdCms/XrdCmsClientMan.cc 2010-12-10 19:25:41.534408000 +0100 +@@ -33,7 +33,7 @@ + /* G l o b a l s */ + /******************************************************************************/ + +-extern XrdInet *XrdXrootdNetwork; ++ XrdInet *XrdXrootdNetwork = 0; + + XrdNetBufferQ XrdCmsClientMan::BuffQ(2048,64); + +diff -ur xrootd.orig/src/XrdCms/XrdCmsConfig.cc xrootd/src/XrdCms/XrdCmsConfig.cc +--- xrootd.orig/src/XrdCms/XrdCmsConfig.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdCms/XrdCmsConfig.cc 2010-12-10 19:25:41.536408001 +0100 +@@ -135,11 +135,11 @@ + // of the following symbol being non-zero. On the server side, we have no + // such symbol and need to provide one initialized to zero. + // +- XrdSecProtocol *(*XrdXrootdSecGetProtocol) ++extern XrdSecProtocol *(*XrdXrootdSecGetProtocol) + (const char *hostname, + const struct sockaddr &netaddr, + const XrdSecParameters &parms, +- XrdOucErrInfo *einfo)=0; ++ XrdOucErrInfo *einfo); + + /******************************************************************************/ + /* E x t e r n a l T h r e a d I n t e r f a c e s */ +diff -ur xrootd.orig/src/XrdCms/XrdCmsSecurity.cc xrootd/src/XrdCms/XrdCmsSecurity.cc +--- xrootd.orig/src/XrdCms/XrdCmsSecurity.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdCms/XrdCmsSecurity.cc 2010-12-10 19:25:41.537408001 +0100 +@@ -50,11 +50,11 @@ + /* G l o b a l S y m b o l s */ + /******************************************************************************/ + +-extern XrdSecProtocol *(*XrdXrootdSecGetProtocol) ++XrdSecProtocol *(*XrdXrootdSecGetProtocol) + (const char *hostname, + const struct sockaddr &netaddr, + const XrdSecParameters &parms, +- XrdOucErrInfo *einfo); ++ XrdOucErrInfo *einfo) = 0; + + /******************************************************************************/ + /* S t a t i c S y m b o l s */ +diff -ur xrootd.orig/src/XrdXrootd/XrdXrootdConfig.cc xrootd/src/XrdXrootd/XrdXrootdConfig.cc +--- xrootd.orig/src/XrdXrootd/XrdXrootdConfig.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdXrootd/XrdXrootdConfig.cc 2010-12-10 19:25:41.598408000 +0100 +@@ -86,7 +86,7 @@ + + const char *XrdXrootdInstance; + +- XrdInet *XrdXrootdNetwork; ++extern XrdInet *XrdXrootdNetwork; + + int XrdXrootdPort; + +diff -ur xrootd.orig/src/XrdXrootd/XrdXrootdLoadLib.cc xrootd/src/XrdXrootd/XrdXrootdLoadLib.cc +--- xrootd.orig/src/XrdXrootd/XrdXrootdLoadLib.cc 2010-12-09 16:24:21.000000000 +0100 ++++ xrootd/src/XrdXrootd/XrdXrootdLoadLib.cc 2010-12-10 19:25:41.599408000 +0100 +@@ -37,10 +37,11 @@ + /* G l o b a l S y m b o l s */ + /******************************************************************************/ + +-XrdSecProtocol *(*XrdXrootdSecGetProtocol)(const char *hostname, ++extern XrdSecProtocol *(*XrdXrootdSecGetProtocol) ++ (const char *hostname, + const struct sockaddr &netaddr, + const XrdSecParameters &parms, +- XrdOucErrInfo *einfo) = 0; ++ XrdOucErrInfo *einfo); + + /******************************************************************************/ + /* x r o o t d _ l o a d F i l e s y s t e m */ diff --git a/xrootd.spec b/xrootd.spec index 576c61e..c9f5d41 100644 --- a/xrootd.spec +++ b/xrootd.spec @@ -3,29 +3,35 @@ %{?perl_default_filter} Name: xrootd -Version: 20100315 -Release: 5%{?dist} +Epoch: 1 +Version: 3.0.0 +Release: 1%{?dist} Summary: Extended ROOT file server Group: System Environment/Daemons # Sources are BSD, man pages are LGPLv2+ License: BSD and LGPLv2+ -URL: http://xrootd.slac.stanford.edu/ -Source0: http://xrootd.slac.stanford.edu/download/%{version}-1007/%{name}-%{version}-1007.src.tgz +URL: http://xrootd.org/ +Source0: http://xrootd.org/download/v%{version}/%{name}-v%{version}.src.tgz # These man pages are extracted from the man/man1 directory in # the root source archive: -# ftp://root.cern.ch/root/root_v5.26.00b.source.tar.gz +# 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: olbd.init -Source7: olbd.sysconfig -Source8: %{name}.logrotate +Source6: %{name}.logrotate Patch0: %{name}-jni.patch Patch1: %{name}-perl-java.patch -Patch2: %{name}-dso.patch +Patch2: %{name}-circular-deps.patch +Patch3: %{name}-dso.patch +Patch4: %{name}-undef.patch +Patch5: %{name}-nsl-link.patch +Patch6: %{name}-bonjour.patch +Patch7: %{name}-headers.patch +Patch8: %{name}-gridsite.patch +Patch9: %{name}-cryptoload.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf @@ -33,20 +39,30 @@ BuildRequires: automake BuildRequires: libtool BuildRequires: krb5-devel BuildRequires: openssl-devel +BuildRequires: gridsite-devel +BuildRequires: readline-devel +%if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 5 +BuildRequires: fuse-devel +%endif +%if %{?fedora}%{!?fedora:0} >= 6 || %{?rhel}%{!?rhel:0} >= 5 +BuildRequires: avahi-compat-libdns_sd-devel +BuildRequires: avahi-devel +%endif +BuildRequires: libxml2-devel BuildRequires: perl(ExtUtils::Embed) BuildRequires: java-devel BuildRequires: jpackage-utils BuildRequires: swig -BuildRequires: readline-devel BuildRequires: doxygen BuildRequires: graphviz %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires(pre): shadow-utils +Requires(pre): chkconfig Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts @@ -81,7 +97,7 @@ clients. %package devel Summary: Development files for xrootd Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} %description devel This package contains header files and development libraries for xrootd. @@ -89,16 +105,27 @@ This package contains header files and development libraries for xrootd. %package client Summary: Xrootd command line client tools Group: Applications/Internet -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} %description client This package contains the command line tools used to communicate with xrootd servers. +%if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 5 +%package fuse +Summary: Xrootd FUSE tool +Group: Applications/Internet +Requires: %{name}-libs = %{epoch}:%{version}-%{release} + +%description fuse +This package contains the FUSE (filesystem in user space) xrootd mount +tool. +%endif + %package client-admin-perl Summary: Xrootd client administration Perl module Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description client-admin-perl @@ -108,8 +135,12 @@ Perl module. %package client-admin-java Summary: Xrootd client administration Java library Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} +%if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 5 Requires: java +%else +Requires: java-1.4.2-gcj-compat +%endif %description client-admin-java This package contains JNI bindings for doing xrootd client administration @@ -128,15 +159,31 @@ This package contains the API documentation of the xrootd libraries. %prep %setup -q -n %{name} %setup -D -T -q -n %{name} -a 1 + +# Resolve libXrdNetUtil → libXrdOuc → libXrdNet circular dependencies +mkdir src/XrdNetUtil +mv src/XrdNet/XrdNetDNS.cc src/XrdNetUtil +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 XrdFrmMonitor XrdFrmProxy XrdFrmReqAgent \ + XrdFrmReqFile XrdFrmRequest XrdFrmTrace XrdFrmUtils ; do + mv src/XrdFrmUtil/$f.* src/XrdFrm +done +cp -p src/XrdFrmUtil/Makefile.am src/XrdFrm + %patch0 -p1 %patch1 -p1 %patch2 -p1 - -# Move XrdNetDNS.cc from XrdNet to XrdOuc in order to break circular -# library dependencies -mv src/XrdNet/XrdNetDNS.cc src/XrdOuc -sed 's/XrdNetDNS.cc//' -i src/XrdNet/Makefile.am -sed 's!libXrdOuc_la_SOURCES =!& XrdNetDNS.cc!' -i src/XrdOuc/Makefile.am +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 # Turn off static linking find . -name Makefile.am -exec sed -e 's/ -static//g' -i {} ';' @@ -144,8 +191,11 @@ find . -name Makefile.am -exec sed -e 's/ -static//g' -i {} ';' # Remove windows pthreads (not used, and has different license - GPL) rm -rf pthreads-win32 -# Remove bundled gridsite library (not used anyway) -rm -rf src/XrdSecssl/libsslGridSite +# Remove bundled gridsite library +for f in grst_asn1.c grst_err.c grst_gacl.c grst_http.c grst_x509.c \ + grst_xacml.c gridsite.h ; do + rm -rf src/XrdSecssl/libsslGridSite/$f +done # Use absolute path to load JNI library sed 's!loadLibrary("\(.*\)")!load("%{_libdir}/%{name}/lib\1.so")!' \ @@ -155,9 +205,6 @@ sed 's!loadLibrary("\(.*\)")!load("%{_libdir}/%{name}/lib\1.so")!' \ sed 's!Java_XrdClientAdminJNI!Java_xrootdadmin_XrdClientAdminJNI!' \ -i src/XrdClient/XrdClientAdminJNI.cc -# Disable threads in doxygen - causes memory corruption on ppc -echo DOT_NUM_THREADS = 1 >> Doxyfile - ./bootstrap.sh %build @@ -179,7 +226,7 @@ popd rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -# Names to generic +# 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 @@ -189,6 +236,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la # Remove some junk rm -rf $RPM_BUILD_ROOT%{_sysconfdir} rm -rf $RPM_BUILD_ROOT%{_bindir}/xrootdutils +%if %{?fedora}%{!?fedora:0} < 7 && %{?rhel}%{!?rhel:0} < 5 +rm $RPM_BUILD_ROOT%{_bindir}/xrootdfs +%endif # Perl module mkdir -p $RPM_BUILD_ROOT%{perl_vendorarch}/auto/XrdClientAdmin @@ -216,13 +266,9 @@ 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 %{SOURCE6} $RPM_BUILD_ROOT%{_initrddir}/olbd -install -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/olbd -echo '# Put your olbd configuration here' \ - > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/olbd.cf mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name} mkdir $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d -install -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} +install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} # Man pages mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 @@ -244,40 +290,37 @@ rm -rf $RPM_BUILD_ROOT 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} -exit 0 + +# Remove obsolete service +/sbin/service olbd stop >/dev/null 2>&1 || : +/sbin/chkconfig --del olbd >/dev/null 2>&1 || : %post if [ $1 = 1 ]; then /sbin/chkconfig --add %{name} /sbin/chkconfig --add cmsd - /sbin/chkconfig --add olbd fi %preun if [ $1 = 0 ]; then /sbin/service %{name} stop >/dev/null 2>&1 || : /sbin/service cmsd stop >/dev/null 2>&1 || : - /sbin/service olbd stop >/dev/null 2>&1 || : /sbin/chkconfig --del %{name} /sbin/chkconfig --del cmsd - /sbin/chkconfig --del olbd 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 olbd condrestart >/dev/null 2>&1 || : fi %files %defattr(-,root,root,-) %{_bindir}/cmsd -%{_bindir}/olbd %{_bindir}/%{name} %{_bindir}/XrdCnsd %{_mandir}/man1/cmsd.1* -%{_mandir}/man1/olbd.1* %{_mandir}/man1/%{name}.1* %{_initrddir}/* %config(noreplace) %{_sysconfdir}/sysconfig/* @@ -289,14 +332,9 @@ fi %defattr(-,root,root,-) %{_libdir}/libXrd*.so.* # Some of the libraries are used as plugins - need the .so symlink at runtime -# Some of these are also used as normal shared libraries -%{_libdir}/libXrdAcc.so %{_libdir}/libXrdBwm.so -%{_libdir}/libXrdCrypto.so -%{_libdir}/libXrdCryptoLite.so %{_libdir}/libXrdCryptossl.so -%{_libdir}/libXrdOfs.so -%{_libdir}/libXrdProxy.so +%{_libdir}/libXrdPss.so %{_libdir}/libXrdRootd.so %{_libdir}/libXrdSec.so %{_libdir}/libXrdSecgsi.so @@ -306,6 +344,7 @@ fi %endif %{_libdir}/libXrdSeckrb5.so %{_libdir}/libXrdSecpwd.so +%{_libdir}/libXrdSecssl.so %{_libdir}/libXrdSecsss.so %{_libdir}/libXrdSecunix.so @@ -314,10 +353,16 @@ fi %{_includedir}/%{name} # These libraries are not used as plugins %{_libdir}/libXrd.so +%{_libdir}/libXrdAcc.so %{_libdir}/libXrdClient.so %{_libdir}/libXrdCms.so +%{_libdir}/libXrdCrypto.so +%{_libdir}/libXrdCryptoLite.so +%{_libdir}/libXrdFfs.so +%{_libdir}/libXrdFrm.so %{_libdir}/libXrdNet.so -%{_libdir}/libXrdOdc.so +%{_libdir}/libXrdNetUtil.so +%{_libdir}/libXrdOfs.so %{_libdir}/libXrdOss.so %{_libdir}/libXrdOuc.so %{_libdir}/libXrdPosix.so @@ -340,6 +385,7 @@ fi %{_bindir}/xrdmonAdmin %{_bindir}/xrdmonCollector %{_bindir}/xrdpwdadmin +%{_bindir}/xrdsecssltest %{_bindir}/xrdsssadmin %{_bindir}/xrdstagetool %{_bindir}/xrdtestclient @@ -351,6 +397,12 @@ fi %{_mandir}/man1/xrdpwdadmin.1* %{_mandir}/man1/xrdstagetool.1* +%if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 5 +%files fuse +%defattr(-,root,root,-) +%{_bindir}/xrootdfs +%endif + %files client-admin-perl %defattr(-,root,root,-) %{perl_vendorarch}/XrdClientAdmin.pm @@ -365,6 +417,11 @@ fi %doc %{_docdir}/%{name}-%{version} %changelog +* Mon Dec 13 2010 Mattias Ellert - 1:3.0.0-1 +- Update to version 3.0.0 +- New subpackage - xrootd-fuse +- New version scheme inroduced by upstream - add epoch + * Wed Sep 01 2010 Mattias Ellert - 20100315-5 - Disable threads in doxygen - causes memory corruption on ppc