Created
June 11, 2014 13:09
-
-
Save mgmarino/bc8b61e9d0a990b21e09 to your computer and use it in GitHub Desktop.
Diff to apply to 5.28.00h to be able to build with xrootd 3.1.1 and later. Usage: 'patch -p0 < root_5.28.00h_xrootd_patch.diff'
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git net/netx/Module.mk net/netx/Module.mk | |
| index 897ea26..a55e93b 100644 | |
| --- net/netx/Module.mk | |
| +++ net/netx/Module.mk | |
| @@ -58,7 +58,7 @@ endif | |
| ifeq ($(PLATFORM),win32) | |
| NETXLIBEXTRA += $(XROOTDDIRL)/libXrdClient.lib | |
| else | |
| -NETXLIBEXTRA += -L$(XROOTDDIRL) -lXrdOuc -lXrdSys \ | |
| +NETXLIBEXTRA += -L$(XROOTDDIRL) \ | |
| -lXrdClient | |
| endif | |
| diff --git proof/proofd/Module.mk proof/proofd/Module.mk | |
| index 60649b0..62b4fa1 100644 | |
| --- proof/proofd/Module.mk | |
| +++ proof/proofd/Module.mk | |
| @@ -115,12 +115,9 @@ XPROOFDEXE := | |
| ifeq ($(HASXRD),yes) | |
| XPDINCEXTRA := $(XROOTDDIRI:%=-I%) | |
| XPDINCEXTRA += $(PROOFDDIRI:%=-I%) | |
| -XPDLIBEXTRA += -L$(XROOTDDIRL) -lXrdOuc -lXrdNet -lXrdSys \ | |
| - -lXrdClient -lXrdSut $(DNSSDLIB) | |
| -XPROOFDEXELIBS := $(XROOTDDIRL)/libXrd.a $(XROOTDDIRL)/libXrdClient.a \ | |
| - $(XROOTDDIRL)/libXrdNet.a \ | |
| - $(XROOTDDIRL)/libXrdOuc.a \ | |
| - $(XROOTDDIRL)/libXrdSys.a $(XROOTDDIRL)/libXrdSut.a | |
| +XPDLIBEXTRA += -L$(XROOTDDIRL) \ | |
| + -lXrdClient $(DNSSDLIB) | |
| +XPROOFDEXELIBS := -L$(XROOTDDIRL) -lXrdMain -lXrdClient | |
| # Starting from Jul 2010 XrdNet has been split in two libs: XrdNet and XrdNetUtil; | |
| # both are needed | |
| XRDNETUTIL := | |
| @@ -130,8 +127,7 @@ XRDNETUTIL := $(shell if test $(XRDVERSION) -gt 20100729; then \ | |
| fi) | |
| endif | |
| ifeq ($(XRDNETUTIL),yes) | |
| -XPDLIBEXTRA += -L$(XROOTDDIRL) -lXrdNetUtil | |
| -XPROOFDEXELIBS += $(XROOTDDIRL)/libXrdNetUtil.a | |
| +XPDLIBEXTRA += | |
| endif | |
| XPDLIBEXTRA += $(DNSSDLIB) | |
| @@ -166,7 +162,7 @@ $(PROOFDEXE): $(PROOFDEXEO) $(RSAO) $(SNPRINTFO) $(GLBPATCHO) $(RPDUTILO) $(ST | |
| $(LD) $(LDFLAGS) -o $@ $(PROOFDEXEO) $(RPDUTILO) $(GLBPATCHO) \ | |
| $(RSAO) $(SNPRINTFO) $(CRYPTLIBS) $(AUTHLIBS) $(STRLCPYO) $(SYSLIBS) | |
| -$(XPROOFDEXE): $(XPDO) $(XPROOFDEXELIBS) $(XRDPROOFXD) | |
| +$(XPROOFDEXE): $(XPDO) $(XRDPROOFXD) | |
| $(LD) $(LDFLAGS) -o $@ $(XPDO) $(XPROOFDEXELIBS) $(SYSLIBS) $(XPROOFDEXESYSLIBS) | |
| $(XPDLIB): $(XPDO) $(XPDH) $(ORDER_) $(MAINLIBS) $(XRDPROOFXD) | |
| diff --git proof/proofd/src/XrdProofConn.cxx proof/proofd/src/XrdProofConn.cxx | |
| index 5f400fb..15d8c3c 100644 | |
| --- proof/proofd/src/XrdProofConn.cxx | |
| +++ proof/proofd/src/XrdProofConn.cxx | |
| @@ -41,7 +41,7 @@ | |
| #include "XrdClient/XrdClientPhyConnection.hh" | |
| #include "XrdClient/XrdClientMessage.hh" | |
| #include "XrdClient/XrdClientUrlInfo.hh" | |
| -#include "XrdNet/XrdNetDNS.hh" | |
| +#include "XrdSys/XrdSysDNS.hh" | |
| #include "XrdOuc/XrdOucErrInfo.hh" | |
| #include "XrdOuc/XrdOucString.hh" | |
| #include "XrdSec/XrdSecInterface.hh" | |
| @@ -334,7 +334,7 @@ int XrdProofConn::TryConnect() | |
| // Resolve the DNS information | |
| char *haddr[10] = {0}, *hname[10] = {0}; | |
| - int naddr = XrdNetDNS::getAddrName(fUrl.Host.c_str(), 10, haddr, hname); | |
| + int naddr = XrdSysDNS::getAddrName(fUrl.Host.c_str(), 10, haddr, hname); | |
| int i = 0; | |
| for (; i < naddr; i++ ) { | |
| @@ -1223,7 +1223,7 @@ XrdSecProtocol *XrdProofConn::Authenticate(char *plist, int plsiz) | |
| // for the authentication. | |
| struct sockaddr_in netaddr; | |
| char **hosterrmsg = 0; | |
| - if (XrdNetDNS::getHostAddr((char *)fUrl.HostAddr.c_str(), | |
| + if (XrdSysDNS::getHostAddr((char *)fUrl.HostAddr.c_str(), | |
| (struct sockaddr &)netaddr, hosterrmsg) <= 0) { | |
| TRACE(XERR, "getHostAddr: "<< *hosterrmsg); | |
| return protocol; | |
| diff --git proof/proofd/src/XrdProofPhyConn.cxx proof/proofd/src/XrdProofPhyConn.cxx | |
| index a7eb3d1..4e10e29 100644 | |
| --- proof/proofd/src/XrdProofPhyConn.cxx | |
| +++ proof/proofd/src/XrdProofPhyConn.cxx | |
| @@ -27,7 +27,7 @@ | |
| #include "XrdClient/XrdClientConst.hh" | |
| #include "XrdClient/XrdClientLogConnection.hh" | |
| #include "XrdClient/XrdClientMessage.hh" | |
| -#include "XrdNet/XrdNetDNS.hh" | |
| +#include "XrdSys/XrdSysDNS.hh" | |
| #include "XrdSec/XrdSecInterface.hh" | |
| #ifndef WIN32 | |
| @@ -91,7 +91,7 @@ bool XrdProofPhyConn::Init(const char *url) | |
| // Host and Port | |
| if (!fTcp) { | |
| - fHost = XrdNetDNS::getHostName(((fUrl.Host.length() > 0) ? | |
| + fHost = XrdSysDNS::getHostName(((fUrl.Host.length() > 0) ? | |
| fUrl.Host.c_str() : "localhost")); | |
| fPort = -1; | |
| fUrl.Host = ""; | |
| diff --git proof/proofd/src/XrdProofWorker.cxx proof/proofd/src/XrdProofWorker.cxx | |
| index 7bef053..ca37b8f 100644 | |
| --- proof/proofd/src/XrdProofWorker.cxx | |
| +++ proof/proofd/src/XrdProofWorker.cxx | |
| @@ -27,7 +27,7 @@ | |
| #include "XrdProofWorker.h" | |
| #include "XrdProofdProofServ.h" | |
| #include "XrdClient/XrdClientUrlInfo.hh" | |
| -#include "XrdNet/XrdNetDNS.hh" | |
| +#include "XrdSys/XrdSysDNS.hh" | |
| #include "XProofProtocol.h" | |
| // Tracing utilities | |
| @@ -99,7 +99,7 @@ void XrdProofWorker::Reset(const char *str) | |
| // Take the user name, if specified | |
| fUser = ui.User; | |
| char *err; | |
| - char *fullHostName = XrdNetDNS::getHostName((char *)ui.Host.c_str(), &err); | |
| + char *fullHostName = XrdSysDNS::getHostName((char *)ui.Host.c_str(), &err); | |
| if (!fullHostName || !strcmp(fullHostName, "0.0.0.0")) { | |
| TRACE(XERR, "DNS could not resolve '" << ui.Host << "'"); | |
| return; | |
| diff --git proof/proofd/src/XrdProofdConfig.cxx proof/proofd/src/XrdProofdConfig.cxx | |
| index 1d99a3d..f6425fb 100644 | |
| --- proof/proofd/src/XrdProofdConfig.cxx | |
| +++ proof/proofd/src/XrdProofdConfig.cxx | |
| @@ -28,7 +28,7 @@ | |
| # include "XrdSys/XrdSysError.hh" | |
| # include "XrdSys/XrdSysLogger.hh" | |
| #endif | |
| -#include "XrdNet/XrdNetDNS.hh" | |
| +#include "XrdSys/XrdSysDNS.hh" | |
| #include "XrdOuc/XrdOucEnv.hh" | |
| #include "XrdOuc/XrdOucStream.hh" | |
| #include "XrdOuc/XrdOucString.hh" | |
| @@ -115,7 +115,7 @@ int XrdProofdConfig::ParseFile(bool rcf) | |
| // Local FQDN | |
| if (fgHost.length() <= 0) { | |
| - char *host = XrdNetDNS::getHostName(); | |
| + char *host = XrdSysDNS::getHostName(); | |
| fgHost = host ? host : ""; | |
| SafeFree(host); | |
| } | |
| diff --git proof/proofd/src/XrdProofdManager.cxx proof/proofd/src/XrdProofdManager.cxx | |
| index 028700d..d21a17f 100644 | |
| --- proof/proofd/src/XrdProofdManager.cxx | |
| +++ proof/proofd/src/XrdProofdManager.cxx | |
| @@ -32,7 +32,7 @@ | |
| # include "XrdSys/XrdSysPlugin.hh" | |
| # include "XrdSys/XrdSysTimer.hh" | |
| #endif | |
| -#include "XrdNet/XrdNetDNS.hh" | |
| +#include "XrdSys/XrdSysDNS.hh" | |
| #include "XrdOuc/XrdOucEnv.hh" | |
| #include "XrdOuc/XrdOucStream.hh" | |
| #include "XrdSys/XrdSysPriv.hh" | |
| @@ -653,7 +653,7 @@ int XrdProofdManager::Config(bool rcf) | |
| } | |
| // Local FQDN | |
| - char *host = XrdNetDNS::getHostName(); | |
| + char *host = XrdSysDNS::getHostName(); | |
| fHost = host ? host : ""; | |
| SafeFree(host); | |
| diff --git proof/proofd/src/XrdProofdNetMgr.cxx proof/proofd/src/XrdProofdNetMgr.cxx | |
| index 4443789..bc896d0 100644 | |
| --- proof/proofd/src/XrdProofdNetMgr.cxx | |
| +++ proof/proofd/src/XrdProofdNetMgr.cxx | |
| @@ -27,7 +27,7 @@ | |
| #include "XrdClient/XrdClientEnv.hh" | |
| #include "XrdClient/XrdClientMessage.hh" | |
| #include "XrdClient/XrdClientUrlInfo.hh" | |
| -#include "XrdNet/XrdNetDNS.hh" | |
| +#include "XrdSys/XrdSysDNS.hh" | |
| #include "XrdOuc/XrdOucStream.hh" | |
| #include "XrdSys/XrdSysPlatform.hh" | |
| @@ -77,7 +77,7 @@ XrdProofdNetMgr::XrdProofdNetMgr(XrdProofdManager *mgr, | |
| fRequestTO = 30; | |
| fBonjourEnabled = false; | |
| #if defined(BUILD_BONJOUR) | |
| - char *host = XrdNetDNS::getHostName(); | |
| + char *host = XrdSysDNS::getHostName(); | |
| fBonjourName = host ? host : ""; | |
| SafeFree(host); | |
| fBonjourCores = XrdProofdAux::GetNumCPUs(); | |
| @@ -1042,7 +1042,7 @@ bool XrdProofdNetMgr::IsLocal(const char *host, bool checkport) | |
| XrdClientUrlInfo uu(host); | |
| if (uu.Port <= 0) uu.Port = 1093; | |
| // Fully qualified name | |
| - char *fqn = XrdNetDNS::getHostName(uu.Host.c_str()); | |
| + char *fqn = XrdSysDNS::getHostName(uu.Host.c_str()); | |
| if (fqn && (strstr(fqn, "localhost") || !strcmp(fqn, "127.0.0.1") || | |
| !strcmp(fMgr->Host(), fqn))) { | |
| if (!checkport || (uu.Port == fMgr->Port())) | |
| diff --git proof/proofd/src/XrdProofdProofServMgr.cxx proof/proofd/src/XrdProofdProofServMgr.cxx | |
| index ceb0016..5b052d0 100644 | |
| --- proof/proofd/src/XrdProofdProofServMgr.cxx | |
| +++ proof/proofd/src/XrdProofdProofServMgr.cxx | |
| @@ -32,7 +32,7 @@ | |
| #include "Xrd/XrdPoll.hh" | |
| #include "Xrd/XrdScheduler.hh" | |
| #include "XrdNet/XrdNet.hh" | |
| -#include "XrdNet/XrdNetDNS.hh" | |
| +#include "XrdSys/XrdSysDNS.hh" | |
| #include "XrdNet/XrdNetPeer.hh" | |
| #include "XrdOuc/XrdOucRash.hh" | |
| #include "XrdOuc/XrdOucStream.hh" | |
| @@ -2414,7 +2414,7 @@ int XrdProofdProofServMgr::SetupProtocol(XrdNetPeer &peerpsrv, | |
| // Make sure we have the full host name | |
| if (peerpsrv.InetName) { | |
| char *ptmp = peerpsrv.InetName; | |
| - peerpsrv.InetName = XrdNetDNS::getHostName("localhost"); | |
| + peerpsrv.InetName = XrdSysDNS::getHostName("localhost"); | |
| free(ptmp); | |
| } | |
| diff --git proof/proofd/src/XrdProofdProtocol.cxx proof/proofd/src/XrdProofdProtocol.cxx | |
| index 6a60fe7..a8901cc 100644 | |
| --- proof/proofd/src/XrdProofdProtocol.cxx | |
| +++ proof/proofd/src/XrdProofdProtocol.cxx | |
| @@ -33,7 +33,7 @@ | |
| #include "XrdVersion.hh" | |
| #include "Xrd/XrdBuffer.hh" | |
| -#include "XrdNet/XrdNetDNS.hh" | |
| +#include "XrdSys/XrdSysDNS.hh" | |
| #include "XrdProofdClient.h" | |
| #include "XrdProofdClientMgr.h" | |
| diff --git proof/proofx/Module.mk proof/proofx/Module.mk | |
| index 08f638d..f151b10 100644 | |
| --- proof/proofx/Module.mk | |
| +++ proof/proofx/Module.mk | |
| @@ -66,7 +66,7 @@ PROOFXINCEXTRA += $(PROOFDDIRI:%=-I%) | |
| ifeq ($(PLATFORM),win32) | |
| PROOFXLIBEXTRA += $(XROOTDDIRL)/libXrdClient.lib | |
| else | |
| -PROOFXLIBEXTRA += -L$(XROOTDDIRL) -lXrdOuc -lXrdSys -lXrdNet -lXrdClient | |
| +PROOFXLIBEXTRA += -L$(XROOTDDIRL) -lXrdClient | |
| # Starting from Jul 2010 XrdNet has been split in two libs: XrdNet and XrdNetUtil; | |
| # both are needed | |
| XRDNETUTIL := | |
| @@ -76,7 +76,7 @@ XRDNETUTIL := $(shell if test $(XRDVERSION) -gt 20100729; then \ | |
| fi) | |
| endif | |
| ifeq ($(XRDNETUTIL),yes) | |
| -PROOFXLIBEXTRA += -lXrdNetUtil | |
| +PROOFXLIBEXTRA += | |
| endif | |
| endif | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment