# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1412268918 -7200
# Node ID 40e999c964eaaf1ceb334bdbe31192c89fe0dbba
# Parent  54f6cfa51542d7a47f430c1e17c0f9afa49fa4c2
bash: CVE-2014-7169 fix

diff -r 54f6cfa51542 -r 40e999c964ea adminer/receipt
--- a/adminer/receipt	Thu Oct 02 12:48:18 2014 +0200
+++ b/adminer/receipt	Thu Oct 02 18:55:18 2014 +0200
@@ -17,7 +17,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	php compile.php
+	php compile.php 2>&1 | sed '/^PHP Warning/d'
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 54f6cfa51542 -r 40e999c964ea bash/receipt
--- a/bash/receipt	Thu Oct 02 12:48:18 2014 +0200
+++ b/bash/receipt	Thu Oct 02 18:55:18 2014 +0200
@@ -19,6 +19,8 @@
 	cd $src
 	# CVE-2014-6271
 	patch -p0 < $stuff/funcdef-import-4.2.patch
+	# CVE-2014-7169
+	patch -p0 < $stuff/CVE-2014-7169.patch
 	./configure --without-bash-malloc &&
 	make && make install
 }
diff -r 54f6cfa51542 -r 40e999c964ea bash/stuff/CVE-2014-7169.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bash/stuff/CVE-2014-7169.patch	Thu Oct 02 18:55:18 2014 +0200
@@ -0,0 +1,12 @@
+*** parse.y	2014-08-26 15:09:42.000000000 -0400
+--- parse.y	2014-09-24 22:47:28.000000000 -0400
+***************
+*** 2849,2852 ****
+--- 2849,2854 ----
+    word_desc_to_read = (WORD_DESC *)NULL;
+  
++   eol_ungetc_lookahead = 0;
++ 
+    current_token = '\n';		/* XXX */
+    last_read_token = '\n';
+