[xorg-x11-server] fix thinko

Adam Jackson ajax at fedoraproject.org
Tue Oct 5 17:31:52 UTC 2010


commit a63afa418e3c7dbd43ae21c2b1de626072bb6547
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Oct 5 13:31:58 2010 -0400

    fix thinko

 xorg-x11-server.spec             |    7 +++++--
 xserver-1.9.0-vbe-insanity.patch |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 873f05f..1001b27 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -30,7 +30,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.9.0
-Release:   12%{?gitdate:.%{gitdate}}%{dist}
+Release:   13%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -354,7 +354,7 @@ test `getminor extension` == %{extension_minor}
 
 # --with-pie ?
 autoreconf -v --install || exit 1
-export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
+export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS -Os"
 %configure --enable-maintainer-mode %{xservers} \
 	--disable-static \
 	--with-pic \
@@ -560,6 +560,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Oct 05 2010 Adam Jackson <ajax at redhat.com> 1.9.0-13
+- xserver-1.9.0-vbe-insanity.patch: Fix thinko.
+
 * Mon Oct 04 2010 Adam Jackson <ajax at redhat.com> 1.9.0-12
 - xserver-1.9.0-vbe-insanity.patch: Fix VBE < 3.0 support.
 
diff --git a/xserver-1.9.0-vbe-insanity.patch b/xserver-1.9.0-vbe-insanity.patch
index e01c707..21d57b6 100644
--- a/xserver-1.9.0-vbe-insanity.patch
+++ b/xserver-1.9.0-vbe-insanity.patch
@@ -77,7 +77,7 @@ index 1defd9a..8c738e7 100644
 -    }
 -    else
 -	memcpy(&block->PhysBasePtr, ((char*)pVbe->memory) + 40, 216);
-+    memcpy(block, pVbe->memory, 256);
++    memcpy(block, pVbe->memory, sizeof(*block));
  
      return block;
  }


More information about the scm-commits mailing list