Apply security fixes for CAN-2005-0073. Patches obtained from

Sympa's CVS repository via Sympa's homepage.

Bump PKGREVISION to 2.

4 files changed, 55 insertions, 3 deletions

diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 9516990780d..795e776e5de 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/10/03 00:12:55 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/02/15 22:45:54 seb Exp $
 #
 
 DISTNAME=	sympa-4.1.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sympa.org/distribution/
 
diff --git a/mail/sympa/distinfo b/mail/sympa/distinfo
index 403f4cbb492..1489b9bdd1f 100644
--- a/mail/sympa/distinfo
+++ b/mail/sympa/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.4 2004/10/10 15:09:23 seb Exp $
+$NetBSD: distinfo,v 1.5 2005/02/15 22:45:54 seb Exp $
 
 SHA1 (sympa-4.1.2.tar.gz) = 68a122a8d762874e2b4bb0c80020e36d8bc344fc
 Size (sympa-4.1.2.tar.gz) = 2354843 bytes
 SHA1 (patch-aa) = 1653a5700572068348e93f659892119230795dae
 SHA1 (patch-ab) = 3b15442e7146dd56bfab698bcb062911a5bba599
 SHA1 (patch-ac) = 77802bab188da024c18810c07bf62064b28e3af1
+SHA1 (patch-ad) = a0230a55043e81267f14d662e45f16afd04b0e82
+SHA1 (patch-ae) = 3451dfed68e02fa298fc22be41e3c878ecc18c29
diff --git a/mail/sympa/patches/patch-ad b/mail/sympa/patches/patch-ad
new file mode 100644
index 00000000000..c6bf148eadc
--- /dev/null
+++ b/mail/sympa/patches/patch-ad
@@ -0,0 +1,25 @@
+$NetBSD: patch-ad,v 1.3 2005/02/15 22:45:54 seb Exp $
+
+--- src/bouncequeue.c.orig	2003-10-07 12:04:47.000000000 +0000
++++ src/bouncequeue.c
+@@ -30,6 +30,11 @@ static char     qfile[128];
+ static char     buf[16384];
+ static int      i, fd;
+ 
++/* For HP-UX */
++#ifndef EX_CONFIG
++# define EX_CONFIG 78
++#endif
++
+ #ifndef CONFIG
+ # define CONFIG		"/etc/sympa.conf"
+ #endif
+@@ -97,7 +102,7 @@ main(int argn, char **argv)
+       exit(EX_NOPERM);
+    }
+    umask(027);
+-   sprintf(qfile, "T.%s.%ld.%d", listname, time(NULL), getpid());
++   snprintf(qfile, sizeof(qfile), "T.%s.%ld.%d", listname, time(NULL), getpid());
+    fd = open(qfile, O_CREAT|O_WRONLY, 0600);
+    if (fd == -1)
+       exit(EX_TEMPFAIL);
diff --git a/mail/sympa/patches/patch-ae b/mail/sympa/patches/patch-ae
new file mode 100644
index 00000000000..87dc538c5e8
--- /dev/null
+++ b/mail/sympa/patches/patch-ae
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.3 2005/02/15 22:45:54 seb Exp $
+
+--- src/queue.c.orig	2003-10-07 12:04:47.000000000 +0000
++++ src/queue.c
+@@ -32,6 +32,11 @@ static char     qfile[128];
+ static char     buf[16384];
+ static int      i, fd;
+ 
++/* For HP-UX */
++#ifndef EX_CONFIG
++# define EX_CONFIG 78
++#endif
++
+ #ifndef CONFIG
+ # define CONFIG		"/etc/sympa.conf"
+ #endif
+@@ -116,7 +121,7 @@ main(int argn, char **argv)
+      exit(EX_NOPERM);
+    }
+    umask(027);
+-   sprintf(qfile, "T.%s.%ld.%d", listname, time(NULL), getpid());
++   snprintf(qfile, sizeof(qfile), "T.%s.%ld.%d", listname, time(NULL), getpid());
+    fd = open(qfile, O_CREAT|O_WRONLY, 0600);
+    if (fd == -1){
+      char* buffer=(char*)malloc(strlen(argv[0])+strlen(queuedir)+80);