Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

add FREETZ_AVM_VERSION_05_5X_*MIN*

git-svn-id: file:///var/svn/freetz/trunk@10320 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
commit a8ef0def12192ab89d914ad54b1ba684e2c31a48 1 parent 91729bc
cuma authored
View
9 Config.in
@@ -1871,16 +1871,23 @@ config FREETZ_AVM_VERSION_7390_05_50
config FREETZ_AVM_VERSION_r7203
bool
+
config FREETZ_AVM_VERSION_04_XX
bool
+
config FREETZ_AVM_VERSION_05_2X_MIN
bool
config FREETZ_AVM_VERSION_05_2X
bool
select FREETZ_AVM_VERSION_05_2X_MIN
-config FREETZ_AVM_VERSION_05_5X
+
+config FREETZ_AVM_VERSION_05_5X_MIN
bool
select FREETZ_AVM_VERSION_05_2X_MIN
+config FREETZ_AVM_VERSION_05_5X
+ bool
+ select FREETZ_AVM_VERSION_05_5X_MIN
+
#alias for 3270 (v2) and 3270 v3
config FREETZ_TYPE_3270
View
2  Config.in.has_avm
@@ -651,7 +651,7 @@ config FREETZ_HAS_AVM_RAMZSWAP
config FREETZ_HAS_AVM_AHA
bool "Has AVM Home Automation" if FREETZ_TYPE_CUSTOM
- default y if FREETZ_AVM_VERSION_05_5X && FREETZ_HAS_AVM_DECT
+ default y if FREETZ_AVM_VERSION_05_5X_MIN && FREETZ_HAS_AVM_DECT
default n
help
Select this if you have a firmware with AHA (AVM Home Automation).
View
2  make/avm-firewall/files/root/usr/lib/cgi-bin/avm-firewall.cgi
@@ -204,7 +204,7 @@ EOF
sec_end
sec_begin '$(lang en:"Port forwarding rules" de:"Port Forwarding-Regeln")' forward-rules
-[ "$FREETZ_AVM_VERSION_05_5X" == "y" ] && echo '<p><small>$(lang en:"This firmware prevents forwarding to FTP (port 21) here. Use AVM webif instead." de:"Diese Firmware erm&ouml;glicht hier keine Freigabe f&uuml;r FTP (Port 21). Bitte das AVM Webif daf&uuml;r nutzen. <br> (Internet -> Freigaben -> FRITZBox-Dienste -> \"Internetzugriff auf Ihre Speichermedien &uuml;ber FTP/FTPS aktiviert\")") </small></p>'
+[ "$FREETZ_AVM_VERSION_05_5X_MIN" == "y" ] && echo '<p><small>$(lang en:"This firmware prevents forwarding to FTP (port 21) here. Use AVM webif instead." de:"Diese Firmware erm&ouml;glicht hier keine Freigabe f&uuml;r FTP (Port 21). Bitte das AVM Webif daf&uuml;r nutzen. <br> (Internet -> Freigaben -> FRITZBox-Dienste -> \"Internetzugriff auf Ihre Speichermedien &uuml;ber FTP/FTPS aktiviert\")") </small></p>'
cat << EOF
$(lang en:"For debugging show forwarding rules" de:"Zum Debuggen Forward-Regeln anzeigen"): <input type="checkbox" onclick='document.getElementById("forwardingrules").style.display=(this.checked)? "block" : "none"' >
View
2  patches/scripts/520-remove_dect.sh
@@ -21,7 +21,7 @@ modsed "/jslGoTo('dect'/d;/^<?.*[dD]ect.*?>$/d" "${HTML_SPEC_MOD_DIR}/menus/menu
menu2html_remove dect
# don't patch this in firmwares < 05.5x (see http://freetz.org/ticket/2056)
-if [ "$FREETZ_AVM_VERSION_05_5X" == "y" ]; then
+if [ "$FREETZ_AVM_VERSION_05_5X_MIN" == "y" ]; then
MODPROBEPIGLET=$(grep -l -i dect_firstlevelfile "${FILESYSTEM_MOD_DIR}/etc/init.d/"* 2>/dev/null)
if [ -e "$MODPROBEPIGLET" ]; then
echo1 "patching ${MODPROBEPIGLET##*/}"
View
2  patches/scripts/900-add_options_cfg.sh
@@ -7,7 +7,7 @@ if [ "$FREETZ_CREATE_SEPARATE_OPTIONS_CFG" != "y" ]; then
ln -snf .config $OPTIONS_CFG
else
OPTIONS_FILES="$(find make/*/files/root/etc/init.d/rc.* make/*/files/root/etc/default.*/*_conf make/*/files/root/usr/lib/cgi-bin/*.cgi)"
- OPTIONS_NAMES="$(grep -hoE "FREETZ_REPLACE_KERNEL|FREETZ_AVMDAEMON_DISABLE_[A-Z0-9]*|FREETZ_AVM_VERSION_[X0-9_]*|FREETZ_(TARGET|BUSYBOX)_[A-Z0-9_]*|(EXTERNAL_)?FREETZ_(PACKAGE|LIB)[a-zA-Z0-9_]*" $OPTIONS_FILES | sort -u)"
+ OPTIONS_NAMES="$(grep -hoE "FREETZ_REPLACE_KERNEL|FREETZ_AVMDAEMON_DISABLE_[A-Z0-9]*|FREETZ_AVM_VERSION_[X0-9_]*(_MIN)?|FREETZ_(TARGET|BUSYBOX)_[A-Z0-9_]*|(EXTERNAL_)?FREETZ_(PACKAGE|LIB)[a-zA-Z0-9_]*" $OPTIONS_FILES | sort -u)"
for OPTIONS_CURRENT in $OPTIONS_NAMES; do
OPTIONS_VALUE="$(eval echo \$$OPTIONS_CURRENT)"
if [ "$OPTIONS_VALUE" != "n" -a "$OPTIONS_VALUE" != "" ]; then
Please sign in to comment.
Something went wrong with that request. Please try again.