Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 361415 - x11-libs/qt-core-4.7.2-r1: fails to prepare due to wrong line breaks in blacklist_ssl.patch
Summary: x11-libs/qt-core-4.7.2-r1: fails to prepare due to wrong line breaks in black...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] KDE (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Qt Bug Alias
URL:
Whiteboard:
Keywords:
: 361425 (view as bug list)
Depends on:
Blocks:
 
Reported: 2011-03-31 06:52 UTC by cach0rr0
Modified: 2011-05-10 22:46 UTC (History)
3 users (show)

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


Attachments
output from failed patch (blacklist_ssl.patch.out,6.70 KB, text/plain)
2011-03-31 06:52 UTC, cach0rr0
Details
build log (build.log,4.43 KB, text/plain)
2011-03-31 06:54 UTC, cach0rr0
Details
Newly created blacklist patchfile (blacklist_ssl.patch,3.82 KB, patch)
2011-03-31 07:53 UTC, Søren Færløv
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description cach0rr0 2011-03-31 06:52:43 UTC
Created attachment 267937 [details]
output from failed patch

Brand new installation, fully ~amd64

"No file to patch.  Skipping patch." for all of the following:

src/network/ssl/qsslsocket_openssl.cpp
src/network/ssl/qsslcertificate_p.h
src/network/ssl/qsslcertificate.cpp

These appear to be modifications relating to the Comodo cert compromise a few days back. 

emerge --info below, will attach build.log and blacklist_ssl.patch.out


Portage 2.1.9.45 (default/linux/amd64/10.0/desktop/kde, gcc-4.4.4, glibc-2.11.2-r3, 2.6.37.5-zen x86_64)
=================================================================
                        System Settings
=================================================================
System uname: Linux-2.6.37.5-zen-x86_64-Pentium-R-_Dual-Core_CPU_T4200_@_2.00GHz-with-gentoo-2.0.2
Timestamp of tree: Thu, 31 Mar 2011 02:15:01 +0000
distcc 3.1 x86_64-pc-linux-gnu [disabled]
app-shells/bash:     4.1_p9
dev-lang/python:     2.6.6-r1, 3.1.2-r4
sys-apps/baselayout: 2.0.2
sys-apps/openrc:     0.8.0
sys-apps/sandbox:    2.4
sys-devel/autoconf:  2.65-r1
sys-devel/automake:  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.36.1 (sys-kernel/linux-headers)
ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="*"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=native -O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/config"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/gconf /etc/gentoo-release /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-march=native -O2 -pipe"
DISTDIR="/usr/portage/distfiles"
FEATURES="assume-digests binpkg-logs distlocks fixlafiles fixpackages news parallel-fetch protect-owned sandbox sfperms splitdebug strict unknown-features-warn unmerge-logs unmerge-orphans userfetch"
FFLAGS=""
GENTOO_MIRRORS="http://gentoo.osuosl.org/ "
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
LINGUAS="en_US en"
MAKEOPTS="-j2"
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=""
SYNC="rsync://rsync.namerica.gentoo.org/gentoo-portage"
USE="X a52 aac acl acpi alsa amd64 berkdb bluetooth branding bzip2 cairo cdr cli consolekit cracklib crypt cups cxx dbus declarative dri dts dvd dvdr emboss encode exif fam firefox flac fortran gdbm gdu gif gpm iconv ipv6 jpeg kde lcms ldap libnotify mad mikmod mmx mng modules mp3 mp4 mpeg mudflap multilib ncurses nls nptl nptlonly ogg opengl openmp pam pango pcre pdf perl png policykit ppds pppd python qt3support qt4 readline sdl session spell sse sse2 ssl startup-notification svg sysfs tcpd tiff truetype udev unicode usb vorbis 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="ptp2" 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" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="en_US en" PHP_TARGETS="php5-3" RUBY_TARGETS="ruby18" USERLAND="GNU" VIDEO_CARDS="intel 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, LANG, LC_ALL, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
=====================================================
houacer01 ~ # emerge -pqv =x11-libs/qt-core-4.7.2-r1
=====================================================
[ebuild  N    ] media-libs/fontconfig-2.8.0-r1  USE="-doc" 
[ebuild  N    ] app-admin/eselect-fontconfig-1.1 
[ebuild  N    ] media-fonts/dejavu-2.33  USE="X -fontforge" 
[ebuild  N    ] virtual/ttf-fonts-1 
[ebuild  N    ] x11-libs/libXft-2.2.0  USE="-static-libs" 
[ebuild  N    ] media-fonts/urw-fonts-2.4.9  USE="X" 
[ebuild  N    ] x11-libs/qt-core-4.7.2-r1  USE="exceptions glib iconv jit qt3support ssl (-aqua) -debug -optimized-qmake -pch -private-headers" 
[ebuild  N    ] x11-libs/qt-script-4.7.2  USE="exceptions iconv jit (-aqua) -debug -pch -private-headers" 
[ebuild  N    ] x11-libs/qt-dbus-4.7.2  USE="exceptions (-aqua) -debug -pch" 
[ebuild  N    ] net-print/cups-1.4.6  USE="X acl dbus jpeg ldap pam perl png python ssl threads tiff usb -debug -gnutls -java -kerberos -php -samba -slp -static-libs -xinetd" LINGUAS="-da -de -es -eu -fi -fr -id -it -ja -ko -nl -no -pl -pt -pt_BR -ru -sv -zh -zh_TW" 
[ebuild  N    ] app-text/ghostscript-gpl-9.01  USE="X cups -bindist -djvu -gtk -idn -jpeg2k" LINGUAS="-ja -ko -zh_CN -zh_TW" 
[ebuild  N    ] x11-libs/qt-gui-4.7.2  USE="accessibility cups dbus exceptions glib mng qt3support tiff (-aqua) -debug -egl -gtk -nas -nis -pch -private-headers -raster -trace -xinerama"                                                                                                                                                                              
[ebuild  N    ] x11-libs/cairo-1.10.2-r1  USE="X opengl qt4 svg xcb (-aqua) -debug -directfb -doc (-drm) (-gallium) (-openvg) -static-libs" 
[ebuild  N    ] dev-util/cmake-2.8.4  USE="ncurses qt4 -emacs -vim-syntax" 
[ebuild  N    ] x11-libs/pango-1.28.3-r1  USE="X -debug -doc (-introspection) -test" 
[ebuild  N    ] x11-libs/gtk+-2.24.3  USE="cups (-aqua) -debug -doc -examples (-introspection) -test -vim-syntax -xinerama" 
[ebuild  N    ] app-text/poppler-0.16.3  USE="abiword cairo cxx jpeg lcms png qt4 utils xpdf-headers -cjk -curl -debug -doc -exceptions (-introspection) -jpeg2k" 
[ebuild  N    ] dev-db/mysql-5.1.53  USE="community perl ssl -big-tables -cluster (-debug) -embedded -extraengine -latin1 -max-idx-128 -minimal -pbxt -profiling (-selinux) -static -test -xtradb"                                                                                                                                                                      
[ebuild  N    ] virtual/mysql-5.1  USE="-embedded -static" 
[ebuild  N    ] dev-perl/DBD-mysql-4.18-r1  USE="-embedded" 
[ebuild  N    ] x11-libs/qt-sql-4.7.2  USE="exceptions iconv mysql qt3support sqlite (-aqua) -debug (-firebird) -freetds -odbc -pch -postgres" 
[ebuild  N    ] x11-libs/qt-qt3support-4.7.2  USE="accessibility exceptions kde (-aqua) -debug -pch -phonon"
Comment 1 cach0rr0 2011-03-31 06:54:56 UTC
Created attachment 267941 [details]
build log

This was part of a kde-meta merge on a virgin gentoo install, for what that's worth.
Comment 2 Søren Færløv 2011-03-31 07:53:14 UTC
Created attachment 267945 [details, diff]
Newly created blacklist patchfile

I suspect the patchfile has wrong newlines. Try running "dos2unix" on /usr/portage/x11-libs/qt-core/files/blacklist_ssl.patch and then digest the ebuild again (ebuild /usr/portage/x11-libs/qt-core/qt-core-4.7.2-r1.ebuild digest). That should (hopefully) make it possible to emerge the new version of qt-core.

I tried adding the differences by hand and then creating a new pathfile. It was practically identical to the original. Thus my suspicion about the newlines arised. I've attached my patchfile just in case, the difference isn't just the newlines. With this patchfile I managed to emerge qt-core-4.7.2-r1 without issues.
Comment 3 Toralf Förster gentoo-dev 2011-03-31 07:58:57 UTC
(In reply to comment #2)
> I suspect the patchfile has wrong newlines.
correct - same here
Comment 4 Stefan Radermacher 2011-03-31 08:53:24 UTC
*** Bug 361425 has been marked as a duplicate of this bug. ***
Comment 5 cach0rr0 2011-03-31 09:02:53 UTC
confirmed. After s/crlf/lf/ via dos2unix, the patch applied without issue, and
qt-core merged successfully. 

Thanks to both of you for the quick response, easy enough hopefully this can be
committed with minimal pain!
Comment 6 Michael Weber (RETIRED) gentoo-dev 2011-03-31 10:04:55 UTC
confirmed bug and fix on 2 machines
Comment 7 Michael Weber (RETIRED) gentoo-dev 2011-03-31 10:10:09 UTC
fixed.

+  31 Mar 2011; Michael Weber <xmw@gentoo.org> files/blacklist_ssl.patch:
+  Fix line breaks, thanks to all reporters on bug 361415 and tampakrap for
+  permission
Comment 8 Nebojsa Trpkovic 2011-05-10 22:46:05 UTC
same problem with x11-libs/qt-core-4.7.3 ?