Update www-apps/nabaztaglives-2.2.2

3 files changed, 291 insertions, 2 deletions

diff --git a/www-apps/nabaztaglives/Manifest b/www-apps/nabaztaglives/Manifest
index 091d0647..d0a82e84 100644
--- a/www-apps/nabaztaglives/Manifest
+++ b/www-apps/nabaztaglives/Manifest
@@ -3,6 +3,7 @@ AUX nabaztaglives-2.00.patch 20490 SHA256 687d25d6dbf30f52ee06c646fbbbe576b36a12
 AUX nabaztaglives-2.01-api.patch 9011 SHA256 a6f677f7819018fb57251b1249874c43654097faf2ba5c4b717e29eb84bce2e9 SHA512 b438464343331201ede935b83b6fb4c6d646195fbcbbfefcbb41f912a6db1c0af2a31e0698160db3a13e33cb0ca85ffc4d154c595369735df83ec22e7257cbdc WHIRLPOOL 033d86f9badd68fb557f0aa2070162878bd7007b5d8df774698cc5adbeab6d3488ed5264de58f0652baafd65ae654d594892efcdea1841f4b4573da52354adf9
 AUX nabaztaglives-2.1-lang-ja.patch 559 SHA256 4379e6ce878d0d700ef7727006e5af6f2d915e1ade4109d71e6b25e167dfff81 SHA512 1c38674dfd9b09b1f6f2af9f5a8958ccdff2c6ccbec02e9ecd36505299c3587428ae11a3fb6664212595e03c2df86577ca123f241f570c3bfab3404dd366b354 WHIRLPOOL 60c07415dcb2c4cb6be5bc9b5aa02497387e495a9e5717a050d1805a024ab3c77e47e20470212886250903116e68ca3c58fb341334e6271e8202966c3fec6c76
 AUX nabaztaglives-2.1.2-api.patch 9012 SHA256 b34e882c503244d5d55f14f66947183acd6abf446663465845b70d15ad32e0e1 SHA512 1e7bdf4bb661c7a8051c7d447d507969abf31770e004f7dde4330dd113cb116e77c9911514b13b76c25b8e36d1ba4485b70b2a61768baf6b9556dad5381a1c6d WHIRLPOOL 663a361a42bb7412aa923a6d66299f3452501bd72096e338f1722facce0446769ce3d1ca8e863e1a3d064ab0633b568e36b400d8e462188e26e41dba9e7f4b90
+AUX nabaztaglives-2.2.2-api.patch 8956 SHA256 31f277496ec5d978b0677052b29beb73ccde0f3121ee9e6961e0b5079217db9f SHA512 efeb6676164905d8f5faa9eacfa479e75a226d49647e1e4f98eb0408e649a8f074e53cedaf8789c8763d3f97fbcc84d8a1ac463a0dc0f551df8bc0db8bd815eb WHIRLPOOL d91118675013280a43a86fe3b0ee7567506d1c1ccee393edd77dd0fab8598b00548c8e5e317fdde0495d0e024930b5668d505fe6de213d4cb9633652bfb531eb
 AUX postinstall-en-2.00.txt 300 SHA256 c54ee8192d3aed8a0f90dc5f9805e42e237e1d479ef3bce2679e6d3dff383af5 SHA512 ac3e056e697f6f29a2cb88e0d34aab33c4968c98f08099f71dc80700004883eab6f89dbf7dc168ea18bfcd89b8108b2474af591a40800f6cc5ad20783d713da2 WHIRLPOOL 828a8d8f4aae4ad2fcc9e13148ce73d0f163b35ec5363e090358957fbb1a9da2e53c87164b6aca55bb186905b8407f227804cf37040f764dbbc6aa94da3dca52
 DIST nabaztaglives-code-258dd0c4c32207863fb4657a453d507876ca2c5a.zip 32143186 SHA256 f299562289bade6779539f929413cec8f30205cd4a133f4bfd964a6cadb938fb SHA512 5ae0d1fdb6b82eb9a0c22b7a9986ddf4e28cab9571f0ba652d52de499e4003a2eba7220d0e91f3d9fc009a8809ea4257eb12d5d66fc3fab1b6edced67a28d032 WHIRLPOOL 50daf7acac1444f7960830bdf348b8a64cb6efd124882332bfaae42d4f45c515351dc3d303283bd32f10aad9d0eb19013df4c6962571c636df2ee8618c34285c
 DIST nabaztaglives-code-5577e0e24dcf95179d078ddc04753a83b1e43b0a.zip 31649978 SHA256 72ae80194e5522fce4732302d41a580262947fdc55dcc52bcfa2d7f5b6de10a8 SHA512 9b3ba8bb8af32a48529af796fca25a70cb607413a32a877e33a157829dcb5540f8b9e47de4d8725f6bd4ad6af9661503aef8d45661cfe7b675d72999ce269f8b WHIRLPOOL 195c3de2dc7c55ea005bc03f5b66a1d258b69dbccb3911e27c3487128588e998e55d5dadfaac72fd8e0b2911c518aa23a65ffd387000b0c359a5706d12eb15f6
@@ -19,4 +20,4 @@ EBUILD nabaztaglives-2.1.2.ebuild 3639 SHA256 66776d98c1f7f80017913ef07360caf58a
 EBUILD nabaztaglives-2.1.7.ebuild 3928 SHA256 a5fb246f4b5397bcfb725ddbd7fccb4334300e3734439e488090f4a5b4bdfe8c SHA512 18939a1d6be5bc68fdf90f8db6342e5c2641b137161b42fa0ab6765c7374ff659aa5584740d449dcb01711263039d60f1aa93280748ce0383977cc44ba507c05 WHIRLPOOL a83a0ad0a6bb1bf14df8ac960f491c7aea2c2fbe95e3c177c608d49303ab8c727daf4de9a2e0ed677bf37fbf1ab6c929afc614baa075e5606f3c055314d9acba
 EBUILD nabaztaglives-2.2.0.ebuild 4521 SHA256 63bbfc904c33277e2810af446c30058c3c73f12507af5821766a43fd401df18a SHA512 4f4994799183a600784f889b1e7da709ad0f1854babbebb67b863adec330a9214d3312e4c9252ab015c13673e82c827e1cc8247d8e2bdafccb99364bd1e9e6a7 WHIRLPOOL 0858948d949378deb9347bd5b0076e821a284d1908caa44864a7bd38fef906c35c0f06587799d6364a21d17992aa774b0e487f39af4cf46aff947df0d041ba72
 EBUILD nabaztaglives-2.2.1.ebuild 4521 SHA256 e9d3ff36508a2d8982fcfac1e6eb4fa60a60c422e16baed4f67c97b451df0aec SHA512 6cca73b7621d943726b0d8968e0b45524d37f9a6dc4d3741470d0a43e35c0a929bb3a3180bd9faceb4dc016e06ed22bd2fd7848802549fe67ecc2582b2209131 WHIRLPOOL ac6282845e34dfd770999f1e93f7fb47ffec7d7d9fe2596a0a275f7859351088629ad97f0596e0794a003b0144e6bc796b9721c3df7e77ac726223c0c718c434
