summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Romig2017-08-19 18:14:51 +0100
committerNeil Romig2017-08-19 18:14:51 +0100
commit364038680e46c4ceba2e763200f2049129335926 (patch)
treed5bfaae2a7356fc0200a5feaedf17d865c881184
parent1bcd4b35c540486b2902a7c914848af60279b3d4 (diff)
downloadaur-364038680e46c4ceba2e763200f2049129335926.tar.gz
Upgrade to courier-mta-0.78.0
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD12
-rw-r--r--courier-mta.conf1
-rw-r--r--courier-mta.install6
4 files changed, 14 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9c10f25f502..7edb5d3aace 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.77.0
- pkgrel = 3
+ pkgver = 0.78.0
+ pkgrel = 1
url = http://courier-mta.org
install = courier-mta.install
arch = i686
@@ -34,7 +34,7 @@ pkgbase = courier-mta
conflicts = ucspi-tcp
options = !libtool
options = !staticlibs
- source = http://downloads.sourceforge.net/project/courier/courier/0.77.0/courier-0.77.0.tar.bz2
+ source = http://downloads.sourceforge.net/project/courier/courier/0.78.0/courier-0.78.0.tar.bz2
source = courier-imapd.service
source = courier-imapd-ssl.service
source = courier-pop3d.service
@@ -48,7 +48,7 @@ pkgbase = courier-mta
source = webmaild.service
source = courier-courierfilter.service
source = courier-mta.conf
- sha1sums = 6a79c331e2b2ac771455d4333947bfbc7d381b57
+ sha1sums = f45eac5679e977591101f9f0fc7417e8ccf513e0
sha1sums = 160f270d8214ac39adc0d1618bc981c59f080adf
sha1sums = 71d07d57d3c211abf267be140ffb074ac2492448
sha1sums = 6b06348e019e8883bcac314169e920f156ed1fa4
@@ -61,7 +61,7 @@ pkgbase = courier-mta
sha1sums = 7c6e687d1cefe3139274b39c659351a503a3adb3
sha1sums = 94703b7bb090754e78710df42f658407a5c0a798
sha1sums = 2c9a51fac9adb1bfb71a9d2b00e417dba4a0c249
- sha1sums = b5aa73e428d568b20c8d59ef029e1740e8f9ef34
+ sha1sums = ba376789c8c5db6a709d2c4657b5bcf090417221
pkgname = courier-mta
diff --git a/PKGBUILD b/PKGBUILD
index 8971e1ea8d6..9eccfaa34f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
# Go read http://www.courier-mta.org/install.html b4 running or building courier
pkgname=courier-mta
-pkgver=0.77.0
-pkgrel=3
+pkgver=0.78.0
+pkgrel=1
pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig"
arch=(i686 x86_64)
license=('GPL2')
@@ -34,7 +34,7 @@ source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/couri
webmaild.service
courier-courierfilter.service
courier-mta.conf)
-sha1sums=('6a79c331e2b2ac771455d4333947bfbc7d381b57'
+sha1sums=('f45eac5679e977591101f9f0fc7417e8ccf513e0'
'160f270d8214ac39adc0d1618bc981c59f080adf'
'71d07d57d3c211abf267be140ffb074ac2492448'
'6b06348e019e8883bcac314169e920f156ed1fa4'
@@ -47,7 +47,7 @@ sha1sums=('6a79c331e2b2ac771455d4333947bfbc7d381b57'
'7c6e687d1cefe3139274b39c659351a503a3adb3'
'94703b7bb090754e78710df42f658407a5c0a798'
'2c9a51fac9adb1bfb71a9d2b00e417dba4a0c249'
- 'b5aa73e428d568b20c8d59ef029e1740e8f9ef34')
+ 'ba376789c8c5db6a709d2c4657b5bcf090417221')
build() {
cd "${srcdir}/courier-${pkgver}"
@@ -77,7 +77,7 @@ build() {
package() {
cd "${srcdir}/courier-${pkgver}"
- make "DESTDIR=${pkgdir} install"
+ make DESTDIR="${pkgdir}" install
# install the perftest-script for testings
install -Dm 755 courier/perftest1 "${pkgdir}/usr/lib/courier/perftest1"
@@ -86,7 +86,7 @@ package() {
install -Dm 755 sysconftool "${pkgdir}/usr/lib/courier/sysconftool"
# install pam files according to the layout used in Arch linux
- for _pamfile in "${pkgdir}/etc/courier/*.authpam"; do
+ for _pamfile in "${pkgdir}"/etc/courier/*.authpam; do
sed -i 's|/lib/security/pam_pwdb\.so|pam_unix.so|' "${_pamfile}"
install -Dm 644 "${_pamfile}" "${pkgdir}"/etc/pam.d/$(basename "${_pamfile}" .authpam | sed "s/d$//")
rm -f "${_pamfile}"
diff --git a/courier-mta.conf b/courier-mta.conf
index 5cbd4a89266..d8f859a17fd 100644
--- a/courier-mta.conf
+++ b/courier-mta.conf
@@ -1,3 +1,2 @@
D /run/courier 0755 courier courier
R /run/courier
-R /var/spool/courier
diff --git a/courier-mta.install b/courier-mta.install
index 65ed42661c9..ebde0bfff09 100644
--- a/courier-mta.install
+++ b/courier-mta.install
@@ -13,7 +13,7 @@ post_install() {
}
pre_upgrade() {
- # the file courier-imapd.conf is renamed to courier-mta.conf for version 0.77.0-2
+ # 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
}
@@ -33,6 +33,6 @@ pre_remove() {
--> /etc/courier has been saved as /etc/courier-$1
EOM
- # clean up the /run and /var/spool directories
- systemd-tmpfiles --remove /usr/lib/tmpfiles.d/courier-mta.conf
+ # clean up temporary storage
+ rm -rf /run/courier /var/spool/courier
}