[pkg-wpa-devel] r1228 - in /wpasupplicant/trunk/debian: changelog ifupdown/functions.sh ifupdown/ifupdown.sh

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Mon Jul 28 07:35:46 2008
New Revision: 1228

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1228
Log:
* Retroactively cleanse past changelog entries of information indicating
  that they were not released, as they were.
* Use short option for grep (-q) and sed (-n) instead of the busybox
  incompatible --quiet as per advice of Charles-Henri Gros.
* New upstream git snapshot.

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/ifupdown/functions.sh
    wpasupplicant/trunk/debian/ifupdown/ifupdown.sh

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1228&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Mon Jul 28 07:35:46 2008
@@ -1,7 +1,16 @@
+wpasupplicant (0.6.4~git20080716.93ef879-2) unstable; urgency=low
+
+  * Retroactively cleanse past changelog entries of information indicating
+    that they were not released, as they were.
+  * Use short option for grep (-q) and sed (-n) instead of the busybox
+    incompatible --quiet as per advice of Charles-Henri Gros.
+
+ -- Kel Modderman <kel at otaku42.de>  Mon, 28 Jul 2008 17:33:06 +1000
+
 wpasupplicant (0.6.4~git20080716.93ef879-1) unstable; urgency=low
 
   [ Kel Modderman ]
-  * (NOT RELEASED YET) New upstream git snapshot.
+  * New upstream git snapshot.
   * Drop patches applied upstream:
     - 10_silence_siocsiwauth_icotl_failure.patch
     - 11_avoid_dbus_version_namespace.patch

Modified: wpasupplicant/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/functions.sh?rev=1228&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Mon Jul 28 07:35:46 2008
@@ -986,7 +986,7 @@
 		
 		local WPA_MAP_STDIN
 		
-		WPA_MAP_STDIN=$(set | sed --quiet 's/^\(IF_WPA_MAP[0-9]*\)=.*/echo \$\1/p')
+		WPA_MAP_STDIN=$(set | sed -n '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" "$WPA_IFACE")
@@ -1012,13 +1012,13 @@
 	fi
 
 	if [ -n "$WPA_LOGICAL_IFACE" ]; then
-		if egrep --quiet "^iface[[:space:]]+${WPA_LOGICAL_IFACE}[[:space:]]+inet" "$INTERFACES_FILE"; then
+		if egrep -q "^iface[[:space:]]+${WPA_LOGICAL_IFACE}[[:space:]]+inet" "$INTERFACES_FILE"; then
 			
 			echo "ifup $WPA_IFACE=$WPA_LOGICAL_IFACE"
 
 			ifupdown_lock
 			
-			if grep --quiet "^$WPA_IFACE=$WPA_IFACE" "$IFSTATE_FILE"; then
+			if grep -q "^$WPA_IFACE=$WPA_IFACE" "$IFSTATE_FILE"; then
 				# Force settings over the unconfigured "master" IFACE
 				/sbin/ifup -v --force "$WPA_IFACE=$WPA_LOGICAL_IFACE"
 			else
@@ -1039,7 +1039,7 @@
 # Check IFACE state and ifdown as requested.
 #
 ifdown () {
-	if grep --quiet "^$WPA_IFACE" "$IFSTATE_FILE"; then
+	if grep -q "^$WPA_IFACE" "$IFSTATE_FILE"; then
 		ifupdown_lock
 
 		echo "ifdown $WPA_IFACE"

Modified: wpasupplicant/trunk/debian/ifupdown/ifupdown.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/ifupdown.sh?rev=1228&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/ifupdown.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/ifupdown.sh Mon Jul 28 07:35:46 2008
@@ -68,7 +68,7 @@
 			wpa_msg stderr "execute \`ifdown --force $WPA_IFACE' to stop wpa_action"
 		fi
 		exit 1
-	elif ! set | grep --quiet "^IF_WPA"; then
+	elif ! set | grep -q "^IF_WPA"; then
 		# no wpa- option defined for IFACE, do nothing
 		exit 0
 	fi
@@ -102,7 +102,7 @@
 			wpa_msg stderr "cannot read contents of $IF_WPA_CONF"
 			exit 1
 		fi	
-		WPA_SUP_CONF_CTRL_DIR=$(sed --quiet -e 's/[[:space:]]*#.*//g' -e 's/[[:space:]]\+.*$//g' \
+		WPA_SUP_CONF_CTRL_DIR=$(sed -n -e 's/[[:space:]]*#.*//g' -e 's/[[:space:]]\+.*$//g' \
 			-e 's/^ctrl_interface=\(DIR=\)\?\(.*\)/\2/p' "$IF_WPA_CONF")
 		if [ -n "$WPA_SUP_CONF_CTRL_DIR" ]; then
 			WPA_CTRL_DIR="$WPA_SUP_CONF_CTRL_DIR"