Skip to contentSkip to conversation

pidgin: Update to 2.10.12

PATCH In review Martin Jansa 2 participants 8 messages May 6, 2016 – May 9, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 pidgin: Update to 2.10.12

From: Herrie <[email protected]>

Which is compatible with GnuTLS that's included in Krogoth.

---
 .../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%)
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +23 -12
index 57c4c46..cfc681c 100644
@@ -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 <[email protected]>
+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])
+
meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted +0 -11
deleted file mode 100644
index 05f7689..0000000
@@ -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
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +3 -7
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
@@ -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 \
Signature · 1 line
2.8.2
#1 lore raw

PATCH 2/3 pidgin: add PACKAGECONFIGs

* disable gstreamer and vv, because gstreamer 0.10 is in meta-multimedia now
* disable farsight2/farstream, because farsight2 is blacklisted
* don't enable X11 support without x11 in DISTRO_FEATURES
* allow to disable all UI, useful for DISTROs who want just the purple libraries like LuneOS

---
 meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb | 31 ++++++++++++++++++------
 1 file changed, 23 insertions(+), 8 deletions(-)
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb +23 -8
index 9133c1c..ac0871f 100644
@@ -2,7 +2,7 @@ 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 libxml2 gconf dbus-glib"
+DEPENDS = "python virtual/libintl intltool-native libxml2 gconf"
 
 inherit autotools gettext pkgconfig gconf perlnative
 
@@ -16,18 +16,33 @@ SRC_URI = "\
 SRC_URI[md5sum] = "14e0f5cfb2ed065e4dc80391a806ac76"
 SRC_URI[sha256sum] = "2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd"
 
+PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \
+"
+PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2"
+#  --disable-gstreamer     compile without GStreamer audio support
+#  --disable-gstreamer-video
+#                          compile without GStreamer 1.0 Video Overlay support
+#  --disable-gstreamer-interfaces
+#                          compile without GStreamer 0.10 interface support
+#  --with-gstreamer=<version>
+#                          compile with GStreamer 0.10 or 1.0 interface
+PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer"
+PACKAGECONFIG[vv] = "--enable-vv,--disable-vv,gstreamer"
+PACKAGECONFIG[idn] = "--enable-idn,--disable-idn,libidn"
+PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+"
+PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11"
+PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
+PACKAGECONFIG[consoleui] = "--enable-consoleui --with-ncurses-headers=${STAGING_INCDIR},--disable-consoleui,ncurses"
+PACKAGECONFIG[gnutls] = "--enable-gnutls --with-gnutls-includes=${STAGING_INCDIR} --with-gnutls-libs=${STAGING_LIBDIR},--disable-gnutls,gnutls"
+PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib"
+PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
+
 EXTRA_OECONF = " \
-    --enable-vv \
     --disable-perl \
     --disable-tcl \
     --disable-gevolution \
     --disable-schemas-install \
-    --x-includes=${STAGING_INCDIR} \
-    --x-libraries=${STAGING_LIBDIR} \
-    --enable-gnutls=yes \
-    --with-ncurses-headers=${STAGING_INCDIR} \
-    --with-gnutls-includes=${STAGING_INCDIR} \
-    --with-gnutls-libs=${STAGING_LIBDIR} \
     --disable-gtkspell \
     --disable-meanwhile \
     --disable-nm \
Signature · 1 line
2.8.2
#2 lore raw

PATCH 3/3 pidgin: use pkg-config instead of hardcoded paths or python-config

In reply to Martin Jansa

* also fix following QA warning:
WARNING: pidgin-2.10.12-r0 do_package: QA Issue: pidgin: Files/directories were installed but not shipped in any package:
/usr/share/appdata
/usr/share/appdata/pidgin.appdata.xml
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
pidgin: 2 installed and not shipped files. [installed-vs-shipped]

---
 .../pidgin/pidgin/pidgin-cross-python-265.patch    | 51 ++++++++++++----------
 meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb   |  2 +-
 2 files changed, 30 insertions(+), 23 deletions(-)
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +29 -22
index cfc681c..72bf4ed 100644
@@ -1,27 +1,34 @@
-From 428836ba7f9048970626ef0d6b805107f7c52d33 Mon Sep 17 00:00:00 2001
-From: Herrie <[email protected]>
-Date: Thu, 5 May 2016 13:33:29 +0200
-Subject: [PATCH] Updated python patch
+Use pkg-config instead of ${PYTHON}-config to find python
 
