Hello community,
here is the log from the commit of package smb4k for openSUSE:13.1 checked in
at 2013-10-29 09:35:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/smb4k (Old)
and /work/SRC/openSUSE:13.1/.smb4k.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smb4k"
Changes:
--------
--- /work/SRC/openSUSE:13.1/smb4k/smb4k.changes 2013-09-23 11:09:16.000000000
+0200
+++ /work/SRC/openSUSE:13.1/.smb4k.new/smb4k.changes 2013-10-29
09:35:47.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Oct 28 08:56:54 UTC 2013 - wba...@tmo.at
+
+- Update to version 1.0.8:
+ * Explicity set language to "C" in Smb4KProcess, because Samba
+ might be localized (closes SF ticket #34).
+
+-------------------------------------------------------------------
Old:
----
smb4k-1.0.7.tar.bz2
New:
----
smb4k-1.0.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ smb4k.spec ++++++
--- /var/tmp/diff_new_pack.FM6wRN/_old 2013-10-29 09:35:48.000000000 +0100
+++ /var/tmp/diff_new_pack.FM6wRN/_new 2013-10-29 09:35:48.000000000 +0100
@@ -17,7 +17,7 @@
Name: smb4k
-Version: 1.0.7
+Version: 1.0.8
Release: 0
Summary: Advanced Network Neighborhood Browser for KDE
License: GPL-2.0+
++++++ smb4k-1.0.7.tar.bz2 -> smb4k-1.0.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smb4k-1.0.7/CMakeLists.txt
new/smb4k-1.0.8/CMakeLists.txt
--- old/smb4k-1.0.7/CMakeLists.txt 2013-05-12 14:45:15.000000000 +0200
+++ new/smb4k-1.0.8/CMakeLists.txt 2013-10-19 18:26:26.000000000 +0200
@@ -1,9 +1,9 @@
project( smb4k )
-set( VERSION 1.0.7 )
+set( VERSION 1.0.8 )
set( VERSION_MAJOR 1 )
set( VERSION_MINOR 0 )
-set( VERSION_PATCH 7 )
+set( VERSION_PATCH 8 )
cmake_minimum_required( VERSION 2.6 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smb4k-1.0.7/ChangeLog new/smb4k-1.0.8/ChangeLog
--- old/smb4k-1.0.7/ChangeLog 2013-05-12 14:45:15.000000000 +0200
+++ new/smb4k-1.0.8/ChangeLog 2013-10-19 18:23:35.000000000 +0200
@@ -1,3 +1,7 @@
+Smb4K 1.0.8 (2013-10-19):
+- Explicity set language to "C" in Smb4KProcess, because Samba might be
+ localized (closes SF ticket #34).
+
Smb4K 1.0.7 (2013-05-13):
- Fixed remounting of shares.
- Fixed Smb4KCustomOptionsManager::hasCustomOptions(). The default options
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smb4k-1.0.7/core/smb4kprocess.cpp
new/smb4k-1.0.8/core/smb4kprocess.cpp
--- old/smb4k-1.0.7/core/smb4kprocess.cpp 2013-05-12 14:45:15.000000000
+0200
+++ new/smb4k-1.0.8/core/smb4kprocess.cpp 2013-10-19 18:23:35.000000000
+0200
@@ -30,6 +30,10 @@
Smb4KProcess::Smb4KProcess( QObject *parent ) : KProcess( parent )
{
m_aborted = false;
+
+ // Explicitly set the language, because Samba
+ // might be localized (closes SF ticket #34).
+ setEnv("LANG", "C");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smb4k-1.0.7/core/unknown_parameter_patch.diff
new/smb4k-1.0.8/core/unknown_parameter_patch.diff
--- old/smb4k-1.0.7/core/unknown_parameter_patch.diff 2013-05-12
14:45:15.000000000 +0200
+++ new/smb4k-1.0.8/core/unknown_parameter_patch.diff 1970-01-01
01:00:00.000000000 +0100
@@ -1,327 +0,0 @@
-Index: smb4kpreviewer_p.cpp
-===================================================================
---- smb4kpreviewer_p.cpp (Revision 1345791)
-+++ smb4kpreviewer_p.cpp (Arbeitskopie)
-@@ -443,7 +443,7 @@
-
- // Remove DEBUG messages and the additional information
- // that smbclient unfortunately reports to stderr.
-- QStringList err_msg = stderr.split( "\n", QString::SkipEmptyParts );
-+ QStringList err_msg = stderr.split( '\n', QString::SkipEmptyParts );
-
- QMutableStringListIterator it( err_msg );
-
-@@ -455,10 +455,14 @@
- {
- it.remove();
- }
-- else if ( line.trimmed().startsWith( "Domain" ) ||
line.trimmed().startsWith( "OS" ) )
-+ else if ( line.trimmed().startsWith( QLatin1String( "Domain" ) ) ||
line.trimmed().startsWith( QLatin1String( "OS" ) ) )
- {
- it.remove();
- }
-+ else if ( line.trimmed().startsWith( "Ignoring unknown parameter" ) )
-+ {
-+ it.remove();
-+ }
- else
- {
- // Do nothing
-Index: smb4kprint_p.cpp
-===================================================================
---- smb4kprint_p.cpp (Revision 1345791)
-+++ smb4kprint_p.cpp (Arbeitskopie)
-@@ -265,7 +265,7 @@
- else
- {
- // Remove DEBUG messages.
-- QStringList err_msg = stderr.split( "\n", QString::SkipEmptyParts );
-+ QStringList err_msg = stderr.split( '\n', QString::SkipEmptyParts );
-
- QMutableStringListIterator it( err_msg );
-
-@@ -277,6 +277,10 @@
- {
- it.remove();
- }
-+ else if ( line.trimmed().startsWith( "Ignoring unknown parameter" ) )
-+ {
-+ it.remove();
-+ }
- else
- {
- // Do nothing
-Index: smb4ksearch_p.cpp
-===================================================================
---- smb4ksearch_p.cpp (Revision 1345791)
-+++ smb4ksearch_p.cpp (Arbeitskopie)
-@@ -328,6 +328,34 @@
- {
- QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1 );
-
-+ // Remove unimportant warnings
-+ if ( stderr.contains( "Ignoring unknown parameter" ) )
-+ {
-+ QStringList tmp = stderr.split( '\n' );
-+
-+ QMutableStringListIterator it( tmp );
-+
-+ while ( it.hasNext() )
-+ {
-+ QString test = it.next();
-+
-+ if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) )
-+ {
-+ it.remove();
-+ }
-+ else
-+ {
-+ // Do nothing
-+ }
-+ }
-+
-+ stderr = tmp.join( "\n" );
-+ }
-+ else
-+ {
-+ // Do nothing
-+ }
-+
- // Process authentication errors:
- if ( stderr.contains( "The username or password was not correct." ) ||
- stderr.contains( "NT_STATUS_ACCOUNT_DISABLED" ) /* AD error */ ||
-@@ -337,7 +365,7 @@
- m_proc->abort();
- emit authError( this );
- }
-- else if ( stderr.contains( "NT_STATUS" ) )
-+ else if ( stderr.contains("NT_STATUS") )
- {
- Smb4KNotification *notification = new Smb4KNotification();
- notification->searchingFailed( m_string, stderr );
-Index: smb4kscanner_p.cpp
-===================================================================
---- smb4kscanner_p.cpp (Revision 1345791)
-+++ smb4kscanner_p.cpp (Arbeitskopie)
-@@ -424,6 +424,34 @@
- // Read from stderr and decide what to do.
- QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1
).trimmed();
-
-+ // Remove unimportant warnings
-+ if ( stderr.contains( "Ignoring unknown parameter" ) )
-+ {
-+ QStringList tmp = stderr.split( '\n' );
-+
-+ QMutableStringListIterator it( tmp );
-+
-+ while ( it.hasNext() )
-+ {
-+ QString test = it.next();
-+
-+ if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) )
-+ {
-+ it.remove();
-+ }
-+ else
-+ {
-+ // Do nothing
-+ }
-+ }
-+
-+ stderr = tmp.join( "\n" );
-+ }
-+ else
-+ {
-+ // Do nothing
-+ }
-+
- if ( !stderr.isEmpty() )
- {
- Smb4KNotification *notification = new Smb4KNotification();
-@@ -820,6 +848,34 @@
- // Read from stderr and decide what to do.
- QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1
).trimmed();
-
-+ // Remove unimportant warnings
-+ if ( stderr.contains( "Ignoring unknown parameter" ) )
-+ {
-+ QStringList tmp = stderr.split( '\n' );
-+
-+ QMutableStringListIterator it( tmp );
-+
-+ while ( it.hasNext() )
-+ {
-+ QString test = it.next();
-+
-+ if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) )
-+ {
-+ it.remove();
-+ }
-+ else
-+ {
-+ // Do nothing
-+ }
-+ }
-+
-+ stderr = tmp.join( "\n" );
-+ }
-+ else
-+ {
-+ // Do nothing
-+ }
-+
- if ( !stderr.isEmpty() )
- {
- if ( stderr.contains( "The username or password was not correct." ) ||
-@@ -830,13 +886,13 @@
- if ( m_master_browser.isEmpty() )
- {
- // Figure out the current master browser's IP address.
-- QStringList stderr_list = stderr.split( "\n", QString::SkipEmptyParts
);
-+ QStringList stderr_list = stderr.split( '\n', QString::SkipEmptyParts
);
-
- foreach ( const QString &line, stderr_list )
- {
- if ( line.contains( "Connecting to host=" ) )
- {
-- m_master_browser = line.section( "=", 1, 1 ).trimmed();
-+ m_master_browser = line.section( '=', 1, 1 ).trimmed();
- break;
- }
- else
-@@ -1351,6 +1407,34 @@
- {
- QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1
).trimmed();
-
-+ // Remove unimportant warnings
-+ if ( stderr.contains( "Ignoring unknown parameter" ) )
-+ {
-+ QStringList tmp = stderr.split( '\n' );
-+
-+ QMutableStringListIterator it( tmp );
-+
-+ while ( it.hasNext() )
-+ {
-+ QString test = it.next();
-+
-+ if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) )
-+ {
-+ it.remove();
-+ }
-+ else
-+ {
-+ // Do nothing
-+ }
-+ }
-+
-+ stderr = tmp.join( "\n" );
-+ }
-+ else
-+ {
-+ // Do nothing
-+ }
-+
- if ( !stderr.isEmpty() )
- {
- Smb4KNotification *notification = new Smb4KNotification();
-@@ -1665,6 +1749,34 @@
- {
- QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1
).trimmed();
-
-+ // Remove unimportant warnings
-+ if ( stderr.contains( "Ignoring unknown parameter" ) )
-+ {
-+ QStringList tmp = stderr.split( '\n' );
-+
-+ QMutableStringListIterator it( tmp );
-+
-+ while ( it.hasNext() )
-+ {
-+ QString test = it.next();
-+
-+ if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) )
-+ {
-+ it.remove();
-+ }
-+ else
-+ {
-+ // Do nothing
-+ }
-+ }
-+
-+ stderr = tmp.join( "\n" );
-+ }
-+ else
-+ {
-+ // Do nothing
-+ }
-+
- if ( !stderr.isEmpty() )
- {
- if ( stderr.contains( "The username or password was not correct." ) ||
-@@ -1677,7 +1789,7 @@
- else if ( stderr.contains( "tdb_transaction_recover:" ) ||
- stderr.contains( "tdb_log" ) )
- {
-- // Suppress debug output/information sent to stderr
-+ // Suppress debug output/information send to stderr
- qDebug() << stderr;
- }
- else
-@@ -2109,6 +2221,38 @@
- {
- QString stderr = QString::fromUtf8( m_proc->readAllStandardError(), -1
).trimmed();
-
-+ // Remove unimportant warnings
-+ if ( stderr.contains( "Ignoring unknown parameter" ) )
-+ {
-+ QStringList tmp = stderr.split( '\n' );
-+
-+ QMutableStringListIterator it( tmp );
-+
-+ while ( it.hasNext() )
-+ {
-+ QString test = it.next();
-+
-+ if ( test.trimmed().startsWith( "Ignoring unknown parameter" ) )
-+ {
-+ it.remove();
-+ }
-+ else if ( test.contains( "creating lame", Qt::CaseSensitive ) )
-+ {
-+ it.remove();
-+ }
-+ else
-+ {
-+ // Do nothing
-+ }
-+ }
-+
-+ stderr = tmp.join( "\n" );
-+ }
-+ else
-+ {
-+ // Do nothing
-+ }
-+
- if ( !stderr.isEmpty() )
- {
- if ( stderr.contains( "The username or password was not correct." ) ||
-@@ -2125,15 +2269,8 @@
- }
- else
- {
-- if ( !stderr.contains( "creating lame", Qt::CaseSensitive ) )
-- {
-- Smb4KNotification *notification = new Smb4KNotification();
-- notification->retrievingSharesFailed( &m_host, stderr );
-- }
-- else
-- {
-- // Do nothing
-- }
-+ Smb4KNotification *notification = new Smb4KNotification();
-+ notification->retrievingSharesFailed( &m_host, stderr );
- }
- }
- else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smb4k-1.0.7/password_dialog_crash.diff
new/smb4k-1.0.8/password_dialog_crash.diff
--- old/smb4k-1.0.7/password_dialog_crash.diff 2013-05-12 14:45:15.000000000
+0200
+++ new/smb4k-1.0.8/password_dialog_crash.diff 1970-01-01 01:00:00.000000000
+0100
@@ -1,53 +0,0 @@
-Index: core/smb4kmounter_p.cpp
-===================================================================
---- core/smb4kmounter_p.cpp (Revision 1330241)
-+++ core/smb4kmounter_p.cpp (Arbeitskopie)
-@@ -764,7 +764,6 @@
- /* authentication error */ )
- {
- m_auth_errors << Smb4KShare( *share );
-- emit authError( this );
- }
- else if ( (stderr.contains( "mount error 6" ) || stderr.contains(
"mount error(6)" )) /* bad share name */ &&
- share->shareName().contains( "_", Qt::CaseSensitive ) )
-@@ -772,7 +771,6 @@
- QString share_name = share->shareName();
- share->setShareName( share_name.replace( "_", " " ) );
- m_retries << *share;
-- emit retry( this );
- }
- else if ( stderr.contains( "mount error 101" ) || stderr.contains(
"mount error(101)" ) /* network unreachable */ )
- {
-@@ -782,7 +780,6 @@
- if ( stderr.contains( "Authentication error" ) )
- {
- m_auth_errors << *share;
-- emit authError( this );
- }
- #endif
- else
-@@ -814,6 +811,24 @@
-
- if ( m_processed == m_shares.size() )
- {
-+ if ( !m_auth_errors.isEmpty() )
-+ {
-+ emit authError( this );
-+ }
-+ else
-+ {
-+ // Do nothing
-+ }
-+
-+ if ( !m_retries.isEmpty() )
-+ {
-+ emit retry( this );
-+ }
-+ else
-+ {
-+ // Do nothing
-+ }
-+
- // Give the operating system some time to process the mounts
- // before we invoke KMountPoint::currentMountPoints().
- QTimer::singleShot( 100, this, SLOT( slotFinishJob() ) );
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
