From 47d5158d403fd49853fcca4115a70e6a4656131b149c1932e6c6d22411cfa1af Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 23 Jan 2007 00:28:07 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/sbl?expand=0&rev=2

---
 sbl.changes                        |  5 +++++
 sbl.spec                           | 30 +++++++++++++++++-------------
 sblsrc-2.2-invalid-operation.patch | 20 ++++++++++++++++++++
 3 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 sblsrc-2.2-invalid-operation.patch

diff --git a/sbl.changes b/sbl.changes
index a7df7dc..3803aa4 100644
--- a/sbl.changes
+++ b/sbl.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 22 12:19:49 CET 2007 - ssommer@suse.de
+
+- fixed invalid operation error and deobfuscated the code a bit
+
 -------------------------------------------------------------------
 Wed Jan 25 21:41:21 CET 2006 - mls@suse.de
 
diff --git a/sbl.spec b/sbl.spec
index 6872860..6d4c072 100644
--- a/sbl.spec
+++ b/sbl.spec
@@ -1,26 +1,27 @@
 #
 # spec file for package sbl (Version 2.2)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
-Name:         sbl
-BuildRequires: gcc-c++
-Version:      2.2
-Release:      28
-License:      GPL
-Group:        Hardware/Other
-Source:       sblsrc-2.2.tgz
-Patch:        sblsrc-2.2.dif
-Summary:      SuSE blinux
-PreReq:       %insserv_prereq
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+Name:           sbl
+BuildRequires:  gcc-c++
+Version:        2.2
+Release:        58
+License:        GNU General Public License (GPL)
+Group:          Hardware/Other
+Source:         sblsrc-2.2.tgz
+Patch:          sblsrc-2.2.dif
+Patch1:         sblsrc-2.2-invalid-operation.patch
+Summary:        SuSE blinux
+PreReq:         %insserv_prereq
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 SuSE blinux is a screen reader for the Linux console. It supports
@@ -35,6 +36,7 @@ Authors:
 %prep
 %setup -n sblsrc-2.2/prog
 %patch -p2
+%patch1 -p2
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE" LIB_CFLAGS="$RPM_OPT_FLAGS -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -fPIC"
@@ -67,6 +69,8 @@ rm -rf $RPM_BUILD_ROOT
 %config /etc/suse-blinux.conf
 
 %changelog -n sbl
+* Mon Jan 22 2007 - ssommer@suse.de
+- fixed invalid operation error and deobfuscated the code a bit
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Sat Jan 14 2006 - schwab@suse.de
diff --git a/sblsrc-2.2-invalid-operation.patch b/sblsrc-2.2-invalid-operation.patch
new file mode 100644
index 0000000..9cbca5b
--- /dev/null
+++ b/sblsrc-2.2-invalid-operation.patch
@@ -0,0 +1,20 @@
+diff -Naur sblsrc-2.2.org/prog/Alva/brlmain.cc sblsrc-2.2/prog/Alva/brlmain.cc
+--- sblsrc-2.2.org/prog/Alva/brlmain.cc	2007-01-22 11:57:37.511031000 +0100
++++ sblsrc-2.2/prog/Alva/brlmain.cc	2007-01-22 12:05:03.354199000 +0100
+@@ -488,10 +488,12 @@
+    }
+   if (i < j)			/* there is something different */
+    {
+-     for (k = 0;
+-	  k < (j - i);
+-	  rawdata[k++] = TransTable[(prevdata[i + k] = brl->disp[i + k])]);
+-     WriteToBrlDisplay (model->NbStCells + i, j - i, rawdata);
++     for (k = 0; k < (j - i); k++)
++     {
++       prevdata[i + k] = brl->disp[i + k];
++       rawdata[k] = TransTable[prevdata[i + k]];
++       WriteToBrlDisplay (model->NbStCells + i, j - i, rawdata);
++     }
+    }
+ }
+