----
- 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)
+diff -uNr pidgin-2.10.12.orig/configure.ac pidgin-2.10.12/configure.ac
+--- pidgin-2.10.12.orig/configure.ac	2016-01-01 00:19:40.000000000 +0100
++++ pidgin-2.10.12/configure.ac	2016-05-05 16:55:13.258945925 +0200
+@@ -1585,20 +1585,15 @@
+ dnl Check for Python headers (currently useful only for libgnt)
+ 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
+-	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.])
- 		AC_MSG_RESULT(ok)
- 	else
- 		AC_MSG_RESULT([Cannot find ${PYTHON}-config])
-
+-		AC_MSG_RESULT(ok)
+-	else
+-		AC_MSG_RESULT([Cannot find ${PYTHON}-config])
+-		PY_CFLAGS=""
+-		PY_LIBS=""
+-	fi
++        AC_MSG_CHECKING(for Python compile flags)
++        PKG_CHECK_MODULES(PY, python, [
++                AC_SUBST(PY_CFLAGS)
++                AC_SUBST(PY_LIBS)
++        ], [
++                AC_MSG_RESULT(no)
++                AC_MSG_ERROR([Can't find python])
++        ])
+ fi
+-AC_SUBST(PY_CFLAGS)
+-AC_SUBST(PY_LIBS)
+ 
+ dnl #######################################################################
+ dnl # Check for Mono support
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb +1 -1
index ac0871f..cd46140 100644
@@ -83,7 +83,7 @@ FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \
            ${datadir}/applications"
 RRECOMMENDS_${PN} = "${PN}-data libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp"
 
-FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons"
+FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata"
 FILES_${PN}-dev += "${libdir}/${PN}/*.la"
 
 PACKAGES_DYNAMIC += "^libpurple-protocol-.* ^libpurple-plugin-.* ^pidgin-plugin-.* ^finch-plugin-.*"
Signature · 1 line
2.8.2
#3 lore raw
In reply to Martin Jansa
Quoted 3 lines · Martin Jansa

From: Herrie <[email protected]>

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

Quoted 106 lines
---
 .../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%)
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +23 -12
index 57c4c46..cfc681c 100644
@@ -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 <[email protected]>
+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])
+
meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted +0 -11
deleted file mode 100644
index 05f7689..0000000
@@ -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
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +3 -7
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
@@ -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 \
#4 lore raw

For me the imporant part is already in commit message, old version doesn't build at all, new does, so it's improvement in itself.

Security fixes are good bonus, but in this case older version wasn't really affected because it couldn't be even built with corresponding gnutls from oe-core release.

Quoted 155 lines · On Sat, May 7, 2016 at 8:09 PM, akuster808 <[email protected]> wrote:
Quoted 3 lines · Martin Jansa

From: Herrie <[email protected]>

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

Quoted 4 lines
---
 .../pidgin/pidgin/pidgin-cross-python-265.patch    | 35

++++++++++++++--------

Quoted 4 lines
 .../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

Quoted 1 line
 rename meta-oe/recipes-support/pidgin/{pidgin_2.10.9.bb =>

pidgin_2.10.12.bb} (91%)

Quoted 2 lines

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

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 9

Quoted 13 lines

index 57c4c46..cfc681c 100644

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -9
@@ -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"

Quoted 6 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +5 -1
--            PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
+From 428836ba7f9048970626ef0d6b805107f7c52d33 Mon Sep 17 00:00:00 2001
+From: Herrie <[email protected]>
+Date: Thu, 5 May 2016 13:33:29 +0200
+Subject: [PATCH] Updated python patch
+

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch

Quoted 10 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +10 -0
+---
+ 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

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch

Quoted 5 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +5 -0
+     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.])

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 22

Quoted 2 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -0
 +            m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
 +

PY_LIBS="-L$PKG_CONFIG_SYSROOT_DIR/usr/lib/python$PY_VERSION/config -lpython$PY_VERSION"

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 13

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -1
-+

