[oe] [PATCH][krogoth][meta-oe 1/3] pidgin: Update to 2.10.12

[akuster808]

On 05/06/2016 07:35 AM, Martin Jansa wrote:
> From: Herrie <github.com at herrie.org>
> 
> Which is compatible with GnuTLS that's included in Krogoth.

this update includes:
Potential information leak from XMPP 	CVE-2014-3698 	
Malicious smiley themes could alter arbitrary files 	CVE-2014-3697 	
Remote crash parsing malformed Groupwise message 	CVE-2014-3696 	
Remote crash parsing malformed MXit emoticon 	CVE-2014-3695 	
Insufficient SSL certificate validation 	CVE-2014-3694 	

info like this helps in deciding patch inclusion.

- armin

> 
> Signed-off-by: Herman van Hazendonk <github.com at herrie.org>
> ---
>  .../pidgin/pidgin/pidgin-cross-python-265.patch    | 35 ++++++++++++++--------
>  .../pidgin/pidgin/pidgin.desktop-set-icon.patch    | 11 -------
>  .../pidgin/{pidgin_2.10.9.bb => pidgin_2.10.12.bb} | 10 ++-----
>  3 files changed, 26 insertions(+), 30 deletions(-)
>  delete mode 100644 meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch
>  rename meta-oe/recipes-support/pidgin/{pidgin_2.10.9.bb => pidgin_2.10.12.bb} (91%)
> 
> diff --git a/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch b/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch
> index 57c4c46..cfc681c 100644
> --- a/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch
> +++ b/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch
> @@ -1,16 +1,27 @@
> -Index: pidgin-2.6.5/configure.ac
> -===================================================================
> ---- pidgin-2.6.5.orig/configure.ac
> -+++ pidgin-2.6.5/configure.ac
> -@@ -1470,8 +1470,9 @@ if test "_$pythonpath" != _ ; then
> - 		AC_CHECK_LIB(pthread, pthread_create, )
> - 		AC_CHECK_LIB(util, openpty, )
> - 		AC_CHECK_LIB(db, dbopen, )
> --		PY_LIBS="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config -lpython$PY_VERSION"
> --		PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
> +From 428836ba7f9048970626ef0d6b805107f7c52d33 Mon Sep 17 00:00:00 2001
> +From: Herrie <github.com at herrie.org>
> +Date: Thu, 5 May 2016 13:33:29 +0200
> +Subject: [PATCH] Updated python patch
> +
> +---
> + configure.ac | 6 +++---
> + 1 file changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 94ea8cf..2285adb 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -1587,9 +1587,9 @@ dnl (Thanks to XChat)
> + if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then
> + 	AC_MSG_CHECKING(for Python compile flags)
> + 	if test -f ${PYTHON}-config; then
> +-		PY_CFLAGS=`${PYTHON}-config --includes`
> +-		PY_LIBS=`${PYTHON}-config --libs`
> +-		AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.])
>  +		m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
>  +		PY_LIBS="-L$PKG_CONFIG_SYSROOT_DIR/usr/lib/python$PY_VERSION/config -lpython$PY_VERSION"
> -+		PY_CFLAGS="-I$PKG_CONFIG_SYSROOT_DIR/usr/include/python$PY_VERSION"
> - 		AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.])
> ++		PY_CFLAGS="-I$PKG_CONFIG_SYSROOT_DIR/usr/include/python$PY_VERSION"		AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.])
>   		AC_MSG_RESULT(ok)
>   	else
> + 		AC_MSG_RESULT([Cannot find ${PYTHON}-config])
> +
> diff --git a/meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch b/meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch
> deleted file mode 100644
> index 05f7689..0000000
> --- a/meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ---- pidgin-2.0.1/pidgin.desktop.in.orig	2007-06-20 23:50:44.000000000 +0000
> -+++ pidgin-2.0.1/pidgin.desktop.in	2007-06-20 23:51:05.000000000 +0000
> -@@ -4,7 +4,7 @@
> - _GenericName=Internet Messenger
> - _Comment=Send instant messages over multiple protocols
> - Exec=pidgin
> --Icon=pidgin
> -+Icon=/usr/share/icons/hicolor/48x48/apps/pidgin.png
> - StartupNotify=true
> - Terminal=false
> - Type=Application
> diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb b/meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb
> similarity index 91%
> rename from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb
> rename to meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb
> index 8352110..9133c1c 100644
> --- a/meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb
> +++ b/meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb
> @@ -2,23 +2,19 @@ DESCRIPTION = "multi-protocol instant messaging client"
>  SECTION = "x11/network"
>  LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
> -DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus intltool-native farsight2 libidn"
> +DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus intltool-native farsight2 libidn libxml2 gconf dbus-glib"
>  
>  inherit autotools gettext pkgconfig gconf perlnative
>  
> -# http://errors.yoctoproject.org/Errors/Details/25824/
> -PNBLACKLIST[pidgin] ?= "Not compatible with gnutls version 3.4 currently in oe-core and also depends on broken libnice through farsight2"
> -
>  SRC_URI = "\
>      ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
>      file://sanitize-configure.ac.patch \
> -    file://pidgin.desktop-set-icon.patch \
>      file://purple-OE-branding-25.patch \
>      file://pidgin-cross-python-265.patch \
>  "
>  
> -SRC_URI[md5sum] = "10a4a69d077893f6dd3438cd8af94e81"
> -SRC_URI[sha256sum] = "dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319"
> +SRC_URI[md5sum] = "14e0f5cfb2ed065e4dc80391a806ac76"
> +SRC_URI[sha256sum] = "2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd"
>  
>  EXTRA_OECONF = " \
>      --enable-vv \
>