From: Maniacikarus <maniacikarus@ipfire.org>
Date: Tue, 19 Aug 2008 20:46:58 +0000 (+0200)
Subject: Made squid 2.7 stable4 for core 17
X-Git-Tag: v2.3-beta3~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2cd9391f52edb4fcd68b6d3d48c7619a333e371;p=people%2Fstevee%2Fipfire-2.x.git

Made squid 2.7 stable4 for core 17
Added to update and 2.3
Added green/blue capabilities to hostapd
---

diff --git a/config/rootfiles/core/17/files b/config/rootfiles/core/17/files
new file mode 100644
index 0000000000..d9decc4ff9
--- /dev/null
+++ b/config/rootfiles/core/17/files
@@ -0,0 +1,3 @@
+etc/squid
+usr/lib/squid
+usr/sbin/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/17/meta b/config/rootfiles/core/17/meta
new file mode 100644
index 0000000000..d547fa86fa
--- /dev/null
+++ b/config/rootfiles/core/17/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/17/update.sh b/config/rootfiles/core/17/update.sh
new file mode 100644
index 0000000000..aed2378fc1
--- /dev/null
+++ b/config/rootfiles/core/17/update.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+/etc/init.d/squid stop
+extract_files
+/etc/init.d/squid start
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
diff --git a/config/rootfiles/updater/filelists/core17 b/config/rootfiles/updater/filelists/core17
index 69ee850a73..033b3dfd73 100644
--- a/config/rootfiles/updater/filelists/core17
+++ b/config/rootfiles/updater/filelists/core17
@@ -13,3 +13,6 @@ etc/rc.d/init.d/checkfstab
 etc/rc.d/init.d/networking/any
 etc/rc.d/init.d/networking/red
 etc/rc.d/rcsysinit.d/S19checkfstab
+etc/squid
+usr/lib/squid
+usr/sbin/squid
diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index aef969b821..7a4333f87e 100755
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -70,11 +70,23 @@ mv /boot/grub/grub.conf /boot/grub/grub-old.conf
 #
 rm -rf /lib/modules/$KVER-ipfire
 #
+# Stopping Squid
+#
+echo
+echo Stopping Squid ...
+/etc/init.d/squid stop
+#
 # Unpack the updated files
 #
 echo
 echo Unpack the updated files ...
 extract_files
+#
+# Starting Squid
+#
+echo
+echo Starting Squid ...
+/etc/init.d/squid start
 # 
 # Modify grub.conf
 #
diff --git a/lfs/squid b/lfs/squid
index 1943512856..b4d14b0ff7 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.7.STABLE3
+VER        = 2.7.STABLE4
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9756d9cf9c197356346d1f931046d3a4
+$(DL_FILE)_MD5 = 88ea575a67d35013ec786761d8a14f33
 
 install : $(TARGET)
 
diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index bbdb24f44e..95c8271207 100644
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -34,12 +34,18 @@ case "${1}" in
 
 		# Bring blue up (but not at boot)
 		if [ "$(basename $0)" == "hostapd" ]; then
-		    /etc/rc.d/init.d/networking/blue start
-		    if [ -f /var/ipfire/dhcp/enable_blue ]; then
-			/etc/rc.d/init.d/dhcp restart
-		    fi
+			
+			if [ "$(INTERFACE)" == "blue0" ]; then
+				/etc/rc.d/init.d/networking/blue start
+			elif [ "$(INTERFACE)" == "green0" ]; then
+				/etc/rc.d/init.d/networking/green start
+			fi
+			
+			if [ -f /var/ipfire/dhcp/enable_blue || -f -f /var/ipfire/dhcp/enable_green ]; then
+				/etc/rc.d/init.d/dhcp restart
+			fi
 		fi
-                ;;
+;;
 
         stop)
 		boot_mesg "Stopping hostapd..."