[prev in list] [next in list] [prev in thread] [next in thread]
List: annvix-cvs
Subject: [cvs] SVN commit in packages r6643 - in
From: Vincent Danen <cvsrep () annvix ! org>
Date: 2006-12-31 8:08:58
Message-ID: 20061231080858.GE3410 () annvix ! org
[Download RAW message or body]
Received: from s01060011958bd0e4.ed.shawcable.net ([68.149.51.213]
helo=build.annvix.org)
by hades.annvix.org with esmtps (TLSv1:AES256-SHA:256) (Exim 4.54)
id 1H0v1j-0006y1-KF
for cvs@annvix.org; Sun, 31 Dec 2006 00:22:42 -0700
Received: from apache by build.annvix.org with local (Exim 4.54)
id 1H0v1h-00046X-PA
for cvs@annvix.org; Sun, 31 Dec 2006 00:22:37 -0700
To: cvs@annvix.org
From: cvsrep@annvix.org
Content-Type: text/plain; charset=UTF-8
Message-Id: <E1H0v1h-00046X-PA@build.annvix.org>
Sender: system user for httpd-conf <apache@build.annvix.org>
Date: Sun, 31 Dec 2006 00:22:37 -0700
X-SA-Exim-Connect-IP: 68.149.51.213
X-SA-Exim-Mail-From: apache@build.annvix.org
X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on hades.annvix.org
X-Spam-Level:
X-Spam-Status: No, score=-1.5 required=6.0 testsºYES_00,FORGED_RCVD_HELO,
NO_REAL_NAME autolearn=no version=3.1.0
Subject: SVN commit in packages r6643 - in releases/2.0-CURRENT/courier-imap:
SOURCES SPECS
X-SA-Exim-Version: 4.2 (built Wed, 01 Feb 2006 18:29:36 -0700)
X-SA-Exim-Scanned: Yes (on hades.annvix.org)
Content-Transfer-Encoding: quoted-printable
Author: vdanen
Date: 2006-12-31 00:22:35 -0700 (Sun, 31 Dec 2006)
New Revision: 6643
Added:
releases/2.0-CURRENT/courier-imap/SOURCES/IP.env
releases/2.0-CURRENT/courier-imap/SOURCES/MAX_CONN.env
releases/2.0-CURRENT/courier-imap/SOURCES/MAX_MEM.env
releases/2.0-CURRENT/courier-imap/SOURCES/MAX_PER_HOST.env
releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-4.1.1-avx-cert_location.patch
releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-4.1.1-avx-tcpsvd_configs.patch
releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-4.1.1-pam_service_name.diff
releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-4.1.1.tar.bz2
Removed:
releases/2.0-CURRENT/courier-imap/SOURCES/authdaemond-log.run
releases/2.0-CURRENT/courier-imap/SOURCES/authdaemond.run
releases/2.0-CURRENT/courier-imap/SOURCES/auto_maildir_creator
releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-1.6.1-initrd.patch
releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-2.1.1-configure.patch
releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-2.1.2-authnodaemon.patch
releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-3.0.8-auto_maildir_creator.diff
releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-3.0.8-overflow.patch
releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-3.0.8.tar.bz2
releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-sysconftool-rpmupgrade
releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap.sysconfig
releases/2.0-CURRENT/courier-imap/SOURCES/courier_patch.tar.gz
releases/2.0-CURRENT/courier-imap/SOURCES/courier_patch.tar.gz.asc
Modified:
releases/2.0-CURRENT/courier-imap/SOURCES/courier-imapd.run
releases/2.0-CURRENT/courier-imap/SOURCES/courier-imapds.run
releases/2.0-CURRENT/courier-imap/SOURCES/courier-pop3d.run
releases/2.0-CURRENT/courier-imap/SOURCES/courier-pop3ds.run
releases/2.0-CURRENT/courier-imap/SPECS/courier-imap.spec
Log:
- 4.1.1
- complete overhaul due to the break-out of courier-authlib
- merge maildirmake++ into courier-base
- SSL certs are now in /etc/ssl/courier rather than the default of
/usr/share/courier (moved the ssl config files there too)
- P0: fix the pam.d/ filenames
- P1: fix the SSL cert location in mkimapdcert and mkpop3dcert
- use environment directories
- update runscripts to use envdirs (MAX_CONN, MAX_MEM, IP, PORT,
MAX_PER_HOST); NOTE: the ./env/IP and ./env/PORT settings override
the courier-imap configuration files' PORT/SSLPORT, ADDRESS, MAXPERIP,
and MAXDAEMONS settings
- move the SSL certs from the old location to the new if they're found
- P2: heavy patch to remove all couriertcpd-related options from the
config files
Added: releases/2.0-CURRENT/courier-imap/SOURCES/IP.env
Added: releases/2.0-CURRENT/courier-imap/SOURCES/MAX_CONN.env
Added: releases/2.0-CURRENT/courier-imap/SOURCES/MAX_MEM.env
Added: releases/2.0-CURRENT/courier-imap/SOURCES/MAX_PER_HOST.env
Deleted: releases/2.0-CURRENT/courier-imap/SOURCES/authdaemond-log.run
Deleted: releases/2.0-CURRENT/courier-imap/SOURCES/authdaemond.run
Deleted: releases/2.0-CURRENT/courier-imap/SOURCES/auto_maildir_creator
Deleted: releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-1.6.1-initrd.patch
Deleted: releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-2.1.1-configure.patch
Deleted: releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-2.1.2-authnodaemon.patch
Deleted: releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-3.0.8-auto_maildir_creator.diff
Deleted: releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-3.0.8-overflow.patch
Deleted: releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-3.0.8.tar.bz2
Added: releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-4.1.1-avx-cert_location.patch
Added: releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-4.1.1-avx-tcpsvd_configs.patch
Added: releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-4.1.1-pam_service_name.diff
Added: releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-4.1.1.tar.bz2
Property changes on: \
releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-4.1.1.tar.bz2 \
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap-sysconftool-rpmupgrade
Deleted: releases/2.0-CURRENT/courier-imap/SOURCES/courier-imap.sysconfig
Modified: releases/2.0-CURRENT/courier-imap/SOURCES/courier-imapd.run
===================================================================
--- releases/2.0-CURRENT/courier-imap/SOURCES/courier-imapd.run 2006-12-31 06:32:13 \
UTC (rev 6642)
+++ releases/2.0-CURRENT/courier-imap/SOURCES/courier-imapd.run 2006-12-31 07:22:35 \
UTC (rev 6643) @@ -10,34 +10,33 @@
# defaults; then source the imap configurations
PORT="143"
-ADDRESS="0"
+IP="0"
+MAX_MEM="14000000"
+MAX_CONN="250"
+MAX_PER_HOST="4"
[ -f /etc/courier/imapd-ssl ] && . /etc/courier/imapd-ssl
[ -f /etc/courier/imapd ] && . /etc/courier/imapd
-
-# source the imap configuration
-[ -f /etc/courier/imapd ] && . /etc/courier/imapd
-
-# defaults; can be overwritten by sysconfig
-MAX_MEMORY="14000000"
-CONCURRENCY="250"
-
# source sysconfig file
-[ -f /etc/sysconfig/imapd ] && . /etc/sysconfig/imapd
+[[ -f ./env/MAX_PER_HOST ]] && MAX_PER_HOST="$(head -1 ./env/MAX_PER_HOST)"
+[[ -f ./env/MAX_CONN ]] && MAX_CONN="$(head -1 ./env/MAX_CONN)"
+[[ -f ./env/MAX_MEM ]] && MAX_MEM="$(head -1 ./env/MAX_MEM)"
+[[ -f ./env/PORT ]] && PORT="$(head -1 ./env/PORT)"
+[[ -f ./env/IP ]] && IP="$(head -1 ./env/IP)"
HOSTNAME="`hostname --fqdn`"
LIBAUTHMODULES=""
-for f in `echo $AUTHMODULES`
+for f in `echo ${AUTHMODULES}`
do
- LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier/authlib/$f"
+ LIBAUTHMODULES="${LIBAUTHMODULES} /usr/lib/courier/authlib/${f}"
done
-IMAP_STARTTLS=$IMAPDSTARTTLS; export IMAP_STARTTLS
-TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL; export TLS_PROTOCOL
+IMAP_STARTTLS=${IMAPDSTARTTLS}; export IMAP_STARTTLS
+TLS_PROTOCOL=${TLS_STARTTLS_PROTOCOL}; export TLS_PROTOCOL
-exec /sbin/chpst -m "$MAX_MEMORY" \
- /sbin/tcpsvd -c"$CONCURRENCY" -v -l"$HOSTNAME" -x peers.cdb \
- $ADDRESS $PORT /usr/sbin/imaplogin $LIBAUTHMODULES \
+exec /sbin/chpst -m "${MAX_MEM}" \
+ /sbin/tcpsvd -c"${MAX_CONN}" -C"${MAX_PER_HOST}" -v -l"${HOSTNAME}" -x peers.cdb \
+ ${IP} ${PORT} /usr/sbin/imaplogin ${LIBAUTHMODULES} \
/usr/bin/imapd Maildir 2>&1
Modified: releases/2.0-CURRENT/courier-imap/SOURCES/courier-imapds.run
===================================================================
--- releases/2.0-CURRENT/courier-imap/SOURCES/courier-imapds.run 2006-12-31 06:32:13 \
UTC (rev 6642)
+++ releases/2.0-CURRENT/courier-imap/SOURCES/courier-imapds.run 2006-12-31 07:22:35 \
UTC (rev 6643) @@ -7,37 +7,40 @@
set -a
PATH="/sbin:/usr/sbin:/bin:/usr/bin"
-TLS_CACHEFILE=""
# defaults; then source the imap configurations
-SSLPORT="993"
-SSLADDRESS="0"
+TLS_CACHEFILE=""
+PORT="993"
+IP="0"
+MAX_MEM="14000000"
+MAX_CONN="250"
+MAX_PER_HOST="4"
[ -f /etc/courier/imapd ] && . /etc/courier/imapd
-[ -f /etc/courier/imapd-ssl ] && . /etc/courier/imapd-ssl
+[ -f /etc/courier/imapd-ssl ] && . /etc/courier/imapd-ssl
-# defaults; can be overwritten by sysconfig
-MAX_MEMORY="14000000"
-CONCURRENCY="250"
-
# source sysconfig file
-[ -f /etc/sysconfig/imapd-ssl ] && . /etc/sysconfig/imapd-ssl
+[[ -f ./env/MAX_PER_HOST ]] && MAX_PER_HOST="$(head -1 ./env/MAX_PER_HOST)"
+[[ -f ./env/MAX_CONN ]] && MAX_CONN="$(head -1 ./env/MAX_CONN)"
+[[ -f ./env/MAX_MEM ]] && MAX_MEM="$(head -1 ./env/MAX_MEM)"
+[[ -f ./env/PORT ]] && PORT="$(head -1 ./env/PORT)"
+[[ -f ./env/IP ]] && IP="$(head -1 ./env/IP)"
HOSTNAME="`hostname --fqdn`"
LIBAUTHMODULES=""
-for f in `echo $AUTHMODULES`
+for f in `echo ${AUTHMODULES}`
do
- LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier/authlib/$f"
+ LIBAUTHMODULES="${LIBAUTHMODULES} /usr/lib/courier/authlib/${f}"
done
IMAP_TLS=1; export IMAP_TLS
-if [ "$TLS_CACHEFILE" != "" ]; then
- rm -f $TLS_CACHEFILE
+if [ "${TLS_CACHEFILE}" != "" ]; then
+ rm -f ${TLS_CACHEFILE}
fi
-exec /sbin/chpst -m "$MAX_MEMORY" \
- /sbin/tcpsvd -c"$CONCURRENCY" -v -l"$HOSTNAME" -x peers.cdb \
- $SSLADDRESS $SSLPORT /usr/bin/couriertls -server -tcpd /usr/sbin/imaplogin \
$LIBAUTHMODULES \ +exec /sbin/chpst -m "${MAX_MEM}" \
+ /sbin/tcpsvd -c"${MAX_CONN}" -C"${MAX_PER_HOST}" -v -l"${HOSTNAME}" -x peers.cdb \
+ ${IP} ${PORT} /usr/bin/couriertls -server -tcpd /usr/sbin/imaplogin \
${LIBAUTHMODULES} \ /usr/bin/imapd Maildir 2>&1
Modified: releases/2.0-CURRENT/courier-imap/SOURCES/courier-pop3d.run
===================================================================
--- releases/2.0-CURRENT/courier-imap/SOURCES/courier-pop3d.run 2006-12-31 06:32:13 \
UTC (rev 6642)
+++ releases/2.0-CURRENT/courier-imap/SOURCES/courier-pop3d.run 2006-12-31 07:22:35 \
UTC (rev 6643) @@ -10,29 +10,32 @@
# defaults; then source the pop3 configurations
PORT="110"
-ADDRESS="0"
+IP="0"
+MAX_MEM="14000000"
+MAX_CONN="250"
+MAX_PER_HOST="4"
[ -f /etc/courier/pop3d-ssl ] && . /etc/courier/pop3d-ssl
[ -f /etc/courier/pop3d ] && . /etc/courier/pop3d
-# defaults; can be overwritten by sysconfig
-MAX_MEMORY="14000000"
-CONCURRENCY="250"
-
# source sysconfig file
-[ -f /etc/sysconfig/pop3d ] && . /etc/sysconfig/pop3d
+[[ -f ./env/MAX_PER_HOST ]] && MAX_PER_HOST="$(head -1 ./env/MAX_PER_HOST)"
+[[ -f ./env/MAX_CONN ]] && MAX_CONN="$(head -1 ./env/MAX_CONN)"
+[[ -f ./env/MAX_MEM ]] && MAX_MEM="$(head -1 ./env/MAX_MEM)"
+[[ -f ./env/PORT ]] && PORT="$(head -1 ./env/PORT)"
+[[ -f ./env/IP ]] && IP="$(head -1 ./env/IP)"
HOSTNAME="`hostname --fqdn`"
LIBAUTHMODULES=""
-for f in `echo $AUTHMODULES`
+for f in `echo ${AUTHMODULES}`
do
- LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier/authlib/$f"
+ LIBAUTHMODULES="${LIBAUTHMODULES} /usr/lib/courier/authlib/${f}"
done
-TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL; export TLS_PROTOCOL
+TLS_PROTOCOL=${TLS_STARTTLS_PROTOCOL}; export TLS_PROTOCOL
-exec /sbin/chpst -m "$MAX_MEMORY" \
- /sbin/tcpsvd -c"$CONCURRENCY" -v -l"$HOSTNAME" -x peers.cdb \
- $ADDRESS $PORT /usr/sbin/pop3login $LIBAUTHMODULES \
+exec /sbin/chpst -m "${MAX_MEM}" \
+ /sbin/tcpsvd -c"${MAX_CONN}" -C"${MAX_PER_HOST}" -v -l"${HOSTNAME}" -x peers.cdb \
+ ${IP} ${PORT} /usr/sbin/pop3login ${LIBAUTHMODULES} \
/usr/bin/pop3d Maildir 2>&1
Modified: releases/2.0-CURRENT/courier-imap/SOURCES/courier-pop3ds.run
===================================================================
--- releases/2.0-CURRENT/courier-imap/SOURCES/courier-pop3ds.run 2006-12-31 06:32:13 \
UTC (rev 6642)
+++ releases/2.0-CURRENT/courier-imap/SOURCES/courier-pop3ds.run 2006-12-31 07:22:35 \
UTC (rev 6643) @@ -9,32 +9,35 @@
PATH="/sbin:/usr/sbin:/bin:/usr/bin:$PATH"
# defaults; then source the pop3 configurations
-SSLPORT="995"
-SSLADDRESS="0"
+PORT="995"
+IP="0"
+MAX_MEM="14000000"
+MAX_CONN="250"
+MAX_PER_HOST="4"
[ -f /etc/courier/pop3d ] && . /etc/courier/pop3d
[ -f /etc/courier/pop3d-ssl ] && . /etc/courier/pop3d-ssl
-# defaults; can be overwritten by sysconfig
-MAX_MEMORY="14000000"
-CONCURRENCY="250"
-
# source sysconfig file
-[ -f /etc/sysconfig/pop3d-ssl ] && . /etc/sysconfig/pop3d-ssl
+[[ -f ./env/MAX_PER_HOST ]] && MAX_PER_HOST="$(head -1 ./env/MAX_PER_HOST)"
+[[ -f ./env/MAX_CONN ]] && MAX_CONN="$(head -1 ./env/MAX_CONN)"
+[[ -f ./env/MAX_MEM ]] && MAX_MEM="$(head -1 ./env/MAX_MEM)"
+[[ -f ./env/PORT ]] && PORT="$(head -1 ./env/PORT)"
+[[ -f ./env/IP ]] && IP="$(head -1 ./env/IP)"
HOSTNAME="`hostname --fqdn`"
LIBAUTHMODULES=""
-for f in `echo $AUTHMODULES`
+for f in `echo ${AUTHMODULES}`
do
- LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier/authlib/$f"
+ LIBAUTHMODULES="${LIBAUTHMODULES} /usr/lib/courier/authlib/${f}"
done
POP3_TLS=1; export POP3_TLS
POP3_STARTTLS=NO; export POP3_STARTTLS
POP3_TLS_REQUIRED=0; export POP3_TLS_REQUIRED
-exec /sbin/chpst -m "$MAX_MEMORY" \
- /sbin/tcpsvd -c"$CONCURRENCY" -v -l"$HOSTNAME" -x peers.cdb \
- $SSLADDRESS $SSLPORT /usr/bin/couriertls -server -tcpd /usr/sbin/pop3login \
$LIBAUTHMODULES \ +exec /sbin/chpst -m "${MAX_MEM}" \
+ /sbin/tcpsvd -c"${MAX_CONN}" -C"${MAX_PER_HOST}"-v -l"${HOSTNAME}" -x peers.cdb \
+ ${IP} ${PORT} /usr/bin/couriertls -server -tcpd /usr/sbin/pop3login \
${LIBAUTHMODULES} \ /usr/bin/pop3d Maildir 2>&1
Deleted: releases/2.0-CURRENT/courier-imap/SOURCES/courier_patch.tar.gz
Deleted: releases/2.0-CURRENT/courier-imap/SOURCES/courier_patch.tar.gz.asc
Modified: releases/2.0-CURRENT/courier-imap/SPECS/courier-imap.spec
===================================================================
--- releases/2.0-CURRENT/courier-imap/SPECS/courier-imap.spec 2006-12-31 06:32:13 UTC \
(rev 6642)
+++ releases/2.0-CURRENT/courier-imap/SPECS/courier-imap.spec 2006-12-31 07:22:35 UTC \
(rev 6643) @@ -9,17 +9,9 @@
%define revision $Rev$
%define name courier-imap
-%define version 3.0.8
+%define version 4.1.1
%define release %_revrel
-%define _localstatedir /var/run
-%define authdaemondir %{_localstatedir}/authdaemon.courier-imap
-%define courierdatadir %{_datadir}/courier
-%define courierlibdir %{_libdir}/courier
-%define couriersysconfdir %{_sysconfdir}/courier
-
-%define courier_patch_version 0.42.2
-
Summary: Courier-IMAP is an IMAP server that uses Maildirs
Name: %{name}
Version: %{version}
@@ -27,44 +19,34 @@
License: GPL
Group: System/Servers
URL: http://www.courier-mta.org
-Source0: %{name}-%{version}.tar.bz2
-Source1: courier-imap-sysconftool-rpmupgrade
-# S4 & S5 originates from the works of Carlo Contavalli and can be found here:
-# http://www.commedia.it/ccontavalli/
-Source2: courier_patch.tar.gz
-Source3: courier_patch.tar.gz.asc
-Source4: auto_maildir_creator
-Source5: courier-imapd.run
-Source6: courier-imapd-log.run
-Source7: courier-imapds.run
-Source8: courier-imapds-log.run
-Source9: courier-pop3d.run
-Source10: courier-pop3d-log.run
-Source11: courier-pop3ds.run
-Source12: courier-pop3ds-log.run
-Source13: courier-imap.sysconfig
-Source14: authdaemond.run
-Source15: authdaemond-log.run
-Source16: 09_courier-imap.afterboot
-Source17: courier.pam
-# (fc) 1.4.2-2mdk fix missing command in initrd
-Patch0: courier-imap-1.6.1-initrd.patch
-Patch1: courier-imap-3.0.8-auto_maildir_creator.diff
-Patch2: courier-imap-2.1.1-configure.patch
-Patch3: courier-imap-2.1.2-authnodaemon.patch
-Patch4: courier-imap-3.0.8-overflow.patch
+Source0: http://prdownloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2
+Source1: courier-imapd.run
+Source2: courier-imapd-log.run
+Source3: courier-imapds.run
+Source4: courier-imapds-log.run
+Source5: courier-pop3d.run
+Source6: courier-pop3d-log.run
+Source7: courier-pop3ds.run
+Source8: courier-pop3ds-log.run
+Source9: 09_courier-imap.afterboot
+Source10: courier.pam
+Source11: MAX_MEM.env
+Source12: MAX_CONN.env
+Source13: MAX_PER_HOST.env
+Source14: IP.env
+Patch0: courier-imap-4.1.1-pam_service_name.diff
+Patch1: courier-imap-4.1.1-avx-cert_location.patch
+Patch2: courier-imap-4.1.1-avx-tcpsvd_configs.patch
BuildRoot: %{_buildroot}/%{name}-%{version}
-BuildRequires: autoconf2.5
BuildRequires: openssl-devel
-BuildRequires: pam-devel
BuildRequires: gdbm-devel
-BuildRequires: openldap-devel
-BuildRequires: mysql-devel
-BuildRequires: postgresql-devel
+BuildRequires: courier-authlib-devel
+BuildRequires: courier-authdaemon
-Requires: gdbm
Requires: ipsvd
+Requires: courier-base = %{version}
+Requires: courier-authdaemon
Requires(post): afterboot
Requires(post): rpm-helper
Requires(postun): afterboot
@@ -78,103 +60,36 @@
Courier-IMAP is an IMAP server for Maildir mailboxes. This package contains
the standalone version of the IMAP server that's included in the Courier
mail server package. This package is a standalone version for use with
-other mail servers. Do not install this package if you intend to install
-the full Courier mail server. Install the Courier package instead.
+other mail servers.
-%package pop
+%package -n courier-base
+Summary: Contains base files for POP and IMAP servers
+Group: System/Servers
+Obsoletes: maildirmake++
+
+%description -n courier-base
+This package contains the base files for POP and IMAP servers.
+
+
+%package -n courier-pop
Summary: Courier-IMAP POP servers
Group: System/Servers
-Requires: %{name} = %{version}-%{release}
+Requires: courier-base = %{version}-%{release}
+Requires: courier-authdaemon
Requires: ipsvd
Requires(post): rpm-helper
-Requires(post): %{name}
Requires(preun): rpm-helper
Provides: pop
Provides: pop-server
Conflicts: uw-imap-pop
+Obsoletes: %{name}-pop
-%description pop
+%description -n courier-pop
This package contains the POP servers of the Courier-IMAP
server suite.
-%package ldap
-Summary: Courier-IMAP LDAP authentication driver
-Group: System/Servers
-Requires: %{name} = %{version}-%{release}
-#Requires: libldap2
-Requires(post): rpm-helper
-Requires(post): %{name}
-Requires(postun): rpm-helper
-Conflicts: %{name}-mysql
-Conflicts: %{name}-pgsql
-
-%description ldap
-This package contains the necessary files to allow Courier-IMAP to
-authenticate from an LDAP directory. Install this package if you need the
-ability to use an LDAP directory for authentication.
-
-
-%package mysql
-Summary: Courier-IMAP MySQL authentication driver
-Group: System/Servers
-Requires: %{name} = %{version}-%{release}
-Requires: mysql
-Requires(post): rpm-helper
-Requires(post): %{name}
-Requires(postun): rpm-helper
-Conflicts: %{name}-ldap
-Conflicts: %{name}-pgsql
-
-%description mysql
-This package contains the necessary files to allow Courier-IMAP to
-authenticate using a MySQL database table. Install this package if you need
-the ability to use a MySQL database table for authentication.
-
-
-%package pgsql
-Summary: Courier-IMAP PostgreSQL authentication driver
-Group: System/Servers
-Requires: %{name} = %{version}-%{release}
-Requires: postgresql-libs
-Requires(post): rpm-helper
-Requires(post): %{name}
-Requires(postun): rpm-helper
-Conflicts: %{name}-ldap
-Conflicts: %{name}-mysql
-
-%description pgsql
-This package contains the necessary files to allow Courier-IMAP to
-authenticate using a PostgreSQL database table. Install this package if you
-need the ability to use a PostgreSQL database table for authentication.
-
-
-%package utils
-Summary: Courier-IMAP debugging utils
-Group: System/Servers
-Requires: %{name} = %{version}-%{release}
-
-%description utils
-This package contains the necessary files to debug the authentication
-modules for Courier-IMAP.
-
-You may also as of v1.6.0 use DEBUG_LOGIN.
-
-
-%package -n maildirmake++
-Summary: The maildirmake application by Mr. Sam
-Group: System/Servers
-Provides: maildirmake
-Obsoletes: maildirmake
-
-%description -n maildirmake++
-This package contains the maildirmake command.
-
-You can create either standard Maildir or Maildir++ with the
-maildirmake command.
-
-
%package doc
Summary: Documentation for %{name}
Group: Documentation
@@ -184,43 +99,32 @@
%prep
-%setup -q -a2
-%patch0 -p0 -b .initrd
-%patch1 -p1 -b .auto_maildir_creator
-%ifarch amd64 x86_64
-%patch2 -p0 -b .config
-%endif
-#%patch3 -p1 -b .nodaemon
-%patch4 -p1 -b .overflow
+%setup -q
+%patch0 -p1
+%patch1 -p1 -b .avx
+%patch2 -p1 -b .tcpsvd
-# doc handling
-mkdir automatic_maildir_creation_patch
-cp -f courier_patch/html/*.html automatic_maildir_creation_patch/
-cp -f courier_patch/README.txt automatic_maildir_creation_patch/
-cp -f courier_patch/THANKS automatic_maildir_creation_patch/
-cp -f courier_patch/README_%{courier_patch_version} \
automatic_maildir_creation_patch/ +# fix docs
+cp imap/README imap/README.imap
+cp rfc822/ChangeLog rfc822/ChangeLog.rfc822
+cp unicode/README unicode/README.unicode
+chmod 0644 maildir/README.sharedfolders.html imap/README.html
+
%build
-#(cd authlib; autoreconf)
-%configure2_5x \
+%configure \
--enable-unicode \
- --enable-workarounds-for-imap-client-bugs \
- --disable-root-check \
- --localstatedir=%{_localstatedir} \
- --with-authdaemonvar=%{authdaemondir} \
- --libexec=%{courierlibdir} \
- --datadir=%{courierdatadir} \
- --sysconfdir=%{couriersysconfdir} \
- --with-db=gdbm \
- --with-dirsync \
- --without-authvchkpw
+ --libexec=%{_libdir}/%{name} \
+ --datadir=%{_datadir}/%{name} \
+ --sysconfdir=%{_sysconfdir}/courier
%make
-# don't run that if using --enable-workarounds-for-imap-client-bugs
-#make check
+%check
+make check
+
%install
[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
@@ -228,140 +132,27 @@
%makeinstall_std
-# Fix imapd.dist
-perl -p -i -e 's|^IMAPDSTART=.*|IMAPDSTART=YES|' \
%{buildroot}%{couriersysconfdir}/imapd.dist
-perl -p -i -e 's|^IMAPDSSLSTART=.*|IMAPDSSLSTART=YES|' \
%{buildroot}%{couriersysconfdir}/imapd-ssl.dist
-perl -p -i -e 's|^POP3DSTART=.*|POP3DSTART=YES|' \
%{buildroot}%{couriersysconfdir}/pop3d.dist
-perl -p -i -e 's|^POP3DSSLSTART=.*|POP3DSSLSTART=YES|' \
%{buildroot}%{couriersysconfdir}/pop3d-ssl.dist
-
-# nuke this...
+# remove unwanted files
+rm -f %{buildroot}%{_libdir}/%{name}/*.rc
rm -rf %{buildroot}%{_sysconfdir}/profile.d
-# fix this...
-cp imap/README imap/README.imap
-cp rfc822/ChangeLog rfc822/ChangeLog.rfc822
-cp unicode/README unicode/README.unicode
+# Fix configurations
+perl -p -i -e 's|^IMAPDSTART=.*|IMAPDSTART=YES|' \
%{buildroot}%{_sysconfdir}/courier/imapd.dist +perl -p -i -e \
's|^IMAPDSSLSTART=.*|IMAPDSSLSTART=YES|' \
%{buildroot}%{_sysconfdir}/courier/imapd-ssl.dist +perl -p -i -e \
's|^POP3DSTART=.*|POP3DSTART=YES|' %{buildroot}%{_sysconfdir}/courier/pop3d.dist \
+perl -p -i -e 's|^POP3DSSLSTART=.*|POP3DSSLSTART=YES|' \
%{buildroot}%{_sysconfdir}/courier/pop3d-ssl.dist +for file in \
%{buildroot}%{_sysconfdir}/courier/*.dist; do + mv $file \
%{buildroot}%{_sysconfdir}/courier/`basename $file .dist` +done
+chmod 0644 %{buildroot}%{_sysconfdir}/courier/imapd*
+chmod 0644 %{buildroot}%{_sysconfdir}/courier/pop3d*
-# Create config files for sysconftool-rpmupgrade (see below)
-mkdir -p %{buildroot}%{courierdatadir}
-cat sysconftool > %{buildroot}%{courierdatadir}/sysconftool
-cat << EOF > %{buildroot}%{courierdatadir}/configlist
-%{couriersysconfdir}/imapd.dist
-%{couriersysconfdir}/imapd-ssl.dist
-EOF
+mkdir -p %{buildroot}%{_sysconfdir}/skel
+pushd %{buildroot}%{_sysconfdir}/skel
+ %{buildroot}%{_bindir}/maildirmake Maildir
+popd
-cat << EOF > %{buildroot}%{courierdatadir}/configlist.pop
-%{couriersysconfdir}/pop3d.dist
-%{couriersysconfdir}/pop3d-ssl.dist
-EOF
-
-touch %{buildroot}%{courierdatadir}/configlist.ldap
-touch %{buildroot}%{courierdatadir}/configlist.mysql
-touch %{buildroot}%{courierdatadir}/configlist.pgsql
-
-# Backwards compatability for older versions of courier-imap. Run the
-# sysconftool-rpmupgrade script if you are upgrading from an older
-# courier-imap RPM
-cp %{_sourcedir}/courier-imap-sysconftool-rpmupgrade \
%{buildroot}%{courierdatadir}/sysconftool-rpmupgrade
-
-# Check if authdaemond was installed, make sure to include authdaemon
-# directory
-touch authdaemon.files
-
-. authlib/authdaemonrc
-
-if [ "x$authdaemonvar" != "x" ]; then
- echo "%{couriersysconfdir}/authdaemonrc.dist" >> \
%{buildroot}%{courierdatadir}/configlist
- echo '%dir %attr(700, root, root) ' $authdaemonvar > authdaemon.files
- touch %{buildroot}/${authdaemonvar}/lock || exit 1
- touch %{buildroot}/${authdaemonvar}/pid || exit 1
- # authmksock can't deal with paths longer than 108 chars
- foo=$(pwd)
- pushd %{buildroot}/${authdaemonvar}
- $foo/authlib/authmksock socket || exit 1
- popd
- echo '%ghost %attr(600, root, root) ' ${authdaemonvar}/lock >> authdaemon.files
- echo '%ghost %attr(644, root, root) ' ${authdaemonvar}/pid >> authdaemon.files
- echo '%ghost %attr(777, root, root) ' ${authdaemonvar}/socket >> \
authdaemon.files
-fi
-
-(cd %{buildroot} ; find .%{courierlibdir} -type f ! -name authdaemond.ldap ! -name \
authdaemond.mysql ! -name authdaemond.pgsql -print ) | cut -c2- >> \
authdaemon.files
-
-touch authdaemon.files.ldap
-touch authdaemon.files.mysql
-touch authdaemon.files.pgsql
-
-test ! -f %{buildroot}%{courierlibdir}/authlib/authdaemond.mysql ||
- echo %{courierlibdir}/authlib/authdaemond.mysql >>authdaemon.files.mysql
-
-test ! -f %{buildroot}%{courierlibdir}/authlib/authdaemond.pgsql ||
- echo %{courierlibdir}/authlib/authdaemond.pgsql >>authdaemon.files.pgsql
-
-test ! -f %{buildroot}%{courierlibdir}/authlib/authdaemond.ldap || \
- echo %{courierlibdir}/authlib/authdaemond.ldap >>authdaemon.files.ldap
-
-if test -f %{buildroot}%{courierlibdir}/authlib/authdaemond.mysql
-then
- echo '%{couriersysconfdir}/authmysqlrc.dist' \
>>%{buildroot}%{courierdatadir}/configlist.mysql
- echo '%attr(-, root, root) %config(noreplace) \
%{couriersysconfdir}/authmysqlrc.dist' >>authdaemon.files.mysql
-fi
-
-if test -f %{buildroot}%{courierlibdir}/authlib/authdaemond.pgsql
-then
- echo '%{couriersysconfdir}/authpgsqlrc.dist' \
>>%{buildroot}%{courierdatadir}/configlist.pgsql
- echo '%attr(-, root, root) %config(noreplace) \
%{couriersysconfdir}/authpgsqlrc.dist' >>authdaemon.files.pgsql
-fi
-
-if test -f %{buildroot}%{courierlibdir}/authlib/authdaemond.ldap
-then
- echo %{couriersysconfdir}/authldaprc.dist >> \
%{buildroot}%{courierdatadir}/configlist.ldap
- echo '%attr(-, root, root) %config(noreplace) \
%{couriersysconfdir}/authldaprc.dist' >> authdaemon.files.ldap
-
- if test -d /etc/openldap/schema
- then
- mkdir -p %{buildroot}/etc/openldap/schema
- cp authlib/authldap.schema %{buildroot}/etc/openldap/schema/courier.schema
- echo '%config(noreplace) %attr(444, root, root) \
/etc/openldap/schema/courier.schema' >>authdaemon.files.ldap
- fi
-fi
-
-mkdir -p %{buildroot}%{_localstatedir}
-touch %{buildroot}%{_localstatedir}/imapd.pid
-touch %{buildroot}%{_localstatedir}/imapd-ssl.pid
-touch %{buildroot}%{_localstatedir}/imapd.pid.lock
-touch %{buildroot}%{_localstatedir}/imapd-ssl.pid.lock
-
-touch %{buildroot}%{_localstatedir}/pop3d.pid
-touch %{buildroot}%{_localstatedir}/pop3d-ssl.pid
-touch %{buildroot}%{_localstatedir}/pop3d.pid.lock
-touch %{buildroot}%{_localstatedir}/pop3d-ssl.pid.lock
-
-find %{buildroot} -type f -print | sed "s@^%{buildroot}@@g" | grep -v perllocal.pod \
> %{_builddir}/tmp-filelist
-
-# some utils...
-install -m 0755 authlib/authinfo %{buildroot}%{_bindir}/courier-imap-authinfo
-install -m 0755 authlib/authtest %{buildroot}%{_bindir}/courier-imap-authtest
-install -m 0755 authlib/authdaemontest \
%{buildroot}%{_bindir}/courier-imap-authdaemontest
-
-# fix the maildirmake command so it won't conflict with vdanens qmail package?
-mv %{buildroot}%{_bindir}/maildirmake %{buildroot}%{_bindir}/maildirmake++
-mv %{buildroot}%{_mandir}/man1/maildirmake.1 \
%{buildroot}%{_mandir}/man1/maildirmake++.1
-
-# fix the auto maildir creation stuff
-cp %{_sourcedir}/auto_maildir_creator \
%{buildroot}%{courierdatadir}/auto_maildir_creator
-chmod 0755 %{buildroot}%{courierdatadir}/auto_maildir_creator
-chmod -R 0644 %{buildroot}%{courierdatadir}/auto_maildir_creator
-
-echo "IMAP_MAILDIR_CREATOR=\"%{courierdatadir}/auto_maildir_creator\"" >> \
%{buildroot}%{couriersysconfdir}/imapd.dist
-echo "IMAP_MAILDIR_CREATOR=\"%{courierdatadir}/auto_maildir_creator\"" >> \
%{buildroot}%{couriersysconfdir}/imapd-ssl.dist
-echo "POP3_MAILDIR_CREATOR=\"%{courierdatadir}/auto_maildir_creator\"" >> \
%{buildroot}%{couriersysconfdir}/pop3d.dist
-echo "POP3_MAILDIR_CREATOR=\"%{courierdatadir}/auto_maildir_creator\"" >> \
%{buildroot}%{couriersysconfdir}/pop3d-ssl.dist
-echo "MOD_MAILDIR_CREATOR=\"/bin/false\"" >> \
%{buildroot}%{couriersysconfdir}/imapd.dist
-echo "MOD_MAILDIR_CREATOR=\"/bin/false\"" >> \
%{buildroot}%{couriersysconfdir}/imapd-ssl.dist
-echo "MOD_MAILDIR_CREATOR=\"/bin/false\"" >> \
%{buildroot}%{couriersysconfdir}/pop3d.dist
-echo "MOD_MAILDIR_CREATOR=\"/bin/false\"" >> \
%{buildroot}%{couriersysconfdir}/pop3d-ssl.dist
-
-mkdir -p %{buildroot}%{_srvdir}/{courier-imapd,courier-imapds,courier-pop3d,courier-pop3ds,authdaemond}/log
+mkdir -p %{buildroot}%{_srvdir}/{courier-imapd,courier-imapds,courier-pop3d,courier-pop3ds}/{env,log}
mkdir -p %{buildroot}%{_srvdir}/{courier-imapd,courier-imapds,courier-pop3d,courier-pop3ds}/peers
install -m 0740 %{_sourcedir}/courier-imapd.run \
%{buildroot}%{_srvdir}/courier-imapd/run install -m 0740 \
%{_sourcedir}/courier-imapd-log.run %{buildroot}%{_srvdir}/courier-imapd/log/run @@ \
-371,38 +162,61 @@ install -m 0740 %{_sourcedir}/courier-pop3d-log.run \
%{buildroot}%{_srvdir}/courier-pop3d/log/run install -m 0740 \
%{_sourcedir}/courier-pop3ds.run %{buildroot}%{_srvdir}/courier-pop3ds/run install \
-m 0740 %{_sourcedir}/courier-pop3ds-log.run \
%{buildroot}%{_srvdir}/courier-pop3ds/log/run
-install -m 0740 %{_sourcedir}/authdaemond.run %{buildroot}%{_srvdir}/authdaemond/run
-install -m 0740 %{_sourcedir}/authdaemond-log.run \
%{buildroot}%{_srvdir}/authdaemond/log/run
+for service in courier-imapd courier-imapds courier-pop3d courier-pop3ds; do
+ install -m 0640 %{_sourcedir}/MAX_MEM.env \
%{buildroot}%{_srvdir}/${service}/env/MAX_MEM + install -m 0640 \
%{_sourcedir}/MAX_CONN.env %{buildroot}%{_srvdir}/${service}/env/MAX_CONN + \
install -m 0640 %{_sourcedir}/MAX_PER_HOST.env \
%{buildroot}%{_srvdir}/${service}/env/MAX_PER_HOST + install -m 0640 \
%{_sourcedir}/IP.env %{buildroot}%{_srvdir}/${service}/env/IP +done
+echo "143" >%{buildroot}%{_srvdir}/courier-imapd/env/PORT
+echo "993" >%{buildroot}%{_srvdir}/courier-imapds/env/PORT
+echo "110" >%{buildroot}%{_srvdir}/courier-pop3d/env/PORT
+echo "995" >%{buildroot}%{_srvdir}/courier-pop3ds/env/PORT
+
touch %{buildroot}%{_srvdir}/{courier-imapd,courier-imapds,courier-pop3d,courier-pop3ds}/peers/0
chmod 0640 %{buildroot}%{_srvdir}/{courier-imapd,courier-imapds,courier-pop3d,courier-pop3ds}/peers/0
mkdir -p %{buildroot}%{_datadir}/afterboot
install -m 0644 %{_sourcedir}/09_courier-imap.afterboot \
%{buildroot}%{_datadir}/afterboot/09_courier-imap
-mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
-install -m 0644 %{_sourcedir}/courier-imap.sysconfig \
%{buildroot}%{_sysconfdir}/sysconfig/imapd
-install -m 0644 %{_sourcedir}/courier-imap.sysconfig \
%{buildroot}%{_sysconfdir}/sysconfig/imapd-ssl
-install -m 0644 %{_sourcedir}/courier-imap.sysconfig \
%{buildroot}%{_sysconfdir}/sysconfig/pop3d
-install -m 0644 %{_sourcedir}/courier-imap.sysconfig \
%{buildroot}%{_sysconfdir}/sysconfig/pop3d-ssl
-
# fix location of authlib stuff on x86_64
%ifarch x86_64 amd64
find %{buildroot}%{_srvdir} -name run -exec perl -pi -e \
's|/usr/lib/courier|/usr/lib64/courier|g' {} \; %endif
# fix pam
-cp -f %{_sourcedir}/courier.pam %{buildroot}%{_sysconfdir}/pam.d/imap
-cp -f %{_sourcedir}/courier.pam %{buildroot}%{_sysconfdir}/pam.d/pop3
+rm -f %{buildroot}%{_sysconfdir}/pam.d/*
+cp -f %{_sourcedir}/courier.pam %{buildroot}%{_sysconfdir}/pam.d/courier-imap
+cp -f %{_sourcedir}/courier.pam %{buildroot}%{_sysconfdir}/pam.d/courier-pop3
chmod 0644 %{buildroot}%{_sysconfdir}/pam.d/*
+# relocate SSL files
+mkdir -p %{buildroot}%{_sysconfdir}/ssl/courier
+mv %{buildroot}%{_sysconfdir}/courier/*.cnf %{buildroot}%{_sysconfdir}/ssl/courier/
+perl -pi -e 's|TLS_CERTFILE=.*|TLS_CERTFILE=%{_sysconfdir}/ssl/courier/courier-imapd.pem|'\
+ %{buildroot}%{_sysconfdir}/courier/imapd-ssl
+perl -pi -e 's|TLS_CERTFILE=.*|TLS_CERTFILE=%{_sysconfdir}/ssl/courier/courier-pop3d.pem|'\
+ %{buildroot}%{_sysconfdir}/courier/pop3d-ssl
+
+
+%clean
+[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
+
+
%post
-%{courierdatadir}/sysconftool `cat %{courierdatadir}/configlist` >/dev/null
+if [ -f %{_datadir}/courier/imapd.pem ]; then
+ mv %{_datadir}/courier/imapd.pem %{_sysconfdir}/ssl/courier/
+ echo "Found and relocated imapd SSL cert to %{_sysconfdir}/ssl/courier"
+fi
+test -f %{_sysconfdir}/courier/imapd.rpmnew && \
%{_libdir}/courier-authlib/sysconftool %{_sysconfdir}/courier/imapd.rpmnew >/dev/null \
+test -f %{_sysconfdir}/courier/imapd-ssl.rpmnew && \
%{_libdir}/courier-authlib/sysconftool %{_sysconfdir}/courier/imapd-ssl.rpmnew \
>/dev/null +
%_post_srv courier-imapd
%_post_srv courier-imapds
-%_post_srv authdaemond
%_mkafterboot
+
for i in courier-imapd courier-imapds
do
pushd %{_srvdir}/$i >/dev/null 2>&1
@@ -410,19 +224,29 @@
popd >/dev/null 2>&1
done
-%create_ghostfile %{_localstatedir}/imapd.pid root root 0600
-%create_ghostfile %{_localstatedir}/imapd.pid.lock root root 0600
-%create_ghostfile %{_localstatedir}/imapd-ssl.pid root root 0600
-%create_ghostfile %{_localstatedir}/imapd-ssl.pid.lock root root 0600
-%create_ghostfile %{_localstatedir}/authdaemon.courier-imap/lock root root 0600
-%create_ghostfile %{_localstatedir}/authdaemon.courier-imap/pid root root 0644
-%create_ghostfile %{_localstatedir}/authdaemon.courier-imap/socket root root 0777
+%preun
+%_preun_srv courier-imapd
+%_preun_srv courier-imapds
+%_preun_srv authdaemond
-%post pop
-%{courierdatadir}/sysconftool `cat %{courierdatadir}/configlist.pop` >/dev/null
+
+%postun
+%_mkafterboot
+
+
+
+%post -n courier-pop
+if [ -f %{_datadir}/courier/pop3d.pem ]; then
+ mv %{_datadir}/courier/pop3d.pem %{_sysconfdir}/ssl/courier/
+ echo "Found and relocated pop3d SSL cert to %{_sysconfdir}/ssl/courier"
+fi
+test -f %{_sysconfdir}/courier/pop3d.rpmnew && \
%{_libdir}/courier-authlib/sysconftool %{_sysconfdir}/courier/pop3d.rpmnew >/dev/null \
+test -f %{_sysconfdir}/courier/pop3d-ssl.rpmnew && \
%{_libdir}/courier-authlib/sysconftool %{_sysconfdir}/courier/pop3d-ssl.rpmnew \
>/dev/null +
%_post_srv courier-pop3d
%_post_srv courier-pop3ds
+
for i in courier-pop3d courier-pop3ds
do
pushd %{_srvdir}/$i >/dev/null 2>&1
@@ -430,245 +254,133 @@
popd >/dev/null 2>&1
done
-%create_ghostfile %{_localstatedir}/pop3d.pid root root 0600
-%create_ghostfile %{_localstatedir}/pop3d.pid.lock root root 0600
-%create_ghostfile %{_localstatedir}/pop3d-ssl.pid root root 0600
-%create_ghostfile %{_localstatedir}/pop3d-ssl.pid.lock root root 0600
-
-%post ldap
-%{courierdatadir}/sysconftool `cat %{courierdatadir}/configlist.ldap` >/dev/null
-
-
-%post mysql
-%{courierdatadir}/sysconftool `cat %{courierdatadir}/configlist.mysql` >/dev/null
-
-
-%post pgsql
-%{courierdatadir}/sysconftool `cat %{courierdatadir}/configlist.pgsql` >/dev/null
-
-
-%postun
-%_mkafterboot
-
-
-%postun ldap
-%_preun_srv courier-imapd
-%_preun_srv courier-imapds
+%preun -n courier-pop
%_preun_srv courier-pop3d
%_preun_srv courier-pop3ds
-%_preun_srv authdaemond
-%postun mysql
-%_preun_srv courier-imapd
-%_preun_srv courier-imapds
-%_preun_srv courier-pop3d
-%_preun_srv courier-pop3ds
-%_preun_srv authdaemond
-
-
-%postun pgsql
-%_preun_srv courier-imapd
-%_preun_srv courier-imapds
-%_preun_srv courier-pop3d
-%_preun_srv courier-pop3ds
-%_preun_srv authdaemond
-
-
-%preun
-%_preun_srv courier-imapd
-%_preun_srv courier-imapds
-%_preun_srv authdaemond
-
-
-%preun pop
-%_preun_srv courier-pop3d
-%_preun_srv courier-pop3ds
-
-
-%triggerpostun -- courier-imap
-test ! -f %{courierdatadir}/configlist || %{courierdatadir}/sysconftool-rpmupgrade \
`cat %{courierdatadir}/configlist` >/dev/null
-
-
-%triggerpostun pop -- courier-imap
-test ! -f %{courierdatadir}/configlist.pop || \
%{courierdatadir}/sysconftool-rpmupgrade `cat %{courierdatadir}/configlist.pop` \
>/dev/null
-
-
-%triggerpostun ldap -- courier-imap
-test ! -f %{courierdatadir}/configlist.ldap || \
%{courierdatadir}/sysconftool-rpmupgrade `cat %{courierdatadir}/configlist.ldap` \
>/dev/null
-
-
-%triggerpostun mysql -- courier-imap
-test ! -f %{courierdatadir}/configlist.mysql || \
%{courierdatadir}/sysconftool-rpmupgrade `cat %{courierdatadir}/configlist.mysql` \
>/dev/null
-
-
-%clean
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
-
-
-%files -f authdaemon.files
+%files
%defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/pam.d/imap
-%dir %{couriersysconfdir}
-%attr(0600,root,root) %config(noreplace) %{couriersysconfdir}/imapd.dist
-%attr(0600,root,root) %config(noreplace) %{couriersysconfdir}/imapd-ssl.dist
-%config(noreplace) %{couriersysconfdir}/imapd.cnf
-%config(noreplace) %{couriersysconfdir}/quotawarnmsg.example
-%attr(0644,root,root) %config(noreplace) %{couriersysconfdir}/authdaemonrc.dist
-%dir %{courierlibdir}
-%dir %{courierlibdir}/authlib
-
-%{_bindir}/deliverquota
+%config(noreplace) %{_sysconfdir}/pam.d/courier-imap
+%config(noreplace) %{_sysconfdir}/courier/imapd
+%config(noreplace) %{_sysconfdir}/courier/imapd-ssl
+%config(noreplace) %{_sysconfdir}/ssl/courier/imapd.cnf
%{_bindir}/imapd
-%{_bindir}/couriertls
-%{_bindir}/maildirkw
-%{_bindir}/maildiracl
-
%{_sbindir}/imaplogin
-%{_sbindir}/userdbpw
-%{_sbindir}/makeuserdb
%{_sbindir}/mkimapdcert
-%{_sbindir}/pw2userdb
-%{_sbindir}/userdb
-%{_sbindir}/vchkpw2userdb
-%{_sbindir}/authenumerate
-%{_sbindir}/courierlogger
-%{_sbindir}/sharedindexinstall
-%{_sbindir}/sharedindexsplit
-
-%{_mandir}/man1/couriertcpd.1*
-%{_mandir}/man1/courierlogger.1*
-%{_mandir}/man1/maildiracl.1*
-%{_mandir}/man1/maildirkw.1*
-%{_mandir}/man7/auth*.7*
-%{_mandir}/man8/deliverquota.8*
%{_mandir}/man8/imapd.8*
-%{_mandir}/man8/makeuserdb.8*
%{_mandir}/man8/mkimapdcert.8*
-%{_mandir}/man8/mkpop3dcert.8*
-%{_mandir}/man8/pw2userdb.8*
-%{_mandir}/man8/user*.8*
-%{_mandir}/man8/vchkpw2userdb.8*
-
-%{courierdatadir}/pw2userdb
-%{courierdatadir}/makeuserdb
-%{courierdatadir}/mkimapdcert
-%{courierdatadir}/vchkpw2userdb
-%{courierdatadir}/userdb
-%attr(0755,root,root) %{courierdatadir}/auto_maildir_creator
-
-%attr(0755,root,root) %{courierdatadir}/sysconftool
-%attr(0755,root,root) %{courierdatadir}/sysconftool-rpmupgrade
-%attr(0644,root,root) %{courierdatadir}/configlist
-
-%ghost %attr(0600,root,root) %{_localstatedir}/imapd.pid
-%ghost %attr(0600,root,root) %{_localstatedir}/imapd-ssl.pid
-%ghost %attr(0600,root,root) %{_localstatedir}/imapd.pid.lock
-%ghost %attr(0600,root,root) %{_localstatedir}/imapd-ssl.pid.lock
-
+%{_datadir}/%{name}/mkimapdcert
%dir %attr(0750,root,admin) %{_srvdir}/courier-imapd
%dir %attr(0750,root,admin) %{_srvdir}/courier-imapd/log
%dir %attr(0750,root,admin) %{_srvdir}/courier-imapd/peers
%config(noreplace) %attr(0740,root,admin) %{_srvdir}/courier-imapd/run
%config(noreplace) %attr(0740,root,admin) %{_srvdir}/courier-imapd/log/run
%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-imapd/peers/0
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-imapd/env/MAX_CONN
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-imapd/env/MAX_MEM
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-imapd/env/MAX_PER_HOST
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-imapd/env/IP
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-imapd/env/PORT
%dir %attr(0750,root,admin) %{_srvdir}/courier-imapds
%dir %attr(0750,root,admin) %{_srvdir}/courier-imapds/log
%dir %attr(0750,root,admin) %{_srvdir}/courier-imapds/peers
%config(noreplace) %attr(0740,root,admin) %{_srvdir}/courier-imapds/run
%config(noreplace) %attr(0740,root,admin) %{_srvdir}/courier-imapds/log/run
%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-imapds/peers/0
-%config(noreplace) %{_sysconfdir}/sysconfig/imapd
-%config(noreplace) %{_sysconfdir}/sysconfig/imapd-ssl
-%dir %attr(0750,root,admin) %{_srvdir}/authdaemond
-%dir %attr(0750,root,admin) %{_srvdir}/authdaemond/log
-%config(noreplace) %attr(0740,root,admin) %{_srvdir}/authdaemond/run
-%config(noreplace) %attr(0740,root,admin) %{_srvdir}/authdaemond/log/run
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-imapds/env/MAX_CONN
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-imapds/env/MAX_MEM
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-imapds/env/MAX_PER_HOST
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-imapds/env/IP
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-imapds/env/PORT
%{_datadir}/afterboot/09_courier-imap
-
-%files pop
-%defattr(-, root, root)
-%config(noreplace) %{_sysconfdir}/pam.d/pop3
-%attr(0600,root,root) %config(noreplace) %{couriersysconfdir}/pop3d.dist
-%attr(0600,root,root) %config(noreplace) %{couriersysconfdir}/pop3d-ssl.dist
-%config(noreplace) %{couriersysconfdir}/pop3d.cnf
+%files -n courier-pop
+%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/pam.d/courier-pop3
+%config(noreplace) %{_sysconfdir}/courier/pop3d
+%config(noreplace) %{_sysconfdir}/courier/pop3d-ssl
+%config(noreplace) %{_sysconfdir}/ssl/courier/pop3d.cnf
%{_bindir}/pop3d
%{_sbindir}/pop3login
%{_sbindir}/mkpop3dcert
-%{courierdatadir}/mkpop3dcert
-%attr(0644,root,root) %{courierdatadir}/configlist.pop
-
-%ghost %attr(0600,root,root) %{_localstatedir}/pop3d.pid
-%ghost %attr(0600,root,root) %{_localstatedir}/pop3d-ssl.pid
-%ghost %attr(0600,root,root) %{_localstatedir}/pop3d.pid.lock
-%ghost %attr(0600,root,root) %{_localstatedir}/pop3d-ssl.pid.lock
-
+%{_mandir}/man8/mkpop3dcert.8*
+%{_datadir}/%{name}/mkpop3dcert
%dir %attr(0750,root,admin) %{_srvdir}/courier-pop3d
%dir %attr(0750,root,admin) %{_srvdir}/courier-pop3d/log
%dir %attr(0750,root,admin) %{_srvdir}/courier-pop3d/peers
%config(noreplace) %attr(0740,root,admin) %{_srvdir}/courier-pop3d/run
%config(noreplace) %attr(0740,root,admin) %{_srvdir}/courier-pop3d/log/run
%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-pop3d/peers/0
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-pop3d/env/MAX_CONN
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-pop3d/env/MAX_MEM
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-pop3d/env/MAX_PER_HOST
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-pop3d/env/IP
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-pop3d/env/PORT
%dir %attr(0750,root,admin) %{_srvdir}/courier-pop3ds
%dir %attr(0750,root,admin) %{_srvdir}/courier-pop3ds/log
%dir %attr(0750,root,admin) %{_srvdir}/courier-pop3ds/peers
%config(noreplace) %attr(0740,root,admin) %{_srvdir}/courier-pop3ds/run
%config(noreplace) %attr(0740,root,admin) %{_srvdir}/courier-pop3ds/log/run
%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-pop3ds/peers/0
-%config(noreplace) %{_sysconfdir}/sysconfig/pop3d
-%config(noreplace) %{_sysconfdir}/sysconfig/pop3d-ssl
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-pop3ds/env/MAX_CONN
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-pop3ds/env/MAX_MEM
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-pop3ds/env/MAX_PER_HOST
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-pop3ds/env/IP
+%config(noreplace) %attr(0640,root,admin) %{_srvdir}/courier-pop3ds/env/PORT
-
-%files ldap -f authdaemon.files.ldap
+%files -n courier-base
%defattr(-,root,root)
-%attr(0644,root,root) %{courierdatadir}/configlist.ldap
+%config(noreplace) %{_sysconfdir}/courier/quotawarnmsg.example
+%config(noreplace) %{_sysconfdir}/courier/shared
+%config(noreplace) %{_sysconfdir}/courier/shared.tmp
+%config(noreplace) %{_sysconfdir}/skel/Maildir
+%{_bindir}/maildirmake
+%{_bindir}/deliverquota
+%{_bindir}/couriertls
+%{_bindir}/maildirkw
+%{_bindir}/maildiracl
+%{_sbindir}/sharedindexinstall
+%{_sbindir}/sharedindexsplit
+%{_mandir}/man1/maildirmake.1*
+%{_mandir}/man1/couriertcpd.1*
+%{_mandir}/man1/maildiracl.1*
+%{_mandir}/man1/maildirkw.1*
+%{_mandir}/man8/deliverquota.8*
+%{_libdir}/%{name}
-
-%files mysql -f authdaemon.files.mysql
-%defattr(-,root,root)
-%attr(0644,root,root) %{courierdatadir}/configlist.mysql
-
-
-%files pgsql -f authdaemon.files.pgsql
-%defattr(-,root,root)
-%attr(0644,root,root) %{courierdatadir}/configlist.pgsql
-
-
-%files utils
-%defattr(0755,root,root)
-%{_bindir}/courier-imap-authinfo
-%{_bindir}/courier-imap-authtest
-%{_bindir}/courier-imap-authdaemontest
-
-
-%files -n maildirmake++
-%defattr(-, root, root)
-%{_bindir}/maildirmake++
-%{_mandir}/man1/maildirmake++.1*
-
%files doc
%defattr(-,root,root)
-%doc 00README.NOW.OR.SUFFER INSTALL INSTALL.html NEWS README
-%doc imap/README.html imap/courierpop3d.html imap/imapd.html imap/mkimapdcert.html \
imap/mkpop3dcert.html
-%doc imap/BUGS imap/ChangeLog imap/README.imap
-%doc liblock/lockmail.html
-%doc maildir/README.maildirfilter.html maildir/README.maildirquota.html \
maildir/README.sharedfolders.html maildir/deliverquota.html
-%doc maildir/maildirquota.html maildir/README.maildirquota.txt \
maildir/README.sharedfolders.txt
-%doc rfc2045/makemime.html rfc2045/reformime.html rfc2045/rfc2045.html \
rfc822/ChangeLog.rfc822 rfc822/rfc822.html
-%doc tcpd/README.couriertls tcpd/couriertcpd.html tcpd/couriertls.html
-%doc unicode/README.unicode
-%doc userdb/makeuserdb.html userdb/userdb.html userdb/userdbpw.html \
automatic_maildir_creation_patch
-%doc authlib/README.ldap
-%doc authlib/authldap.schema
-%doc authlib/README.authmysql.html
-%doc authlib/README.authmysql.myownquery
-%doc authlib/README.authpostgres.html
+%doc imap/BUGS imap/ChangeLog imap/README.* imap/*.html
+%doc INSTALL INSTALL.html NEWS README
+%doc liblock/*.html
+%doc maildir/README.* maildir/*.html
+%doc rfc2045/*.html
+%doc rfc822/ChangeLog.rfc822 rfc822/rfc822.html
+%doc tcpd/README.* tcpd/*.html
+%doc unicode/README.*
%doc maildir/maildirmake.html
%changelog
+* Sat Dec 30 2006 Vincent Danen <vdanen-at-build.annvix.org> 4.1.1
+- 4.1.1
+- complete overhaul due to the break-out of courier-authlib
+- merge maildirmake++ into courier-base
+- SSL certs are now in /etc/ssl/courier rather than the default of
+ /usr/share/courier (moved the ssl config files there too)
+- P0: fix the pam.d/ filenames
+- P1: fix the SSL cert location in mkimapdcert and mkpop3dcert
+- use environment directories
+- update runscripts to use envdirs (MAX_CONN, MAX_MEM, IP, PORT,
+ MAX_PER_HOST); NOTE: the ./env/IP and ./env/PORT settings override
+ the courier-imap configuration files' PORT/SSLPORT, ADDRESS, MAXPERIP,
+ and MAXDAEMONS settings
+- move the SSL certs from the old location to the new if they're found
+- P2: heavy patch to remove all couriertcpd-related options from the
+ config files
+
* Sat Dec 09 2006 Vincent Danen <vdanen-at-build.annvix.org> 3.0.8
- rebuild against new openldap, mysql, postgresql
_______________________________________________
cvs mailing list
cvs@annvix.org
http://annvix.org/mailman/listinfo/cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic