add latest whiterussian fixes

SVN-Revision: 3506

diff --git a/openwrt/package/base-files/default/bin/ipcalc b/openwrt/package/base-files/default/bin/ipcalc
index 7a9c6077754df7a1b5876a4f478f93bcfb2e441a..318980e5a25f25de5cc53d065faf8571228af8a6 100755 (executable)
--- a/openwrt/package/base-files/default/bin/ipcalc
+++ b/openwrt/package/base-files/default/bin/ipcalc
@@ -11,7 +11,7 @@ BEGIN {
        limit=network+1
        if (start<limit) start=limit
        
-       end=or(start,and(ip2int(ARGV[4]),compl(netmask)))
+       end=start+ARGV[4]
        limit=or(network,compl(netmask))-1
        if (end>limit) end=limit
 

diff --git a/openwrt/package/ipkg/Config.in b/openwrt/package/ipkg/Config.in
index 90c512b4a52a7d4d237b9d3a3973df680baf6d7f..a1fdce4907735d2f522c327b392c5f62023bfccf 100644 (file)
--- a/openwrt/package/ipkg/Config.in
+++ b/openwrt/package/ipkg/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_IPKG
        tristate
        default n
-       depends BR2_PACKAGE_IPKG_C || BR2_PACKAGE_IPKG_SHELL
+       depends BR2_PACKAGE_IPKG_C || BR2_PACKAGE_IPKG_SH
 
 config BR2_PACKAGE_IPKG_C
        tristate "ipkg - itsy package management system"
@@ -21,7 +21,7 @@ config BR2_PACKAGE_IPKG_C
         up much less space).
         
 config BR2_PACKAGE_IPKG_SH
-       tristate "ipkg - itsy package management system (shell version)"
+       tristate "ipkg-sh - itsy package management system (shell version)"
        default m if CONFIG_DEVEL
        default m if BR2_PACKAGE_IMAGEBUILDER
        select BR2_PACKAGE_IPKG
@@ -38,3 +38,6 @@ config BR2_PACKAGE_IPKG_SH
         Familiar that dpkg and apt serve for Debian, (while taking
         up much less space).
 
+if (BR2_PACKAGE_IPKG_C = y) && (BR2_PACKAGE_IPKG_SH = y)
+       comment "WARNING: both ipkg and ipkg-sh are selected for installation !"
+endif