From f1af0b08c8885a1bb0b55008904f3e7422ad4d86a1c3aba303c2c6f9f0672171 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 22 Aug 2008 23:56:49 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=26 --- pidgin-2.4.3.tar.bz2 | 3 -- pidgin-2.5.0.tar.bz2 | 3 ++ pidgin-check.patch | 19 ------------- pidgin-msn-xfer-fail.patch | 42 ---------------------------- pidgin.changes | 23 +++++++++++++++ pidgin.spec | 57 ++++++++++++++++++++++++-------------- 6 files changed, 62 insertions(+), 85 deletions(-) delete mode 100644 pidgin-2.4.3.tar.bz2 create mode 100644 pidgin-2.5.0.tar.bz2 delete mode 100644 pidgin-check.patch delete mode 100644 pidgin-msn-xfer-fail.patch diff --git a/pidgin-2.4.3.tar.bz2 b/pidgin-2.4.3.tar.bz2 deleted file mode 100644 index c45e5e9..0000000 --- a/pidgin-2.4.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8bb5d452fa3239c703647cf2dc28a5dfb849d7df7b89da0018271a337af053a6 -size 9382967 diff --git a/pidgin-2.5.0.tar.bz2 b/pidgin-2.5.0.tar.bz2 new file mode 100644 index 0000000..17a912e --- /dev/null +++ b/pidgin-2.5.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:978b956c4d411433a5844f4cbd15176cf8e55bc7e71fe950415b2adb0e8f4ddb +size 9316876 diff --git a/pidgin-check.patch b/pidgin-check.patch deleted file mode 100644 index 3eb7674..0000000 --- a/pidgin-check.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix autoreconf for latest version of check. - -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -2243,11 +2243,7 @@ fi - dnl ####################################################################### - dnl # Check for check - dnl ####################################################################### --PKG_CHECK_MODULES(CHECK,[check >= 0.9.4],:,[ -- ifdef([[AM_PATH_CHECK]], -- [AM_PATH_CHECK(0.8.2,:,:)], -- [AC_MSG_RESULT([no, testing is disabled])]) -- ]) -+PKG_CHECK_MODULES(CHECK,[check >= 0.9.4],:,[AC_MSG_RESULT([no, testing is disabled])]) - AM_CONDITIONAL(HAVE_CHECK, [test "x$CHECK_LIBS" != "x"]) - AC_SUBST(CHECK_CFLAGS) - AC_SUBST(CHECK_LIBS) diff --git a/pidgin-msn-xfer-fail.patch b/pidgin-msn-xfer-fail.patch deleted file mode 100644 index 8c8a923..0000000 --- a/pidgin-msn-xfer-fail.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- libpurple/protocols/msn/slplink.c -+++ libpurple/protocols/msn/slplink.c -@@ -556,13 +556,15 @@ - PurpleXfer *xfer; - - xfer = slpmsg->slpcall->xfer; -- - if (xfer != NULL) - { - purple_xfer_start(slpmsg->slpcall->xfer, - 0, NULL, 0); -- slpmsg->fp = ((PurpleXfer *)slpmsg->slpcall->xfer)->dest_fp; -- xfer->dest_fp = NULL; /* Disable double fclose() */ -+ if (slpmsg->slpcall->xfer) -+ { -+ slpmsg->fp = ((PurpleXfer *)slpmsg->slpcall->xfer)->dest_fp; -+ xfer->dest_fp = NULL; /* Disable double fclose() */ -+ } - } - } - } ---- libpurple/protocols/msnp9/slplink.c -+++ libpurple/protocols/msnp9/slplink.c -@@ -555,13 +555,15 @@ - PurpleXfer *xfer; - - xfer = slpmsg->slpcall->xfer; -- - if (xfer != NULL) - { - purple_xfer_start(slpmsg->slpcall->xfer, - 0, NULL, 0); -- slpmsg->fp = ((PurpleXfer *)slpmsg->slpcall->xfer)->dest_fp; -- xfer->dest_fp = NULL; /* Disable double fclose() */ -+ if (slpmsg->slpcall->xfer) -+ { -+ slpmsg->fp = ((PurpleXfer *)slpmsg->slpcall->xfer)->dest_fp; -+ xfer->dest_fp = NULL; /* Disable double fclose() */ -+ } - } - } - } diff --git a/pidgin.changes b/pidgin.changes index 337b644..aea5174 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Fri Aug 22 12:18:41 CEST 2008 - sbrabec@suse.cz + +- Update to version 2.5.0: + * number of bug fixed and good stuff + * MSNP protocol 15 support and many improvements + * custom smileys (MSN) + * Configure option --with-system-ssl-certs (openSUSE new default) + * Add SSL Certificates support to the NSS SSL plugin. + (bnc#415679, CVE-2008-3532, pigdin#6500) + * Fixed XMPP endless loops. + * IRC /ctcp command + * Allow for auto-detection of incoming UTF-8 formatted text. + * Improved visibility of Custom buddy icons feature. + * Resize down large incoming custom smileys. + * Alias based offer to add new buddies into the same contact. + * Minor smiley style update. + * Group and Chat buddy list entries can now be given custom buddy + icons. + * Finch menu improvements and tab-completion for commands in + conversation windows. + * Finch support for '/msgcolor' command. + ------------------------------------------------------------------- Tue Jul 15 13:54:12 CEST 2008 - sbrabec@suse.cz diff --git a/pidgin.spec b/pidgin.spec index 08ff7de..21630db 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -1,10 +1,17 @@ # -# spec file for package pidgin (Version 2.4.3) +# spec file for package pidgin (Version 2.5.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,7 +20,7 @@ Name: pidgin Summary: GTK+-Based Multiprotocol Instant Messaging Client -Version: 2.4.3 +Version: 2.5.0 Release: 1 License: GPL v2 or later Group: Productivity/Networking/Instant Messenger @@ -26,15 +33,13 @@ Patch2: pidgin-nonblock-aim.patch Patch3: pidgin-nonblock-common.patch Patch4: pidgin-nonblock-gwim.patch Patch5: pidgin-nonblock-common2.patch -Patch7: pidgin-check.patch Patch9: includes.patch Patch10: pidgin-64bit-buildhack.patch # PATCH-FIX-UPSTREAM: pidgin-directconn-argfix.patch Patch11: pidgin-directconn-argfix.patch Patch12: pidgin-dbus-invalid-gpointer.patch -Patch13: pidgin-msn-xfer-fail.patch # Can use external libzephyr -BuildRequires: cyrus-sasl-devel dbus-1-devel doxygen evolution-data-server-devel gnome-keyring-devel graphviz gtk-doc gtkspell-devel intltool libao-devel libbonobo-devel libgadu-devel libstdc++-devel libxml2-devel libxslt meanwhile-devel mono-devel mozilla-nspr-devel mozilla-nss-devel ncurses-devel perl-XML-Parser python sqlite-devel startup-notification-devel tk-devel update-desktop-files +BuildRequires: cyrus-sasl-devel dbus-1-devel doxygen evolution-data-server-devel gnome-keyring-devel graphviz gtk-doc gtkspell-devel intltool libao-devel libbonobo-devel libgadu-devel libstdc++-devel libxml2-devel libxslt meanwhile-devel mono-devel mozilla-nspr-devel mozilla-nss-devel ncurses-devel openssl-certs perl-XML-Parser python sqlite-devel startup-notification-devel tk-devel update-desktop-files # Product specific lines %if %suse_version >= 1000 || 0%{?opensuse_bs} BuildRequires: NetworkManager-devel @@ -62,6 +67,7 @@ BuildRequires: avahi-devel %endif %endif Requires: libpurple-lang = %{version} +Requires: openssl-certs BuildRoot: %{_tmppath}/%{name}-%{version}-build # Existed before 10.3: Obsoletes: gaim <= 1.5.0 @@ -707,17 +713,13 @@ Authors: %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch7 %patch9 -p1 %patch11 -p1 %patch12 -# PATCH-FIX-UPSTREAM pidgin-msn-xfer-fail.patch bnc404163 sbrabec@suse.cz -- Fix MSN file transfer DoS -# http://developer.pidgin.im/ticket/6246 -%patch13 # Change Myanmar/Myanmar to Myanmar: rename my_MM my po/my_MM.* sed -i "/^ALL_LINGUAS/s/ my_MM / my /" configure.ac -# ditto for sr@latin to sr@Latn +# Change sr@latin to sr@Latn - all projects except pidgin and PackageKit use sr@Latn: rename sr@latin sr@Latn po/sr@latin.* sed -i "/^ALL_LINGUAS/s/ sr@latin / sr@Latn /" configure.ac @@ -746,7 +748,8 @@ intltoolize --force --with-nspr-includes=/usr/include/nspr4\ --with-nss-includes=/usr/include/nss3\ --with-tclconfig=/usr/%_lib\ - --with-tkconfig=/usr/%_lib + --with-tkconfig=/usr/%_lib\ + --with-system-ssl-certs=/etc/ssl/certs cd libpurple make dbus-bindings.c cd .. @@ -833,14 +836,6 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/purple-send-async %{_bindir}/purple-url-handler %{_datadir}/pixmaps/purple -%dir %{_datadir}/purple -%dir %{_datadir}/purple/ca-certs -%{_datadir}/purple/ca-certs/Equifax_Secure_CA.pem -%{_datadir}/purple/ca-certs/GTE_CyberTrust_Global_Root.pem -%{_datadir}/purple/ca-certs/Microsoft_Secure_Server_Authority.pem -%{_datadir}/purple/ca-certs/StartCom_Free_SSL_CA.pem -%{_datadir}/purple/ca-certs/Verisign_Class3_Primary_CA.pem -%{_datadir}/purple/ca-certs/Verisign_RSA_Secure_Server_CA.pem %{_libdir}/libpurple.so.* %{_libdir}/libpurple-client.so.* %dir %{_libdir}/purple-2 @@ -884,6 +879,26 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/gnt.pc %changelog +* Fri Aug 22 2008 sbrabec@suse.cz +- Update to version 2.5.0: + * number of bug fixed and good stuff + * MSNP protocol 15 support and many improvements + * custom smileys (MSN) + * Configure option --with-system-ssl-certs (openSUSE new default) + * Add SSL Certificates support to the NSS SSL plugin. + (bnc#415679, CVE-2008-3532, pigdin#6500) + * Fixed XMPP endless loops. + * IRC /ctcp command + * Allow for auto-detection of incoming UTF-8 formatted text. + * Improved visibility of Custom buddy icons feature. + * Resize down large incoming custom smileys. + * Alias based offer to add new buddies into the same contact. + * Minor smiley style update. + * Group and Chat buddy list entries can now be given custom buddy + icons. + * Finch menu improvements and tab-completion for commands in + conversation windows. + * Finch support for '/msgcolor' command. * Tue Jul 15 2008 sbrabec@suse.cz - Update to version 2.4.3: * Setting your buddy icon once again works for Yahoo! accounts.