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

diff --git a/config/vdr/etc/setup.conf b/config/vdr/etc/setup.conf
index a14aff9df558e83d9170926c2c816487aec97384..749ad03c88558198310ff0c6cb1854cf97104dac 100644 (file)
--- 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 ba6770b33509d2ebac92ce63e0c2ce4a7fe8148b..555c782ed2c93eb2096e2fa57f4764a64a700466 100644 (file)
--- 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 9888e53ee80207eaf560cfd0e6ca6fbe5b6dc390..d98ea872bd89cd0d748fe3440afed19c90a124ac 100644 (file)
--- 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/src/misc-progs/wirelessctrl.c b/src/misc-progs/wirelessctrl.c
index 1f1b0f861e6a75913243938dd59482ee6328249e..8ca7a81ae77572aac6a522629857bb08203f1a1a 100644 (file)
--- 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);