Emerging dev-lang/php-5.3.11_rc2 fails when applying suhosin patch. Reproducible: Always Steps to Reproduce: 1. USE=suhosin emerge =dev-lang/php-5.3.11_rc2 2. 3. Actual Results: * Applying suhosin-patch-5.3.9-0.9.10.patch ... * Failed Patch: suhosin-patch-5.3.9-0.9.10.patch ! * ( /var/tmp/portage/dev-lang/php-5.3.11_rc2/work/suhosin-patch-5.3.9-0.9.10.patch ) Expected Results: compiled. see attached file.
Created attachment 308871 [details] suhosin-patch-5.3.9-0.9.10.patch.out Output of the patch command while applying suhosin patch.
Created attachment 309107 [details, diff] Modified patch for 5.3.11_rc2 However because of some inconsiderate two Zend files in the source has dos new-lines. If they realize it upstreams and change it back, the patch must be modified again. Regards: Dw.
confirm bug * /var/tmp/portage/dev-lang/php-5.3.11_rc2/temp/suhosin-patch-5.3.9-0.9.10.patch.out * ERROR: dev-lang/php-5.3.11_rc2 failed (prepare phase): * Failed Patch: suhosin-patch-5.3.9-0.9.10.patch! * * Call stack: * ebuild.sh, line 85: Called src_prepare * environment, line 3570: Called eblit-run 'src_prepare' 'v3' * environment, line 1314: Called eblit-php-src_prepare * src_prepare-v3.eblit, line 48: Called epatch '/var/tmp/portage/dev-lang/php-5.3.11_rc2/work/suhosin-patch-5.3.9-0.9.10.patch' * environment, line 2123: Called die * The specific snippet of code: * die "Failed Patch: ${patchname}!";
Created attachment 309651 [details] build log
Created attachment 309653 [details] ebuild environment
emerge --info Portage 2.1.10.49 (default/linux/amd64/10.0/desktop, gcc-4.5.3, glibc-2.13-r4, 3.2.11-gentoo-jms-3.2.11 x86_64) ================================================================= System uname: Linux-3.2.11-gentoo-jms-3.2.11-x86_64-Intel-R-_Core-TM-2_Duo_CPU_P8600_@_2.40GHz-with-gentoo-2.0.3 Timestamp of tree: Fri, 20 Apr 2012 16:15:01 +0000 distcc 3.1 x86_64-pc-linux-gnu [disabled] ccache version 3.1.6 [enabled] app-shells/bash: 4.2_p20 dev-java/java-config: 2.1.11-r3 dev-lang/python: 2.6.6-r2, 2.7.2-r3, 3.2.2 dev-util/ccache: 3.1.6 dev-util/cmake: 2.8.7-r5 dev-util/pkgconfig: 0.26 sys-apps/baselayout: 2.0.3 sys-apps/openrc: 0.9.8.4 sys-apps/sandbox: 2.5 sys-devel/autoconf: 2.13, 2.68 sys-devel/automake: 1.9.6-r3, 1.11.1 sys-devel/binutils: 2.21.1-r1 sys-devel/gcc: 4.5.3-r2 sys-devel/gcc-config: 1.5-r2 sys-devel/libtool: 2.4-r1 sys-devel/make: 3.82-r1 sys-kernel/linux-headers: 3.1 (virtual/os-headers) sys-libs/glibc: 2.13-r4 Repositories: gentoo sunrise gamerlay-stable x-jms ACCEPT_KEYWORDS="amd64" ACCEPT_LICENSE="* -@EULA" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-march=native -O2 -pipe" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/share/config /usr/share/gnupg/qualified.txt /usr/share/openvpn/easy-rsa" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php5.3/ext-active/ /etc/php/apache2-php5.4/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/cgi-php5.4/ext-active/ /etc/php/cli-php5.3/ext-active/ /etc/php/cli-php5.4/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/splash /etc/terminfo" CXXFLAGS="-march=native -O2 -pipe" DISTDIR="/portage/distfiles" FEATURES="assume-digests binpkg-logs ccache collision-protect distlocks ebuild-locks fixlafiles news parallel-fetch protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch xattr" FFLAGS="" GENTOO_MIRRORS="http://open-systems.ufl.edu/mirrors/gentoo http://distfiles.gentoo.org http://www.ibiblio.org/pub/Linux/distributions/gentoo" LANG="en_GB.UTF-8" LDFLAGS="-Wl,-O1 -Wl,--as-needed" LINGUAS="en_GB en es fr en" PKGDIR="/portage/packages" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/portage" PORTDIR_OVERLAY="/var/lib/layman/sunrise /var/lib/layman/gamerlay /usr/local/portage/jms" SYNC="rsync://rsync.namerica.gentoo.org/gentoo-portage" USE="X a52 aac aalib acl acpi aim alsa amd64 ao apm autoipd avahi bash-completion berkdb bluetooth branding bzip2 cairo cdaudio cdda cddb cdparanoia cdr cjk cli consolekit cracklib crypt css cups cxx dbus dga dhcpcd directfb dri dts dv dvb dvd dvdnav dvdr emboss encode evdev exif fam fbcon ffmpeg firefox flac fontconfig foomaticdb fortran ftp gdbm gdu gif gimp gnutls gphoto2 gpm gstreamer gtk gzip hdri iconv icq icu ieee1394 imagemagick imap imlib ipod ipv6 jabber jpeg jpeg2k kde kipi kontact lame laptop lastfm lcms ldap libcaca libnotify libwww lm_sensor lzma lzo mad maildir matroska mdnsresponder-compat memlimit mhash mikmod mime mmap mmx mng modules motif mozilla mp3 mp4 mpeg mplayer msn mtp mudflap multilib musepack musicbrainz mysql ncurse ncurses networkmanager nls nptl nptlonly nsplugin nvidia ofx ogg openal openexr opengl openmp oss pam pango pcmcia pcre pdf phonon php plasma png policykit ppds pppd projectm pulseaudio qt3support qt4 quicktime raw readline resolvconf scanner sdl semantic-desktop session smp speex spell sse sse2 ssl ssse3 startup-notification svg sysfs syslog taglib tcpd theora thumbnail tidy tiff truetype udev unicode usb v4l v4l2 vcd vdpau video vim-syntax vorbis webkit wifi wxwidgets x x264 xattr xcb xcomposite xine xinerama xml xorg xosd xpm xscreesaver xulrunner xv xvid xvmc yahoo zip 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" CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump" CAMERAS="ptp2" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" DRACUT_MODULES="plymouth" 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" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="en_GB en es fr en" PHP_TARGETS="php5-3 php5-4" RUBY_TARGETS="ruby18" USERLAND="GNU" VIDEO_CARDS="nvidia 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, INSTALL_MASK, LC_ALL, MAKEOPTS, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, USE_PYTHON
dev-lang/php-5.3.10-r2 was built with the following: USE="apache2 berkdb bzip2 cjk cli crypt ctype curl exif fileinfo filter ftp gd gdbm hash iconv imap ipv6 json ldap mhash (multilib) mysql nls pdo phar posix readline session simplexml soap sockets spell ssl suhosin tidy tokenizer truetype unicode xml xpm xsl zip zlib -bcmath -calendar -cdb -cgi -curlwrappers -debug -doc -embed -enchant -firebird -flatfile -fpm (-frontbase) -gmp -inifile -intl -iodbc -kerberos -kolab -ldap-sasl -libedit -mssql -mysqli -mysqlnd -oci8-instant-client -odbc -pcntl -pic -postgres -qdbm -recode -sharedmem -snmp -sqlite -sqlite3 (-sybase-ct) -sysvipc -threads -wddx -xmlreader -xmlrpc -xmlwriter" dev-lang/php-5.4.1_rc2 was built with the following: USE="apache2 berkdb bzip2 cjk cli crypt ctype curl exif fileinfo filter ftp gd gdbm hash iconv imap ipv6 json ldap mhash (multilib) mysql nls pdo phar posix readline session simplexml soap sockets spell ssl tidy tokenizer truetype unicode xml xpm xsl zip zlib -bcmath -calendar -cdb -cgi -curlwrappers -debug -doc -embed -enchant -firebird -flatfile -fpm (-frontbase) -gmp -inifile -intl -iodbc -kerberos -kolab -ldap-sasl -libedit -mssql -mysqli -mysqlnd -oci8-instant-client -odbc -pcntl -pic -postgres -qdbm -recode -sharedmem -snmp -sqlite3 (-sybase-ct) -sysvipc -threads -wddx -xmlreader -xmlrpc -xmlwriter" emerge -pv =dev-lang/php-5.3.11_rc2 These are the packages that would be merged, in order: Calculating dependencies... done! [ebuild U ~] dev-lang/php-5.3.11_rc2 [5.3.10-r2] USE="apache2 berkdb bzip2 cjk cli crypt ctype curl exif fileinfo filter ftp gd gdbm hash iconv imap ipv6 json ldap mhash mysql nls pdo phar posix readline session simplexml soap sockets spell ssl suhosin tidy tokenizer truetype unicode xml xpm xsl zip zlib -bcmath -calendar -cdb -cgi -curlwrappers -debug -doc -embed -enchant -firebird -flatfile -fpm (-frontbase) -gmp -inifile -intl -iodbc -kerberos -kolab -ldap-sasl -libedit -mssql -mysqli -mysqlnd -oci8-instant-client -odbc -pcntl -pic -postgres -qdbm -recode -sharedmem -snmp -sqlite -sqlite3 (-sybase-ct) -sysvipc -threads -wddx -xmlreader -xmlrpc -xmlwriter" 0 kB
(In reply to comment #7) Try the patch if it works for you as well: https://bugs.gentoo.org/show_bug.cgi?id=411935#c2
(In reply to comment #8) Tested and working, thanks! If we can get olemarkus to put it at his patches place, it'll do it with that little modification in the ebuild: SUHOSIN_VERSION="5.3.11-0.9.10-gentoo"
Thanks for reporting this. I've spoken with olemarkus and provided an updated patch based on your work here. The updated php-5.3.11_rc2 ebuild I just committed to cvs uses this patch.
(In reply to comment #10) > Thanks for reporting this. I've spoken with olemarkus and provided an > updated patch based on your work here. The updated php-5.3.11_rc2 ebuild I > just committed to cvs uses this patch. Just beware, that upstreams had two files converted to Windows-style newlines for this rc2 version. As soon that gets realized and Unix newlines restored in those two files, the patch will start failing. For example in an upcoming final version. The patch is a simple modification. Doesn't deal with possible in-depth differences. But at least works...
