From 463292f3ade280ce88819534935399b1dfccf88d Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <tasaka1@localhost.localdomain>
Date: Jan 05 2011 16:37:42 +0000
Subject: - Fix one-byte ahead access on apple2.c (may fix 666643)


---

diff --git a/xscreensaver-5.12-apple2-1byte-ahead.patch b/xscreensaver-5.12-apple2-1byte-ahead.patch
new file mode 100644
index 0000000..4bb58af
--- /dev/null
+++ b/xscreensaver-5.12-apple2-1byte-ahead.patch
@@ -0,0 +1,16 @@
+--- xscreensaver-5.12/hacks/apple2.c.debug	2010-04-12 13:47:06.000000000 +0900
++++ xscreensaver-5.12/hacks/apple2.c	2011-01-02 16:02:05.000000000 +0900
+@@ -671,11 +671,12 @@
+         int c;
+         /* If we're in the midst of typing a string, emit a character with
+            random timing. */
+-        c =*sim->typing++;
++        c =*sim->typing;
+         if (c==0) {
+           sim->typing=NULL;
+         }
+         else {
++          sim->typing++;
+           a2_printc(sim->st, c);
+           if (c=='\r' || c=='\n') {
+             sim->next_actiontime = sim->curtime;
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 1d5757e..89aadd7 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    8
+%define fedora_rel    9
 
 %undefine extrarel
 
@@ -55,12 +55,12 @@ Patch21:         xscreensaver-5.11-webcollage-default-nonet.patch
 Patch30:         xscreensaver-5.11-conf264.patch
 #
 ## Patches which must be discussed with upstream
+#
+## Patch31, 32, 33, 34, 35, 36, 37, 38: already sent to the upstream
+#
 # For now set LANG to C for daemon because some garbage character appears
 # on passwd prompt
 Patch31:         xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch
-#
-# Patch32, 33, 34, 35, 36: already sent to the upstream
-#
 # Kill memleak on gltext (bug 638600)
 Patch32:         xscreensaver-5.12-gltext-memleak.patch
 # Remove duplicate xml files entry
@@ -75,6 +75,8 @@ Patch35:         xscreensaver-5.12-gtkspinbox-page-size-to-zero.patch
 Patch36:         xscreensaver-5.12-warn-only-once-with-missing-image-dir.patch
 # wormhole causes SIGFPE with some size of window (bug 665752)
 Patch37:         xscreensaver-5.12-wormhole-fpe.patch
+# Fix one-byte ahead access in apple2.c (may fix bug 666643)
+Patch38:         xscreensaver-5.12-apple2-1byte-ahead.patch
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -252,6 +254,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch35 -p1 -b .spin_warn
 %patch36 -p1 -b .warn_once
 %patch37 -p1 -b .wormhole
+%patch38 -p1 -b .apple2_byte
 
 change_option(){
    set +x
@@ -757,6 +760,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Sun Jan  2 2011 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:5.12-9
+- Fix one-byte ahead access on apple2.c (may fix 666643)
+
 * Mon Dec 27 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:5.12-8
 - Fix SIGFPE on wormhole with some window size (bug 665752)