Merge branch 'work'

diff --git a/config/backup/includes/asterisk b/config/backup/includes/asterisk
new file mode 100644 (file)
index 0000000..ccc47ea
--- /dev/null
+++ b/config/backup/includes/asterisk
@@ -0,0 +1,2 @@
+/var/ipfire/asterisk/
+/var/log/asterisk/cdr-csv/

diff --git a/config/clamav/clamd.conf b/config/clamav/clamd.conf
index 900ace8b8ae1f0645eaff947687f24bf6993b669..8af895e2c54e513baa484b8695f4cc79d6f04f03 100644 (file)
--- a/config/clamav/clamd.conf
+++ b/config/clamav/clamd.conf
@@ -4,6 +4,4 @@
 LogSyslog yes
 PidFile /var/run/clamav/clamd.pid
 LocalSocket /var/run/clamav/clamd
-ArchiveMaxFileSize 15M
-StreamMaxLength 50M
 ScanPDF yes

diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk
index d28d00b068d2d477e775bc30d6f6daad387fd39e..1a6c547be6103649746f453749ea231d6c960b54 100644 (file)
--- a/config/rootfiles/packages/asterisk
+++ b/config/rootfiles/packages/asterisk
@@ -1,5 +1,6 @@
 etc/init.d/asterisk
 var/ipfire/menu.d/EX-asterisk.menu
+var/ipfire/backup/addons/includes/asterisk
 srv/web/ipfire/cgi-bin/asterisk
 etc/fcron.minutely/wakeup.sh
 #usr/include/asterisk

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 2a4946375224ba286b83159136deb2af98264c89..79bb3fb887e7315eae6d91ac6c75b74f13e0ee22 100644 (file)
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -136,13 +136,11 @@ END
 
 } elsif ($pakfiresettings{'ACTION'} eq 'update') {
 
-       system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null");
+       system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &");
 
 } elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
-       my $command = "/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null";
+       my $command = "/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null &";
        system("$command");
-       refreshpage();
-
 } elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
 
        if ($pakfiresettings{'AUTOUPDATE'} eq 'on') {
@@ -198,7 +196,7 @@ if ($return) {
                        </form>
                <tr><td colspan='2' align='left'><pre>
 END
-       my @output = `tail -20 /var/log/pakfire.log`;
+       my @output = `grep pakfire /var/log/messages | tail -20`;
        foreach (@output) {
                print "$_";
        }
@@ -210,6 +208,7 @@ END
        &Header::closebigbox();
        &Header::closepage();
        exit;
+       refreshpage();
 }
 
 my $core_release = `cat /opt/pakfire/db/core/mine 2>/dev/null`;

diff --git a/lfs/asterisk b/lfs/asterisk
index f792f503145697cab605c205638acd0c0472a7b8..91ebf98bbc2cb74d3fc396217b1fe0810d7c2928 100644 (file)
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -132,4 +132,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        
        @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-*  $(DIR_SRC)/$(CHAN_CAPI) \
                $(DIR_SRC)/agx-ast-addons
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/asterisk /var/ipfire/backup/addons/includes/asterisk
        @$(POSTBUILD)

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 1080b0062136a9fe8400bb5529667c250872ab53..c8febe76e6dfd6201a5187d1592d14f425b18ab5 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -118,7 +118,7 @@ sub pinghost {
        
        $p = Net::Ping->new();
   if ($p->ping($host)) {
-       logger("PING INFO: $host is alive");
+        logger("PING INFO: $host is alive");
        return 1;
   } else {
                logger("PING INFO: $host is unreachable");
@@ -211,6 +211,9 @@ sub fetchfile {
                                                move("$Conf::tmpdir/$bfile","$Conf::cachedir/$bfile");
                                        } else {
                                                message("DOWNLOAD ERROR: The downloaded file ($file) wasn't verified by IPFire.org. Sorry - Exiting...");
+                                               my $ntp = `ntpdate -q -t 10 pool.ntp.org 2>/dev/null | tail -1`;
+                                               if ( $ntp !~ /time\ server(.*)offset(.*)/ ){message("TIME ERROR: Unable to get the nettime, this may lead to the verification error.");}
+                                               else { $ntp =~ /time\ server(.*)offset(.*)/; message("TIME INFO: Time Server$1has$2 offset to localtime.");}
                                                exit 1;
                                        }
                                        logger("DOWNLOAD FINISHED: $file");
@@ -544,7 +547,12 @@ sub cleanup {
 sub getmetafile {
        my $pak = shift;
        
-       unless ( -e "$Conf::dbdir/meta/meta-$pak") {
+       unless ( -e "$Conf::dbdir/meta/meta-$pak" ) {
+               fetchfile("meta/meta-$pak", "");
+               move("$Conf::cachedir/meta-$pak", "$Conf::dbdir/meta/meta-$pak");
+       }
+       
+       if ( -z "$Conf::dbdir/meta/meta-$pak" ) {
                fetchfile("meta/meta-$pak", "");
                move("$Conf::cachedir/meta-$pak", "$Conf::dbdir/meta/meta-$pak");
        }

diff --git a/src/paks/asterisk/install.sh b/src/paks/asterisk/install.sh
new file mode 100644 (file)
index 0000000..24ce657
--- /dev/null
+++ b/src/paks/asterisk/install.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+restore_backup ${NAME}
+start_service ${NAME}

diff --git a/src/paks/asterisk/uninstall.sh b/src/paks/asterisk/uninstall.sh
new file mode 100644 (file)
index 0000000..bd755e3
--- /dev/null
+++ b/src/paks/asterisk/uninstall.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+echo "/var/ipfire/asterisk/" >> /var/ipfire/backup/addons/includes/asterisk
+echo "/var/log/asterisk/cdr-csv/" >> /var/ipfire/backup/addons/includes/asterisk
+stop_service ${NAME}
+make_backup ${NAME}
+remove_files

diff --git a/src/paks/asterisk/update.sh b/src/paks/asterisk/update.sh
new file mode 100644 (file)
index 0000000..89c40d0
--- /dev/null
+++ b/src/paks/asterisk/update.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh