Merge remote-tracking branch 'trikolon/next' into next

diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core/66/filelists/files
index a7f3664400988cbadb7829275811f8f94c158f26..e139bb01ab07e6fc800c87dc64bc27a9eff6cad2 100644 (file)
--- a/config/rootfiles/core/66/filelists/files
+++ b/config/rootfiles/core/66/filelists/files
@@ -38,6 +38,7 @@ srv/web/ipfire/cgi-bin/services.cgi
 srv/web/ipfire/cgi-bin/updatexlrator.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/bin/watch
+usr/local/bin/backupiso
 usr/local/bin/makegraphs
 usr/local/bin/readhash
 usr/local/bin/scanhd

diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi
index 3ec78d4616b76886c85fa9be8d4a4d995387f99e..af1d3d915a15eb5db418e75ee9f8c19b2b5ab69f 100644 (file)
--- a/config/rootfiles/packages/avahi
+++ b/config/rootfiles/packages/avahi
@@ -7,7 +7,7 @@ etc/avahi/services
 etc/avahi/services/sftp-ssh.service
 etc/avahi/services/smb.service
 etc/avahi/services/ssh.service
-etc/dbus-1/system.d/avahi-dbus.conf
+#etc/dbus-1/system.d/avahi-dbus.conf
 etc/rc.d/init.d/avahi
 usr/bin/avahi-browse
 usr/bin/avahi-browse-domains
@@ -82,10 +82,10 @@ usr/lib/libavahi-glib.so.1.0.2
 #usr/lib/libavahi-gobject.so
 usr/lib/libavahi-gobject.so.0
 usr/lib/libavahi-gobject.so.0.0.4
-usr/lib/pkgconfig/avahi-client.pc
-usr/lib/pkgconfig/avahi-core.pc
-usr/lib/pkgconfig/avahi-glib.pc
-usr/lib/pkgconfig/avahi-gobject.pc
+#usr/lib/pkgconfig/avahi-client.pc
+#usr/lib/pkgconfig/avahi-core.pc
+#usr/lib/pkgconfig/avahi-glib.pc
+#usr/lib/pkgconfig/avahi-gobject.pc
 usr/lib/python2.7/site-packages/avahi
 usr/lib/python2.7/site-packages/avahi/ServiceTypeDatabase.py
 usr/sbin/avahi-autoipd
@@ -160,5 +160,4 @@ usr/share/avahi/service-types
 #usr/share/man/man8/avahi-daemon.8
 #usr/share/man/man8/avahi-dnsconfd.8
 #usr/share/man/man8/avahi-dnsconfd.action.8
-usr/var/run
 etc/init.d/avahi

diff --git a/config/rootfiles/packages/libdaemon b/config/rootfiles/packages/libdaemon
index 1b4a46a7c7fa3062f681349b880439a5daf8ac9d..d22e6946d421c3288ebb719cc6058050812e077c 100644 (file)
--- a/config/rootfiles/packages/libdaemon
+++ b/config/rootfiles/packages/libdaemon
@@ -1,17 +1,17 @@
-usr/include/libdaemon
-usr/include/libdaemon/daemon.h
-usr/include/libdaemon/dexec.h
-usr/include/libdaemon/dfork.h
-usr/include/libdaemon/dlog.h
-usr/include/libdaemon/dnonblock.h
-usr/include/libdaemon/dpid.h
-usr/include/libdaemon/dsignal.h
+#usr/include/libdaemon
+#usr/include/libdaemon/daemon.h
+#usr/include/libdaemon/dexec.h
+#usr/include/libdaemon/dfork.h
+#usr/include/libdaemon/dlog.h
+#usr/include/libdaemon/dnonblock.h
+#usr/include/libdaemon/dpid.h
+#usr/include/libdaemon/dsignal.h
 #usr/lib/libdaemon.a
 #usr/lib/libdaemon.la
 #usr/lib/libdaemon.so
 usr/lib/libdaemon.so.0
 usr/lib/libdaemon.so.0.5.0