PY_CFLAGS="-I$PKG_CONFIG_SYSROOT_DIR/usr/include/python$PY_VERSION"

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 14

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -1
-             AC_DEFINE(USE_PYTHON, [1], [Define if python headers are

available.])

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 23

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +1 -0
++

PY_CFLAGS="-I$PKG_CONFIG_SYSROOT_DIR/usr/include/python$PY_VERSION"
AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.])

Quoted 5 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +2 -0
              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

meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch line 1

Quoted 6 lines

deleted file mode 100644
index 05f7689..0000000

meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted +0 -1
@@ -1,11 +0,0 @@
---- pidgin-2.0.1/pidgin.desktop.in.orig      2007-06-20

23:50:44.000000000 +0000

meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch line 2

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted +0 -1
-+++ pidgin-2.0.1/pidgin.desktop.in   2007-06-20 23:51:05.000000000

+0000

Review

Quoted 10 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted +0 -9
-@@ -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
(quoted diff) +0 -0

b/meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client" · line 5

Quoted 11 lines

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

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -1
@@ -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"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client" · line 5

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +1 -0
+DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls

virtual/libintl gstreamer dbus intltool-native farsight2 libidn libxml2 gconf dbus-glib"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client"

Quoted 5 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -2
 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"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client"

Quoted 11 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -4
-
 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"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client" · line 16

Quoted 2 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +2 -0
+SRC_URI[md5sum] = "14e0f5cfb2ed065e4dc80391a806ac76"
+SRC_URI[sha256sum] =

"2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client"

Quoted 4 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -0
 EXTRA_OECONF = " \
     --enable-vv \
 

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#5 lore raw
Quoted 2 lines · Martin Jansa

For me the imporant part is already in commit message, old version doesn't build at all, new does, so it's improvement in itself.

I didn't get that from "Which is compatible with GnuTLS that's included in Krogoth." nor "pidgin: Update to 2.10.12".

thanks for explaining, some days I need more help than others : )

- armin

Quoted 162 lines

Security fixes are good bonus, but in this case older version wasn't really affected because it couldn't be even built with corresponding gnutls from oe-core release.

Quoted 155 lines · On Sat, May 7, 2016 at 8:09 PM, akuster808 <[email protected]> wrote:
Quoted 3 lines · Martin Jansa

From: Herrie <[email protected]>

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

Quoted 4 lines
---
 .../pidgin/pidgin/pidgin-cross-python-265.patch    | 35

++++++++++++++--------

Quoted 4 lines
 .../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

Quoted 1 line
 rename meta-oe/recipes-support/pidgin/{pidgin_2.10.9.bb =>

pidgin_2.10.12.bb} (91%)

Quoted 2 lines

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

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 9

Quoted 13 lines

index 57c4c46..cfc681c 100644

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -9
@@ -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"

Quoted 6 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +5 -1
--            PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
+From 428836ba7f9048970626ef0d6b805107f7c52d33 Mon Sep 17 00:00:00 2001
+From: Herrie <[email protected]>
+Date: Thu, 5 May 2016 13:33:29 +0200
+Subject: [PATCH] Updated python patch
+

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch

Quoted 10 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +10 -0
+---
+ 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

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch

Quoted 5 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +5 -0
+     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.])

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 22

Quoted 2 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -0
 +            m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
 +

PY_LIBS="-L$PKG_CONFIG_SYSROOT_DIR/usr/lib/python$PY_VERSION/config -lpython$PY_VERSION"

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 13

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -1
-+

PY_CFLAGS="-I$PKG_CONFIG_SYSROOT_DIR/usr/include/python$PY_VERSION"

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 14

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -1
-             AC_DEFINE(USE_PYTHON, [1], [Define if python headers are

available.])

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 23

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +1 -0
++

PY_CFLAGS="-I$PKG_CONFIG_SYSROOT_DIR/usr/include/python$PY_VERSION"
AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.])

Quoted 5 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +2 -0
              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

meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch line 1

Quoted 6 lines

deleted file mode 100644
index 05f7689..0000000

meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted +0 -1
@@ -1,11 +0,0 @@
---- pidgin-2.0.1/pidgin.desktop.in.orig      2007-06-20

23:50:44.000000000 +0000

meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch line 2

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted +0 -1
-+++ pidgin-2.0.1/pidgin.desktop.in   2007-06-20 23:51:05.000000000

+0000

Review

Quoted 10 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted +0 -9
-@@ -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
(quoted diff) +0 -0

b/meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client" · line 5

Quoted 11 lines

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

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -1
@@ -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"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client" · line 5

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +1 -0
+DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls

virtual/libintl gstreamer dbus intltool-native farsight2 libidn libxml2 gconf dbus-glib"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client"

Quoted 5 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -2
 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"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client"

Quoted 11 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -4
-
 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"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client" · line 16

Quoted 2 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +2 -0
+SRC_URI[md5sum] = "14e0f5cfb2ed065e4dc80391a806ac76"
+SRC_URI[sha256sum] =

"2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client"

Quoted 4 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -0
 EXTRA_OECONF = " \
     --enable-vv \
 

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#6 lore raw
In reply to Martin Jansa
Quoted 6 lines · Martin Jansa

For me the imporant part is already in commit message, old version doesn't build at all, new does, so it's improvement in itself.

Security fixes are good bonus, but in this case older version wasn't really affected because it couldn't be even built with corresponding gnutls from oe-core release.

I see you got impatient and pushed the changes in. I have those staged.

the "llvm3.3: Disable auto -dbg packages" commit to krogoth-next, is that needed in Master?

- Armin

Quoted 152 lines · On Sat, May 7, 2016 at 8:09 PM, akuster808 <[email protected]> wrote:
Quoted 150 lines · Martin Jansa
Quoted 3 lines

From: Herrie <[email protected]>

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

Quoted 3 lines
---
 .../pidgin/pidgin/pidgin-cross-python-265.patch    | 35

++++++++++++++--------

Quoted 4 lines
 .../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

Quoted 1 line
 rename meta-oe/recipes-support/pidgin/{pidgin_2.10.9.bb =>

pidgin_2.10.12.bb} (91%)

Quoted 1 line

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

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 9

Quoted 13 lines

index 57c4c46..cfc681c 100644

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -9
@@ -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"

Quoted 6 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +5 -1
--            PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
+From 428836ba7f9048970626ef0d6b805107f7c52d33 Mon Sep 17 00:00:00 2001
+From: Herrie <[email protected]>
+Date: Thu, 5 May 2016 13:33:29 +0200
+Subject: [PATCH] Updated python patch
+

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch

Quoted 10 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +10 -0
+---
+ 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

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch

Quoted 5 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +5 -0
+     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.])

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 22

Quoted 2 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -0
 +            m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
 +

PY_LIBS="-L$PKG_CONFIG_SYSROOT_DIR/usr/lib/python$PY_VERSION/config -lpython$PY_VERSION"

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 13

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -1
-+

PY_CFLAGS="-I$PKG_CONFIG_SYSROOT_DIR/usr/include/python$PY_VERSION"

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 14

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -1
-             AC_DEFINE(USE_PYTHON, [1], [Define if python headers are

available.])

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 23

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +1 -0
++

PY_CFLAGS="-I$PKG_CONFIG_SYSROOT_DIR/usr/include/python$PY_VERSION"
AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.])

Quoted 5 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +2 -0
              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

meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch line 1

Quoted 6 lines

deleted file mode 100644
index 05f7689..0000000

meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted +0 -1
@@ -1,11 +0,0 @@
---- pidgin-2.0.1/pidgin.desktop.in.orig      2007-06-20

23:50:44.000000000 +0000

meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch line 2

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted +0 -1
-+++ pidgin-2.0.1/pidgin.desktop.in   2007-06-20 23:51:05.000000000

+0000

Review

Quoted 10 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted +0 -9
-@@ -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
(quoted diff) +0 -0

b/meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client" · line 5

Quoted 11 lines

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

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -1
@@ -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"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client" · line 5

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +1 -0
+DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls

virtual/libintl gstreamer dbus intltool-native farsight2 libidn libxml2 gconf dbus-glib"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client"

Quoted 4 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -2
 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"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client"

Quoted 11 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -4
-
 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"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client" · line 16

Quoted 2 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +2 -0
+SRC_URI[md5sum] = "14e0f5cfb2ed065e4dc80391a806ac76"
+SRC_URI[sha256sum] =

