[xrootd] Update to version 3.0.4 Drop patches fixed upstream: xrootd-man.patch, xrootd-rhel5-no-atomic.patch
Mattias Ellert
ellert at fedoraproject.org
Tue Jun 28 12:06:07 UTC 2011
commit bb7bb83df72eeb51121e6fb825924941eaf2fbb4
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Tue Jun 28 14:05:12 2011 +0200
Update to version 3.0.4
Drop patches fixed upstream: xrootd-man.patch, xrootd-rhel5-no-atomic.patch
Drop the remaining man-pages copied from root - now provided by upstream
.gitignore | 3 +-
sources | 3 +-
xrootd-circular-deps.patch | 196 +++++++++++++++++-----------------
xrootd-dso.patch | 241 +++++++++++++++++++++--------------------
xrootd-headers.patch | 51 +++++-----
xrootd-man.patch | 12 --
xrootd-rhel5-no-atomic.patch | 12 --
xrootd.spec | 48 +++++----
8 files changed, 276 insertions(+), 290 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d62a454..05aa456 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/xrootd-3.0.3.tar.gz
-/xrootd-manpages.tar.gz
+/xrootd-3.0.4.tar.gz
diff --git a/sources b/sources
index 490f7f2..0386f9e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-f857ba6303f2e821420553f8e54ee188 xrootd-3.0.3.tar.gz
-3b71baeaedb74599a3ba93888d56e0b6 xrootd-manpages.tar.gz
+cd260d0ea347fcc029ad6ad092667d05 xrootd-3.0.4.tar.gz
diff --git a/xrootd-circular-deps.patch b/xrootd-circular-deps.patch
index abfdcdf..f674ebd 100644
--- a/xrootd-circular-deps.patch
+++ b/xrootd-circular-deps.patch
@@ -1,6 +1,6 @@
-diff -ur xrootd-3.0.3.orig/configure.ac xrootd-3.0.3/configure.ac
---- xrootd-3.0.3.orig/configure.ac 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/configure.ac 2011-04-22 09:05:09.381418838 +0200
+diff -ur xrootd-3.0.4.orig/configure.ac xrootd-3.0.4/configure.ac
+--- xrootd-3.0.4.orig/configure.ac 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/configure.ac 2011-06-27 19:45:35.651558615 +0200
@@ -1147,6 +1147,7 @@
src/Makefile
src/Makefile_include
@@ -17,9 +17,9 @@ diff -ur xrootd-3.0.3.orig/configure.ac xrootd-3.0.3/configure.ac
src/XrdClient/Makefile
src/XrdPosix/Makefile
src/XrdPss/Makefile
-diff -ur xrootd-3.0.3.orig/src/Makefile.am xrootd-3.0.3/src/Makefile.am
---- xrootd-3.0.3.orig/src/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/Makefile.am 2011-04-22 09:05:09.382418750 +0200
+diff -ur xrootd-3.0.4.orig/src/Makefile.am xrootd-3.0.4/src/Makefile.am
+--- xrootd-3.0.4.orig/src/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/Makefile.am 2011-06-27 19:45:35.651558615 +0200
@@ -69,6 +69,7 @@
#######################################################################
@@ -40,9 +40,9 @@ diff -ur xrootd-3.0.3.orig/src/Makefile.am xrootd-3.0.3/src/Makefile.am
XrdCms \
XrdOfs \
XrdRootd \
-diff -ur xrootd-3.0.3.orig/src/XrdFrm/Makefile.am xrootd-3.0.3/src/XrdFrm/Makefile.am
---- xrootd-3.0.3.orig/src/XrdFrm/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrm/Makefile.am 2011-04-22 09:56:18.207877090 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrm/Makefile.am xrootd-3.0.4/src/XrdFrm/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdFrm/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrm/Makefile.am 2011-06-27 19:59:27.110551812 +0200
@@ -16,7 +16,7 @@
#
@@ -52,11 +52,13 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrm/Makefile.am xrootd-3.0.3/src/XrdFrm/Makefi
#############################################################################
## extra directory definitions
-@@ -25,124 +25,36 @@
+@@ -25,126 +25,36 @@
#############################################################################
## deliverables
-bin_PROGRAMS = frm_admin frm_purged frm_xfragent frm_xfrd
+-man8_MANS = ../../docs/man/frm_admin.8 ../../docs/man/frm_purged.8 \
+- ../../docs/man/frm_xfragent.8 ../../docs/man/frm_xfrd.8
-
-xrootdfrminc_HEADERS = XrdFrmAdmin.hh \
- XrdFrmCID.hh \
@@ -180,10 +182,10 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrm/Makefile.am xrootd-3.0.3/src/XrdFrm/Makefi
-
-frm_xfrd_LDFLAGS = -static -export-dynamic -ldl
-
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.3/src/XrdFrmUtil/Makefile.am
---- xrootd-3.0.3.orig/src/XrdFrmUtil/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/Makefile.am 2011-04-22 10:32:55.411376079 +0200
-@@ -19,40 +19,10 @@
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.4/src/XrdFrmUtil/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/Makefile.am 2011-06-27 19:55:25.006765615 +0200
+@@ -19,42 +19,12 @@
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(READLINE_INCDIR)
#############################################################################
@@ -194,6 +196,8 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.3/src/XrdFrmUti
## deliverables
bin_PROGRAMS = frm_admin frm_purged frm_xfragent frm_xfrd
+ man8_MANS = ../../docs/man/frm_admin.8 ../../docs/man/frm_purged.8 \
+ ../../docs/man/frm_xfragent.8 ../../docs/man/frm_xfrd.8
-xrootdfrminc_HEADERS = XrdFrmAdmin.hh \
- XrdFrmCID.hh \
@@ -224,7 +228,7 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.3/src/XrdFrmUti
# Convenience libs to use for objs common to multiple binaries in this dir
noinst_LTLIBRARIES = libXrdFrmConv.la libXrdFrmConvAgent.la
-@@ -61,7 +31,10 @@
+@@ -63,7 +33,10 @@
## Build rules
@@ -236,7 +240,7 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.3/src/XrdFrmUti
libXrdFrmConvAgent_la_SOURCES = XrdFrmReqBoss.cc \
XrdFrmTransfer.cc \
-@@ -70,30 +43,6 @@
+@@ -72,30 +45,6 @@
XrdFrmMigrate.cc \
XrdFrmXfrQueue.cc
@@ -267,7 +271,7 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.3/src/XrdFrmUti
frm_admin_SOURCES = \
XrdFrmAdminMain.cc \
XrdFrmAdmin.cc \
-@@ -104,45 +53,46 @@
+@@ -106,45 +55,46 @@
XrdFrmAdminQuery.cc \
XrdFrmAdminUnlink.cc
@@ -334,9 +338,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/Makefile.am xrootd-3.0.3/src/XrdFrmUti
-frm_xfrd_LDFLAGS = -static -export-dynamic -ldl
+frm_xfrd_LDFLAGS = -static -export-dynamic
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminAudit.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminAudit.cc 2011-04-22 09:05:10.105430591 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminAudit.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminAudit.cc 2011-06-27 19:45:35.654558576 +0200
@@ -12,9 +12,9 @@
#include <string.h>
#include <sys/param.h>
@@ -350,9 +354,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminAudit.cc xrootd-3.0.3/src/X
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdFrm/XrdFrmUtils.hh"
#include "XrdOss/XrdOssPath.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdmin.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdmin.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdmin.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdmin.cc 2011-04-22 09:05:10.141431310 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdmin.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdmin.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdmin.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdmin.cc 2011-06-27 19:45:35.654558576 +0200
@@ -19,8 +19,8 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -364,9 +368,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdmin.cc xrootd-3.0.3/src/XrdFrm
#include "XrdFrm/XrdFrmProxy.hh"
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdFrm/XrdFrmUtils.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminConvert.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminConvert.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminConvert.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminConvert.cc 2011-04-22 14:03:02.445775638 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminConvert.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminConvert.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminConvert.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminConvert.cc 2011-06-27 19:45:35.655558563 +0200
@@ -14,9 +14,9 @@
#include <time.h>
#include <sys/param.h>
@@ -380,9 +384,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminConvert.cc xrootd-3.0.3/src
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdFrm/XrdFrmUtils.hh"
#include "XrdFrm/XrdFrmXAttr.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminFiles.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminFiles.cc 2011-04-22 09:05:10.142431336 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminFiles.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminFiles.cc 2011-06-27 19:45:35.656558550 +0200
@@ -19,9 +19,9 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -396,9 +400,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminFiles.cc xrootd-3.0.3/src/X
#include "XrdFrm/XrdFrmUtils.hh"
#include "XrdFrm/XrdFrmXAttr.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminFind.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminFind.cc 2011-04-22 09:05:10.143431364 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminFind.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminFind.cc 2011-06-27 19:45:35.657558537 +0200
@@ -14,9 +14,9 @@
#include <time.h>
#include <sys/param.h>
@@ -412,9 +416,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminFind.cc xrootd-3.0.3/src/Xr
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdOuc/XrdOucArgs.hh"
#include "XrdOuc/XrdOucNSWalk.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminMain.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminMain.cc 2011-04-22 09:05:10.143431364 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminMain.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminMain.cc 2011-06-27 19:45:35.657558537 +0200
@@ -53,8 +53,8 @@
#include <readline/history.h>
#endif
@@ -426,9 +430,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminMain.cc xrootd-3.0.3/src/Xr
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdNet/XrdNetOpts.hh"
#include "XrdNet/XrdNetSocket.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminQuery.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminQuery.cc 2011-04-22 09:05:10.144431402 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminQuery.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminQuery.cc 2011-06-27 19:45:35.658558523 +0200
@@ -16,9 +16,9 @@
#include <sys/stat.h>
#include <sys/types.h>
@@ -442,9 +446,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminQuery.cc xrootd-3.0.3/src/X
#include "XrdFrm/XrdFrmProxy.hh"
#include "XrdFrm/XrdFrmRequest.hh"
#include "XrdFrm/XrdFrmTrace.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminReloc.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminReloc.cc 2011-04-22 09:05:10.145431428 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminReloc.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminReloc.cc 2011-06-27 19:45:35.658558523 +0200
@@ -23,8 +23,8 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -456,9 +460,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminReloc.cc xrootd-3.0.3/src/X
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdOss/XrdOss.hh"
#include "XrdOss/XrdOssOpaque.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminUnlink.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmAdminUnlink.cc 2011-04-22 09:05:10.146431448 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminUnlink.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmAdminUnlink.cc 2011-06-27 19:45:35.659558509 +0200
@@ -14,8 +14,8 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -470,9 +474,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmAdminUnlink.cc xrootd-3.0.3/src/
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdFrm/XrdFrmUtils.hh"
#include "XrdNet/XrdNetCmsNotify.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmConfig.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmConfig.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmConfig.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmConfig.cc 2011-04-22 09:05:10.147431466 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmConfig.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmConfig.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmConfig.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmConfig.cc 2011-06-27 19:45:35.660558495 +0200
@@ -20,8 +20,8 @@
#include <sys/stat.h>
@@ -484,9 +488,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmConfig.cc xrootd-3.0.3/src/XrdFr
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdFrm/XrdFrmUtils.hh"
#include "XrdNet/XrdNetCmsNotify.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmFiles.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmFiles.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmFiles.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmFiles.cc 2011-04-22 09:05:10.149431502 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmFiles.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmFiles.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmFiles.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmFiles.cc 2011-06-27 19:45:35.661558481 +0200
@@ -17,8 +17,8 @@
#include <sys/stat.h>
#include <sys/types.h>
@@ -498,9 +502,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmFiles.cc xrootd-3.0.3/src/XrdFrm
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdOuc/XrdOucTList.hh"
#include "XrdSys/XrdSysPlatform.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmMigrate.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmMigrate.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmMigrate.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmMigrate.cc 2011-04-22 09:05:10.150431521 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmMigrate.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmMigrate.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmMigrate.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmMigrate.cc 2011-06-27 19:45:35.661558481 +0200
@@ -19,13 +19,13 @@
#include "XrdOss/XrdOssPath.hh"
#include "XrdOuc/XrdOucNSWalk.hh"
@@ -520,9 +524,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmMigrate.cc xrootd-3.0.3/src/XrdF
#include "XrdSys/XrdSysPthread.hh"
#include "XrdSys/XrdSysPlatform.hh"
#include "XrdSys/XrdSysTimer.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmMonitor.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmMonitor.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmMonitor.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmMonitor.cc 2011-04-22 09:05:10.151431541 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmMonitor.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmMonitor.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmMonitor.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmMonitor.cc 2011-06-27 19:45:35.662558468 +0200
@@ -20,7 +20,7 @@
#include <sys/types.h>
@@ -532,9 +536,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmMonitor.cc xrootd-3.0.3/src/XrdF
#include "XrdNet/XrdNet.hh"
#include "XrdNet/XrdNetDNS.hh"
#include "XrdNet/XrdNetPeer.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmPurge.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmPurge.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmPurge.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmPurge.cc 2011-04-22 09:05:10.152431563 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmPurge.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmPurge.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmPurge.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmPurge.cc 2011-06-27 19:45:35.663558456 +0200
@@ -23,9 +23,9 @@
#include "XrdOuc/XrdOucProg.hh"
#include "XrdOuc/XrdOucStream.hh"
@@ -548,9 +552,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmPurge.cc xrootd-3.0.3/src/XrdFrm
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdSys/XrdSysPlatform.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmPurge.hh xrootd-3.0.3/src/XrdFrmUtil/XrdFrmPurge.hh
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmPurge.hh 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmPurge.hh 2011-04-22 09:05:10.153431586 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmPurge.hh xrootd-3.0.4/src/XrdFrmUtil/XrdFrmPurge.hh
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmPurge.hh 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmPurge.hh 2011-06-27 19:45:35.663558456 +0200
@@ -13,7 +13,7 @@
#include <time.h>
#include <sys/types.h>
@@ -560,9 +564,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmPurge.hh xrootd-3.0.3/src/XrdFrm
#include "XrdOss/XrdOssSpace.hh"
class XrdFrmFileset;
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmPurgMain.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmPurgMain.cc 2011-04-22 09:05:10.154431608 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmPurgMain.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmPurgMain.cc 2011-06-27 19:45:35.664558444 +0200
@@ -65,8 +65,8 @@
#include <stdio.h>
#include <sys/param.h>
@@ -574,9 +578,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmPurgMain.cc xrootd-3.0.3/src/Xrd
#include "XrdFrm/XrdFrmTrace.hh"
#include "XrdNet/XrdNetOpts.hh"
#include "XrdNet/XrdNetSocket.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmReqBoss.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmReqBoss.cc 2011-04-22 09:05:10.154431608 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmReqBoss.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmReqBoss.cc 2011-06-27 19:45:35.664558444 +0200
@@ -22,10 +22,10 @@
#include <sys/stat.h>
@@ -590,9 +594,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmReqBoss.cc xrootd-3.0.3/src/XrdF
#include "XrdNet/XrdNetMsg.hh"
#include "XrdOuc/XrdOucUtils.hh"
#include "XrdSys/XrdSysHeaders.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmTransfer.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmTransfer.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmTransfer.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmTransfer.cc 2011-04-22 09:06:45.922426702 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmTransfer.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmTransfer.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmTransfer.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmTransfer.cc 2011-06-27 19:45:35.665558431 +0200
@@ -20,14 +20,14 @@
#include <sys/stat.h>
@@ -613,9 +617,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmTransfer.cc xrootd-3.0.3/src/Xrd
#include "XrdFrm/XrdFrmXAttr.hh"
#include "XrdNet/XrdNetCmsNotify.hh"
#include "XrdOss/XrdOss.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmTSort.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmTSort.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmTSort.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmTSort.cc 2011-04-22 09:05:10.156431649 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmTSort.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmTSort.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmTSort.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmTSort.cc 2011-06-27 19:45:35.666558417 +0200
@@ -12,8 +12,8 @@
const char *XrdFrmTSortCVSID = "$Id$";
@@ -627,9 +631,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmTSort.cc xrootd-3.0.3/src/XrdFrm
//#include "iostream.h"
/******************************************************************************/
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrAgent.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrAgent.cc 2011-04-22 09:05:10.157431669 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmXfrAgent.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmXfrAgent.cc 2011-06-27 19:45:35.666558417 +0200
@@ -20,11 +20,11 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -644,9 +648,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrAgent.cc xrootd-3.0.3/src/Xrd
#include "XrdOuc/XrdOucStream.hh"
#include "XrdSys/XrdSysPlatform.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrDaemon.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrDaemon.cc 2011-04-22 09:05:10.157431669 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmXfrDaemon.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmXfrDaemon.cc 2011-06-27 19:45:35.667558403 +0200
@@ -21,14 +21,14 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -667,9 +671,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.cc xrootd-3.0.3/src/Xr
#include "XrdNet/XrdNetOpts.hh"
#include "XrdNet/XrdNetSocket.hh"
#include "XrdOuc/XrdOucStream.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrDaemon.hh
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrDaemon.hh 2011-04-22 09:05:10.173431999 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh xrootd-3.0.4/src/XrdFrmUtil/XrdFrmXfrDaemon.hh
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmXfrDaemon.hh 2011-06-27 19:45:35.667558403 +0200
@@ -12,7 +12,7 @@
// $Id$
@@ -679,10 +683,10 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrDaemon.hh xrootd-3.0.3/src/Xr
class XrdFrmXfrDaemon
{
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrMain.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrMain.cc 2011-04-22 09:05:10.174432023 +0200
-@@ -59,10 +59,10 @@
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmXfrMain.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmXfrMain.cc 2011-06-27 19:45:35.668558389 +0200
+@@ -55,10 +55,10 @@
#include <stdio.h>
#include <sys/param.h>
@@ -696,9 +700,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrMain.cc xrootd-3.0.3/src/XrdF
#include "XrdSys/XrdSysError.hh"
#include "XrdSys/XrdSysHeaders.hh"
#include "XrdSys/XrdSysLogger.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrQueue.cc
---- xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFrmUtil/XrdFrmXfrQueue.cc 2011-04-22 09:05:10.174432023 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc xrootd-3.0.4/src/XrdFrmUtil/XrdFrmXfrQueue.cc
+--- xrootd-3.0.4.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFrmUtil/XrdFrmXfrQueue.cc 2011-06-27 19:45:35.668558389 +0200
@@ -22,11 +22,11 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -714,9 +718,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrmUtil/XrdFrmXfrQueue.cc xrootd-3.0.3/src/Xrd
#include "XrdNet/XrdNetMsg.hh"
#include "XrdOuc/XrdOucTList.hh"
#include "XrdSys/XrdSysError.hh"
-diff -ur xrootd-3.0.3.orig/src/XrdNet/Makefile.am xrootd-3.0.3/src/XrdNet/Makefile.am
---- xrootd-3.0.3.orig/src/XrdNet/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdNet/Makefile.am 2011-04-22 09:05:10.175432046 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdNet/Makefile.am xrootd-3.0.4/src/XrdNet/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdNet/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdNet/Makefile.am 2011-06-27 19:45:35.669558375 +0200
@@ -18,7 +18,7 @@
#############################################################################
## deliverables (to be built / installed)
@@ -746,9 +750,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdNet/Makefile.am xrootd-3.0.3/src/XrdNet/Makefi
+ ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la \
+ $(LIBSOCKET) $(LIBNSL)
-diff -ur xrootd-3.0.3.orig/src/XrdNetUtil/Makefile.am xrootd-3.0.3/src/XrdNetUtil/Makefile.am
---- xrootd-3.0.3.orig/src/XrdNetUtil/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdNetUtil/Makefile.am 2011-04-22 09:05:10.175432046 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdNetUtil/Makefile.am xrootd-3.0.4/src/XrdNetUtil/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdNetUtil/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdNetUtil/Makefile.am 2011-06-27 19:45:35.670558362 +0200
@@ -11,44 +11,13 @@
AM_CPPFLAGS = -I$(top_srcdir)/src
diff --git a/xrootd-dso.patch b/xrootd-dso.patch
index 3b0d5b1..17b46a5 100644
--- a/xrootd-dso.patch
+++ b/xrootd-dso.patch
@@ -1,6 +1,6 @@
-diff -ur xrootd-3.0.3.orig/src/Xrd/Makefile.am xrootd-3.0.3/src/Xrd/Makefile.am
---- xrootd-3.0.3.orig/src/Xrd/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/Xrd/Makefile.am 2011-04-23 07:47:43.799204731 +0200
+diff -ur xrootd-3.0.4.orig/src/Xrd/Makefile.am xrootd-3.0.4/src/Xrd/Makefile.am
+--- xrootd-3.0.4.orig/src/Xrd/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/Xrd/Makefile.am 2011-06-28 11:30:46.600465098 +0200
@@ -47,6 +47,11 @@
XrdScheduler.cc XrdScheduler.hh XrdJob.hh \
XrdStats.cc XrdStats.hh \
@@ -13,9 +13,9 @@ diff -ur xrootd-3.0.3.orig/src/Xrd/Makefile.am xrootd-3.0.3/src/Xrd/Makefile.am
## Extra sources that should go into the tarball
-diff -ur xrootd-3.0.3.orig/src/XrdAcc/Makefile.am xrootd-3.0.3/src/XrdAcc/Makefile.am
---- xrootd-3.0.3.orig/src/XrdAcc/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdAcc/Makefile.am 2011-04-23 07:47:43.799204731 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdAcc/Makefile.am xrootd-3.0.4/src/XrdAcc/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdAcc/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdAcc/Makefile.am 2011-06-28 11:30:46.600465098 +0200
@@ -38,11 +38,11 @@
XrdAccCapability.cc XrdAccCapability.hh \
XrdAccConfig.cc XrdAccConfig.hh XrdAccAuthDB.hh \
@@ -32,10 +32,10 @@ diff -ur xrootd-3.0.3.orig/src/XrdAcc/Makefile.am xrootd-3.0.3/src/XrdAcc/Makefi
- ../XrdNet/libXrdNetUtil.la \
- -ldl
+ ../XrdSys/libXrdSys.la
-diff -ur xrootd-3.0.3.orig/src/XrdApps/Makefile.am xrootd-3.0.3/src/XrdApps/Makefile.am
---- xrootd-3.0.3.orig/src/XrdApps/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdApps/Makefile.am 2011-04-23 07:47:43.852205381 +0200
-@@ -32,17 +32,17 @@
+diff -ur xrootd-3.0.4.orig/src/XrdApps/Makefile.am xrootd-3.0.4/src/XrdApps/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdApps/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdApps/Makefile.am 2011-06-28 11:30:46.601465085 +0200
+@@ -33,17 +33,17 @@
../XrdClient/libXrdClient.la \
../XrdPosix/libXrdPosix.la \
../XrdOuc/libXrdOuc.la \
@@ -57,7 +57,7 @@ diff -ur xrootd-3.0.3.orig/src/XrdApps/Makefile.am xrootd-3.0.3/src/XrdApps/Make
cconfig_LDFLAGS = -static -export-dynamic
-@@ -51,15 +51,14 @@
+@@ -52,15 +52,14 @@
mpxstats_LDADD = \
../XrdNet/libXrdNet.la \
../XrdOuc/libXrdOuc.la \
@@ -75,9 +75,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdApps/Makefile.am xrootd-3.0.3/src/XrdApps/Make
../XrdSys/libXrdSys.la
wait41_LDFLAGS = -static -export-dynamic
-diff -ur xrootd-3.0.3.orig/src/XrdBwm/Makefile.am xrootd-3.0.3/src/XrdBwm/Makefile.am
---- xrootd-3.0.3.orig/src/XrdBwm/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdBwm/Makefile.am 2011-04-23 07:47:43.853205406 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdBwm/Makefile.am xrootd-3.0.4/src/XrdBwm/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdBwm/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdBwm/Makefile.am 2011-06-28 11:30:46.601465085 +0200
@@ -37,4 +37,8 @@
libXrdBwm_la_LIBADD = ../XrdAcc/libXrdAcc.la \
../XrdNet/libXrdNet.la \
@@ -88,9 +88,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdBwm/Makefile.am xrootd-3.0.3/src/XrdBwm/Makefi
+ $(LIBPTHREAD)
+
+libXrdBwm_la_LDFLAGS = -module
-diff -ur xrootd-3.0.3.orig/src/XrdClient/Makefile.am xrootd-3.0.3/src/XrdClient/Makefile.am
---- xrootd-3.0.3.orig/src/XrdClient/Makefile.am 2011-04-23 07:46:53.932211598 +0200
-+++ xrootd-3.0.3/src/XrdClient/Makefile.am 2011-04-23 07:47:43.854205431 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdClient/Makefile.am xrootd-3.0.4/src/XrdClient/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdClient/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdClient/Makefile.am 2011-06-28 11:30:46.602465072 +0200
@@ -80,22 +80,19 @@
XrdcpXtremeRead.cc XrdcpXtremeRead.hh
@@ -132,10 +132,10 @@ diff -ur xrootd-3.0.3.orig/src/XrdClient/Makefile.am xrootd-3.0.3/src/XrdClient/
if ENABLE_JAVAINT
libXrdClientAdminJNI_la_SOURCES = XrdClientAdminJNI.cc
-diff -ur xrootd-3.0.3.orig/src/XrdCms/Makefile.am xrootd-3.0.3/src/XrdCms/Makefile.am
---- xrootd-3.0.3.orig/src/XrdCms/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdCms/Makefile.am 2011-04-23 07:47:43.855205452 +0200
-@@ -61,9 +61,12 @@
+diff -ur xrootd-3.0.4.orig/src/XrdCms/Makefile.am xrootd-3.0.4/src/XrdCms/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdCms/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdCms/Makefile.am 2011-06-28 11:30:46.603465059 +0200
+@@ -62,9 +62,12 @@
libXrdCms_la_LIBADD = libXrdCmsConv.la \
@@ -151,7 +151,7 @@ diff -ur xrootd-3.0.3.orig/src/XrdCms/Makefile.am xrootd-3.0.3/src/XrdCms/Makefi
cmsd_SOURCES = \
XrdCmsAdmin.cc \
-@@ -93,14 +96,13 @@
+@@ -94,14 +97,13 @@
@@ -170,10 +170,10 @@ diff -ur xrootd-3.0.3.orig/src/XrdCms/Makefile.am xrootd-3.0.3/src/XrdCms/Makefi
cmsd_LDFLAGS = -static -export-dynamic
-diff -ur xrootd-3.0.3.orig/src/XrdCns/Makefile.am xrootd-3.0.3/src/XrdCns/Makefile.am
---- xrootd-3.0.3.orig/src/XrdCns/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdCns/Makefile.am 2011-04-23 07:47:43.856205472 +0200
-@@ -47,16 +47,15 @@
+diff -ur xrootd-3.0.4.orig/src/XrdCns/Makefile.am xrootd-3.0.4/src/XrdCns/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdCns/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdCns/Makefile.am 2011-06-28 11:30:46.603465059 +0200
+@@ -48,16 +48,15 @@
XrdCnsXref.cc
XrdCnsd_LDADD = \
@@ -194,7 +194,7 @@ diff -ur xrootd-3.0.3.orig/src/XrdCns/Makefile.am xrootd-3.0.3/src/XrdCns/Makefi
cns_ssi_SOURCES = \
XrdCnsLog.cc \
-@@ -67,13 +66,8 @@
+@@ -68,13 +67,8 @@
XrdCnsSsiMain.cc
cns_ssi_LDADD = \
@@ -210,9 +210,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdCns/Makefile.am xrootd-3.0.3/src/XrdCns/Makefi
cns_ssi_LDFLAGS = -static -export-dynamic
-
-$(OBJECT_CNS_SSI) $(BINLIBS) $(LIBM) $(LIBS)
-diff -ur xrootd-3.0.3.orig/src/XrdCrypto/Makefile.am xrootd-3.0.3/src/XrdCrypto/Makefile.am
---- xrootd-3.0.3.orig/src/XrdCrypto/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdCrypto/Makefile.am 2011-04-23 07:47:43.856205472 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdCrypto/Makefile.am xrootd-3.0.4/src/XrdCrypto/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdCrypto/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdCrypto/Makefile.am 2011-06-28 11:30:46.604465046 +0200
@@ -43,11 +43,8 @@
XrdCryptosslX509.cc XrdCryptosslX509.hh \
XrdCryptosslX509Crl.cc XrdCryptosslX509Crl.hh \
@@ -269,10 +269,10 @@ diff -ur xrootd-3.0.3.orig/src/XrdCrypto/Makefile.am xrootd-3.0.3/src/XrdCrypto/
$(OPENSSL_LIBDIR) -lssl -lcrypto
libXrdCryptossl_la_LDFLAGS = -module
libXrdCryptossl_la_CXXFLAGS = $(SSLCXXFLAGS)
-diff -ur xrootd-3.0.3.orig/src/XrdFfs/Makefile.am xrootd-3.0.3/src/XrdFfs/Makefile.am
---- xrootd-3.0.3.orig/src/XrdFfs/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdFfs/Makefile.am 2011-04-23 07:47:43.857205492 +0200
-@@ -41,14 +41,12 @@
+diff -ur xrootd-3.0.4.orig/src/XrdFfs/Makefile.am xrootd-3.0.4/src/XrdFfs/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdFfs/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdFfs/Makefile.am 2011-06-28 11:30:46.604465046 +0200
+@@ -42,14 +42,12 @@
XrdFfsPosix.cc \
XrdFfsQueue.cc \
XrdFfsWcache.cc
@@ -294,9 +294,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFfs/Makefile.am xrootd-3.0.3/src/XrdFfs/Makefi
- ../XrdOuc/libXrdOuc.la \
- ../XrdSys/libXrdSys.la
+xrootdfs_LDADD = libXrdFfs.la $(FUSELIB)
-diff -ur xrootd-3.0.3.orig/src/XrdFrm/Makefile.am xrootd-3.0.3/src/XrdFrm/Makefile.am
---- xrootd-3.0.3.orig/src/XrdFrm/Makefile.am 2011-04-23 07:46:53.939211735 +0200
-+++ xrootd-3.0.3/src/XrdFrm/Makefile.am 2011-04-23 07:58:09.065642807 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdFrm/Makefile.am xrootd-3.0.4/src/XrdFrm/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdFrm/Makefile.am 2011-06-28 11:30:15.789867035 +0200
++++ xrootd-3.0.4/src/XrdFrm/Makefile.am 2011-06-28 11:30:46.605465033 +0200
@@ -54,7 +54,6 @@
libXrdFrm_la_LIBADD = \
../XrdNet/libXrdNet.la \
@@ -305,9 +305,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdFrm/Makefile.am xrootd-3.0.3/src/XrdFrm/Makefi
../XrdSys/libXrdSys.la
libXrdFrm_la_LDFLAGS = -static
-diff -ur xrootd-3.0.3.orig/src/XrdMon/Makefile.am xrootd-3.0.3/src/XrdMon/Makefile.am
---- xrootd-3.0.3.orig/src/XrdMon/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdMon/Makefile.am 2011-04-23 07:47:43.858205512 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdMon/Makefile.am xrootd-3.0.4/src/XrdMon/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdMon/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdMon/Makefile.am 2011-06-28 11:30:46.605465033 +0200
@@ -10,7 +10,7 @@
# global settings
@@ -341,9 +341,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdMon/Makefile.am xrootd-3.0.3/src/XrdMon/Makefi
- libXrdMonCommon.la
\ No newline at end of file
+ libXrdMonCommon.la
-diff -ur xrootd-3.0.3.orig/src/XrdMon/XrdMonArgParserConvert.hh xrootd-3.0.3/src/XrdMon/XrdMonArgParserConvert.hh
---- xrootd-3.0.3.orig/src/XrdMon/XrdMonArgParserConvert.hh 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdMon/XrdMonArgParserConvert.hh 2011-04-23 07:47:43.859205532 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdMon/XrdMonArgParserConvert.hh xrootd-3.0.4/src/XrdMon/XrdMonArgParserConvert.hh
+--- xrootd-3.0.4.orig/src/XrdMon/XrdMonArgParserConvert.hh 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdMon/XrdMonArgParserConvert.hh 2011-06-28 11:30:46.606465020 +0200
@@ -12,6 +12,7 @@
#include "XrdMon/XrdMonException.hh"
@@ -352,9 +352,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdMon/XrdMonArgParserConvert.hh xrootd-3.0.3/src
#include <stdlib.h> /* atoi */
#include <string.h>
-diff -ur xrootd-3.0.3.orig/src/XrdOfs/Makefile.am xrootd-3.0.3/src/XrdOfs/Makefile.am
---- xrootd-3.0.3.orig/src/XrdOfs/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdOfs/Makefile.am 2011-04-23 07:47:43.864205631 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdOfs/Makefile.am xrootd-3.0.4/src/XrdOfs/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdOfs/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdOfs/Makefile.am 2011-06-28 11:30:46.607465007 +0200
@@ -18,11 +18,7 @@
XrdOfs.hh \
XrdOfsEvr.hh XrdOfsEvs.hh XrdOfsHandle.hh \
@@ -383,9 +383,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdOfs/Makefile.am xrootd-3.0.3/src/XrdOfs/Makefi
+ ../XrdNetUtil/libXrdNetUtil.la \
+ ../XrdSys/libXrdSys.la \
+ $(LIBPTHREAD)
-diff -ur xrootd-3.0.3.orig/src/XrdOss/Makefile.am xrootd-3.0.3/src/XrdOss/Makefile.am
---- xrootd-3.0.3.orig/src/XrdOss/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdOss/Makefile.am 2011-04-23 07:47:43.865205651 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdOss/Makefile.am xrootd-3.0.4/src/XrdOss/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdOss/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdOss/Makefile.am 2011-06-28 11:30:46.607465007 +0200
@@ -41,4 +41,7 @@
XrdOssStat.cc \
XrdOssUnlink.cc
@@ -395,9 +395,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdOss/Makefile.am xrootd-3.0.3/src/XrdOss/Makefi
+ ../XrdOuc/libXrdOuc.la \
+ ../XrdSys/libXrdSys.la \
+ $(LIBRT) $(LIBPTHREAD)
-diff -ur xrootd-3.0.3.orig/src/XrdOuc/Makefile.am xrootd-3.0.3/src/XrdOuc/Makefile.am
---- xrootd-3.0.3.orig/src/XrdOuc/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdOuc/Makefile.am 2011-04-23 07:47:43.866205671 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdOuc/Makefile.am xrootd-3.0.4/src/XrdOuc/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdOuc/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdOuc/Makefile.am 2011-06-28 11:30:46.608464994 +0200
@@ -57,18 +57,10 @@
XrdOucTrace.cc XrdOucTrace.hh \
XrdOucUtils.cc XrdOucUtils.hh
@@ -420,10 +420,10 @@ diff -ur xrootd-3.0.3.orig/src/XrdOuc/Makefile.am xrootd-3.0.3/src/XrdOuc/Makefi
-# XrdSys/XrdSysLogger.cc
# TODO: again as in classic? REFAC libXrdOuc_la_CXXFLAGS = -prefer-pic
# TODO: again as in classic? REFAC libXrdOuc_la_LDFLAGS = -static
-diff -ur xrootd-3.0.3.orig/src/XrdPosix/Makefile.am xrootd-3.0.3/src/XrdPosix/Makefile.am
---- xrootd-3.0.3.orig/src/XrdPosix/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdPosix/Makefile.am 2011-04-23 07:47:43.866205671 +0200
-@@ -41,10 +41,9 @@
+diff -ur xrootd-3.0.4.orig/src/XrdPosix/Makefile.am xrootd-3.0.4/src/XrdPosix/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdPosix/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdPosix/Makefile.am 2011-06-28 11:32:00.600499679 +0200
+@@ -34,10 +34,9 @@
XrdPosixXrootd.cc
libXrdPosix_la_LIBADD = ../XrdClient/libXrdClient.la \
@@ -434,18 +434,22 @@ diff -ur xrootd-3.0.3.orig/src/XrdPosix/Makefile.am xrootd-3.0.3/src/XrdPosix/Ma
+ ../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-3.0.3.orig/src/XrdPss/Makefile.am xrootd-3.0.3/src/XrdPss/Makefile.am
---- xrootd-3.0.3.orig/src/XrdPss/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdPss/Makefile.am 2011-04-23 07:47:43.866205671 +0200
+ libXrdPosixPreload_la_SOURCES = \
+ XrdPosixPreload32.cc \
+@@ -48,8 +47,6 @@
+
+ libXrdPosixPreload_la_LIBADD = \
+ ../XrdClient/libXrdClient.la \
+- ../XrdNet/libXrdNet.la \
+ ../XrdOuc/libXrdOuc.la \
+- ../XrdSec/libXrdSec.la \
+- ../XrdSys/libXrdSys.la
+-
++ ../XrdSys/libXrdSys.la \
++ $(LIBPTHREAD) -ldl
+diff -ur xrootd-3.0.4.orig/src/XrdPss/Makefile.am xrootd-3.0.4/src/XrdPss/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdPss/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdPss/Makefile.am 2011-06-28 11:30:46.610464967 +0200
@@ -20,12 +20,11 @@
XrdPssAio.cc \
XrdPssConfig.cc
@@ -465,9 +469,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdPss/Makefile.am xrootd-3.0.3/src/XrdPss/Makefi
+ ../XrdSys/libXrdSys.la
+
+libXrdPss_la_LDFLAGS = -module
-diff -ur xrootd-3.0.3.orig/src/XrdRootd/Makefile.am xrootd-3.0.3/src/XrdRootd/Makefile.am
---- xrootd-3.0.3.orig/src/XrdRootd/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdRootd/Makefile.am 2011-04-23 07:47:43.867205691 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdRootd/Makefile.am xrootd-3.0.4/src/XrdRootd/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdRootd/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdRootd/Makefile.am 2011-06-28 11:30:46.611464954 +0200
@@ -13,4 +13,5 @@
INCLUDES = -I$(top_srcdir)/src
@@ -475,9 +479,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdRootd/Makefile.am xrootd-3.0.3/src/XrdRootd/Ma
-libXrdRootd_la_LIBADD = ../XrdOuc/libXrdOuc.la
+libXrdRootd_la_LIBADD = ../Xrd/libXrd.la ../XrdSys/libXrdSys.la
+libXrdRootd_la_LDFLAGS = -module
-diff -ur xrootd-3.0.3.orig/src/XrdSec/Makefile.am xrootd-3.0.3/src/XrdSec/Makefile.am
---- xrootd-3.0.3.orig/src/XrdSec/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdSec/Makefile.am 2011-04-23 07:47:43.867205691 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdSec/Makefile.am xrootd-3.0.4/src/XrdSec/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdSec/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdSec/Makefile.am 2011-06-28 11:30:46.611464955 +0200
@@ -16,47 +16,42 @@
#############################################################################
@@ -543,12 +547,12 @@ diff -ur xrootd-3.0.3.orig/src/XrdSec/Makefile.am xrootd-3.0.3/src/XrdSec/Makefi
- ../XrdSys/libXrdSys.la \
- ../XrdNet/libXrdNetUtil.la
+ ../XrdSys/libXrdSys.la
-diff -ur xrootd-3.0.3.orig/src/XrdSecgsi/Makefile.am xrootd-3.0.3/src/XrdSecgsi/Makefile.am
---- xrootd-3.0.3.orig/src/XrdSecgsi/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdSecgsi/Makefile.am 2011-04-23 08:00:34.132591340 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdSecgsi/Makefile.am xrootd-3.0.4/src/XrdSecgsi/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdSecgsi/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdSecgsi/Makefile.am 2011-06-28 11:30:46.612464942 +0200
@@ -13,8 +13,7 @@
bin_PROGRAMS = xrdgsiproxy
- man1_MANS = xrdgsiproxy.1
+ man1_MANS = ../../docs/man/xrdgsiproxy.1
-# TODO: xrdsecgsitest no longer builds
-#check_PROGRAMS = xrdsecgsitest
@@ -604,10 +608,10 @@ diff -ur xrootd-3.0.3.orig/src/XrdSecgsi/Makefile.am xrootd-3.0.3/src/XrdSecgsi/
+xrdsecgsitest_LDADD = ../XrdCrypto/libXrdSSLutil.la \
+ ../XrdCrypto/libXrdCrypto.la \
+ $(OPENSSL_LIBDIR) -lssl -lcrypto
-diff -ur xrootd-3.0.3.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc xrootd-3.0.3/src/XrdSecgsi/XrdSecProtocolgsi.cc
---- xrootd-3.0.3.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdSecgsi/XrdSecProtocolgsi.cc 2011-04-23 07:47:43.869205731 +0200
-@@ -150,6 +150,7 @@
+diff -ur xrootd-3.0.4.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc xrootd-3.0.4/src/XrdSecgsi/XrdSecProtocolgsi.cc
+--- xrootd-3.0.4.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdSecgsi/XrdSecProtocolgsi.cc 2011-06-28 11:30:46.614464914 +0200
+@@ -152,6 +152,7 @@
XrdOucTrace *XrdSecProtocolgsi::GSITrace = 0;
XrdOucTrace *gsiTrace = 0;
@@ -615,10 +619,10 @@ diff -ur xrootd-3.0.3.orig/src/XrdSecgsi/XrdSecProtocolgsi.cc xrootd-3.0.3/src/X
/******************************************************************************/
/* S t a t i c F u n c t i o n s */
-diff -ur xrootd-3.0.3.orig/src/XrdSecgsi/XrdSecgsiProxy.cc xrootd-3.0.3/src/XrdSecgsi/XrdSecgsiProxy.cc
---- xrootd-3.0.3.orig/src/XrdSecgsi/XrdSecgsiProxy.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdSecgsi/XrdSecgsiProxy.cc 2011-04-23 07:47:43.871205770 +0200
-@@ -94,6 +94,7 @@
+diff -ur xrootd-3.0.4.orig/src/XrdSecgsi/XrdSecgsiProxy.cc xrootd-3.0.4/src/XrdSecgsi/XrdSecgsiProxy.cc
+--- xrootd-3.0.4.orig/src/XrdSecgsi/XrdSecgsiProxy.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdSecgsi/XrdSecgsiProxy.cc 2011-06-28 11:30:46.616464888 +0200
+@@ -95,6 +95,7 @@
static XrdSysLogger Logger;
static XrdSysError eDest(0,"proxy_");
XrdOucTrace *gsiTrace = 0;
@@ -626,9 +630,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdSecgsi/XrdSecgsiProxy.cc xrootd-3.0.3/src/XrdS
int main( int argc, char **argv )
{
-diff -ur xrootd-3.0.3.orig/src/XrdSecgsi/XrdSecgsitest.cc xrootd-3.0.3/src/XrdSecgsi/XrdSecgsitest.cc
---- xrootd-3.0.3.orig/src/XrdSecgsi/XrdSecgsitest.cc 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdSecgsi/XrdSecgsitest.cc 2011-04-23 07:47:43.872205790 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdSecgsi/XrdSecgsitest.cc xrootd-3.0.4/src/XrdSecgsi/XrdSecgsitest.cc
+--- xrootd-3.0.4.orig/src/XrdSecgsi/XrdSecgsitest.cc 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdSecgsi/XrdSecgsitest.cc 2011-06-28 11:30:46.616464889 +0200
@@ -52,6 +52,7 @@
static XrdSysLogger Logger;
static XrdSysError eDest(0,"gsitest_");
@@ -637,9 +641,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdSecgsi/XrdSecgsitest.cc xrootd-3.0.3/src/XrdSe
int main( int argc, char **argv )
{
-diff -ur xrootd-3.0.3.orig/src/XrdSeckrb4/Makefile.am xrootd-3.0.3/src/XrdSeckrb4/Makefile.am
---- xrootd-3.0.3.orig/src/XrdSeckrb4/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdSeckrb4/Makefile.am 2011-04-23 07:47:43.872205790 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdSeckrb4/Makefile.am xrootd-3.0.4/src/XrdSeckrb4/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdSeckrb4/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdSeckrb4/Makefile.am 2011-06-28 11:30:46.616464889 +0200
@@ -13,6 +13,9 @@
INCLUDES = -I$(top_srcdir)/src $(KRB4_INCDIR)
@@ -653,9 +657,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdSeckrb4/Makefile.am xrootd-3.0.3/src/XrdSeckrb
-libXrdSeckrb4_la_LIBTOOLFLAGS = --tag=disable-static
\ No newline at end of file
+libXrdSeckrb4_la_LIBTOOLFLAGS = --tag=disable-static
-diff -ur xrootd-3.0.3.orig/src/XrdSeckrb5/Makefile.am xrootd-3.0.3/src/XrdSeckrb5/Makefile.am
---- xrootd-3.0.3.orig/src/XrdSeckrb5/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdSeckrb5/Makefile.am 2011-04-23 07:47:43.873205810 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdSeckrb5/Makefile.am xrootd-3.0.4/src/XrdSeckrb5/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdSeckrb5/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdSeckrb5/Makefile.am 2011-06-28 11:30:46.617464876 +0200
@@ -22,9 +22,9 @@
libXrdSeckrb5_la_SOURCES = XrdSecProtocolkrb5.cc
@@ -668,10 +672,10 @@ diff -ur xrootd-3.0.3.orig/src/XrdSeckrb5/Makefile.am xrootd-3.0.3/src/XrdSeckrb
$(KRB5_LIBDIR) -lkrb5 -lk5crypto -lcom_err
libXrdSeckrb5_la_LDFLAGS = -module
-diff -ur xrootd-3.0.3.orig/src/XrdSecpwd/Makefile.am xrootd-3.0.3/src/XrdSecpwd/Makefile.am
---- xrootd-3.0.3.orig/src/XrdSecpwd/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdSecpwd/Makefile.am 2011-04-23 07:47:43.873205810 +0200
-@@ -20,7 +20,7 @@
+diff -ur xrootd-3.0.4.orig/src/XrdSecpwd/Makefile.am xrootd-3.0.4/src/XrdSecpwd/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdSecpwd/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdSecpwd/Makefile.am 2011-06-28 11:30:46.617464876 +0200
+@@ -21,7 +21,7 @@
../XrdSut/libXrdSut.la \
../XrdOuc/libXrdOuc.la \
../XrdSys/libXrdSys.la \
@@ -680,7 +684,7 @@ diff -ur xrootd-3.0.3.orig/src/XrdSecpwd/Makefile.am xrootd-3.0.3/src/XrdSecpwd/
libXrdSecpwd_la_LDFLAGS = -module
libXrdSecpwd_la_LIBTOOLFLAGS = --tag=disable-static
-@@ -28,7 +28,5 @@
+@@ -29,7 +29,5 @@
xrdpwdadmin_LDFLAGS = -static
xrdpwdadmin_LDADD = ../XrdCrypto/libXrdCrypto.la \
../XrdSut/libXrdSut.la \
@@ -689,18 +693,19 @@ diff -ur xrootd-3.0.3.orig/src/XrdSecpwd/Makefile.am xrootd-3.0.3/src/XrdSecpwd/
- $(CRYPTLIB) $(OPENSSL_LIBDIR) -ldl -lcrypto
+ ../XrdOuc/libXrdOuc.la
-diff -ur xrootd-3.0.3.orig/src/XrdSecsss/Makefile.am xrootd-3.0.3/src/XrdSecsss/Makefile.am
---- xrootd-3.0.3.orig/src/XrdSecsss/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdSecsss/Makefile.am 2011-04-23 07:47:43.874205830 +0200
-@@ -19,34 +19,29 @@
+diff -ur xrootd-3.0.4.orig/src/XrdSecsss/Makefile.am xrootd-3.0.4/src/XrdSecsss/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdSecsss/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdSecsss/Makefile.am 2011-06-28 11:30:46.618464863 +0200
+@@ -19,6 +19,8 @@
## deliverables (to be built / installed)
lib_LTLIBRARIES = libXrdSecsss.la
+noinst_LTLIBRARIES = libXrdSecsssUtil.la
+
bin_PROGRAMS = xrdsssadmin
+ man8_MANS = ../../docs/man/xrdsssadmin.8
- Secsssinc_HEADERS = XrdSecProtocolsss.hh XrdSecsssID.hh XrdSecsssKT.hh XrdSecsssRR.hh
+@@ -26,28 +28,21 @@
#############################################################################
## Build rules
@@ -740,9 +745,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdSecsss/Makefile.am xrootd-3.0.3/src/XrdSecsss/
+xrdsssadmin_LDADD = libXrdSecsssUtil.la \
+ ../XrdOuc/libXrdOuc.la \
+ ../XrdSys/libXrdSys.la
-diff -ur xrootd-3.0.3.orig/src/XrdSecunix/Makefile.am xrootd-3.0.3/src/XrdSecunix/Makefile.am
---- xrootd-3.0.3.orig/src/XrdSecunix/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdSecunix/Makefile.am 2011-04-23 07:47:43.875205850 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdSecunix/Makefile.am xrootd-3.0.4/src/XrdSecunix/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdSecunix/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdSecunix/Makefile.am 2011-06-28 11:30:46.618464863 +0200
@@ -13,9 +13,7 @@
INCLUDES = -I$(top_srcdir)/src $(KRB4_INCDIR)
@@ -754,9 +759,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdSecunix/Makefile.am xrootd-3.0.3/src/XrdSecuni
libXrdSecunix_la_LDFLAGS = -module
libXrdSecunix_la_LIBTOOLFLAGS = --tag=disable-static
-diff -ur xrootd-3.0.3.orig/src/XrdSut/Makefile.am xrootd-3.0.3/src/XrdSut/Makefile.am
---- xrootd-3.0.3.orig/src/XrdSut/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdSut/Makefile.am 2011-04-23 07:47:43.875205850 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdSut/Makefile.am xrootd-3.0.4/src/XrdSut/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdSut/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdSut/Makefile.am 2011-06-28 11:30:46.619464850 +0200
@@ -27,3 +27,6 @@
XrdSutPFile.cc XrdSutPFile.hh\
XrdSutPFEntry.cc XrdSutPFEntry.hh \
@@ -764,9 +769,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdSut/Makefile.am xrootd-3.0.3/src/XrdSut/Makefi
+
+libXrdSut_la_LIBADD = ../XrdOuc/libXrdOuc.la \
+ ../XrdSys/libXrdSys.la
-diff -ur xrootd-3.0.3.orig/src/XrdSys/Makefile.am xrootd-3.0.3/src/XrdSys/Makefile.am
---- xrootd-3.0.3.orig/src/XrdSys/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdSys/Makefile.am 2011-04-23 07:47:43.876205870 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdSys/Makefile.am xrootd-3.0.4/src/XrdSys/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdSys/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdSys/Makefile.am 2011-06-28 11:30:46.620464837 +0200
@@ -20,9 +20,6 @@
lib_LTLIBRARIES = libXrdSys.la
@@ -801,10 +806,10 @@ diff -ur xrootd-3.0.3.orig/src/XrdSys/Makefile.am xrootd-3.0.3/src/XrdSys/Makefi
libXrdSys_la_CXXFLAGS = -prefer-pic
# sources not named in rules that still need to get rolled into the distribution tarball
-diff -ur xrootd-3.0.3.orig/src/XrdXrootd/Makefile.am xrootd-3.0.3/src/XrdXrootd/Makefile.am
---- xrootd-3.0.3.orig/src/XrdXrootd/Makefile.am 2011-04-11 13:24:37.000000000 +0200
-+++ xrootd-3.0.3/src/XrdXrootd/Makefile.am 2011-04-23 07:47:43.876205870 +0200
-@@ -39,21 +39,10 @@
+diff -ur xrootd-3.0.4.orig/src/XrdXrootd/Makefile.am xrootd-3.0.4/src/XrdXrootd/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdXrootd/Makefile.am 2011-06-14 17:39:38.000000000 +0200
++++ xrootd-3.0.4/src/XrdXrootd/Makefile.am 2011-06-28 11:30:46.620464837 +0200
+@@ -40,21 +40,10 @@
xrootd_LDADD = -ldl \
../Xrd/libXrd.la \
../XrdOfs/libXrdOfs.la \
diff --git a/xrootd-headers.patch b/xrootd-headers.patch
index fb14470..64a08fd 100644
--- a/xrootd-headers.patch
+++ b/xrootd-headers.patch
@@ -1,6 +1,6 @@
-diff -ur xrootd-3.0.3.orig/src/XrdBwm/Makefile.am xrootd-3.0.3/src/XrdBwm/Makefile.am
---- xrootd-3.0.3.orig/src/XrdBwm/Makefile.am 2011-04-22 12:28:53.721992261 +0200
-+++ xrootd-3.0.3/src/XrdBwm/Makefile.am 2011-04-22 12:30:02.126371577 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdBwm/Makefile.am xrootd-3.0.4/src/XrdBwm/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdBwm/Makefile.am 2011-06-27 20:49:43.142337090 +0200
++++ xrootd-3.0.4/src/XrdBwm/Makefile.am 2011-06-27 21:26:07.254033194 +0200
@@ -9,30 +9,20 @@
#######################################################################
@@ -38,10 +38,10 @@ diff -ur xrootd-3.0.3.orig/src/XrdBwm/Makefile.am xrootd-3.0.3/src/XrdBwm/Makefi
libXrdBwm_la_LIBADD = ../XrdAcc/libXrdAcc.la \
../XrdNet/libXrdNet.la \
-diff -ur xrootd-3.0.3.orig/src/XrdCms/Makefile.am xrootd-3.0.3/src/XrdCms/Makefile.am
---- xrootd-3.0.3.orig/src/XrdCms/Makefile.am 2011-04-22 12:28:53.723992301 +0200
-+++ xrootd-3.0.3/src/XrdCms/Makefile.am 2011-04-22 12:40:49.906967849 +0200
-@@ -22,19 +22,12 @@
+diff -ur xrootd-3.0.4.orig/src/XrdCms/Makefile.am xrootd-3.0.4/src/XrdCms/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdCms/Makefile.am 2011-06-27 20:49:43.144337062 +0200
++++ xrootd-3.0.4/src/XrdCms/Makefile.am 2011-06-27 21:26:07.255033181 +0200
+@@ -23,19 +23,12 @@
xrootdcmsincdir = $(includedir)/xrootd/XrdCms
xrootdcmsinc_HEADERS = \
@@ -67,7 +67,7 @@ diff -ur xrootd-3.0.3.orig/src/XrdCms/Makefile.am xrootd-3.0.3/src/XrdCms/Makefi
-@@ -45,19 +38,19 @@
+@@ -46,19 +39,19 @@
# for convenience:
libXrdCmsConv_la_SOURCES = \
@@ -97,7 +97,7 @@ diff -ur xrootd-3.0.3.orig/src/XrdCms/Makefile.am xrootd-3.0.3/src/XrdCms/Makefi
libXrdCms_la_LIBADD = libXrdCmsConv.la \
-@@ -69,31 +62,32 @@
+@@ -70,31 +63,32 @@
$(LIBPTHREAD) -ldl
cmsd_SOURCES = \
@@ -155,10 +155,10 @@ diff -ur xrootd-3.0.3.orig/src/XrdCms/Makefile.am xrootd-3.0.3/src/XrdCms/Makefi
cmsd_LDADD = libXrdCms.la \
-diff -ur xrootd-3.0.3.orig/src/XrdCns/Makefile.am xrootd-3.0.3/src/XrdCns/Makefile.am
---- xrootd-3.0.3.orig/src/XrdCns/Makefile.am 2011-04-22 12:28:53.723992301 +0200
-+++ xrootd-3.0.3/src/XrdCns/Makefile.am 2011-04-22 12:30:02.182372759 +0200
-@@ -9,42 +9,26 @@
+diff -ur xrootd-3.0.4.orig/src/XrdCns/Makefile.am xrootd-3.0.4/src/XrdCns/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdCns/Makefile.am 2011-06-27 20:49:43.144337063 +0200
++++ xrootd-3.0.4/src/XrdCns/Makefile.am 2011-06-27 21:43:30.650024598 +0200
+@@ -9,43 +9,27 @@
#######################################################################
#############################################################################
@@ -168,6 +168,7 @@ diff -ur xrootd-3.0.3.orig/src/XrdCns/Makefile.am xrootd-3.0.3/src/XrdCns/Makefi
-#############################################################################
## deliverables
bin_PROGRAMS = XrdCnsd cns_ssi
+ man8_MANS = ../../docs/man/XrdCnsd.8 ../../docs/man/cns_ssi.8
INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
@@ -210,7 +211,7 @@ diff -ur xrootd-3.0.3.orig/src/XrdCns/Makefile.am xrootd-3.0.3/src/XrdCns/Makefi
XrdCnsd_LDADD = \
../XrdOss/libXrdOss.la \
-@@ -61,9 +45,9 @@
+@@ -62,9 +46,9 @@
XrdCnsLog.cc \
XrdCnsLogRec.cc \
XrdCnsXref.cc \
@@ -223,9 +224,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdCns/Makefile.am xrootd-3.0.3/src/XrdCns/Makefi
cns_ssi_LDADD = \
../XrdOuc/libXrdOuc.la \
-diff -ur xrootd-3.0.3.orig/src/XrdCrypto/Makefile.am xrootd-3.0.3/src/XrdCrypto/Makefile.am
---- xrootd-3.0.3.orig/src/XrdCrypto/Makefile.am 2011-04-22 12:28:53.724992321 +0200
-+++ xrootd-3.0.3/src/XrdCrypto/Makefile.am 2011-04-22 12:30:02.182372759 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdCrypto/Makefile.am xrootd-3.0.4/src/XrdCrypto/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdCrypto/Makefile.am 2011-06-27 20:49:43.144337063 +0200
++++ xrootd-3.0.4/src/XrdCrypto/Makefile.am 2011-06-27 21:26:07.256033168 +0200
@@ -21,13 +21,22 @@
noinst_LTLIBRARIES = libXrdSSLutil.la
@@ -256,9 +257,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdCrypto/Makefile.am xrootd-3.0.3/src/XrdCrypto/
check_PROGRAMS = xrdcryptotest
-diff -ur xrootd-3.0.3.orig/src/XrdMon/Makefile.am xrootd-3.0.3/src/XrdMon/Makefile.am
---- xrootd-3.0.3.orig/src/XrdMon/Makefile.am 2011-04-22 12:28:53.726992361 +0200
-+++ xrootd-3.0.3/src/XrdMon/Makefile.am 2011-04-22 12:30:02.183372795 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdMon/Makefile.am xrootd-3.0.4/src/XrdMon/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdMon/Makefile.am 2011-06-27 20:49:43.146337036 +0200
++++ xrootd-3.0.4/src/XrdMon/Makefile.am 2011-06-27 21:26:07.257033154 +0200
@@ -13,10 +13,6 @@
AM_LDFLAGS = -static
@@ -293,9 +294,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdMon/Makefile.am xrootd-3.0.3/src/XrdMon/Makefi
#############################################################################
# Build rules
-diff -ur xrootd-3.0.3.orig/src/XrdSecsss/Makefile.am xrootd-3.0.3/src/XrdSecsss/Makefile.am
---- xrootd-3.0.3.orig/src/XrdSecsss/Makefile.am 2011-04-22 12:28:53.747992785 +0200
-+++ xrootd-3.0.3/src/XrdSecsss/Makefile.am 2011-04-22 12:30:02.184372830 +0200
+diff -ur xrootd-3.0.4.orig/src/XrdSecsss/Makefile.am xrootd-3.0.4/src/XrdSecsss/Makefile.am
+--- xrootd-3.0.4.orig/src/XrdSecsss/Makefile.am 2011-06-27 21:02:59.492641873 +0200
++++ xrootd-3.0.4/src/XrdSecsss/Makefile.am 2011-06-27 21:26:07.258033140 +0200
@@ -12,10 +12,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/src
@@ -307,9 +308,9 @@ diff -ur xrootd-3.0.3.orig/src/XrdSecsss/Makefile.am xrootd-3.0.3/src/XrdSecsss/
## deliverables (to be built / installed)
lib_LTLIBRARIES = libXrdSecsss.la
-@@ -23,8 +19,6 @@
-
+@@ -24,8 +20,6 @@
bin_PROGRAMS = xrdsssadmin
+ man8_MANS = ../../docs/man/xrdsssadmin.8
-Secsssinc_HEADERS = XrdSecProtocolsss.hh XrdSecsssID.hh XrdSecsssKT.hh XrdSecsssRR.hh
-
diff --git a/xrootd.spec b/xrootd.spec
index b8e1aef..16d57a2 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -4,8 +4,8 @@
Name: xrootd
Epoch: 1
-Version: 3.0.3
-Release: 3%{?dist}
+Version: 3.0.4
+Release: 1%{?dist}
Summary: Extended ROOT file server
Group: System Environment/Daemons
@@ -13,11 +13,7 @@ Group: System Environment/Daemons
License: BSD and LGPLv2+
URL: http://xrootd.org/
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
-Source1: xrootd-manpages.tar.gz
-Source2: %{name}.logrotate
+Source1: %{name}.logrotate
Patch0: %{name}-jni.patch
Patch1: %{name}-perl-java.patch
Patch2: %{name}-circular-deps.patch
@@ -29,9 +25,7 @@ Patch7: %{name}-headers.patch
Patch8: %{name}-gridsite.patch
Patch9: %{name}-cryptoload.patch
Patch10: %{name}-xmi.patch
-Patch11: %{name}-man.patch
-Patch12: %{name}-init.patch
-Patch13: %{name}-rhel5-no-atomic.patch
+Patch11: %{name}-init.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
@@ -155,7 +149,6 @@ This package contains the API documentation of the xrootd libraries.
%prep
%setup -q
-%setup -D -T -q -a 1
# Resolve libXrdNetUtil → libXrdOuc → libXrdNet circular dependencies
mkdir src/XrdNetUtil
@@ -183,8 +176,6 @@ cp -p src/XrdFrmUtil/Makefile.am src/XrdFrm
%patch9 -p1
%patch10 -p1
%patch11 -p1
-%patch12 -p1
-%patch13 -p1
# Turn off static linking
find . -name Makefile.am -exec sed -e 's/ -static//g' -i {} ';'
@@ -290,12 +281,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name}
mkdir $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
-
-# Man pages
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-sed -e '/^\.UR/d' -e '/^\.UE/d' -i xrootd-manpages/*
-install -p -m 644 xrootd-manpages/* $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
# Documentation
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -353,16 +339,23 @@ fi
%{_bindir}/frm_*
%{_bindir}/mpxstats
%{_bindir}/wait41
-%{_bindir}/xrdadler32
%{_bindir}/XrdCnsd
%{_bindir}/xrdmonAdmin
%{_bindir}/xrdmonCollector
%{_bindir}/xrdpwdadmin
%{_bindir}/xrdsssadmin
%{_bindir}/%{name}
-%{_mandir}/man1/cmsd.1*
-%{_mandir}/man1/xrdpwdadmin.1*
-%{_mandir}/man1/%{name}.1*
+%{_mandir}/man8/cmsd.8*
+%{_mandir}/man8/cns_ssi.8*
+%{_mandir}/man8/frm_admin.8*
+%{_mandir}/man8/frm_purged.8*
+%{_mandir}/man8/frm_xfragent.8*
+%{_mandir}/man8/frm_xfrd.8*
+%{_mandir}/man8/mpxstats.8*
+%{_mandir}/man8/XrdCnsd.8*
+%{_mandir}/man8/xrdpwdadmin.8*
+%{_mandir}/man8/xrdsssadmin.8*
+%{_mandir}/man8/%{name}.8*
%{_initrddir}/*
%config(noreplace) %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
@@ -376,6 +369,7 @@ fi
# Some of the libraries are used as plugins - need the .so symlink at runtime
%{_libdir}/libXrdBwm.so
%{_libdir}/libXrdCryptossl.so
+%{_libdir}/libXrdPosixPreload.so
%{_libdir}/libXrdPss.so
%{_libdir}/libXrdRootd.so
%{_libdir}/libXrdSec.so
@@ -415,11 +409,13 @@ fi
%defattr(-,root,root,-)
%{_bindir}/xprep
%{_bindir}/xrd
+%{_bindir}/xrdadler32
%{_bindir}/xrdcp
%{_bindir}/xrdgsiproxy
%{_bindir}/xrdstagetool
%{_mandir}/man1/xprep.1*
%{_mandir}/man1/xrd.1*
+%{_mandir}/man1/xrdadler32.1*
%{_mandir}/man1/xrdcp.1*
%{_mandir}/man1/xrdgsiproxy.1*
%{_mandir}/man1/xrdstagetool.1*
@@ -428,6 +424,7 @@ fi
%files fuse
%defattr(-,root,root,-)
%{_bindir}/xrootdfs
+%{_mandir}/man1/xrootdfs.1*
%endif
%files client-admin-perl
@@ -444,6 +441,11 @@ fi
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Mon Jun 27 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1:3.0.4-1
+- Update to version 3.0.4
+- Drop patches fixed upstream: xrootd-man.patch, xrootd-rhel5-no-atomic.patch
+- Drop the remaining man-pages copied from root - now provided by upstream
+
* Fri Jun 17 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1:3.0.3-3
- Perl mass rebuild
More information about the scm-commits
mailing list