-usr/lib/pkgconfig/libdaemon.pc
+#usr/lib/pkgconfig/libdaemon.pc
 #usr/share/doc/libdaemon
 #usr/share/doc/libdaemon/README.html
 #usr/share/doc/libdaemon/style.css

diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
index 8c938149642380152562767a4752bf0309fc3529..830775ddf5f99df71292a9ea74fe2ad975dc6cb8 100644 (file)
--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2005-2010  IPFire Team                                        #
+# Copyright (C) 2005-2013  IPFire Team  <info@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        #
@@ -176,7 +176,13 @@ print <<END
        <td align='left'>
                <input type='radio' name='BACKUPLOGS' value='include'/> $Lang::tr{'include logfiles'}<br/>
                <input type='radio' name='BACKUPLOGS' value='exclude' checked='checked'/> $Lang::tr{'exclude logfiles'}<br/>
-               <input type='radio' name='BACKUPLOGS' value='iso' /> $Lang::tr{'generate iso'}
+END
+;
+my $MACHINE=`uname -m`;
+if ( ! ( $MACHINE =~ "arm" )) {
+       print"          <input type='radio' name='BACKUPLOGS' value='iso' /> $Lang::tr{'generate iso'}<br/>"
+}
+print <<END
        </td>
 </tr>
 <tr><td align='center' colspan='2'>

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 0b28c2adf36a4fa0738147fc1bc768c158144755..cc7416a9439ba86fb54bc8d41f3fa8e4e2dfb738 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2013  IPFire Team  <info@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        #
@@ -3556,15 +3556,15 @@ if ($delaypools) {
 
 if ($proxysettings{'NO_PROXY_LOCAL'} eq 'on')
 {
-       print FILE "#Prevent internal proxy access to Green\n";
-       print FILE "http_access deny IPFire_green_servers !IPFire_green_network\n\n";
+       print FILE "#Prevent internal proxy access to Green except IPFire itself\n";
+       print FILE "http_access deny IPFire_green_servers !IPFire_ips !IPFire_green_network\n\n";
 }
 
 if ($proxysettings{'NO_PROXY_LOCAL_BLUE'} eq 'on')
 {
-       print FILE "#Prevent internal proxy access from Blue\n";
+       print FILE "#Prevent internal proxy access from Blue except IPFire itself\n";
        print FILE "http_access allow IPFire_blue_network IPFire_blue_servers\n";
-       print FILE "http_access deny  IPFire_blue_network IPFire_servers\n\n";
+       print FILE "http_access deny  IPFire_blue_network !IPFire_ips IPFire_servers\n\n";
 }
 
        print FILE <<END

diff --git a/make.sh b/make.sh
index da3349b2a1d10d00793c30b7ffc0bb29e050491c..54fb812c32daafda5031e86c467a28d6d0bc24a2 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.13rc2"                                                      # Version number
-CORE="65"                                                      # Core Level (Filename)
-PAKFIRE_CORE="65"                                              # Core Level (PAKFIRE)
+VERSION="2.13"                                                 # Version number
+CORE="66"                                                      # Core Level (Filename)
+PAKFIRE_CORE="66"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
@@ -755,6 +755,9 @@ buildipfire() {
   ipfiremake sarg
   ipfiremake fstrim
   ipfiremake check_mk_agent
+  ipfiremake libdaemon
+  ipfiremake avahi
+  ipfiremake nginx
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 14139b5c910c30576645d56597cede3b916fce6c..bf0a356e10271f61d2edd24f423fff14b28b142a 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -277,7 +277,7 @@ int main(int argc, char *argv[])
                        ctr[TR_CANCEL], NULL);
        } else {
            rc = 1;
-           fstype = EXT3;
+           fstype = EXT4;
        }
        if (rc == 2)
                goto EXIT;
@@ -596,12 +596,6 @@ EXIT:
                fclose(flog);
                newtFinished();
 
