From 2cd4a6fb2e3e99ed5cfad7a5a7d4ebc6aae04cfa Mon Sep 17 00:00:00 2001 From: Matsuu Takuto Date: Mon, 4 Feb 2008 16:28:03 +0000 Subject: Version bump and fixed CVE-2006-4484, bug #208464. (Portage version: 2.1.3.19) --- dev-lang/tk/ChangeLog | 15 +++- dev-lang/tk/files/tk-CVE-2006-4484.patch | 63 ++++++++++++++++ dev-lang/tk/tk-8.4.15-r2.ebuild | 123 +++++++++++++++++++++++++++++++ dev-lang/tk/tk-8.4.16.ebuild | 117 ----------------------------- dev-lang/tk/tk-8.4.17.ebuild | 120 ++++++++++++++++++++++++++++++ dev-lang/tk/tk-8.5.0-r1.ebuild | 106 -------------------------- dev-lang/tk/tk-8.5.0-r2.ebuild | 109 +++++++++++++++++++++++++++ dev-lang/tk/tk-8.5.0.ebuild | 104 -------------------------- 8 files changed, 428 insertions(+), 329 deletions(-) create mode 100644 dev-lang/tk/files/tk-CVE-2006-4484.patch create mode 100644 dev-lang/tk/tk-8.4.15-r2.ebuild delete mode 100644 dev-lang/tk/tk-8.4.16.ebuild create mode 100644 dev-lang/tk/tk-8.4.17.ebuild delete mode 100644 dev-lang/tk/tk-8.5.0-r1.ebuild create mode 100644 dev-lang/tk/tk-8.5.0-r2.ebuild delete mode 100644 dev-lang/tk/tk-8.5.0.ebuild (limited to 'dev-lang/tk') diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog index ad60a8f93ac5..db892e9dcdad 100644 --- a/dev-lang/tk/ChangeLog +++ b/dev-lang/tk/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for dev-lang/tk -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.101 2007/12/30 03:35:09 matsuu Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.102 2008/02/04 16:28:02 matsuu Exp $ + +*tk-8.5.0-r2 (04 Feb 2008) +*tk-8.4.17 (04 Feb 2008) +*tk-8.4.15-r2 (04 Feb 2008) + + 04 Feb 2008; MATSUU Takuto + +files/tk-CVE-2006-4484.patch, +tk-8.4.15-r2.ebuild, -tk-8.4.16.ebuild, + +tk-8.4.17.ebuild, -tk-8.5.0.ebuild, -tk-8.5.0-r1.ebuild, + +tk-8.5.0-r2.ebuild: + Version bumped. + Fixed CVE-2006-4484, bug #208464. *tk-8.5.0-r1 (30 Dec 2007) diff --git a/dev-lang/tk/files/tk-CVE-2006-4484.patch b/dev-lang/tk/files/tk-CVE-2006-4484.patch new file mode 100644 index 000000000000..e8a81f384f28 --- /dev/null +++ b/dev-lang/tk/files/tk-CVE-2006-4484.patch @@ -0,0 +1,63 @@ +Index: generic/tkImgGIF.c +=================================================================== +RCS file: /cvsroot/tktoolkit/tk/generic/tkImgGIF.c,v +retrieving revision 1.24.2.5 +diff -u -r1.24.2.5 tkImgGIF.c +--- generic/tkImgGIF.c 11 Sep 2007 18:01:45 -0000 1.24.2.5 ++++ generic/tkImgGIF.c 25 Jan 2008 19:23:01 -0000 +@@ -826,6 +826,12 @@ + Tcl_PosixError(interp), (char *) NULL); + return TCL_ERROR; + } ++ ++ if (initialCodeSize > MAX_LWZ_BITS) { ++ Tcl_SetResult(interp, "malformed image", TCL_STATIC); ++ return TCL_ERROR; ++ } ++ + if (transparent != -1) { + cmap[transparent][CM_RED] = 0; + cmap[transparent][CM_GREEN] = 0; +Index: tests/imgPhoto.test +=================================================================== +RCS file: /cvsroot/tktoolkit/tk/tests/imgPhoto.test,v +retrieving revision 1.15.2.5 +diff -u -r1.15.2.5 imgPhoto.test +--- tests/imgPhoto.test 11 Sep 2007 18:01:46 -0000 1.15.2.5 ++++ tests/imgPhoto.test 25 Jan 2008 19:23:01 -0000 +@@ -681,6 +681,35 @@ + image delete $i + } + ++test imgPhoto-14.4 {GIF buffer overflow} -setup { ++ set i [image create photo] ++} -body { ++ # This crashes Tk up to 8.4.17 and 8.5.0 ++ $i configure -data { ++ R0lGODlhCgAKAPcAAAAAAIAAAACAAICAAAAAgIAAgACAgICAgMDAwP8AAAD/ ++ AP//AAAA//8A/wD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ++ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ++ AAAAMwAAZgAAmQAAzAAA/wAzAAAzMwAzZgAzmQAzzAAz/wBmAABmMwBmZgBm ++ mQBmzABm/wCZAACZMwCZZgCZmQCZzACZ/wDMAADMMwDMZgDMmQDMzADM/wD/ ++ AAD/MwD/ZgD/mQD/zAD//zMAADMAMzMAZjMAmTMAzDMA/zMzADMzMzMzZjMz ++ mTMzzDMz/zNmADNmMzNmZjNmmTNmzDNm/zOZADOZMzOZZjOZmTOZzDOZ/zPM ++ ADPMMzPMZjPMmTPMzDPM/zP/ADP/MzP/ZjP/mTP/zDP//2YAAGYAM2YAZmYA ++ mWYAzGYA/2YzAGYzM2YzZmYzmWYzzGYz/2ZmAGZmM2ZmZmZmmWZmzGZm/2aZ ++ AGaZM2aZZmaZmWaZzGaZ/2bMAGbMM2bMZmbMmWbMzGbM/2b/AGb/M2b/Zmb/ ++ mWb/zGb//5kAAJkAM5kAZpkAmZkAzJkA/5kzAJkzM5kzZpkzmZkzzJkz/5lm ++ AJlmM5lmZplmmZlmzJlm/5mZAJmZM5mZZpmZmZmZzJmZ/5nMAJnMM5nMZpnM ++ mZnMzJnM/5n/AJn/M5n/Zpn/mZn/zJn//8wAAMwAM8wAZswAmcwAzMwA/8wz ++ AMwzM8wzZswzmcwzzMwz/8xmAMxmM8xmZsxmmcxmzMxm/8yZAMyZM8yZZsyZ ++ mcyZzMyZ/8zMAMzMM8zMZszMmczMzMzM/8z/AMz/M8z/Zsz/mcz/zMz///8A ++ AP8AM/8AZv8Amf8AzP8A//8zAP8zM/8zZv8zmf8zzP8z//9mAP9mM/9mZv9m ++ mf9mzP9m//+ZAP+ZM/+ZZv+Zmf+ZzP+Z///MAP/MM//MZv/Mmf/MzP/M//// ++ AP//M///Zv//mf//zP///yH5BAEAABAALAAAAAAKAAoAABUSAAD/HEiwoMGD ++ CBMqXMiwYcKAADs= ++ } ++} -cleanup { ++ image delete $i ++} -returnCodes error -result {malformed image} ++ + test imgPhoto-15.1 {photo images can fail to allocate memory gracefully} \ + {nonPortable} { + # This is not portable to very large machines with more around diff --git a/dev-lang/tk/tk-8.4.15-r2.ebuild b/dev-lang/tk/tk-8.4.15-r2.ebuild new file mode 100644 index 000000000000..7daa07327f1f --- /dev/null +++ b/dev-lang/tk/tk-8.4.15-r2.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.15-r2.ebuild,v 1.1 2008/02/04 16:28:02 matsuu Exp $ + +WANT_AUTOCONF=latest +WANT_AUTOMAKE=latest + +inherit autotools eutils multilib toolchain-funcs + +DESCRIPTION="Tk Widget Set" +HOMEPAGE="http://dev.scriptics.com/software/tcltk/" +SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="debug threads" + +RDEPEND="x11-libs/libX11 + ~dev-lang/tcl-${PV}" +DEPEND="${RDEPEND} + x11-libs/libXt + x11-proto/xproto" + +S=${WORKDIR}/${PN}${PV} + +pkg_setup() { + if use threads ; then + ewarn "" + ewarn "PLEASE NOTE: You are compiling ${P} with" + ewarn "threading enabled." + ewarn "Threading is not supported by all applications" + ewarn "that compile against tcl. You use threading at" + ewarn "your own discretion." + ewarn "" + epause 5 + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/remove-control-v-8.4.9.diff + epatch "${FILESDIR}"/${PN}-8.4.9-man.patch + epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch + + # Bug 125971 + epatch "${FILESDIR}"/${P}-tclm4-soname.patch + + # Bug 192539 + epatch "${FILESDIR}"/${PN}-CVE-2007-4851.patch + + # Bug 208464 + epatch "${FILESDIR}"/${PN}-CVE-2006-4484.patch + + local d + for d in */configure ; do + cd "${S}"/${d%%/*} + EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \ + epatch "${FILESDIR}"/tk-configure-LANG.patch + done + + cd "${S}"/unix + eautoreconf +} + +src_compile() { + tc-export CC + cd "${S}"/unix + + local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} + + econf \ + --with-tcl=/usr/${mylibdir} \ + $(use_enable threads) \ + $(use_enable debug symbols) || die + + emake || die +} + +src_install() { + #short version number + local v1 + v1=${PV%.*} + + cd "${S}"/unix + make DESTDIR="${D}" install || die + + # fix the tkConfig.sh to eliminate refs to the build directory + local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} + sed -i \ + -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \ + -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \ + -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \ + -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \ + -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \ + -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \ + "${D}"/usr/${mylibdir}/tkConfig.sh || die + + # install private headers + insinto /usr/${mylibdir}/tk${v1}/include/unix + doins "${S}"/unix/*.h || die + insinto /usr/${mylibdir}/tk${v1}/include/generic + doins "${S}"/generic/*.h || die + rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h + rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h + rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h + + # install symlink for libraries + #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a + if use debug ; then + dosym libtk${v1}g.so /usr/${mylibdir}/libtk${v1}.so + dosym libtkstub${v1}g.a /usr/${mylibdir}/libtkstub${v1}.a + dosym ../tk${v1}g/pkgIndex.tcl /usr/${mylibdir}/tk${v1}/pkgIndex.tcl + fi + dosym libtk${v1}.so /usr/${mylibdir}/libtk.so + dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a + + dosym wish${v1} /usr/bin/wish + + cd "${S}" + dodoc ChangeLog README changes license.terms +} diff --git a/dev-lang/tk/tk-8.4.16.ebuild b/dev-lang/tk/tk-8.4.16.ebuild deleted file mode 100644 index 0052978faa77..000000000000 --- a/dev-lang/tk/tk-8.4.16.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.16.ebuild,v 1.1 2007/12/22 03:58:06 matsuu Exp $ - -WANT_AUTOCONF=latest -WANT_AUTOMAKE=latest - -inherit autotools eutils multilib toolchain-funcs - -DESCRIPTION="Tk Widget Set" -HOMEPAGE="http://dev.scriptics.com/software/tcltk/" -SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="debug threads" - -RDEPEND="x11-libs/libX11 - ~dev-lang/tcl-${PV}" -DEPEND="${RDEPEND} - x11-libs/libXt - x11-proto/xproto" - -S=${WORKDIR}/${PN}${PV} - -pkg_setup() { - if use threads ; then - ewarn "" - ewarn "PLEASE NOTE: You are compiling ${P} with" - ewarn "threading enabled." - ewarn "Threading is not supported by all applications" - ewarn "that compile against tcl. You use threading at" - ewarn "your own discretion." - ewarn "" - epause 5 - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/remove-control-v-8.4.9.diff - epatch "${FILESDIR}"/${PN}-8.4.9-man.patch - epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch - - # Bug 125971 - epatch "${FILESDIR}"/${PN}-8.4.15-tclm4-soname.patch - - local d - for d in */configure ; do - cd "${S}"/${d%%/*} - EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \ - epatch "${FILESDIR}"/tk-configure-LANG.patch - done - - cd "${S}"/unix - eautoreconf -} - -src_compile() { - tc-export CC - cd "${S}"/unix - - local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} - - econf \ - --with-tcl=/usr/${mylibdir} \ - $(use_enable threads) \ - $(use_enable debug symbols) || die - - emake || die -} - -src_install() { - #short version number - local v1 - v1=${PV%.*} - - cd "${S}"/unix - make DESTDIR="${D}" install || die - - # fix the tkConfig.sh to eliminate refs to the build directory - local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} - sed -i \ - -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \ - -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \ - -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \ - -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \ - -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \ - -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \ - "${D}"/usr/${mylibdir}/tkConfig.sh || die - - # install private headers - insinto /usr/${mylibdir}/tk${v1}/include/unix - doins "${S}"/unix/*.h || die - insinto /usr/${mylibdir}/tk${v1}/include/generic - doins "${S}"/generic/*.h || die - rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h - rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h - rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h - - # install symlink for libraries - #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a - if use debug ; then - dosym libtk${v1}g.so /usr/${mylibdir}/libtk${v1}.so - dosym libtkstub${v1}g.a /usr/${mylibdir}/libtkstub${v1}.a - dosym ../tk${v1}g/pkgIndex.tcl /usr/${mylibdir}/tk${v1}/pkgIndex.tcl - fi - dosym libtk${v1}.so /usr/${mylibdir}/libtk.so - dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a - - dosym wish${v1} /usr/bin/wish - - cd "${S}" - dodoc ChangeLog README changes license.terms -} diff --git a/dev-lang/tk/tk-8.4.17.ebuild b/dev-lang/tk/tk-8.4.17.ebuild new file mode 100644 index 000000000000..3651ec371e19 --- /dev/null +++ b/dev-lang/tk/tk-8.4.17.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.17.ebuild,v 1.1 2008/02/04 16:28:02 matsuu Exp $ + +WANT_AUTOCONF=latest +WANT_AUTOMAKE=latest + +inherit autotools eutils multilib toolchain-funcs + +DESCRIPTION="Tk Widget Set" +HOMEPAGE="http://dev.scriptics.com/software/tcltk/" +SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="debug threads" + +RDEPEND="x11-libs/libX11 + ~dev-lang/tcl-${PV}" +DEPEND="${RDEPEND} + x11-libs/libXt + x11-proto/xproto" + +S=${WORKDIR}/${PN}${PV} + +pkg_setup() { + if use threads ; then + ewarn "" + ewarn "PLEASE NOTE: You are compiling ${P} with" + ewarn "threading enabled." + ewarn "Threading is not supported by all applications" + ewarn "that compile against tcl. You use threading at" + ewarn "your own discretion." + ewarn "" + epause 5 + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/remove-control-v-8.4.9.diff + epatch "${FILESDIR}"/${PN}-8.4.9-man.patch + epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch + + # Bug 125971 + epatch "${FILESDIR}"/${PN}-8.4.15-tclm4-soname.patch + + # Bug 208464 + epatch "${FILESDIR}"/${PN}-CVE-2006-4484.patch + + local d + for d in */configure ; do + cd "${S}"/${d%%/*} + EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \ + epatch "${FILESDIR}"/tk-configure-LANG.patch + done + + cd "${S}"/unix + eautoreconf +} + +src_compile() { + tc-export CC + cd "${S}"/unix + + local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} + + econf \ + --with-tcl=/usr/${mylibdir} \ + $(use_enable threads) \ + $(use_enable debug symbols) || die + + emake || die +} + +src_install() { + #short version number + local v1 + v1=${PV%.*} + + cd "${S}"/unix + make DESTDIR="${D}" install || die + + # fix the tkConfig.sh to eliminate refs to the build directory + local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} + sed -i \ + -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \ + -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \ + -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \ + -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \ + -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \ + -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \ + "${D}"/usr/${mylibdir}/tkConfig.sh || die + + # install private headers + insinto /usr/${mylibdir}/tk${v1}/include/unix + doins "${S}"/unix/*.h || die + insinto /usr/${mylibdir}/tk${v1}/include/generic + doins "${S}"/generic/*.h || die + rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h + rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h + rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h + + # install symlink for libraries + #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a + if use debug ; then + dosym libtk${v1}g.so /usr/${mylibdir}/libtk${v1}.so + dosym libtkstub${v1}g.a /usr/${mylibdir}/libtkstub${v1}.a + dosym ../tk${v1}g/pkgIndex.tcl /usr/${mylibdir}/tk${v1}/pkgIndex.tcl + fi + dosym libtk${v1}.so /usr/${mylibdir}/libtk.so + dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a + + dosym wish${v1} /usr/bin/wish + + cd "${S}" + dodoc ChangeLog README changes license.terms +} diff --git a/dev-lang/tk/tk-8.5.0-r1.ebuild b/dev-lang/tk/tk-8.5.0-r1.ebuild deleted file mode 100644 index dca932179c9a..000000000000 --- a/dev-lang/tk/tk-8.5.0-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.0-r1.ebuild,v 1.1 2007/12/30 03:35:09 matsuu Exp $ - -WANT_AUTOCONF=latest -WANT_AUTOMAKE=latest - -inherit autotools eutils multilib toolchain-funcs - -MY_P="${PN}${PV/_beta/b}" -DESCRIPTION="Tk Widget Set" -HOMEPAGE="http://www.tcl.tk/" -SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="debug threads truetype" - -RDEPEND="x11-libs/libX11 - ~dev-lang/tcl-${PV}" -DEPEND="${RDEPEND} - truetype? ( x11-libs/libXft ) - x11-libs/libXt - x11-proto/xproto" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use threads ; then - ewarn "" - ewarn "PLEASE NOTE: You are compiling ${P} with" - ewarn "threading enabled." - ewarn "Threading is not supported by all applications" - ewarn "that compile against tcl. You use threading at" - ewarn "your own discretion." - ewarn "" - epause 5 - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch - - # Bug 125971 - epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch - - cd "${S}"/unix - eautoreconf -} - -src_compile() { - tc-export CC - cd "${S}"/unix - - local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} - - econf \ - --with-tcl=/usr/${mylibdir} \ - $(use_enable threads) \ - $(use_enable truetype xft) \ - $(use_enable debug symbols) || die - - emake || die -} - -src_install() { - #short version number - local v1 - v1=${PV%.*} - - cd "${S}"/unix - S= emake DESTDIR="${D}" install || die - - # fix the tkConfig.sh to eliminate refs to the build directory - local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} - sed -i \ - -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \ - -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \ - -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \ - -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \ - -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \ - -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \ - "${D}"/usr/${mylibdir}/tkConfig.sh || die - - # install private headers - insinto /usr/${mylibdir}/tk${v1}/include/unix - doins "${S}"/unix/*.h || die - insinto /usr/${mylibdir}/tk${v1}/include/generic - doins "${S}"/generic/*.h || die - rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h - rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h - rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h - - # install symlink for libraries - #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a - dosym libtk${v1}.so /usr/${mylibdir}/libtk.so - dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a - - dosym wish${v1} /usr/bin/wish - - cd "${S}" - dodoc ChangeLog* README changes -} diff --git a/dev-lang/tk/tk-8.5.0-r2.ebuild b/dev-lang/tk/tk-8.5.0-r2.ebuild new file mode 100644 index 000000000000..1d490774fcca --- /dev/null +++ b/dev-lang/tk/tk-8.5.0-r2.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.0-r2.ebuild,v 1.1 2008/02/04 16:28:02 matsuu Exp $ + +WANT_AUTOCONF=latest +WANT_AUTOMAKE=latest + +inherit autotools eutils multilib toolchain-funcs + +MY_P="${PN}${PV/_beta/b}" +DESCRIPTION="Tk Widget Set" +HOMEPAGE="http://www.tcl.tk/" +SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="debug threads truetype" + +RDEPEND="x11-libs/libX11 + ~dev-lang/tcl-${PV}" +DEPEND="${RDEPEND} + truetype? ( x11-libs/libXft ) + x11-libs/libXt + x11-proto/xproto" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if use threads ; then + ewarn "" + ewarn "PLEASE NOTE: You are compiling ${P} with" + ewarn "threading enabled." + ewarn "Threading is not supported by all applications" + ewarn "that compile against tcl. You use threading at" + ewarn "your own discretion." + ewarn "" + epause 5 + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch + + # Bug 125971 + epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch + + # Bug 208464 + epatch "${FILESDIR}"/${PN}-CVE-2006-4484.patch + + cd "${S}"/unix + eautoreconf +} + +src_compile() { + tc-export CC + cd "${S}"/unix + + local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} + + econf \ + --with-tcl=/usr/${mylibdir} \ + $(use_enable threads) \ + $(use_enable truetype xft) \ + $(use_enable debug symbols) || die + + emake || die +} + +src_install() { + #short version number + local v1 + v1=${PV%.*} + + cd "${S}"/unix + S= emake DESTDIR="${D}" install || die + + # fix the tkConfig.sh to eliminate refs to the build directory + local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} + sed -i \ + -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \ + -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \ + -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \ + -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \ + -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \ + -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \ + "${D}"/usr/${mylibdir}/tkConfig.sh || die + + # install private headers + insinto /usr/${mylibdir}/tk${v1}/include/unix + doins "${S}"/unix/*.h || die + insinto /usr/${mylibdir}/tk${v1}/include/generic + doins "${S}"/generic/*.h || die + rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h + rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h + rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h + + # install symlink for libraries + #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a + dosym libtk${v1}.so /usr/${mylibdir}/libtk.so + dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a + + dosym wish${v1} /usr/bin/wish + + cd "${S}" + dodoc ChangeLog* README changes +} diff --git a/dev-lang/tk/tk-8.5.0.ebuild b/dev-lang/tk/tk-8.5.0.ebuild deleted file mode 100644 index 0cbf6edd2932..000000000000 --- a/dev-lang/tk/tk-8.5.0.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.0.ebuild,v 1.1 2007/12/22 03:58:06 matsuu Exp $ - -WANT_AUTOCONF=latest -WANT_AUTOMAKE=latest - -inherit autotools eutils multilib toolchain-funcs - -MY_P="${PN}${PV/_beta/b}" -DESCRIPTION="Tk Widget Set" -HOMEPAGE="http://www.tcl.tk/" -SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="debug threads" - -RDEPEND="x11-libs/libX11 - ~dev-lang/tcl-${PV}" -DEPEND="${RDEPEND} - x11-libs/libXt - x11-proto/xproto" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use threads ; then - ewarn "" - ewarn "PLEASE NOTE: You are compiling ${P} with" - ewarn "threading enabled." - ewarn "Threading is not supported by all applications" - ewarn "that compile against tcl. You use threading at" - ewarn "your own discretion." - ewarn "" - epause 5 - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch - - # Bug 125971 - epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch - - cd "${S}"/unix - eautoreconf -} - -src_compile() { - tc-export CC - cd "${S}"/unix - - local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} - - econf \ - --with-tcl=/usr/${mylibdir} \ - $(use_enable threads) \ - $(use_enable debug symbols) || die - - emake || die -} - -src_install() { - #short version number - local v1 - v1=${PV%.*} - - cd "${S}"/unix - S= emake DESTDIR="${D}" install || die - - # fix the tkConfig.sh to eliminate refs to the build directory - local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} - sed -i \ - -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \ - -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \ - -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \ - -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \ - -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \ - -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \ - "${D}"/usr/${mylibdir}/tkConfig.sh || die - - # install private headers - insinto /usr/${mylibdir}/tk${v1}/include/unix - doins "${S}"/unix/*.h || die - insinto /usr/${mylibdir}/tk${v1}/include/generic - doins "${S}"/generic/*.h || die - rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h - rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h - rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h - - # install symlink for libraries - #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a - dosym libtk${v1}.so /usr/${mylibdir}/libtk.so - dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a - - dosym wish${v1} /usr/bin/wish - - cd "${S}" - dodoc ChangeLog* README changes -} -- cgit v1.2.3-65-gdbad