diff options
author | 2010-01-23 14:07:34 +0000 | |
---|---|---|
committer | 2010-01-23 14:07:34 +0000 | |
commit | 61db4c9ceff6c1f8770a14feceab22caabb10302 (patch) | |
tree | 033cc5721d937a8e0ff74efb03be7eddbaa17d45 | |
parent | Keyword glib-2.22.3 from the overlay with a elibtoolize enforced. (diff) | |
download | embedded-cross-61db4c9ceff6c1f8770a14feceab22caabb10302.tar.gz embedded-cross-61db4c9ceff6c1f8770a14feceab22caabb10302.tar.bz2 embedded-cross-61db4c9ceff6c1f8770a14feceab22caabb10302.zip |
Remove old version of glib.
-rw-r--r-- | dev-libs/glib/Manifest | 3 | ||||
-rw-r--r-- | dev-libs/glib/files/glib2-CVE-2008-4316.patch | 62 | ||||
-rw-r--r-- | dev-libs/glib/glib-2.18.4-r1.ebuild | 90 |
3 files changed, 0 insertions, 155 deletions
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 0f9a4fa..aff8ed6 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -2,8 +2,5 @@ AUX glib-2.10.3-ia64-atomic-ops.patch 1058 RMD160 066e63a99739dc412fbed7f7731183 AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363 SHA1 b7a0f4d67083f2c9b4bbecd84a6d597dd0f0f9ed SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 RMD160 dd06abe9298d6e3e4d3eda0d5d155f1545dfd1aa SHA1 92164aa1b29f49cf62fc366231f2046b8b3def52 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 SHA1 403b249a460a9700669e754a562fb6974f3d6898 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8 -AUX glib2-CVE-2008-4316.patch 2692 RMD160 3143c4df4f1063f8177a545d8cb5678a68c2980f SHA1 f89222a8f09e4e841480bbfbd4defd1e3d402e91 SHA256 c249ef6513c2490e9efe836e9d41a4a5f1056979748e2535b8ec7d13a71b1bf0 -DIST glib-2.18.4.tar.bz2 4809051 RMD160 c47a71708fd13ade70d72d3443799d3e74a0459d SHA1 3e21395c6980e3970d5260b46ecb6b87f2482c61 SHA256 6aeb2c845e9fdc388943acdaba2f6357e3007c5ffaa8d666904679cfb40de100 DIST glib-2.22.3.tar.bz2 5009176 RMD160 53e1707547612e592bd2a3b5f7dfc7be1c09ed5c SHA1 185d5b80adef96019daf7402cc6762cc4d37470d SHA256 edf1a42cfefc13dbb2c0973188a45e02908d6fe31e769306b190d15ace6c8b8a -EBUILD glib-2.18.4-r1.ebuild 2525 RMD160 a0d859b38c630643cd4d09f5acabebd0993f7574 SHA1 66e2e4ac413bc48ae110b78786d5cba4ac6cf022 SHA256 81674405dec1d866737bbdfc98bd591b885ddeddaaf3a9a6c45b4ae0ff73ba36 EBUILD glib-2.22.3.ebuild 2725 RMD160 23440cfdf1ef004298785e1c8595579a5878b1ac SHA1 38cf75ba873c8ead7663bf30bade6016aeeadf51 SHA256 8d650e1a8964095623014a767c976ffb11755c0d654352c83baa3ecd37892b87 diff --git a/dev-libs/glib/files/glib2-CVE-2008-4316.patch b/dev-libs/glib/files/glib2-CVE-2008-4316.patch deleted file mode 100644 index 758a01b..0000000 --- a/dev-libs/glib/files/glib2-CVE-2008-4316.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- glib/gbase64.c.orig 2008-12-04 12:07:21.000000000 +0100 -+++ glib/gbase64.c 2009-01-12 14:08:31.000000000 +0100 -@@ -54,8 +54,9 @@ static const char base64_alphabet[] = - * - * The output buffer must be large enough to fit all the data that will - * be written to it. Due to the way base64 encodes you will need -- * at least: @len * 4 / 3 + 6 bytes. If you enable line-breaking you will -- * need at least: @len * 4 / 3 + @len * 4 / (3 * 72) + 7 bytes. -+ * at least: (@len / 3 + 1) * 4 + 4 bytes (+ 4 may be needed in case of -+ * non-zero state). If you enable line-breaking you will need at least: -+ * ((@len / 3 + 1) * 4 + 4) / 72 + 1 bytes of extra space. - * - * @break_lines is typically used when putting base64-encoded data in emails. - * It breaks the lines at 72 columns instead of putting all of the text on -@@ -233,8 +234,14 @@ g_base64_encode (const guchar *data, - g_return_val_if_fail (data != NULL, NULL); - g_return_val_if_fail (len > 0, NULL); - -- /* We can use a smaller limit here, since we know the saved state is 0 */ -- out = g_malloc (len * 4 / 3 + 4); -+ /* We can use a smaller limit here, since we know the saved state is 0, -+ +1 is needed for trailing \0, also check for unlikely integer overflow */ -+ if (len >= ((G_MAXSIZE - 1) / 4 - 1) * 3) -+ g_error("%s: input too large for Base64 encoding (%"G_GSIZE_FORMAT" chars)", -+ G_STRLOC, len); -+ -+ out = g_malloc ((len / 3 + 1) * 4 + 1); -+ - outlen = g_base64_encode_step (data, len, FALSE, out, &state, &save); - outlen += g_base64_encode_close (FALSE, out + outlen, &state, &save); - out[outlen] = '\0'; -@@ -275,7 +282,8 @@ static const unsigned char mime_base64_r - * - * The output buffer must be large enough to fit all the data that will - * be written to it. Since base64 encodes 3 bytes in 4 chars you need -- * at least: @len * 3 / 4 bytes. -+ * at least: (@len / 4) * 3 + 3 bytes (+ 3 may be needed in case of non-zero -+ * state). - * - * Return value: The number of bytes of output that was written - * -@@ -358,7 +366,8 @@ g_base64_decode (const gchar *text, - gsize *out_len) - { - guchar *ret; -- gint input_length, state = 0; -+ gsize input_length; -+ gint state = 0; - guint save = 0; - - g_return_val_if_fail (text != NULL, NULL); -@@ -368,7 +377,9 @@ g_base64_decode (const gchar *text, - - g_return_val_if_fail (input_length > 1, NULL); - -- ret = g_malloc0 (input_length * 3 / 4); -+ /* We can use a smaller limit here, since we know the saved state is 0, -+ +1 used to avoid calling g_malloc0(0), and hence retruning NULL */ -+ ret = g_malloc0 ((input_length / 4) * 3 + 1); - - *out_len = g_base64_decode_step (text, input_length, ret, &state, &save); - diff --git a/dev-libs/glib/glib-2.18.4-r1.ebuild b/dev-libs/glib/glib-2.18.4-r1.ebuild deleted file mode 100644 index cbca0c1..0000000 --- a/dev-libs/glib/glib-2.18.4-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.18.4-r1.ebuild,v 1.8 2009/03/26 14:03:45 armin76 Exp $ - -inherit gnome.org libtool eutils flag-o-matic - -DESCRIPTION="The GLib library of C routines" -HOMEPAGE="http://www.gtk.org/" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="debug doc fam hardened selinux xattr" - -RDEPEND="virtual/libc - virtual/libiconv - xattr? ( sys-apps/attr ) - fam? ( virtual/fam )" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.16 - >=sys-devel/gettext-0.11 - doc? ( - >=dev-libs/libxslt-1.0 - >=dev-util/gtk-doc-1.8 - ~app-text/docbook-xml-dtd-4.1.2 - )" - -src_unpack() { - unpack ${A} - cd "${S}" - - if use ppc64 && use hardened ; then - replace-flags -O[2-3] -O1 - epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch" - fi - - if use ia64 ; then - # Only apply for < 4.1 - local major=$(gcc-major-version) - local minor=$(gcc-minor-version) - if (( major < 4 || ( major == 4 && minor == 0 ) )); then - epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch" - fi - fi - - # Don't fail gio tests when ran without userpriv, upstream bug 552912 - # This is only a temporary workaround, remove as soon as possible - epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch" - - # Fix gmodule issues on fbsd; bug #184301 - epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch - - # Fix g_base64 overruns. bug #249214 - epatch "${FILESDIR}"/glib2-CVE-2008-4316.patch - - elibtoolize -} - -src_compile() { - local myconf - - epunt_cxx - - # Building with --disable-debug highly unrecommended. It will build glib in - # an unusable form as it disables some commonly used API. Please do not - # convert this to the use_enable form, as it results in a broken build. - # -- compnerd (3/27/06) - use debug && myconf="--enable-debug" - - # always build static libs, see #153807 - econf ${myconf} \ - $(use_enable xattr) \ - $(use_enable doc man) \ - $(use_enable doc gtk-doc) \ - $(use_enable fam) \ - $(use_enable selinux) \ - --enable-static \ - --with-threads=posix || die "configure failed" - - emake || die "make failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "Installation failed" - - # Do not install charset.alias even if generated, leave it to libiconv - rm -f "${D}/usr/lib/charset.alias" - - dodoc AUTHORS ChangeLog* NEWS* README -} |