Here is an update to pidgin 2.7.10.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/pidgin/Makefile,v
retrieving revision 1.87
diff -u -p -r1.87 Makefile
--- Makefile 12 Feb 2011 10:59:59 -0000 1.87
+++ Makefile 24 Feb 2011 01:59:27 -0000
@@ -6,7 +6,7 @@ COMMENT-main= multi-protocol instant mes
COMMENT-finch= multi-protocol instant messaging client, console client
COMMENT-libpurple= multi-protocol instant messaging library
-VERSION= 2.7.9
+VERSION= 2.7.10
DISTNAME= pidgin-${VERSION}
PKGNAME-main= pidgin-${VERSION}
PKGNAME-finch= finch-${VERSION}
@@ -15,8 +15,6 @@ 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-libpurple= 0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
@@ -141,7 +139,7 @@ post-extract:
post-build:
cp ${FILESDIR}/purple.service ${WRKSRC}
- ${SUBST_CMD} ${WRKSRC}/libpurple/purple-remote \
+ @${SUBST_CMD} ${WRKSRC}/libpurple/purple-remote \
${WRKSRC}/libpurple/purple-url-handler \
${WRKSRC}/purple.service
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/pidgin/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- distinfo 28 Dec 2010 18:18:02 -0000 1.35
+++ distinfo 24 Feb 2011 01:34:46 -0000
@@ -1,5 +1,5 @@
-MD5 (pidgin-2.7.9.tar.gz) = SvNE7rNLd5G+zeQyO2mlhQ==
-RMD160 (pidgin-2.7.9.tar.gz) = sKx8/4mahIpvbGWLEcFCV0ZrIa0=
-SHA1 (pidgin-2.7.9.tar.gz) = PmBRMwa7+hRo5+jNelCYKTQG7Ik=
-SHA256 (pidgin-2.7.9.tar.gz) = 6RsvCLLh6aPGMG+m2dUIeS2dw7/bY7eDIZhJnV/4wek=
-SIZE (pidgin-2.7.9.tar.gz) = 14129626
+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
Index: patches/patch-finch_libgnt_gntwm_c
===================================================================
RCS file: /home/cvs/ports/net/pidgin/patches/patch-finch_libgnt_gntwm_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-finch_libgnt_gntwm_c
--- patches/patch-finch_libgnt_gntwm_c 6 Sep 2010 18:33:37 -0000 1.7
+++ patches/patch-finch_libgnt_gntwm_c 24 Feb 2011 01:52:05 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-finch_libgnt_gntwm_c,v 1.7 2010/09/06 18:33:37 nicm Exp $
---- finch/libgnt/gntwm.c.orig Tue Aug 10 08:35:44 2010
-+++ finch/libgnt/gntwm.c Mon Aug 30 09:42:25 2010
+--- 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
@@ -9,7 +9,7 @@ $OpenBSD: patch-finch_libgnt_gntwm_c,v 1
+#endif
#define _GNU_SOURCE
-#if (defined(__APPLE__) || defined(__unix__)) && !defined(__FreeBSD__) &&
!defined(__OpenBSD__)
-+#if (defined(__APPLE__) || defined(__unix__)) && !defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__unix__)
#define _XOPEN_SOURCE_EXTENDED
-#endif
#endif
Index: patches/patch-libpurple_cipher_c
===================================================================
RCS file: patches/patch-libpurple_cipher_c
diff -N patches/patch-libpurple_cipher_c
--- patches/patch-libpurple_cipher_c 12 Feb 2011 11:00:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,60 +0,0 @@
-$OpenBSD: patch-libpurple_cipher_c,v 1.1 2011/02/12 11:00:00 jasper Exp $
-
-Fix a potential information leak in cipher.c (SA43271).
-
---- libpurple/cipher.c.orig Thu Feb 10 19:32:03 2011
-+++ libpurple/cipher.c Thu Feb 10 19:34:18 2011
-@@ -249,7 +249,7 @@ md5_uninit(PurpleCipherContext *context) {
- purple_cipher_context_reset(context, NULL);
-
- md5_context = purple_cipher_context_get_data(context);
-- memset(md5_context, 0, sizeof(md5_context));
-+ memset(md5_context, 0, sizeof(*md5_context));
-
- g_free(md5_context);
- md5_context = NULL;
-@@ -705,7 +705,7 @@ md4_uninit(PurpleCipherContext *context) {
- purple_cipher_context_reset(context, NULL);
-
- md4_context = purple_cipher_context_get_data(context);
-- memset(md4_context, 0, sizeof(md4_context));
-+ memset(md4_context, 0, sizeof(*md4_context));
-
- g_free(md4_context);
- md4_context = NULL;
-@@ -1356,7 +1356,7 @@ des_uninit(PurpleCipherContext *context) {
- struct _des_ctx *des_context;
-
- des_context = purple_cipher_context_get_data(context);
-- memset(des_context, 0, sizeof(des_context));
-+ memset(des_context, 0, sizeof(*des_context));
-
- g_free(des_context);
- des_context = NULL;
-@@ -1706,7 +1706,7 @@ des3_uninit(PurpleCipherContext *context)
- struct _des3_ctx *des3_context;
-
- des3_context = purple_cipher_context_get_data(context);
-- memset(des3_context, 0, sizeof(des3_context));
-+ memset(des3_context, 0, sizeof(*des3_context));
-
- g_free(des3_context);
- des3_context = NULL;
-@@ -2382,7 +2382,7 @@ rc4_uninit(PurpleCipherContext *context) {
- struct RC4Context *rc4_ctx;
-
- rc4_ctx = purple_cipher_context_get_data(context);
-- memset(rc4_ctx, 0, sizeof(rc4_ctx));
-+ memset(rc4_ctx, 0, sizeof(*rc4_ctx));
-
- g_free(rc4_ctx);
- rc4_ctx = NULL;
-@@ -2828,7 +2828,7 @@ purple_cipher_context_destroy(PurpleCipherContext *con
- if(cipher->ops && cipher->ops->uninit)
- cipher->ops->uninit(context);
-
-- memset(context, 0, sizeof(context));
-+ memset(context, 0, sizeof(*context));
- g_free(context);
- context = NULL;
- }
Index: patches/patch-libpurple_protocols_silc_silc_c
===================================================================
RCS file:
/home/cvs/ports/net/pidgin/patches/patch-libpurple_protocols_silc_silc_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-libpurple_protocols_silc_silc_c
--- patches/patch-libpurple_protocols_silc_silc_c 7 Dec 2009 06:27:59
-0000 1.6
+++ patches/patch-libpurple_protocols_silc_silc_c 24 Feb 2011 01:45:04
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_silc_silc_c,v 1.6 2009/12/07 06:27:59
steven Exp $
---- libpurple/protocols/silc/silc.c.orig Sun Nov 29 22:13:53 2009
-+++ libpurple/protocols/silc/silc.c Sun Dec 6 13:05:09 2009
-@@ -672,31 +672,12 @@ silcpurple_close(PurpleConnection *gc)
+--- 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)
SilcPurpleTask task;
#endif /* __SILC_TOOLKIT_VERSION */
GHashTable *ui_info;
@@ -11,12 +11,12 @@ $OpenBSD: patch-libpurple_protocols_silc
g_return_if_fail(sg != NULL);
- ui_info = purple_core_get_ui_info();
--
+-
- if(ui_info) {
- ui_name = g_hash_table_lookup(ui_info, "name");
- ui_website = g_hash_table_lookup(ui_info, "website");
- }
--
+-
- if(!ui_name || !ui_website) {
- ui_name = "Pidgin";
- ui_website = PURPLE_WEBSITE;
@@ -29,32 +29,31 @@ $OpenBSD: patch-libpurple_protocols_silc
- "QUIT", quit_msg,
- NULL);
- g_free(quit_msg);
--
+ "QUIT", NULL);
+
if (sg->conn)
silc_client_close_connection(sg->client, sg->conn);
-
-@@ -1842,9 +1823,6 @@ static PurpleCmdRet silcpurple_cmd_quit(PurpleConversa
+@@ -1842,9 +1824,6 @@ static PurpleCmdRet silcpurple_cmd_quit(PurpleConversa
{
PurpleConnection *gc;
SilcPurple sg;
- GHashTable *ui_info;
- const char *ui_name = NULL, *ui_website = NULL;
- char *quit_msg;
-
+
gc = purple_conversation_get_gc(conv);
-@@ -1856,23 +1834,8 @@ static PurpleCmdRet silcpurple_cmd_quit(PurpleConversa
+@@ -1856,23 +1835,8 @@ static PurpleCmdRet silcpurple_cmd_quit(PurpleConversa
if (sg == NULL)
return PURPLE_CMD_RET_FAILED;
- ui_info = purple_core_get_ui_info();
--
+-
- if(ui_info) {
- ui_name = g_hash_table_lookup(ui_info, "name");
- ui_website = g_hash_table_lookup(ui_info, "website");
- }
--
+-
- if(!ui_name || !ui_website) {
- ui_name = "Pidgin";
- ui_website = PURPLE_WEBSITE;
Index: pkg/PLIST-libpurple
===================================================================
RCS file: /home/cvs/ports/net/pidgin/pkg/PLIST-libpurple,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST-libpurple
--- pkg/PLIST-libpurple 29 Nov 2010 23:18:30 -0000 1.13
+++ pkg/PLIST-libpurple 24 Feb 2011 02:02:19 -0000
@@ -155,6 +155,7 @@ share/dbus-1/services/purple.service
share/purple/
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/CAcert_Class3.pem
share/purple/ca-certs/CAcert_Root.pem
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
