This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, fifteen has been updated via ee1d2d13eec82becb9df17e511672682a27feae2 (commit) via f7bb003150fc1d4fba360224b31314629737ec2f (commit) via 7a302dd0fe1487d764bc30ee2479713d2288040a (commit) via f29eb7ec93f05b553f4bb168b30827ff06de11c4 (commit) via a1fdbdac799c8b65f6e38465d76d4fc34847ad8f (commit) via 9b966c6a0bb6c889aac3b07aae08973014334c24 (commit) from 0203401cf5dcd2fc005eb33a593b625f56258463 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit ee1d2d13eec82becb9df17e511672682a27feae2 Merge: f7bb003 0203401 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Oct 3 14:51:30 2013 +0200

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

commit f7bb003150fc1d4fba360224b31314629737ec2f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Oct 3 14:50:33 2013 +0200

wirelessctrl: fix blue access "enabled" checkbox.

commit 7a302dd0fe1487d764bc30ee2479713d2288040a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Oct 3 14:50:11 2013 +0200

memtest: disable parallel build.

commit f29eb7ec93f05b553f4bb168b30827ff06de11c4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Oct 3 13:44:56 2013 +0200

vdr: remove unknown config keys.

commit a1fdbdac799c8b65f6e38465d76d4fc34847ad8f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Oct 3 11:53:35 2013 +0200

configroot: enable log off wireless packet drop.

commit 9b966c6a0bb6c889aac3b07aae08973014334c24 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Oct 3 11:52:59 2013 +0200

memtest: enable smp as default.

-----------------------------------------------------------------------

Summary of changes: config/vdr/etc/setup.conf | 2 -- lfs/configroot | 4 ++-- lfs/memtest | 5 +++-- src/misc-progs/wirelessctrl.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-)

Difference in files: diff --git a/config/vdr/etc/setup.conf b/config/vdr/etc/setup.conf index a14aff9..749ad03 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 ba6770b..555c782 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 9888e53..d98ea87 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/src/misc-progs/wirelessctrl.c b/src/misc-progs/wirelessctrl.c index 1f1b0f8..8ca7a81 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);

hooks/post-receive -- IPFire 2.x development tree