kensington 15/03/17 14:41:53 Modified: ChangeLog Added: qtgui-4.8.5-r4.ebuild qtgui-4.8.6-r2.ebuild Removed: qtgui-4.8.6-r1.ebuild Log: Backport patch from upstream to solve CVE-2015-0295 wrt bug #541972. (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Revision Changes Path 1.62 dev-qt/qtgui/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/ChangeLog?rev=1.62&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/ChangeLog?rev=1.62&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/ChangeLog?r1=1.61&r2=1.62 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- ChangeLog 17 Mar 2015 14:24:12 -0000 1.61 +++ ChangeLog 17 Mar 2015 14:41:53 -0000 1.62 @@ -1,6 +1,14 @@ # ChangeLog for dev-qt/qtgui # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.61 2015/03/17 14:24:12 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.62 2015/03/17 14:41:53 kensington Exp $ + +*qtgui-4.8.6-r2 (17 Mar 2015) +*qtgui-4.8.5-r4 (17 Mar 2015) + + 17 Mar 2015; Michael Palimaka <kensing...@gentoo.org> + +files/qtgui-4.8.5-CVE-2015-0295.patch, +qtgui-4.8.5-r4.ebuild, + +qtgui-4.8.6-r2.ebuild, -qtgui-4.8.6-r1.ebuild: + Backport patch from upstream to solve CVE-2015-0295 wrt bug #541972. *qtgui-5.4.1-r1 (17 Mar 2015) 1.1 dev-qt/qtgui/qtgui-4.8.5-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild?rev=1.1&content-type=text/plain Index: qtgui-4.8.5-r4.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild,v 1.1 2015/03/17 14:41:53 kensington Exp $ EAPI=5 inherit eutils qt4-build DESCRIPTION="The GUI module for the Qt toolkit" SRC_URI+=" http://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"; SLOT="4" if [[ ${QT4_BUILD_TYPE} == live ]]; then KEYWORDS="" else KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv" REQUIRED_USE=" gtkstyle? ( glib ) " # cairo[-qt4] is needed because of bug 454066 RDEPEND=" app-admin/eselect-qtgraphicssystem ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=] ~dev-qt/qtscript-${PV}[aqua=,debug=] media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sys-libs/zlib virtual/jpeg:0 !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) cups? ( net-print/cups ) egl? ( media-libs/mesa[egl] ) glib? ( dev-libs/glib:2 ) gtkstyle? ( x11-libs/cairo[-qt4] x11-libs/gtk+:2[aqua=] ) mng? ( >=media-libs/libmng-1.0.9:= ) nas? ( >=media-libs/nas-1.5 ) tiff? ( media-libs/tiff:0 ) !<dev-qt/qthelp-4.8.5:4 " DEPEND="${RDEPEND} !aqua? ( x11-proto/inputproto x11-proto/xextproto xinerama? ( x11-proto/xineramaproto ) xv? ( x11-proto/videoproto ) ) " PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )" PATCHES=( "${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880 "${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257 "${FILESDIR}/${PN}-4.8.5-cleanlooks-floating-point-exception.patch" # bug 507124 "${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226 "${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984 "${FILESDIR}/${PN}-4.8.5-keyboard-shortcuts.patch" # bug 477796 "${FILESDIR}/${PN}-4.8.5-libjpeg-9.patch" # bug 480182 "${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968 "${FILESDIR}/${PN}-4.8.5-CVE-2015-0295.patch" # bug 541972 ) pkg_setup() { QT4_TARGET_DIRECTORIES=" src/gui src/scripttools src/plugins/imageformats/gif src/plugins/imageformats/ico src/plugins/imageformats/jpeg src/plugins/imageformats/tga src/plugins/inputmethods" QT4_EXTRACT_DIRECTORIES=" examples/desktop/systray include src" use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets" use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng" use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff" use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay" # mac version does not contain qtconfig? [[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig" QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}" qt4-build_pkg_setup } src_prepare() { qt4-build_src_prepare # Add -xvideo to the list of accepted configure options sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die } src_configure() { myconf="$(qt_use accessibility) $(qt_use cups) $(qt_use glib) $(qt_use mng libmng system) $(qt_use nas nas-sound system) $(qt_use nis) $(qt_use tiff libtiff system) $(qt_use egl) $(qt_use qt3support) $(qt_use gtkstyle) $(qt_use xinerama) $(qt_use xv xvideo)" myconf+=" -system-libpng -system-libjpeg -system-zlib -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" # bug 367045 [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" qt4-build_src_configure if use gtkstyle; then sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed" fi sed -i -e 's:-I/usr/include/qt4/QtGui ::' src/gui/Makefile || die "sed failed" } src_install() { QCONFIG_ADD=" mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync fontconfig system-freetype gif png system-png jpeg system-jpeg $(usev accessibility) $(usev cups) $(use mng && echo system-mng) $(usev nas) $(usev nis) $(use tiff && echo system-tiff) $(usev xinerama) $(use xv && echo xvideo)" QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui" QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) $(use cups && echo QT_CUPS) $(use egl && echo QT_EGL) QT_FONTCONFIG QT_FREETYPE $(use gtkstyle && echo QT_STYLE_GTK) QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG $(use mng && echo QT_IMAGEFORMAT_MNG) $(use nas && echo QT_NAS) $(use nis && echo QT_NIS) $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES $(use xinerama && echo QT_XINERAMA) QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC $(use xv && echo QT_XVIDEO)" qt4-build_src_install # install private headers if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/ else insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private fi find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then # rerun to get links to headers right fix_includes fi # touch the available graphics systems dodir /usr/share/qt4/graphicssystems echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die newicon tools/qtconfig/images/appicon.png qtconfig.png make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' # bug 388551 if use gtkstyle; then local tempfile=${T}/${PN}${SLOT}.sh cat <<-EOF > "${tempfile}" export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0 EOF insinto /etc/profile.d doins "${tempfile}" fi } pkg_postinst() { qt4-build_pkg_postinst # raster is the default graphicssystem, set it on first install eselect qtgraphicssystem set raster --use-old } 1.1 dev-qt/qtgui/qtgui-4.8.6-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/qtgui-4.8.6-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/qtgui-4.8.6-r2.ebuild?rev=1.1&content-type=text/plain Index: qtgui-4.8.6-r2.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.6-r2.ebuild,v 1.1 2015/03/17 14:41:53 kensington Exp $ EAPI=5 inherit eutils qt4-build-multilib DESCRIPTION="The GUI module for the Qt toolkit" SRC_URI+=" http://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"; if [[ ${QT4_BUILD_TYPE} == live ]]; then KEYWORDS="" else KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv" REQUIRED_USE=" gtkstyle? ( glib ) " # cairo[-qt4] is needed because of bug 454066 RDEPEND=" app-admin/eselect-qtgraphicssystem ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}] ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}] >=media-libs/freetype-2.4.11-r1:2[${MULTILIB_USEDEP}] media-libs/libpng:0=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] virtual/jpeg:0[${MULTILIB_USEDEP}] !aqua? ( >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] >=x11-libs/libXcursor-1.1.13-r1[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}] >=x11-libs/libXfixes-5.0-r1[${MULTILIB_USEDEP}] >=x11-libs/libXi-1.6.2-r1[${MULTILIB_USEDEP}] >=x11-libs/libXrandr-1.4.0-r1[${MULTILIB_USEDEP}] >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] xinerama? ( >=x11-libs/libXinerama-1.1.2-r1[${MULTILIB_USEDEP}] ) xv? ( >=x11-libs/libXv-1.0.7-r1[${MULTILIB_USEDEP}] ) ) cups? ( net-print/cups[${MULTILIB_USEDEP}] ) egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] ) glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) gtkstyle? ( >=x11-libs/cairo-1.12[-qt4,${MULTILIB_USEDEP}] >=x11-libs/gtk+-2.24.23-r1:2[aqua=,${MULTILIB_USEDEP}] ) mng? ( >=media-libs/libmng-1.0.10-r2:=[${MULTILIB_USEDEP}] ) nas? ( >=media-libs/nas-1.9.3-r1[${MULTILIB_USEDEP}] ) tiff? ( >=media-libs/tiff-4.0.3-r2:0[${MULTILIB_USEDEP}] ) !<dev-qt/qthelp-4.8.5:4 " DEPEND="${RDEPEND} !aqua? ( >=x11-proto/inputproto-2.2-r1[${MULTILIB_USEDEP}] >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] ) xv? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] ) ) " PDEPEND=" qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) " PATCHES=( "${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880 "${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257 "${FILESDIR}/${PN}-4.8.5-cleanlooks-floating-point-exception.patch" # bug 507124 "${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226 "${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984 "${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968 "${FILESDIR}/${PN}-4.8.5-CVE-2015-0295.patch" # bug 541972 ) QT4_TARGET_DIRECTORIES=" src/gui src/scripttools src/plugins/imageformats/gif src/plugins/imageformats/ico src/plugins/imageformats/jpeg src/plugins/imageformats/tga src/plugins/inputmethods" pkg_setup() { use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets" use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng" use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff" use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay" [[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig" QCONFIG_ADD=" mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync fontconfig system-freetype gif png system-png jpeg system-jpeg $(usev accessibility) $(usev cups) $(use mng && echo system-mng) $(usev nas) $(usev nis) $(use tiff && echo system-tiff) $(usev xinerama) $(use xv && echo xvideo)" QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui" QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) $(use cups && echo QT_CUPS) $(use egl && echo QT_EGL) QT_FONTCONFIG QT_FREETYPE $(use gtkstyle && echo QT_STYLE_GTK) QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG $(use mng && echo QT_IMAGEFORMAT_MNG) $(use nas && echo QT_NAS) $(use nis && echo QT_NIS) $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES $(use xinerama && echo QT_XINERAMA) QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC $(use xv && echo QT_XVIDEO)" } src_prepare() { qt4-build-multilib_src_prepare # Add -xvideo to the list of accepted configure options sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die } multilib_src_configure() { local myconf=( $(qt_use accessibility) $(qt_use cups) $(qt_use glib) $(qt_use mng libmng system) $(qt_use nas nas-sound system) $(qt_use nis) $(qt_use tiff libtiff system) $(qt_use egl) $(qt_use qt3support) $(qt_use gtkstyle) $(qt_use xinerama) $(qt_use xv xvideo) -system-libpng -system-libjpeg -system-zlib -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb -fontconfig -no-svg -no-webkit -no-phonon -no-opengl $([[ ${CHOST} == *86*-apple-darwin* ]] && echo -no-ssse3) # bug 367045 ) qt4_multilib_src_configure } multilib_src_install_all() { qt4_multilib_src_install_all dodir /usr/share/qt4/graphicssystems echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die if has tools/qtconfig ${QT4_TARGET_DIRECTORIES}; then newicon tools/qtconfig/images/appicon.png qtconfig.png make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' fi } pkg_postinst() { qt4-build-multilib_pkg_postinst # raster is the default graphicssystem, set it on first install eselect qtgraphicssystem set raster --use-old }