"2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client"

Quoted 3 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -0
 EXTRA_OECONF = " \
     --enable-vv \
 

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#7 lore raw
Quoted 9 lines · On Mon, May 09, 2016 at 11:32:04AM -0700, akuster808 wrote:
Quoted 6 lines · Martin Jansa

For me the imporant part is already in commit message, old version doesn't build at all, new does, so it's improvement in itself.

Security fixes are good bonus, but in this case older version wasn't really affected because it couldn't be even built with corresponding gnutls from oe-core release.

I see you got impatient and pushed the changes in. I have those staged.

Sorry I've pushed them to krogoth-next only so I don't forgot to make you include them eventually, but please stage them in normal consolidated pull as always.

Quoted 2 lines

the "llvm3.3: Disable auto -dbg packages" commit to krogoth-next, is that needed in Master?

yes, it is (fixes DEBUGFS generation) and it's also in master-next will be merged to master soon.

Quoted 154 lines

- Armin

Quoted 152 lines · On Sat, May 7, 2016 at 8:09 PM, akuster808 <[email protected]> wrote:
Quoted 150 lines · Martin Jansa
Quoted 3 lines

From: Herrie <[email protected]>

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

Quoted 3 lines
---
 .../pidgin/pidgin/pidgin-cross-python-265.patch    | 35

++++++++++++++--------

Quoted 4 lines
 .../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

Quoted 1 line
 rename meta-oe/recipes-support/pidgin/{pidgin_2.10.9.bb =>

pidgin_2.10.12.bb} (91%)

Quoted 1 line

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

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 9

Quoted 13 lines

index 57c4c46..cfc681c 100644

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -9
@@ -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"

Quoted 6 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +5 -1
--            PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
+From 428836ba7f9048970626ef0d6b805107f7c52d33 Mon Sep 17 00:00:00 2001
+From: Herrie <[email protected]>
+Date: Thu, 5 May 2016 13:33:29 +0200
+Subject: [PATCH] Updated python patch
+

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch

Quoted 10 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +10 -0
+---
+ 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

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch

Quoted 5 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +5 -0
+     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.])

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 22

Quoted 2 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -0
 +            m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
 +

PY_LIBS="-L$PKG_CONFIG_SYSROOT_DIR/usr/lib/python$PY_VERSION/config -lpython$PY_VERSION"

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 13

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -1
-+

PY_CFLAGS="-I$PKG_CONFIG_SYSROOT_DIR/usr/include/python$PY_VERSION"

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 14

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +0 -1
-             AC_DEFINE(USE_PYTHON, [1], [Define if python headers are

available.])

meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch line 23

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +1 -0
++

PY_CFLAGS="-I$PKG_CONFIG_SYSROOT_DIR/usr/include/python$PY_VERSION"
AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.])

Quoted 5 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +2 -0
              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

meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch line 1

Quoted 6 lines

deleted file mode 100644
index 05f7689..0000000

meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted +0 -1
@@ -1,11 +0,0 @@
---- pidgin-2.0.1/pidgin.desktop.in.orig      2007-06-20

23:50:44.000000000 +0000

meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch line 2

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted +0 -1
-+++ pidgin-2.0.1/pidgin.desktop.in   2007-06-20 23:51:05.000000000

+0000

Review

Quoted 10 lines
meta-oe/recipes-support/pidgin/pidgin/pidgin.desktop-set-icon.patch deleted +0 -9
-@@ -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
(quoted diff) +0 -0

b/meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client" · line 5

Quoted 11 lines

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

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -1
@@ -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"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client" · line 5

Quoted 1 line
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +1 -0
+DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls

virtual/libintl gstreamer dbus intltool-native farsight2 libidn libxml2 gconf dbus-glib"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client"

Quoted 4 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -2
 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"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client"

Quoted 11 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -4
-
 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"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client" · line 16

Quoted 2 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +2 -0
+SRC_URI[md5sum] = "14e0f5cfb2ed065e4dc80391a806ac76"
+SRC_URI[sha256sum] =

"2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd"

meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb DESCRIPTION = "multi-protocol instant messaging client"

Quoted 3 lines
meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb +0 -0
 EXTRA_OECONF = " \
     --enable-vv \
 

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]