Merge lp:~e7appew/ubuntu/wily/usb-modeswitch/yakkety-fix into lp:ubuntu/wily/usb-modeswitch

[Carlos Maddela]

Cherry-pick commit 10a62408 from Debian unstable to resolve incompatibility with systemd (>= 230-1~) (LP: #1639607).

[Robie Basak (racb)]

Looks like this has landed (according to bug 1639607) so marking this MP as Merged.

=== removed file '.pc/03_use_udev_specifics.patch/usb_modeswitch.sh'
--- .pc/03_use_udev_specifics.patch/usb_modeswitch.sh	2015-07-20 12:12:31 +0000
+++ .pc/03_use_udev_specifics.patch/usb_modeswitch.sh	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-#!/bin/sh
-# part of usb_modeswitch 2.2.5
-device_in()
-{
-	if [ ! -e /var/lib/usb_modeswitch/$1 ]; then
-		return 0
-	fi
-	while read line
-	do
-		if [ $(expr "$line" : "$2:$3") != 0 ]; then
-			return 1
-		fi
-	done </var/lib/usb_modeswitch/$1
-	if [ $(expr "$line" : "$2:$3") != 0 ]; then
-		return 1
-	fi
-	return 0
-}
-
-if [ $(expr "$1" : "--.*") ]; then
-	p_id=$4
-	if [ -z $p_id ]; then
-		prod=$5
-		if [ -z $prod ]; then
-			prod=$3
-		fi
-		prod=${prod%/*}
-		v_id=0x${prod%/*}
-		p_id=0x${prod#*/}
-		if [ "$v_id" = "0x" ]; then
-			v_id="0"
-			p_id="0"
-		fi
-		v_id="$(printf %04x $(($v_id)))"
-		p_id="$(printf %04x $(($p_id)))"
-	else
-		v_id=$3
-	fi
-fi
-PATH=/sbin:/usr/sbin:$PATH
-case "$1" in
-	--driver-bind)
-		(
-		dir=$(ls -d /sys$2/ttyUSB* 2>/dev/null)
-		sleep 1
-		if [ ! -z "$dir" ]; then
-			exit 0
-		fi
-		set +e
-		device_in "bind_list" $v_id $p_id
-		if [ "$?" = "1" ]; then
-			id_attr="/sys/bus/usb-serial/drivers/option1/new_id"
-			if [ ! -e "$id_attr" ]; then
-				modprobe option 2>/dev/null || true
-			fi
-			if [ -e "$id_attr" ]; then
-				echo "$v_id $p_id ff" > $id_attr
-			else
-				modprobe -r usbserial 2>/dev/null
-				modprobe usbserial "vendor=0x$v_id" "product=0x$p_id" 2>/dev/null
-			fi
-		fi
-		) &
-		exit 0
-		;;
-	--symlink-name)
-		device_in "link_list" $v_id $p_id
-		if [ "$?" = "1" ]; then
-			if [ -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
-				exec usb_modeswitch_dispatcher $1 $2 2>>/dev/null
-			fi
-		fi
-		exit 0
-		;;
-esac
-(
-IFS='/' read -r p1 p2 <<EOF
-$1
-EOF
-PATH=/bin:/sbin:/usr/bin:/usr/sbin
-count=20
-while [ $count != 0 ]; do
-	if [ ! -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
-		sleep 1
-		count=$(($count - 1))
-	else
-		if [ -e "/etc/systemd/system/usb_modeswitch@.service" ]; then
-			exec systemctl --no-block start usb_modeswitch@$p1'_'$p2.service
-		elif [ -e "/etc/init/usb-modeswitch-upstart.conf" ]; then
-			exec initctl emit --no-wait usb-modeswitch-upstart UMS_PARAM=$1
-		else
-			exec usb_modeswitch_dispatcher --switch-mode $1 &
-		fi
-		exit 0
-	fi
-done
-) &
-exit 0

=== modified file '.pc/05_upstart_systemd_runtime_detection.patch/usb_modeswitch.sh'
--- .pc/05_upstart_systemd_runtime_detection.patch/usb_modeswitch.sh	2015-07-20 12:12:31 +0000
+++ .pc/05_upstart_systemd_runtime_detection.patch/usb_modeswitch.sh	2016-11-06 19:41:38 +0000
@@ -66,9 +66,9 @@
 	--symlink-name)
 		device_in "link_list" $v_id $p_id
 		if [ "$?" = "1" ]; then
-			. /lib/udev/hotplug.functions
-			wait_for_file /usr/sbin/usb_modeswitch_dispatcher
-			exec usb_modeswitch_dispatcher $1 $2 2>>/dev/null
+			if [ -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
+				exec usb_modeswitch_dispatcher $1 $2 2>>/dev/null
+			fi
 		fi
 		exit 0
 		;;
@@ -78,8 +78,12 @@
 $1
 EOF
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
-		. /lib/udev/hotplug.functions
-		wait_for_file /usr/sbin/usb_modeswitch_dispatcher
+count=20
+while [ $count != 0 ]; do
+	if [ ! -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
+		sleep 1
+		count=$(($count - 1))
+	else
 		if [ -e "/etc/systemd/system/usb_modeswitch@.service" ]; then
 			exec systemctl --no-block start usb_modeswitch@$p1'_'$p2.service
 		elif [ -e "/etc/init/usb-modeswitch-upstart.conf" ]; then
@@ -88,5 +92,7 @@
 			exec usb_modeswitch_dispatcher --switch-mode $1 &
 		fi
 		exit 0
+	fi
+done
 ) &
 exit 0

=== modified file '.pc/06_set_TMPDIR_in_run.patch/usb_modeswitch.sh'
--- .pc/06_set_TMPDIR_in_run.patch/usb_modeswitch.sh	2015-07-20 12:12:31 +0000
+++ .pc/06_set_TMPDIR_in_run.patch/usb_modeswitch.sh	2016-11-06 19:41:38 +0000
@@ -66,9 +66,9 @@
 	--symlink-name)
 		device_in "link_list" $v_id $p_id
 		if [ "$?" = "1" ]; then
-			. /lib/udev/hotplug.functions
-			wait_for_file /usr/sbin/usb_modeswitch_dispatcher
-			exec usb_modeswitch_dispatcher $1 $2 2>>/dev/null
+			if [ -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
+				exec usb_modeswitch_dispatcher $1 $2 2>>/dev/null
+			fi
 		fi
 		exit 0
 		;;
@@ -78,15 +78,21 @@
 $1
 EOF
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
-		. /lib/udev/hotplug.functions
-		wait_for_file /usr/sbin/usb_modeswitch_dispatcher
+count=20
+while [ $count != 0 ]; do
+	if [ ! -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
+		sleep 1
+		count=$(($count - 1))
+	else
 		if [ -d "/run/systemd/system/" ]; then # Test if systemd is running
 			exec systemctl --no-block start usb_modeswitch@$p1'_'$p2.service
- 		elif [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then # Test if upstart is running
+		elif [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then # Test if upstart is running
 			exec initctl emit --no-wait usb-modeswitch-upstart UMS_PARAM=$1
 		else
 			exec usb_modeswitch_dispatcher --switch-mode $1 &
 		fi
 		exit 0
+	fi
+done
 ) &
 exit 0

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2015-10-02 16:52:27 +0000
+++ .pc/applied-patches	2016-11-06 19:41:38 +0000
@@ -1,4 +1,3 @@
-03_use_udev_specifics.patch
 04_use_system_libjim.patch
 05_upstart_systemd_runtime_detection.patch
 06_set_TMPDIR_in_run.patch

=== modified file '.pc/redirect_dispatcher_output.patch/usb_modeswitch.sh'
--- .pc/redirect_dispatcher_output.patch/usb_modeswitch.sh	2015-10-02 16:52:27 +0000
+++ .pc/redirect_dispatcher_output.patch/usb_modeswitch.sh	2016-11-06 19:41:38 +0000
@@ -66,9 +66,9 @@
 	--symlink-name)
 		device_in "link_list" $v_id $p_id
 		if [ "$?" = "1" ]; then
-			. /lib/udev/hotplug.functions
-			wait_for_file /usr/sbin/usb_modeswitch_dispatcher
-			exec usb_modeswitch_dispatcher $1 $2 2>>/dev/null
+			if [ -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
+				exec usb_modeswitch_dispatcher $1 $2 2>>/dev/null
+			fi
 		fi
 		exit 0
 		;;
@@ -78,16 +78,22 @@
 $1
 EOF
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
-		. /lib/udev/hotplug.functions
-		wait_for_file /usr/sbin/usb_modeswitch_dispatcher
+count=20
+while [ $count != 0 ]; do
+	if [ ! -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
+		sleep 1
+		count=$(($count - 1))
+	else
 		if [ -d "/run/systemd/system/" ]; then # Test if systemd is running
 			exec systemctl --no-block start usb_modeswitch@$p1'_'$p2.service
- 		elif [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then # Test if upstart is running
+		elif [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then # Test if upstart is running
 			exec initctl emit --no-wait usb-modeswitch-upstart UMS_PARAM=$1
 		else
 			export TMPDIR=/run
 			exec usb_modeswitch_dispatcher --switch-mode $1 &
 		fi
 		exit 0
+	fi
+done
 ) &
 exit 0

=== modified file '.pc/systemd_service_name.patch/usb_modeswitch.sh'
--- .pc/systemd_service_name.patch/usb_modeswitch.sh	2015-10-02 16:52:27 +0000
+++ .pc/systemd_service_name.patch/usb_modeswitch.sh	2016-11-06 19:41:38 +0000
@@ -66,9 +66,9 @@
 	--symlink-name)
 		device_in "link_list" $v_id $p_id
 		if [ "$?" = "1" ]; then
-			. /lib/udev/hotplug.functions
-			wait_for_file /usr/sbin/usb_modeswitch_dispatcher
-			exec usb_modeswitch_dispatcher $1 $2 >>/dev/null 2>&1
+			if [ -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
+				exec usb_modeswitch_dispatcher $1 $2 >>/dev/null 2>&1
+			fi
 		fi
 		exit 0
 		;;
@@ -78,16 +78,22 @@
 $1
 EOF
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
-		. /lib/udev/hotplug.functions
-		wait_for_file /usr/sbin/usb_modeswitch_dispatcher
+count=20
+while [ $count != 0 ]; do
+	if [ ! -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
+		sleep 1
+		count=$(($count - 1))
+	else
 		if [ -d "/run/systemd/system/" ]; then # Test if systemd is running
 			exec systemctl --no-block start usb_modeswitch@$p1'_'$p2.service
- 		elif [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then # Test if upstart is running
+		elif [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then # Test if upstart is running
 			exec initctl emit --no-wait usb-modeswitch-upstart UMS_PARAM=$1
 		else
 			export TMPDIR=/run
 			exec usb_modeswitch_dispatcher --switch-mode $1 >>/dev/null 2>&1 &
 		fi
 		exit 0
+	fi
+done
 ) &
 exit 0

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-02 16:52:27 +0000
+++ debian/changelog	2016-11-06 19:41:38 +0000
@@ -1,3 +1,11 @@
+usb-modeswitch (2.2.5+repack0-1ubuntu2) yakkety; urgency=high
+
+  * Cherry-pick commit 10a62408 from Debian unstable to resolve
+    incompatibility with systemd (>= 230-1~) (LP: #1639607).
+  * Refresh and apply all patches.
+
+ -- Carlos Maddela <[e-mail]>  Mon, 07 Nov 2016 05:19:05 +1100
+
 usb-modeswitch (2.2.5+repack0-1ubuntu1) wily; urgency=medium
 
   * Merge from Debian unstable, remaining changes: (LP: #1498805)

=== removed file 'debian/patches/03_use_udev_specifics.patch'
--- debian/patches/03_use_udev_specifics.patch	2015-10-02 16:52:27 +0000
+++ debian/patches/03_use_udev_specifics.patch	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-Description: Use udev-in-Debian specific tools for the waiting script
- This is inspired from alsa-utils'
-Author: Didier Raboud <[e-mail]>
-Origin: vendor
-Last-Update: 2013-09-17
---- a/usb_modeswitch.sh
-+++ b/usb_modeswitch.sh
-@@ -66,9 +66,9 @@
- 	--symlink-name)
- 		device_in "link_list" $v_id $p_id
- 		if [ "$?" = "1" ]; then
--			if [ -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
--				exec usb_modeswitch_dispatcher $1 $2 2>>/dev/null
--			fi
-+			. /lib/udev/hotplug.functions
-+			wait_for_file /usr/sbin/usb_modeswitch_dispatcher
-+			exec usb_modeswitch_dispatcher $1 $2 2>>/dev/null
- 		fi
- 		exit 0
- 		;;
-@@ -78,12 +78,8 @@
- $1
- EOF
- PATH=/bin:/sbin:/usr/bin:/usr/sbin
--count=20
--while [ $count != 0 ]; do
--	if [ ! -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
--		sleep 1
--		count=$(($count - 1))
--	else
-+		. /lib/udev/hotplug.functions
-+		wait_for_file /usr/sbin/usb_modeswitch_dispatcher
- 		if [ -e "/etc/systemd/system/usb_modeswitch@.service" ]; then
- 			exec systemctl --no-block start usb_modeswitch@$p1'_'$p2.service
- 		elif [ -e "/etc/init/usb-modeswitch-upstart.conf" ]; then
-@@ -92,7 +88,5 @@
- 			exec usb_modeswitch_dispatcher --switch-mode $1 &
- 		fi
- 		exit 0
--	fi
--done
- ) &
- exit 0

=== modified file 'debian/patches/05_upstart_systemd_runtime_detection.patch'
--- debian/patches/05_upstart_systemd_runtime_detection.patch	2015-07-20 12:12:31 +0000
+++ debian/patches/05_upstart_systemd_runtime_detection.patch	2016-11-06 19:41:38 +0000
@@ -3,18 +3,18 @@
 Author: Didier Raboud <[e-mail]>
 Origin: vendor
 Bug-Debian: http://bugs.debian.org/725394
-Last-Update: 2013-10-07
+Last-Update: 2016-01-13
 --- a/usb_modeswitch.sh
 +++ b/usb_modeswitch.sh
-@@ -80,9 +80,9 @@
- PATH=/bin:/sbin:/usr/bin:/usr/sbin
- 		. /lib/udev/hotplug.functions
- 		wait_for_file /usr/sbin/usb_modeswitch_dispatcher
+@@ -84,9 +84,9 @@
+ 		sleep 1
+ 		count=$(($count - 1))
+ 	else
 -		if [ -e "/etc/systemd/system/usb_modeswitch@.service" ]; then
 +		if [ -d "/run/systemd/system/" ]; then # Test if systemd is running
  			exec systemctl --no-block start usb_modeswitch@$p1'_'$p2.service
 -		elif [ -e "/etc/init/usb-modeswitch-upstart.conf" ]; then
-+ 		elif [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then # Test if upstart is running
++		elif [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then # Test if upstart is running
  			exec initctl emit --no-wait usb-modeswitch-upstart UMS_PARAM=$1
  		else
  			exec usb_modeswitch_dispatcher --switch-mode $1 &

=== modified file 'debian/patches/06_set_TMPDIR_in_run.patch'
--- debian/patches/06_set_TMPDIR_in_run.patch	2015-07-20 12:12:31 +0000
+++ debian/patches/06_set_TMPDIR_in_run.patch	2016-11-06 19:41:38 +0000
@@ -9,8 +9,8 @@
  end script
 --- a/usb_modeswitch.sh
 +++ b/usb_modeswitch.sh
-@@ -85,6 +85,7 @@
-  		elif [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then # Test if upstart is running
+@@ -89,6 +89,7 @@
+ 		elif [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then # Test if upstart is running
  			exec initctl emit --no-wait usb-modeswitch-upstart UMS_PARAM=$1
  		else
 +			export TMPDIR=/run

=== modified file 'debian/patches/redirect_dispatcher_output.patch'
--- debian/patches/redirect_dispatcher_output.patch	2015-10-02 16:52:27 +0000
+++ debian/patches/redirect_dispatcher_output.patch	2016-11-06 19:41:38 +0000
@@ -8,20 +8,18 @@
  usb_modeswitch.sh |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: b/usb_modeswitch.sh
-===================================================================
 --- a/usb_modeswitch.sh
 +++ b/usb_modeswitch.sh
-@@ -68,7 +68,7 @@ case "$1" in
+@@ -67,7 +67,7 @@ case "$1" in
+ 		device_in "link_list" $v_id $p_id
  		if [ "$?" = "1" ]; then
- 			. /lib/udev/hotplug.functions
- 			wait_for_file /usr/sbin/usb_modeswitch_dispatcher
--			exec usb_modeswitch_dispatcher $1 $2 2>>/dev/null
-+			exec usb_modeswitch_dispatcher $1 $2 >>/dev/null 2>&1
+ 			if [ -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
+-				exec usb_modeswitch_dispatcher $1 $2 2>>/dev/null
++				exec usb_modeswitch_dispatcher $1 $2 >>/dev/null 2>&1
+ 			fi
  		fi
  		exit 0
- 		;;
-@@ -87,7 +87,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin
+@@ -90,7 +90,7 @@ while [ $count != 0 ]; do
  			exec initctl emit --no-wait usb-modeswitch-upstart UMS_PARAM=$1
  		else
  			export TMPDIR=/run
@@ -29,4 +27,4 @@
 +			exec usb_modeswitch_dispatcher --switch-mode $1 >>/dev/null 2>&1 &
  		fi
  		exit 0
- ) &
+ 	fi

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-10-02 16:52:27 +0000
+++ debian/patches/series	2016-11-06 19:41:38 +0000
@@ -1,4 +1,3 @@
-03_use_udev_specifics.patch
 04_use_system_libjim.patch
 05_upstart_systemd_runtime_detection.patch
 06_set_TMPDIR_in_run.patch

=== modified file 'debian/patches/systemd_service_name.patch'
--- debian/patches/systemd_service_name.patch	2015-10-02 16:52:27 +0000
+++ debian/patches/systemd_service_name.patch	2016-11-06 19:41:38 +0000
@@ -8,16 +8,14 @@
  usb_modeswitch.sh |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: b/usb_modeswitch.sh
-===================================================================
 --- a/usb_modeswitch.sh
 +++ b/usb_modeswitch.sh
-@@ -81,7 +81,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin
- 		. /lib/udev/hotplug.functions
- 		wait_for_file /usr/sbin/usb_modeswitch_dispatcher
+@@ -85,7 +85,7 @@ while [ $count != 0 ]; do
+ 		count=$(($count - 1))
+ 	else
  		if [ -d "/run/systemd/system/" ]; then # Test if systemd is running
 -			exec systemctl --no-block start usb_modeswitch@$p1'_'$p2.service
 +			exec systemctl --no-block start usb_modeswitch@${p1:+${p1}_}$p2.service
-  		elif [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then # Test if upstart is running
+ 		elif [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then # Test if upstart is running
  			exec initctl emit --no-wait usb-modeswitch-upstart UMS_PARAM=$1
  		else

=== modified file 'usb_modeswitch.sh'
--- usb_modeswitch.sh	2015-10-02 16:52:27 +0000
+++ usb_modeswitch.sh	2016-11-06 19:41:38 +0000
@@ -66,9 +66,9 @@
 	--symlink-name)
 		device_in "link_list" $v_id $p_id
 		if [ "$?" = "1" ]; then
-			. /lib/udev/hotplug.functions
-			wait_for_file /usr/sbin/usb_modeswitch_dispatcher
-			exec usb_modeswitch_dispatcher $1 $2 >>/dev/null 2>&1
+			if [ -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
+				exec usb_modeswitch_dispatcher $1 $2 >>/dev/null 2>&1
+			fi
 		fi
 		exit 0
 		;;
@@ -78,16 +78,22 @@
 $1
 EOF
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
-		. /lib/udev/hotplug.functions
-		wait_for_file /usr/sbin/usb_modeswitch_dispatcher
+count=20
+while [ $count != 0 ]; do
+	if [ ! -e "/usr/sbin/usb_modeswitch_dispatcher" ]; then
+		sleep 1
+		count=$(($count - 1))
+	else
 		if [ -d "/run/systemd/system/" ]; then # Test if systemd is running
 			exec systemctl --no-block start usb_modeswitch@${p1:+${p1}_}$p2.service
- 		elif [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then # Test if upstart is running
+		elif [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then # Test if upstart is running
 			exec initctl emit --no-wait usb-modeswitch-upstart UMS_PARAM=$1
 		else
 			export TMPDIR=/run
 			exec usb_modeswitch_dispatcher --switch-mode $1 >>/dev/null 2>&1 &
 		fi
 		exit 0
+	fi
+done
 ) &
 exit 0