-EBUILD nabaztaglives-2.2.2.ebuild 4521 SHA256 7916474ea5c15932a39a3caabee29f4c12d64a78d7e1661a5bdc12a2d7ff0a99 SHA512 3275c84be202fba7b2bfc1bb8bc437113ffc1dbea4d9163d1df7b819e438be9295e118d5d336b7d9b0e8badcf8ec4e3926eab5c4eb02e4f2587ae2da6c4dc104 WHIRLPOOL ae95d3ea5d9486835d660dd09dfd3173a43b43ff8165267de69584d2ee660e5b6467956239e55dece58080a82c62ddd5e5528526741527174629e420b63008bb
+EBUILD nabaztaglives-2.2.2.ebuild 4521 SHA256 7a1a69f9466f878d452b1509f8144290912e776307de1ac78e7a1f2f8a18c0b6 SHA512 19a653628f313ad9a639d6b5af2119858fa510cc21e8bf531e5442dff629dbf67fb7ed2b1a6184225fdce7327bc026798a458c48d70cd1ee4e8670a2877774a4 WHIRLPOOL 9001b5fc0932e463fc4b12098e61b7677e3fcec17ff18cfd62a678a03a315dff5610c4aa9ce5732fcfb15c7952bfbf82f26b4719cab8a1c1dbd4fe176f9a1581
diff --git a/www-apps/nabaztaglives/files/nabaztaglives-2.2.2-api.patch b/www-apps/nabaztaglives/files/nabaztaglives-2.2.2-api.patch
new file mode 100644
index 00000000..5424748e
--- /dev/null
+++ b/www-apps/nabaztaglives/files/nabaztaglives-2.2.2-api.patch
@@ -0,0 +1,288 @@
+--- www/api.php.dist	2017-08-01 07:18:06.331127221 +0100
++++ www/api.php	2017-08-01 07:20:24.698727371 +0100
+@@ -29,7 +29,9 @@ You should have received a copy of the G
+ along with NabaztagLives.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ //error_reporting(E_ALL);  //don't use this in production
+-ini_set('display_errors', 0);
++//ini_set('display_errors', 0);
++error_reporting(E_ALL);  //don't use this in production
++ini_set('display_errors', 1);
+ ini_set('log_errors', 1);
+ ini_set('error_log','./logs/error.log');
+ //error_reporting(0);  //don't use this, use ini_set or nothing goes to the log
+@@ -65,7 +67,8 @@ if(isset($_GET['led3'])) $led3 = $_GET['
+ if(isset($_GET['led4'])) $led4 = $_GET['led4'];
+ if(isset($_GET['led0'])) $led0 = $_GET['led0'];
+ 
+-$debug=false;
++//$debug=false;
++$debug=true;
+ 
+ if(strlen($sn) == 0)
+ {
+@@ -112,7 +115,7 @@ include '/var/etc/nabaztag_db.php';
+ $con = mysqli_connect($host,$user,$pass,$db);
+ if (!$con) 
+ {
+-	logError('Api.php: Could not connect: ' . mysqli_connect_errno() . mysqli_connect_error());
++	logError('api.php: Could not connect: ' . mysqli_connect_errno() . mysqli_connect_error());
+ 	echo 'The operation failed.  The head rabbit has been placed on notice.';
+ 	return;
+ }
+@@ -132,7 +135,7 @@ if($debug) echo $cmd . '<p>';
+ $result = mysqli_query($con,$cmd);
+ if (!$result) 
+ {
+-	logError('Api.php: Invalid log connect call. ' . mysqli_error($con));
++	logError('api.php: Invalid log connect call. ' . mysqli_error($con));
+ 	echo 'The operation failed.  The head rabbit has been placed on notice.';
+ 	return;
+ }
+@@ -140,7 +143,7 @@ if (!$result)
+ $result = mysqli_query($con,"select @rabbitID");
+ if (!$result) 
+ {
+-	logError('Api.php: Invalid log query. ' . mysqli_error($con));
++	logError('api.php: Invalid log query. ' . mysqli_error($con));
+ 	echo 'The operation failed.  The head rabbit has been placed on notice.';
+ 	return;
+ }
+@@ -156,7 +159,8 @@ if($rabbitID < 1)  //rows found in DB
+ 	return;
+ }
+ 
+-mysqli_next_result($con);  //required to avoid sync error
++//mysqli_next_result($con);  //required to avoid sync error
++while(mysqli_next_result($con));
+ 
+ /*************************************
+  * get rabbit
+@@ -166,7 +170,7 @@ if($debug) echo $cmd . '<p>';
+ $result = mysqli_query($con,$cmd);
+ if (!$result) 
+ {
+-	logError('Api.php: Invalid getRabbit query. ' . mysqli_error($con));
++	logError('api.php: Invalid getRabbit query. ' . mysqli_error($con));
+ 	echo 'The operation failed.  The head rabbit has been placed on notice.';
+ 	return;
+ }
+@@ -195,7 +199,8 @@ while($row = mysqli_fetch_row($result))
+ 
+ }
+ 
+-mysqli_next_result($con);  //required to avoid sync error
++//mysqli_next_result($con);  //required to avoid sync error
++while(mysqli_next_result($con));
+ 
+ $min  = date("i"); //minute 00-59
+ $sec  = date("s"); //secs 00-59
+@@ -215,10 +220,11 @@ $cmd = "delete from queue "
+ $result = mysqli_query($con,$cmd);
+ if (!$result) 
+ {
+-	logError('Api.php: Invalid delete queue query: ' . mysqli_error($con));
++	logError('api.php: Invalid delete queue query: ' . mysqli_error($con));
+ }
+ 
+-mysqli_next_result($con);  //required to avoid sync error
++//mysqli_next_result($con);  //required to avoid sync error
++while(mysqli_next_result($con));
+ 
+ //need to check here to make sure there is not already a msg in the queue from multiple attempts
+ 
+@@ -246,7 +252,8 @@ if($count > 0)
+ 	exit(0);
+ }
+ 	
+-mysqli_next_result($con);  //required to avoid sync error
++//mysqli_next_result($con);  //required to avoid sync error
++while(mysqli_next_result($con));
+ 
+ /**************************************************************
+  * LED color for V2
+@@ -473,25 +480,26 @@ return;
+ function queueV1($msg,$rabbitID,$min,$con)
+ {
+ 	if(strlen($msg) < 1) return;
+-	
+-	mysqli_next_result($con);  //required to avoid sync error
+-	
+-	$cmd = "call sp_Queue2('" . $rabbitID . "'
+-			              ,'" . $min . "'
+-						  ,'" . $msg . "'
+-						  ,@msg
+-						  )";
++
++	logError("DEBUG: api.php:queueV1 started with msg '" . $msg . "'");
++
++	//mysqli_next_result($con);  //required to avoid sync error
++	while(mysqli_next_result($con));
++
++	$cmd = "call sp_Queue2('" . $rabbitID . "', '" . $min . "', '" . $msg . "', @msg)";
+                              
+-  	$result = queryWithRetry($con,$cmd,$rabbitID,"api.php queue function.");
+-	
++	$result = queryWithRetry($con,$cmd,$rabbitID,"api.php queue function.");
++
+ 	if (!$result) 
+ 	{
+-	  	logError("Api.php: Queue query failed. " . mysqli_error($con));
+-		mysqli_next_result($con);  //required to avoid sync error
++		logError("api.php: Queue query failed: " . mysqli_error($con));
++		//mysqli_next_result($con);  //required to avoid sync error
++		while(mysqli_next_result($con));
+ 		return;
+ 	}
+-	
+-	mysqli_next_result($con);  //required to avoid sync error
++
++	//mysqli_next_result($con);  //required to avoid sync error
++	while(mysqli_next_result($con));
+ 
+ 	$result = mysqli_query($con,"select @msg");
+ 
+@@ -499,10 +507,10 @@ function queueV1($msg,$rabbitID,$min,$co
+ 		$msg = $row[0];
+ 
+ 	if($msg != 'OK')
+-		logError("Api.php: Queue function: $msg");
+-	
+-	mysqli_next_result($con);  //required to avoid sync error
+-	
++		logError("api.php: Queue function: $msg");
++
++	//mysqli_next_result($con);  //required to avoid sync error
++	while(mysqli_next_result($con));
+ }
+ 
+ /*****************************************************************
+@@ -536,11 +544,13 @@ function queueCmd($serNbr,$min,$msg,$con
+ 	if (!$result) 
+ 	{
+ 		logError('API.php: Queue function invalid insert after retry: ' . mysqli_error($con));
+-		mysqli_next_result($con);  //required to avoid sync error
++		//mysqli_next_result($con);  //required to avoid sync error
++		while(mysqli_next_result($con));
+ 		return;
+ 	}
+ 	
+-	mysqli_next_result($con);  //required to avoid sync error
++	//mysqli_next_result($con);  //required to avoid sync error
++	while(mysqli_next_result($con));
+ 
+ 	$result = mysqli_query($con,"select @msg");
+ 
+@@ -554,7 +564,8 @@ function queueCmd($serNbr,$min,$msg,$con
+ 		logError($msg);
+ 	}
+ 	
+-	mysqli_next_result($con);  //required to avoid sync error
++	//mysqli_next_result($con);  //required to avoid sync error
++	while(mysqli_next_result($con));
+ 
+ }
+ 
+@@ -568,41 +579,41 @@ function queue($serNbr,$min,$tts,$con,$l
+ 		echo "You need to enter some text to send to the rabbit. $back";
+ 		return;
+ 	}
+-	
++
++	logError("DEBUG: api.php:queue started for serial '" . $serNbr . "', text '" . $tts . "'");
++
+ 	$tts = mysqli_real_escape_string($con, $tts);
+ 
+ 	$lang = getLanguage($lang);
+-	
++
+ 	doTTS3($tts,$lang,$serNbr);
+-		
++
+ 	$hutch = "./hutch/$serNbr";
+-    $msg="PLAY $hutch/rss.mp3";
++	$msg="PLAY $hutch/rss.mp3";
+ 
+-	$cmd = "call sp_Queue('" . $serNbr . "'
+-											 ,'" . $min . "'
+-											 ,'" . $msg . "'
+-											 ,@msg
+-											 )";
++	$cmd = "call sp_Queue('" . $serNbr . "', '" . $min . "', '" . $msg . "', @msg)";
+                                             
+ 	$result = mysqli_query($con,$cmd);
+-	
++
+ 	//retry transaction
+-	if(!$result)
++	if (!$result)
+ 	{
+-	usleep(1000000); //1 sec
+-	//usleep(100000);  //100 ms
+-	
+-	$result = mysqli_query($con,$cmd);
++		usleep(1000000); //1 sec
++		//usleep(100000);  //100 ms
++
++		$result = mysqli_query($con,$cmd);
+ 	}
+-	
++
+ 	if (!$result) 
+ 	{
+-		logError('API.php Queue function invalid insert after retry: ' . mysqli_error($con));
+-		mysqli_next_result($con);  //required to avoid sync error
++		logError('api.php Queue function invalid insert after retry: ' . mysqli_error($con));
++		//mysqli_next_result($con);  //required to avoid sync error
++		while(mysqli_next_result($con));
+ 		return;
+ 	}
+-	
+-	mysqli_next_result($con);  //required to avoid sync error
++
++	//mysqli_next_result($con);  //required to avoid sync error
++	while(mysqli_next_result($con));
+ 
+ 	$result = mysqli_query($con,"select @msg");
+ 
+@@ -615,9 +626,9 @@ function queue($serNbr,$min,$tts,$con,$l
+ 	{
+ 		logError($msg);
+ 	}
+-	
+-	mysqli_next_result($con);  //required to avoid sync error
+ 
++	//mysqli_next_result($con);  //required to avoid sync error
++	while(mysqli_next_result($con));
+ }
+ 
+ /***********************************************************
+@@ -636,11 +647,13 @@ function outV1($out,$rabbitID,$min,$con)
+ 	if (!$result) 
+ 	{
+ 		logError('Out function invalid update last Command query: ' . mysqli_error($con));
+-		mysqli_next_result($con);  //required to avoid sync error
++		//mysqli_next_result($con);  //required to avoid sync error
++		while(mysqli_next_result($con));
+ 		return;
+ 	}
+ 	
+-	mysqli_next_result($con);  //required to avoid sync error
++	//mysqli_next_result($con);  //required to avoid sync error
++	while(mysqli_next_result($con));
+ 
+ 	$result = mysqli_query($con,"select @msg");
+ 
+@@ -650,8 +663,9 @@ function outV1($out,$rabbitID,$min,$con)
+ 	if($msg != 'OK')
+ 		logError($msg);
+ 	
+-	mysqli_next_result($con);  //required to avoid sync error
++	//mysqli_next_result($con);  //required to avoid sync error
++	while(mysqli_next_result($con));
+ }
+ 
+ ?>
+-</html>
+\ No newline at end of file
++</html>
diff --git a/www-apps/nabaztaglives/nabaztaglives-2.2.2.ebuild b/www-apps/nabaztaglives/nabaztaglives-2.2.2.ebuild
index a336be9f..a32f0a7a 100644
--- a/www-apps/nabaztaglives/nabaztaglives-2.2.2.ebuild
+++ b/www-apps/nabaztaglives/nabaztaglives-2.2.2.ebuild
@@ -119,7 +119,7 @@ src_prepare() {
 	mv www/*.jpg www/images/
 	mv db/rabbit_pi.sql db/initial.sql
 
-	epatch "${FILESDIR}/${PN}-2.1.2-api.patch" || die "Patch failed"
+	epatch "${FILESDIR}/${PN}-2.2.2-api.patch" || die "Patch failed"
 	epatch "${FILESDIR}/${PN}-2.00.patch" || die "Patch failed"
 
 	sed -si \