cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to version 0.99 from maintainer

Browse Source
This commit is contained in:
danh 2000-08-10 21:12:48 +00:00
parent 7be1e8c24d
commit fe14c909c5
12 changed files with 122 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mail/courier-imap/Makefile
View File

@ -1,25 +1,30 @@
# $OpenBSD: Makefile,v 1.1.1.2 2000/07/03 08:11:24 kevlo Exp $
# $OpenBSD: Makefile,v 1.2 2000/08/10 21:12:48 danh Exp $
DISTNAME= courier-imap-0.35
DISTNAME= courier-imap-0.99
CATEGORIES= mail
NEED_VERSION= 1.311
MASTER_SITES= ftp://download.sourceforge.net/pub/sourceforge/courier/
NEED_VERSION= 1.319
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= courier
MAINTAINER= anil@recoil.org
HOMEPAGE= http://www.inter7.com/courierimap/
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
RUN_DEPENDS= stunnel::security/stunnel
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/share/courier-imap
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --disable-root-check --datadir=${PREFIX}/sbin
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/courier-imap
${INSTALL_DATA} ${WRKSRC}/imapd-ssl.config ${PREFIX}/share/courier-imap
${INSTALL_DATA} ${WRKSRC}/imapd.config ${PREFIX}/share/courier-imap
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/courier-imap
${INSTALL_DATA} ${WRKBUILD}/imapd-ssl.config \
${PREFIX}/share/examples/courier-imap
${INSTALL_DATA} ${WRKBUILD}/imapd.config \
${PREFIX}/share/examples/courier-imap
${INSTALL_DATA} ${WRKBUILD}/imapd.cnf \
${PREFIX}/share/examples/courier-imap
.include <bsd.port.mk>

6
mail/courier-imap/files/md5
View File

@ -1,3 +1,3 @@
MD5 (courier-imap-0.35.tar.gz) = 70080e8f4f42b13c73ec6b8f83f3e2d6
RMD160 (courier-imap-0.35.tar.gz) = 255f4c2b8c14636f04f374d2cee02d336a39623c
SHA1 (courier-imap-0.35.tar.gz) = aefd5341862cef800b59c638bb616fb8327acac5
MD5 (courier-imap-0.99.tar.gz) = 30cd5394164e9062e4a45c496480bc4c
RMD160 (courier-imap-0.99.tar.gz) = 040dd70707931164e6796c3305b34e8bd603a1a8
SHA1 (courier-imap-0.99.tar.gz) = c67ec1f33806c6c857429d9111eafcb19137980c

