Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 253740 - app-emulation/wine-9999 - files/wine-gentoo-no-ssp.patch fails to apply
Summary: app-emulation/wine-9999 - files/wine-gentoo-no-ssp.patch fails to apply
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: AMD64 Linux
: High normal with 1 vote (vote)
Assignee: Wine Maintainers
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-01-04 16:16 UTC by Miguel Marco
Modified: 2009-01-06 10:17 UTC (History)
2 users (show)

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


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Miguel Marco 2009-01-04 16:16:31 UTC
When trying to emerge wine-9999, i get the "Failed Patch: wine-gentoo-no-ssp.patch !" error message.

I paste the content of /var/tmp/portage/app-emulation/wine-9999/temp/wine-gentoo-no-ssp.patch-20264.out

***** wine-gentoo-no-ssp.patch *****

====================================

PATCH COMMAND:   patch -p0 -g0 -E --no-backup-if-mismatch < /usr/portage/app-emu
lation/wine/files/wine-gentoo-no-ssp.patch

====================================
patching file loader/preloader.c
Hunk #1 FAILED at 155.
1 out of 1 hunk FAILED -- saving rejects to file loader/preloader.c.rej
====================================

PATCH COMMAND:   patch -p1 -g0 -E --no-backup-if-mismatch < /usr/portage/app-emu
lation/wine/files/wine-gentoo-no-ssp.patch

====================================
can't find file to patch at input line 8
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|support older ssp (gcc-3.4.x).  this ssp was never in mainline gcc, thus
|upstream wine wont accept it.  can drop once hardened gets a stable gcc-4.x.
|
|http://bugs.gentoo.org/66002
|
|--- loader/preloader.c
|+++ loader/preloader.c
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
====================================

PATCH COMMAND:   patch -p2 -g0 -E --no-backup-if-mismatch < /usr/portage/app-emu
lation/wine/files/wine-gentoo-no-ssp.patch

====================================
missing header for unified diff at line 8 of patch
can't find file to patch at input line 8
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|support older ssp (gcc-3.4.x).  this ssp was never in mainline gcc, thus
|upstream wine wont accept it.  can drop once hardened gets a stable gcc-4.x.
|
|http://bugs.gentoo.org/66002
|
|--- loader/preloader.c
|+++ loader/preloader.c
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
====================================

PATCH COMMAND:   patch -p3 -g0 -E --no-backup-if-mismatch < /usr/portage/app-emu
lation/wine/files/wine-gentoo-no-ssp.patch

====================================
missing header for unified diff at line 8 of patch
can't find file to patch at input line 8
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|support older ssp (gcc-3.4.x).  this ssp was never in mainline gcc, thus
|upstream wine wont accept it.  can drop once hardened gets a stable gcc-4.x.
|
|http://bugs.gentoo.org/66002
|
|--- loader/preloader.c
|+++ loader/preloader.c
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
====================================

PATCH COMMAND:   patch -p4 -g0 -E --no-backup-if-mismatch < /usr/portage/app-emu
lation/wine/files/wine-gentoo-no-ssp.patch

====================================
missing header for unified diff at line 8 of patch
can't find file to patch at input line 8
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|support older ssp (gcc-3.4.x).  this ssp was never in mainline gcc, thus
|upstream wine wont accept it.  can drop once hardened gets a stable gcc-4.x.
|
|http://bugs.gentoo.org/66002
|
|--- loader/preloader.c
|+++ loader/preloader.c
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored



And my emerge --info:

Portage 2.1.6.4 (default/linux/amd64/2008.0, gcc-4.1.2, glibc-2.6.1-r0, 2.6.25-gentoo-r6 x86_64)
=================================================================
System uname: Linux-2.6.25-gentoo-r6-x86_64-Intel-R-_Core-TM-2_Duo_CPU_T9300_@_2.50GHz-with-glibc2.2.5
Timestamp of tree: Sun, 04 Jan 2009 15:15:01 +0000
app-shells/bash:     3.2_p33
dev-java/java-config: 1.3.7-r1, 2.1.6
dev-lang/python:     2.4.4-r14, 2.5.2-r7
dev-python/pycrypto: 2.0.1-r6
dev-util/cmake:      2.6.2
sys-apps/baselayout: 1.12.11.1
sys-apps/sandbox:    1.2.18.1-r2
sys-devel/autoconf:  2.13, 2.63
sys-devel/automake:  1.5, 1.7.9-r1, 1.8.5-r3, 1.9.6-r2, 1.10.2
sys-devel/binutils:  2.18-r3
sys-devel/gcc-config: 1.4.0-r4
sys-devel/libtool:   1.5.26
virtual/os-headers:  2.6.27-r2
ACCEPT_KEYWORDS="amd64"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=nocona -O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/share/config"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf /etc/gconf /etc/revdep-rebuild /etc/terminfo /etc/texmf/web2c /etc/udev/rules.d"
CXXFLAGS="-march=nocona -O2 -pipe"
DISTDIR="/usr/portage/distfiles"
FEATURES="collisions-protect distlocks fixpackages parallel-fetch protect-owned sandbox sfperms strict unmerge-orphans userfetch"
GENTOO_MIRRORS="http://distfiles.gentoo.org http://www.ibiblio.org/pub/Linux/distributions/gentoo"
LANG="es_ES@euro"
LC_ALL="es_ES@euro"
LDFLAGS="-Wl,-O1"
LINGUAS="en es"
MAKEOPTS="-j3"
PKGDIR="/usr/portage/packages"
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="/usr/portage/local/layman/science /usr/portage/local/layman/wschlich-testing /usr/local/portage"
SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage"
USE="X acl acpi alsa amd64 arts berkdb bzip2 cdr cli cracklib crypt cups dri dvd fortran gdbm gif gpm hal iconv ipv6 isdnlog kde midi mmx mudflap multilib ncurses nls nptl nptlonly opengl openmp pam pcre perl pppd python qt qt4 readline reflection session spl sse sse2 ssl sysfs tcpd unicode xorg 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 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" ELIBC="glibc" INPUT_DEVICES="keyboard mouse joystick" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="en es" USERLAND="GNU" VIDEO_CARDS="nv nvidia vesa vga"
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS


Reproducible: Always

Steps to Reproduce:
1. Unmask wine-9999
2. emerge wine
3.
Comment 1 Shunichi Fuji 2009-01-04 16:43:28 UTC
it was just add a new line in upstream.

http://source.winehq.org/git/wine.git/?a=commit;h=3dcd1285f16fab7dc73884330753308b5b12199b

Index: files/wine-gentoo-no-ssp.patch
===================================================================
--- files/wine-gentoo-no-ssp.patch
+++ files/wine-gentoo-no-ssp.patch
@@ -6,6 +6,7 @@
  void *__stack_chk_guard = 0;
 +void *__guard = 0;
 +void __stack_smash_handler(void) { return; }
+ void __stack_chk_fail_local(void) { return; }
  void __stack_chk_fail(void) { return; }
  
   * The _start function is the entry and exit point of this program
Comment 2 Miguel Marco 2009-01-04 17:07:43 UTC
So, is it already solved? or is it easy to solve by hand?
Comment 3 Shunichi Fuji 2009-01-04 17:27:53 UTC
(In reply to comment #2)
wine-gentoo-no-ssp.patch is no longer able to apply newer version.
this patch(comment #1) would fix build, `at the time`. (i'm building now ;-])
you can make your own local overlay.

off course, official portage tree fixing is mattered.
Comment 4 SpanKY gentoo-dev 2009-01-06 10:17:30 UTC
eh, let's just drop support for gcc-3.4 hardened already

http://sources.gentoo.org/app-emulation/wine/wine-9999.ebuild?r1=1.24&r2=1.25