[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ace40c90eceaf77ed20ba39a45a2f883aaafa3fe

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ace40c90eceaf77ed20ba39a45a2f883aaafa3fe

[git]

[-- Attachment #1: Type: text/plain, Size: 2912 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  ace40c90eceaf77ed20ba39a45a2f883aaafa3fe (commit)
      from  b81b96d215d289c2956552eeb4f6ed6440d59b9e (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 ace40c90eceaf77ed20ba39a45a2f883aaafa3fe
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Jul 7 19:37:56 2012 +0200

    pakfire: add function to extract backup includes.
    
    this is needed to fix some addons with missing includes at the next
    update. (eg. nagios).

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

Summary of changes:
 config/rootfiles/core/61/filelists/files |    1 +
 src/pakfire/lib/functions.sh             |    9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/61/filelists/files b/config/rootfiles/core/61/filelists/files
index 11316eb..56981ed 100644
--- a/config/rootfiles/core/61/filelists/files
+++ b/config/rootfiles/core/61/filelists/files
@@ -1,6 +1,7 @@
 etc/system-release
 etc/issue
 etc/rc.d/init.d/collectd
+opt/pakfire/lib/functions.sh
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 var/ipfire/general-functions.pl
diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh
index 2f6491f..bc05bd0 100644
--- a/src/pakfire/lib/functions.sh
+++ b/src/pakfire/lib/functions.sh
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -28,6 +28,13 @@ extract_files() {
 	echo "...Finished."
 }
 
+extract_backup_includes() {
+	echo "Extracting backup includes..."
+	tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \
+		var/ipfire/backup/addons/includes
+	echo "...Finished."
+}
+
 remove_files() {
 	echo "Removing files..."
 	for i in $(cat /opt/pakfire/db/rootfiles/${NAME}); do


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