pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2005Q2]: pkgsrc/chat/gaim Pullup ticket 657 - requested by Lub...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/020fd4bc468a
branches:  pkgsrc-2005Q2
changeset: 495953:020fd4bc468a
user:      snj <snj%pkgsrc.org@localhost>
date:      Fri Aug 05 16:37:15 2005 +0000

description:
Pullup ticket 657 - requested by Lubomir Sedlacik
security fix for gaim

Revisions pulled up:
- pkgsrc/chat/gaim/Makefile             1.90, 1.91, 1.93
- pkgsrc/chat/gaim/PLIST                1.41
- pkgsrc/chat/gaim/distinfo             1.66, 1.67
- pkgsrc/chat/gaim/buildlink3.mk        1.6
- pkgsrc/chat/gaim/patches/patch-ae     1.3

    Module Name:    pkgsrc
    Committed By:   grant
    Date:           Fri Jul  8 09:39:47 UTC 2005

    Modified Files:
            pkgsrc/chat/gaim: Makefile PLIST distinfo

    Log Message:
    update gaim to 1.4.0. update provided by maintainer in PR pkg/30693.

    changes since 1.3.1:

    * Fix system log start times for some protocols
    * SILC compiles with newer SILC toolkit versions (Pekka Riikonen)
    * Fixed a bug where buddy icon cache files were left in the icon
      cache directory after they were no longer in use.
    * Attempt to detect the file type of a buddy icon when saving.
    * Additional Yahoo! boot protection (Peter Lawler)
    * A few Yahoo! memory leaks plugged (Peter Lawler)
    * Fixed handling of the new Yahoo! profile page. (Joshua Honeycutt,
      Peter Lawler)
    * Fixed localized Yahoo! room lists.  Please refer to the Yahoo!
      section of the Gaim FAQ for details. (Peter Lawler)
    * Enabled sending files to ICQ users using ICQ 5.02 and newer
      (Jonathan Clark)
----
    Module Name:    pkgsrc
    Committed By:   grant
    Date:           Sat Jul  9 03:56:12 UTC 2005

    Modified Files:
            pkgsrc/chat/gaim: Makefile

    Log Message:
    this pkg uses X, so include x11.buildlink3.mk to ensure that the
    correct X distribution is used. fixes build problem observed on Linux.
----
    Module Name:    pkgsrc
    Committed By:   salo
    Date:           Fri Aug  5 14:33:53 UTC 2005

    Modified Files:
            pkgsrc/chat/gaim: Makefile buildlink3.mk distinfo
    Added Files:
            pkgsrc/chat/gaim/patches: patch-ae

    Log Message:
    Security fix for CAN-2005-2370

    "Multiple "memory alignment errors" in libgadu, as used in ekg before 1.6rc2
    and other packages, allows remote attackers to cause a denial of service
    (bus error) on certain architectures such as SPARC via an incoming message."

    Bump PKGREVISION, patch from Gaim CVS.

diffstat:

 chat/gaim/Makefile         |   5 +++--
 chat/gaim/PLIST            |   3 ++-
 chat/gaim/buildlink3.mk    |   4 ++--
 chat/gaim/distinfo         |   9 +++++----
 chat/gaim/patches/patch-ae |  20 ++++++++++++++++++++
 5 files changed, 32 insertions(+), 9 deletions(-)

diffs (93 lines):

diff -r e31363d5c5dd -r 020fd4bc468a chat/gaim/Makefile
--- a/chat/gaim/Makefile        Fri Aug 05 16:28:58 2005 +0000
+++ b/chat/gaim/Makefile        Fri Aug 05 16:37:15 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.89 2005/06/10 22:49:47 salo Exp $
+# $NetBSD: Makefile,v 1.89.2.1 2005/08/05 16:37:15 snj Exp $
 
-DISTNAME=      gaim-1.3.1
+DISTNAME=      gaim-1.4.0
 PKGREVISION=   1
 CATEGORIES=    chat x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gaim/}
