Merge remote-tracking branch 'ms/ccache-update' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 Aug 2012 06:56:54 +0000 (08:56 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 Aug 2012 06:56:54 +0000 (08:56 +0200)
html/cgi-bin/connections.cgi
html/cgi-bin/credits.cgi
html/cgi-bin/proxy.cgi [changed mode: 0755->0644]
lfs/ccache
make.sh
tools/make-functions

index 21f66d7b2c7a06315309f1bbefb0c35a133b2377..fbd7fcd7cd5adbd325f20d7330644e97edcf254d 100644 (file)
@@ -32,6 +32,8 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
+my $colour_multicast = "#A0A0A0";
+
 &Header::showhttpheaders();
 
 my @network=();
@@ -147,6 +149,11 @@ if ($netsettings{'ORANGE_DEV'}) {
        }
 }
 
+# Highlight multicast connections.
+push(@network, "224.0.0.0");
+push(@masklen, "239.0.0.0");
+push(@colour, $colour_multicast);
+
 # Add OpenVPN net and RED/BLUE/ORANGE entry (when appropriate)
 if (-e "${General::swroot}/ovpn/settings") {
        my %ovpnsettings = ();
@@ -173,7 +180,7 @@ if (-e "${General::swroot}/ovpn/settings") {
        }
 }
 
-open(IPSEC, "${General::swroot}/var/ipfire/vpn/config");
+open(IPSEC, "${General::swroot}/vpn/config");
 my @ipsec = <IPSEC>;
 close(IPSEC);
 
@@ -243,6 +250,9 @@ print <<END;
                        <td align='center' bgcolor='${Header::colourovpn}'>
                                <b><font color='#FFFFFF'>$Lang::tr{'OpenVPN'}</font></b>
                        </td>
+                       <td align='center' bgcolor='$colour_multicast'>
+                               <b><font color='#FFFFFF'>Multicast</font></b>
+                       </td>
                </tr>
        </table>
        <br>
index 75e59b18d66be403ae59721690a22257c2ad9b2b..3ae2f71884ba00dbac18400c4691cfa67c0f5479 100644 (file)
@@ -42,9 +42,9 @@ print <<END
        <div align="center">
                <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
                        <input type="hidden" name="cmd" value="_s-xclick">
-                       <input type="hidden" name="hosted_button_id" value="10781833">
-                       <input type="image" src=$Lang::tr{'donation-link'} border="0" name="submit" alt="PayPal - The safer, easier way to pay online.">
-                       <img alt="" border="0" src="https://www.paypal.com/de_DE/i/scr/pixel.gif" width="1" height="1">
+                       <input type="hidden" name="hosted_button_id" value="HHBTSN9QRWPAY">
+                       <input type="image" src="$Lang::tr{'donation-link'}" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+                       <img alt="" border="0" src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif" width="1" height="1">
                </form>
        </div>
 <br />
old mode 100755 (executable)
new mode 100644 (file)
index b7cad8697d143be739ed38ecf1d66c33559ba517..00f7cd7f4c30fc257ac813ab66ff9c20e48431ff 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.6
+VER        = 3.1.7
 
 THISAPP    = ccache-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 343dc9b642e1d2af1e6bd8e474dde92e
+$(DL_FILE)_MD5 = 82257745eac54826527946e9e3d046f4
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index 84447f5e97846ac527e056414454638356f4f569..8e44c4d799ab69c5bc48ebfa09b22cf52940c4a3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.11"                                                 # Version number
 CORE="61"                                                      # Core Level (Filename)
-PAKFIRE_CORE="60"                                              # Core Level (PAKFIRE)
+PAKFIRE_CORE="61"                                              # 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
@@ -222,7 +222,7 @@ prepareenv() {
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
     export CCACHE_COMPRESS=1
-    export CCACHE_HASHDIR=1
+    export CCACHE_COMPILERCHECK="none"
 
     # Remove pre-install list of installed files in case user erase some files before rebuild
     rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
index b6e0ff3c3f45f4e3d4f3f97b8757142b9c5bbe2c..5450689396dc8baab5c2f214117c63906fe83928 100644 (file)
@@ -298,7 +298,7 @@ entershell() {
                CFLAGS="$CF2LAGS" CXXFLAGS="$CXX2FLAGS" \
                CCACHE_DIR=/usr/src/ccache \
                CCACHE_COMPRESS=1 \
-               CCACHE_HASHDIR=1 \
+               CCACHE_COMPILERCHECK="none" \
                KVER=$KVER \
                BUILDTARGET="$BUILDTARGET" \
                MACHINE="$MACHINE" \
@@ -415,7 +415,8 @@ lfsmake2() {
                                                CONFIG_ROOT=$CONFIG_ROOT \
                                                NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                                                CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
-                                               CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
+                                               CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
+                                               CCACHE_COMPILERCHECK="none" \
                                                KVER=$KVER MAKETUNING=$MAKETUNING \
                                                BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
                                                MACHINE_TYPE="$MACHINE_TYPE" \
@@ -448,7 +449,8 @@ ipfiremake() {
                                                CONFIG_ROOT=$CONFIG_ROOT \
                                                NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                                                CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
-                                               CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
+                                               CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
+                                               CCACHE_COMPILERCHECK="none" \
                                                KVER=$KVER MAKETUNING=$MAKETUNING \
                                                BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
                                                MACHINE_TYPE="$MACHINE_TYPE" \
@@ -480,7 +482,8 @@ ipfiredist() {
                                        CONFIG_ROOT=$CONFIG_ROOT \
                                        NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                                        CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
-                                       CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
+                                       CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
+                                       CCACHE_COMPILERCHECK="none" \
                                        KVER=$KVER \
                                        BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
                                        MACHINE_TYPE="$MACHINE_TYPE" \