Hello community, here is the log from the commit of package kdelibs3 checked in at Tue Mar 28 17:01:12 CEST 2006. -------- --- /work/SRC/all/KDE/kdelibs3/kdelibs3.changes 2006-03-28 10:37:20.000000000 +0200 +++ /work/src/done/STABLE/kdelibs3/kdelibs3.changes 2006-03-28 16:49:30.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Mar 28 16:49:08 CEST 2006 - dmueller@suse.de + +- fix xauth being garbled during hostname changes (#147691) +- fix tar extraction error for certain archives (#161312) + +------------------------------------------------------------------- +Tue Mar 28 16:44:52 CEST 2006 - ro@suse.de + +- kdelibs3-devel req: replace mDNSResponder by mDNSResponder-devel + +------------------------------------------------------------------- New: ---- 3_5_BRANCH-r521012.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.91uQ8s/_old 2006-03-28 17:00:10.000000000 +0200 +++ /var/tmp/diff_new_pack.91uQ8s/_new 2006-03-28 17:00:10.000000000 +0200 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation Version: 3.5.1 -Release: 35 +Release: 36 %define kdelibs_patch_level b BuildArch: noarch Requires: kdelibs3 qt3-devel-doc ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.91uQ8s/_old 2006-03-28 17:00:10.000000000 +0200 +++ /var/tmp/diff_new_pack.91uQ8s/_new 2006-03-28 17:00:10.000000000 +0200 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE Base Libraries Version: 3.5.1 -Release: 35 +Release: 36 %define kdelibs_patch_level a Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons Provides: kups keramik kdelibs3-cups kdelibs3-33addons @@ -96,6 +96,7 @@ Patch99: 3_5_BRANCH-r523122.diff Patch100: kmessagebox-with-kinstance.diff Patch101: kdesu-lc_all.diff +Patch102: 3_5_BRANCH-r521012.diff %description This package contains kdelibs, one of the basic packages of the K @@ -159,7 +160,7 @@ %endif Requires: libattr-devel libacl-devel %if %suse_version > 920 -Requires: mDNSResponder +Requires: mDNSResponder-devel %endif %if %suse_version > 930 Requires: kdelibs3-arts @@ -258,6 +259,7 @@ %patch99 %patch100 %patch101 +%patch102 # # define KDE version exactly # @@ -737,6 +739,11 @@ /opt/kde3/%_lib/libkwalletclient.so %changelog -n kdelibs3 +* Tue Mar 28 2006 - dmueller@suse.de +- fix xauth being garbled during hostname changes (#147691) +- fix tar extraction error for certain archives (#161312) +* Tue Mar 28 2006 - ro@suse.de +- kdelibs3-devel req: replace mDNSResponder by mDNSResponder-devel * Tue Mar 28 2006 - stbinner@suse.de - fix kdesu maybe not working with non-C locale (#152077) * Tue Mar 28 2006 - ro@suse.de ++++++ testkhtml.spec ++++++ --- /var/tmp/diff_new_pack.91uQ8s/_old 2006-03-28 17:00:10.000000000 +0200 +++ /var/tmp/diff_new_pack.91uQ8s/_new 2006-03-28 17:00:10.000000000 +0200 @@ -16,7 +16,7 @@ License: Other License(s), see package, BSD Group: System/GUI/KDE Version: 3.5.1 -Release: 35 +Release: 36 Summary: Internal: regression testing for konqueror renderer BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: kdelibs-%{version}.tar.bz2 ++++++ 3_5_BRANCH-r521012.diff ++++++ ------------------------------------------------------------------------ r521012 | pley | 2006-03-21 15:11:33 +0100 (Tue, 21 Mar 2006) | 3 lines When compressed file had size % 8192 == 0, fillTempFile returned an error. ------------------------------------------------------------------------ Index: kio/kio/ktar.cpp =================================================================== --- kio/kio/ktar.cpp (revision 521011) +++ kio/kio/ktar.cpp (revision 521012) @@ -301,10 +301,10 @@ bool KTar::KTarPrivate::fillTempFile( co delete filterDev; return false; } - Q_LONG len; - while ( !filterDev->atEnd() ) { + Q_LONG len = -1; + while ( !filterDev->atEnd() && len != 0) { len = filterDev->readBlock(buffer.data(),buffer.size()); - if ( len <= 0 ) { // corrupted archive + if ( len < 0 ) { // corrupted archive delete filterDev; return false; } ++++++ use-xauthlocalhostname.diff ++++++ --- /var/tmp/diff_new_pack.91uQ8s/_old 2006-03-28 17:00:12.000000000 +0200 +++ /var/tmp/diff_new_pack.91uQ8s/_new 2006-03-28 17:00:12.000000000 +0200 @@ -133,3 +133,92 @@ { fName += "localhost"; } +Index: dcop/KDE-ICE/Xtranssock.c +=================================================================== +--- dcop/KDE-ICE/Xtranssock.c (revision 523215) ++++ dcop/KDE-ICE/Xtranssock.c (working copy) +@@ -1444,6 +1444,7 @@ UnixHostReallyLocal (char *host) + + { + char hostnamebuf[256]; ++ char* xauthlocalname = getenv("XAUTHLOCALHOSTNAME"); + + TRANS(GetHostname) (hostnamebuf, sizeof (hostnamebuf)); + +@@ -1451,6 +1452,10 @@ UnixHostReallyLocal (char *host) + { + return (1); + } ++ else if(xauthlocalname && strcmp (xauthlocalname, host) == 0) ++ { ++ return (1); ++ } + else + { + /* +--- kded/khostname.cpp (revision 523215) ++++ kded/khostname.cpp (working copy) +@@ -111,7 +111,8 @@ static QCStringList split(const QCString + + void KHostName::changeX() + { +- QString cmd = "xauth list"; ++ const char* xauthlocalhostname = getenv("XAUTHLOCALHOSTNAME"); ++ QString cmd = "xauth -n list"; + FILE *xFile = popen(QFile::encodeName(cmd), "r"); + if (!xFile) + { +@@ -123,6 +124,7 @@ void KHostName::changeX() + char buf[1024+1]; + while (!feof(xFile)) + { ++ buf[1024]='\0'; + QCString line = fgets(buf, 1024, xFile); + if (line.length()) + line.truncate(line.length()-1); // Strip LF. +@@ -155,10 +157,19 @@ void KHostName::changeX() + continue; + + QCString newNetId = newName+netId.mid(i); ++ QCString oldNetId = netId.left(i); + +- cmd = "xauth remove "+KProcess::quote(netId); +- system(QFile::encodeName(cmd)); +- cmd = "xauth add "; ++ if(oldNetId != oldName ++ && (!xauthlocalhostname || strcmp(xauthlocalhostname, oldNetId.data()) != 0)) ++ continue; ++ ++ // don't nuke the xauth when XAUTHLOCALHOSTNAME points to it ++ if (!xauthlocalhostname || oldNetId != xauthlocalhostname) ++ { ++ cmd = "xauth -n remove "+KProcess::quote(netId); ++ system(QFile::encodeName(cmd)); ++ } ++ cmd = "xauth -n add "; + cmd += KProcess::quote(newNetId); + cmd += " "; + cmd += KProcess::quote(authName); +@@ -272,7 +283,10 @@ void KHostName::changeDcop() + } + } + +- // Remove old entries ++ // Remove old entries, but only if XAUTHLOCALHOSTNAME doesn't point ++ // to it ++ char* xauthlocalhostname = getenv("XAUTHLOCALHOSTNAME"); ++ if (!xauthlocalhostname || !oldNetId.contains(xauthlocalhostname)) + { + QString cmd = "iceauth remove "+KProcess::quote("netid="+oldNetId); + system(QFile::encodeName(cmd)); +@@ -364,9 +378,7 @@ int main(int argc, char **argv) + + KHostName hn; + +- if(!getenv("XAUTHLOCALHOSTNAME")) +- hn.changeX(); +- ++ hn.changeX(); + hn.changeDcop(); + hn.changeStdDirs("socket"); + hn.changeStdDirs("tmp"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...