Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 341155 - x11-base/xorg-server-1.9.0.902 Failed Patch
Summary: x11-base/xorg-server-1.9.0.902 Failed Patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All Linux
: High normal (vote)
Assignee: Gentoo X packagers
URL: http://cgit.freedesktop.org/xorg/xser...
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-10-15 20:00 UTC by labor_ratte
Modified: 2010-10-16 05:06 UTC (History)
4 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
out file (1.9.0-fix-VbeModeInfoBlock-memcpy.patch.out,4.85 KB, text/plain)
2010-10-15 20:21 UTC, egon2003
Details
/var/lib/portage/logs/x11-base:xorg-server-1.9.0.902:20101015-211431.log (x11-base:xorg-server-1.9.0.902:20101015-211431.log,2.09 KB, text/plain)
2010-10-15 21:43 UTC, taaroa
Details
emerge_info_xorg-server (emerge_info_xorg-server-1.9.0.902.txt,5.20 KB, text/plain)
2010-10-15 22:29 UTC, jms
Details
1.9.0-fix-VbeModeInfoBlock-memcpy.patch.out (1.9.0-fix-VbeModeInfoBlock-memcpy.patch.out,4.90 KB, text/plain)
2010-10-16 00:02 UTC, taaroa
Details

Note You need to log in before you can comment on or make changes to this bug.
Description labor_ratte 2010-10-15 20:00:19 UTC
>>> Preparing source in /var/tmp/portage/x11-base/xorg-server-1.9.0.902/work/xorg-server-1.9.0.902 ...
 * Applying xorg-server-disable-acpi.patch ...                                                                                       [ ok ]
 * Applying xorg-server-1.9-nouveau-default.patch ...                                                                                [ ok ]
 * Applying 1.9.0-fix-VbeModeInfoBlock-memcpy.patch ...

 * Failed Patch: 1.9.0-fix-VbeModeInfoBlock-memcpy.patch !
 *  ( /usr/portage/x11-base/xorg-server/files/1.9.0-fix-VbeModeInfoBlock-memcpy.patch )
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/x11-base/xorg-server-1.9.0.902/temp/1.9.0-fix-VbeModeInfoBlock-memcpy.patch.out

 * ERROR: x11-base/xorg-server-1.9.0.902 failed:
 *   Failed Patch: 1.9.0-fix-VbeModeInfoBlock-memcpy.patch!
 * 
 * Call stack:
 *     ebuild.sh, line   56:  Called src_prepare
 *   environment, line 3833:  Called xorg-2_src_prepare
 *   environment, line 4785:  Called xorg-2_patch_source
 *   environment, line 4715:  Called base_src_prepare
 *   environment, line  832:  Called epatch '/usr/portage/x11-base/xorg-server/files/1.9.0-fix-VbeModeInfoBlock-memcpy.patch'
 *   environment, line 2226:  Called die
 * The specific snippet of code:
 *               die "Failed Patch: ${patchname}!";
 * 
 * If you need support, post the output of 'emerge --info =x11-base/xorg-server-1.9.0.902',
 * the complete build log and the output of 'emerge -pqv =x11-base/xorg-server-1.9.0.902'.
 * The complete build log is located at '/var/tmp/portage/x11-base/xorg-server-1.9.0.902/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/x11-base/xorg-server-1.9.0.902/temp/environment'.
 * S: '/var/tmp/portage/x11-base/xorg-server-1.9.0.902/work/xorg-server-1.9.0.902'
Comment 1 egon2003 2010-10-15 20:21:47 UTC
Created attachment 250755 [details]
out file
Comment 2 taaroa 2010-10-15 21:43:22 UTC
Created attachment 250759 [details]
/var/lib/portage/logs/x11-base:xorg-server-1.9.0.902:20101015-211431.log

1.9.0-fix-VbeModeInfoBlock-memcpy.patch is not applied
Comment 3 jms 2010-10-15 22:26:29 UTC
confirm

>> Preparing source in /var/tmp/portage/x11-base/xorg-server-1.9.0.902/work/xorg-server-1.9.0.902 ...
 * Applying xorg-server-disable-acpi.patch ...                                                    [ ok ]
 * Applying xorg-server-1.9-nouveau-default.patch ...                                             [ ok ]
 * Applying 1.9.0-fix-VbeModeInfoBlock-memcpy.patch ...

 * Failed Patch: 1.9.0-fix-VbeModeInfoBlock-memcpy.patch !
 *  ( /portage/x11-base/xorg-server/files/1.9.0-fix-VbeModeInfoBlock-memcpy.patch )
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/x11-base/xorg-server-1.9.0.902/temp/1.9.0-fix-VbeModeInfoBlock-memcpy.patch.out

 * ERROR: x11-base/xorg-server-1.9.0.902 failed:
 *   Failed Patch: 1.9.0-fix-VbeModeInfoBlock-memcpy.patch!
 * 
 * Call stack:
 *     ebuild.sh, line   54:  Called src_prepare
 *   environment, line 3837:  Called xorg-2_src_prepare
 *   environment, line 4789:  Called xorg-2_patch_source
 *   environment, line 4719:  Called base_src_prepare
 *   environment, line  847:  Called epatch '/portage/x11-base/xorg-server/files/1.9.0-fix-VbeModeInfoBlock-memcpy.patch'
 *   environment, line 2241:  Called die
 * The specific snippet of code:
 *               die "Failed Patch: ${patchname}!";
 * 
 * If you need support, post the output of 'emerge --info =x11-base/xorg-server-1.9.0.902',
 * the complete build log and the output of 'emerge -pqv =x11-base/xorg-server-1.9.0.902'.
 * The complete build log is located at '/var/log/portage/x11-base:xorg-server-1.9.0.902:20101015-222243.log'.
 * The ebuild environment file is located at '/var/tmp/portage/x11-base/xorg-server-1.9.0.902/temp/environment'.
 * S: '/var/tmp/portage/x11-base/xorg-server-1.9.0.902/work/xorg-server-1.9.0.902'
Comment 4 jms 2010-10-15 22:29:29 UTC
Created attachment 250771 [details]
emerge_info_xorg-server
Comment 5 Mamadou Babaei 2010-10-15 23:10:46 UTC
The Same Here....
Comment 6 Mamadou Babaei 2010-10-15 23:13:55 UTC
Portage 2.1.9.18 (default/linux/x86/10.0, gcc-4.4.4, glibc-2.12.1-r1, 2.6.35.7 i686)
=================================================================
System uname: Linux-2.6.35.7-i686-Intel-R-_Core-TM-2_Duo_CPU_T9300_@_2.50GHz-with-gentoo-2.0.1
Timestamp of tree: Fri, 15 Oct 2010 22:30:01 +0000
app-shells/bash:     4.1_p9
dev-java/java-config: 2.1.11
dev-lang/python:     2.6.6-r1, 3.1.2-r4
dev-util/cmake:      2.8.1-r2
sys-apps/baselayout: 2.0.1
sys-apps/openrc:     0.6.3
sys-apps/sandbox:    2.3-r1
sys-devel/autoconf:  2.13, 2.68
sys-devel/automake:  1.6.3, 1.7.9-r2, 1.9.6-r3, 1.10.3, 1.11.1
sys-devel/binutils:  2.20.1-r1
sys-devel/gcc:       4.4.4-r2
sys-devel/gcc-config: 1.4.1
sys-devel/libtool:   2.2.10
sys-devel/make:      3.81-r2
virtual/os-headers:  2.6.35 (sys-kernel/linux-headers)
ACCEPT_KEYWORDS="x86 ~x86"
ACCEPT_LICENSE="* -@EULA Q3AEULA Nero-EULA-US PUEL vmware dlj-1.1 skype-eula AdobeFlash-10.1"
CBUILD="i686-pc-linux-gnu"
CFLAGS="-O2 -march=core2 -mtune=core2 -pipe -msse4.1 -fomit-frame-pointer"
CHOST="i686-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/config"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c"
CXXFLAGS="-O2 -march=core2 -mtune=core2 -pipe -msse4.1 -fomit-frame-pointer"
DISTDIR="/usr/portage/distfiles"
FEATURES="assume-digests binpkg-logs ccache distlocks fixlafiles fixpackages news parallel-fetch protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch"
GENTOO_MIRRORS="http://mirrors.kernel.org/gentoo/distfiles/ http://distfiles.gentoo.org http://distro.ibiblio.org/pub/linux/distributions/gentoo http://mirror.csclub.uwaterloo.ca/gentoo-distfiles/ ftp://mirror.csclub.uwaterloo.ca/gentoo-distfiles/"
LANG="en_US.utf8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
LINGUAS="en_US fa_IR en fa"
MAKEOPTS="-j3"
PKGDIR="/usr/portage/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="X a52 aac aalib acl acpi alsa amr aspell avahi bash-completion battery berkdb bluetooth branding bzip2 cairo cdr cleartype cli corefonts cracklib crypt cxx dbus dri dvd dvdr exif fbcon ffmpeg flac fontconfig fontforge fortran gdbm gif glitz gpm graphicsmagick gtk gtk2 hal hddtemp hdri hfs iconv id3tag ieee1394 imagemagick ipod ipv6 irda isight jbig joystick jpeg jpeg2k lcms libnotify lirc lm_sensors lzma lzo macbook matroska md5sum mesa midi mjpeg mmx mmxext mng modules mp3 mpeg mudflap ncurses nls nptl nptlonly nvidia ogg openal openexr opengl openmp pam pcre perl png pulseaudio python q32 qt3support qt4 rar raw readline reflection rle samba scanner sdl session smp sqlite sqlite3 sse sse2 sse3 sse4 sse4.1 ssl ssse3 svg sysfs tcpd theora tiff timidity truetype unicode usb v4l v4l2 vorbis wavpack webkit wifi wmf wxwidgets x264 x86 xcb xfce xml xorg xvid zlib" ALSA_CARDS="hda-intel" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ubx" INPUT_DEVICES="keyboard mouse synaptics evdev joystick" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="en_US fa_IR en fa" PHP_TARGETS="php-5.2" RUBY_TARGETS="ruby18" USERLAND="GNU" VIDEO_CARDS="nvidia vesa v4l fbdev" XFCE_PLUGINS="brightness menu trash" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account" 
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, LC_ALL, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, PORTDIR_OVERLAY


contents of /usr/portage/x11-base/xorg-server/files/1.9.0-fix-VbeModeInfoBlock-memcpy.patch

########
From ef6c9d2af50ac03b28ad92ea90105047d8bc9948 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gmail.com>
Date: Sun, 12 Sep 2010 23:53:26 -0400
Subject: [PATCH] Fix VbeModeInfoBlock memcpy.

Reserved2 is 189 bytes (not 188). From LinBytesPerScanLine to end of
Reserved2 we have 189 + 16 = 205 bytes (not 206). From PhysBasePtr to end
of Reserved2 we have 189 + 26 = 215 bytes (not 216).
---
 hw/xfree86/vbe/vbe.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
index 0b34648..2051577 100644
--- a/hw/xfree86/vbe/vbe.c
+++ b/hw/xfree86/vbe/vbe.c
@@ -583,13 +583,13 @@ VBEGetModeInfo(vbeInfoPtr pVbe, int mode)
 	    block->LinRsvdMaskSize = ((char*)pVbe->memory)[60];
 	    block->LinRsvdFieldPosition = ((char*)pVbe->memory)[61];
 	    block->MaxPixelClock = *(CARD32*)(((char*)pVbe->memory) + 62);
-	    memcpy(&block->Reserved2, ((char*)pVbe->memory) + 66, 188);
+	    memcpy(&block->Reserved2, ((char*)pVbe->memory) + 66, 189);
 	}
 	else
-	memcpy(&block->LinBytesPerScanLine, ((char*)pVbe->memory) + 50, 206);
+	memcpy(&block->LinBytesPerScanLine, ((char*)pVbe->memory) + 50, 205);
     }
     else
-	memcpy(&block->PhysBasePtr, ((char*)pVbe->memory) + 40, 216);
+	memcpy(&block->PhysBasePtr, ((char*)pVbe->memory) + 40, 215);
 
     return block;
 }
-- 
1.7.2.2
########

Comment 7 Mamadou Babaei 2010-10-15 23:16:21 UTC
And these are my use flags

USE:  elibc_glibc ipv6 kernel_linux nptl udev userland_GNU x86 xorg
Comment 8 infobox.oleg 2010-10-15 23:32:08 UTC
Same here:

Portage 2.1.9.18 (default/linux/amd64/10.0/desktop, gcc-4.4.4, glibc-2.12.1-r1, 2.6.35-gentoo-r9 x86_64)
=================================================================
System uname: Linux-2.6.35-gentoo-r9-x86_64-Intel-R-_Core-TM-2_Duo_CPU_T6670_@_2.20GHz-with-gentoo-2.0.1
Timestamp of tree: Fri, 15 Oct 2010 19:45:02 +0000
ccache version 2.4 [enabled]
app-shells/bash:     4.1_p9
dev-java/java-config: 2.1.11
dev-lang/python:     2.6.6-r1, 3.1.2-r4
dev-util/ccache:     2.4-r8
dev-util/cmake:      2.8.1-r2
sys-apps/baselayout: 2.0.1
sys-apps/openrc:     0.6.3
sys-apps/sandbox:    2.3-r1
sys-devel/autoconf:  2.13, 2.68
sys-devel/automake:  1.7.9-r1, 1.8.5-r3, 1.9.6-r2, 1.10.3, 1.11.1
sys-devel/binutils:  2.20.1-r1
sys-devel/gcc:       4.3.4, 4.4.4-r2
sys-devel/gcc-config: 1.4.1
sys-devel/libtool:   2.2.10
sys-devel/make:      3.81-r2
virtual/os-headers:  2.6.35 (sys-kernel/linux-headers)
ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="*"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -pipe -march=core2 -msse -msse2 -mssse3 -mmmx -msse4.1"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/config /var/lib/hsqldb"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-O2 -pipe -march=core2 -msse -msse2 -mssse3 -mmmx -msse4.1"
DISTDIR="/usr/portage/distfiles"
FEATURES="assume-digests binpkg-logs ccache collision-protect distlocks fixlafiles fixpackages news parallel-fetch protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch"
GENTOO_MIRRORS="http://gentoo.mirror.dkm.cz/pub/gentoo/"
LANG="en_US.UTF-8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
MAKEOPTS="-j3"
PKGDIR="/usr/portage/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/var/lib/layman/perl-experimental /var/lib/layman/java-overlay /usr/local/portage"
SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage"
USE="X a52 aac acl acpi alsa amd64 automount bash-completion berkdb bluetooth branding bzip2 cairo cdr cleartype cli consolekit cracklib crypt cups custom-optimization cvs cxx dbus dhclient dri dts dvb dvd dvdr emboss encode exif extras fam firefox flac fortran fuse gdbm gif git glitz gnome gnome-keyring gnutls gpm graphite gstreamer gtk hal iconv icq ipv6 jabber java java6 jpeg kde kdrive laptop latin1 lcms ldap libnotify lm_sensors mad matroska mikmod mmx mng modules mp3 mp4 mpeg mplayer mudflap multilib mysql nautilus ncurses networkmanager nls nodrm nptl nptlonly nsplugin ogg opencore-amr opengl openmp oscar pam pango pcre pdf perl png ppds pppd python qt3support qt4 readline reflection samba sdl semantic-desktop session sip spell sql sqlite sse sse2 sse3 sse4.1 ssl ssse3 startup-notification subversion svg sysfs tcpd tiff truetype unicode usb v4l v4l2 vorbis wav webkit x264 xcb xml xorg xulrunner xv xvid zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CAMERAS="*" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ubx" INPUT_DEVICES="evdev keyboard mouse synaptics" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" PHP_TARGETS="php-5.2" RUBY_TARGETS="ruby18" USERLAND="GNU" VIDEO_CARDS="intel fbdev vesa" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account" 
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, LC_ALL, LINGUAS, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
Comment 9 Zeev Tarantov 2010-10-15 23:59:15 UTC
The reason for the patch being needed was fixed upstream:
http://cgit.freedesktop.org/xorg/xserver/commit/?id=853d7ebfa3e2d281d92890a39010ff5787a00ffd

Just remove the patch
Comment 10 taaroa 2010-10-16 00:02:37 UTC
Created attachment 250785 [details]
1.9.0-fix-VbeModeInfoBlock-memcpy.patch.out
Comment 11 taaroa 2010-10-16 00:12:04 UTC
(In reply to comment #9)
> The reason for the patch being needed was fixed upstream:
> http://cgit.freedesktop.org/xorg/xserver/commit/?id=853d7ebfa3e2d281d92890a39010ff5787a00ffd
> 
> Just remove the patch
> 
Thanks, problem resolved

Comment 12 David J Cozatt 2010-10-16 03:35:15 UTC
In reference to comment #9
Simply removing the patch causes portage to fail due to not finding the file. 
Beyond that remove the line from the ebuild referencing the patch and 

ebuild package-name.ebuild manifest 

(doing this bypasses security checks)

if you trust that it is fixed (and it does reference the commit in the Changelog)

Comment 13 Chí-Thanh Christopher Nguyễn gentoo-dev 2010-10-16 05:06:06 UTC
The patch was already applied upstream (in a modified form). It is now removed from the xorg-server ebuild.

Marking as FIXED.