From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 4 Oct 2013 12:53:03 +0000 (+0200)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=4598f16cfddf949149f4b00f554d8991a192a84f;hp=08facb3b223363379e0077989cc44fe85a6e1552

Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
---

diff --git a/config/rootfiles/core/73/filelists/php b/config/rootfiles/core/73/filelists/php
deleted file mode 120000
index 1ae48d7a7..000000000
--- a/config/rootfiles/core/73/filelists/php
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/php
\ No newline at end of file
diff --git a/config/vdr/etc/setup.conf b/config/vdr/etc/setup.conf
index a14aff9df..749ad03c8 100644
--- a/config/vdr/etc/setup.conf
+++ b/config/vdr/etc/setup.conf
@@ -50,7 +50,6 @@ OSDWidth = 624
 PauseLifetime = 1
 PausePriority = 10
 PrimaryDVB = 1
-PrimaryLimit = 0
 RecordingDirs = 1
 ResumeID = 0
 SetSystemTime = 0
@@ -82,5 +81,4 @@ streamdev-server.MaxClients = 5
 streamdev-server.ServerPort = 2004
 streamdev-server.StartHTTPServer = 1
 streamdev-server.StartServer = 1
-streamdev-server.SuspendMode = 1
 streamdev-server.VTPBindIP = 0.0.0.0
diff --git a/lfs/configroot b/lfs/configroot
index ba6770b33..555c782ed 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -128,8 +128,8 @@ $(TARGET) :
 	echo  "SHOWCOLORS=on"		>> $(CONFIG_ROOT)/optionsfw/settings
 	echo  "SHOWTABLES=off"		>> $(CONFIG_ROOT)/optionsfw/settings
 	echo  "SHOWDROPDOWN=off"	>> $(CONFIG_ROOT)/optionsfw/settings
-	echo  "DROPWIRELESSINPUT=off"	>> $(CONFIG_ROOT)/optionsfw/settings
-	echo  "DROPWIRELESSFORWARD=off"	>> $(CONFIG_ROOT)/optionsfw/settings
+	echo  "DROPWIRELESSINPUT=on"	>> $(CONFIG_ROOT)/optionsfw/settings
+	echo  "DROPWIRELESSFORWARD=on"	>> $(CONFIG_ROOT)/optionsfw/settings
 	echo  "POLICY=MODE2"		>> $(CONFIG_ROOT)/forward/settings
 	echo  "POLICY1=MODE2"		>> $(CONFIG_ROOT)/forward/settings
 	
diff --git a/lfs/memtest b/lfs/memtest
index 9888e53ee..d98ea872b 100644
--- a/lfs/memtest
+++ b/lfs/memtest
@@ -71,9 +71,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-#	cd $(DIR_APP) && sed -i -e "s| -fno-stack-protector||g" Makefile
+	# Enable SMP as default
+	cd $(DIR_APP) && sed -i -e "s|CONSERVATIVE_SMP 1|CONSERVATIVE_SMP 0|g" config.h
 	cd $(DIR_APP) && sed -i -e "s|scp |echo |g" Makefile
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make $(EXTRA_MAKE)
 	-mkdir -p /usr/lib/memtest86+
 	cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+
 	@rm -rf $(DIR_APP)
diff --git a/lfs/rsync b/lfs/rsync
index 2e65268ed..57c822cc2 100644
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -1,7 +1,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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.0.9
+VER        = 3.1.0
 
 THISAPP    = rsync-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rsync
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5ee72266fe2c1822333c407e1761b92b
+$(DL_FILE)_MD5 = 3be148772a33224771a8d4d2a028b132
 
 install : $(TARGET)
 
diff --git a/lfs/samba b/lfs/samba
index 210bfbead..ce53ebac1 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 52
+PAK_VER    = 53
 
 DEPS       = "cups"
 
diff --git a/src/misc-progs/wirelessctrl.c b/src/misc-progs/wirelessctrl.c
index 1f1b0f861..8ca7a81ae 100644
--- a/src/misc-progs/wirelessctrl.c
+++ b/src/misc-progs/wirelessctrl.c
@@ -130,7 +130,7 @@ int main(void) {
 		macaddress = strtok(NULL, ",");
 		enabled = strtok(NULL, ",");
 
-		if (strncmp(enabled, "on", 2) != 0) {
+		if (strcmp(enabled, "on") == 0) {
 			/* both specified, added security */
 			if ((strlen(macaddress) == 17) && (VALID_IP_AND_MASK(ipaddress))) {
 				snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSINPUT -m mac --mac-source %s -s %s -i %s -j ACCEPT", macaddress, ipaddress, blue_dev);