diff options
| author | Stanislav Brabec <utx@penguin.cz> | 2010-01-22 00:33:28 +0000 |
|---|---|---|
| committer | utx@penguin.cz <utx@penguin.cz> | 2010-01-22 00:33:28 +0000 |
| commit | 1922d0e8813af43a4228dadf3f5899dd7419320f (patch) | |
| tree | 2661f68c5ec527378bffaf421959df6441088835 /recipes/pidgin | |
| parent | e2cc28b2075e064e73bc6e6a10cf5f115fdcb124 (diff) | |
pidgin: Update to version 2.6.5 (security: CVE-2010-0013).
* Fixes, security update for MSN plugin.
* Removed unreferred recipes for vulnerable versions.
Diffstat (limited to 'recipes/pidgin')
| -rw-r--r-- | recipes/pidgin/pidgin/pidgin-cross-python-265.patch | 16 | ||||
| -rw-r--r-- | recipes/pidgin/pidgin_2.6.2.bb | 20 | ||||
| -rw-r--r-- | recipes/pidgin/pidgin_2.6.5.bb (renamed from recipes/pidgin/pidgin_2.6.4.bb) | 2 |
3 files changed, 17 insertions, 21 deletions
diff --git a/recipes/pidgin/pidgin/pidgin-cross-python-265.patch b/recipes/pidgin/pidgin/pidgin-cross-python-265.patch new file mode 100644 index 0000000000..57c4c46814 --- /dev/null +++ b/recipes/pidgin/pidgin/pidgin-cross-python-265.patch @@ -0,0 +1,16 @@ +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" ++ 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 diff --git a/recipes/pidgin/pidgin_2.6.2.bb b/recipes/pidgin/pidgin_2.6.2.bb deleted file mode 100644 index d3b27a771b..0000000000 --- a/recipes/pidgin/pidgin_2.6.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -require pidgin.inc -PR = "${INC_PR}.1" - -DEPENDS += "farsight2 libidn" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ - file://sanitize-configure.ac.patch;patch=1 \ - file://pidgin.desktop-set-icon.patch;patch=1 \ - file://purple-OE-branding-25.patch;patch=1 \ - file://pidgin-cross-python.patch;patch=1 \ - file://status-icon-theme-crash.patch;patch=1 \ -" - -EXTRA_OECONF += "\ - --disable-gtkspell \ - --disable-meanwhile \ - --disable-nm \ - --disable-screensaver \ -" diff --git a/recipes/pidgin/pidgin_2.6.4.bb b/recipes/pidgin/pidgin_2.6.5.bb index 7ced40d9c3..67b573fa3e 100644 --- a/recipes/pidgin/pidgin_2.6.4.bb +++ b/recipes/pidgin/pidgin_2.6.5.bb @@ -8,7 +8,7 @@ SRC_URI = "\ file://sanitize-configure.ac.patch;patch=1 \ file://pidgin.desktop-set-icon.patch;patch=1 \ file://purple-OE-branding-25.patch;patch=1 \ - file://pidgin-cross-python.patch;patch=1 \ + file://pidgin-cross-python-265.patch;patch=1 \ " EXTRA_OECONF += "\ |