Update to 1.2.6. Change since 1.2.5 is security fixes, possibly allowing remote

shell.

4 files changed, 36 insertions, 14 deletions

diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index d12fc021661..7e4a223a264 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2001/07/13 07:09:17 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/07/29 14:25:05 bouyer Exp $
 
-DISTNAME=	imp-2.2.5
+DISTNAME=	imp-2.2.6
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/
 
@@ -8,7 +8,7 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.horde.org/imp/
 COMMENT=	Internet Messaging Program
 
-DEPENDS+=	horde-1.2.5:../../www/horde
+DEPENDS+=	horde-1.2.6:../../www/horde
 DEPENDS+=	php-imap>3.0.17:../../www/php4-imap
 
 NO_CONFIGURE=	# defined
@@ -41,10 +41,12 @@ FILES_SUBST+=		TRUE=${TRUE:Q}
 FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
 
 post-extract:
-	cd ${WRKSRC}/config;						\
+	cd ${WRKSRC};						\
 	for file in							\
-		MOTD.html header.txt html.php3 imp_module_config.php3	\
-		lang.php3 mailbox.php3 menu.txt prefs.php3 trailer.txt;	\
+		config/MOTD.html config/header.txt config/html.php3  \
+		config/imp_module_config.php3	config/lang.php3  \
+		config/mailbox.php3 config/menu.txt config/trailer.txt  \
+		prefs.php3 ;	\
 	do								\
 		${MV} $${file} $${file}.dist;				\
 	done
diff --git a/mail/imp/distinfo b/mail/imp/distinfo
index 5a71d7a82a5..037435e84c7 100644
--- a/mail/imp/distinfo
+++ b/mail/imp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/05/22 21:12:21 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/07/29 14:25:05 bouyer Exp $
 
-SHA1 (imp-2.2.5.tar.gz) = 82be7689ce888ec7c433ce1ff5663c5cde9c3059
-Size (imp-2.2.5.tar.gz) = 355561 bytes
+SHA1 (imp-2.2.6.tar.gz) = 7e433007d717d9d213ef5af4fd0424f3b0bbe18b
+Size (imp-2.2.6.tar.gz) = 363565 bytes
 SHA1 (patch-aa) = 2149a5a9954d975b9b8c1df5c64c09cd0bf330d3
diff --git a/mail/imp/pkg/DEINSTALL b/mail/imp/pkg/DEINSTALL
index 6c0f23c4357..66dd246c3da 100644
--- a/mail/imp/pkg/DEINSTALL
+++ b/mail/imp/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.3 2001/07/13 07:09:18 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.4 2001/07/29 14:25:06 bouyer Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -27,7 +27,6 @@ NONCONFFILES="	${IMPDIR}/config/MOTD.html				\
 		${IMPDIR}/config/mailbox.php3				\
 		${IMPDIR}/config/menu.txt				\
 		${IMPDIR}/config/mime.php3				\
-		${IMPDIR}/config/prefs.php3				\
 		${IMPDIR}/config/trailer.txt"
 
 case ${STAGE} in
diff --git a/mail/imp/pkg/PLIST b/mail/imp/pkg/PLIST
index 4fe2c95b55d..7129b2d7fdb 100644
--- a/mail/imp/pkg/PLIST
+++ b/mail/imp/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2001/05/22 21:12:21 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/07/29 14:25:06 bouyer Exp $
 share/doc/imp/CHANGES
 share/doc/imp/COPYING
 share/doc/imp/CREDITS
@@ -22,7 +22,6 @@ share/horde/imp/config/ldap.php3.dist
 share/horde/imp/config/mailbox.php3.dist
 share/horde/imp/config/menu.txt.dist
 share/horde/imp/config/mime.php3.dist
-share/horde/imp/config/prefs.php3.dist
 share/horde/imp/config/servers.php3.dist
 share/horde/imp/config/trailer.txt.dist
 share/horde/imp/contacts.php3
@@ -496,6 +495,29 @@ share/horde/imp/locale/nl/prefs.lang
 share/horde/imp/locale/nl/select.lang
 share/horde/imp/locale/nl/spelling.lang
 share/horde/imp/locale/nl/status.lang
+share/horde/imp/locale/lt/compose.help
+share/horde/imp/locale/lt/compose.lang
+share/horde/imp/locale/lt/contacts.help
+share/horde/imp/locale/lt/contacts.lang
+share/horde/imp/locale/lt/folders.help
+share/horde/imp/locale/lt/folders.lang
+share/horde/imp/locale/lt/help.lang
+share/horde/imp/locale/lt/horde.lang
+share/horde/imp/locale/lt/login.help
+share/horde/imp/locale/lt/login.lang
+share/horde/imp/locale/lt/mailbox.lang
+share/horde/imp/locale/lt/menu.lang
+share/horde/imp/locale/lt/message.lang
+share/horde/imp/locale/lt/newuser.entro.txt
+share/horde/imp/locale/lt/newuser.intro.txt
+share/horde/imp/locale/lt/newuser.lang
+share/horde/imp/locale/lt/newuser.start.txt
+share/horde/imp/locale/lt/openwin.lang
+share/horde/imp/locale/lt/passwd.lang
+share/horde/imp/locale/lt/prefs.lang
+share/horde/imp/locale/lt/select.lang
+share/horde/imp/locale/lt/spelling.lang
+share/horde/imp/locale/lt/status.lang
 share/horde/imp/locale/no-bok/compose.help
 share/horde/imp/locale/no-bok/compose.lang
 share/horde/imp/locale/no-bok/contacts.help
@@ -732,7 +754,6 @@ share/horde/imp/menu.php3
 share/horde/imp/message.php3
 share/horde/imp/newuser.php3
 share/horde/imp/poppassd.php3
-share/horde/imp/prefs.php3
 share/horde/imp/remote_login.php3
 share/horde/imp/scripts/imp-cleanup.cron
 share/horde/imp/scripts/pine2imp.pl