[pkgsrc/pkgsrc-2009Q1]: pkgsrc/chat/unrealircd Pullup ticket #2735 - requeste...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d4d956e0a96e
branches:  pkgsrc-2009Q1
changeset: 556769:d4d956e0a96e
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Apr 14 21:12:04 2009 +0000

description:
Pullup ticket #2735 - requested by adrianp:
unrealircd: security patch

Revisions pulled up:
- chat/unrealircd/Makefile                      1.26
- chat/unrealircd/distinfo                      1.11
- chat/unrealircd/patches/patch-ag              1.1
---
Module Name:    pkgsrc
Committed By:   adrianp
Date:           Mon Apr 13 16:20:52 UTC 2009

Modified Files:
        pkgsrc/chat/unrealircd: Makefile distinfo
Added Files:
        pkgsrc/chat/unrealircd/patches: patch-ag

Log Message:
Add patch for http://forums.unrealircd.com/viewtopic.php?t=6204
Update MASTER_SITES
PKGREVISION++

diffstat:

 chat/unrealircd/Makefile         |   8 ++----
 chat/unrealircd/distinfo         |   3 +-
 chat/unrealircd/patches/patch-ag |  48 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 6 deletions(-)

diffs (85 lines):

diff -r bfeb027298e4 -r d4d956e0a96e chat/unrealircd/Makefile
--- a/chat/unrealircd/Makefile  Tue Apr 14 20:51:17 2009 +0000
+++ b/chat/unrealircd/Makefile  Tue Apr 14 21:12:04 2009 +0000
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2008/08/23 08:09:16 obache Exp $
+# $NetBSD: Makefile,v 1.25.8.1 2009/04/14 21:12:04 tron Exp $
 
 DISTNAME=      Unreal3.2.7
 PKGNAME=       unrealircd-3.2.7
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    chat
-MASTER_SITES=  http://files.alexisnet.net/unreal/ \
-               http://unrealircd.st-city.net/ \
-               http://unrealircd.icedslash.com/
+MASTER_SITES=  http://unreal.brueggisite.de/
 
 MAINTAINER=    adrianp%NetBSD.org@localhost
 HOMEPAGE=      http://www.unrealircd.com/
diff -r bfeb027298e4 -r d4d956e0a96e chat/unrealircd/distinfo
--- a/chat/unrealircd/distinfo  Tue Apr 14 20:51:17 2009 +0000
+++ b/chat/unrealircd/distinfo  Tue Apr 14 21:12:04 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2007/07/14 22:19:49 adrianp Exp $
+$NetBSD: distinfo,v 1.10.18.1 2009/04/14 21:12:04 tron Exp $
 
 SHA1 (Unreal3.2.7.tar.gz) = a6c83c186008c429bc5a476fc0b9e3b174092efb
 RMD160 (Unreal3.2.7.tar.gz) = 49e00dbe4fdda672b20be16ceb116971f514d62b
@@ -9,3 +9,4 @@
 SHA1 (patch-ad) = 3bef7c197efb59def9e77114ad9356ef2f23fa26
 SHA1 (patch-ae) = dc5f4d080d1027e229f9817d1d4f1e501124f7ba
 SHA1 (patch-af) = 28d622375362bc77ec44ea6a3b1f3a0d05c60ce5
+SHA1 (patch-ag) = 95857258f893d086ea3feb2d4e0f0a6816b0be91
diff -r bfeb027298e4 -r d4d956e0a96e chat/unrealircd/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/unrealircd/patches/patch-ag  Tue Apr 14 21:12:04 2009 +0000
@@ -0,0 +1,48 @@
+$NetBSD: patch-ag,v 1.1.2.2 2009/04/14 21:12:04 tron Exp $
+
+--- src/s_conf.c.orig  2007-06-27 12:36:31.000000000 +0100
++++ src/s_conf.c
+@@ -2663,25 +2663,15 @@ int    AllowClient(aClient *cptr, struct ho
+                       Debug((DEBUG_DNS, "a_il: %s->%s", sockhost, fullname));
+                       if (index(aconf->hostname, '@'))
+                       {
+-                              /*
+-                               * Doing strlcpy / strlcat here
+-                               * would simply be a waste. We are
+-                               * ALREADY sure that it is proper 
+-                               * lengths
+-                              */
+                               if (aconf->flags.noident)
+-                                      strcpy(uhost, username);
++                                      strlcpy(uhost, username, sizeof(uhost));
+                               else
+-                                      strcpy(uhost, cptr->username);
+-                              strcat(uhost, "@");
++                                      strlcpy(uhost, cptr->username, sizeof(uhost));
++                              strlcat(uhost, "@", sizeof(uhost));
+                       }
+                       else
+                               *uhost = '\0';
+-                      /* 
+-                       * Same here as above
+-                       * -Stskeeps 
+-                      */
+-                      strncat(uhost, fullname, sizeof(uhost) - strlen(uhost));
++                      strlcat(uhost, fullname, sizeof(uhost));
+                       if (!match(aconf->hostname, uhost))
+                               goto attach;
+               }
+@@ -2692,11 +2682,11 @@ int    AllowClient(aClient *cptr, struct ho
+                               strncpyzt(uhost, username, sizeof(uhost));
+                       else
+                               strncpyzt(uhost, cptr->username, sizeof(uhost));
+-                      (void)strcat(uhost, "@");
++                      (void)strlcat(uhost, "@", sizeof(uhost));
+               }
+               else
+                       *uhost = '\0';
+-              (void)strncat(uhost, sockhost, sizeof(uhost) - strlen(uhost));
++              strlcat(uhost, sockhost, sizeof(uhost));
+               /* Check the IP */
+               if (match_ip(cptr->ip, uhost, aconf->ip, aconf->netmask))
+                       goto attach;