Hello community,
here is the log from the commit of package smb4k for openSUSE:Factory checked
in at 2012-03-26 11:07:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/smb4k (Old)
and /work/SRC/openSUSE:Factory/.smb4k.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smb4k", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/smb4k/smb4k.changes 2012-03-22
12:41:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.smb4k.new/smb4k.changes 2012-03-26
11:07:58.000000000 +0200
@@ -1,0 +2,10 @@
+Sun Mar 25 12:54:13 UTC 2012 - asterios.dra...@gmail.com
+
+- Update to version 1.0.1:
+ * Fixed potential crash in Smb4KWalletManager::init().
+ * Fixed KDEInit complaining when Smb4K is started from a desktop icon (closes
+ SF ticket #23).
+ * Fixed periodic scanning.
+- Removed enscript and texlive from recommended programs (not needed anymore).
+
+-------------------------------------------------------------------
Old:
----
smb4k-1.0.0.tar.bz2
New:
----
smb4k-1.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ smb4k.spec ++++++
--- /var/tmp/diff_new_pack.hm19db/_old 2012-03-26 11:08:01.000000000 +0200
+++ /var/tmp/diff_new_pack.hm19db/_new 2012-03-26 11:08:01.000000000 +0200
@@ -17,7 +17,7 @@
Name: smb4k
-Version: 1.0.0
+Version: 1.0.1
Release: 0
Summary: Advanced Network Neighborhood Browser for KDE
License: GPL-2.0+
@@ -31,9 +31,7 @@
Requires: samba-client
Recommends: %{name}-doc = %{version}
Recommends: %{name}-lang = %{version}
-Recommends: enscript
Recommends: rsync
-Recommends: texlive
# smb4k-devel was last used in openSUSE-11.4 (version 0.10.9)
Provides: smb4k-devel = %{version}
Obsoletes: smb4k-devel <= 0.10.9
@@ -58,10 +56,9 @@
This package provides the documentation for smb4k.
%lang_package
+
%prep
%setup -q
-# Fix po file name
-#mv po/pt/pt.po po/pt/smb4k.po
%build
%cmake_kde4 -d build
@@ -103,9 +100,9 @@
%{_kde4_libexecdir}/mounthelper
%{_kde4_libdir}/libsmb4ktooltips.so*
%{_kde4_modulesdir}/smb4k*.so
-/etc/dbus-1/system.d/de.berlios.smb4k.mounthelper.conf
-/usr/share/dbus-1/system-services/de.berlios.smb4k.mounthelper.service
-/usr/share/polkit-1/actions/de.berlios.smb4k.mounthelper.policy
+%config %{_sysconfdir}/dbus-1/system.d/de.berlios.smb4k.mounthelper.conf
+%{_datadir}/dbus-1/system-services/de.berlios.smb4k.mounthelper.service
+%{_datadir}/polkit-1/actions/de.berlios.smb4k.mounthelper.policy
%files lang -f %{name}.lang
%defattr(-,root,root,-)
++++++ smb4k-1.0.0.tar.bz2 -> smb4k-1.0.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smb4k-1.0.0/CMakeLists.txt
new/smb4k-1.0.1/CMakeLists.txt
--- old/smb4k-1.0.0/CMakeLists.txt 2012-02-04 09:51:12.000000000 +0100
+++ new/smb4k-1.0.1/CMakeLists.txt 2012-03-11 16:33:45.000000000 +0100
@@ -1,15 +1,17 @@
project( smb4k )
-set( VERSION 1.0.0 )
+set( VERSION 1.0.1 )
set( VERSION_MAJOR 1 )
set( VERSION_MINOR 0 )
-set( VERSION_PATCH 0 )
+set( VERSION_PATCH 1 )
cmake_minimum_required( VERSION 2.6 )
set( QT_MIN_VERSION 4.7.0 )
set( KDE_MIN_VERSION 4.4.0 )
find_package( KDE4 REQUIRED )
+find_package( Msgfmt REQUIRED )
+find_package( Gettext REQUIRED )
include(KDE4Defaults)
include(MacroLibrary)
@@ -36,6 +38,9 @@
add_subdirectory( helpers )
add_subdirectory( smb4k )
add_subdirectory( data )
+add_subdirectory( po )
+add_subdirectory( doc-translations )
+add_subdirectory( doc )
########### Header files ################
@@ -80,8 +85,3 @@
"^${PROJECT_SOURCE_DIR}/build/" )
include( CPack )
-find_package(Msgfmt REQUIRED)
-find_package(Gettext REQUIRED)
-add_subdirectory( po )
-add_subdirectory( doc-translations )
-add_subdirectory( doc )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smb4k-1.0.0/ChangeLog new/smb4k-1.0.1/ChangeLog
--- old/smb4k-1.0.0/ChangeLog 2012-02-04 09:49:35.000000000 +0100
+++ new/smb4k-1.0.1/ChangeLog 2012-03-11 16:33:45.000000000 +0100
@@ -1,3 +1,9 @@
+Smb4K 1.0.1 (2012-03-11):
+- Fixed potential crash in Smb4KWalletManager::init().
+- Fixed KDEInit complaining when Smb4K is started from a desktop icon
+ (closes SF ticket #23).
+- Fixed periodic scanning.
+
Smb4K 1.0.0 (2012-02-01):
- KDE SC 4.4.0 and Qt 4.7.0 or later are required.
- We now use Utf8 throughout the whole application (closes #14674 and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smb4k-1.0.0/Messages.sh new/smb4k-1.0.1/Messages.sh
--- old/smb4k-1.0.0/Messages.sh 2012-02-04 09:49:35.000000000 +0100
+++ new/smb4k-1.0.1/Messages.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-#!/bin/bash
-$EXTRACTRC `find . -name \*.kcfg -o -name \*.rc` >> ./rc.cpp
-$XGETTEXT `find . -name \*.cpp` -o $podir/smb4k.pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smb4k-1.0.0/core/smb4kscanner.cpp
new/smb4k-1.0.1/core/smb4kscanner.cpp
--- old/smb4k-1.0.0/core/smb4kscanner.cpp 2012-02-04 09:49:35.000000000
+0100
+++ new/smb4k-1.0.1/core/smb4kscanner.cpp 2012-03-11 16:33:45.000000000
+0100
@@ -686,7 +686,7 @@
{
if ( m_periodic_jobs.isEmpty() )
{
- // This case occurs when the user enables periodic scanning during
+ // This case occurs when the user enables periodic scanning during
// runtime. We need to fill the list of periodic jobs here, so that
// we can immediately start periodic scanning.
m_periodic_jobs << LookupDomains;
@@ -695,11 +695,11 @@
}
else
{
- // This is the regular case. We do not need to do anything.
+ // This is the regular case. We do not need to do anything.
}
-
+
Process p = m_periodic_jobs.takeFirst();
-
+
switch ( p )
{
case LookupDomains:
@@ -718,9 +718,9 @@
{
if ( m_interval >= (Smb4KSettings::scanInterval() * 60000 /*
milliseconds */) )
{
- // Reset interval
- m_interval = 0;
-
+ // Reset interval. Since the check above
+ m_interval = -TIMER_INTERVAL;
+
// Fill list
m_periodic_jobs << LookupDomains;
m_periodic_jobs << LookupDomainMembers;
@@ -733,7 +733,7 @@
if ( !m_periodic_jobs.isEmpty() && m_scanning_allowed )
{
Process p = m_periodic_jobs.takeFirst();
-
+
switch ( p )
{
case LookupDomainMembers:
@@ -766,7 +766,7 @@
}
}
}
-
+
m_interval += TIMER_INTERVAL;
}
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smb4k-1.0.0/core/smb4kscanner_p.cpp
new/smb4k-1.0.1/core/smb4kscanner_p.cpp
--- old/smb4k-1.0.0/core/smb4kscanner_p.cpp 2012-02-04 09:49:35.000000000
+0100
+++ new/smb4k-1.0.1/core/smb4kscanner_p.cpp 2012-03-11 16:33:45.000000000
+0100
@@ -701,12 +701,13 @@
}
// User name and password if needed
- if ( Smb4KSettings::masterBrowsersRequireAuth() )
+ if ( Smb4KSettings::masterBrowsersRequireAuth() && !host.login().isEmpty() )
{
arguments << QString( "-U %1%" ).arg( host.login() );
}
else
{
+ // Do *not* change this to "-U guest%". This won't work.
arguments << "-U %";
}
@@ -765,12 +766,13 @@
}
// User name and password if needed
- if ( Smb4KSettings::masterBrowsersRequireAuth() )
+ if ( Smb4KSettings::masterBrowsersRequireAuth() && !host.login().isEmpty() )
{
arguments << QString( "-U %1%" ).arg( host.login() );
}
else
{
+ // Do *not* change this to "-U guest%". This won't work.
arguments << "-U %";
}
@@ -795,13 +797,13 @@
m_proc->setOutputChannelMode( KProcess::SeparateChannels );
m_proc->setShellCommand( arguments.join( " " ) );
- if ( Smb4KSettings::masterBrowsersRequireAuth() )
+ if ( Smb4KSettings::masterBrowsersRequireAuth() &&
!host.password().isEmpty() )
{
- m_proc->setEnv( "PASSWD", host.password() );
+ m_proc->setEnv( "PASSWD", host.password(), true );
}
else
{
- // Do nothing
+ m_proc->unsetEnv( "PASSWD" );
}
connect( m_proc, SIGNAL( readyReadStandardError() ), this, SLOT(
slotReadStandardError() ) );
@@ -1619,20 +1621,13 @@
arguments << QString( "-S %1" ).arg( KShell::quoteArg(
m_workgroup.masterBrowserName() ) );
// Authentication, if needed
- if ( Smb4KSettings::masterBrowsersRequireAuth() )
+ if ( Smb4KSettings::masterBrowsersRequireAuth() &&
!m_master_browser.login().isEmpty() )
{
- if ( !m_master_browser.login().isEmpty() )
- {
- arguments << QString( "-U %1" ).arg( m_master_browser.login() );
- // Password will be set below.
- }
- else
- {
- arguments << "-U %";
- }
+ arguments << QString( "-U %1" ).arg( m_master_browser.login() );
}
else
{
+ // Do *not* change this to "-U guest%". This won't work.
arguments << "-U %";
}
@@ -1640,13 +1635,13 @@
m_proc->setShellCommand( arguments.join( " " ) );
m_proc->setOutputChannelMode( KProcess::SeparateChannels );
- if ( Smb4KSettings::self()->masterBrowsersRequireAuth() )
+ if ( Smb4KSettings::self()->masterBrowsersRequireAuth() &&
!m_master_browser.password().isEmpty() )
{
m_proc->setEnv( "PASSWD", m_master_browser.password(), true );
}
else
{
- // Do nothing
+ m_proc->unsetEnv( "PASSWD" );
}
connect( m_proc, SIGNAL( readyReadStandardError() ), SLOT(
slotReadStandardError() ) );
@@ -2075,7 +2070,7 @@
}
// Authentication data
- if ( !m_host.login().isEmpty() )
+ if ( !m_host.login().isEmpty() && !m_host.login().isEmpty() )
{
arguments << QString( "-U %1" ).arg( m_host.login() );
}
@@ -2090,7 +2085,15 @@
m_proc = new Smb4KProcess( this );
m_proc->setOutputChannelMode( KProcess::SeparateChannels );
m_proc->setShellCommand( arguments.join( " " ) );
- m_proc->setEnv( "PASSWD", m_host.password(), true );
+
+ if ( !m_host.password().isEmpty() )
+ {
+ m_proc->setEnv( "PASSWD", m_host.password(), true );
+ }
+ else
+ {
+ m_proc->unsetEnv( "PASSWD" );
+ }
connect( m_proc, SIGNAL( readyReadStandardError() ), this, SLOT(
slotReadStandardError() ) );
connect( m_proc, SIGNAL( finished( int, QProcess::ExitStatus ) ), this,
SLOT( slotProcessFinished( int, QProcess::ExitStatus ) ) );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smb4k-1.0.0/core/smb4kwalletmanager.cpp
new/smb4k-1.0.1/core/smb4kwalletmanager.cpp
--- old/smb4k-1.0.0/core/smb4kwalletmanager.cpp 2012-02-04 09:49:35.000000000
+0100
+++ new/smb4k-1.0.1/core/smb4kwalletmanager.cpp 2012-03-11 16:33:45.000000000
+0100
@@ -110,7 +110,7 @@
}
m_wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(),
- parent->winId(),
+ parent ? parent->winId() : 0,
KWallet::Wallet::Synchronous );
if ( m_wallet )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smb4k-1.0.0/smb4k/smb4k.desktop
new/smb4k-1.0.1/smb4k/smb4k.desktop
--- old/smb4k-1.0.0/smb4k/smb4k.desktop 2012-02-04 09:49:34.000000000 +0100
+++ new/smb4k-1.0.1/smb4k/smb4k.desktop 2012-03-11 16:33:45.000000000 +0100
@@ -75,5 +75,4 @@
Type=Application
Terminal=false
Categories=Qt;KDE;Utility;
-X-DBUS-StartupType=Unique
X-DBUS-ServiceName=de.berlios.smb4k
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
