cyrus-imapd: add backupinclude.

diff --git a/config/backup/includes/cyrus-imapd b/config/backup/includes/cyrus-imapd
new file mode 100644 (file)
index 0000000..bb1bb3b
--- /dev/null
+++ b/config/backup/includes/cyrus-imapd
@@ -0,0 +1,4 @@
+/usr/sieve
+/var/imap
+/var/ipfire/cyrusimap
+/var/log/imap

diff --git a/config/rootfiles/packages/cyrus-imapd b/config/rootfiles/packages/cyrus-imapd
index 0c0485e4ef685cb8eea4c2ba9f27cc76b6dfe196..bbaec3ffb05ca2690c2a0d48863a0403f1f8d5ed 100644 (file)
--- a/config/rootfiles/packages/cyrus-imapd
+++ b/config/rootfiles/packages/cyrus-imapd
@@ -146,6 +146,7 @@ var/imap/msg
 var/imap/proc
 var/imap/ptclient
 var/imap/socket
+var/ipfire/backup/addons/includes/cyrus-imapd
 var/ipfire/cyrusimap
 var/ipfire/cyrusimap/cyrus.conf
 var/ipfire/cyrusimap/imapd.conf

diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index 8e61354520cc96424b3e2eef755b87c5739c625e..fc87bd62b472be117b8024551fcd9bd7e30b37f4 100644 (file)
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cyrus-imapd
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -100,5 +100,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp -f $(DIR_APP)/tools/mkimap /usr/bin
        sudo -u cyrus /usr/bin/mkimap /var/ipfire/cyrusimap/imapd.conf
        chown cyrus.mail /var/imap/socket
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/cyrus-imapd \
+               /var/ipfire/backup/addons/includes/cyrus-imapd
        @rm -rf $(DIR_APP) /usr/include/com_err.h
        @$(POSTBUILD)

diff --git a/src/paks/cyrus-imapd/uninstall.sh b/src/paks/cyrus-imapd/uninstall.sh
index 0d2109eb9e6337d1c5838982f6b82f04e7f4e4d1..6e1468ec7f6ca27bad2617d7a76543f78f608e96 100644 (file)
--- a/src/paks/cyrus-imapd/uninstall.sh
+++ b/src/paks/cyrus-imapd/uninstall.sh
@@ -22,6 +22,7 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+extract_backup_include
 stop_service ${NAME}
 make_backup ${NAME}
 remove_files