commit: aa58fc8a88c2267f7a4d303be6242fe3cb5fe7c5
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Mon Feb 23 12:59:57 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Feb 23 12:59:57 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=aa58fc8a
dev-libs/icu: in tree version builds fine
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
dev-libs/icu/files/icu-51.1-CVE-2013-2924.patch | 36 -------
dev-libs/icu/files/icu-51.2-timezone.patch | 11 ---
dev-libs/icu/icu-51.2-r99.ebuild | 124 ------------------------
dev-libs/icu/metadata.xml | 5 -
4 files changed, 176 deletions(-)
diff --git a/dev-libs/icu/files/icu-51.1-CVE-2013-2924.patch
b/dev-libs/icu/files/icu-51.1-CVE-2013-2924.patch
deleted file mode 100644
index 65e734c..0000000
--- a/dev-libs/icu/files/icu-51.1-CVE-2013-2924.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: /icu/trunk/source/i18n/csrucode.cpp
-===================================================================
---- /icu/trunk/source/i18n/csrucode.cpp (revision 34075)
-+++ /icu/trunk/source/i18n/csrucode.cpp (revision 34076)
-@@ -1,5 +1,5 @@
- /*
- **********************************************************************
-- * Copyright (C) 2005-2012, International Business Machines
-+ * Copyright (C) 2005-2013, International Business Machines
- * Corporation and others. All Rights Reserved.
- **********************************************************************
-@@ -34,6 +34,7 @@
- const uint8_t *input = textIn->fRawInput;
- int32_t confidence = 0;
-+ int32_t length = textIn->fRawLength;
-
-- if (input[0] == 0xFE && input[1] == 0xFF) {
-+ if (length >=2 && input[0] == 0xFE && input[1] == 0xFF) {
- confidence = 100;
- }
-@@ -58,6 +59,7 @@
- const uint8_t *input = textIn->fRawInput;
- int32_t confidence = 0;
-+ int32_t length = textIn->fRawLength;
-
-- if (input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3]
!= 0x00)) {
-+ if (length >= 4 && input[0] == 0xFF && input[1] == 0xFE && (input[2] !=
0x00 || input[3] != 0x00)) {
- confidence = 100;
- }
-@@ -82,5 +84,5 @@
- int32_t confidence = 0;
-
-- if (getChar(input, 0) == 0x0000FEFFUL) {
-+ if (limit > 0 && getChar(input, 0) == 0x0000FEFFUL) {
- hasBOM = TRUE;
- }
diff --git a/dev-libs/icu/files/icu-51.2-timezone.patch
b/dev-libs/icu/files/icu-51.2-timezone.patch
deleted file mode 100644
index 889045e..0000000
--- a/dev-libs/icu/files/icu-51.2-timezone.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/icu/source/common/putilimp.h
-+++ b/icu/source/common/putilimp.h
-@@ -116,7 +116,7 @@
- #elif U_PLATFORM == U_PF_ANDROID
- # define U_TIMEZONE timezone
- #elif U_PLATFORM_IS_LINUX_BASED
--# if !defined(__UCLIBC__)
-+# if defined(__GLIBC__)
- /* __timezone is only available in glibc */
- # define U_TIMEZONE __timezone
- # endif
diff --git a/dev-libs/icu/icu-51.2-r99.ebuild b/dev-libs/icu/icu-51.2-r99.ebuild
deleted file mode 100644
index 1851d94..0000000
--- a/dev-libs/icu/icu-51.2-r99.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-51.2-r1.ebuild,v 1.11
2013/11/12 20:12:53 ago Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs base autotools
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/";
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz";
-
-LICENSE="BSD"
-
-SLOT="0/51.2"
-# As far as I can remember, icu consumers reacted rather sensitive to icu
upgrades in the past.
-# Even if revdep-rebuild did not rebuild (i.e. soname did not change), random
crashes and
-# other irregularities occured until the consumers were rebuilt. So let's
rather err on the side
-# of caution and more rebuilds here. See also bug 464876. dilfridge
-
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="debug doc examples static-libs"
-
-DEPEND="
- doc? (
- app-doc/doxygen[dot]
- )
-"
-
-S="${WORKDIR}/${PN}/source"
-
-PATCHES=(
- "${FILESDIR}/${PN}-51.1-CVE-2013-2924.patch"
- "${FILESDIR}/${PN}-51.2-timezone.patch"
-)
-
-src_prepare() {
- local variable
-
- base_src_prepare
-
- # Do not hardcode flags in icu-config and icu-*.pc files.
- # https://ssl.icu-project.org/trac/ticket/6102
- for variable in CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do
- sed \
- -e "/^${variable} =.*/s: *@${variable}@\( *$\)\?::" \
- -i config/icu.pc.in \
- -i config/Makefile.inc.in \
- || die
- done
-
- # Disable renaming as it is stupind thing to do
- sed -i \
- -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING
1/" \
- common/unicode/uconfig.h || die
-
- # Fix linking of icudata
- sed -i \
- -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
- config/mh-linux || die
-
- # Append doxygen configuration to configure
- sed -i \
- -e 's:icudefs.mk:icudefs.mk Doxyfile:' \
- configure.in || die
- eautoreconf
-}
-
-src_configure() {
- local cross_opts
-
- # bootstrap for cross compilation
- if tc-is-cross-compiler; then
- CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
- CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)"
AR="$(tc-getBUILD_AR)" \
- RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
- ./configure --disable-renaming --disable-debug \
- --disable-samples --enable-static || die
- emake
- mkdir -p "${WORKDIR}/host/"
- cp -a {bin,lib,config,tools} "${WORKDIR}/host/"
- emake clean
-
- cross_opts="--with-cross-build=${WORKDIR}/host"
- fi
-
- econf \
- --disable-renaming \
- $(use_enable debug) \
- $(use_enable examples samples) \
- $(use_enable static-libs static) \
- ${cross_opts}
-}
-
-src_compile() {
- default
-
- if use doc; then
- doxygen -u Doxyfile || die
- doxygen Doxyfile || die
- fi
-}
-
-src_test() {
- # INTLTEST_OPTS: intltest options
- # -e: Exhaustive testing
- # -l: Reporting of memory leaks
- # -v: Increased verbosity
- # IOTEST_OPTS: iotest options
- # -e: Exhaustive testing
- # -v: Increased verbosity
- # CINTLTST_OPTS: cintltst options
- # -e: Exhaustive testing
- # -v: Increased verbosity
- emake -j1 VERBOSE="1" check
-}
-
-src_install() {
- default
-
- dohtml ../readme.html
-
- use doc && dohtml -p api -r doc/html/
-}
diff --git a/dev-libs/icu/metadata.xml b/dev-libs/icu/metadata.xml
deleted file mode 100644
index 5d46203..0000000
--- a/dev-libs/icu/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <herd>openoffice</herd>
-</pkgmetadata>
