>Number:         17361
>Category:       pkg
>Synopsis:       Fixed mail/courier-imap to work with new getopt
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jun 22 08:14:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Julio Merino
>Release:        NetBSD 1.6B
>Organization:
HispaBSD
>Environment:
	
	
System: NetBSD darkstar.local 1.6B NetBSD 1.6B (DARKSTAR) #1: Fri Jun 21 13:22:23 CEST 2002 root@darkstar.local:/var/build/kernel/DARKSTAR i386
Architecture: i386
Machine: i386
>Description:
	All the startup scripts used in mail/courier-imap have a problem when
	calling the env utility. They use the deprecated (and now,
	non-functional) - parameter. I've changed them to -i which seems more
	correct. Patch follows.
>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/courier-imap/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- Makefile	2002/05/28 15:07:03	1.12
+++ Makefile	2002/06/22 15:11:17
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.12 2002/05/28 15:07:03 yyamano Exp $
 
 DISTNAME=	courier-imap-1.4.2
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	IMAP server for access to Maildir-style mailboxes
 HOMEPAGE=	http://www.inter7.com/courierimap/
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/courier-imap/distinfo,v
retrieving revision 1.8
diff -u -u -r1.8 distinfo
--- distinfo	2002/01/23 02:22:21	1.8
+++ distinfo	2002/06/22 15:11:17
@@ -6,7 +6,7 @@
 SHA1 (patch-ab) = 9f6afb8f2e046c5d7d5d94e659d8dc9b544816a3
 SHA1 (patch-ac) = f85ae9f2f56c1885180ae86b156ff508aa2491c4
 SHA1 (patch-ad) = d4c91ca56a85896f4f7fef72003f4f8c3be1b315
-SHA1 (patch-ae) = e1bef05319322d67507ce11ece350e86743ea0a2
-SHA1 (patch-af) = f71566831301ed9add898abd18807d6b33a6d697
-SHA1 (patch-ag) = bf74ac57cf67b0c6b76b120f23109a35ab4f0475
-SHA1 (patch-ah) = a85ad2baa7600611b5d1d94e17d074728135198a
+SHA1 (patch-ae) = 842c76a8d6cd7820c337469966b3bb7e901e271f
+SHA1 (patch-af) = e2982c2120a582fe20763f85e00ca611b45ac98f
+SHA1 (patch-ag) = e29f5e481704285e366d31d0d3be211f6a91d79d
+SHA1 (patch-ah) = d0b7b7d11d016e632c49d21412cad76b3e5876de
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/mail/courier-imap/patches/patch-ae,v
retrieving revision 1.2
diff -u -u -r1.2 patch-ae
--- patch-ae	2002/01/22 22:08:54	1.2
+++ patch-ae	2002/06/22 15:11:17
@@ -1,8 +1,8 @@
 $NetBSD: patch-ae,v 1.2 2002/01/22 22:08:54 jlam Exp $
 
---- imapd-ssl.rc.in.orig	Thu Mar 15 22:36:47 2001
-+++ imapd-ssl.rc.in
-@@ -21,11 +21,6 @@
+--- imapd-ssl.rc.in.orig	Fri Mar 16 04:36:47 2001
++++ imapd-ssl.rc.in	Sat Jun 22 16:58:09 2002
+@@ -21,13 +21,8 @@
  		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
  	done
  
@@ -12,8 +12,11 @@
 -	fi
 -
  	ulimit -d $IMAP_ULIMITD
- 	@SETENV@ - @SHELL@ -c " . @sysconfdir@/imapd ; \
+-	@SETENV@ - @SHELL@ -c " . @sysconfdir@/imapd ; \
++	@SETENV@ -i @SHELL@ -c " . @sysconfdir@/imapd ; \
  		. @sysconfdir@/imapd-ssl ; \
+ 		IMAP_TLS=1; export IMAP_TLS; \
+ 		`sed -n '/^#/d;/=/p' <@sysconfdir@/imapd | \
 @@ -45,10 +40,6 @@
  	;;
  stop)
Index: patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/mail/courier-imap/patches/patch-af,v
retrieving revision 1.2
diff -u -u -r1.2 patch-af
--- patch-af	2002/01/22 22:08:54	1.2
+++ patch-af	2002/06/22 15:11:17
@@ -1,8 +1,8 @@
 $NetBSD: patch-af,v 1.2 2002/01/22 22:08:54 jlam Exp $
 
