summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Romig2018-09-19 06:29:03 +0100
committerNeil Romig2018-09-19 06:29:03 +0100
commit867c11dbb5cd07a290bddaab1d9bd9d46c827f0f (patch)
treef95554538f34538eeef7a90823709ebae03bb20c
parenteaa649bbbd531a69a5f43cc44a38d604ebb1645b (diff)
downloadaur-867c11dbb5cd07a290bddaab1d9bd9d46c827f0f.tar.gz
New Courier version
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD21
-rw-r--r--courier-mta.install8
3 files changed, 21 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1c663c0d06d..f5c92b0950d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = courier-mta
pkgdesc = IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig
- pkgver = 0.78.3
- pkgrel = 2
+ pkgver = 1.0
+ pkgrel = 1
url = http://courier-mta.org
install = courier-mta.install
arch = i686
@@ -13,6 +13,7 @@ pkgbase = courier-mta
makedepends = libldap
makedepends = gamin
depends = courier-authlib>=0.68
+ depends = courier-unicode>=2.1
depends = gamin
depends = gcc-libs
depends = gdbm
@@ -39,9 +40,9 @@ pkgbase = courier-mta
backup = etc/courier/webadmin/password
backup = etc/courier/imapd.cnf
backup = etc/courier/esmtpd.cnf
- backup = etc/courier/pop3d.conf
+ backup = etc/courier/pop3d.cnf
backup = etc/courier/esmtpauthclient
- source = http://downloads.sourceforge.net/project/courier/courier/0.78.3/courier-0.78.3.tar.bz2
+ source = http://downloads.sourceforge.net/project/courier/courier/1.0/courier-1.0.tar.bz2
source = courier-imapd.service
source = courier-imapd-ssl.service
source = courier-pop3d.service
@@ -55,7 +56,7 @@ pkgbase = courier-mta
source = webmaild.service
source = courier-courierfilter.service
source = courier-mta.conf
- sha1sums = 2c4a553462fd982855a1223cd05028c3ccd99779
+ sha1sums = 8d3c76ab586e33f83ab8e4ad5b7aca0e9ed27218
sha1sums = 9feaa269795a85c1464c104d9268fb266ad1a666
sha1sums = 0344ac948b189cae73d86f4565e40847c44772c9
sha1sums = 920bd35afc0bf6e6ba5cf7b309210be4d2c76e18
diff --git a/PKGBUILD b/PKGBUILD
index 91c16311590..5e145fba2b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,23 +4,26 @@
# Contributor: Tobias Kieslich <tobias@justdreams.de>
# ----------- NOTE TO ALL USERS ------------
+
# Go read http://www.courier-mta.org/install.html b4 running or building courier
+# If upgrading, you must read the guidance at http://www.courier-mta.org/maildirmake.html on "Converting pre-unicode format maildirs"
+
pkgname=courier-mta
-pkgver=0.78.3
-pkgrel=2
+pkgver=1.0
+pkgrel=1
pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig"
arch=(i686 x86_64)
license=('GPL2')
url="http://courier-mta.org"
-depends=('courier-authlib>=0.68' 'gamin' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates')
+depends=('courier-authlib>=0.68' 'courier-unicode>=2.1' 'gamin' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates')
optdepends=('libldap')
makedepends=('pam' 'expect' 'gnupg' 'libldap' 'gamin')
provides=('smtp-server' 'smtp-forwarder' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop')
conflicts=('courier-imap' 'smtp-forwarder' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp')
options=(!libtool !staticlibs)
-# Specify some files to backup that aren't managed by sysconftool during an upgrade
-backup=('etc/courier/aliases/system' 'etc/courier/smtpaccess/default' 'etc/courier/webadmin/password' 'etc/courier/imapd.cnf' 'etc/courier/esmtpd.cnf' 'etc/courier/pop3d.conf' 'etc/courier/esmtpauthclient')
+# Specify some package files to backup that aren't managed by sysconftool during an upgrade
+backup=('etc/courier/aliases/system' 'etc/courier/smtpaccess/default' 'etc/courier/webadmin/password' 'etc/courier/imapd.cnf' 'etc/courier/esmtpd.cnf' 'etc/courier/pop3d.cnf' 'etc/courier/esmtpauthclient')
install=courier-mta.install
source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2
courier-imapd.service
@@ -36,7 +39,7 @@ source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/couri
webmaild.service
courier-courierfilter.service
courier-mta.conf)
-sha1sums=('2c4a553462fd982855a1223cd05028c3ccd99779'
+sha1sums=('8d3c76ab586e33f83ab8e4ad5b7aca0e9ed27218'
'9feaa269795a85c1464c104d9268fb266ad1a666'
'0344ac948b189cae73d86f4565e40847c44772c9'
'920bd35afc0bf6e6ba5cf7b309210be4d2c76e18'
@@ -72,7 +75,8 @@ build() {
--without-ispell \
--with-mailuser=courier \
--with-mailgroup=courier \
- --with-certdb=/etc/ssl/certs/
+ --with-certdb=/etc/ssl/certs/ \
+ --with-notice=unicode
make
}
@@ -109,9 +113,6 @@ package() {
install -Dm 644 "${srcdir}/courier-mkdhparams.service" "${pkgdir}/usr/lib/systemd/system/courier-mkdhparams.service"
install -Dm 644 "${srcdir}/courier-mkdhparams.timer" "${pkgdir}/usr/lib/systemd/system/courier-mkdhparams.timer"
- # pacman gives an error for /var/run file conflict. Circumvent this by removing the directory
- rm -rf "${pkgdir}/var/run"
-
# Install systemd configuration file which will set up empty /run/courier directory (and clean up after uninstall)
install -Dm 644 "$srcdir/courier-mta.conf" "$pkgdir/usr/lib/tmpfiles.d/courier-mta.conf"
diff --git a/courier-mta.install b/courier-mta.install
index 03a37935f7a..3254de08b01 100644
--- a/courier-mta.install
+++ b/courier-mta.install
@@ -4,8 +4,8 @@ post_install() {
# perform all the tasks required of a standard Courier install
echo Performing install-configure...
- /usr/lib/courier/sysconftool /etc/courier/*.dist > /etc/courier/install-$1.log
- echo "...output saved to /etc/courier/install-$1.log"
+ /usr/lib/courier/sysconftool /etc/courier/*.dist > /etc/courier/install-configure-$1.log
+ echo "...output saved to /etc/courier/install-configure-$1.log"
echo "Don't forget to configure an account to receive postmaster mail"
makealiases
makesmtpaccess
@@ -15,12 +15,12 @@ post_install() {
pre_upgrade() {
# the file courier-imapd.conf is renamed to courier-mta.conf from version 0.77.0-2
[ -f /usr/lib/tmpfiles.d/courier-imapd.conf ] && rm -f /usr/lib/tmpfiles.d/courier-imapd.conf
+ [ "${1%%.*}" = "1" ] && [ "${2%%.*}" != "1" ] && echo "Please make sure you have read the guidance on pre-unicode maildir names."
}
post_upgrade() {
echo Performing install-configure...
- /usr/lib/courier/sysconftool /etc/courier/*.dist > /etc/courier/upgrade-$1.log
- echo "...output saved to /etc/courier/upgrade-$1.log"
+ /usr/lib/courier/sysconftool /etc/courier/*.dist > /etc/courier/install-configure-$1.log
}
pre_remove() {