From 160808a0be960b6ca05917127ad5752df91521b5 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 18 Mar 2005 00:53:24 +0000 Subject: Add an upstream patch to fix a security issue with information leakage #85387. Package-Manager: portage-2.0.51.19 --- app-emulation/wine/ChangeLog | 9 +- app-emulation/wine/Manifest | 7 +- app-emulation/wine/files/digest-wine-20050111 | 1 - app-emulation/wine/files/digest-wine-20050111-r1 | 1 + .../wine-20050111-upstream-registry-fix.patch.bz2 | Bin 0 -> 13584 bytes app-emulation/wine/wine-20050111-r1.ebuild | 112 +++++++++++++++++++++ app-emulation/wine/wine-20050111.ebuild | 112 --------------------- 7 files changed, 125 insertions(+), 117 deletions(-) delete mode 100644 app-emulation/wine/files/digest-wine-20050111 create mode 100644 app-emulation/wine/files/digest-wine-20050111-r1 create mode 100644 app-emulation/wine/files/wine-20050111-upstream-registry-fix.patch.bz2 create mode 100644 app-emulation/wine/wine-20050111-r1.ebuild delete mode 100644 app-emulation/wine/wine-20050111.ebuild (limited to 'app-emulation') diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 2a4d5669831e..8d6269c33107 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/wine # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.89 2005/03/13 11:00:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.90 2005/03/18 00:53:24 vapier Exp $ + +*wine-20050111-r1 (18 Mar 2005) + + 18 Mar 2005; Mike Frysinger + +files/wine-20050111-upstream-registry-fix.patch.bz2, + -wine-20050111.ebuild, +wine-20050111-r1.ebuild: + Add an upstream patch to fix a security issue with information leakage #85387. *wine-20050310 (13 Mar 2005) diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index e21459e55915..b2efe18b1df3 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -1,15 +1,16 @@ -MD5 4aec1efb2da76e4815808698c38a880c ChangeLog 15879 +MD5 449230b44a85c482406dc3bec7b22618 ChangeLog 16151 MD5 6525c48ba09d08599432ea6c299e52f4 metadata.xml 354 MD5 c1827c6cc58e99351d55e19916234acf wine-20050310.ebuild 3429 MD5 1fcec66c3a3db069065a704291b8b4c4 wine-20041019.ebuild 3772 MD5 fb6682213117b666a78dd3b8960b190d wine-20041019-r3.ebuild 2927 -MD5 db33247fa3d4ed19668319fa3497fa61 wine-20050111.ebuild 3059 MD5 29184f4b38f581e093dd147a4df25c78 wine-20050211.ebuild 3471 +MD5 ecc175b14b17bb75418a8b58e62a91cd wine-20050111-r1.ebuild 3096 MD5 67846279ad436d5d70d0857d29c5fabf files/20050211-docs.patch 719 MD5 64c9b939319110b4f44ef6f431262181 files/digest-wine-20041019 212 MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325 MD5 03f968d969bdc86d7afd384b026aa7cf files/digest-wine-20050310 67 MD5 23ff2a3980929ae4a6f02161bd875b55 files/digest-wine-20041019-r3 67 +MD5 32c5bd022b8547d02b07517dd7a9bc02 files/wine-20050111-upstream-registry-fix.patch.bz2 13584 MD5 d9e9a2cb6521b07ace7e7c142679b85b files/20041019-no-stack.patch 257 -MD5 8028af5342611d0521183f95342f787a files/digest-wine-20050111 67 MD5 fe364ce26a93f838a04f30b274df034c files/digest-wine-20050211 67 +MD5 8028af5342611d0521183f95342f787a files/digest-wine-20050111-r1 67 diff --git a/app-emulation/wine/files/digest-wine-20050111 b/app-emulation/wine/files/digest-wine-20050111 deleted file mode 100644 index c061286bb658..000000000000 --- a/app-emulation/wine/files/digest-wine-20050111 +++ /dev/null @@ -1 +0,0 @@ -MD5 33f80e2c7a228912a3ab28fc163550b3 Wine-20050111.tar.gz 11477802 diff --git a/app-emulation/wine/files/digest-wine-20050111-r1 b/app-emulation/wine/files/digest-wine-20050111-r1 new file mode 100644 index 000000000000..c061286bb658 --- /dev/null +++ b/app-emulation/wine/files/digest-wine-20050111-r1 @@ -0,0 +1 @@ +MD5 33f80e2c7a228912a3ab28fc163550b3 Wine-20050111.tar.gz 11477802 diff --git a/app-emulation/wine/files/wine-20050111-upstream-registry-fix.patch.bz2 b/app-emulation/wine/files/wine-20050111-upstream-registry-fix.patch.bz2 new file mode 100644 index 000000000000..05dac02a5a52 Binary files /dev/null and b/app-emulation/wine/files/wine-20050111-upstream-registry-fix.patch.bz2 differ diff --git a/app-emulation/wine/wine-20050111-r1.ebuild b/app-emulation/wine/wine-20050111-r1.ebuild new file mode 100644 index 000000000000..f151027c30b3 --- /dev/null +++ b/app-emulation/wine/wine-20050111-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050111-r1.ebuild,v 1.1 2005/03/18 00:53:24 vapier Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="free implementation of Windows(tm) on Unix - CVS snapshot" +HOMEPAGE="http://www.winehq.com/" +SRC_URI="mirror://sourceforge/${PN}/Wine-${PV}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="-* x86" +IUSE="X alsa arts cups debug nas opengl gif glut jack jpeg oss ncurses doc lcms" +RESTRICT="maketest" #72375 + +RDEPEND=">=media-libs/freetype-2.0.0 + ncurses? ( >=sys-libs/ncurses-5.2 ) + jack? ( media-sound/jack-audio-connection-kit ) + X? ( virtual/x11 ) + arts? ( kde-base/arts ) + alsa? ( media-libs/alsa-lib ) + nas? ( media-libs/nas ) + cups? ( net-print/cups ) + opengl? ( virtual/opengl ) + gif? ( media-libs/libungif ) + jpeg? ( media-libs/jpeg ) + glut? ( virtual/glut ) + lcms? ( media-libs/lcms )" +DEPEND="${RDEPEND} + sys-devel/bison + doc? ( app-text/docbook-sgml-utils app-text/jadetex ) + sys-devel/flex" + +src_unpack() { + unpack Wine-${PV}.tar.gz + cd "${S}" + + epatch "${FILESDIR}"/${P}-upstream-registry-fix.patch.bz2 #85387 + + epatch "${FILESDIR}"/winearts-kdecvs-fix.patch + sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in + + test_flag -fstack-protector && epatch "${FILESDIR}"/20041019-no-stack.patch #66002 +} + +config_cache() { + local h ans="no" + use ${1} && ans="yes" + shift + for h in "$@" ; do + export ac_cv_${h}=${ans} + done +} + +src_compile() { + export LDCONFIG=/bin/true + config_cache jack header_jack_jack_h + config_cache cups header_cups_cups_h + config_cache alsa header_alsa_asoundlib_h header_sys_asoundlib_h lib_asound_snd_pcm_open + use arts || export ARTSCCONFIG="/bin/false" + config_cache nas header_audio_audiolib_h header_audio_soundlib_h + config_cache gif header_gif_lib_h + config_cache glut lib_glut_glutMainLoop + config_cache jpeg header_jpeglib_h + config_cache oss header_sys_soundcard_h header_machine_soundcard_h header_soundcard_h + config_cache lcms header_lcms_h + + strip-flags + use lcms && append-flags -I${ROOT}/usr/include/lcms + + if ! built_with_use app-text/docbook-sgml-utils tetex ; then + export DB2PDF=true + export DB2PS=true + fi + + # $(use_enable amd64 win64) + # USE=debug is broken in this release + econf \ + --sysconfdir=/etc/wine \ + $(use_with ncurses curses) \ + $(use_with opengl) \ + $(use_with X x) \ + $(use_enable debug trace) \ + $(use_enable debug) \ + || die "configure failed" + + emake -j1 depend || die "depend" + emake all || die "all" + if use doc ; then + emake -j1 -C documentation doc || die "docs" + fi +} + +src_install() { + make \ + prefix="${D}"/usr \ + bindir="${D}"/usr/bin \ + datadir="${D}"/usr/share \ + includedir="${D}"/usr/include/wine \ + sysconfdir="${D}"/etc/wine \ + mandir="${D}"/usr/share/man \ + libdir="${D}"/usr/lib \ + dlldir="${D}"/usr/lib/wine \ + install || die + use doc && dodoc documentation/*.pdf + + insinto /usr/share/wine + doins documentation/samples/config || die "doins config" + + dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS README +} diff --git a/app-emulation/wine/wine-20050111.ebuild b/app-emulation/wine/wine-20050111.ebuild deleted file mode 100644 index 8b12bf7fc259..000000000000 --- a/app-emulation/wine/wine-20050111.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050111.ebuild,v 1.3 2005/02/20 02:30:35 vapier Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="free implementation of Windows(tm) on Unix - CVS snapshot" -HOMEPAGE="http://www.winehq.com/" -SRC_URI="mirror://sourceforge/${PN}/Wine-${PV}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="-* x86" -IUSE="X alsa arts cups debug nas opengl gif glut jack jpeg oss ncurses doc lcms" -RESTRICT="maketest" #72375 - -RDEPEND=">=media-libs/freetype-2.0.0 - ncurses? ( >=sys-libs/ncurses-5.2 ) - jack? ( media-sound/jack-audio-connection-kit ) - X? ( virtual/x11 ) - arts? ( kde-base/arts ) - alsa? ( media-libs/alsa-lib ) - nas? ( media-libs/nas ) - cups? ( net-print/cups ) - opengl? ( virtual/opengl ) - gif? ( media-libs/libungif ) - jpeg? ( media-libs/jpeg ) - glut? ( virtual/glut ) - lcms? ( media-libs/lcms )" -DEPEND="${RDEPEND} - >=sys-apps/sed-4 - sys-devel/bison - sys-devel/gcc - doc? ( app-text/docbook-sgml-utils app-text/jadetex ) - sys-devel/flex" - -src_unpack() { - unpack Wine-${PV}.tar.gz - cd "${S}" - - epatch "${FILESDIR}"/winearts-kdecvs-fix.patch - sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in - - test_flag -fstack-protector && epatch "${FILESDIR}"/20041019-no-stack.patch #66002 -} - -config_cache() { - local h ans="no" - use ${1} && ans="yes" - shift - for h in "$@" ; do - export ac_cv_${h}=${ans} - done -} - -src_compile() { - export LDCONFIG=/bin/true - config_cache jack header_jack_jack_h - config_cache cups header_cups_cups_h - config_cache alsa header_alsa_asoundlib_h header_sys_asoundlib_h lib_asound_snd_pcm_open - use arts || export ARTSCCONFIG="/bin/false" - config_cache nas header_audio_audiolib_h header_audio_soundlib_h - config_cache gif header_gif_lib_h - config_cache glut lib_glut_glutMainLoop - config_cache jpeg header_jpeglib_h - config_cache oss header_sys_soundcard_h header_machine_soundcard_h header_soundcard_h - config_cache lcms header_lcms_h - - strip-flags - use lcms && append-flags -I${ROOT}/usr/include/lcms - - if ! built_with_use app-text/docbook-sgml-utils tetex ; then - export DB2PDF=true - export DB2PS=true - fi - - # $(use_enable amd64 win64) - # USE=debug is broken in this release - econf \ - --sysconfdir=/etc/wine \ - $(use_with ncurses curses) \ - $(use_with opengl) \ - $(use_with X x) \ - $(use_enable debug trace) \ - $(use_enable debug) \ - || die "configure failed" - - emake -j1 depend || die "depend" - emake all || die "all" - if use doc ; then - emake -j1 -C documentation doc || die "docs" - fi -} - -src_install() { - make \ - prefix="${D}"/usr \ - bindir="${D}"/usr/bin \ - datadir="${D}"/usr/share \ - includedir="${D}"/usr/include/wine \ - sysconfdir="${D}"/etc/wine \ - mandir="${D}"/usr/share/man \ - libdir="${D}"/usr/lib \ - dlldir="${D}"/usr/lib/wine \ - install || die - use doc && dodoc documentation/*.pdf - - insinto /usr/share/wine - doins documentation/samples/config || die "doins config" - - dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS README -} -- cgit v1.2.3-65-gdbad