summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
Diffstat (limited to 'chat')
-rw-r--r--chat/unrealircd/Makefile8
-rw-r--r--chat/unrealircd/distinfo3
-rw-r--r--chat/unrealircd/patches/patch-ag48
3 files changed, 53 insertions, 6 deletions
diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile
index d52350bb549..8e7f1eea3e0 100644
--- a/chat/unrealircd/Makefile
+++ b/chat/unrealircd/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2008/08/23 08:09:16 obache Exp $
+# $NetBSD: Makefile,v 1.26 2009/04/13 16:20:52 adrianp 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
HOMEPAGE= http://www.unrealircd.com/
diff --git a/chat/unrealircd/distinfo b/chat/unrealircd/distinfo
index 38c7698a15a..6fbb8e50817 100644
--- a/chat/unrealircd/distinfo
+++ b/chat/unrealircd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2007/07/14 22:19:49 adrianp Exp $
+$NetBSD: distinfo,v 1.11 2009/04/13 16:20:52 adrianp Exp $
SHA1 (Unreal3.2.7.tar.gz) = a6c83c186008c429bc5a476fc0b9e3b174092efb
RMD160 (Unreal3.2.7.tar.gz) = 49e00dbe4fdda672b20be16ceb116971f514d62b
@@ -9,3 +9,4 @@ SHA1 (patch-ac) = 4c3e7219d03e93c2a3e8f735c350d919efdf8fbb
SHA1 (patch-ad) = 3bef7c197efb59def9e77114ad9356ef2f23fa26
SHA1 (patch-ae) = dc5f4d080d1027e229f9817d1d4f1e501124f7ba
SHA1 (patch-af) = 28d622375362bc77ec44ea6a3b1f3a0d05c60ce5
+SHA1 (patch-ag) = 95857258f893d086ea3feb2d4e0f0a6816b0be91
diff --git a/chat/unrealircd/patches/patch-ag b/chat/unrealircd/patches/patch-ag
new file mode 100644
index 00000000000..10d8261571b
--- /dev/null
+++ b/chat/unrealircd/patches/patch-ag
@@ -0,0 +1,48 @@
+$NetBSD: patch-ag,v 1.1 2009/04/13 16:20:52 adrianp 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;