d6b7ea47c8
- regenerate patches and name them consistently. Note that the configuration file format and names have changed with this release - add an INSTALL shell fragment to detect old versions of the config files and warn the user to regenerate them - config files now live in /etc/courier-imap, as they are very generic names, and this avoid conflict with other imap daemons Summary of changes: This release fixes some bugs in the POP3 server, adds optional support for gb2312 and big5 text search, and introduces a new configuration file format. The new configuration file format will allow future upgrades to automatically preserve the existing system configuration data, instead of installing a default set of configuration files
44 lines
1.5 KiB
Plaintext
44 lines
1.5 KiB
Plaintext
$OpenBSD: patch-imap_mkpop3dcert_in,v 1.1 2000/12/29 18:51:57 avsm Exp $
|
|
--- imap/mkpop3dcert.in.orig Fri Oct 6 17:50:37 2000
|
|
+++ imap/mkpop3dcert.in Fri Dec 29 17:29:17 2000
|
|
@@ -13,25 +13,27 @@ test -x @OPENSSL@ || exit 0
|
|
|
|
prefix="@prefix@"
|
|
|
|
-if test -f @datadir@/pop3d.pem
|
|
+SSLDIR=/etc/ssl/private
|
|
+
|
|
+if test -f ${SSLDIR}/pop3d.pem
|
|
then
|
|
- echo "@datadir@/pop3d.pem already exists."
|
|
+ echo "${SSLDIR}/pop3d.pem already exists."
|
|
exit 1
|
|
fi
|
|
|
|
-cp /dev/null @datadir@/pop3d.pem
|
|
-chmod 600 @datadir@/pop3d.pem
|
|
-chown @mailuser@ @datadir@/pop3d.pem
|
|
+cp /dev/null ${SSLDIR}/pop3d.pem
|
|
+chmod 600 ${SSLDIR}/pop3d.pem
|
|
+chown @mailuser@ ${SSLDIR}/pop3d.pem
|
|
|
|
cleanup() {
|
|
- rm -f @datadir@/pop3d.pem
|
|
- rm -f @datadir@/pop3d.rand
|
|
+ rm -f ${SSLDIR}/pop3d.pem
|
|
+ rm -f ${SSLDIR}/pop3d.rand
|
|
exit 1
|
|
}
|
|
|
|
-dd if=@RANDOMV@ of=@datadir@/pop3d.rand count=1 2>/dev/null
|
|
+dd if=@RANDOMV@ of=${SSLDIR}/pop3d.rand count=1 2>/dev/null
|
|
@OPENSSL@ req -new -x509 -days 365 -nodes \
|
|
- -config @sysconfdir@/pop3d.cnf -out @datadir@/pop3d.pem -keyout @datadir@/pop3d.pem || cleanup
|
|
-@OPENSSL@ gendh -rand @datadir@/pop3d.rand 512 >>@datadir@/pop3d.pem || cleanup
|
|
-@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/pop3d.pem || cleanup
|
|
-rm -f @datadir@/pop3d.rand
|
|
+ -config @sysconfdir@/pop3d.cnf -out ${SSLDIR}/pop3d.pem -keyout ${SSLDIR}/pop3d.pem || cleanup
|
|
+@OPENSSL@ gendh -rand ${SSLDIR}/pop3d.rand 512 >>${SSLDIR}/pop3d.pem || cleanup
|
|
+@OPENSSL@ x509 -subject -dates -fingerprint -noout -in ${SSLDIR}/pop3d.pem || cleanup
|
|
+rm -f ${SSLDIR}/pop3d.rand
|