webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Tremer
2013-10-04 14:53:03 +02:00
parent 08facb3b22 5ae3072a47
commit 4598f16cfd
7 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/73/filelists/php
View File

@@ -1 +0,0 @@
../../../common/php

2
config/vdr/etc/setup.conf
View File

@@ -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

4
lfs/configroot
View File

@@ -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

5
lfs/memtest
View File

@@ -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)

8
lfs/rsync
View File

@@ -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)

2
lfs/samba
View File

@@ -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"

2
src/misc-progs/wirelessctrl.c
View File

@@ -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);