From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 27 Mar 2006 00:00:14 +0000 (+0000)
Subject: add latest whiterussian fixes
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=adf094b0656ce87936c41f818b83f4e11635ad3f

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 7a9c607775..318980e5a2 100755
--- 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 90c512b4a5..a1fdce4907 100644
--- 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