[xrootd] - Update to version 3.0.2 - Patch XrdCms makefile to make the Xmi interface public
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 30 10:35:04 UTC 2011
commit 43214a8729733b4da3958e0729b35df8cfb4fbab
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sun Jan 30 11:28:53 2011 +0100
- Update to version 3.0.2
- Patch XrdCms makefile to make the Xmi interface public
.gitignore | 2 +-
sources | 2 +-
xrootd-circular-deps.patch | 208 ++++++++++++++++++++++++--------------------
xrootd-dso.patch | 195 ++++++++++++++++++++++-------------------
xrootd-headers.patch | 108 ++++++++++++++---------
xrootd-xmi.patch | 46 ++++++++++
xrootd.spec | 19 +++--
7 files changed, 341 insertions(+), 239 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 016280a..f1360c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/xrootd-v3.0.0.src.tgz
+/xrootd-3.0.2.tar.gz
/xrootd-manpages.tar.gz
diff --git a/sources b/sources
index 8c12161..74d49ae 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-de4eda3ab7f6b146e133d18427c10f43 xrootd-v3.0.0.src.tgz
+98a30a9d84dc24da4cae51ed26965f5b xrootd-3.0.2.tar.gz
4c09bb53def37811f7dd523f9d27769a xrootd-manpages.tar.gz
diff --git a/xrootd-circular-deps.patch b/xrootd-circular-deps.patch
index a586d5a..95f9abc 100644
--- a/xrootd-circular-deps.patch
+++ b/xrootd-circular-deps.patch
@@ -1,6 +1,6 @@
-diff -ur xrootd.orig/configure.ac xrootd/configure.ac
---- xrootd.orig/configure.ac 2010-12-09 16:24:21.000000000 +0100
-+++ xrootd/configure.ac 2010-12-12 10:39:26.343645458 +0100
+diff -ur xrootd-3.0.2.orig/configure.ac xrootd-3.0.2/configure.ac
+--- xrootd-3.0.2.orig/configure.ac 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/configure.ac 2011-01-29 08:58:59.333934025 +0100
@@ -1121,6 +1121,7 @@
src/Makefile
src/Makefile_include
@@ -17,9 +17,9 @@ diff -ur xrootd.orig/configure.ac xrootd/configure.ac
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
+diff -ur xrootd-3.0.2.orig/src/Makefile.am xrootd-3.0.2/src/Makefile.am
+--- xrootd-3.0.2.orig/src/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/Makefile.am 2011-01-29 08:58:59.333934025 +0100
@@ -69,6 +69,7 @@
#######################################################################
@@ -40,19 +40,19 @@ diff -ur xrootd.orig/src/Makefile.am xrootd/src/Makefile.am
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
+diff -ur xrootd-3.0.2.orig/src/XrdFrm/Makefile.am xrootd-3.0.2/src/XrdFrm/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdFrm/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrm/Makefile.am 2011-01-29 09:00:22.359811392 +0100
@@ -16,7 +16,7 @@
#
--AM_CPPFLAGS = -I$(top_srcdir)/src $(READLINE_INCDIR)
-+AM_CPPFLAGS = -I$(top_srcdir)/src
+-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(READLINE_INCDIR)
++AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src
#############################################################################
## extra directory definitions
-@@ -25,121 +25,36 @@
+@@ -25,121 +25,34 @@
#############################################################################
## deliverables
@@ -63,8 +63,8 @@ diff -ur xrootd.orig/src/XrdFrm/Makefile.am xrootd/src/XrdFrm/Makefile.am
- XrdFrmConfig.hh \
- XrdFrmFiles.hh \
- XrdFrmMigrate.hh \
+- XrdFrmMonitor.hh \
+xrootdfrminc_HEADERS = XrdFrmCID.hh \
- XrdFrmMonitor.hh \
XrdFrmProxy.hh \
- XrdFrmPurge.hh \
XrdFrmReqAgent.hh \
@@ -105,7 +105,7 @@ diff -ur xrootd.orig/src/XrdFrm/Makefile.am xrootd/src/XrdFrm/Makefile.am
libXrdFrm_la_SOURCES = \
XrdFrmCID.cc \
- XrdFrmFiles.cc \
- XrdFrmMonitor.cc\
+- XrdFrmMonitor.cc\
XrdFrmProxy.cc \
XrdFrmReqAgent.cc \
XrdFrmReqFile.cc \
@@ -178,11 +178,11 @@ diff -ur xrootd.orig/src/XrdFrm/Makefile.am xrootd/src/XrdFrm/Makefile.am
-
-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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.2/src/XrdFrmUtil/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/Makefile.am 2011-01-29 09:00:20.995829836 +0100
@@ -19,38 +19,10 @@
- AM_CPPFLAGS = -I$(top_srcdir)/src $(READLINE_INCDIR)
+ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(READLINE_INCDIR)
#############################################################################
-## extra directory definitions
@@ -220,18 +220,19 @@ diff -ur xrootd.orig/src/XrdFrmUtil/Makefile.am xrootd/src/XrdFrmUtil/Makefile.a
# Convenience libs to use for objs common to multiple binaries in this dir
noinst_LTLIBRARIES = libXrdFrmConv.la libXrdFrmConvAgent.la
-@@ -59,7 +31,9 @@
+@@ -59,7 +31,10 @@
## Build rules
-libXrdFrmConv_la_SOURCES = XrdFrmConfig.cc
+libXrdFrmConv_la_SOURCES = XrdFrmConfig.cc \
+ XrdFrmFiles.cc \
++ XrdFrmMonitor.cc \
+ XrdFrmTSort.cc
libXrdFrmConvAgent_la_SOURCES = XrdFrmReqBoss.cc \
XrdFrmTransfer.cc \
-@@ -69,29 +43,6 @@
+@@ -69,29 +44,6 @@
XrdFrmXfrQueue.cc
@@ -261,7 +262,7 @@ diff -ur xrootd.orig/src/XrdFrmUtil/Makefile.am xrootd/src/XrdFrmUtil/Makefile.a
frm_admin_SOURCES = \
XrdFrmAdminMain.cc \
XrdFrmAdmin.cc \
-@@ -101,45 +52,46 @@
+@@ -101,45 +53,46 @@
XrdFrmAdminQuery.cc \
XrdFrmAdminUnlink.cc
@@ -328,9 +329,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/Makefile.am xrootd/src/XrdFrmUtil/Makefile.a
-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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminAudit.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminAudit.cc 2011-01-29 08:58:59.434932659 +0100
@@ -14,9 +14,9 @@
#include <string.h>
#include <sys/param.h>
@@ -344,9 +345,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc xrootd/src/XrdFrmUtil/Xr
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdmin.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdmin.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdmin.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdmin.cc 2011-01-29 08:58:59.436932633 +0100
@@ -21,8 +21,8 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -358,9 +359,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdmin.cc xrootd/src/XrdFrmUtil/XrdFrmA
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminFiles.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminFiles.cc 2011-01-29 08:58:59.465932241 +0100
@@ -22,9 +22,9 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -374,9 +375,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc xrootd/src/XrdFrmUtil/Xr
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminFind.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminFind.cc 2011-01-29 08:58:59.466932228 +0100
@@ -15,9 +15,9 @@
#include <strings.h>
#include <sys/param.h>
@@ -390,9 +391,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc xrootd/src/XrdFrmUtil/Xrd
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminMain.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminMain.cc 2011-01-29 08:58:59.490931903 +0100
@@ -53,8 +53,8 @@
#include <readline/history.h>
#endif
@@ -404,9 +405,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc xrootd/src/XrdFrmUtil/Xrd
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminQuery.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminQuery.cc 2011-01-29 08:58:59.491931889 +0100
@@ -18,9 +18,9 @@
#include <sys/stat.h>
#include <sys/types.h>
@@ -420,9 +421,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc xrootd/src/XrdFrmUtil/Xr
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminReloc.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminReloc.cc 2011-01-29 08:58:59.491931889 +0100
@@ -23,8 +23,8 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -434,9 +435,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc xrootd/src/XrdFrmUtil/Xr
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminUnlink.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmAdminUnlink.cc 2011-01-29 08:58:59.492931875 +0100
@@ -18,8 +18,8 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -448,21 +449,23 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc xrootd/src/XrdFrmUtil/X
#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 @@
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmConfig.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmConfig.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmConfig.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmConfig.cc 2011-01-29 09:14:32.637302174 +0100
+@@ -24,8 +24,8 @@
#include <sys/stat.h>
#include "Xrd/XrdInfo.hh"
-#include "XrdFrm/XrdFrmConfig.hh"
+-#include "XrdFrm/XrdFrmMonitor.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
- #include "XrdFrm/XrdFrmMonitor.hh"
++#include "XrdFrmUtil/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
+ #include "XrdNet/XrdNetCmsNotify.hh"
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmFiles.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmFiles.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmFiles.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmFiles.cc 2011-01-29 08:58:59.493931862 +0100
@@ -19,8 +19,8 @@
#include <sys/stat.h>
#include <sys/types.h>
@@ -474,9 +477,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmFiles.cc xrootd/src/XrdFrmUtil/XrdFrmF
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmMigrate.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmMigrate.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmMigrate.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmMigrate.cc 2011-01-29 08:58:59.494931849 +0100
@@ -23,13 +23,13 @@
#include "XrdOss/XrdOssPath.hh"
#include "XrdOuc/XrdOucNSWalk.hh"
@@ -496,9 +499,21 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmMigrate.cc xrootd/src/XrdFrmUtil/XrdFr
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmMonitor.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmMonitor.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmMonitor.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmMonitor.cc 2011-01-29 09:14:32.629302283 +0100
+@@ -20,7 +20,7 @@
+ #include <sys/types.h>
+
+ #include "XrdFrm/XrdFrmTrace.hh"
+-#include "XrdFrm/XrdFrmMonitor.hh"
++#include "XrdFrmUtil/XrdFrmMonitor.hh"
+ #include "XrdNet/XrdNet.hh"
+ #include "XrdNet/XrdNetDNS.hh"
+ #include "XrdNet/XrdNetPeer.hh"
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurge.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurge.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurge.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurge.cc 2011-01-29 08:58:59.494931849 +0100
@@ -27,9 +27,9 @@
#include "XrdOuc/XrdOucProg.hh"
#include "XrdOuc/XrdOucStream.hh"
@@ -512,9 +527,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmPurge.cc xrootd/src/XrdFrmUtil/XrdFrmP
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurge.hh xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurge.hh
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurge.hh 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurge.hh 2011-01-29 08:58:59.495931836 +0100
@@ -15,7 +15,7 @@
#include <time.h>
#include <sys/types.h>
@@ -524,9 +539,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmPurge.hh xrootd/src/XrdFrmUtil/XrdFrmP
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurgMain.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmPurgMain.cc 2011-01-29 08:58:59.496931822 +0100
@@ -65,8 +65,8 @@
#include <stdio.h>
#include <sys/param.h>
@@ -538,9 +553,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc xrootd/src/XrdFrmUtil/XrdF
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmReqBoss.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmReqBoss.cc 2011-01-29 08:58:59.496931822 +0100
@@ -22,10 +22,10 @@
#include <sys/stat.h>
@@ -554,16 +569,17 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc xrootd/src/XrdFrmUtil/XrdFr
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmTransfer.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmTransfer.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmTransfer.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmTransfer.cc 2011-01-29 09:14:32.628302296 +0100
@@ -24,14 +24,14 @@
#include <sys/stat.h>
#include "XrdFrm/XrdFrmCID.hh"
-#include "XrdFrm/XrdFrmConfig.hh"
+-#include "XrdFrm/XrdFrmMonitor.hh"
+#include "XrdFrmUtil/XrdFrmConfig.hh"
- #include "XrdFrm/XrdFrmMonitor.hh"
++#include "XrdFrmUtil/XrdFrmMonitor.hh"
#include "XrdFrm/XrdFrmReqFile.hh"
#include "XrdFrm/XrdFrmRequest.hh"
#include "XrdFrm/XrdFrmTrace.hh"
@@ -576,9 +592,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmTransfer.cc xrootd/src/XrdFrmUtil/XrdF
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmTSort.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmTSort.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmTSort.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmTSort.cc 2011-01-29 08:58:59.498931794 +0100
@@ -12,8 +12,8 @@
const char *XrdFrmTSortCVSID = "$Id$";
@@ -590,9 +606,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmTSort.cc xrootd/src/XrdFrmUtil/XrdFrmT
//#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrAgent.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrAgent.cc 2011-01-29 08:58:59.498931794 +0100
@@ -20,11 +20,11 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -607,9 +623,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc xrootd/src/XrdFrmUtil/XrdF
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrDaemon.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrDaemon.cc 2011-01-29 08:58:59.499931781 +0100
@@ -21,14 +21,14 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -630,9 +646,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc xrootd/src/XrdFrmUtil/Xrd
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrDaemon.hh
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrDaemon.hh 2011-01-29 08:58:59.499931781 +0100
@@ -12,7 +12,7 @@
// $Id$
@@ -642,9 +658,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh xrootd/src/XrdFrmUtil/Xrd
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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrMain.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrMain.cc 2011-01-29 08:58:59.500931768 +0100
@@ -59,10 +59,10 @@
#include <stdio.h>
#include <sys/param.h>
@@ -659,9 +675,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc xrootd/src/XrdFrmUtil/XrdFr
#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
+diff -ur xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrQueue.cc
+--- xrootd-3.0.2.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFrmUtil/XrdFrmXfrQueue.cc 2011-01-29 08:58:59.500931768 +0100
@@ -22,11 +22,11 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -677,9 +693,9 @@ diff -ur xrootd.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc xrootd/src/XrdFrmUtil/XrdF
#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
+diff -ur xrootd-3.0.2.orig/src/XrdNet/Makefile.am xrootd-3.0.2/src/XrdNet/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdNet/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdNet/Makefile.am 2011-01-29 08:58:59.501931754 +0100
@@ -18,7 +18,7 @@
#############################################################################
## deliverables (to be built / installed)
@@ -709,9 +725,9 @@ diff -ur xrootd.orig/src/XrdNet/Makefile.am xrootd/src/XrdNet/Makefile.am
+ ../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
+diff -ur xrootd-3.0.2.orig/src/XrdNetUtil/Makefile.am xrootd-3.0.2/src/XrdNetUtil/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdNetUtil/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdNetUtil/Makefile.am 2011-01-29 08:58:59.501931754 +0100
@@ -11,44 +11,13 @@
AM_CPPFLAGS = -I$(top_srcdir)/src
diff --git a/xrootd-dso.patch b/xrootd-dso.patch
index 9ef6834..b8cb28c 100644
--- a/xrootd-dso.patch
+++ b/xrootd-dso.patch
@@ -1,6 +1,6 @@
-diff -ur xrootd.orig/src/Xrd/Makefile.am xrootd/src/Xrd/Makefile.am
---- xrootd.orig/src/Xrd/Makefile.am 2010-12-09 16:24:21.000000000 +0100
-+++ xrootd/src/Xrd/Makefile.am 2010-12-16 06:16:37.453934921 +0100
+diff -ur xrootd-3.0.2.orig/src/Xrd/Makefile.am xrootd-3.0.2/src/Xrd/Makefile.am
+--- xrootd-3.0.2.orig/src/Xrd/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/Xrd/Makefile.am 2011-01-29 06:50:37.843565642 +0100
@@ -47,6 +47,11 @@
XrdScheduler.cc XrdScheduler.hh XrdJob.hh \
XrdStats.cc XrdStats.hh \
@@ -13,9 +13,9 @@ diff -ur xrootd.orig/src/Xrd/Makefile.am xrootd/src/Xrd/Makefile.am
## 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 2010-12-09 16:24:21.000000000 +0100
-+++ xrootd/src/XrdAcc/Makefile.am 2010-12-16 06:00:10.348934620 +0100
+diff -ur xrootd-3.0.2.orig/src/XrdAcc/Makefile.am xrootd-3.0.2/src/XrdAcc/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdAcc/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdAcc/Makefile.am 2011-01-29 06:50:37.844565628 +0100
@@ -38,11 +38,11 @@
XrdAccCapability.cc XrdAccCapability.hh \
XrdAccConfig.cc XrdAccConfig.hh XrdAccAuthDB.hh \
@@ -32,10 +32,10 @@ diff -ur xrootd.orig/src/XrdAcc/Makefile.am xrootd/src/XrdAcc/Makefile.am
- ../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 @@
+diff -ur xrootd-3.0.2.orig/src/XrdApps/Makefile.am xrootd-3.0.2/src/XrdApps/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdApps/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdApps/Makefile.am 2011-01-29 07:02:48.336500256 +0100
+@@ -32,17 +32,17 @@
../XrdClient/libXrdClient.la \
../XrdPosix/libXrdPosix.la \
../XrdOuc/libXrdOuc.la \
@@ -45,8 +45,19 @@ diff -ur xrootd.orig/src/XrdApps/Makefile.am xrootd/src/XrdApps/Makefile.am
-xrdadler32_LDFLAGS = -static -export-dynamic -ldl -lz
+xrdadler32_LDFLAGS = -static -export-dynamic
- mpxstats_SOURCES = XrdMpxStats.cc
+ cconfig_SOURCES = XrdAppsCconfig.cc
+ cconfig_LDADD = \
+ ../XrdNet/libXrdNet.la \
+ ../XrdOuc/libXrdOuc.la \
+- ../XrdSys/libXrdSys.la \
+- ../XrdNet/libXrdNetUtil.la
++ ../XrdNetUtil/libXrdNetUtil.la \
++ ../XrdSys/libXrdSys.la
+
+ cconfig_LDFLAGS = -static -export-dynamic
+
+@@ -51,15 +51,14 @@
mpxstats_LDADD = \
../XrdNet/libXrdNet.la \
../XrdOuc/libXrdOuc.la \
@@ -64,9 +75,9 @@ diff -ur xrootd.orig/src/XrdApps/Makefile.am xrootd/src/XrdApps/Makefile.am
../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
+diff -ur xrootd-3.0.2.orig/src/XrdBwm/Makefile.am xrootd-3.0.2/src/XrdBwm/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdBwm/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdBwm/Makefile.am 2011-01-29 06:50:37.852565518 +0100
@@ -37,4 +37,8 @@
libXrdBwm_la_LIBADD = ../XrdAcc/libXrdAcc.la \
../XrdNet/libXrdNet.la \
@@ -77,9 +88,9 @@ diff -ur xrootd.orig/src/XrdBwm/Makefile.am xrootd/src/XrdBwm/Makefile.am
+ $(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
+diff -ur xrootd-3.0.2.orig/src/XrdClient/Makefile.am xrootd-3.0.2/src/XrdClient/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdClient/Makefile.am 2011-01-29 06:43:32.481425196 +0100
++++ xrootd-3.0.2/src/XrdClient/Makefile.am 2011-01-29 06:50:37.852565518 +0100
@@ -77,22 +77,19 @@
XrdcpXtremeRead.cc XrdcpXtremeRead.hh
@@ -121,9 +132,9 @@ diff -ur xrootd.orig/src/XrdClient/Makefile.am xrootd/src/XrdClient/Makefile.am
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 2010-12-09 16:24:21.000000000 +0100
-+++ xrootd/src/XrdCms/Makefile.am 2010-12-16 06:26:19.292935186 +0100
+diff -ur xrootd-3.0.2.orig/src/XrdCms/Makefile.am xrootd-3.0.2/src/XrdCms/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdCms/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdCms/Makefile.am 2011-01-29 06:50:37.860565408 +0100
@@ -61,9 +61,12 @@
@@ -159,9 +170,9 @@ diff -ur xrootd.orig/src/XrdCms/Makefile.am xrootd/src/XrdCms/Makefile.am
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
+diff -ur xrootd-3.0.2.orig/src/XrdCns/Makefile.am xrootd-3.0.2/src/XrdCns/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdCns/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdCns/Makefile.am 2011-01-29 06:50:37.860565408 +0100
@@ -47,16 +47,15 @@
XrdCnsXref.cc
@@ -199,9 +210,9 @@ diff -ur xrootd.orig/src/XrdCns/Makefile.am xrootd/src/XrdCns/Makefile.am
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 2010-12-09 16:24:21.000000000 +0100
-+++ xrootd/src/XrdCrypto/Makefile.am 2010-12-16 06:00:10.465935016 +0100
+diff -ur xrootd-3.0.2.orig/src/XrdCrypto/Makefile.am xrootd-3.0.2/src/XrdCrypto/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdCrypto/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdCrypto/Makefile.am 2011-01-29 06:50:37.861565394 +0100
@@ -43,11 +43,8 @@
XrdCryptosslX509.cc XrdCryptosslX509.hh \
XrdCryptosslX509Crl.cc XrdCryptosslX509Crl.hh \
@@ -258,9 +269,9 @@ diff -ur xrootd.orig/src/XrdCrypto/Makefile.am xrootd/src/XrdCrypto/Makefile.am
$(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
+diff -ur xrootd-3.0.2.orig/src/XrdFfs/Makefile.am xrootd-3.0.2/src/XrdFfs/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdFfs/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdFfs/Makefile.am 2011-01-29 06:50:37.861565394 +0100
@@ -42,15 +42,12 @@
XrdFfsQueue.cc \
XrdFfsWcache.cc
@@ -281,9 +292,9 @@ diff -ur xrootd.orig/src/XrdFfs/Makefile.am xrootd/src/XrdFfs/Makefile.am
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 2010-12-09 16:24:21.000000000 +0100
-+++ xrootd/src/XrdMon/Makefile.am 2010-12-16 06:00:10.467935006 +0100
+diff -ur xrootd-3.0.2.orig/src/XrdMon/Makefile.am xrootd-3.0.2/src/XrdMon/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdMon/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdMon/Makefile.am 2011-01-29 06:50:37.862565380 +0100
@@ -10,7 +10,7 @@
# global settings
@@ -317,9 +328,9 @@ diff -ur xrootd.orig/src/XrdMon/Makefile.am xrootd/src/XrdMon/Makefile.am
- 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
+diff -ur xrootd-3.0.2.orig/src/XrdMon/XrdMonArgParserConvert.hh xrootd-3.0.2/src/XrdMon/XrdMonArgParserConvert.hh
+--- xrootd-3.0.2.orig/src/XrdMon/XrdMonArgParserConvert.hh 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdMon/XrdMonArgParserConvert.hh 2011-01-29 06:50:37.862565380 +0100
@@ -12,6 +12,7 @@
#include "XrdMon/XrdMonException.hh"
@@ -328,9 +339,9 @@ diff -ur xrootd.orig/src/XrdMon/XrdMonArgParserConvert.hh xrootd/src/XrdMon/XrdM
#include <stdlib.h> /* atoi */
#include <string.h>
-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
+diff -ur xrootd-3.0.2.orig/src/XrdOfs/Makefile.am xrootd-3.0.2/src/XrdOfs/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdOfs/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdOfs/Makefile.am 2011-01-29 06:50:37.863565366 +0100
@@ -18,11 +18,7 @@
XrdOfs.hh \
XrdOfsEvr.hh XrdOfsEvs.hh XrdOfsHandle.hh \
@@ -359,9 +370,9 @@ diff -ur xrootd.orig/src/XrdOfs/Makefile.am xrootd/src/XrdOfs/Makefile.am
+ ../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 2010-12-09 16:24:21.000000000 +0100
-+++ xrootd/src/XrdOss/Makefile.am 2010-12-16 06:00:10.470935000 +0100
+diff -ur xrootd-3.0.2.orig/src/XrdOss/Makefile.am xrootd-3.0.2/src/XrdOss/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdOss/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdOss/Makefile.am 2011-01-29 06:50:37.863565366 +0100
@@ -41,4 +41,7 @@
XrdOssSpace.cc XrdOssSpace.hh \
XrdOssStat.cc \
@@ -371,9 +382,9 @@ diff -ur xrootd.orig/src/XrdOss/Makefile.am xrootd/src/XrdOss/Makefile.am
+ ../XrdOuc/libXrdOuc.la \
+ ../XrdSys/libXrdSys.la \
+ $(LIBRT) $(LIBPTHREAD)
-diff -ur xrootd.orig/src/XrdOuc/Makefile.am xrootd/src/XrdOuc/Makefile.am
---- 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
+diff -ur xrootd-3.0.2.orig/src/XrdOuc/Makefile.am xrootd-3.0.2/src/XrdOuc/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdOuc/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdOuc/Makefile.am 2011-01-29 06:50:37.864565352 +0100
@@ -57,18 +57,10 @@
XrdOucTrace.cc XrdOucTrace.hh \
XrdOucUtils.cc XrdOucUtils.hh
@@ -396,9 +407,9 @@ diff -ur xrootd.orig/src/XrdOuc/Makefile.am xrootd/src/XrdOuc/Makefile.am
-# 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
+diff -ur xrootd-3.0.2.orig/src/XrdPosix/Makefile.am xrootd-3.0.2/src/XrdPosix/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdPosix/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdPosix/Makefile.am 2011-01-29 06:50:37.864565352 +0100
@@ -41,10 +41,9 @@
XrdPosixXrootd.cc
@@ -419,9 +430,9 @@ diff -ur xrootd.orig/src/XrdPosix/Makefile.am xrootd/src/XrdPosix/Makefile.am
-# ../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 2010-12-09 16:24:21.000000000 +0100
-+++ xrootd/src/XrdPss/Makefile.am 2010-12-16 06:00:10.471935001 +0100
+diff -ur xrootd-3.0.2.orig/src/XrdPss/Makefile.am xrootd-3.0.2/src/XrdPss/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdPss/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdPss/Makefile.am 2011-01-29 06:50:37.865565338 +0100
@@ -21,10 +21,9 @@
XrdPssConfig.cc
@@ -437,9 +448,9 @@ diff -ur xrootd.orig/src/XrdPss/Makefile.am xrootd/src/XrdPss/Makefile.am
../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 2010-12-09 16:24:21.000000000 +0100
-+++ xrootd/src/XrdRootd/Makefile.am 2010-12-16 06:00:10.472935002 +0100
+diff -ur xrootd-3.0.2.orig/src/XrdRootd/Makefile.am xrootd-3.0.2/src/XrdRootd/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdRootd/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdRootd/Makefile.am 2011-01-29 06:50:37.865565338 +0100
@@ -13,4 +13,5 @@
INCLUDES = -I$(top_srcdir)/src
@@ -447,9 +458,9 @@ diff -ur xrootd.orig/src/XrdRootd/Makefile.am xrootd/src/XrdRootd/Makefile.am
-libXrdRootd_la_LIBADD = ../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-12-09 16:24:21.000000000 +0100
-+++ xrootd/src/XrdSec/Makefile.am 2010-12-16 06:00:10.473935003 +0100
+diff -ur xrootd-3.0.2.orig/src/XrdSec/Makefile.am xrootd-3.0.2/src/XrdSec/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdSec/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdSec/Makefile.am 2011-01-29 06:50:37.866565325 +0100
@@ -16,47 +16,42 @@
#############################################################################
@@ -515,9 +526,9 @@ diff -ur xrootd.orig/src/XrdSec/Makefile.am xrootd/src/XrdSec/Makefile.am
- ../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
+diff -ur xrootd-3.0.2.orig/src/XrdSecgsi/Makefile.am xrootd-3.0.2/src/XrdSecgsi/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdSecgsi/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdSecgsi/Makefile.am 2011-01-29 06:50:37.866565325 +0100
@@ -12,8 +12,7 @@
bin_PROGRAMS = xrdgsiproxy
@@ -576,9 +587,9 @@ diff -ur xrootd.orig/src/XrdSecgsi/Makefile.am xrootd/src/XrdSecgsi/Makefile.am
+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
+diff -ur xrootd-3.0.2.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc xrootd-3.0.2/src/XrdSecgsi/XrdSecProtocolgsi.cc
+--- xrootd-3.0.2.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdSecgsi/XrdSecProtocolgsi.cc 2011-01-29 06:50:37.868565298 +0100
@@ -150,6 +150,7 @@
XrdOucTrace *XrdSecProtocolgsi::GSITrace = 0;
@@ -587,9 +598,9 @@ diff -ur xrootd.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc xrootd/src/XrdSecgsi/Xrd
/******************************************************************************/
/* 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
+diff -ur xrootd-3.0.2.orig/src/XrdSecgsi/XrdSecgsiProxy.cc xrootd-3.0.2/src/XrdSecgsi/XrdSecgsiProxy.cc
+--- xrootd-3.0.2.orig/src/XrdSecgsi/XrdSecgsiProxy.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdSecgsi/XrdSecgsiProxy.cc 2011-01-29 06:50:37.869565284 +0100
@@ -94,6 +94,7 @@
static XrdSysLogger Logger;
static XrdSysError eDest(0,"proxy_");
@@ -598,9 +609,9 @@ diff -ur xrootd.orig/src/XrdSecgsi/XrdSecgsiProxy.cc xrootd/src/XrdSecgsi/XrdSec
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
+diff -ur xrootd-3.0.2.orig/src/XrdSecgsi/XrdSecgsitest.cc xrootd-3.0.2/src/XrdSecgsi/XrdSecgsitest.cc
+--- xrootd-3.0.2.orig/src/XrdSecgsi/XrdSecgsitest.cc 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdSecgsi/XrdSecgsitest.cc 2011-01-29 06:50:37.870565270 +0100
@@ -52,6 +52,7 @@
static XrdSysLogger Logger;
static XrdSysError eDest(0,"gsitest_");
@@ -609,9 +620,9 @@ diff -ur xrootd.orig/src/XrdSecgsi/XrdSecgsitest.cc xrootd/src/XrdSecgsi/XrdSecg
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
+diff -ur xrootd-3.0.2.orig/src/XrdSeckrb4/Makefile.am xrootd-3.0.2/src/XrdSeckrb4/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdSeckrb4/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdSeckrb4/Makefile.am 2011-01-29 06:50:37.870565270 +0100
@@ -13,6 +13,9 @@
INCLUDES = -I$(top_srcdir)/src $(KRB4_INCDIR)
@@ -625,9 +636,9 @@ diff -ur xrootd.orig/src/XrdSeckrb4/Makefile.am xrootd/src/XrdSeckrb4/Makefile.a
-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
+diff -ur xrootd-3.0.2.orig/src/XrdSeckrb5/Makefile.am xrootd-3.0.2/src/XrdSeckrb5/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdSeckrb5/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdSeckrb5/Makefile.am 2011-01-29 06:50:37.871565256 +0100
@@ -22,9 +22,9 @@
libXrdSeckrb5_la_SOURCES = XrdSecProtocolkrb5.cc
@@ -640,9 +651,9 @@ diff -ur xrootd.orig/src/XrdSeckrb5/Makefile.am xrootd/src/XrdSeckrb5/Makefile.a
$(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
+diff -ur xrootd-3.0.2.orig/src/XrdSecpwd/Makefile.am xrootd-3.0.2/src/XrdSecpwd/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdSecpwd/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdSecpwd/Makefile.am 2011-01-29 06:50:37.871565256 +0100
@@ -20,7 +20,7 @@
../XrdSut/libXrdSut.la \
../XrdOuc/libXrdOuc.la \
@@ -661,9 +672,9 @@ diff -ur xrootd.orig/src/XrdSecpwd/Makefile.am xrootd/src/XrdSecpwd/Makefile.am
- $(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
+diff -ur xrootd-3.0.2.orig/src/XrdSecsss/Makefile.am xrootd-3.0.2/src/XrdSecsss/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdSecsss/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdSecsss/Makefile.am 2011-01-29 06:50:37.871565256 +0100
@@ -19,34 +19,29 @@
## deliverables (to be built / installed)
lib_LTLIBRARIES = libXrdSecsss.la
@@ -712,9 +723,9 @@ diff -ur xrootd.orig/src/XrdSecsss/Makefile.am xrootd/src/XrdSecsss/Makefile.am
+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
+diff -ur xrootd-3.0.2.orig/src/XrdSecunix/Makefile.am xrootd-3.0.2/src/XrdSecunix/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdSecunix/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdSecunix/Makefile.am 2011-01-29 06:50:37.872565242 +0100
@@ -13,9 +13,7 @@
INCLUDES = -I$(top_srcdir)/src $(KRB4_INCDIR)
@@ -726,9 +737,9 @@ diff -ur xrootd.orig/src/XrdSecunix/Makefile.am xrootd/src/XrdSecunix/Makefile.a
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 2010-12-09 16:24:21.000000000 +0100
-+++ xrootd/src/XrdSut/Makefile.am 2010-12-16 06:00:10.480935003 +0100
+diff -ur xrootd-3.0.2.orig/src/XrdSut/Makefile.am xrootd-3.0.2/src/XrdSut/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdSut/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdSut/Makefile.am 2011-01-29 06:50:37.872565242 +0100
@@ -27,3 +27,6 @@
XrdSutPFile.cc XrdSutPFile.hh\
XrdSutPFEntry.cc XrdSutPFEntry.hh \
@@ -736,9 +747,9 @@ diff -ur xrootd.orig/src/XrdSut/Makefile.am xrootd/src/XrdSut/Makefile.am
+
+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 2010-12-09 16:24:21.000000000 +0100
-+++ xrootd/src/XrdSys/Makefile.am 2010-12-16 06:00:10.481935003 +0100
+diff -ur xrootd-3.0.2.orig/src/XrdSys/Makefile.am xrootd-3.0.2/src/XrdSys/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdSys/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdSys/Makefile.am 2011-01-29 06:50:37.873565228 +0100
@@ -20,9 +20,6 @@
lib_LTLIBRARIES = libXrdSys.la
@@ -773,9 +784,9 @@ diff -ur xrootd.orig/src/XrdSys/Makefile.am xrootd/src/XrdSys/Makefile.am
libXrdSys_la_CXXFLAGS = -prefer-pic
# 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 2010-12-09 16:24:21.000000000 +0100
-+++ xrootd/src/XrdXrootd/Makefile.am 2010-12-16 06:00:10.481935003 +0100
+diff -ur xrootd-3.0.2.orig/src/XrdXrootd/Makefile.am xrootd-3.0.2/src/XrdXrootd/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdXrootd/Makefile.am 2011-01-26 17:44:32.000000000 +0100
++++ xrootd-3.0.2/src/XrdXrootd/Makefile.am 2011-01-29 06:50:37.873565228 +0100
@@ -39,21 +39,10 @@
xrootd_LDADD = -ldl \
../Xrd/libXrd.la \
diff --git a/xrootd-headers.patch b/xrootd-headers.patch
index 3f3b8f8..d057e15 100644
--- a/xrootd-headers.patch
+++ b/xrootd-headers.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -ur xrootd-3.0.2.orig/src/XrdBwm/Makefile.am xrootd-3.0.2/src/XrdBwm/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdBwm/Makefile.am 2011-01-29 06:50:37.852565518 +0100
++++ xrootd-3.0.2/src/XrdBwm/Makefile.am 2011-01-29 07:14:29.490860383 +0100
+@@ -9,30 +9,20 @@
#######################################################################
#############################################################################
@@ -21,7 +21,7 @@ diff -ur xrootd.orig/src/XrdBwm/Makefile.am xrootd/src/XrdBwm/Makefile.am
-
#############################################################################
## Build rules
- AM_CPPFLAGS = -I$(top_srcdir)/src
+ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src
libXrdBwm_la_SOURCES = \
- XrdBwm.cc \
@@ -35,14 +35,13 @@ diff -ur xrootd.orig/src/XrdBwm/Makefile.am xrootd/src/XrdBwm/Makefile.am
+ 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 @@
+diff -ur xrootd-3.0.2.orig/src/XrdCms/Makefile.am xrootd-3.0.2/src/XrdCms/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdCms/Makefile.am 2011-01-29 06:50:37.860565408 +0100
++++ xrootd-3.0.2/src/XrdCms/Makefile.am 2011-01-30 10:34:26.344681405 +0100
+@@ -22,19 +22,12 @@
xrootdcmsincdir = $(includedir)/xrootd/XrdCms
xrootdcmsinc_HEADERS = \
@@ -59,25 +58,46 @@ diff -ur xrootd.orig/src/XrdCms/Makefile.am xrootd/src/XrdCms/Makefile.am
-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 @@
++ XrdCmsClient.hh \
++ XrdCmsClientConfig.hh \
++ XrdCmsFinder.hh \
++ XrdCmsSecurity.hh \
++ XrdCmsTrace.hh \
++ XrdCmsTypes.hh
+
+
+
+@@ -45,19 +38,19 @@
+
+ # for convenience:
+ libXrdCmsConv_la_SOURCES = \
+- XrdCmsLogin.cc \
+- XrdCmsParser.cc \
+- XrdCmsRRData.cc \
+- XrdCmsSecurity.cc \
+- XrdCmsTalk.cc
++ XrdCmsLogin.cc XrdCmsLogin.hh \
++ XrdCmsParser.cc XrdCmsParser.hh \
++ XrdCmsRRData.cc XrdCmsRRData.hh \
++ XrdCmsSecurity.cc \
++ XrdCmsTalk.cc XrdCmsTalk.hh
+
+
+ libXrdCms_la_SOURCES = \
+- XrdCmsClientConfig.cc\
+- XrdCmsClientMan.cc \
+- XrdCmsClientMsg.cc \
+- XrdCmsFinder.cc \
+- XrdCmsResp.cc
++ XrdCmsClientConfig.cc \
++ XrdCmsClientMan.cc XrdCmsClientMan.hh \
++ XrdCmsClientMsg.cc XrdCmsClientMsg.hh \
++ XrdCmsFinder.cc \
++ XrdCmsResp.cc XrdCmsResp.hh
+
+
+ libXrdCms_la_LIBADD = libXrdCmsConv.la \
+@@ -69,29 +62,31 @@
$(LIBPTHREAD) -ldl
cmsd_SOURCES = \
@@ -124,15 +144,17 @@ diff -ur xrootd.orig/src/XrdCms/Makefile.am xrootd/src/XrdCms/Makefile.am
+ XrdCmsRouting.cc XrdCmsRouting.hh \
+ XrdCmsRRQ.cc XrdCmsRRQ.hh \
+ XrdCmsRTable.cc XrdCmsRTable.hh \
++ XrdCmsSelect.hh \
+ XrdCmsState.cc XrdCmsState.hh \
+ XrdCmsSupervisor.cc XrdCmsSupervisor.hh \
++ XrdCmsXmi.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
+diff -ur xrootd-3.0.2.orig/src/XrdCns/Makefile.am xrootd-3.0.2/src/XrdCns/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdCns/Makefile.am 2011-01-29 06:50:37.860565408 +0100
++++ xrootd-3.0.2/src/XrdCns/Makefile.am 2011-01-29 07:28:23.379459198 +0100
@@ -9,42 +9,26 @@
#######################################################################
@@ -144,7 +166,7 @@ diff -ur xrootd.orig/src/XrdCns/Makefile.am xrootd/src/XrdCns/Makefile.am
## deliverables
bin_PROGRAMS = XrdCnsd cns_ssi
- INCLUDES = -I$(top_srcdir)/src
+ INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
-xrootdcnsinc_HEADERS = XrdCnsConfig.hh \
- XrdCnsDaemon.hh \
@@ -185,7 +207,7 @@ diff -ur xrootd.orig/src/XrdCns/Makefile.am xrootd/src/XrdCns/Makefile.am
XrdCnsd_LDADD = \
../XrdOss/libXrdOss.la \
-@@ -60,9 +44,9 @@
+@@ -61,9 +45,9 @@
XrdCnsLog.cc \
XrdCnsLogRec.cc \
XrdCnsXref.cc \
@@ -198,9 +220,9 @@ diff -ur xrootd.orig/src/XrdCns/Makefile.am xrootd/src/XrdCns/Makefile.am
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
+diff -ur xrootd-3.0.2.orig/src/XrdCrypto/Makefile.am xrootd-3.0.2/src/XrdCrypto/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdCrypto/Makefile.am 2011-01-29 06:50:37.861565394 +0100
++++ xrootd-3.0.2/src/XrdCrypto/Makefile.am 2011-01-29 07:07:46.868386002 +0100
@@ -21,13 +21,22 @@
noinst_LTLIBRARIES = libXrdSSLutil.la
@@ -231,9 +253,9 @@ diff -ur xrootd.orig/src/XrdCrypto/Makefile.am xrootd/src/XrdCrypto/Makefile.am
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
+diff -ur xrootd-3.0.2.orig/src/XrdMon/Makefile.am xrootd-3.0.2/src/XrdMon/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdMon/Makefile.am 2011-01-29 06:50:37.862565380 +0100
++++ xrootd-3.0.2/src/XrdMon/Makefile.am 2011-01-29 07:07:46.869385989 +0100
@@ -13,10 +13,6 @@
AM_LDFLAGS = -static
@@ -268,9 +290,9 @@ diff -ur xrootd.orig/src/XrdMon/Makefile.am xrootd/src/XrdMon/Makefile.am
#############################################################################
# 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
+diff -ur xrootd-3.0.2.orig/src/XrdSecsss/Makefile.am xrootd-3.0.2/src/XrdSecsss/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdSecsss/Makefile.am 2011-01-29 06:50:37.871565256 +0100
++++ xrootd-3.0.2/src/XrdSecsss/Makefile.am 2011-01-29 07:07:46.870385975 +0100
@@ -12,10 +12,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/src
diff --git a/xrootd-xmi.patch b/xrootd-xmi.patch
new file mode 100644
index 0000000..08a282d
--- /dev/null
+++ b/xrootd-xmi.patch
@@ -0,0 +1,46 @@
+diff -ur xrootd-3.0.2.orig/src/XrdCms/Makefile.am xrootd-3.0.2/src/XrdCms/Makefile.am
+--- xrootd-3.0.2.orig/src/XrdCms/Makefile.am 2011-01-30 10:34:26.344681405 +0100
++++ xrootd-3.0.2/src/XrdCms/Makefile.am 2011-01-30 10:45:57.390201806 +0100
+@@ -25,9 +25,12 @@
+ XrdCmsClient.hh \
+ XrdCmsClientConfig.hh \
+ XrdCmsFinder.hh \
++ XrdCmsReq.hh \
+ XrdCmsSecurity.hh \
+ XrdCmsTrace.hh \
+- XrdCmsTypes.hh
++ XrdCmsTypes.hh \
++ XrdCmsXmi.hh \
++ XrdCmsXmiReq.hh
+
+
+
+@@ -50,7 +53,10 @@
+ XrdCmsClientMan.cc XrdCmsClientMan.hh \
+ XrdCmsClientMsg.cc XrdCmsClientMsg.hh \
+ XrdCmsFinder.cc \
+- XrdCmsResp.cc XrdCmsResp.hh
++ XrdCmsReq.cc \
++ XrdCmsResp.cc XrdCmsResp.hh \
++ XrdCmsRTable.cc XrdCmsRTable.hh \
++ XrdCmsXmiReq.cc
+
+
+ libXrdCms_la_LIBADD = libXrdCmsConv.la \
+@@ -78,15 +84,11 @@
+ 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 \
+ XrdCmsSelect.hh \
+ XrdCmsState.cc XrdCmsState.hh \
+- XrdCmsSupervisor.cc XrdCmsSupervisor.hh \
+- XrdCmsXmi.hh \
+- XrdCmsXmiReq.cc XrdCmsXmiReq.hh
++ XrdCmsSupervisor.cc XrdCmsSupervisor.hh
+
+
+
diff --git a/xrootd.spec b/xrootd.spec
index 3dace8b..42e6334 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -4,15 +4,15 @@
Name: xrootd
Epoch: 1
-Version: 3.0.0
-Release: 2%{?dist}
+Version: 3.0.2
+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.org/
-Source0: http://xrootd.org/download/v%{version}/%{name}-v%{version}.src.tgz
+Source0: http://xrootd.org/download/v%{version}/%{name}-%{version}.tar.gz
# These man pages are extracted from the man/man1 directory in
# the root source archive:
# ftp://root.cern.ch/root/root_v5.28.00.source.tar.gz
@@ -32,6 +32,7 @@ Patch6: %{name}-bonjour.patch
Patch7: %{name}-headers.patch
Patch8: %{name}-gridsite.patch
Patch9: %{name}-cryptoload.patch
+Patch10: %{name}-xmi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
@@ -152,8 +153,8 @@ BuildArch: noarch
This package contains the API documentation of the xrootd libraries.
%prep
-%setup -q -n %{name}
-%setup -D -T -q -n %{name} -a 1
+%setup -q
+%setup -D -T -q -a 1
# Resolve libXrdNetUtil → libXrdOuc → libXrdNet circular dependencies
mkdir src/XrdNetUtil
@@ -163,7 +164,7 @@ 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 \
+for f in XrdFrmCID XrdFrmProxy XrdFrmReqAgent \
XrdFrmReqFile XrdFrmRequest XrdFrmTrace XrdFrmUtils ; do
mv src/XrdFrmUtil/$f.* src/XrdFrm
done
@@ -179,6 +180,7 @@ cp -p src/XrdFrmUtil/Makefile.am src/XrdFrm
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
# Turn off static linking
find . -name Makefile.am -exec sed -e 's/ -static//g' -i {} ';'
@@ -368,6 +370,7 @@ fi
%defattr(-,root,root,-)
%{_bindir}/TestXrdClient*
%{_bindir}/XrdAccTest
+%{_bindir}/cconfig
%{_bindir}/cns_ssi
%{_bindir}/frm_*
%{_bindir}/mpxstats
@@ -412,6 +415,10 @@ fi
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Sun Jan 30 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1:3.0.2-1
+- Update to version 3.0.2
+- Patch XrdCms makefile to make the Xmi interface public
+
* Fri Dec 17 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1:3.0.0-2
- Rebuilt for updated gridsite package
More information about the scm-commits
mailing list