diff -u root-system-5.18.00/xrootd/src/xrootd/src/XrdNet/XrdNetDNS.cc root-system-5.18.00/xrootd/src/xrootd/src/XrdNet/XrdNetDNS.cc --- root-system-5.18.00/xrootd/src/xrootd/src/XrdNet/XrdNetDNS.cc +++ root-system-5.18.00/xrootd/src/xrootd/src/XrdNet/XrdNetDNS.cc @@ -460,7 +460,7 @@ // Find the colon in the host name // - if (!(cp = index(hostname, (int)':'))) + if (!(cp = (char *) index(hostname, (int)':'))) {if (errtxt) *errtxt = (char *)"port not specified"; return 0; } diff -u root-system-5.18.00/debian/changelog root-system-5.18.00/debian/changelog --- root-system-5.18.00/debian/changelog +++ root-system-5.18.00/debian/changelog @@ -1,3 +1,25 @@ +root-system (5.18.00-2.3ubuntu2.1) karmic-proposed; urgency=low + + [ Evan Broder ] + * Rebuild to pick up new krb5 library dependencies (LP: #462059). + + [ Ilya Barygin ] + * Fix build issues: + - cint/src/Type.cxx: fix typos in #elif directives. Patch from BTS + #505015, thanks to Martin Michlmayr. + - krb5auth/src/Krb5Auth.cxx: valid_cksumtype() renamed to + krb5_c_valid_cksumtype(). Patch from BTS #529998, thanks to Jurij + Smakov. + - xrootd/src/xrootd/src/XrdNet/XrdNetDNS.cc: + xrootd/src/xrootd/src/XrdXrootd/XrdXrootdPrepare.cc: + add explicit casts to char* to fix invalid conversions. Backported + from upstream 2.24.00. + - xrootd/src/xrootd/src/XrdClient/XrdClientConn.hh: add missing + header. + - io/Module.mk: compile with -O as a workaround for gcc bug 40056. + + -- Ilya Barygin Sun, 08 Nov 2009 16:40:57 +0300 + root-system (5.18.00-2.3ubuntu2) jaunty; urgency=low * No-change rebuild to build with Python 2.6. only in patch2: unchanged: --- root-system-5.18.00.orig/cint/src/Type.cxx +++ root-system-5.18.00/cint/src/Type.cxx @@ -125,7 +125,7 @@ strcpy(G__buf, G__type2string((int)type,(int)tagnum,-1,(int)reftype,(int)isconst)); return(G__buf); -#elif !defind(G__OLDIMPLEMENTATION401) +#elif !defined(G__OLDIMPLEMENTATION401) return(G__type2string((int)type,(int)tagnum,-1,(int)reftype,(int)isconst)); #else return(G__type2string((int)type,(int)tagnum,-1,(int)reftype)); @@ -138,7 +138,7 @@ strcpy(G__buf,G__type2string((int)type,(int)tagnum,(int)typenum,(int)reftype ,(int)isconst)); return(G__buf); -#elif !defind(G__OLDIMPLEMENTATION401) +#elif !defined(G__OLDIMPLEMENTATION401) return(G__type2string((int)type,(int)tagnum,(int)typenum,(int)reftype ,(int)isconst)); #else only in patch2: unchanged: --- root-system-5.18.00.orig/io/Module.mk +++ root-system-5.18.00/io/Module.mk @@ -61,3 +61,8 @@ @rm -f $(IODEP) $(IODS) $(IODH) $(IOLIB) $(IOMAP) distclean:: distclean-io + +##### extra rules ###### +ifneq ($(filter -O%,$(OPT)),) + $(IODIRS)/TStreamerInfoReadBuffer.o: OPT = -O +endif only in patch2: unchanged: --- root-system-5.18.00.orig/xrootd/src/xrootd/src/XrdClient/XrdClientConn.hh +++ root-system-5.18.00/xrootd/src/xrootd/src/XrdClient/XrdClientConn.hh @@ -16,6 +16,7 @@ #ifndef XRD_CONN_H #define XRD_CONN_H +#include #include "XrdClient/XrdClientConst.hh" only in patch2: unchanged: --- root-system-5.18.00.orig/xrootd/src/xrootd/src/XrdXrootd/XrdXrootdPrepare.cc +++ root-system-5.18.00/xrootd/src/xrootd/src/XrdXrootd/XrdXrootdPrepare.cc @@ -98,7 +98,7 @@ // errno = 0; while((dp = readdir(pargs.dirP))) - {if (!(up = index((const char *)dp->d_name, '_'))) continue; + {if (!(up =(char *) index((const char *)dp->d_name, '_'))) continue; if (pargs.reqlen && strncmp(dp->d_name, pargs.reqid, pargs.reqlen)) continue; if (pargs.usrlen) @@ -108,9 +108,9 @@ strcpy(path+LogDirLen, (const char *)dp->d_name); if (stat((const char *)path, &buf)) continue; *up = ' '; - if ((up = index((const char *)(up+1), (int)'_'))) *up = ' '; + if ((up = (char *) index((const char *)(up+1), (int)'_'))) *up = ' '; else continue; - if ((up = index((const char *)(up+1), (int)'_'))) *up = ' '; + if ((up = (char *) index((const char *)(up+1), (int)'_'))) *up = ' '; else continue; return snprintf(resp, resplen-1, "%s %ld", dp->d_name, buf.st_mtime); } @@ -279,7 +279,7 @@ // errno = 0; while((dp = readdir(prepD))) - {if (!(up = index((const char *)dp->d_name, '_'))) continue; + {if (!(up = (char *) index((const char *)dp->d_name, '_'))) continue; strcpy(fn, (const char *)dp->d_name); if (stat((const char *)path, &buf)) continue; if (buf.st_mtime <= stale) only in patch2: unchanged: --- root-system-5.18.00.orig/krb5auth/src/Krb5Auth.cxx +++ root-system-5.18.00/krb5auth/src/Krb5Auth.cxx @@ -421,8 +421,8 @@ cleanup.fSignal = kFALSE; // test for CRC-32 - if (!valid_cksumtype(CKSUMTYPE_CRC32)) { - Error("Krb5Authenticate","failed : %s\n", + if (!krb5_c_valid_cksumtype(CKSUMTYPE_CRC32)) { + Error("Krb5Authenticate","failed : %s\n", error_message(KRB5_PROG_SUMTYPE_NOSUPP)); return 0; }