13
mail/courier-imap/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-Makefile_in,v 1.1 2000/08/10 21:12:49 danh Exp $
--- Makefile.in.orig Thu Jul 27 20:49:07 2000
+++ Makefile.in Thu Aug 10 14:21:23 2000
@@ -760,9 +760,6 @@ install-exec-local:
test ! -x tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
$(mkinstalldirs) $(DESTDIR)$(sbindir)
- for f in mkimapdcert vchkpw2userdb makeuserdb pw2userdb userdb ; \
- do rm -f $(DESTDIR)$(sbindir)/$$f ; \
- $(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
# If authlib built authpam, install the PAM configuration file

12
mail/courier-imap/patches/patch-authlib-Makefile-in
View File

@ -1,12 +0,0 @@
--- authlib/Makefile.in.orig Thu Jun 29 17:23:06 2000
+++ authlib/Makefile.in Thu Jun 29 17:23:25 2000
@@ -1073,8 +1073,7 @@ install-data-local: install-authldaprc i
test "$(man_LINKS)" = "" && exit 0; \
$(mkinstalldirs) $(DESTDIR)$(man8dir) ; \
for f in $(man_MANS) "" ; do \
- test "$$f" = "" && continue ; \
- $(INSTALL_DATA) $$f $(DESTDIR)$(man8dir) ; done ; \
+ test "$$f" = "" && continue ; done ; \
cd $(DESTDIR)$(man8dir) || exit 1 ; \
for f in $(man_LINKS) "" ; do \
test "$$f" = "" && continue ; \

37
mail/courier-imap/patches/patch-configure
View File

@ -1,37 +0,0 @@
--- configure.orig Thu Jun 29 01:47:00 2000
+++ configure Thu Jun 29 17:30:50 2000
@@ -45,10 +45,10 @@ x_libraries=NONE
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
+datadir='${prefix}/share/courier-imap'
+sysconfdir='${prefix}/share/courier-imap'
sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
+localstatedir='/var/run'
libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
@@ -1109,19 +1109,7 @@ fi
-defaultprefix="/usr/lib/courier-imap"
-
-
-rm -f confmdtest1
-cp /dev/null confmdtest1
-chmod 000 confmdtest1
-if test -w confmdtest1
-then
- echo "configure: warning: === Do not compile Courier-IMAP as root. Compile" 1>&2
- echo "configure: warning: === Courier-IMAP as a non-root user then su to" 1>&2
- echo "configure: warning: === root before running make install." 1>&2
- { echo "configure: error: aborted." 1>&2; exit 1; }
-fi
+defaultprefix="/usr/local"
if test x$prefix = xNONE
then

26
mail/courier-imap/patches/patch-imap_imapd-ssl_config_in Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-imap_imapd-ssl_config_in,v 1.1 2000/08/10 21:12:49 danh Exp $
--- imap/imapd-ssl.config.in.orig Sat Jul 22 23:01:19 2000
+++ imap/imapd-ssl.config.in Thu Aug 10 14:43:19 2000
@@ -42,11 +42,11 @@ SSLPIDFILE=@piddir@/imapd-ssl.pid
# Whether or not to start IMAP over SSL on simap port:
-IMAPDSSLSTART=NO
+IMAPDSSLSTART=YES
# Whether or not to implement IMAP STARTTLS extension instead:
-IMAPDSTARTTLS=YES
+IMAPDSTARTTLS=NO
# Set IMAP_TLS_REQUIRED to 1 if you REQUIRE STARTTLS for everyone.
# (this option advertises the LOGINDISABLED IMAP capability, until STARTTLS
@@ -99,7 +99,7 @@ TLS_PROTOCOL=SSL3
# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually
# treated as confidential, and must not be world-readable.
#
-TLS_CERTFILE=@datadir@/imapd.pem
+TLS_CERTFILE=@sysconfdir@/ssl/private/imapd.pem
# TLS_PEERCERTDIR, TLS_OURCACERT - when it is required that all peer
# certificates are signed by a specific certificate authority, set

40
mail/courier-imap/patches/patch-imap_mkimapdcert_in Normal file
View File

@ -0,0 +1,40 @@
$OpenBSD: patch-imap_mkimapdcert_in,v 1.1 2000/08/10 21:12:49 danh Exp $
--- imap/mkimapdcert.in.orig Sun Jul 9 14:27:21 2000
+++ imap/mkimapdcert.in Thu Aug 10 14:44:02 2000
@@ -12,20 +12,24 @@
test -x @OPENSSL@ || exit 0
prefix="@prefix@"
-
-if test -f @datadir@/imapd.pem
+certdir=@sysconfdir@/ssl/private
+if test -f ${certdir}/imapd.pem
then
- echo "@datadir@/imapd.pem already exists."
+ echo "${certdir}/imapd.pem already exists."
exit 1
fi
+if test -f ${certdir}/imapd.rand
+then
+ echo "${certdir}/imapd.rand exists - delete it to continue."
+ exit 1
+fi
+cp /dev/null ${certdir}/imapd.pem
+chmod 600 ${certdir}/imapd.pem
+chown @mailuser@ ${certdir}/imapd.pem
-cp /dev/null @datadir@/imapd.pem
-chmod 600 @datadir@/imapd.pem
-chown @mailuser@ @datadir@/imapd.pem
-
-dd if=@RANDOMV@ of=@datadir@/imapd.rand count=1 2>/dev/null
+dd if=@RANDOMV@ of=${certdir}/imapd.rand count=1 2>/dev/null
@OPENSSL@ req -new -x509 -days 365 -nodes \
- -config @sysconfdir@/imapd.cnf -out @datadir@/imapd.pem -keyout @datadir@/imapd.pem
-@OPENSSL@ gendh -rand @datadir@/imapd.rand 512 >>@datadir@/imapd.pem
-@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/imapd.pem
-rm -f @datadir@/imapd.rand
+ -config @sysconfdir@/imapd.cnf -out ${certdir}/imapd.pem -keyout ${certdir}/imapd.pem
+@OPENSSL@ gendh -rand ${certdir}/imapd.rand 512 >>${certdir}/imapd.pem
+@OPENSSL@ x509 -subject -dates -fingerprint -noout -in ${certdir}/imapd.pem
+rm -f ${certdir}/imapd.rand

24
mail/courier-imap/patches/patch-imapd-rc-in
View File

@ -1,24 +0,0 @@
--- imapd.rc.in.orig Thu Jun 29 16:48:00 2000
+++ imapd.rc.in Thu Jun 29 16:49:13 2000
@@ -10,8 +10,8 @@ exec_prefix=@exec_prefix@
bindir=@bindir@
libexecdir=@libexecdir@
-. @sysconfdir@/imapd.config
-. @sysconfdir@/imapd-ssl.config
+. /etc/imapd.config
+. /etc/imapd-ssl.config
case $1 in
start)
@@ -27,8 +27,8 @@ start)
fi
ulimit -d $IMAP_ULIMITD
- @SETENV@ - @SHELL@ -c " . @sysconfdir@/imapd.config ; \
- `sed -n '/^#/d;/=/p' <@sysconfdir@/imapd.config | \
+ @SETENV@ - @SHELL@ -c " . /etc/imapd.config ; \
+ `sed -n '/^#/d;/=/p' </etc/imapd.config | \
sed 's/=.*//;s/^/export /;s/$/;/'`
@libexecdir@/couriertcpd -address=$ADDRESS \
-stderrlogger=@libexecdir@/logger \

