Use 'env -i' to satisfy new getopt(3).

Enable TLS.

Bump PKGREVISION.

provided by Julio Merino <jmmv at hispabsd dot org> in pkg/17361.

4 files changed, 30 insertions, 20 deletions

diff --git a/mail/courier-imap/patches/patch-ae b/mail/courier-imap/patches/patch-ae
index 250ff0d431e..0cd7612881a 100644
--- a/mail/courier-imap/patches/patch-ae
+++ b/mail/courier-imap/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2002/01/22 22:08:54 jlam Exp $
+$NetBSD: patch-ae,v 1.3 2002/06/22 15:55:24 grant 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 @@ $NetBSD: patch-ae,v 1.2 2002/01/22 22:08:54 jlam Exp $
 -	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)
diff --git a/mail/courier-imap/patches/patch-af b/mail/courier-imap/patches/patch-af
index cef07ec990f..1330daffc4e 100644
--- a/mail/courier-imap/patches/patch-af
+++ b/mail/courier-imap/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2002/01/22 22:08:54 jlam Exp $
+$NetBSD: patch-af,v 1.3 2002/06/22 15:55:24 grant 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 @@ $NetBSD: patch-af,v 1.2 2002/01/22 22:08:54 jlam Exp $
 -	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)
diff --git a/mail/courier-imap/patches/patch-ag b/mail/courier-imap/patches/patch-ag
index f51c4e66cf7..dae49a1fe2e 100644
--- a/mail/courier-imap/patches/patch-ag
+++ b/mail/courier-imap/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2002/01/22 22:08:55 jlam Exp $
+$NetBSD: patch-ag,v 1.3 2002/06/22 15:55:24 grant 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 @@ $NetBSD: patch-ag,v 1.2 2002/01/22 22:08:55 jlam Exp $
 -		@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)
diff --git a/mail/courier-imap/patches/patch-ah b/mail/courier-imap/patches/patch-ah
index 5f4b342c810..822978e9e5f 100644
--- a/mail/courier-imap/patches/patch-ah
+++ b/mail/courier-imap/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2002/01/22 22:08:55 jlam Exp $
+$NetBSD: patch-ah,v 1.2 2002/06/22 15:55:25 grant 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 @@ $NetBSD: patch-ah,v 1.1 2002/01/22 22:08:55 jlam Exp $
 -		@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)