---- imapd.rc.in.orig	Sun Jul 29 20:02:32 2001
-+++ imapd.rc.in
-@@ -21,11 +21,6 @@
+--- imapd.rc.in.orig	Mon Jul 30 02:02:32 2001
++++ imapd.rc.in	Sat Jun 22 16:58:20 2002
+@@ -21,13 +21,8 @@
  		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
  	done
  
@@ -12,8 +12,11 @@
 -	fi
 -
  	ulimit -d $IMAP_ULIMITD
- 	@SETENV@ - @SHELL@ -c " . @sysconfdir@/imapd ; \
+-	@SETENV@ - @SHELL@ -c " . @sysconfdir@/imapd ; \
++	@SETENV@ -i @SHELL@ -c " . @sysconfdir@/imapd ; \
  				. @sysconfdir@/imapd-ssl ; \
+ 		IMAP_STARTTLS=$IMAPDSTARTTLS ; export IMAP_STARTTLS ; \
+ 		TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
 @@ -45,10 +40,6 @@
  	;;
  stop)
Index: patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/mail/courier-imap/patches/patch-ag,v
retrieving revision 1.2
diff -u -u -r1.2 patch-ag
--- patch-ag	2002/01/22 22:08:55	1.2
+++ patch-ag	2002/06/22 15:11:17
@@ -1,8 +1,8 @@
 $NetBSD: patch-ag,v 1.2 2002/01/22 22:08:55 jlam Exp $
 
---- pop3d-ssl.rc.in.orig	Sun Jan 28 13:52:49 2001
-+++ pop3d-ssl.rc.in
-@@ -21,11 +21,6 @@
+--- pop3d-ssl.rc.in.orig	Sun Jan 28 19:52:49 2001
++++ pop3d-ssl.rc.in	Sat Jun 22 16:58:46 2002
+@@ -21,12 +21,7 @@
  		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
  	done
  
@@ -11,9 +11,11 @@
 -		@SETENV@ - ${libexecdir}/authlib/authdaemond start
 -	fi
 -
- 	@SETENV@ - @SHELL@ -c " . @sysconfdir@/pop3d ; \
+-	@SETENV@ - @SHELL@ -c " . @sysconfdir@/pop3d ; \
++	@SETENV@ -i @SHELL@ -c " . @sysconfdir@/pop3d ; \
  		. @sysconfdir@/pop3d-ssl ; \
  		POP3_TLS=1; export POP3_TLS; \
+ 		`sed -n '/^#/d;/=/p' <@sysconfdir@/pop3d | \
 @@ -44,10 +39,6 @@
  	;;
  stop)
Index: patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/mail/courier-imap/patches/patch-ah,v
retrieving revision 1.1
diff -u -u -r1.1 patch-ah
--- patch-ah	2002/01/22 22:08:55	1.1
+++ patch-ah	2002/06/22 15:11:17
@@ -1,8 +1,8 @@
 $NetBSD: patch-ah,v 1.1 2002/01/22 22:08:55 jlam Exp $
 
---- pop3d.rc.in.orig	Sun Jul 29 20:02:32 2001
-+++ pop3d.rc.in
-@@ -21,11 +21,6 @@
+--- pop3d.rc.in.orig	Mon Jul 30 02:02:32 2001
++++ pop3d.rc.in	Sat Jun 22 16:58:36 2002
+@@ -21,12 +21,7 @@
  		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
  	done
  
@@ -11,9 +11,11 @@
 -		@SETENV@ - ${libexecdir}/authlib/authdaemond start
 -	fi
 -
- 	@SETENV@ - @SHELL@ -c " . @sysconfdir@/pop3d ; \
+-	@SETENV@ - @SHELL@ -c " . @sysconfdir@/pop3d ; \
++	@SETENV@ -i @SHELL@ -c " . @sysconfdir@/pop3d ; \
  				. @sysconfdir@/pop3d-ssl ; \
  		POP3_STARTTLS=$POP3DSTARTTLS ; export POP3_STARTTLS ; \
+ 		TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
 @@ -44,10 +39,6 @@
  	;;
  stop)
>Release-Note:
>Audit-Trail:
>Unformatted: