Hello community, here is the log from the commit of package kdelibs3 checked in at Thu Nov 23 16:54:22 CET 2006. -------- --- KDE/kdelibs3/kdelibs3.changes 2006-11-22 20:53:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdelibs3/kdelibs3.changes 2006-11-23 16:03:25.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 23 16:01:43 CET 2006 - dmueller@suse.de + +- fix cups only accepting localhost as ipp:// hostname (#222938) +- fix samba sharing dialog accessible even though samba not running + (#159223) + +------------------------------------------------------------------- New: ---- cups-only-accepts-localhost-ipp.diff disable-samba-dialog-without-smb.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.WmSADX/_old 2006-11-23 16:51:33.000000000 +0100 +++ /var/tmp/diff_new_pack.WmSADX/_new 2006-11-23 16:51:33.000000000 +0100 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation Version: 3.5.5 -Release: 40 +Release: 41 %define kdelibs_patch_level b BuildArch: noarch Requires: kdelibs3 qt3-devel-doc ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.WmSADX/_old 2006-11-23 16:51:33.000000000 +0100 +++ /var/tmp/diff_new_pack.WmSADX/_new 2006-11-23 16:51:33.000000000 +0100 @@ -21,7 +21,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE Base Libraries Version: 3.5.5 -Release: 40 +Release: 41 Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons Provides: kups keramik kdelibs3-cups kdelibs3-33addons Provides: kdelibs3_base = 3.3 @@ -108,6 +108,8 @@ Patch118: fix-kjs-crash-regression.diff Patch119: 3_5_BRANCH_606489.diff Patch120: kdesu_stub.diff +Patch121: cups-only-accepts-localhost-ipp.diff +Patch122: disable-samba-dialog-without-smb.diff %description This package contains kdelibs, one of the basic packages of the K @@ -282,6 +284,8 @@ %patch118 %patch119 %patch120 +%patch121 +%patch122 tar xfvj %SOURCE12 # # define KDE version exactly @@ -754,6 +758,10 @@ /opt/kde3/%_lib/libkwalletclient.so %changelog -n kdelibs3 +* Thu Nov 23 2006 - dmueller@suse.de +- fix cups only accepting localhost as ipp:// hostname (#222938) +- fix samba sharing dialog accessible even though samba not running + (#159223) * Wed Nov 22 2006 - stbinner@suse.de - fix kdesu resets locale (#222728) * Mon Nov 20 2006 - dmueller@suse.de ++++++ testkhtml.spec ++++++ --- /var/tmp/diff_new_pack.WmSADX/_old 2006-11-23 16:51:33.000000000 +0100 +++ /var/tmp/diff_new_pack.WmSADX/_new 2006-11-23 16:51:33.000000000 +0100 @@ -16,7 +16,7 @@ License: BSD License and BSD-like, Other License(s), see package Group: System/GUI/KDE Version: 3.5.5 -Release: 42 +Release: 43 Summary: Internal: regression testing for konqueror renderer BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: kdelibs-%{version}.tar.bz2 ++++++ cups-only-accepts-localhost-ipp.diff ++++++ --- kdeprint/cups/kmwfax.cpp +++ kdeprint/cups/kmwfax.cpp @@ -48,7 +48,7 @@ // initialize IppRequest req; req.setOperation(CUPS_GET_DEVICES); - QString uri = QString::fromLatin1("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); + QString uri = QString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); if (req.doRequest("/")) { --- kdeprint/cups/cupsinfos.cpp +++ kdeprint/cups/cupsinfos.cpp @@ -73,7 +73,7 @@ { if (host_[0] != '/') return host_ + ":" + QString::number(port_); - return host_; + return "localhost"; } void CupsInfos::setHost(const QString& s) --- kdeprint/cups/kmcupsjobmanager.cpp +++ kdeprint/cups/kmcupsjobmanager.cpp @@ -92,7 +92,9 @@ case KMJob::Move: if (argstr.isEmpty()) return false; req.setOperation(CUPS_MOVE_JOB); - uri = QString::fromLatin1("ipp://%1:%2/printers/%3").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()).arg(argstr); + uri = + QString::fromLatin1("ipp://%1/printers/%2").arg(CupsInfos::self()->hostaddr(), + argstr); req.addURI(IPP_TAG_OPERATION, "job-printer-uri", uri); break; default: @@ -109,7 +111,6 @@ bool KMCupsJobManager::listJobs(const QString& prname, KMJobManager::JobType type, int limit) { IppRequest req; - QString uri("ipp://%1:%2/%3/%4"); QStringList keys; CupsInfos *infos = CupsInfos::self(); @@ -143,7 +144,8 @@ */ } else - req.addURI(IPP_TAG_OPERATION, "printer-uri", uri.arg(infos->host()).arg(infos->port()).arg(((mp&&mp->isClass())?"classes":"printers")).arg(prname)); + req.addURI(IPP_TAG_OPERATION, "printer-uri", QString("ipp://%1/%2/%3").arg(infos->hostaddr(), + (mp&&mp->isClass())?"classes":"printers", prname)); // other attributes req.addKeyword(IPP_TAG_OPERATION, "requested-attributes", keys); --- kdeprint/cups/kmwippselect.cpp +++ kdeprint/cups/kmwippselect.cpp @@ -75,7 +75,7 @@ IppRequest req; QString uri; req.setOperation(CUPS_GET_PRINTERS); - uri = QString::fromLatin1("ipp://%1:%2/printers/").arg(url.host()).arg(url.port()); + uri = QString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",QString::fromLatin1("printer-name")); if (req.doRequest("/printers/")) --- kdeprint/cups/kmcupsmanager.cpp +++ kdeprint/cups/kmcupsmanager.cpp @@ -60,9 +60,9 @@ #define ppdi18n(s) i18n(QString::fromLocal8Bit(s).utf8()) -void extractMaticData(QString& buf, const QString& filename); -QString printerURI(KMPrinter *p, bool useExistingURI = false); -QString downloadDriver(KMPrinter *p); +static void extractMaticData(QString& buf, const QString& filename); +static QString printerURI(KMPrinter *p, bool useExistingURI = false); +static QString downloadDriver(KMPrinter *p); static int trials = 5; @@ -912,7 +912,9 @@ { return QString("%1: %2") .arg(i18n("Server")) - .arg(CupsInfos::self()->hostaddr()); + .arg(CupsInfos::self()->host()[0] != '/' ? + QString("%1:%2").arg(CupsInfos::self()->host(), CupsInfos::self()->port()) + : CupsInfos::self()->host()); } void KMCupsManager::checkUpdatePossibleInternal() @@ -1012,7 +1014,7 @@ //***************************************************************************************************** -void extractMaticData(QString& buf, const QString& filename) +static void extractMaticData(QString& buf, const QString& filename) { QFile f(filename); if (f.exists() && f.open(IO_ReadOnly)) @@ -1028,7 +1030,7 @@ } } -QString printerURI(KMPrinter *p, bool use) +static QString printerURI(KMPrinter *p, bool use) { QString uri; if (use && !p->uri().isEmpty()) @@ -1038,7 +1040,7 @@ return uri; } -QString downloadDriver(KMPrinter *p) +static QString downloadDriver(KMPrinter *p) { QString driverfile, prname = p->printerName(); bool changed(false); ++++++ disable-samba-dialog-without-smb.diff ++++++ --- kio/kio/kfileshare.cpp.sav 2005-09-29 21:31:30.000000000 +0200 +++ kio/kio/kfileshare.cpp 2006-11-15 20:47:51.000000000 +0100 @@ -291,4 +291,24 @@ bool KFileShare::setShared( const QStrin return ok; } +bool KFileShare::sambaActive() +{ + // rcsmb is not executable by users, try ourselves + int status = system( "/sbin/checkproc -p /var/run/samba/smbd.pid /usr/sbin/smbd" ); + return status != -1 && WIFEXITED( status ) && WEXITSTATUS( status ) == 0; +} + +bool KFileShare::nfsActive() +{ + // rcnfsserver is not executable by users, try ourselves + int status = system( "/sbin/checkproc /usr/sbin/rpc.mountd" ); + if( status != -1 && WIFEXITED( status ) && WEXITSTATUS( status ) == 0 ) + { + status = system( "/sbin/checkproc -n nfsd" ); + if( status != -1 && WIFEXITED( status ) && WEXITSTATUS( status ) == 0 ) + return true; + } + return false; +} + #include "kfileshare.moc" --- kio/kio/kfileshare.h.sav 2005-09-29 21:31:29.000000000 +0200 +++ kio/kio/kfileshare.h 2006-11-15 21:18:57.000000000 +0100 @@ -131,6 +131,18 @@ public: * Returns whether NFS is enabled */ static bool nfsEnabled(); + + /** + * Returns whether Samba is active (service is running) + * @internal + */ + static bool sambaActive(); + + /** + * Returns whether NFS is active (service is running) + * @internal + */ + static bool nfsActive(); private: static Authorization s_authorization; --- kio/kfile/kfilesharedlg.cpp.sav 2005-09-29 21:31:31.000000000 +0200 +++ kio/kfile/kfilesharedlg.cpp 2006-11-15 21:16:04.000000000 +0100 @@ -167,6 +167,9 @@ void KFileSharePropsPlugin::init() vbox->addWidget( m_pbConfig, 0, Qt::AlignHCenter ); vbox->addStretch( 10 ); + + if( !KFileShare::sambaActive() && !KFileShare::nfsActive()) + m_widget->setEnabled( false ); } } break; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org