cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update pidgin to 2.9.0

Browse Source 
* includes a security fix for SA45037 Pidgin "gdk_pixbuf__gif_image_load()" Denial of Service Weakness

from brad (MAINTAINER)
This commit is contained in:
jasper 2011-07-22 06:44:45 +00:00
parent 49c96a6e30
commit 36ba1270db
11 changed files with 75 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
net/pidgin/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.96 2011/07/09 12:46:31 dcoppa Exp $
# $OpenBSD: Makefile,v 1.97 2011/07/22 06:44:45 jasper Exp $
SHARED_ONLY= Yes
@ -6,14 +6,11 @@ COMMENT-main= multi-protocol instant messaging client
COMMENT-finch= multi-protocol instant messaging client, console client
COMMENT-libpurple= multi-protocol instant messaging library
VERSION= 2.7.11
VERSION= 2.9.0
DISTNAME= pidgin-${VERSION}
PKGNAME-main= pidgin-${VERSION}
PKGNAME-finch= finch-${VERSION}
PKGNAME-libpurple= libpurple-${VERSION}
REVISION-main= 1
REVISION-finch= 2
REVISION-libpurple= 1
.for i in -finch -libpurple
FULLPKGNAME$i= ${PKGNAME$i}${FLAVOR_EXT:S/-gtkspell//}
FULLPKGPATH$i= ${PKGPATH},$i${FLAVOR_EXT:S/-gtkspell//:S/-/,/g}
@ -23,9 +20,9 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
SHARED_LIBS= jabber 0.0 \
oscar 0.0 \
purple 5.2 \
purple-client 5.2 \
gnt 6.0 \
purple 6.0 \
purple-client 6.0 \
gnt 6.1 \
ymsg 0.0
HOMEPAGE= http://pidgin.im/
@ -38,21 +35,20 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c dbus-1 dbus-glib-1 gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 gthread-2.0 m pcre pthread util xml2 z
WANTLIB= c dbus-1 dbus-glib-1 glib-2.0 gmodule-2.0 gobject-2.0 \
gthread-2.0 m pcre pthread util xml2 z
WANTLIB-main= GL X11 Xau Xdmcp ICE SM Xcomposite Xcursor Xdamage Xext \
Xfixes Xi Xinerama Xrandr Xrender Xss Xxf86vm atk-1.0 cairo \
drm expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
gio-2.0 gtk-x11-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pixman-1 png pthread-stubs purple stdc++ xcb-atom xcb-aux \
xcb-event xcb-render xcb-shm xcb ${WANTLIB}
pixman-1 png pthread-stubs purple stdc++ xcb-render xcb-shm \
xcb ${WANTLIB}
WANTLIB-libpurple= crypto ssl silc>=7 silcclient>=5 meanwhile gadu>=4 \
WANTLIB-libpurple= crypto gadu>=5 meanwhile ssl silc>=7 silcclient>=5 \
${WANTLIB}
WANTLIB-finch= X11 Xau Xdmcp ncursesw panelw pthread-stubs xcb purple \
${WANTLIB} ${MODPY_WANTLIB}
WANTLIB-finch= X11 ncursesw panelw purple xcb ${WANTLIB} ${MODPY_WANTLIB}
MODULES= devel/gettext \
textproc/intltool \
@ -73,7 +69,7 @@ RUN_DEPENDS-libpurple= ${MODGCONF2_RUN_DEPENDS}
LIB_DEPENDS-libpurple= ${LIB_DEPENDS} \
devel/silc-toolkit \
net/meanwhile \
net/libgadu
net/libgadu>=1.11.0
MODGCONF2_SCHEMAS_DIR= pidgin
MODGCONF2_LIBDEP= No

10
net/pidgin/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pidgin-2.7.11.tar.gz) = eJE28PC3fSioBZuItQ+wJA==
RMD160 (pidgin-2.7.11.tar.gz) = p0EcgdpQVymBXEzCa29Uvbs3o+g=
SHA1 (pidgin-2.7.11.tar.gz) = oLYOT+RoOZpxjz2AymldaU+C6ms=
SHA256 (pidgin-2.7.11.tar.gz) = 8oBCaHbED9CXu/lO8nIYiIJUcp+kLNs6gKASDci+1C4=
SIZE (pidgin-2.7.11.tar.gz) = 14152728
MD5 (pidgin-2.9.0.tar.gz) = Q8Y7AgyUhuTqYXmUXkm3wQ==
RMD160 (pidgin-2.9.0.tar.gz) = Ay7g/njb78ORhTws0dZWkvzU5wY=
SHA1 (pidgin-2.9.0.tar.gz) = 9uC9qSP7pWFj8aCNLG8TR1nRAAI=
SHA256 (pidgin-2.9.0.tar.gz) = MtUDtPFaVrxfhUYhr1/oz+gOeZKien6JmGtPI5XoW44=
SIZE (pidgin-2.9.0.tar.gz) = 14061566

16
net/pidgin/patches/patch-configure_ac
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.26 2011/07/09 12:46:31 dcoppa Exp $
--- configure.ac.orig Fri Mar 11 03:20:27 2011
+++ configure.ac Fri Jul 8 16:15:02 2011
$OpenBSD: patch-configure_ac,v 1.27 2011/07/22 06:44:45 jasper Exp $
--- configure.ac.orig Wed Jun 22 03:32:24 2011
+++ configure.ac Wed Jul 13 01:08:50 2011
@@ -972,7 +972,7 @@ else
if test "$ac_silc_libs" != "no"; then
SILC_LIBS="-L$ac_silc_libs"
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.26 2011/07/09 12:46:31 dcoppa Exp $
AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then
@@ -1328,7 +1328,6 @@ if test "x$GCC" = "xyes"; then
@@ -1325,7 +1325,6 @@ if test "x$GCC" = "xyes"; then
fi
DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS"
@ -18,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.26 2011/07/09 12:46:31 dcoppa Exp $
fi
if test "x$SUNCC" = "xyes"; then
@@ -1495,7 +1494,17 @@ if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON
@@ -1492,7 +1491,17 @@ if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON
changequote([, ])dnl
if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h -a "$PY_MAJOR" = "2."; then
AC_MSG_RESULT()
@ -37,7 +37,7 @@ $OpenBSD: patch-configure_ac,v 1.26 2011/07/09 12:46:31 dcoppa Exp $
AC_CHECK_LIB(util, openpty, )
AC_CHECK_LIB(db, dbopen, )
PY_LIBS="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config -lpython$PY_VERSION"
@@ -1697,6 +1706,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
@@ -1694,6 +1703,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
dnl These two are inverses of each other <-- stolen from evolution!
@ -49,7 +49,7 @@ $OpenBSD: patch-configure_ac,v 1.26 2011/07/09 12:46:31 dcoppa Exp $
AC_ARG_ENABLE(gnutls,
[ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support [default=yes]],
[enable_gnutls="$enableval"],
@@ -1707,10 +1721,98 @@ AC_ARG_ENABLE(nss,
@@ -1704,10 +1718,98 @@ AC_ARG_ENABLE(nss,
[enable_nss="$enableval"],
[enable_nss="yes"])
@ -150,7 +150,7 @@ $OpenBSD: patch-configure_ac,v 1.26 2011/07/09 12:46:31 dcoppa Exp $
dnl #
if test "x$enable_gnutls" != "xno"; then
enable_gnutls="no"
@@ -2108,17 +2210,32 @@ fi
@@ -2105,17 +2207,32 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")

23
net/pidgin/patches/patch-finch_libgnt_gntwm_c
View File

@ -1,17 +1,12 @@
$OpenBSD: patch-finch_libgnt_gntwm_c,v 1.8 2011/03/06 14:13:20 steven Exp $
--- finch/libgnt/gntwm.c.orig Sat Jan 8 10:19:44 2011
+++ finch/libgnt/gntwm.c Wed Feb 23 20:51:51 2011
@@ -24,11 +24,10 @@
#ifdef USE_PYTHON
#include <Python.h>
-#else
+#endif
$OpenBSD: patch-finch_libgnt_gntwm_c,v 1.9 2011/07/22 06:44:45 jasper Exp $
--- finch/libgnt/gntwm.c.orig Tue Jul 12 15:33:00 2011
+++ finch/libgnt/gntwm.c Tue Jul 12 15:35:12 2011
@@ -32,7 +32,7 @@
#define _GNU_SOURCE
-#if (defined(__APPLE__) || defined(__unix__)) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+#if defined(__APPLE__) || defined(__unix__)
#define _XOPEN_SOURCE_EXTENDED
-#endif
#endif
#include <glib.h>
-#if !defined _XOPEN_SOURCE_EXTENDED && (defined(__APPLE__) || defined(__unix__)) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+#if !defined _XOPEN_SOURCE_EXTENDED && (defined(__APPLE__) || defined(__unix__))
#define _XOPEN_SOURCE_EXTENDED
#endif

11
net/pidgin/patches/patch-libpurple_protocols_msn_slp_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-libpurple_protocols_msn_slp_c,v 1.3 2011/07/22 06:44:45 jasper Exp $
--- libpurple/protocols/msn/slp.c.orig Thu Jul 14 13:04:57 2011
+++ libpurple/protocols/msn/slp.c Thu Jul 14 13:05:34 2011
@@ -284,7 +284,6 @@ send_file_cb(MsnSlpCall *slpcall)
purple_xfer_unref(xfer);
slpmsg = msn_slpmsg_file_new(slpcall, purple_xfer_get_size(xfer));
- msn_slpmsg_set_slplink(slpmsg, slpcall->slplink);
msn_slplink_send_slpmsg(slpcall->slplink, slpmsg);
}

16
net/pidgin/patches/patch-libpurple_protocols_msn_slpcall_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-libpurple_protocols_msn_slpcall_c,v 1.1 2011/07/22 06:44:45 jasper Exp $
--- libpurple/protocols/msn/slpcall.c.orig Thu Jul 14 13:05:46 2011
+++ libpurple/protocols/msn/slpcall.c Thu Jul 14 13:06:32 2011
@@ -490,12 +490,10 @@ got_sessionreq(MsnSlpCall *slpcall, const char *branch
if (img != NULL) {
/* DATA PREP */
slpmsg = msn_slpmsg_dataprep_new(slpcall);
- msn_slpmsg_set_slplink(slpmsg, slplink);
msn_slplink_queue_slpmsg(slplink, slpmsg);
/* DATA */
slpmsg = msn_slpmsg_obj_new(slpcall, img);
- msn_slpmsg_set_slplink(slpmsg, slplink);
msn_slplink_queue_slpmsg(slplink, slpmsg);
purple_imgstore_unref(img);

8
net/pidgin/patches/patch-pidgin_gtkdialogs_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.22 2010/12/23 23:25:25 steven Exp $
--- pidgin/gtkdialogs.c.orig Sun Dec 19 21:05:46 2010
+++ pidgin/gtkdialogs.c Mon Dec 20 20:35:12 2010
@@ -609,6 +609,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.23 2011/07/22 06:44:45 jasper Exp $
--- pidgin/gtkdialogs.c.orig Wed Jun 22 03:32:30 2011
+++ pidgin/gtkdialogs.c Wed Jul 13 01:08:41 2011
@@ -616,6 +616,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
#endif

10
net/pidgin/patches/patch-pidgin_gtknotify_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-pidgin_gtknotify_c,v 1.12 2010/06/10 20:13:33 steven Exp $
--- pidgin/gtknotify.c.orig Sat May 29 21:24:00 2010
+++ pidgin/gtknotify.c Fri Jun 4 21:42:39 2010
@@ -1230,7 +1230,16 @@ uri_command(const char *command, gboolean sync)
$OpenBSD: patch-pidgin_gtknotify_c,v 1.13 2011/07/22 06:44:45 jasper Exp $
--- pidgin/gtknotify.c.orig Wed Jun 22 03:32:30 2011
+++ pidgin/gtknotify.c Wed Jul 13 01:09:31 2011
@@ -1222,7 +1222,16 @@ uri_command(const char *command, gboolean sync)
g_error_free(error);
}
else
+#if HAVE_SIGNAL_H
+#ifdef HAVE_SIGNAL_H
+ {
+ extern int real_status;
+

3
net/pidgin/pkg/PLIST-finch
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-finch,v 1.5 2011/07/07 08:28:04 dcoppa Exp $
@comment $OpenBSD: PLIST-finch,v 1.6 2011/07/22 06:44:45 jasper Exp $
@conflict pidgin-<2.5.6p3
@pkgpath net/pidgin
@bin bin/finch
@ -66,4 +66,3 @@ lib/libgnt.a
lib/pkgconfig/finch.pc
lib/pkgconfig/gnt.pc
@man man/man1/finch.1
share/applications/

4
net/pidgin/pkg/PLIST-libpurple
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-libpurple,v 1.15 2011/07/07 08:28:04 dcoppa Exp $
@comment $OpenBSD: PLIST-libpurple,v 1.16 2011/07/22 06:44:45 jasper Exp $
@conflict pidgin-<2.5.6p3
@pkgpath net/pidgin
@pkgpath net/pidgin,-libpurple,gtkspell
@ -103,7 +103,6 @@ lib/purple-2/libmxit.so
lib/purple-2/libmyspace.so
lib/purple-2/libnovell.so
@lib lib/purple-2/liboscar.so.${LIBoscar_VERSION}
lib/purple-2/libqq.so
lib/purple-2/libsametime.so
lib/purple-2/libsilcpurple.so
lib/purple-2/libsimple.so
@ -129,6 +128,7 @@ share/purple/ca-certs/America_Online_Root_Certification_Authority_1.pem
share/purple/ca-certs/CAcert_Class3.pem
share/purple/ca-certs/CAcert_Root.pem
share/purple/ca-certs/Deutsche_Telekom_Root_CA_2.pem
share/purple/ca-certs/DigiCertHighAssuranceCA-3.pem
share/purple/ca-certs/Entrust.net_Secure_Server_CA.pem
share/purple/ca-certs/Equifax_Secure_CA.pem
share/purple/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem

10
net/pidgin/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.12 2011/07/07 08:28:04 dcoppa Exp $
@comment $OpenBSD: PLIST-main,v 1.13 2011/07/22 06:44:45 jasper Exp $
@conflict gaim-*
@conflict pidgin-facebookchat-<1.68p0
@pkgpath net/pidgin
@ -117,6 +117,7 @@ share/locale/gl/LC_MESSAGES/pidgin.mo
share/locale/gu/LC_MESSAGES/pidgin.mo
share/locale/he/LC_MESSAGES/pidgin.mo
share/locale/hi/LC_MESSAGES/pidgin.mo
share/locale/hr/LC_MESSAGES/pidgin.mo
share/locale/hu/LC_MESSAGES/pidgin.mo
share/locale/hy/LC_MESSAGES/pidgin.mo
share/locale/id/LC_MESSAGES/pidgin.mo
@ -279,7 +280,6 @@ share/pixmaps/pidgin/emblems/16/hiptop.png
share/pixmaps/pidgin/emblems/16/male.png
share/pixmaps/pidgin/emblems/16/not-authorized.png
share/pixmaps/pidgin/emblems/16/operator.png
share/pixmaps/pidgin/emblems/16/qq-member.png
share/pixmaps/pidgin/emblems/16/secure.png
share/pixmaps/pidgin/emblems/16/unavailable.png
share/pixmaps/pidgin/emblems/16/video.png
@ -294,7 +294,6 @@ share/pixmaps/pidgin/emblems/scalable/free-for-chat.svg
share/pixmaps/pidgin/emblems/scalable/game.svg
share/pixmaps/pidgin/emblems/scalable/male.svg
share/pixmaps/pidgin/emblems/scalable/not-authorized.svg
share/pixmaps/pidgin/emblems/scalable/qq-member.svg
share/pixmaps/pidgin/emblems/scalable/secure.svg
share/pixmaps/pidgin/emblems/scalable/unavailable.svg
share/pixmaps/pidgin/emblems/scalable/video.svg
@ -440,7 +439,6 @@ share/pixmaps/pidgin/emotes/default/poop.png
share/pixmaps/pidgin/emotes/default/pray.png
share/pixmaps/pidgin/emotes/default/present.png
share/pixmaps/pidgin/emotes/default/pumpkin.png
share/pixmaps/pidgin/emotes/default/qq.png
share/pixmaps/pidgin/emotes/default/question.png
share/pixmaps/pidgin/emotes/default/quiet.png
share/pixmaps/pidgin/emotes/default/rain.png
@ -596,7 +594,6 @@ share/pixmaps/pidgin/protocols/16/msn.png
share/pixmaps/pidgin/protocols/16/mxit.png
share/pixmaps/pidgin/protocols/16/myspace.png
share/pixmaps/pidgin/protocols/16/novell.png
share/pixmaps/pidgin/protocols/16/qq.png
share/pixmaps/pidgin/protocols/16/silc.png
share/pixmaps/pidgin/protocols/16/simple.png
share/pixmaps/pidgin/protocols/16/yahoo.png
@ -614,7 +611,6 @@ share/pixmaps/pidgin/protocols/22/meanwhile.png
share/pixmaps/pidgin/protocols/22/msn.png
share/pixmaps/pidgin/protocols/22/myspace.png
share/pixmaps/pidgin/protocols/22/novell.png
share/pixmaps/pidgin/protocols/22/qq.png
share/pixmaps/pidgin/protocols/22/silc.png
share/pixmaps/pidgin/protocols/22/simple.png
share/pixmaps/pidgin/protocols/22/yahoo.png
@ -632,7 +628,6 @@ share/pixmaps/pidgin/protocols/48/msn.png
share/pixmaps/pidgin/protocols/48/mxit.png
share/pixmaps/pidgin/protocols/48/myspace.png
share/pixmaps/pidgin/protocols/48/novell.png
share/pixmaps/pidgin/protocols/48/qq.png
share/pixmaps/pidgin/protocols/48/silc.png
share/pixmaps/pidgin/protocols/48/simple.png
share/pixmaps/pidgin/protocols/48/yahoo.png
@ -649,7 +644,6 @@ share/pixmaps/pidgin/protocols/scalable/meanwhile.svg
share/pixmaps/pidgin/protocols/scalable/msn.svg
share/pixmaps/pidgin/protocols/scalable/mxit.svg
share/pixmaps/pidgin/protocols/scalable/novell.svg
share/pixmaps/pidgin/protocols/scalable/qq.svg
share/pixmaps/pidgin/protocols/scalable/silc.svg
share/pixmaps/pidgin/protocols/scalable/simple.svg
share/pixmaps/pidgin/protocols/scalable/yahoo.svg