[pkg-wpa-devel] 0.5.4-5 bugfix upload

[Kel Modderman]

Hi Kyle and Reinhard,

I really hate to admit it; I made some mistakes in 0.5.4-4. So, I've prepared 
0.5.4-5 with two pretty serious changes (debdiff attached).

Sorry about this, I hope it's not pushing the boundaries too far to ask for 
another upload so soon . . .

Source package location:

http://users.tpg.com.au/sigm/misc/pkg-wpa/wpasupplicant_0.5.4-5.dsc

Thanks, Kel.
-------------- next part --------------
diff -u wpasupplicant-0.5.4/debian/control wpasupplicant-0.5.4/debian/control
--- wpasupplicant-0.5.4/debian/control
+++ wpasupplicant-0.5.4/debian/control
@@ -9,9 +9,8 @@
 Package: wpasupplicant
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: libengine-pkcs11-openssl
+Suggests: libengine-pkcs11-openssl, guessnet, iproute
 Recommends: dhcp3-client
-Suggests: guessnet, iproute
 Description: Client support for WPA and WPA2 (IEEE 802.11i)
  WPA and WPA2 are methods for securing wireless networks, the former
  using IEEE 802.1X, and the latter using IEEE 802.11i. This software
diff -u wpasupplicant-0.5.4/debian/wpa_action.sh wpasupplicant-0.5.4/debian/wpa_action.sh
--- wpasupplicant-0.5.4/debian/wpa_action.sh
+++ wpasupplicant-0.5.4/debian/wpa_action.sh
@@ -120,15 +120,11 @@
 		# find a suitable WPA_LOGICAL_IFACE by running the mapping script
 		echo "Mapping logical interface via wpa-mapping-script: $IF_WPA_MAPPING_SCRIPT"
 		
-		# ensure these are private to this function
-		local WPA_MAP_ENV WPA_MAP_STDIN
-		WPA_MAP_ENV=$(set | sed -n -e 's/^\(IF_WPA_MAP[0-9]*\)=.*/\1/p')
-		if [ -n "$WPA_MAP_ENV" ]; then
-			# preserve env var value
-			for stdin in $WPA_MAP_ENV; do
-				eval "WPA_MAP_STDIN=\"\$WPA_MAP_STDIN \$$stdin\""
-			done
-			WPA_LOGICAL_IFACE=$(echo $WPA_MAP_STDIN | "$IF_WPA_MAPPING_SCRIPT" "$IFACE")
+		# ensure this is private to function
+		local WPA_MAP_STDIN
+		WPA_MAP_STDIN=$(set | sed -n -e 's/^\(IF_WPA_MAP[0-9]*\)=.*/echo\ \$\1/p')
+		if [ -n "$WPA_MAP_STDIN" ]; then
+			WPA_LOGICAL_IFACE=$(eval "$WPA_MAP_STDIN" | "$IF_WPA_MAPPING_SCRIPT" "$IFACE")
 		else		
 			WPA_LOGICAL_IFACE=$("$IF_WPA_MAPPING_SCRIPT" "$IFACE")
 		fi
diff -u wpasupplicant-0.5.4/debian/changelog wpasupplicant-0.5.4/debian/changelog
--- wpasupplicant-0.5.4/debian/changelog
+++ wpasupplicant-0.5.4/debian/changelog
@@ -1,3 +1,11 @@
+wpasupplicant (0.5.4-5) unstable; urgency=low
+
+  * STDIN was not given to external mapping script correctly. Use the power of
+    eval to fix the issue. [wpa_action.sh]
+  * Fix stupid debian/control error: duplicate Suggests fields.
+
+ -- Kel Modderman <kelrin at tpg.com.au>  Thu, 10 Aug 2006 01:03:38 +1000
+
 wpasupplicant (0.5.4-4) unstable; urgency=low
 
   * Add support to wpa_action.sh and ifupdown.sh for allowing external mapping