@@ -53,4 +53,5 @@
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e31363d5c5dd -r 020fd4bc468a chat/gaim/PLIST
--- a/chat/gaim/PLIST   Fri Aug 05 16:28:58 2005 +0000
+++ b/chat/gaim/PLIST   Fri Aug 05 16:37:15 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2005/06/10 22:49:47 salo Exp $
+@comment $NetBSD: PLIST,v 1.40.2.1 2005/08/05 16:37:15 snj Exp $
 bin/gaim
 bin/gaim-remote
 include/gaim/account.h
@@ -129,6 +129,7 @@
 ${PKGLOCALEDIR}/locale/my_MM/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gaim.mo
diff -r e31363d5c5dd -r 020fd4bc468a chat/gaim/buildlink3.mk
--- a/chat/gaim/buildlink3.mk   Fri Aug 05 16:28:58 2005 +0000
+++ b/chat/gaim/buildlink3.mk   Fri Aug 05 16:37:15 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/05/12 10:32:18 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.5.2.1 2005/08/05 16:37:15 snj Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GAIM_BUILDLINK3_MK:=   ${GAIM_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
 
 .if !empty(GAIM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gaim+=       gaim>=1.1.2
-BUILDLINK_RECOMMENDED.gaim+=   gaim>=1.3.0
+BUILDLINK_RECOMMENDED.gaim+=   gaim>=1.4.0nb1
 BUILDLINK_PKGSRCDIR.gaim?=     ../../chat/gaim
 
 PRINT_PLIST_AWK+=      /^@dirrm lib\/gaim$$/ \
diff -r e31363d5c5dd -r 020fd4bc468a chat/gaim/distinfo
--- a/chat/gaim/distinfo        Fri Aug 05 16:28:58 2005 +0000
+++ b/chat/gaim/distinfo        Fri Aug 05 16:37:15 2005 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.65 2005/06/10 12:57:56 salo Exp $
+$NetBSD: distinfo,v 1.65.2.1 2005/08/05 16:37:15 snj Exp $
 
-SHA1 (gaim-1.3.1.tar.bz2) = b856ceaa5c0747b650b69ecacb22ddb4b0466a02
-RMD160 (gaim-1.3.1.tar.bz2) = 94b788ac35e385163e2fa6b8885329861533236e
-Size (gaim-1.3.1.tar.bz2) = 5862559 bytes
+SHA1 (gaim-1.4.0.tar.bz2) = 49955722104216e6e41757657abaa94388c42249
+RMD160 (gaim-1.4.0.tar.bz2) = d12354df0828451d32124750340b759180289591
+Size (gaim-1.4.0.tar.bz2) = 5979303 bytes
 SHA1 (patch-aa) = 555c394dbb4cd9ef4fea621d30ce72baae309067
 SHA1 (patch-ad) = 21ffc478343793ce065c75a24ed0cf58b0677359
+SHA1 (patch-ae) = 6c8a5960918ea77a766cdb4f3c2d805a61235771
diff -r e31363d5c5dd -r 020fd4bc468a chat/gaim/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/gaim/patches/patch-ae        Fri Aug 05 16:37:15 2005 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.2.10.1 2005/08/05 16:37:15 snj Exp $
+
+Fix for CAN-2005-2370, from Gaim CVS.
+
+--- src/protocols/gg/libgg.c.orig      2005-03-02 12:53:57.000000000 +0100
++++ src/protocols/gg/libgg.c   2005-08-05 15:38:42.000000000 +0200
+@@ -1098,8 +1098,11 @@
+ 
+                           e->event.status60.descr = buf;
+ 
+-                          if (len > 4 && p[h->length - 5] == 0)
+-                                  e->event.status60.time = *((int*) (p + h->length - 4));
++                          if (len > 4 && p[h->length - 5] == 0) {
++                                  uint32_t t;
++                                  memcpy(&t, p + h->length - 4, sizeof(uint32_t));
++                                  e->event.status60.time = t;
++                          }
+                   }
+ 
+                   break;



Home | Main Index | Thread Index | Old Index