Courier IMAP SSL rc scripts have an unterminated string

[Mark Cullen <mark.r.cullen%gmail.com@localhost>]

send-pr doesn't seem to want to work for me for some strange reason, so 
I hope someone here picks it up instead.

To: gnats-bugs%gnats.NetBSD.org@localhost
Subject: Courier IMAP SSL rc scripts have an unterminated string
From: mark.r.cullen%gmail.com@localhost
Reply-To: mark.r.cullen%gmail.com@localhost
X-send-pr-version: 3.95

>Submitter-Id:  net
>Originator:
>Organization:
>Confidential:  no
>Synopsis:      Courier IMAP SSL rc scripts have an unterminated 
string, preventing them from running
>Severity:      critical
>Priority:      medium
>Category:      pkg
>Class:         sw-bug
>Release:       NetBSD 3.0
System: NetBSD bone2.bone.servebeer.com 3.0 NetBSD 3.0 (BONE) #1: Fri 
Jun 9 15:51:51 UTC 2006 mrboo%bone2.bone.servebeer.com@localhost
:/usr/obj/sys/arch/i386/compile/BONE i386
Architecture: i386
Machine: i386

>Description:
The rc.d scripts for the courier-imap package, installed from pkgsrc, 
have an unterminated string in one of the if statement
s, resulting in the following errors when they are executed:

courierimaps: 61: Syntax error: Unterminated quoted string

courierpops: 61: Syntax error: Unterminated quoted string

>How-To-Repeat:
Install `mail/courier-imap` package from pkgsrc and attempt to run the 
SSL rc.d scripts:

/usr/pkg/share/examples/rc.d/courierimaps start
/usr/pkg/share/examples/rc.d/courierpops start

>Fix:
This is my first ever time submitting a patch for anything, so I 
apologise if they're in a wrong format or anything.

Patch for: /usr/pkgsrc/mail/courier-imap/files/courierimaps.sh

--- courierimaps.sh     2006-04-30 07:07:07.000000000 +0000
+++ courierimaps.sh.fixed       2006-06-09 16:45:46.000000000 +0000
@@ -41,7 +41,7 @@
                        return 1
                fi
                if [ ! -f "$f" ] && \
-                  [ "$f" = "@PKG_SYSCONFDIR@/imapd.pem ]; then
+                  [ "$f" = "@PKG_SYSCONFDIR@/imapd.pem" ]; then
                        @ECHO@ "Generating IMAP SSL certificate in $f."
                        @PREFIX@/sbin/mkimapdcert >/dev/null 2>&1
                fi

Patch for: /usr/pkgsrc/mail/courier-imap/files/courierpops.sh

--- courierpops.sh      2006-04-30 07:07:07.000000000 +0000
+++ courierpops.sh.fixed        2006-06-09 16:46:00.000000000 +0000
@@ -41,7 +41,7 @@
                        return 1
                fi
                if [ ! -f "$f" ] && \
-                  [ "$f" = "@PKG_SYSCONFDIR@/pop3d.pem ]; then
+                  [ "$f" = "@PKG_SYSCONFDIR@/pop3d.pem" ]; then
                        @ECHO@ "Generating POP3 SSL certificate in $f."
                        @PREFIX@/sbin/mkpop3dcert >/dev/null 2>&1
                fi