29
mail/courier-imap/patches/patch-imapd-ssl-rc-in
View File

@ -1,29 +0,0 @@
--- imapd-ssl.rc.in.orig Sat Jun 10 02:41:27 2000
+++ imapd-ssl.rc.in Thu Jun 29 16:50:49 2000
@@ -10,8 +10,8 @@ exec_prefix=@exec_prefix@
bindir=@bindir@
libexecdir=@libexecdir@
-. @sysconfdir@/imapd.config
-. @sysconfdir@/imapd-ssl.config
+. /etc/imapd.config
+. /etc/imapd-ssl.config
case $1 in
start)
@@ -27,11 +27,11 @@ start)
fi
ulimit -d $IMAP_ULIMITD
- @SETENV@ - @SHELL@ -c " . @sysconfdir@/imapd.config ; \
- . @sysconfdir@/imapd-ssl.config ; \
- `sed -n '/^#/d;/=/p' <@sysconfdir@/imapd.config | \
+ @SETENV@ - @SHELL@ -c " . /etc/imapd.config ; \
+ . /etc/imapd-ssl.config ; \
+ `sed -n '/^#/d;/=/p' </etc/imapd.config | \
sed 's/=.*//;s/^/export /;s/$/;/'`
- `sed -n '/^#/d;/=/p' <@sysconfdir@/imapd-ssl.config | \
+ `sed -n '/^#/d;/=/p' </etc/imapd-ssl.config | \
sed 's/=.*//;s/^/export /;s/$/;/'`
@libexecdir@/couriertcpd -address=$ADDRESS \
-stderrlogger=@libexecdir@/logger \

3
mail/courier-imap/pkg/DESCR
View File

@ -8,5 +8,4 @@ Features include an extremely small memory footprint, abstract
authentication modules (e.g. /etc/passwd, LDAP, PAM), virtual mailbox
support, resource controls, SSL/TLS, shared folders, and IPv6 support.
--
Anil Madhavapeddy, anil@recoil.org
WWW: ${HOMEPAGE}

25
mail/courier-imap/pkg/MESSAGE
View File

@ -1,20 +1,23 @@
==============================================================
The configuration files for Courier-IMAP have been installed
in /usr/local/share/courier.
Example configuration files for Courier-IMAP have been installed
in ${PREFIX}/share/examples/courier-imap.
You should copy imapd.config and imapd-ssl.config to /etc,
and edit them to your site's needs.
You should copy imapd.config, imapd-ssl.config and imapd.cnf
to /etc, and edit them to your site's needs. Pay particular
attention to the details in imapd.cnf, and read ssl(8) if
necessary. You MUST set the CN in imapd.cnf to the hostname
by which your imap server is accessed, or else clients will
throw up security warnings.
When this is done, you can use the 'mkimapdcert' script
to automatically generate a server certificate, which
is installed into /etc/ssl/private/imapd.pem
It is generally not a good idea to expose plain-text IMAP to
the outside world, so you can bind the plain-text one to
127.0.0.1, and the SSL one to your external IP interface(s).
Don't forget to configure stunnel correctly before trying to
use the SSL facility of Courier.
To control the daemon use /usr/local/libexec/imapd.rc and
/usr/local/libexec/imapd-ssl.rc
More documentation is available at the Courier-IMAP homepage,
at http://www.inter7.com/courierimap/
To control the daemon use ${PREFIX}/libexec/imapd.rc and
${PREFIX}/libexec/imapd-ssl.rc
==============================================================

13
mail/courier-imap/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2000/07/03 03:42:55 turan Exp $
@comment $OpenBSD: PLIST,v 1.2 2000/08/10 21:12:50 danh Exp $
bin/couriertls
bin/imapd
bin/maildirmake
libexec/authlib/authcram
@ -15,6 +16,7 @@ man/man8/authcram.8
man/man8/authdaemon.8
man/man8/authdaemond.8
man/man8/authldap.8
man/man8/authlib.8
man/man8/authmysql.8
man/man8/authpam.8
man/man8/authpwd.8
@ -25,17 +27,20 @@ man/man8/couriertcpd.8
man/man8/deliverquota.8
man/man8/imapd.8
man/man8/makeuserdb.8
man/man8/mkimapdcert.8
man/man8/pw2userdb.8
man/man8/userdb.8
man/man8/userdbpw.8
man/man8/vchkpw2userdb.8
sbin/imaplogin
sbin/makeuserdb
sbin/mkimapdcert
sbin/pw2userdb
sbin/userdb
sbin/userdbpw
sbin/vchkpw2userdb
share/courier-imap/imapd-ssl.config
share/courier-imap/imapd.config
@dirrm share/courier-imap
share/examples/courier-imap/imapd-ssl.config
share/examples/courier-imap/imapd.cnf
share/examples/courier-imap/imapd.config
@dirrm share/examples/courier-imap
@dirrm libexec/authlib