[Pkg-freevo-maint] Bug#489590: Bug#489590: bashims in /bin/sh script

[Matthew Johnson]

On Tue Sep 02 19:53, A Mennucc wrote:
> On Sat, Aug 23, 2008 at 12:31:51PM +0100, Matthew Johnson wrote:
> > Hi, I attach a patch to fix this bug. If you want to handle the upload,
> > let me know, otherwise I'll upload an NMU to delayed in a few days.
> 
> I could not find the patch.
> 
> May you send me a completed debdiff between the .dsc
> in unstable and the one you uploaded?
> 
Attached

Matt
-- 
Matthew Johnson
-------------- next part --------------
diff -u freevo-1.8.1/debian/changelog freevo-1.8.1/debian/changelog
--- freevo-1.8.1/debian/changelog
+++ freevo-1.8.1/debian/changelog
@@ -1,3 +1,10 @@
+freevo (1.8.1-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix bashism in /bin/sh script (Closes: #489590)
+
+ -- Matthew Johnson <mjj29 at debian.org>  Sun, 24 Aug 2008 11:25:10 +0000
+
 freevo (1.8.1-0) unstable; urgency=high
 
   * New upstream release.
diff -u freevo-1.8.1/debian/patches/series freevo-1.8.1/debian/patches/series
--- freevo-1.8.1/debian/patches/series
+++ freevo-1.8.1/debian/patches/series
@@ -1,3 +1,4 @@
+bashims
 nocheck
 source_etc_freevo_debconf_py.diff
 freevo_config_py_remarks.diff
only in patch2:
unchanged:
--- freevo-1.8.1.orig/debian/patches/bashims
+++ freevo-1.8.1/debian/patches/bashims
@@ -0,0 +1,62 @@
+Index: freevo-1.8.1/contrib/fbcon/mgafb
+===================================================================
+--- freevo-1.8.1.orig/contrib/fbcon/mgafb	2008-08-24 11:19:56.000000000 +0000
++++ freevo-1.8.1/contrib/fbcon/mgafb	2008-08-24 11:20:56.000000000 +0000
+@@ -28,7 +28,7 @@
+     exit 1
+ fi
+ 
+-if [ "$1" == "restore" ]; then
++if [ "$1" = "restore" ]; then
+     if [ -c /dev/fb0 ]; then
+ 	HEAD0=/dev/fb0
+ 	HEAD1=/dev/fb1
+@@ -51,8 +51,8 @@
+     exit 0
+ fi
+ 
+-if ! [ "$1" == "pal" ] && ! [ "$1" == "PAL" ] && \
+-    ! [ "$1" == "ntsc" ] && ! [ "$1" == "NTSC" ]; then
++if ! [ "$1" = "pal" ] && ! [ "$1" = "PAL" ] && \
++    ! [ "$1" = "ntsc" ] && ! [ "$1" = "NTSC" ]; then
+     echo "usage: mgafb [ pal | ntsc ] resolution"
+     echo "       mgafb restore"
+     exit 1
+@@ -66,11 +66,11 @@
+ $freevo runapp matroxset -f /dev/fb0 -m 3
+ 
+ # set the correct fbset mode
+-if [ "$1" == "pal" ] || [ "$1" == "PAL" ]; then
++if [ "$1" = "pal" ] || [ "$1" = "PAL" ]; then
+     # switch to PAL
+     $freevo runapp matroxset 1
+ 
+-    if [ "$2" == "768x576" ]; then
++    if [ "$2" = "768x576" ]; then
+ 	$freevo runapp fbset -fb /dev/fb0 -depth 32 -left 20 -right 10 -hslen 34 \
+ 	    -upper 30 -lower 10 -vslen 10 -xres 768 -yres 576 \
+ 	    -vxres 768 -vyres 576 -depth 32 -laced false -bcast true -pixclock 38400 \
+@@ -80,7 +80,7 @@
+ # 	    -upper 39 -lower 10 -hslen 46 -vslen 4 -xres 768 -yres 576 \
+ # 	    -vxres 768 -vyres 576 -depth 32 -laced false -bcast true
+ 
+-    elif [ "$2" == "800x600" ]; then
++    elif [ "$2" = "800x600" ]; then
+ 	$freevo runapp fbset -fb /dev/fb0 -depth 32 -left 48 -right 24 \
+ 	    -upper 70 -lower 32 -hslen 40 -vslen 2 -xres 800 -yres 600 \
+ 	    -vxres 800 -vyres 600 -depth 32 -laced false -bcast true
+@@ -93,11 +93,11 @@
+ else
+     $freevo runapp matroxset -f /dev/fb0 2 2
+     db=`dirname $0`/fbset.db
+-    if [ "$2" == "640x480" ]; then
++    if [ "$2" = "640x480" ]; then
+ 	$freevo runapp fbset -db $db -fb /dev/fb0 "ntsc-640x480_60"
+-    elif [ "$2" == "768x576" ]; then
++    elif [ "$2" = "768x576" ]; then
+ 	$freevo runapp fbset -db $db -fb /dev/fb0 "ntsc-768x576"
+-    elif [ "$2" == "800x600" ]; then
++    elif [ "$2" = "800x600" ]; then
+ 	$freevo runapp fbset -db $db -fb /dev/fb0 "ntsc-800x600"
+     else
+ 	echo unsupported mode $2 for ntsc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-freevo-maint/attachments/20080902/fd95173e/attachment.pgp