Update to 2.1.7: Many bug and security fixes; you should upgrade.

6 files changed, 48 insertions, 17 deletions

diff --git a/mail/hypermail/Makefile b/mail/hypermail/Makefile
index 0a605ca8f4f..6bab30d6bf4 100644
--- a/mail/hypermail/Makefile
+++ b/mail/hypermail/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/11/01 16:34:40 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/05 09:46:35 wiz Exp $
 #
 
-DISTNAME=	hypermail-2.1.4
-PKGREVISION=	1
+DISTNAME=	hypermail-2.1.7
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.hypermail.org/dist/
 
@@ -15,5 +14,9 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-gdbm=${BUILDLINK_PREFIX.gdbm}
 CONFIGURE_ARGS+=	--with-htmldir=${PREFIX}/share/doc/html/hypermail
 
+pre-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/hypermail/images
+
 .include "../../databases/gdbm/buildlink2.mk"
+.include "../../devel/pcre/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/hypermail/PLIST b/mail/hypermail/PLIST
index a9156987063..932104d338e 100644
--- a/mail/hypermail/PLIST
+++ b/mail/hypermail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/26 05:52:05 grant Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/05 09:46:36 wiz Exp $
 bin/hypermail
 bin/msg2archive
 bin/rdmsg
@@ -6,7 +6,8 @@ man/man1/hypermail.1
 man/man4/hmrc.4
 share/doc/html/hypermail/customizing.html
 share/doc/html/hypermail/hmrc.html
-share/doc/html/hypermail/hr.yellow.gif
-share/doc/html/hypermail/hypermail.gif
 share/doc/html/hypermail/hypermail.html
+share/doc/html/hypermail/images/hr.yellow.gif
+share/doc/html/hypermail/images/hypermail.gif
+@dirrm share/doc/html/hypermail/images
 @dirrm share/doc/html/hypermail
diff --git a/mail/hypermail/distinfo b/mail/hypermail/distinfo
index c7a0792da18..7f5595c34d9 100644
--- a/mail/hypermail/distinfo
+++ b/mail/hypermail/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2002/10/10 00:49:41 jlam Exp $
+$NetBSD: distinfo,v 1.3 2003/03/05 09:46:37 wiz Exp $
 
-SHA1 (hypermail-2.1.4.tar.gz) = 34db32df6dd5db68577e65569514489e25afb293
-Size (hypermail-2.1.4.tar.gz) = 752629 bytes
-SHA1 (patch-aa) = beebcf1b23d854600dec4574551884b0895e75cf
+SHA1 (hypermail-2.1.7.tar.gz) = cf30d00e662e4906e00946b2a4808103f22c347a
+Size (hypermail-2.1.7.tar.gz) = 990553 bytes
+SHA1 (patch-aa) = 7a61647415691bd651c500330f41ea0f8e36bfff
+SHA1 (patch-ab) = 14568b83d7aa9ec5c2648925830c9eedd3869e03
+SHA1 (patch-ac) = f6e4752c032c8823deb17a16aea40257d45b18ff
diff --git a/mail/hypermail/patches/patch-aa b/mail/hypermail/patches/patch-aa
index ba50038bea6..1b019d358ce 100644
--- a/mail/hypermail/patches/patch-aa
+++ b/mail/hypermail/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2002/10/10 00:49:42 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2003/03/05 09:46:38 wiz Exp $
 
---- configure.orig	Sat Dec  1 20:49:31 2001
+--- configure.orig	Fri Feb 14 01:11:16 2003
 +++ configure
-@@ -542,13 +542,6 @@ fi
+@@ -544,13 +544,5 @@ fi
  
  
  
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.1 2002/10/10 00:49:42 jlam Exp $
 -INCLUDES=""
 -GDBM_INCLUDE=""
 -GDBM_LIB=""
--
- ac_aux_dir=
- for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-   if test -f $ac_dir/install-sh; then
+-FNV_DEP=""
+-SUBDIRS="src/pcre"
+ 
+ 
diff --git a/mail/hypermail/patches/patch-ab b/mail/hypermail/patches/patch-ab
new file mode 100644
index 00000000000..86f96521f5b
--- /dev/null
+++ b/mail/hypermail/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2003/03/05 09:46:38 wiz Exp $
+
+--- archive/msg2archive.c.orig	Thu Feb 20 18:04:00 2003
++++ archive/msg2archive.c
+@@ -21,7 +21,6 @@
+ #include <ctype.h>
+ #include <fcntl.h>
+ #include <time.h>
+-#include <wait.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include "lists.h"
diff --git a/mail/hypermail/patches/patch-ac b/mail/hypermail/patches/patch-ac
new file mode 100644
index 00000000000..17ddaff6b27
--- /dev/null
+++ b/mail/hypermail/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2003/03/05 09:46:39 wiz Exp $
+
+--- src/Makefile.in.orig	Wed Mar  5 10:33:51 2003
++++ src/Makefile.in
+@@ -56,7 +56,7 @@ MAILOBJS=	mail.o ../libcgi/libcgi.a
+ .c.o:
+ 	$(CC) -c $(CFLAGS) $<
+ 
+-all:    pcre/libpcre.a @FNV_DEP@ hypermail$(SUFFIX) mail$(SUFFIX) lang$(SUFFIX)
++all:    @FNV_DEP@ hypermail$(SUFFIX) mail$(SUFFIX) lang$(SUFFIX)
+ 
+ pcre/libpcre.a:
+ 	@cd pcre; $(MAKE) libtool libpcre.a CC="$(CC)" CFLAGS="$(CFLAGS)"