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

- update pidgin to 2.7.11

Browse Source 
* various fixes and a fix for CVE-2011-1091

from brad (MAINTAINER)
This commit is contained in:
jasper 2011-03-13 17:27:10 +00:00
parent b642536efb
commit ca5e20e14b
6 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
net/pidgin/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.89 2011/03/11 00:13:04 sthen Exp $
# $OpenBSD: Makefile,v 1.90 2011/03/13 17:27:10 jasper Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ 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.10
VERSION= 2.7.11
DISTNAME= pidgin-${VERSION}
PKGNAME-main= pidgin-${VERSION}
PKGNAME-finch= finch-${VERSION}
@ -15,16 +15,13 @@ PKGNAME-libpurple= libpurple-${VERSION}
FULLPKGNAME$i= ${PKGNAME$i}${FLAVOR_EXT:S/-gtkspell//}
FULLPKGPATH$i= ${PKGPATH},$i${FLAVOR_EXT:S/-gtkspell//:S/-/,/g}
.endfor
REVISION-main= 0
REVISION-finch= 0
REVISION-libpurple= 0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
SHARED_LIBS= jabber 0.0 \
oscar 0.0 \
purple 5.1 \
purple-client 5.1 \
purple 5.2 \
purple-client 5.2 \
gnt 6.0 \
ymsg 0.0
@ -43,11 +40,10 @@ WANTLIB= c dbus-1 dbus-glib-1 glib-2.0 gmodule-2.0 gobject-2.0 \
WANTLIB-main= GL X11 Xau Xdmcp ICE SM Xcomposite Xcursor Xdamage Xext \
Xfixes Xi Xinerama Xrandr Xrender Xss Xxf86vm atk-1.0 cairo \
drm execinfo 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 stdc++ xcb-atom \
startup-notification-1 purple xcb-aux xcb-event xcb-render \
xcb-shm xcb ${WANTLIB}
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}
WANTLIB-libpurple= crypto ssl silc>=7 silcclient>=5 meanwhile gadu>=4 \
${WANTLIB}
@ -61,11 +57,12 @@ MODULES= devel/gettext \
devel/gconf2
BUILD_DEPENDS= x11/dbus-python
LIB_DEPENDS= devel/glib2
RUN_DEPENDS-main= x11/dbus-python \
x11/py-gtk2 \
devel/desktop-file-utils
LIB_DEPENDS-main= ${LIB_DEPENDS} \
devel/startup-notification>=0.10
x11/gtk+2
RUN_DEPENDS-finch= # empty
LIB_DEPENDS-finch= ${LIB_DEPENDS} \
${MODPY_LIB_DEPENDS}

10
net/pidgin/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pidgin-2.7.10.tar.gz) = CExNML8pXvlY6S4nl/6Q6A==
RMD160 (pidgin-2.7.10.tar.gz) = nfxnXThZmAwln4StlXF4w9Lv3O4=
SHA1 (pidgin-2.7.10.tar.gz) = nQCZWHqWC53kSP7xzFAo8I3kHPQ=
SHA256 (pidgin-2.7.10.tar.gz) = LSqJf278Tu+KDyIyvu2ILilVc0+2n39+B46Z0Kqql+A=
SIZE (pidgin-2.7.10.tar.gz) = 14134697
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

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.23 2011/03/11 00:13:04 sthen Exp $
--- configure.ac.orig Sun Feb 6 22:42:11 2011
+++ configure.ac Sun Mar 6 16:38:10 2011
@@ -994,7 +994,7 @@ else
$OpenBSD: patch-configure_ac,v 1.24 2011/03/13 17:27:11 jasper Exp $
--- configure.ac.orig Thu Mar 10 21:20:27 2011
+++ configure.ac Fri Mar 11 18:59:03 2011
@@ -972,7 +972,7 @@ else
if test "$ac_silc_libs" != "no"; then
SILC_LIBS="-L$ac_silc_libs"
fi
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.23 2011/03/11 00:13:04 sthen Exp $
AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then
@@ -1350,7 +1350,6 @@ if test "x$GCC" = "xyes"; then
@@ -1328,7 +1328,6 @@ if test "x$GCC" = "xyes"; then
fi
DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS"
@ -18,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.23 2011/03/11 00:13:04 sthen Exp $
fi
if test "x$SUNCC" = "xyes"; then
@@ -1719,6 +1718,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
@@ -1697,6 +1696,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
dnl These two are inverses of each other <-- stolen from evolution!
@ -30,7 +30,7 @@ $OpenBSD: patch-configure_ac,v 1.23 2011/03/11 00:13:04 sthen Exp $
AC_ARG_ENABLE(gnutls,
[ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support [default=yes]],
[enable_gnutls="$enableval"],
@@ -1729,10 +1733,98 @@ AC_ARG_ENABLE(nss,
@@ -1707,10 +1711,98 @@ AC_ARG_ENABLE(nss,
[enable_nss="$enableval"],
[enable_nss="yes"])
@ -131,7 +131,7 @@ $OpenBSD: patch-configure_ac,v 1.23 2011/03/11 00:13:04 sthen Exp $
dnl #
if test "x$enable_gnutls" != "xno"; then
enable_gnutls="no"
@@ -2130,17 +2222,32 @@ fi
@@ -2108,17 +2200,32 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")

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

@ -1,6 +1,6 @@
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.24 2010/10/24 19:17:31 steven Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Wed Oct 20 11:50:58 2010
+++ libpurple/plugins/ssl/Makefile.in Thu Oct 21 19:55:54 2010
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.25 2011/03/13 17:27:11 jasper Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Thu Mar 10 21:20:43 2011
+++ libpurple/plugins/ssl/Makefile.in Fri Mar 11 18:59:03 2011
@@ -69,6 +69,12 @@ am__base_list = \
am__installdirs = "$(DESTDIR)$(plugindir)"
LTLIBRARIES = $(plugin_LTLIBRARIES)
@ -32,7 +32,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.24 2010/10/24 19:17:31 ste
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
GNUTLS_LIBS = @GNUTLS_LIBS@
GREP = @GREP@
@@ -400,6 +408,7 @@ EXTRA_DIST = \
@@ -398,6 +406,7 @@ EXTRA_DIST = \
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
ssl_la_LDFLAGS = -module -avoid-version
@ -40,7 +40,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.24 2010/10/24 19:17:31 ste
ssl_gnutls_la_LDFLAGS = -module -avoid-version
ssl_nss_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@@USE_GNUTLS_FALSE@@USE_NSS_FALSE@plugin_LTLIBRARIES = \
@@ -413,19 +422,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version
@@ -411,19 +420,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl.la \
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl-gnutls.la
@ -66,7 +66,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.24 2010/10/24 19:17:31 ste
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
AM_CPPFLAGS = \
@@ -437,6 +452,7 @@ AM_CPPFLAGS = \
@@ -435,6 +450,7 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS)
@ -74,7 +74,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.24 2010/10/24 19:17:31 ste
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
all: all-am
@@ -504,6 +520,8 @@ clean-pluginLTLIBRARIES:
@@ -502,6 +518,8 @@ clean-pluginLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
@ -83,7 +83,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.24 2010/10/24 19:17:31 ste
ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES)
$(AM_V_CCLD)$(ssl_gnutls_la_LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
ssl-nss.la: $(ssl_nss_la_OBJECTS) $(ssl_nss_la_DEPENDENCIES)
@@ -518,6 +536,7 @@ distclean-compile:
@@ -516,6 +534,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl.Plo@am__quote@

12
net/pidgin/patches/patch-libpurple_protocols_silc_silc_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_silc_silc_c,v 1.7 2011/03/06 14:13:20 steven Exp $
--- libpurple/protocols/silc/silc.c.orig Sat Jan 8 10:19:45 2011
+++ libpurple/protocols/silc/silc.c Wed Feb 23 20:44:51 2011
@@ -672,30 +672,12 @@ silcpurple_close(PurpleConnection *gc)
$OpenBSD: patch-libpurple_protocols_silc_silc_c,v 1.8 2011/03/13 17:27:11 jasper Exp $
--- libpurple/protocols/silc/silc.c.orig Thu Mar 10 21:20:28 2011
+++ libpurple/protocols/silc/silc.c Fri Mar 11 18:58:56 2011
@@ -674,30 +674,12 @@ silcpurple_close(PurpleConnection *gc)
SilcPurpleTask task;
#endif /* __SILC_TOOLKIT_VERSION */
GHashTable *ui_info;
@ -33,7 +33,7 @@ $OpenBSD: patch-libpurple_protocols_silc_silc_c,v 1.7 2011/03/06 14:13:20 steven
if (sg->conn)
silc_client_close_connection(sg->client, sg->conn);
@@ -1842,9 +1824,6 @@ static PurpleCmdRet silcpurple_cmd_quit(PurpleConversa
@@ -1846,9 +1828,6 @@ static PurpleCmdRet silcpurple_cmd_quit(PurpleConversa
{
PurpleConnection *gc;
SilcPurple sg;
@ -43,7 +43,7 @@ $OpenBSD: patch-libpurple_protocols_silc_silc_c,v 1.7 2011/03/06 14:13:20 steven
gc = purple_conversation_get_gc(conv);
@@ -1856,23 +1835,8 @@ static PurpleCmdRet silcpurple_cmd_quit(PurpleConversa
@@ -1860,23 +1839,8 @@ static PurpleCmdRet silcpurple_cmd_quit(PurpleConversa
if (sg == NULL)
return PURPLE_CMD_RET_FAILED;

12
net/pidgin/patches/patch-pidgin_gtkmain_c
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-pidgin_gtkmain_c,v 1.11 2010/08/18 21:36:00 steven Exp $
--- pidgin/gtkmain.c.orig Tue Aug 10 03:35:50 2010
+++ pidgin/gtkmain.c Sun Aug 15 21:45:53 2010
@@ -90,6 +90,7 @@ static SnDisplay *sn_display = NULL;
#endif
$OpenBSD: patch-pidgin_gtkmain_c,v 1.12 2011/03/13 17:27:11 jasper Exp $
--- pidgin/gtkmain.c.orig Thu Mar 10 21:20:28 2011
+++ pidgin/gtkmain.c Fri Mar 11 18:58:56 2011
@@ -78,6 +78,7 @@
#ifdef HAVE_SIGNAL_H
+int real_status;
/*
* Lists of signals we wish to catch and those we wish to ignore.
@@ -163,6 +164,8 @@ clean_pid(void)
@@ -151,6 +152,8 @@ clean_pid(void)
do {
pid = waitpid(-1, &status, WNOHANG);
} while (pid != 0 && pid != (pid_t)-1);