Date: Sun, 27 Aug 2000 18:49:01 +0200 (CEST) From: Jimmy Olgeni <olgeni@uli.it> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/20888: [PATCH] Miscellaneous fixes for the cyrus port Message-ID: <Pine.BSF.4.21.0008271848450.58989-100000@olgeni.localdomain.net>
next in thread | raw e-mail | index | archive | help
>Number: 20888
>Category: ports
>Synopsis: [PATCH] Miscellaneous fixes for the cyrus port
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 27 09:50:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Jimmy Olgeni
>Release: FreeBSD 4.1-STABLE i386
>Organization:
Colby
>Environment:
Current cyrus port (1.6.22).
>Description:
${PREFIX}/etc/rc.d/cyrus.sh will never find pwcheck in the
${PREFIX}/cyrus/bin/pwcheck directory, since pwcheck is managed by the
cyrus-sasl port.
"make deinstall" will delete these files:
${PREFIX}/etc/imap/mailboxes
${PREFIX}/etc/imapd.conf
losing some data and configuration.
Changes:
* Remove file cyrus.sh: pwcheck is already started by pwcheck.sh from
the cyrus-sasl port. cyrus.sh does not have any effect since
${PREFIX}/cyrus/bin/pwcheck does not exist. Let cyrus-sasl manage
pwcheck.
* Remove these files from the PLIST, so "make deinstall" won't lose
data and configuration during an upgrade.
etc/imap/mailboxes
etc/imapd.conf
Changed files:
Makefile (don't install cyrus.sh)
pkg/PLIST (remove configuration data)
Removed files:
files/cyrus.sh
>How-To-Repeat:
>Fix:
diff -rcN cyrus.orig/Makefile cyrus/Makefile
*** cyrus.orig/Makefile Thu Jun 29 20:48:04 2000
--- cyrus/Makefile Sun Aug 27 15:37:58 2000
***************
*** 98,106 ****
@${ECHO} "@cwd /var" >>${TMPPLIST}
@${ECHO} "@dirrm pwcheck" >>${TMPPLIST}
@${ECHO} "@dirrm spool/imap" >>${TMPPLIST}
- @${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \
- >${PREFIX}/etc/rc.d/cyrus.sh
- @${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh
@PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
--- 98,103 ----
diff -rcN cyrus.orig/files/cyrus.sh cyrus/files/cyrus.sh
*** cyrus.orig/files/cyrus.sh Wed Sep 23 17:36:26 1998
--- cyrus/files/cyrus.sh Thu Jan 1 01:00:00 1970
***************
*** 1,27 ****
- #!/bin/sh
- #
- PREFIX=%%PREFIX%%
-
- case "$1" in
-
- start)
- if [ -x ${PREFIX}/cyrus/bin/pwcheck ]
- then
- ${PREFIX}/cyrus/bin/pwcheck & && echo -n " pwcheck"
- fi
- ;;
-
- stop)
- if [ -r /var/run/pwcheck.pid ]
- then
- kill `cat /var/run/pwcheck.pid` && echo -n " pwcheck"
- fi
- ;;
-
- *)
- echo "usage: $0 {start|stop}" 1>&2
- exit 64
- ;;
-
- esac
-
--- 0 ----
diff -rcN cyrus.orig/pkg/PLIST cyrus/pkg/PLIST
*** cyrus.orig/pkg/PLIST Wed Jun 14 19:45:28 2000
--- cyrus/pkg/PLIST Sun Aug 27 15:44:10 2000
***************
*** 14,24 ****
cyrus/bin/feedcyrus
cyrus/bin/timsieved
cyrus/bin/cyrquota
- etc/rc.d/cyrus.sh
etc/imapd.conf.dist
etc/inetd.conf.cyrus
- etc/imap/mailboxes
- etc/imapd.conf
include/cyrus/acl.h
include/cyrus/assert.h
include/cyrus/auth.h
--- 14,21 ----
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0008271848450.58989-100000>