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

Update to Pidgin 2.10.7. Fixes 3 security issues and some crashing bugs,

Browse Source 
as well as other bug fixes. CVE-2013-0271, CVE-2013-0272, CVE-2013-0273,
CVE-2013-0274

ok sthen@
This commit is contained in:
brad 2013-03-08 01:03:09 +00:00
parent 27e72840b6
commit 3e2964487a
12 changed files with 48 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/pidgin/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.114 2013/02/09 14:49:52 sthen Exp $
# $OpenBSD: Makefile,v 1.115 2013/03/08 01:03:09 brad 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.10.6
VERSION= 2.10.7
DISTNAME= pidgin-${VERSION}
PKGNAME-main= pidgin-${VERSION}
REVISION-main= 2
PKGNAME-finch= finch-${VERSION}
REVISION-finch= 2
PKGNAME-libpurple= libpurple-${VERSION}
REVISION-libpurple= 3
.for i in -finch -libpurple
FULLPKGNAME$i= ${PKGNAME$i}${FLAVOR_EXT:S/-gtkspell//}
FULLPKGPATH$i= ${PKGPATH},$i${FLAVOR_EXT:S/-gtkspell//:S/-/,/g}

4
net/pidgin/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (pidgin-2.10.6.tar.bz2) = PiWmM7l8v6gyaZmjAoLnpmKpubvyhTvoSvC4+2A5LJY=
SIZE (pidgin-2.10.6.tar.bz2) = 10007092
SHA256 (pidgin-2.10.7.tar.bz2) = 66MplOyiDRzySkJhsFmy3nGh7C3Qkm6QQHSw20n38ZI=
SIZE (pidgin-2.10.7.tar.bz2) = 10069279

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.31 2012/08/26 07:16:54 ajacoutot Exp $
--- configure.ac.orig Mon May 7 05:37:20 2012
+++ configure.ac Mon May 7 22:27:24 2012
$OpenBSD: patch-configure_ac,v 1.32 2013/03/08 01:03:09 brad Exp $
--- configure.ac.orig Mon Feb 11 04:16:51 2013
+++ configure.ac Wed Feb 13 14:55:45 2013
@@ -1334,7 +1334,6 @@ if test "x$GCC" = "xyes"; then
fi
@ -9,7 +9,7 @@ $OpenBSD: patch-configure_ac,v 1.31 2012/08/26 07:16:54 ajacoutot Exp $
fi
if test "x$SUNCC" = "xyes"; then
@@ -1703,6 +1712,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
@@ -1703,6 +1702,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
dnl These two are inverses of each other <-- stolen from evolution!
@ -21,7 +21,7 @@ $OpenBSD: patch-configure_ac,v 1.31 2012/08/26 07:16:54 ajacoutot Exp $
AC_ARG_ENABLE(gnutls,
[ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support [default=yes]],
[enable_gnutls="$enableval"],
@@ -1713,10 +1727,98 @@ AC_ARG_ENABLE(nss,
@@ -1713,10 +1717,98 @@ AC_ARG_ENABLE(nss,
[enable_nss="$enableval"],
[enable_nss="yes"])
@ -122,7 +122,7 @@ $OpenBSD: patch-configure_ac,v 1.31 2012/08/26 07:16:54 ajacoutot Exp $
dnl #
if test "x$enable_gnutls" != "xno"; then
enable_gnutls="no"
@@ -2114,17 +2216,32 @@ fi
@@ -2114,17 +2206,32 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")

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

@ -1,12 +0,0 @@
$OpenBSD: patch-finch_libgnt_Makefile_am,v 1.5 2012/08/04 14:25:33 espie Exp $
--- finch/libgnt/Makefile.am.orig Fri Jul 20 11:55:59 2012
+++ finch/libgnt/Makefile.am Fri Jul 20 11:56:05 2012
@@ -84,7 +84,7 @@ libgnt_lainclude_HEADERS = \
$(libgnt_la_headers)
libgnt_la_DEPENDENCIES =
-libgnt_la_LDFLAGS = -export-dynamic -version_info $(GNT_LT_VERSION_INFO) -no-undefined
+libgnt_la_LDFLAGS = -export-dynamic -version-info $(GNT_LT_VERSION_INFO) -no-undefined
libgnt_la_LIBADD = \
$(GLIB_LIBS) \
$(GNT_LIBS) \

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

@ -1,12 +0,0 @@
$OpenBSD: patch-finch_libgnt_Makefile_in,v 1.19 2012/08/04 14:25:33 espie Exp $
--- finch/libgnt/Makefile.in.orig Fri Jul 20 11:56:10 2012
+++ finch/libgnt/Makefile.in Fri Jul 20 11:56:20 2012
@@ -477,7 +477,7 @@ libgnt_lainclude_HEADERS = \
$(libgnt_la_headers)
libgnt_la_DEPENDENCIES =
-libgnt_la_LDFLAGS = -export-dynamic -version_info $(GNT_LT_VERSION_INFO) -no-undefined
+libgnt_la_LDFLAGS = -export-dynamic -version-info $(GNT_LT_VERSION_INFO) -no-undefined
libgnt_la_LIBADD = \
$(GLIB_LIBS) \
$(GNT_LIBS) \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.27 2012/07/18 13:31:49 jasper Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Fri Jul 6 11:27:42 2012
+++ libpurple/plugins/ssl/Makefile.in Mon Jul 16 19:20:38 2012
@@ -75,6 +75,20 @@ am__uninstall_files_from_dir = { \
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.28 2013/03/08 01:03:09 brad Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Mon Feb 11 04:17:19 2013
+++ libpurple/plugins/ssl/Makefile.in Wed Feb 13 14:55:46 2013
@@ -92,6 +92,20 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(plugindir)"
LTLIBRARIES = $(plugin_LTLIBRARIES)
am__DEPENDENCIES_1 =
@ -22,16 +22,16 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.27 2012/07/18 13:31:49 jas
@PLUGINS_TRUE@ssl_gnutls_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@PLUGINS_TRUE@ $(am__DEPENDENCIES_1)
am__ssl_gnutls_la_SOURCES_DIST = ssl-gnutls.c
@@ -152,7 +166,7 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
@@ -169,7 +183,7 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(ssl_gnutls_la_SOURCES) $(ssl_nss_la_SOURCES) \
$(ssl_la_SOURCES)
-DIST_SOURCES = $(am__ssl_gnutls_la_SOURCES_DIST) \
+DIST_SOURCES = $(am__ssl_openssl_la_SOURCES_DIST) $(am__ssl_gnutls_la_SOURCES_DIST) \
$(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
ETAGS = etags
CTAGS = ctags
@@ -221,6 +235,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
@@ -243,6 +257,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@
GNT_MICRO_VERSION = @GNT_MICRO_VERSION@
GNT_MINOR_VERSION = @GNT_MINOR_VERSION@
GNT_VERSION = @GNT_VERSION@
@ -40,7 +40,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.27 2012/07/18 13:31:49 jas
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
GNUTLS_LIBS = @GNUTLS_LIBS@
GREP = @GREP@
@@ -412,6 +428,7 @@ EXTRA_DIST = \
@@ -434,6 +450,7 @@ EXTRA_DIST = \
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
ssl_la_LDFLAGS = -module -avoid-version
@ -48,7 +48,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.27 2012/07/18 13:31:49 jas
ssl_gnutls_la_LDFLAGS = -module -avoid-version
ssl_nss_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@@USE_GNUTLS_FALSE@@USE_NSS_FALSE@plugin_LTLIBRARIES = \
@@ -425,19 +442,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version
@@ -447,19 +464,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
@ -74,7 +74,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.27 2012/07/18 13:31:49 jas
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
AM_CPPFLAGS = \
@@ -449,6 +472,7 @@ AM_CPPFLAGS = \
@@ -471,6 +494,7 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS)
@ -82,7 +82,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.27 2012/07/18 13:31:49 jas
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
all: all-am
@@ -516,6 +540,8 @@ clean-pluginLTLIBRARIES:
@@ -539,6 +563,8 @@ clean-pluginLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
@ -91,7 +91,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.27 2012/07/18 13:31:49 jas
ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES) $(EXTRA_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) $(EXTRA_ssl_nss_la_DEPENDENCIES)
@@ -530,6 +556,7 @@ distclean-compile:
@@ -553,6 +579,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl.Plo@am__quote@
@ -99,7 +99,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.27 2012/07/18 13:31:49 jas
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl_gnutls_la-ssl-gnutls.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl_nss_la-ssl-nss.Plo@am__quote@
@@ -553,6 +580,13 @@ distclean-compile:
@@ -576,6 +603,13 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<

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

@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_jabber_Makefile_in,v 1.3 2012/07/18 13:31:49 jasper Exp $
--- libpurple/protocols/jabber/Makefile.in.orig Fri Jul 6 11:27:43 2012
+++ libpurple/protocols/jabber/Makefile.in Tue Jul 17 14:48:38 2012
@@ -143,7 +143,7 @@ libxmpp_la_OBJECTS = $(am_libxmpp_la_OBJECTS)
$OpenBSD: patch-libpurple_protocols_jabber_Makefile_in,v 1.4 2013/03/08 01:03:09 brad Exp $
--- libpurple/protocols/jabber/Makefile.in.orig Mon Feb 11 04:17:20 2013
+++ libpurple/protocols/jabber/Makefile.in Wed Feb 13 14:55:46 2013
@@ -160,7 +160,7 @@ libxmpp_la_OBJECTS = $(am_libxmpp_la_OBJECTS)
libxmpp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libxmpp_la_LDFLAGS) $(LDFLAGS) -o $@

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

@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.20 2012/07/18 13:31:49 jasper Exp $
--- libpurple/protocols/oscar/Makefile.in.orig Fri Jul 6 11:27:44 2012
+++ libpurple/protocols/oscar/Makefile.in Tue Jul 17 14:48:38 2012
@@ -85,7 +85,7 @@ am__v_lt_0 = --silent
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.21 2013/03/08 01:03:09 brad Exp $
--- libpurple/protocols/oscar/Makefile.in.orig Mon Feb 11 04:17:21 2013
+++ libpurple/protocols/oscar/Makefile.in Wed Feb 13 14:55:46 2013
@@ -102,7 +102,7 @@ am__v_lt_0 = --silent
libaim_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libaim_la_LDFLAGS) $(LDFLAGS) -o $@
@ -10,7 +10,7 @@ $OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.20 2012/07/18 13:31:49
@STATIC_OSCAR_FALSE@libicq_la_DEPENDENCIES = liboscar.la
am__libicq_la_SOURCES_DIST = libicq.c
@STATIC_OSCAR_FALSE@am_libicq_la_OBJECTS = libicq.lo
@@ -93,7 +93,7 @@ libicq_la_OBJECTS = $(am_libicq_la_OBJECTS)
@@ -110,7 +110,7 @@ libicq_la_OBJECTS = $(am_libicq_la_OBJECTS)
libicq_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libicq_la_LDFLAGS) $(LDFLAGS) -o $@

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

@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_yahoo_Makefile_in,v 1.7 2012/07/18 13:31:49 jasper Exp $
--- libpurple/protocols/yahoo/Makefile.in.orig Fri Jul 6 11:27:45 2012
+++ libpurple/protocols/yahoo/Makefile.in Tue Jul 17 14:48:38 2012
@@ -84,7 +84,7 @@ am__v_lt_0 = --silent
$OpenBSD: patch-libpurple_protocols_yahoo_Makefile_in,v 1.8 2013/03/08 01:03:09 brad Exp $
--- libpurple/protocols/yahoo/Makefile.in.orig Mon Feb 11 04:17:22 2013
+++ libpurple/protocols/yahoo/Makefile.in Wed Feb 13 14:55:46 2013
@@ -101,7 +101,7 @@ am__v_lt_0 = --silent
libyahoo_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libyahoo_la_LDFLAGS) $(LDFLAGS) -o $@
@ -10,7 +10,7 @@ $OpenBSD: patch-libpurple_protocols_yahoo_Makefile_in,v 1.7 2012/07/18 13:31:49
@STATIC_YAHOO_FALSE@libyahoojp_la_DEPENDENCIES = libymsg.la
am__libyahoojp_la_SOURCES_DIST = libyahoojp.c
@STATIC_YAHOO_FALSE@am_libyahoojp_la_OBJECTS = libyahoojp.lo
@@ -92,7 +92,7 @@ libyahoojp_la_OBJECTS = $(am_libyahoojp_la_OBJECTS)
@@ -109,7 +109,7 @@ libyahoojp_la_OBJECTS = $(am_libyahoojp_la_OBJECTS)
libyahoojp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libyahoojp_la_LDFLAGS) $(LDFLAGS) -o $@

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

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_Makefile_in,v 1.15 2012/07/18 13:31:49 jasper Exp $
--- pidgin/Makefile.in.orig Fri Jul 6 11:27:45 2012
+++ pidgin/Makefile.in Sat Jul 14 17:37:30 2012
@@ -122,7 +122,7 @@ am__v_CC_0 = @echo " CC " $@;
$OpenBSD: patch-pidgin_Makefile_in,v 1.16 2013/03/08 01:03:09 brad Exp $
--- pidgin/Makefile.in.orig Mon Feb 11 04:17:23 2013
+++ pidgin/Makefile.in Wed Feb 13 14:55:46 2013
@@ -139,7 +139,7 @@ am__v_CC_0 = @echo " CC " $@;
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @

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

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.26 2012/07/18 13:31:49 jasper Exp $
--- pidgin/gtkdialogs.c.orig Tue Jul 3 01:03:50 2012
+++ pidgin/gtkdialogs.c Sat Jul 14 17:37:30 2012
@@ -620,6 +620,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.27 2013/03/08 01:03:09 brad Exp $
--- pidgin/gtkdialogs.c.orig Mon Feb 11 04:16:53 2013
+++ pidgin/gtkdialogs.c Wed Feb 13 14:55:46 2013
@@ -631,6 +631,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
#endif

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-libpurple,v 1.19 2013/02/06 14:23:06 ajacoutot Exp $
@comment $OpenBSD: PLIST-libpurple,v 1.20 2013/03/08 01:03:09 brad Exp $
@conflict pidgin-<2.5.6p3
@pkgpath net/pidgin
@pkgpath net/pidgin,-libpurple,gtkspell
@ -126,6 +126,7 @@ share/purple/ca-certs/
share/purple/ca-certs/AOL_Member_CA.pem
share/purple/ca-certs/AddTrust_External_Root.pem
share/purple/ca-certs/America_Online_Root_Certification_Authority_1.pem
share/purple/ca-certs/Baltimore_CyberTrust_Root.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