[pkgsrc/pkgsrc-2005Q2]: pkgsrc/chat/centericq Pullup ticket 683 - requested b...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4fefb97428b
branches:  pkgsrc-2005Q2
changeset: 495989:c4fefb97428b
user:      salo <salo%pkgsrc.org@localhost>
date:      Thu Aug 18 21:39:09 2005 +0000

description:
Pullup ticket 683 - requested by Adrian Portelli
security fix for centericq

Revisions pulled up:
- pkgsrc/chat/centericq/Makefile                1.52
- pkgsrc/chat/centericq/distinfo                1.16
- pkgsrc/chat/centericq/patches/patch-ae        1.1

   Module Name:         pkgsrc
   Committed By:        adrianp
   Date:                Sat Jul 16 18:55:23 UTC 2005

   Modified Files:
        pkgsrc/chat/centericq: Makefile distinfo
   Added Files:
        pkgsrc/chat/centericq/patches: patch-ae

   Log Message:
   Bump to nb1 for security issue
   Patch via debian

diffstat:

 chat/centericq/Makefile         |   3 ++-
 chat/centericq/distinfo         |   3 ++-
 chat/centericq/patches/patch-ae |  37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diffs (68 lines):

diff -r a70c4a1f8601 -r c4fefb97428b chat/centericq/Makefile
--- a/chat/centericq/Makefile   Thu Aug 18 08:09:37 2005 +0000
+++ b/chat/centericq/Makefile   Thu Aug 18 21:39:09 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2005/05/22 20:07:42 jlam Exp $
+# $NetBSD: Makefile,v 1.50.2.1 2005/08/18 21:39:09 salo Exp $
 #
 
 DISTNAME=      centericq-4.20.0
+PKGREVISION=   1
 CATEGORIES=    chat
 MASTER_SITES=  http://konst.org.ua/download/ \
                http://centericq.de/archive/source/releases/
diff -r a70c4a1f8601 -r c4fefb97428b chat/centericq/distinfo
--- a/chat/centericq/distinfo   Thu Aug 18 08:09:37 2005 +0000
+++ b/chat/centericq/distinfo   Thu Aug 18 21:39:09 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2005/04/05 12:44:17 wiz Exp $
+$NetBSD: distinfo,v 1.15.2.1 2005/08/18 21:39:09 salo Exp $
 
 SHA1 (centericq-4.20.0.tar.bz2) = 14b37c5257039853f0a1b948c7eaa49581a5913c
 RMD160 (centericq-4.20.0.tar.bz2) = 7f17cd87aa4b98269fa65173b3e6317143c7c8ca
@@ -7,3 +7,4 @@
 SHA1 (patch-ab) = 6d9beb28024666bbfef2e95cab648d7058f8136c
 SHA1 (patch-ac) = 74ae25e19bf5d250a407a937bf78405b38cc86da
 SHA1 (patch-ad) = be8ba5c952bf560b0758c97ba81c4faef04ffe49
+SHA1 (patch-ae) = 01b4bf2e26c9974b189ffe5d0361651aabaef549
diff -r a70c4a1f8601 -r c4fefb97428b chat/centericq/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/centericq/patches/patch-ae   Thu Aug 18 21:39:09 2005 +0000
@@ -0,0 +1,37 @@
+$NetBSD: patch-ae,v 1.1.2.2 2005/08/18 21:39:09 salo Exp $
+
+--- src/hooks/gaduhook.cc.orig 2005-01-18 23:20:17.000000000 +0000
++++ src/hooks/gaduhook.cc
+@@ -893,6 +893,7 @@ static char *token_ocr(const char *ocr, 
+ string gaduhook::handletoken(struct gg_http *h) {
+     struct gg_token *t;
+     string fname, r;
++    char *tmpfilep = NULL;
+ 
+     if(!h)
+       return "";
+@@ -906,8 +907,22 @@ string gaduhook::handletoken(struct gg_h
+     if(!(t = (struct gg_token *) h->data) || !h->body)
+       return "";
+ 
+-    fname = (getenv("TMPDIR") ? getenv("TMPDIR") : "/tmp");
+-    fname += "/gg.token." + i2str(getpid());
++    while (tmpfilep == NULL) {
++      char tmpnam[100];
++      int tmpfiledes;
++      if (getenv("TMPDIR") && strlen(getenv("TMPDIR")) < 50)
++      sprintf (tmpnam, "%s/gg.token.XXXXXX", getenv("TMPDIR"));
++      else
++      sprintf (tmpnam, "/tmp/gg.token.XXXXXX");
++
++      if ((tmpfilep = mktemp (tmpnam)) != NULL) {
++      if ((tmpfiledes = open (tmpnam, O_CREAT | O_EXCL, S_IREAD | S_IWRITE)) == -1)
++        tmpfilep = NULL;
++      else
++        close (tmpfiledes);
++      }
++      fname = tmpnam;
++    }
+ 
+     ofstream bf(fname.c_str());
+