[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b65251c87d28e09f0c299fc1ca0e9c6ce8ccc43f

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b65251c87d28e09f0c299fc1ca0e9c6ce8ccc43f

[git]

[-- Attachment #1: Type: text/plain, Size: 3307 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  b65251c87d28e09f0c299fc1ca0e9c6ce8ccc43f (commit)
       via  8bd45f85efc8a282c5d1d1f6b3c47609eb265ba7 (commit)
      from  3d9b9dd30e86b03dce4e31103099a6a0bdc97a98 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b65251c87d28e09f0c299fc1ca0e9c6ce8ccc43f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Jun 10 18:45:29 2015 +0200

    postfix: add backup/restore at package update.

commit 8bd45f85efc8a282c5d1d1f6b3c47609eb265ba7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Jun 10 18:38:41 2015 +0200

    cyrus-imapd: fix typo at backup include extraction.

-----------------------------------------------------------------------

Summary of changes:
 src/paks/cyrus-imapd/uninstall.sh | 2 +-
 src/paks/default/uninstall.sh     | 2 +-
 src/paks/postfix/install.sh       | 4 +++-
 src/paks/postfix/uninstall.sh     | 3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/src/paks/cyrus-imapd/uninstall.sh b/src/paks/cyrus-imapd/uninstall.sh
index 6e1468e..e34fa56 100644
--- a/src/paks/cyrus-imapd/uninstall.sh
+++ b/src/paks/cyrus-imapd/uninstall.sh
@@ -22,7 +22,7 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
-extract_backup_include
+extract_backup_includes
 stop_service ${NAME}
 make_backup ${NAME}
 remove_files
diff --git a/src/paks/default/uninstall.sh b/src/paks/default/uninstall.sh
index a7b8a53..88f5faf 100644
--- a/src/paks/default/uninstall.sh
+++ b/src/paks/default/uninstall.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+	#!/bin/bash
 ############################################################################
 #                                                                          #
 # This file is part of the IPFire Firewall.                                #
diff --git a/src/paks/postfix/install.sh b/src/paks/postfix/install.sh
index 56c23e2..0932d2e 100644
--- a/src/paks/postfix/install.sh
+++ b/src/paks/postfix/install.sh
@@ -23,10 +23,12 @@
 #
 . /opt/pakfire/lib/functions.sh
 extract_files
+restore_backup ${NAME}
 postalias /etc/aliases
 # Set postfix's hostname
 postconf -e "myhostname=$(hostname -f)"
-/etc/init.d/postfix start
+
+start_service ${NAME}
 
 # Enable autostart for postfix
 ln -sf  ../init.d/postfix /etc/rc.d/rc0.d/K25postfix
diff --git a/src/paks/postfix/uninstall.sh b/src/paks/postfix/uninstall.sh
index 39f1ef9..bc70451 100644
--- a/src/paks/postfix/uninstall.sh
+++ b/src/paks/postfix/uninstall.sh
@@ -22,5 +22,8 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+extract_backup_includes
+stop_service ${NAME}
+make_backup ${NAME}
 remove_files
 rm -rfv /etc/rc.d/rc*.d/*postfix


hooks/post-receive
--
IPFire 2.x development tree