-               if (unattended) {
-                       // Remove Setup autorun after boot
-                       if (system("rm -f /harddisk/etc/rc.d/rcsysinit.d/S75firstsetup"))
-                               printf("Unable to disable setup autorun.\n");
-               }
-
                if (system("/bin/umount /harddisk/proc"))
                        printf("Unable to umount /harddisk/proc.\n"); 
        } else {

diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index 6bea85578b80553fc3e7f8d6bf732bb4ddd0b681..30616a4a5a48277487133a21aae1776eb77122a6 100644 (file)
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-COREVER=`cat /opt/pakfire/db/core/mine`
+COREVER=$(cat /opt/pakfire/db/core/mine)
 # FIXME: edit this lines before release
-URL=http://download.ipfire.org/releases/ipfire-2.x/2.11-core$COREVER/
-ISO=ipfire-2.11.i586-full-core$COREVER.iso
+URL="http://download.ipfire.org/releases/ipfire-2.x/2.13-core$COREVER/"
+ISO="ipfire-2.13.i586-full-core$COREVER.iso"
 
-if [ -z "$1" ]; then 
+if [ -z $1 ]; then
        echo usage: $0 backup-file
        exit
 fi
@@ -15,22 +15,36 @@ TS=$1
 mkdir -p /var/tmp/backupiso
 cd /var/tmp/backupiso
 
-echo "Fetching ${URL}${ISO}"
-wget --quiet -c ${URL}${ISO}
-echo "Fetching ${URL}md5sums.txt"
+if [ ! -e ${ISO} ]
+then
+       echo "Fetching ${URL}${ISO}"
+       wget --quiet -c ${URL}${ISO}
+fi
+
+echo "Fetching ${URL}${ISO}.md5"
 wget --quiet -O ${ISO}.md5 ${URL}${ISO}.md5
 
 echo "Checking md5 of ${ISO}"
 md5sum --status -c ${ISO}.md5
-RETVAR="$?"
-if [ $RETVAR -eq 0 -o $RETVAR -eq 24 ]
-       then
-                echo "md5 is OK"
-       else
-                echo "md5 mismatch"
-               echo "Fetching again ${URL}${ISO}"
-               wget --quiet -O ${ISO} ${URL}${ISO}
+if [ $? -eq 0 -o $? -eq 24 ]
+then
+       echo "md5 is OK"
+else
+       echo "md5 mismatch"
+       echo "Fetching again ${URL}${ISO}"
+       wget --quiet -O ${ISO} ${URL}${ISO}
+       echo "Checking again md5 of ${ISO}"
+       md5sum --status -c ${ISO}.md5
+       if [ $? -eq 0 -o $? -eq 24 ]
+       then
+               echo "md5 is OK"
+       else
+               echo "md5 mismatch"
+               echo "aborting backup because md5 mismatch"
+               exit 1
+       fi
 fi
+rm ${ISO}.md5
 
 echo "Remastering iso"
 mkdir -p backupiso.tmp.${TS}
@@ -45,7 +59,7 @@ cp /var/ipfire/backup/${TS}.ipf backupiso.${TS}
 echo "Running mkisofs"
 mkisofs -J -r -V "ipfire backup ${TS}" \
             -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
-            -c boot/isolinux/boot.catalog backupiso.${TS} > `basename ${ISO} .iso`-${TS}.iso
+            -c boot/isolinux/boot.catalog backupiso.${TS} > $(basename ${ISO} .iso)-${TS}.iso
 
 echo "Cleaning up"
 rm -rf backupiso.${TS}

diff --git a/src/scripts/readhash b/src/scripts/readhash
index cc063a7a2b2ddc3a11af741d6bec4a3042c68957..bffc93fbd00c31a76e9c96fc17dabf0a87c3c9ef 100644 (file)
--- a/src/scripts/readhash
+++ b/src/scripts/readhash
@@ -13,7 +13,7 @@ VARNAME='[A-Za-z_][A-Za-z0-9_]*'
 
 # For the assigned value we only accept a limited number of characters - none
 # of which are shell metachars
-VARCHARS='A-Za-z0-9=/,.:_@#+-'
+VARCHARS='A-Za-z0-9=/,.:%_@#+-'
 VARVAL="[${VARCHARS}]*"
 
 sed -ne "s/\(${VARNAME}\)=\(${VARVAL}\)$/\1=\2/p" $1