summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Romig2017-12-13 12:36:25 +0000
committerNeil Romig2017-12-13 12:36:25 +0000
commit641ce110d55bffc35fad8dc3fd8d4f2b2d65e7ba (patch)
tree2a5485df08fb465b6bcda029a7fde908a6db9e83
parentb813ff15d2fd8d492b35f9858eeb0974753c7802 (diff)
downloadaur-641ce110d55bffc35fad8dc3fd8d4f2b2d65e7ba.tar.gz
Added handling for some files that were overwritten during upgrades
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
-rw-r--r--courier-mta.install3
3 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d9560d7b167..4f4fa5eb599 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.2
- pkgrel = 1
+ pkgrel = 2
url = http://courier-mta.org
install = courier-mta.install
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 58561ec272e..e2fe36a1a7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
pkgname=courier-mta
pkgver=0.78.2
-pkgrel=1
+pkgrel=2
pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig"
arch=(i686 x86_64)
license=('GPL2')
@@ -19,6 +19,8 @@ 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')
install=courier-mta.install
source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2
courier-imapd.service
diff --git a/courier-mta.install b/courier-mta.install
index ea7134d3d79..03a37935f7a 100644
--- a/courier-mta.install
+++ b/courier-mta.install
@@ -26,8 +26,7 @@ post_upgrade() {
pre_remove() {
# there may be many files not part of the original installation that would be useful to save
# so save the whole configuration directory rather than try to list all possibilities
- # in backup(). Also avoids creation of .pacsave files in the alias and smtpaccess directories that
- # process all contained files
+ # in backup().
mv -f /etc/courier /etc/courier-$1
echo "/etc/courier has been saved as /etc/courier-$1 - you may remove this folder if you wish."