commit kadu for openSUSE:12.1:Update:Test
Hello community,
here is the log from the commit of package kadu for openSUSE:12.1:Update:Test
checked in at 2012-02-28 13:48:09
Comparing /work/SRC/openSUSE:12.1:Update:Test/kadu (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.kadu.new (New)
Package is "kadu", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:12.1:Update:Test/kadu/kadu.changes 2011-12-19
18:17:31.0 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.kadu.new/kadu.changes 2012-02-28
13:48:11.0 +0100
@@ -1,0 +2,5 @@
+Sun Feb 26 15:10:27 UTC 2012 - fi...@opensuse.org
+
+- Security fix: inject js code into history. Fix bnc#749036.
+
+---
New:
kadu-inject-js-into-history-fix.patch
Other differences:
--
++ kadu.spec ++
--- /var/tmp/diff_new_pack.HKdFjT/_old 2012-02-28 13:48:11.0 +0100
+++ /var/tmp/diff_new_pack.HKdFjT/_new 2012-02-28 13:48:11.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kadu
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,12 +21,12 @@
Name: kadu
Version:0.10.1
-Release:1
+Release:0
# Choosing GPL-3.0+ because of presence and usage of numerous GPL-3.0 files
-License:GPL-3.0+
Summary:Gadu-Gadu protocol client for online messaging
-Url:http://www.kadu.im/
+License:GPL-3.0+
Group: Productivity/Networking/Instant Messenger
+Url:http://www.kadu.im/
Source0:http://download.kadu.im/stable/%{name}-%{version}.tar.bz2
# PATCH-FEATURE-OPENSUSE enable_external_plugins.patch fi...@opensuse.org
Patch0: enable_external_plugins.patch
@@ -34,6 +34,8 @@
Patch1: kadu-0.10.1-fix-enchant.patch
# PATCH-FEATURE-UPSTREAM kadu-0.10.1-sensible-error-messages.patch
b.brachac...@gmail.com -- provide more sensible error messages
Patch2: kadu-0.10.1-sensible-error-messages.patch
+# PATCH-FIX-UPSTREAM -- kadu-inject-js-into-history-fix.patch --
rafal.przemyslaw.malinow...@gmail.com -- fix for js code injection into history
+Patch3: kadu-inject-js-into-history-fix.patch
### 1x - External Plugins ###
Source10: http://kadu.net/~weagle/anonymous_check-0.10.1.tar.bz2
Source11: http://ultr.pl/kadu/globalhotkeys-0.10-26.tar.gz
@@ -68,11 +70,11 @@
%if %{?suse_version} > 1140
BuildRequires: pkgconfig(libntrack-qt4)
%endif
+BuildRequires: pkgconfig(QtGui) >= 4.7.0
+BuildRequires: pkgconfig(QtWebKit) >= 4.7.0
BuildRequires: pkgconfig(phonon)
BuildRequires: pkgconfig(qca2)
BuildRequires: pkgconfig(sndfile)
-BuildRequires: pkgconfig(QtGui) >= 4.7.0
-BuildRequires: pkgconfig(QtWebKit) >= 4.7.0
# runtime requires
Requires: libgadu3 >= 1.11.0
# sql_history needs qt4-sqlite to operate
@@ -88,6 +90,7 @@
%packagedevel
Summary:Gadu-Gadu and Jabber/XMPP protocol Instant Messenger
+License:GPL-3.0+
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@@ -103,6 +106,7 @@
%packageanonymous_check
Summary:Automatic lookup of an interlocutor in public directory
+License:GPL-3.0+
Group: Productivity/Networking/Instant Messenger
Requires: %{name} = %{version}
@@ -113,6 +117,7 @@
%packageglobalhotkeys
Summary:Global hotkeys support to Kadu
+License:GPL-3.0+
Group: Productivity/Networking/Instant Messenger
Requires: %{name} = %{version}
@@ -122,6 +127,7 @@
%packageimport_history
Summary:History import plugin
+License:GPL-3.0+
Group: Productivity/Networking/Instant Messenger
Requires: %{name} = %{version}
@@ -131,6 +137,7 @@
%packagelednotify
Summary:Notification by Scroll Lock LED
+License:GPL-3.0+
Group: Productivity/Networking/Instant Messenger
Requires: %{name} = %{version}
@@ -140,6 +147,7 @@
%packagemessagessplitter
Summary:Automatically splits too long messages
+License:GPL-3.0+
Group: Productivity/Networking/Instant Messenger
Requires: %{name} = %{version}
@@ -149,6 +157,7 @@
%packagemimetex
Summary:TeX formulas support
+License:GPL-3.0+
Group: Productivity/Networking/Instant Messenger
Requires: %{name} = %{version}
@@ -158,6 +167,7 @@
%packagenetworkping
Summary:Periodically checks the network state
+License:GPL-3.0+
commit kadu for openSUSE:12.1:Update:Test
Hello community,
here is the log from the commit of package kadu for openSUSE:12.1:Update:Test
checked in at 2011-12-19 18:17:26
Comparing /work/SRC/openSUSE:12.1:Update:Test/kadu (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.kadu.new (New)
Package is "kadu", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:12.1:Update:Test/kadu/kadu.changes 2011-12-19
18:17:31.0 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.kadu.new/kadu.changes 2011-12-19
18:17:31.0 +0100
@@ -1,0 +2,8 @@
+Thu Dec 15 18:24:05 UTC 2011 - fi...@opensuse.org
+
+- kadu-0.10.1-fix-enchant.patch: fix crash without enchant
+ dictionary (bnc#735465)
+- kadu-0.10.1-sensible-error-messages.patch: provide more sensible
+ error messages
+
+---
New:
kadu-0.10.1-fix-enchant.patch
kadu-0.10.1-sensible-error-messages.patch
Other differences:
--
++ kadu.spec ++
--- /var/tmp/diff_new_pack.8PZCnG/_old 2011-12-19 18:17:32.0 +0100
+++ /var/tmp/diff_new_pack.8PZCnG/_new 2011-12-19 18:17:32.0 +0100
@@ -30,6 +30,10 @@
Source0:http://download.kadu.im/stable/%{name}-%{version}.tar.bz2
# PATCH-FEATURE-OPENSUSE enable_external_plugins.patch fi...@opensuse.org
Patch0: enable_external_plugins.patch
+# PATCH-FIX-UPSTREAM kadu-0.10.1-fix-enchant.patch bnc#735465
b.brachac...@gmail.com -- fix crash without enchant dictionary
+Patch1: kadu-0.10.1-fix-enchant.patch
+# PATCH-FEATURE-UPSTREAM kadu-0.10.1-sensible-error-messages.patch
b.brachac...@gmail.com -- provide more sensible error messages
+Patch2: kadu-0.10.1-sensible-error-messages.patch
### 1x - External Plugins ###
Source10: http://kadu.net/~weagle/anonymous_check-0.10.1.tar.bz2
Source11: http://ultr.pl/kadu/globalhotkeys-0.10-26.tar.gz
@@ -305,6 +309,9 @@
# networkping, nextinfo, panelkadu, senthistory
#
%patch0
+#
+%patch1 -p1
+%patch2 -p1
# don't enable mpd since it's not in oss repository
sed -e 's:\t\tmpd_mediaplayer:\t\t# mpd_mediaplayer:' -i Plugins.cmake
++ kadu-0.10.1-fix-enchant.patch ++
>From 260df8e8d27e0550f0b548f5f925d67a0a3ea826 Mon Sep 17 00:00:00 2001
From: Bartosz Brachaczek
Date: Wed, 7 Dec 2011 19:46:43 +0100
Subject: [PATCH] spellchecker: Fix possible crash in enchant code
If enchant exception was thrown here, QMap::operator[] would create
entry with null pointer which would be dereferenced later.
QMap::insert() avoids that.
Change also other backends' code for consistency.
Reported by wojtek on IRC. Thanks to whe for spotting the actual issue
in the code.
Signed-off-by: Bartosz Brachaczek
---
plugins/spellchecker/spellchecker.cpp |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/spellchecker/spellchecker.cpp
b/plugins/spellchecker/spellchecker.cpp
index 250ed7d..495f483 100644
--- a/plugins/spellchecker/spellchecker.cpp
+++ b/plugins/spellchecker/spellchecker.cpp
@@ -163,11 +163,11 @@ bool SpellChecker::addCheckedLang(const QString &name)
return false;
}
else
- MyCheckers[name] = to_aspell_speller(possibleErr);
+ MyCheckers.insert(name, to_aspell_speller(possibleErr));
#elif defined(HAVE_ENCHANT)
try
{
- MyCheckers[name] =
enchant::Broker::instance()->request_dict(name.toStdString());
+ MyCheckers.insert(name,
enchant::Broker::instance()->request_dict(name.toStdString()));
}
catch (enchant::Exception &e)
{
@@ -175,7 +175,7 @@ bool SpellChecker::addCheckedLang(const QString &name)
return false;
}
#elif defined(Q_WS_MAC)
- MyCheckers[name] = new MacSpellChecker();
+ MyCheckers.insert(name, new MacSpellChecker());
#endif
if (MyCheckers.size() == 1)
--
1.7.6
++ kadu-0.10.1-sensible-error-messages.patch ++
>From b409a7784364c3b9df4f1886c67a1075ffa078d4 Mon Sep 17 00:00:00 2001
From: Bartosz Brachaczek
Date: Wed, 7 Dec 2011 21:10:30 +0100
Subject: [PATCH] spellchecker: Provide more sensible error messages
Signed-off-by: Bartosz Brachaczek
---
plugins/spellchecker/spellchecker.cpp | 24 ++-
.../spellchecker/translations/spellchecker_en.ts |8 ++
.../spellchecker/translations/spellchecker_pl.ts |8 ++
3 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/plugins/spellchecker/spellchecker.cpp
b/plugins/spellchecker/spellchecker.cpp
index 495f483..1b25e56 100644
--- a/plugins/spellchecker/spellchecker.cpp
+++ b/plugins/spellchecker/spellchecker.cpp
@@ -152,18 +152,21 @@ bool SpellChecker::addCheckedLang(const QString &name)
if (MyCheckers.contains(name))
