From 0dacf3d6ce2e84f0e03a8a159ae613fcb5d98d93c8a004bdfff2c1758c0b5d7e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Sep 2016 08:19:33 +0000 Subject: [PATCH] Accepting request 425070 from GNOME:Apps 1 OBS-URL: https://build.opensuse.org/request/show/425070 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=114 --- pidgin-NLD-smiley-theme.tar.bz2 | 3 + pidgin-Tango-smiley-theme.tar.bz2 | 3 + pidgin-use-default-alsa.patch | 15 ++++ pidgin.changes | 128 ++++++++++++++++++------------ pidgin.spec | 15 +++- 5 files changed, 114 insertions(+), 50 deletions(-) create mode 100644 pidgin-NLD-smiley-theme.tar.bz2 create mode 100644 pidgin-Tango-smiley-theme.tar.bz2 create mode 100644 pidgin-use-default-alsa.patch diff --git a/pidgin-NLD-smiley-theme.tar.bz2 b/pidgin-NLD-smiley-theme.tar.bz2 new file mode 100644 index 0000000..d587245 --- /dev/null +++ b/pidgin-NLD-smiley-theme.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b4f9e92f0e8ebc473e72a3cf8d8ae488fde177088ba61c1569f86093c9d5c6e +size 20019 diff --git a/pidgin-Tango-smiley-theme.tar.bz2 b/pidgin-Tango-smiley-theme.tar.bz2 new file mode 100644 index 0000000..c86a206 --- /dev/null +++ b/pidgin-Tango-smiley-theme.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3204686fdc32b330aedac3c7e5cd8ac45deedc4128f01cc1878c2ea93e47f4b8 +size 13938 diff --git a/pidgin-use-default-alsa.patch b/pidgin-use-default-alsa.patch new file mode 100644 index 0000000..4f3896b --- /dev/null +++ b/pidgin-use-default-alsa.patch @@ -0,0 +1,15 @@ +--- + pidgin/gtksound.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/pidgin/gtksound.c ++++ b/pidgin/gtksound.c +@@ -314,7 +314,7 @@ pidgin_sound_init(void) + purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/conv_focus", TRUE); + purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/mute", FALSE); + purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/command", ""); +- purple_prefs_add_string(PIDGIN_PREFS_ROOT "/sound/method", "automatic"); ++ purple_prefs_add_string(PIDGIN_PREFS_ROOT "/sound/method", "alsa"); + purple_prefs_add_int(PIDGIN_PREFS_ROOT "/sound/volume", 50); + + #ifdef USE_GSTREAMER diff --git a/pidgin.changes b/pidgin.changes index 668f602..ee3b3ad 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -4,6 +4,14 @@ Fri Jul 22 19:13:38 UTC 2016 - jengelh@inai.de - Drop additional pkgconfig require (already implicitly detected), but explicitly buildrequire it for /usr/lib/rpm/pkgconfigdeps.sh. +------------------------------------------------------------------- +Mon Jul 4 16:39:43 UTC 2016 - fezhang@suse.com + +- Update to GNOME 3.20.2 Fate#318572 + + Drop pidgin-CVE-2014-3695 (bsc#902409): fixed upstream. + + Drop pidgin-CVE-2014-3696 (bsc#902410): fixed upstream. + + Drop pidgin-CVE-2014-3698 (bsc#902408): fixed upstream. + ------------------------------------------------------------------- Tue Jun 21 12:02:53 UTC 2016 - sor.alexei@meowr.ru @@ -129,6 +137,17 @@ Tue Jan 20 10:04:54 UTC 2015 - tbehrens@suse.com - Remove pidgin-ssl-cache.patch: testing with the usual suspects in irc land suggests this workaround is no longer necessary +------------------------------------------------------------------- +Fri Nov 28 10:22:16 UTC 2014 - dimstar@opensuse.org + +- Add patches to address CVE issues: + + pidgin-CVE-2014-3698: bnc#902408: remote information leak via + crafted XMPP message. + + pidgin-CVE-2014-3696: bnc#902410: denial of service parsing + Groupwise server message. + + pidgin-CVE-2014-3695: bnc#902409: crash in MXit protocol + plug-in. + ------------------------------------------------------------------- Mon Nov 24 10:55:10 UTC 2014 - dimstar@opensuse.org @@ -204,6 +223,13 @@ Fri Oct 24 10:07:47 UTC 2014 - dimstar@opensuse.org GStreamer 1.0. - Rebase pidgin-crash-missing-gst-registry.patch. +------------------------------------------------------------------- +Thu Jul 10 18:23:54 CEST 2014 - tiwai@suse.de + +- Add pidgin-use-default-alsa.patch: + Use ALSA as default for avoiding broken volume control of pa sink + (bnc#886670). + ------------------------------------------------------------------- Wed Jul 6 23:00:00 UTC 2014 - tbehrens@suse.com @@ -220,7 +246,7 @@ Sun Jun 22 17:20:00 UTC 2014 - meissner@suse.com ------------------------------------------------------------------- Thu Jun 19 08:27:50 UTC 2014 - fcrozat@suse.com -- Replaces (BuildRequires) of openssl-certs with +- Replaces (BuildRequires) of openssl-certs with ca-certificates-mozilla starting with SLE12 and openSUSE 13.2. ------------------------------------------------------------------- @@ -408,7 +434,7 @@ Fri Feb 15 09:26:24 UTC 2013 - christoph.miebach@web.de - Remove all reference to Hidden Number. - Ignore new invites to join a GroupChat if you're already joined, or still have a pending invite. - - The buddy's name was not centered vertically in the + - The buddy's name was not centered vertically in the buddy-list if they did not have a status-message or mood set. - Fix decoding of font-size changes in the markup of received @@ -627,7 +653,7 @@ Sun Nov 27 06:44:46 UTC 2011 - coolo@suse.com ------------------------------------------------------------------- Mon Aug 22 10:31:57 CET 2011 - christoph.miebach@web.de - + - Update to version 2.10.0: + Pidgin: - Make the max size of incoming smileys a pref instead of @@ -677,10 +703,10 @@ Mon Aug 22 10:31:57 CET 2011 - christoph.miebach@web.de - Open an explorer.exe window at the location of the file when clicking on a file link instead of executing the file, because executing a file can be potentially dangerous. -- Drop pidgin-b1dfad7fa45e394c213a97053d7ed5926c69901d.patch +- Drop pidgin-b1dfad7fa45e394c213a97053d7ed5926c69901d.patch (multiple display of room members): the patch was taken from upstream and as such is included in the current tarball. - + ------------------------------------------------------------------- Wed Jul 6 17:13:47 CEST 2011 - vuntz@opensuse.org @@ -714,20 +740,20 @@ Fri Jun 24 11:51:57 CET 2011 - christoph.miebach@web.de - Update to version 2.9.0: + Pidgin: - - Fix a potential remote denial-of-service bug related to + - Fix a potential remote denial-of-service bug related to displaying buddy icons. - - Significantly improved performance of larger IRC channels + - Significantly improved performance of larger IRC channels (regression introduced in 2.8.0). - Fix Conversation->Add on AIM and MSN. - - Entries in the chat user list are sorted properly again. This - was inadvertenly broken in 2.8.0. + - Entries in the chat user list are sorted properly again. This + was inadvertenly broken in 2.8.0. + Finch: - - Fix logging in to ICQ. + - Fix logging in to ICQ. + libpurple: - - media: Actually use the specified TCP port from the TURN - configuration to create a TCP relay candidate. + - media: Actually use the specified TCP port from the TURN + configuration to create a TCP relay candidate. + AIM and ICQ: - - Fix crashes on some non-mainstream OSes when attempting to + - Fix crashes on some non-mainstream OSes when attempting to printf("%s", NULL). + Plugins: - The Evolution Integration plugin compiles again. @@ -825,7 +851,7 @@ Tue Jun 7 16:55:34 CEST 2011 - dimstar@opensuse.org - Added the ability to view and invite your Suggested Friends, and to search for contacts. - Also display the Status Message of offline contacts in their - profile information. + profile information. + XMPP: - Remember the previously entered user directory when searching - Correctly handle a buddy's unsetting his/her vCard-based @@ -863,32 +889,32 @@ Fri Mar 11 22:46:57 CET 2011 - christoph.miebach@web.de - Our bundled libgadu should now build on HP-UX. - Fix some instances of file transfers never completing. + Pidgin: - - Sort by Status no longer causes buddies to move around when + - Sort by Status no longer causes buddies to move around when you click them. - Fix embedding in the system tray on older GTK+ releases (such as on CentOS 5.5 and older Fedora). - - No longer require libstartup-notification for startup + - No longer require libstartup-notification for startup notification support. GTK+ has included support for years, so use it instead. + AIM: - - Fix a bug where some buddies from your buddy list might not + - Fix a bug where some buddies from your buddy list might not show up. Affected non-English ICQ users the most. - - Send keepalives for all types of network connections. Will + - Send keepalives for all types of network connections. Will hopefully make chat rooms more reliable. + MSN: - - Fix bug that prevented added buddies to your buddy list in + - Fix bug that prevented added buddies to your buddy list in certain circumstances. + XMPP: - - Fix building on platforms with an older glib (inadvertantly + - Fix building on platforms with an older glib (inadvertantly broken in 2.7.10). - Don't treat the on-join status storms as 'new arrivals'. - - Extend the /join command to support room JIDs, enabling you + - Extend the /join command to support room JIDs, enabling you to join a room on any server. - - Add support for receiving a limited amount of history when + - Add support for receiving a limited amount of history when joining a room (not currently supported by Pidgin and Finch). + Yahoo!/Yahoo! JAPAN: - - Fix CVE-2011-1091, denials of service caused by NULL pointer - dereferences due to improper handling of malformed YMSG + - Fix CVE-2011-1091, denials of service caused by NULL pointer + dereferences due to improper handling of malformed YMSG packets. ------------------------------------------------------------------- @@ -1038,17 +1064,17 @@ Thu Nov 25 13:29:36 UTC 2010 - christoph.miebach@web.de - Update to version 2.7.7: + General: - - Allow multiple CA certificates to share the same + - Allow multiple CA certificates to share the same Distinguished Name (DN). Partially fixes remaining MSN issues. - The GNUTLS SSL plugin now discards any certificate (and all - subsequent certificates) in a chain if it did not sign the + subsequent certificates) in a chain if it did not sign the previous certificate. Partially fixes remaining MSN issues. - Open requests related to a file transfer are now closed when the request is cancelled locally. + AIM and ICQ: - AIM should now connect if "Use clientLogin" is turned off and - the "Server" field is set to anything other than + the "Server" field is set to anything other than "login.oscar.aol.com" or "slogin.oscar.aol.com". - Fix a crash on connection loss. @@ -1198,7 +1224,7 @@ Fri Oct 22 17:27:42 CEST 2010 - dimstar@opensuse.org ridiculously large (>500 buddies) list and may improve login speed for those on slow connections. - Fix sending SMS messages. The lookup host changed on us. - - Improvements for some file transfer scenarios, but not all. + - Improvements for some file transfer scenarios, but not all. - Drop pidgin-browser-default.patch: fixed upstream. ------------------------------------------------------------------- @@ -1550,7 +1576,7 @@ Thu Nov 26 17:58:29 CET 2009 - sbrabec@suse.cz Tue Oct 20 09:36:10 CEST 2009 - dimstar@opensuse.org - Add pidgin-bnc548072.patch, fixes crash with oscar (ICQ) protocol - bnc#548072. + bnc#548072. ------------------------------------------------------------------- Wed Sep 23 19:48:37 UTC 2009 - aj@suse.de @@ -1834,7 +1860,7 @@ Sun Feb 1 18:13:23 EST 2009 - mboman@suse.de + Windows-specific changes * Fix the "Hang on Exit" issue that a number of users encountered - * Updated GTK+ to 2.14.6 + * Updated GTK+ to 2.14.6 + Translation updates ------------------------------------------------------------------- @@ -1851,9 +1877,9 @@ Sat Jan 24 14:38:38 CET 2009 - vuntz@novell.com - Remove pidgin-64bit-buildhack.patch which wasn't used anymore. ------------------------------------------------------------------- -Mon Jan 12 15:25:27 EST 2009 - mauro@suse.de +Mon Jan 12 15:25:27 EST 2009 - mauro@suse.de -- Translations update. +- Translations update. ------------------------------------------------------------------- Tue Jan 6 12:11:13 EST 2009 - jpr@novell.com @@ -1867,13 +1893,13 @@ Wed Dec 31 09:23:03 IST 2008 - msuman@suse.de - Update to version 2.5.3: + Misc. bug fixes + Custom smileys for the XMPP protocol -- Spec file cleanup for a few RPMLINT warnings. +- Spec file cleanup for a few RPMLINT warnings. ------------------------------------------------------------------- Tue Nov 25 10:22:44 CET 2008 - ro@suse.de - comment out libpurple2-mono on ppc64 for the moment to fix - build (no native mono on ppc64) + build (no native mono on ppc64) ------------------------------------------------------------------- Fri Oct 3 23:26:52 CEST 2008 - vuntz@novell.com @@ -2053,18 +2079,22 @@ Sat Dec 8 09:05:30 GMT 2007 - james@usr-local-bin.org - Update to version 2.3.1: + http://developer.pidgin.im/query?status=closed&milestone=2.3.1 + libpurple: - * Fixed a number of MSN bugs introduced in 2.3.0, resolving problems - connecting to MSN and random local display name changes - * Going idle on MySpaceIM will no longer clear your status and message. - * Idle MySpaceIM buddies should now appear online at login. - * Fixed crashes in XMPP when discovering a client's capabilities - * Don't set the current tune title if it's NULL (XMPP/Google Talk) - * Don't allow buddies to be manually added to Bonjour - * Don't advertise IPv6 on Bonjour because we don't support it + * Fixed a number of MSN bugs introduced in 2.3.0, resolving + problems connecting to MSN and random local display name + changes + * Going idle on MySpaceIM will no longer clear your status and + message. + * Idle MySpaceIM buddies should now appear online at login. + * Fixed crashes in XMPP when discovering a client's capabilities + * Don't set the current tune title if it's NULL (XMPP/Google + Talk) + * Don't allow buddies to be manually added to Bonjour + * Don't advertise IPv6 on Bonjour because we don't support it * Compile fixes for FreeBSD and Solaris - * Update QQ client version so some accounts can connect again - * Do not allow ISON requests to stack in IRC, preventing flooding IRC - servers when temporary network outages are restored + * Update QQ client version so some accounts can connect again + * Do not allow ISON requests to stack in IRC, preventing + flooding IRC servers when temporary network outages are + restored * Plug several leaks in the perl plugin loader * Prevent autoaccept plugin overwriting existing files @@ -2083,7 +2113,7 @@ Sat Dec 1 13:38:28 CST 2007 - maw@suse.de work with iChat or Adium as they use a different file transfer implementation. * XMPP password changes that return errors no longer cause the saved - password to be changed. + password to be changed. * XMPP file transfer support has been enhanced to support sending files through a proxy when the server supports discovering a a bytestream proxy. This should make file transfers much more @@ -2110,7 +2140,7 @@ Sat Dec 1 13:38:28 CST 2007 - maw@suse.de know she is listening to some soothing music. * Added a 'Move to' menu in buddy list context menu for moving buddies to other groups as an alternative to dragging. - * Group headings are now marked via an underline instead of a + * Group headings are now marked via an underline instead of a different color background. * It is now possible to mark a chat on your buddy list as "Persistent" so you do not leave the chat when the window or tab is closed. @@ -2186,7 +2216,7 @@ Thu Sep 6 18:56:24 CEST 2007 - sbrabec@suse.cz ------------------------------------------------------------------- Fri Aug 17 02:06:21 CEST 2007 - ro@suse.de -- fix requires: require libpurple-lang instead of pidgin-lang +- fix requires: require libpurple-lang instead of pidgin-lang ------------------------------------------------------------------- Tue Aug 14 15:57:04 CEST 2007 - maw@suse.de @@ -2229,7 +2259,7 @@ Tue Jul 24 00:17:19 CEST 2007 - maw@suse.de ------------------------------------------------------------------- Tue Jun 12 01:54:48 CEST 2007 - ro@suse.de -- avoid string compare with char literal (use strcmp) +- avoid string compare with char literal (use strcmp) ------------------------------------------------------------------- Thu May 31 11:21:27 CEST 2007 - sbrabec@suse.cz diff --git a/pidgin.spec b/pidgin.spec index 9de6dda..bd49068 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -28,6 +28,8 @@ Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2.asc Source2: pidgin.keyring Source3: pidgin-prefs.xml +Source4: pidgin-NLD-smiley-theme.tar.bz2 +Source5: pidgin-Tango-smiley-theme.tar.bz2 # PATCH-FIX-OPENSUSE pidgin-nonblock-common.patch Patch0: pidgin-nonblock-common.patch # PATCH-FIX-OPENSUSE pidgin-nonblock-gwim.patch @@ -42,6 +44,8 @@ Patch4: pidgin-fix-perl-build.patch Patch5: pidgin-crash-missing-gst-registry.patch # PATCH-FIX-UPSTREAM pidgin-ncurses-6.0-accessors.patch pidgin.im#16764 dimstar@opensuse.org -- Fix build with NCurses 6.0 with WINDOW_OPAQUE set to 1 Patch6: pidgin-ncurses-6.0-accessors.patch +# PATCH-FIX-SLE pidgin-use-default-alsa.patch bnc#886670 tiwai@suse.de -- use ALSA as default for avoiding broken volume control +Patch8: pidgin-use-default-alsa.patch BuildRequires: NetworkManager-devel # Can use external libzephyr. BuildRequires: cyrus-sasl-devel @@ -248,7 +252,7 @@ documentation, and libraries required for development of Finch scripts and plugins. %prep -%setup -q +%setup -q -a4 -a5 %if 0%{?suse_version} >= 1120 translation-update-upstream %endif @@ -259,6 +263,9 @@ translation-update-upstream %patch4 -p1 %patch5 -p1 %patch6 -p1 +%if !0%{?is_opensuse} +%patch8 -p1 +%endif cp -f %{SOURCE3} %{name}-prefs.xml @@ -311,6 +318,12 @@ find %{buildroot} -type f -name ".packlist" -delete -print find %{buildroot} -type f -name "*.bs" -empty -delete -print find %{buildroot} -type f -name "*.la" -delete -print +# Provide only upstream emotes in openSUSE >= 11.2 and SLE > 11 (see bnc#569271#c1): +%if %suse_version < 1120 +cp -a NLD $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/pidgin/emotes +cp -a Tango $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/pidgin/emotes +%endif + # FIXME: Should be nonversioned name. ls %{buildroot}%{_libdir}/purple-2/*.so | while read libim; do if [ -L %{buildroot}%{_libdir}/purple-2/$libim ]; then