parent
d3d4114432
commit
c2154b7254
@ -0,0 +1,2 @@
|
|||||||
|
DIST cfssl-1.2.0_p20170322.tar.gz 8150942 SHA256 b1f70ecddc3f609ad2b12fd550b318e09119372130e978bfae8c3b6e04e2ed85 SHA512 69ef4418a485fe0317aec7d51f32670ff9603bb0fc8cce175ec4b98f79155538de0d3189a589c179d900ad1c4e486c3ad50b12c7345ba7771abf3f948f98a138 WHIRLPOOL da2bf58248a6cba0a004f71476f0c460dfe0fa2ea5da211343560faf9c7e295733de57bb7f22311af9be230ef96c5182777550473383550f6c6c401a1da881be
|
||||||
|
DIST github.com-juju-ratelimit-acf38b000a03e4ab89e40f20f1e548f4e6ac7f72.tar.gz 7980 SHA256 d3de61697c62b643d7b63b80d0eee853193f0379ea12b1371000c84c4dcdf0f1 SHA512 e26bbe1ba705718e919d99061a44de76ed6950666b07185e295860fb5f0e7d94f1be91d616737aecb4652e4e32b7066d94c0ffaaeb07e916cb09aac2b519754d WHIRLPOOL 89b621b810c00f6a7fa0468e7ca80556a3084f5e78d6afe6a44e9079fe3b56e4a472b9247470026300ed8c4ad3e1e652f69fa089e5efc47e41a74ffd55726b6f
|
@ -0,0 +1,34 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
|
||||||
|
EGO_PN="github.com/cloudflare/${PN}/..."
|
||||||
|
EGIT_COMMIT="1a5ac2e68991e01380068b96f50f5ff982d9bb14"
|
||||||
|
EGO_VENDOR=( "github.com/juju/ratelimit acf38b000a03e4ab89e40f20f1e548f4e6ac7f72" )
|
||||||
|
inherit golang-build golang-vcs-snapshot
|
||||||
|
|
||||||
|
ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||||
|
KEYWORDS="~amd64"
|
||||||
|
|
||||||
|
DESCRIPTION="Cloudflare's PKI and TLS toolkit"
|
||||||
|
HOMEPAGE="https://github.com/cloudflare/cfssl"
|
||||||
|
SRC_URI="${ARCHIVE_URI}
|
||||||
|
${EGO_VENDOR_URI}"
|
||||||
|
LICENSE="BSD-2"
|
||||||
|
SLOT="0"
|
||||||
|
IUSE="hardened"
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
|
||||||
|
pushd src || die
|
||||||
|
GOPATH="${S}" go install github.com/cloudflare/cfssl/cmd/... || die
|
||||||
|
popd || die
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
dobin bin/*
|
||||||
|
pushd src/${EGO_PN%/*} || die
|
||||||
|
dodoc CHANGELOG README.md
|
||||||
|
popd || die
|
||||||
|
}
|
@ -0,0 +1,13 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||||
|
<pkgmetadata>
|
||||||
|
<longdescription>
|
||||||
|
</longdescription>
|
||||||
|
<maintainer type="person">
|
||||||
|
<email>mrueg@gentoo.org</email>
|
||||||
|
<name>Manuel Rüger</name>
|
||||||
|
</maintainer>
|
||||||
|
<upstream>
|
||||||
|
<remote-id type="github">cloudflare/cfssl</remote-id>
|
||||||
|
</upstream>
|
||||||
|
</pkgmetadata>
|
@ -1,593 +0,0 @@
|
|||||||
# Copyright 1999-2017 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
KDE_REQUIRED="optional"
|
|
||||||
KDE_SCM="git"
|
|
||||||
CMAKE_REQUIRED="never"
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
|
|
||||||
PYTHON_REQ_USE="threads,xml"
|
|
||||||
|
|
||||||
# experimental ; release ; old
|
|
||||||
# Usually the tarballs are moved a lot so this should make
|
|
||||||
# everyone happy.
|
|
||||||
DEV_URI="
|
|
||||||
http://dev-builds.libreoffice.org/pre-releases/src
|
|
||||||
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
|
|
||||||
http://download.documentfoundation.org/libreoffice/old/${PV}/
|
|
||||||
"
|
|
||||||
ADDONS_URI="http://dev-www.libreoffice.org/src/"
|
|
||||||
|
|
||||||
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
|
|
||||||
# PATCHSET="${P}-patchset-01.tar.xz"
|
|
||||||
|
|
||||||
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
|
|
||||||
inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
|
|
||||||
unset SCM_ECLASS
|
|
||||||
|
|
||||||
DESCRIPTION="A full office productivity suite"
|
|
||||||
HOMEPAGE="http://www.libreoffice.org"
|
|
||||||
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
|
|
||||||
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
|
|
||||||
|
|
||||||
# Split modules following git/tarballs
|
|
||||||
# Core MUST be first!
|
|
||||||
# Help is used for the image generator
|
|
||||||
MODULES="core help"
|
|
||||||
# Only release has the tarballs
|
|
||||||
if [[ ${PV} != *9999* ]]; then
|
|
||||||
for i in ${DEV_URI}; do
|
|
||||||
for mod in ${MODULES}; do
|
|
||||||
if [[ ${mod} == core ]]; then
|
|
||||||
SRC_URI+=" ${i}/${P}.tar.xz"
|
|
||||||
else
|
|
||||||
SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
unset mod
|
|
||||||
done
|
|
||||||
unset i
|
|
||||||
fi
|
|
||||||
unset DEV_URI
|
|
||||||
|
|
||||||
# Really required addons
|
|
||||||
# These are bundles that can't be removed for now due to huge patchsets.
|
|
||||||
# If you want them gone, patches are welcome.
|
|
||||||
ADDONS_SRC=(
|
|
||||||
"${ADDONS_URI}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz" # modifies source code
|
|
||||||
"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
|
|
||||||
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
|
|
||||||
# no release for 8 years, should we package it?
|
|
||||||
"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
|
|
||||||
# Does not build with 1.6 rhino at all
|
|
||||||
"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
|
|
||||||
# requirement of rhino
|
|
||||||
"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
|
|
||||||
# not packageable
|
|
||||||
"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
|
|
||||||
)
|
|
||||||
SRC_URI+=" ${ADDONS_SRC[*]}"
|
|
||||||
|
|
||||||
unset ADDONS_URI
|
|
||||||
unset ADDONS_SRC
|
|
||||||
|
|
||||||
# Extensions that need extra work:
|
|
||||||
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
|
|
||||||
|
|
||||||
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
|
|
||||||
gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
|
|
||||||
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
|
|
||||||
|
|
||||||
LICENSE="|| ( LGPL-3 MPL-1.1 )"
|
|
||||||
SLOT="0"
|
|
||||||
[[ ${PV} == *9999* ]] || \
|
|
||||||
KEYWORDS=""
|
|
||||||
#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
|
|
||||||
|
|
||||||
COMMON_DEPEND="${PYTHON_DEPS}
|
|
||||||
app-arch/unzip
|
|
||||||
app-arch/zip
|
|
||||||
app-text/hunspell
|
|
||||||
>=app-text/libabw-0.1.0
|
|
||||||
>=app-text/libebook-0.1
|
|
||||||
>=app-text/libetonyek-0.1
|
|
||||||
app-text/libexttextcat
|
|
||||||
app-text/liblangtag
|
|
||||||
>=app-text/libmspub-0.1.0
|
|
||||||
>=app-text/libmwaw-0.3.1
|
|
||||||
>=app-text/libodfgen-0.1.0
|
|
||||||
app-text/libstaroffice
|
|
||||||
app-text/libwpd:0.10[tools]
|
|
||||||
app-text/libwpg:0.3
|
|
||||||
>=app-text/libwps-0.4
|
|
||||||
app-text/mythes
|
|
||||||
>=dev-cpp/clucene-2.3.3.4-r2
|
|
||||||
=dev-cpp/libcmis-0.5*
|
|
||||||
dev-db/unixODBC
|
|
||||||
dev-lang/perl
|
|
||||||
dev-libs/boost:=
|
|
||||||
dev-libs/expat
|
|
||||||
dev-libs/hyphen
|
|
||||||
dev-libs/icu:=
|
|
||||||
>=dev-libs/liborcus-0.12.1
|
|
||||||
dev-libs/librevenge
|
|
||||||
dev-libs/nspr
|
|
||||||
dev-libs/nss
|
|
||||||
!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
|
|
||||||
libressl? ( dev-libs/libressl )
|
|
||||||
>=dev-libs/redland-1.0.16
|
|
||||||
media-gfx/graphite2
|
|
||||||
media-libs/fontconfig
|
|
||||||
media-libs/freetype:2
|
|
||||||
>=media-libs/glew-1.10:=
|
|
||||||
media-libs/harfbuzz:=[graphite,icu]
|
|
||||||
media-libs/lcms:2
|
|
||||||
>=media-libs/libcdr-0.1.0
|
|
||||||
>=media-libs/libfreehand-0.1.0
|
|
||||||
media-libs/libpagemaker
|
|
||||||
>=media-libs/libpng-1.4:0=
|
|
||||||
>=media-libs/libvisio-0.1.0
|
|
||||||
media-libs/libzmf
|
|
||||||
net-libs/neon
|
|
||||||
net-misc/curl
|
|
||||||
net-nds/openldap
|
|
||||||
sci-mathematics/lpsolve
|
|
||||||
x11-libs/cairo[X,-xlib-xcb(-)]
|
|
||||||
x11-libs/libXinerama
|
|
||||||
x11-libs/libXrandr
|
|
||||||
x11-libs/libXrender
|
|
||||||
virtual/glu
|
|
||||||
virtual/jpeg:0
|
|
||||||
virtual/opengl
|
|
||||||
bluetooth? ( net-wireless/bluez )
|
|
||||||
coinmp? ( sci-libs/coinor-mp )
|
|
||||||
collada? ( media-libs/opencollada )
|
|
||||||
cups? ( net-print/cups )
|
|
||||||
dbus? ( dev-libs/dbus-glib )
|
|
||||||
eds? (
|
|
||||||
dev-libs/glib:2
|
|
||||||
gnome-extra/evolution-data-server
|
|
||||||
)
|
|
||||||
firebird? ( >=dev-db/firebird-2.5 )
|
|
||||||
gltf? ( media-libs/libgltf )
|
|
||||||
gnome? ( gnome-base/dconf )
|
|
||||||
gstreamer? (
|
|
||||||
media-libs/gstreamer:1.0
|
|
||||||
media-libs/gst-plugins-base:1.0
|
|
||||||
)
|
|
||||||
gtk? (
|
|
||||||
x11-libs/gdk-pixbuf
|
|
||||||
>=x11-libs/gtk+-2.24:2
|
|
||||||
)
|
|
||||||
gtk3? (
|
|
||||||
dev-libs/glib:2
|
|
||||||
dev-libs/gobject-introspection
|
|
||||||
x11-libs/gtk+:3
|
|
||||||
)
|
|
||||||
jemalloc? ( dev-libs/jemalloc )
|
|
||||||
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
|
|
||||||
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
|
|
||||||
mysql? ( dev-db/mysql-connector-c++ )
|
|
||||||
pdfimport? ( app-text/poppler:=[cxx] )
|
|
||||||
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
|
|
||||||
telepathy? ( net-libs/telepathy-glib )
|
|
||||||
"
|
|
||||||
|
|
||||||
RDEPEND="${COMMON_DEPEND}
|
|
||||||
!app-office/libreoffice-bin
|
|
||||||
!app-office/libreoffice-bin-debug
|
|
||||||
!app-office/openoffice
|
|
||||||
media-fonts/liberation-fonts
|
|
||||||
media-fonts/libertine
|
|
||||||
media-fonts/urw-fonts
|
|
||||||
java? ( >=virtual/jre-1.6 )
|
|
||||||
kde? ( $(add_kdeapps_dep kioclient) )
|
|
||||||
vlc? ( media-video/vlc )
|
|
||||||
"
|
|
||||||
|
|
||||||
if [[ ${PV} != *9999* ]]; then
|
|
||||||
PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
|
|
||||||
else
|
|
||||||
# Translations are not reliable on live ebuilds
|
|
||||||
# rather force people to use english only.
|
|
||||||
PDEPEND="!app-office/libreoffice-l10n"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# FIXME: cppunit should be moved to test conditional
|
|
||||||
# after everything upstream is under gbuild
|
|
||||||
# as dmake execute tests right away
|
|
||||||
DEPEND="${COMMON_DEPEND}
|
|
||||||
!<sys-devel/make-3.82
|
|
||||||
>=dev-libs/libatomic_ops-7.2d
|
|
||||||
>=dev-libs/libxml2-2.7.8
|
|
||||||
dev-libs/libxslt
|
|
||||||
dev-perl/Archive-Zip
|
|
||||||
dev-util/cppunit
|
|
||||||
>=dev-util/gperf-3
|
|
||||||
dev-util/intltool
|
|
||||||
>=dev-util/mdds-1.2.2:1=
|
|
||||||
media-libs/glm
|
|
||||||
sys-devel/bison
|
|
||||||
sys-devel/flex
|
|
||||||
sys-devel/gettext
|
|
||||||
sys-devel/ucpp
|
|
||||||
sys-libs/zlib
|
|
||||||
virtual/pkgconfig
|
|
||||||
x11-libs/libXt
|
|
||||||
x11-libs/libXtst
|
|
||||||
x11-proto/randrproto
|
|
||||||
x11-proto/xextproto
|
|
||||||
x11-proto/xineramaproto
|
|
||||||
x11-proto/xproto
|
|
||||||
java? (
|
|
||||||
dev-java/ant-core
|
|
||||||
>=virtual/jdk-1.6
|
|
||||||
)
|
|
||||||
odk? ( >=app-doc/doxygen-1.8.4 )
|
|
||||||
test? ( dev-util/cppunit )
|
|
||||||
"
|
|
||||||
|
|
||||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
|
||||||
bluetooth? ( dbus )
|
|
||||||
collada? ( gltf )
|
|
||||||
eds? ( gnome )
|
|
||||||
gnome? ( gtk )
|
|
||||||
telepathy? ( gtk )
|
|
||||||
libreoffice_extensions_nlpsolver? ( java )
|
|
||||||
libreoffice_extensions_scripting-beanshell? ( java )
|
|
||||||
libreoffice_extensions_scripting-javascript? ( java )
|
|
||||||
libreoffice_extensions_wiki-publisher? ( java )
|
|
||||||
"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
# not upstreamable stuff
|
|
||||||
"${FILESDIR}/${PN}-5.3-system-pyuno.patch"
|
|
||||||
|
|
||||||
# TODO: upstream
|
|
||||||
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
|
|
||||||
)
|
|
||||||
|
|
||||||
pkg_pretend() {
|
|
||||||
use java || \
|
|
||||||
ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
|
|
||||||
|
|
||||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
|
||||||
|
|
||||||
CHECKREQS_MEMORY="512M"
|
|
||||||
if is-flagq "-g*" && ! is-flagq "-g*0" ; then
|
|
||||||
CHECKREQS_DISK_BUILD="22G"
|
|
||||||
else
|
|
||||||
CHECKREQS_DISK_BUILD="6G"
|
|
||||||
fi
|
|
||||||
check-reqs_pkg_pretend
|
|
||||||
|
|
||||||
if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
|
|
||||||
[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
|
|
||||||
eerror "Compilation with gcc older than 4.7 is not supported"
|
|
||||||
die "Too old gcc found."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Ensure pg version but we have to be sure the pg is installed (first
|
|
||||||
# install on clean system)
|
|
||||||
if use postgres && has_version dev-db/postgresql; then
|
|
||||||
local pgslot=$(postgresql-config show)
|
|
||||||
if [[ ${pgslot//.} -lt 90 ]] ; then
|
|
||||||
eerror "PostgreSQL slot must be set to 9.0 or higher."
|
|
||||||
eerror " postgresql-config set 9.0"
|
|
||||||
die "PostgreSQL slot is not set to 9.0 or higher."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
java-pkg-opt-2_pkg_setup
|
|
||||||
kde4-base_pkg_setup
|
|
||||||
python-single-r1_pkg_setup
|
|
||||||
xdg_environment_reset
|
|
||||||
|
|
||||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
|
||||||
CHECKREQS_MEMORY="512M"
|
|
||||||
if is-flagq "-g*" && ! is-flagq "-g*0" ; then
|
|
||||||
CHECKREQS_DISK_BUILD="22G"
|
|
||||||
else
|
|
||||||
CHECKREQS_DISK_BUILD="6G"
|
|
||||||
fi
|
|
||||||
check-reqs_pkg_setup
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
local mod
|
|
||||||
|
|
||||||
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
|
|
||||||
use branding && unpack "${BRANDING}"
|
|
||||||
|
|
||||||
if [[ ${PV} != *9999* ]]; then
|
|
||||||
unpack "${P}.tar.xz"
|
|
||||||
for mod in ${MODULES}; do
|
|
||||||
[[ ${mod} == core ]] && continue
|
|
||||||
unpack "${PN}-${mod}-${PV}.tar.xz"
|
|
||||||
done
|
|
||||||
else
|
|
||||||
local base_uri branch checkout mypv
|
|
||||||
base_uri="git://anongit.freedesktop.org"
|
|
||||||
for mod in ${MODULES}; do
|
|
||||||
branch="master"
|
|
||||||
mypv=${PV/.9999}
|
|
||||||
[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
|
|
||||||
git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
|
|
||||||
[[ ${mod} != core ]] && checkout="${S}/${mod}"
|
|
||||||
[[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
|
|
||||||
git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
[[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
|
|
||||||
eapply "${PATCHES[@]}"
|
|
||||||
eapply_user
|
|
||||||
|
|
||||||
AT_M4DIR="m4" eautoreconf
|
|
||||||
# hack in the autogen.sh
|
|
||||||
touch autogen.lastrun
|
|
||||||
|
|
||||||
# system pyuno mess
|
|
||||||
sed -i \
|
|
||||||
-e "s:%eprefix%:${EPREFIX}:g" \
|
|
||||||
-e "s:%libdir%:$(get_libdir):g" \
|
|
||||||
pyuno/source/module/uno.py \
|
|
||||||
pyuno/source/officehelper.py || die
|
|
||||||
# sed in the tests
|
|
||||||
sed -i \
|
|
||||||
-e "s#all : build unitcheck#all : build#g" \
|
|
||||||
solenv/gbuild/Module.mk || die
|
|
||||||
sed -i \
|
|
||||||
-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
|
|
||||||
-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
|
|
||||||
Makefile.in || die
|
|
||||||
|
|
||||||
sed -i \
|
|
||||||
-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
|
|
||||||
-e "s,\$INSTALLDIRNAME.sh,${PN}," \
|
|
||||||
bin/distro-install-desktop-integration || die
|
|
||||||
|
|
||||||
if use branding; then
|
|
||||||
# hack...
|
|
||||||
mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Don't list pdfimport support in desktop when built with none, bug # 605464
|
|
||||||
if ! use pdfimport; then
|
|
||||||
sed -i \
|
|
||||||
-e ":MimeType: s:application/pdf;::" \
|
|
||||||
-e ":Keywords: s:pdf;::" \
|
|
||||||
sysui/desktop/menus/draw.desktop || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local java_opts
|
|
||||||
local ext_opts
|
|
||||||
|
|
||||||
# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
|
|
||||||
# Note: these are for Gentoo use ONLY. For your own distribution, please get
|
|
||||||
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
|
|
||||||
local google_default_client_id="329227923882.apps.googleusercontent.com"
|
|
||||||
local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
|
|
||||||
|
|
||||||
# optimization flags
|
|
||||||
export GMAKE_OPTIONS="${MAKEOPTS}"
|
|
||||||
# System python enablement:
|
|
||||||
export PYTHON_CFLAGS=$(python_get_CFLAGS)
|
|
||||||
export PYTHON_LIBS=$(python_get_LIBS)
|
|
||||||
|
|
||||||
if use collada; then
|
|
||||||
export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
|
|
||||||
export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# libreoffice extensions handling
|
|
||||||
for lo_xt in ${LO_EXTS}; do
|
|
||||||
if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
|
|
||||||
ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
|
|
||||||
else
|
|
||||||
ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
if use java; then
|
|
||||||
# hsqldb: system one is too new
|
|
||||||
java_opts="
|
|
||||||
--without-junit
|
|
||||||
--without-system-hsqldb
|
|
||||||
--with-ant-home="${ANT_HOME}"
|
|
||||||
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
|
|
||||||
--with-jvm-path="${EPREFIX}/usr/lib/"
|
|
||||||
"
|
|
||||||
|
|
||||||
use libreoffice_extensions_scripting-beanshell && \
|
|
||||||
java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
|
|
||||||
|
|
||||||
use libreoffice_extensions_scripting-javascript && \
|
|
||||||
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use kde; then
|
|
||||||
# bug 544108, bug 599076
|
|
||||||
export QMAKEQT4="$(qt4_get_bindir)/qmake"
|
|
||||||
export MOCQT4="$(qt4_get_bindir)/moc"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# system headers/libs/...: enforce using system packages
|
|
||||||
# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
|
|
||||||
# --enable-cairo: ensure that cairo is always required
|
|
||||||
# --enable-graphite: disabling causes build breakages
|
|
||||||
# --enable-*-link: link to the library rather than just dlopen on runtime
|
|
||||||
# --enable-release-build: build the libreoffice as release
|
|
||||||
# --disable-fetch-external: prevent dowloading during compile phase
|
|
||||||
# --enable-extension-integration: enable any extension integration support
|
|
||||||
# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
|
|
||||||
# --disable-report-builder: too much java packages pulled in without pkgs
|
|
||||||
# --without-system-sane: just sane.h header that is used for scan in writer,
|
|
||||||
# not linked or anything else, worthless to depend on
|
|
||||||
econf \
|
|
||||||
--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
|
|
||||||
--with-system-dicts \
|
|
||||||
--with-system-headers \
|
|
||||||
--with-system-jars \
|
|
||||||
--with-system-libs \
|
|
||||||
--enable-cairo-canvas \
|
|
||||||
--enable-graphite \
|
|
||||||
--enable-largefile \
|
|
||||||
--enable-mergelibs \
|
|
||||||
--enable-neon \
|
|
||||||
--enable-python=system \
|
|
||||||
--enable-randr \
|
|
||||||
--enable-release-build \
|
|
||||||
--disable-breakpad \
|
|
||||||
--disable-ccache \
|
|
||||||
--disable-dependency-tracking \
|
|
||||||
--disable-epm \
|
|
||||||
--disable-fetch-external \
|
|
||||||
--disable-gstreamer-0-10 \
|
|
||||||
--disable-online-update \
|
|
||||||
--disable-report-builder \
|
|
||||||
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
|
|
||||||
--with-build-version="Gentoo official package" \
|
|
||||||
--enable-extension-integration \
|
|
||||||
--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
|
|
||||||
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
|
|
||||||
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
|
|
||||||
--with-external-tar="${DISTDIR}" \
|
|
||||||
--with-lang="" \
|
|
||||||
--with-parallelism=$(makeopts_jobs) \
|
|
||||||
--with-system-ucpp \
|
|
||||||
--with-vendor="Gentoo Foundation" \
|
|
||||||
--with-x \
|
|
||||||
--without-fonts \
|
|
||||||
--without-myspell-dicts \
|
|
||||||
--without-help \
|
|
||||||
--with-helppack-integration \
|
|
||||||
--without-system-sane \
|
|
||||||
$(use_enable bluetooth sdremote-bluetooth) \
|
|
||||||
$(use_enable coinmp) \
|
|
||||||
$(use_enable collada) \
|
|
||||||
$(use_enable cups) \
|
|
||||||
$(use_enable debug) \
|
|
||||||
$(use_enable dbus) \
|
|
||||||
$(use_enable eds evolution2) \
|
|
||||||
$(use_enable firebird firebird-sdbc) \
|
|
||||||
$(use_enable gltf) \
|
|
||||||
$(use_enable gnome gio) \
|
|
||||||
$(use_enable gnome dconf) \
|
|
||||||
$(use_enable gstreamer gstreamer-1-0) \
|
|
||||||
$(use_enable gtk) \
|
|
||||||
$(use_enable gtk3) \
|
|
||||||
$(use_enable kde kde4) \
|
|
||||||
$(use_enable mysql ext-mariadb-connector) \
|
|
||||||
$(use_enable odk) \
|
|
||||||
$(use_enable pdfimport) \
|
|
||||||
$(use_enable postgres postgresql-sdbc) \
|
|
||||||
$(use_enable quickstarter systray) \
|
|
||||||
$(use_enable telepathy) \
|
|
||||||
$(use_enable vlc) \
|
|
||||||
$(use_with coinmp system-coinmp) \
|
|
||||||
$(use_with collada system-opencollada) \
|
|
||||||
$(use_with gltf system-libgltf) \
|
|
||||||
$(use_with googledrive gdrive-client-id ${google_default_client_id}) \
|
|
||||||
$(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
|
|
||||||
$(use_with java) \
|
|
||||||
$(use_with mysql system-mysql-cppconn) \
|
|
||||||
$(use_with odk doxygen) \
|
|
||||||
${java_opts} \
|
|
||||||
${ext_opts}
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
# more and more LO stuff tries to use OpenGL, including tests during build
|
|
||||||
# bug 501508, bug 540624, bug 545974 and probably more
|
|
||||||
addpredict /dev/dri
|
|
||||||
addpredict /dev/ati
|
|
||||||
addpredict /dev/nvidiactl
|
|
||||||
|
|
||||||
# hack for offlinehelp, this needs fixing upstream at some point
|
|
||||||
# it is broken because we send --without-help
|
|
||||||
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
|
|
||||||
(
|
|
||||||
grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
|
|
||||||
source "${T}/config_host.mk" 2&> /dev/null
|
|
||||||
|
|
||||||
local path="${WORKDIR}/helpcontent2/source/auxiliary/"
|
|
||||||
mkdir -p "${path}" || die
|
|
||||||
|
|
||||||
echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
|
|
||||||
perl "${S}/helpcontent2/helpers/create_ilst.pl" \
|
|
||||||
-dir=icon-themes/galaxy/res/helpimg \
|
|
||||||
> "${path}/helpimg.ilst"
|
|
||||||
[[ -s "${path}/helpimg.ilst" ]] || \
|
|
||||||
ewarn "The help images list is empty, something is fishy, report a bug."
|
|
||||||
)
|
|
||||||
|
|
||||||
local target
|
|
||||||
use test && target="build" || target="build-nocheck"
|
|
||||||
|
|
||||||
# this is not a proper make script
|
|
||||||
make ${target} || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
make unitcheck || die
|
|
||||||
make slowcheck || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
# This is not Makefile so no buildserver
|
|
||||||
make DESTDIR="${D}" distro-pack-install -o build -o check || die
|
|
||||||
|
|
||||||
# bug 593514
|
|
||||||
if use gtk3; then
|
|
||||||
dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
|
|
||||||
/usr/$(get_libdir)/liblibreofficekitgtk.so
|
|
||||||
fi
|
|
||||||
|
|
||||||
# bash completion aliases
|
|
||||||
bashcomp_alias \
|
|
||||||
libreoffice \
|
|
||||||
unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
|
|
||||||
|
|
||||||
if use branding; then
|
|
||||||
insinto /usr/$(get_libdir)/${PN}/program
|
|
||||||
newins "${WORKDIR}/branding-sofficerc" sofficerc
|
|
||||||
dodir /etc/env.d
|
|
||||||
echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Hack for offlinehelp, this needs fixing upstream at some point.
|
|
||||||
# It is broken because we send --without-help
|
|
||||||
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
|
|
||||||
insinto /usr/$(get_libdir)/libreoffice/help
|
|
||||||
doins xmlhelp/util/*.xsl
|
|
||||||
|
|
||||||
# Remove desktop files to support old installs that can't parse mime
|
|
||||||
rm -r "${ED}"usr/share/mimelnk/ || die
|
|
||||||
|
|
||||||
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
|
|
||||||
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_preinst() {
|
|
||||||
# Cache updates - all handled by kde eclass for all environments
|
|
||||||
kde4-base_pkg_preinst
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
kde4-base_pkg_postinst
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
kde4-base_pkg_postrm
|
|
||||||
}
|
|
@ -1,2 +1,2 @@
|
|||||||
DIST mpv-bash-completion-3.3.10.tar.gz 19113 SHA256 ead8c528b9e3862063499f241560d63e9b0786f770d666e92eeb0a371c172baf SHA512 0344b5dca82af57bf32e142bd70229067079eed1f152a0803c764f63c39dabbf6b283f3624b87f863b02c6dd3fac77010ef014523b835d0f1a24f4fd4ff22e0d WHIRLPOOL 926f23ef86a11c169d881d480354632bf723a6e7160e8f922c8a8fca96aa1012ff356c87a0f529020bac3c09233ad73693e96b03a2e7f1c91b59855e3a9e616a
|
DIST mpv-bash-completion-3.3.11.tar.gz 19225 SHA256 b74a180c3318bafc9e8d240bb90f2de1f26a653776abd18f6f7c188fe8a38626 SHA512 ac0244c048c7d468fb6f971e58c631c39c919be9a049bb600abed9df9b2ae1429aba918714f6ad60b3cec48bf4dbcf81673946bc5736c0deb0d57585af460f21 WHIRLPOOL 1e25ffb8baba95381463d9ddd1b6ca18d8e954470fa8a384d00645049978869bc00408e7596fe0878c6a6a7e8fe8cf5567ad47a71a1f69945ca469dc560aa799
|
||||||
DIST mpv-bash-completion-3.3.8.tar.gz 19002 SHA256 67bb3565daafb1e3f64b24262b0859f7843ac052960e0159e3fe3a375ffed181 SHA512 4d6cfc3ac2d1fd6a28be1a40e3ca28d61f5d9ed40a850c5c60e45501b958b929d6ef9266027d2be95ed0c2b0dedccfdbb04fe4115bb7bcfd39435cb73f2dc452 WHIRLPOOL 62012925d3fb212c473e889930c1add93ce36533313a677cc9ddbc7acce2d9dfc1a18f9054dad901f7a0cb2b57c56a05f302f1fadc83b4bbeda5baa06fb2c7c8
|
DIST mpv-bash-completion-3.3.8.tar.gz 19002 SHA256 67bb3565daafb1e3f64b24262b0859f7843ac052960e0159e3fe3a375ffed181 SHA512 4d6cfc3ac2d1fd6a28be1a40e3ca28d61f5d9ed40a850c5c60e45501b958b929d6ef9266027d2be95ed0c2b0dedccfdbb04fe4115bb7bcfd39435cb73f2dc452 WHIRLPOOL 62012925d3fb212c473e889930c1add93ce36533313a677cc9ddbc7acce2d9dfc1a18f9054dad901f7a0cb2b57c56a05f302f1fadc83b4bbeda5baa06fb2c7c8
|
||||||
|
@ -1,2 +1,4 @@
|
|||||||
|
DIST tbb-2017.20170226.tar.gz 2856407 SHA256 780baf0ad520f23b54dd20dc97bf5aae4bc562019e0a70f53bfc4c1afec6e545 SHA512 d07eeca53138432a4ac20145169907f5271e234bedfb53e0eabbed2b6fafaecdc0a2ad7bdbead205993f822e7c415233cce9afd7575d366c17a117d5cc971a65 WHIRLPOOL 18095aa7fec6a6766f9d8456c34a346bc51c2525263f03ae00f6a37899cafea0b83d67fd199372983561543f197f797b50f99966ea24591114958ff115e80b6f
|
||||||
DIST tbb2017_20161128oss_src.tgz 2965854 SHA256 c009166233c8ea0e34530a1c5f870b79314316d19e6876b37a7e7c854080a540 SHA512 3c48ce196d2d3557e86cea7ede9dea456bbaeb29dbed34210f99c6f380406403a6056ccfa3d5befe6b29c4f8a9ee58ca6da545249cf4ec4ec85b463e04e4518c WHIRLPOOL d1ce8d07ac002c617afa7c0aa1d5cad41928a6eefd064a744b4efdd0192dd310ad8cb32b949858a7c2c44211477deffc05dbd65e8101184d4cae26744143b922
|
DIST tbb2017_20161128oss_src.tgz 2965854 SHA256 c009166233c8ea0e34530a1c5f870b79314316d19e6876b37a7e7c854080a540 SHA512 3c48ce196d2d3557e86cea7ede9dea456bbaeb29dbed34210f99c6f380406403a6056ccfa3d5befe6b29c4f8a9ee58ca6da545249cf4ec4ec85b463e04e4518c WHIRLPOOL d1ce8d07ac002c617afa7c0aa1d5cad41928a6eefd064a744b4efdd0192dd310ad8cb32b949858a7c2c44211477deffc05dbd65e8101184d4cae26744143b922
|
||||||
DIST tbb43_20150611oss_src.tgz 2757631 SHA256 221f85fe64e11c9638e43b3c57d5750c26683905fc90827c0bcfefdb286e79c9 SHA512 83d5d827706b774ef5cd6df8082e5d7f48683388684423bb40565dfc25892fc2e57c382f719b78087d83e51edb3f7f7215f33d8b5039b55c32788d80efa6e0b8 WHIRLPOOL 8e98162b2307c759fb26923d76ab784dea81e166c8bf5323869d234da59641c333e5ae30b4a224bccbf20d4f5f6b75c658589f519a165ea3ad7658322f148c72
|
DIST tbb43_20150611oss_src.tgz 2757631 SHA256 221f85fe64e11c9638e43b3c57d5750c26683905fc90827c0bcfefdb286e79c9 SHA512 83d5d827706b774ef5cd6df8082e5d7f48683388684423bb40565dfc25892fc2e57c382f719b78087d83e51edb3f7f7215f33d8b5039b55c32788d80efa6e0b8 WHIRLPOOL 8e98162b2307c759fb26923d76ab784dea81e166c8bf5323869d234da59641c333e5ae30b4a224bccbf20d4f5f6b75c658589f519a165ea3ad7658322f148c72
|
||||||
|
DIST tbb44_20160803oss_src.tgz 2874050 SHA256 23fb69a16b5daccef8e1ffe194d1dd5c6b1d225c0de87e54bc30c958aa244fb0 SHA512 01b1dcdaffa96c3d503e44d7b236b1115f419c122dab0f40de4c9dc90db315a1f3755cc91adf9df91d5d31d8927df115230db94cf175edac09ae438b46374a92 WHIRLPOOL 2b93bfabc0eadb1a10ad34f1a475322a04554bd8b5e4ac90505ec285f7727a537249a045f7a464fb3c266f9ece6c83fa259a099cc052da16cdd6c05cd9a1fb42
|
||||||
|
@ -0,0 +1,193 @@
|
|||||||
|
diff --git a/build/FreeBSD.gcc.inc b/build/FreeBSD.gcc.inc
|
||||||
|
index dc22ca3..65dfb6e 100644
|
||||||
|
--- a/build/FreeBSD.gcc.inc
|
||||||
|
+++ b/build/FreeBSD.gcc.inc
|
||||||
|
@@ -28,8 +28,8 @@ WARNING_KEY = -Wall
|
||||||
|
DYLIB_KEY = -shared
|
||||||
|
WARNING_SUPPRESS = -Wno-parentheses
|
||||||
|
|
||||||
|
-CPLUS = g++
|
||||||
|
-CONLY = gcc
|
||||||
|
+CPLUS = $(CXX)
|
||||||
|
+CONLY = $(CC)
|
||||||
|
LIB_LINK_FLAGS = -shared
|
||||||
|
LIBS = -lpthread
|
||||||
|
C_FLAGS = $(CPLUS_FLAGS)
|
||||||
|
@@ -42,7 +42,7 @@ ifneq (,$(shell gcc -dumpversion | egrep "^([6-9])"))
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(cfg), release)
|
||||||
|
- CPLUS_FLAGS = -g -O2 -DUSE_PTHREAD
|
||||||
|
+ CPLUS_FLAGS = -g -DUSE_PTHREAD
|
||||||
|
endif
|
||||||
|
ifeq ($(cfg), debug)
|
||||||
|
CPLUS_FLAGS = -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD
|
||||||
|
@@ -59,22 +59,12 @@ ifeq (ia64,$(arch))
|
||||||
|
CPLUS_FLAGS += $(PIC_KEY)
|
||||||
|
endif
|
||||||
|
|
||||||
|
-ifeq (intel64,$(arch))
|
||||||
|
- CPLUS_FLAGS += -m64
|
||||||
|
- LIB_LINK_FLAGS += -m64
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
-ifeq (ia32,$(arch))
|
||||||
|
- CPLUS_FLAGS += -m32
|
||||||
|
- LIB_LINK_FLAGS += -m32
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
#------------------------------------------------------------------------------
|
||||||
|
# Setting assembler data.
|
||||||
|
#------------------------------------------------------------------------------
|
||||||
|
ASSEMBLY_SOURCE=$(arch)-gas
|
||||||
|
ifeq (ia64,$(arch))
|
||||||
|
- ASM=as
|
||||||
|
+ ASM=$(AS)
|
||||||
|
TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o
|
||||||
|
MALLOC_ASM.OBJ = atomic_support.o lock_byte.o pause.o
|
||||||
|
endif
|
||||||
|
diff --git a/build/linux.clang.inc b/build/linux.clang.inc
|
||||||
|
index fc8d7de..21ad5d4 100644
|
||||||
|
--- a/build/linux.clang.inc
|
||||||
|
+++ b/build/linux.clang.inc
|
||||||
|
@@ -31,15 +31,15 @@ DYLIB_KEY = -shared
|
||||||
|
EXPORT_KEY = -Wl,--version-script,
|
||||||
|
LIBDL = -ldl
|
||||||
|
|
||||||
|
-CPLUS = clang++
|
||||||
|
-CONLY = clang
|
||||||
|
+CPLUS := $(CXX)
|
||||||
|
+CONLY := $(CC)
|
||||||
|
LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
|
||||||
|
LIBS += -lpthread -lrt
|
||||||
|
LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
|
||||||
|
C_FLAGS = $(CPLUS_FLAGS)
|
||||||
|
|
||||||
|
ifeq ($(cfg), release)
|
||||||
|
- CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
|
||||||
|
+ CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
|
||||||
|
endif
|
||||||
|
ifeq ($(cfg), debug)
|
||||||
|
CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
|
||||||
|
@@ -55,24 +55,10 @@ MALLOC_ASM.OBJ=
|
||||||
|
|
||||||
|
ifeq (intel64,$(arch))
|
||||||
|
ITT_NOTIFY = -DDO_ITT_NOTIFY
|
||||||
|
- CPLUS_FLAGS += -m64
|
||||||
|
- LIB_LINK_FLAGS += -m64
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq (ia32,$(arch))
|
||||||
|
ITT_NOTIFY = -DDO_ITT_NOTIFY
|
||||||
|
- CPLUS_FLAGS += -m32 -march=pentium4
|
||||||
|
- LIB_LINK_FLAGS += -m32
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
-ifeq (ppc64,$(arch))
|
||||||
|
- CPLUS_FLAGS += -m64
|
||||||
|
- LIB_LINK_FLAGS += -m64
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
-ifeq (ppc32,$(arch))
|
||||||
|
- CPLUS_FLAGS += -m32
|
||||||
|
- LIB_LINK_FLAGS += -m32
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq (bg,$(arch))
|
||||||
|
@@ -84,12 +70,6 @@ endif
|
||||||
|
# Setting assembler data.
|
||||||
|
#------------------------------------------------------------------------------
|
||||||
|
ASM = as
|
||||||
|
-ifeq (intel64,$(arch))
|
||||||
|
- ASM_FLAGS += --64
|
||||||
|
-endif
|
||||||
|
-ifeq (ia32,$(arch))
|
||||||
|
- ASM_FLAGS += --32
|
||||||
|
-endif
|
||||||
|
ifeq ($(cfg),debug)
|
||||||
|
ASM_FLAGS += -g
|
||||||
|
endif
|
||||||
|
diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc
|
||||||
|
index f9b483d..1e69789 100644
|
||||||
|
--- a/build/linux.gcc.inc
|
||||||
|
+++ b/build/linux.gcc.inc
|
||||||
|
@@ -32,12 +32,12 @@ DYLIB_KEY = -shared
|
||||||
|
EXPORT_KEY = -Wl,--version-script,
|
||||||
|
LIBDL = -ldl
|
||||||
|
|
||||||
|
-CPLUS = g++
|
||||||
|
-CONLY = gcc
|
||||||
|
+CPLUS := $(CXX)
|
||||||
|
+CONLY := $(CC)
|
||||||
|
LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
|
||||||
|
LIBS += -lpthread -lrt
|
||||||
|
LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
|
||||||
|
-C_FLAGS = $(CPLUS_FLAGS)
|
||||||
|
+C_FLAGS := $(CPLUS_FLAGS)
|
||||||
|
|
||||||
|
# gcc 4.2 and higher support OpenMP
|
||||||
|
ifneq (,$(shell gcc -dumpversion | egrep "^(4\.[2-9]|[5-9])"))
|
||||||
|
@@ -57,7 +57,7 @@ ifneq (,$(shell gcc -dumpversion | egrep "^([6-9])"))
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(cfg), release)
|
||||||
|
- CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
|
||||||
|
+ CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
|
||||||
|
endif
|
||||||
|
ifeq ($(cfg), debug)
|
||||||
|
CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
|
||||||
|
@@ -73,24 +73,12 @@ endif
|
||||||
|
|
||||||
|
ifeq (intel64,$(arch))
|
||||||
|
ITT_NOTIFY = -DDO_ITT_NOTIFY
|
||||||
|
- CPLUS_FLAGS += -m64 $(RTM_KEY)
|
||||||
|
- LIB_LINK_FLAGS += -m64
|
||||||
|
+ CPLUS_FLAGS += $(RTM_KEY)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq (ia32,$(arch))
|
||||||
|
ITT_NOTIFY = -DDO_ITT_NOTIFY
|
||||||
|
- CPLUS_FLAGS += -m32 -march=pentium4 $(RTM_KEY)
|
||||||
|
- LIB_LINK_FLAGS += -m32
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
-ifeq (ppc64,$(arch))
|
||||||
|
- CPLUS_FLAGS += -m64
|
||||||
|
- LIB_LINK_FLAGS += -m64
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
-ifeq (ppc32,$(arch))
|
||||||
|
- CPLUS_FLAGS += -m32
|
||||||
|
- LIB_LINK_FLAGS += -m32
|
||||||
|
+ CPLUS_FLAGS += $(RTM_KEY)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq (bg,$(arch))
|
||||||
|
@@ -98,12 +86,6 @@ ifeq (bg,$(arch))
|
||||||
|
CONLY = $(firstword $(notdir $(shell which powerpc{64,32,}-bg{z..a}-linux-gcc 2>/dev/null)))
|
||||||
|
endif
|
||||||
|
|
||||||
|
-# for some gcc versions on Solaris, -m64 may imply V9, but perhaps not everywhere (TODO: verify)
|
||||||
|
-ifeq (sparc,$(arch))
|
||||||
|
- CPLUS_FLAGS += -mcpu=v9 -m64
|
||||||
|
- LIB_LINK_FLAGS += -mcpu=v9 -m64
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
# automatically generate "IT" instructions when compiling for Thumb ISA
|
||||||
|
ifeq (armv7,$(arch))
|
||||||
|
CPLUS_FLAGS += -Wa,-mimplicit-it=thumb
|
||||||
|
@@ -112,13 +94,7 @@ endif
|
||||||
|
#------------------------------------------------------------------------------
|
||||||
|
# Setting assembler data.
|
||||||
|
#------------------------------------------------------------------------------
|
||||||
|
-ASM = as
|
||||||
|
-ifeq (intel64,$(arch))
|
||||||
|
- ASM_FLAGS += --64
|
||||||
|
-endif
|
||||||
|
-ifeq (ia32,$(arch))
|
||||||
|
- ASM_FLAGS += --32
|
||||||
|
-endif
|
||||||
|
+ASM := $(AS)
|
||||||
|
ifeq ($(cfg),debug)
|
||||||
|
ASM_FLAGS += -g
|
||||||
|
endif
|
@ -0,0 +1,15 @@
|
|||||||
|
https://bugs.gentoo.org/show_bug.cgi?id=418447
|
||||||
|
|
||||||
|
--- a/build/Makefile.test
|
||||||
|
+++ b/build/Makefile.test
|
||||||
|
@@ -44,8 +44,8 @@
|
||||||
|
USE_PROXY_FLAG = $(DEFINE_KEY)HARNESS_USE_PROXY
|
||||||
|
CPLUS_FLAGS += $(USE_PROXY_FLAG)
|
||||||
|
LINK_TBB.LIB = $(PROXY.LIB)
|
||||||
|
- LIBS += $(LIBDL)
|
||||||
|
-endif
|
||||||
|
+endif
|
||||||
|
+LIBS += $(LIBDL)
|
||||||
|
|
||||||
|
TEST_SUFFIXES=secondary compiler_builtins pic
|
||||||
|
include $(tbb_root)/build/common_rules.inc
|
@ -0,0 +1,144 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
|
||||||
|
inherit eutils flag-o-matic multilib-minimal toolchain-funcs versionator
|
||||||
|
|
||||||
|
PV1="$(get_version_component_range 1)"
|
||||||
|
PV2=5
|
||||||
|
MY_PV="${PV1}_U${PV2}"
|
||||||
|
|
||||||
|
DESCRIPTION="High level abstract threading library"
|
||||||
|
HOMEPAGE="http://www.threadingbuildingblocks.org/"
|
||||||
|
SRC_URI="https://github.com/01org/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
|
||||||
|
LICENSE="Apache-2.0"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
|
||||||
|
IUSE="debug doc examples"
|
||||||
|
|
||||||
|
DEPEND=""
|
||||||
|
RDEPEND="${DEPEND}"
|
||||||
|
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/${PN}-2017.20161128-underlinking.patch
|
||||||
|
"${FILESDIR}"/${PN}-2017.20161128-build.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
default
|
||||||
|
|
||||||
|
find include -name \*.html -delete || die
|
||||||
|
|
||||||
|
# Give it a soname on FreeBSD
|
||||||
|
echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >> build/FreeBSD.gcc.inc
|
||||||
|
# Set proper versionning on FreeBSD
|
||||||
|
sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die
|
||||||
|
|
||||||
|
use debug || sed -i -e '/_debug/d' Makefile
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_configure() {
|
||||||
|
# pc files are for debian and fedora compatibility
|
||||||
|
# some deps use them
|
||||||
|
cat <<-EOF > ${PN}.pc.template
|
||||||
|
prefix=${EPREFIX}/usr
|
||||||
|
libdir=\${prefix}/$(get_libdir)
|
||||||
|
includedir=\${prefix}/include
|
||||||
|
Name: ${PN}
|
||||||
|
Description: ${DESCRIPTION}
|
||||||
|
Version: ${PV}
|
||||||
|
URL: ${HOMEPAGE}
|
||||||
|
Cflags: -I\${includedir}
|
||||||
|
EOF
|
||||||
|
cp ${PN}.pc.template ${PN}.pc || die
|
||||||
|
cat <<-EOF >> ${PN}.pc
|
||||||
|
Libs: -L\${libdir} -ltbb
|
||||||
|
Libs.private: -lm -lrt
|
||||||
|
EOF
|
||||||
|
cp ${PN}.pc.template ${PN}malloc.pc || die
|
||||||
|
cat <<-EOF >> ${PN}malloc.pc
|
||||||
|
Libs: -L\${libdir} -ltbbmalloc
|
||||||
|
Libs.private: -lm -lrt
|
||||||
|
EOF
|
||||||
|
cp ${PN}.pc.template ${PN}malloc_proxy.pc || die
|
||||||
|
cat <<-EOF >> ${PN}malloc_proxy.pc
|
||||||
|
Libs: -L\${libdir} -ltbbmalloc_proxy
|
||||||
|
Libs.private: -lrt
|
||||||
|
Requires: tbbmalloc
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
local_src_compile() {
|
||||||
|
cd "${S}"
|
||||||
|
|
||||||
|
local comp arch
|
||||||
|
|
||||||
|
case ${MULTILIB_ABI_FLAG} in
|
||||||
|
abi_x86_64) arch=x86_64 ;;
|
||||||
|
abi_x86_32) arch=ia32 ;;
|
||||||
|
abi_ppc_64) arch=ppc64 ;;
|
||||||
|
abi_ppc_32) arch=ppc32 ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
case "$(tc-getCXX)" in
|
||||||
|
*g++*) comp="gcc" ;;
|
||||||
|
*ic*c) comp="icc" ;;
|
||||||
|
*clang*) comp="clang" ;;
|
||||||
|
*) die "compiler $(tc-getCXX) not supported by build system" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
CXX="$(tc-getCXX)" \
|
||||||
|
CC="$(tc-getCC)" \
|
||||||
|
AS="$(tc-getAS)" \
|
||||||
|
arch=${arch} \
|
||||||
|
CPLUS_FLAGS="${CXXFLAGS}" \
|
||||||
|
emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" $@
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_compile() {
|
||||||
|
local_src_compile tbb tbbmalloc
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_test() {
|
||||||
|
CXXFLAGS="${CXXFLAGS} -fabi-version=4" \
|
||||||
|
local_src_compile -j1 test
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_install() {
|
||||||
|
local bt
|
||||||
|
local buildtypes
|
||||||
|
if use debug ; then
|
||||||
|
buildtypes="release debug"
|
||||||
|
else
|
||||||
|
buildtypes="release"
|
||||||
|
fi
|
||||||
|
for bt in ${buildtypes}; do
|
||||||
|
cd "${BUILD_DIR}_${bt}" || die
|
||||||
|
local l
|
||||||
|
for l in $(find . -name lib\*.so.\*); do
|
||||||
|
dolib.so ${l}
|
||||||
|
local bl=$(basename ${l})
|
||||||
|
dosym ${bl} /usr/$(get_libdir)/${bl%.*}
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
cd "${BUILD_DIR}" || die
|
||||||
|
insinto /usr/$(get_libdir)/pkgconfig
|
||||||
|
doins *.pc
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_install_all() {
|
||||||
|
doheader -r include/*
|
||||||
|
|
||||||
|
dodoc README CHANGES doc/Release_Notes.txt
|
||||||
|
use doc && dohtml -r doc/html/*
|
||||||
|
|
||||||
|
if use examples ; then
|
||||||
|
insinto /usr/share/doc/${PF}/examples/build
|
||||||
|
doins build/*.inc
|
||||||
|
insinto /usr/share/doc/${PF}/examples
|
||||||
|
doins -r examples
|
||||||
|
fi
|
||||||
|
}
|
@ -0,0 +1,108 @@
|
|||||||
|
--- a/cgi/configure.in
|
||||||
|
+++ b/cgi/configure.in
|
||||||
|
@@ -13,15 +13,6 @@
|
||||||
|
# Export variables
|
||||||
|
TARGETS="all"
|
||||||
|
|
||||||
|
-# Building paths
|
||||||
|
-pathtmp="$PATH"
|
||||||
|
-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
|
||||||
|
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
|
||||||
|
-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
|
||||||
|
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
|
||||||
|
-CPATH="$HOME/include:/usr/local/include:$CPATH"
|
||||||
|
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
|
||||||
|
-
|
||||||
|
|
||||||
|
|
||||||
|
#================================================================
|
||||||
|
--- a/configure.in
|
||||||
|
+++ b/configure.in
|
||||||
|
@@ -20,15 +20,6 @@
|
||||||
|
LD="ld"
|
||||||
|
AR="ar"
|
||||||
|
|
||||||
|
-# Building paths
|
||||||
|
-pathtmp="$PATH"
|
||||||
|
-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
|
||||||
|
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
|
||||||
|
-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
|
||||||
|
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
|
||||||
|
-CPATH="$HOME/include:/usr/local/include:$CPATH"
|
||||||
|
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
|
||||||
|
-
|
||||||
|
|
||||||
|
|
||||||
|
#================================================================
|
||||||
|
--- a/java/configure.in
|
||||||
|
+++ b/java/configure.in
|
||||||
|
@@ -25,15 +25,6 @@
|
||||||
|
MYOPTS=""
|
||||||
|
LD="ld"
|
||||||
|
|
||||||
|
-# Building paths
|
||||||
|
-pathtmp="$PATH"
|
||||||
|
-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
|
||||||
|
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
|
||||||
|
-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
|
||||||
|
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
|
||||||
|
-CPATH="$HOME/include:/usr/local/include:$CPATH"
|
||||||
|
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
|
||||||
|
-
|
||||||
|
|
||||||
|
|
||||||
|
#================================================================
|
||||||
|
--- a/perl/configure.in
|
||||||
|
+++ b/perl/configure.in
|
||||||
|
@@ -5,15 +5,6 @@
|
||||||
|
# Targets
|
||||||
|
AC_INIT(qdbm-perl, 1.0.0)
|
||||||
|
|
||||||
|
-# Building paths
|
||||||
|
-pathtmp="$PATH"
|
||||||
|
-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
|
||||||
|
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
|
||||||
|
-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
|
||||||
|
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
|
||||||
|
-CPATH="$HOME/include:/usr/local/include:$CPATH"
|
||||||
|
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
|
||||||
|
-
|
||||||
|
# Setting the default prefix
|
||||||
|
if test "$prefix" = NONE
|
||||||
|
then
|
||||||
|
--- a/plus/configure.in
|
||||||
|
+++ b/plus/configure.in
|
||||||
|
@@ -19,15 +19,6 @@
|
||||||
|
LD="ld"
|
||||||
|
AR="ar"
|
||||||
|
|
||||||
|
-# Building paths
|
||||||
|
-pathtmp="$PATH"
|
||||||
|
-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
|
||||||
|
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
|
||||||
|
-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
|
||||||
|
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
|
||||||
|
-CPATH="$HOME/include:/usr/local/include:$CPATH"
|
||||||
|
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
|
||||||
|
-
|
||||||
|
|
||||||
|
|
||||||
|
#================================================================
|
||||||
|
--- a/ruby/configure.in
|
||||||
|
+++ b/ruby/configure.in
|
||||||
|
@@ -5,15 +5,6 @@
|
||||||
|
# Targets
|
||||||
|
AC_INIT(qdbm-ruby, 1.0.0)
|
||||||
|
|
||||||
|
-# Building paths
|
||||||
|
-pathtmp="$PATH"
|
||||||
|
-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
|
||||||
|
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
|
||||||
|
-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
|
||||||
|
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
|
||||||
|
-CPATH="$HOME/include:/usr/local/include:$CPATH"
|
||||||
|
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
|
||||||
|
-
|
||||||
|
# Setting the default prefix
|
||||||
|
if test "$prefix" = NONE
|
||||||
|
then
|
@ -1,22 +1,34 @@
|
|||||||
diff -ur qdbm-1.8.62.orig/perl/Makefile.in qdbm-1.8.62/perl/Makefile.in
|
--- a/perl/Makefile.in
|
||||||
--- qdbm-1.8.62.orig/perl/Makefile.in
|
+++ b/perl/Makefile.in
|
||||||
+++ qdbm-1.8.62/perl/Makefile.in
|
@@ -25,10 +25,10 @@
|
||||||
|
DESTDIR =
|
||||||
|
|
||||||
|
# Building binaries
|
||||||
|
-CC = gcc
|
||||||
|
+CC = @CC@
|
||||||
|
INC = -I. -I../.. -I$(HOME)/include -I/usr/local/include
|
||||||
|
OPTIMIZE = -O2
|
||||||
|
-LD = gcc
|
||||||
|
+LD = @CC@
|
||||||
|
LIBS = -L../.. -I$(HOME)/lib -L/usr/local/lib -lqdbm @LIBS@
|
||||||
|
RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib:$(HOME)/lib
|
||||||
|
|
||||||
@@ -42,15 +42,15 @@
|
@@ -42,15 +42,15 @@
|
||||||
all :
|
all :
|
||||||
cd depot && [ -f Makefile ] || \
|
cd depot && [ -f Makefile ] || \
|
||||||
$(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
|
$(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
|
||||||
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
|
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
|
||||||
+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \
|
+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS="vendor" ; \
|
||||||
$(RUNENV) make
|
$(RUNENV) make
|
||||||
cd curia && [ -f Makefile ] || \
|
cd curia && [ -f Makefile ] || \
|
||||||
$(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
|
$(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
|
||||||
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
|
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
|
||||||
+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \
|
+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS="vendor" ; \
|
||||||
$(RUNENV) make
|
$(RUNENV) make
|
||||||
cd villa && [ -f Makefile ] || \
|
cd villa && [ -f Makefile ] || \
|
||||||
$(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
|
$(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
|
||||||
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
|
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
|
||||||
+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \
|
+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS="vendor" ; \
|
||||||
$(RUNENV) make
|
$(RUNENV) make
|
||||||
@printf '\n'
|
@printf '\n'
|
||||||
@printf '#================================================================\n'
|
@printf '#================================================================\n'
|
@ -1,36 +1,30 @@
|
|||||||
diff -ur qdbm-1.8.77.orig/Makefile.in qdbm-1.8.77/Makefile.in
|
--- a/Makefile.in
|
||||||
--- qdbm-1.8.77.orig/Makefile.in
|
+++ b/Makefile.in
|
||||||
+++ qdbm-1.8.77/Makefile.in
|
@@ -61,7 +61,6 @@
|
||||||
@@ -61,7 +61,7 @@
|
|
||||||
LIBS = -lqdbm @LIBS@
|
LIBS = -lqdbm @LIBS@
|
||||||
LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
|
LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
|
||||||
LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
|
LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
|
||||||
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
|
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
|
||||||
+LDENV =
|
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
ARFLAGS = rcsv
|
ARFLAGS = rcsv
|
||||||
RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
|
RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
|
||||||
diff -urN qdbm-1.8.77.orig/cgi/Makefile.in qdbm-1.8.77/cgi/Makefile.in
|
--- a/cgi/Makefile.in
|
||||||
--- qdbm-1.8.77.orig/cgi/Makefile.in 2006-08-24 11:55:12.000000000 +0900
|
+++ b/cgi/Makefile.in
|
||||||
+++ qdbm-1.8.77/cgi/Makefile.in 2007-12-15 22:02:43.804668256 +0900
|
@@ -28,7 +28,6 @@
|
||||||
@@ -28,7 +28,7 @@
|
|
||||||
CFLAGS = -Wall -ansi -pedantic -fsigned-char -O2
|
CFLAGS = -Wall -ansi -pedantic -fsigned-char -O2
|
||||||
LIBS = -lqdbm @LIBS@
|
LIBS = -lqdbm @LIBS@
|
||||||
LDFLAGS = -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
|
LDFLAGS = -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
|
||||||
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(prefix)/lib
|
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(prefix)/lib
|
||||||
+LDENV =
|
|
||||||
|
|
||||||
# Install destinations
|
# Install destinations
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
diff -urN qdbm-1.8.77.orig/plus/Makefile.in qdbm-1.8.77/plus/Makefile.in
|
--- a/plus/Makefile.in
|
||||||
--- qdbm-1.8.77.orig/plus/Makefile.in 2007-03-07 11:44:27.000000000 +0900
|
+++ b/plus/Makefile.in
|
||||||
+++ qdbm-1.8.77/plus/Makefile.in 2007-12-15 22:02:32.976636806 +0900
|
@@ -51,7 +51,6 @@
|
||||||
@@ -51,7 +51,7 @@
|
|
||||||
-L$(HOME)/lib -L/usr/local/lib $(LIBS)
|
-L$(HOME)/lib -L/usr/local/lib $(LIBS)
|
||||||
LDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
|
LDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
|
||||||
-L$(HOME)/lib -L/usr/local/lib -lxqdbm $(LIBS)
|
-L$(HOME)/lib -L/usr/local/lib -lxqdbm $(LIBS)
|
||||||
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
|
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
|
||||||
+LDENV =
|
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
ARFLAGS = rcsv
|
ARFLAGS = rcsv
|
||||||
RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
|
RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
|
@ -1 +1,2 @@
|
|||||||
DIST tokumx-enterprise-2.0.2.tar.gz 16756175 SHA256 2ba471715f399a2652e75a978afde89072fce5560c0813a901a1dadb28582e6b SHA512 8d063abcbe16ce50b5b7f99ae6deec348cf60bb8bb57a3b06e478c03af7ded7501ca6ca15ac63ef07bf3fa0da59a30571b9a799fa5c5a9dcbac741c0a674b1f6 WHIRLPOOL 24546adf1466327571406af41378a15d1ceea58ff92aa01b8f758746cc4b54eabac100710c5bfab53f380f073edf081fc47e5c096df598f96c5e971bdee52805
|
DIST tokumx-enterprise-2.0.2.tar.gz 16756175 SHA256 2ba471715f399a2652e75a978afde89072fce5560c0813a901a1dadb28582e6b SHA512 8d063abcbe16ce50b5b7f99ae6deec348cf60bb8bb57a3b06e478c03af7ded7501ca6ca15ac63ef07bf3fa0da59a30571b9a799fa5c5a9dcbac741c0a674b1f6 WHIRLPOOL 24546adf1466327571406af41378a15d1ceea58ff92aa01b8f758746cc4b54eabac100710c5bfab53f380f073edf081fc47e5c096df598f96c5e971bdee52805
|
||||||
|
DIST tokumx-git-tag-1.5.0.tar.bz2 13059584 SHA256 381747c47073c8a6f8717a27756bb793ec6d80f4f7d119385f8d7b805a3d827d SHA512 ba19237db7d3dcbd3ac07b8cc4860549830fa065fa4d26cbae685274524cd5b89f671d5f126ec25bee605c99929ce0436bb2ac32d67efdbb8dd6d7526d3f1c24 WHIRLPOOL e5e33e28ce55b1abcff603a40453ab0a9d68f61cd15c68950dd6f87371565bd05057e8e48475f772524684fdb744093867423b249614d4c02908a467f9380c75
|
||||||
|
@ -0,0 +1,45 @@
|
|||||||
|
diff -uNr work.ORIG/mongo/CMakeLists.txt work/mongo/CMakeLists.txt
|
||||||
|
--- work.ORIG/mongo/CMakeLists.txt 2014-08-01 11:51:20.832614062 +0100
|
||||||
|
+++ work/mongo/CMakeLists.txt 2014-08-01 11:51:36.898614862 +0100
|
||||||
|
@@ -71,14 +71,13 @@
|
||||||
|
endforeach(flag)
|
||||||
|
endmacro(set_cxxflags_if_supported)
|
||||||
|
|
||||||
|
-set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -Werror -pipe")
|
||||||
|
+set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -pipe")
|
||||||
|
set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -ggdb")
|
||||||
|
set_cxxflags_if_supported(
|
||||||
|
-Wall
|
||||||
|
-Wsign-compare
|
||||||
|
-Wno-unknown-pragmas
|
||||||
|
-Winvalid-pch
|
||||||
|
- -Werror
|
||||||
|
-pipe
|
||||||
|
-Wnon-virtual-dtor
|
||||||
|
-Woverloaded-virtual
|
||||||
|
diff -uNr work.ORIG/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake work/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake
|
||||||
|
--- work.ORIG/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake 2014-08-01 11:51:20.696614056 +0100
|
||||||
|
+++ work/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake 2014-08-01 11:51:36.898614862 +0100
|
||||||
|
@@ -174,8 +174,8 @@
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
## always want these
|
||||||
|
-set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
|
||||||
|
-set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}")
|
||||||
|
+set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
|
||||||
|
+set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}")
|
||||||
|
|
||||||
|
## need to set -stdlib=libc++ to get real c++11 support on darwin
|
||||||
|
if (APPLE)
|
||||||
|
diff -uNr work.ORIG/mongo/src/third_party/ft-index/examples/Makefile work/mongo/src/third_party/ft-index/examples/Makefile
|
||||||
|
--- work.ORIG/mongo/src/third_party/ft-index/examples/Makefile 2014-08-01 11:51:20.676614055 +0100
|
||||||
|
+++ work/mongo/src/third_party/ft-index/examples/Makefile 2014-08-01 11:51:36.898614862 +0100
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
SRCS = $(wildcard *.c)
|
||||||
|
TARGETS = $(patsubst %.c,%,$(SRCS)) $(patsubst %.c,%-bdb,$(SRCS))
|
||||||
|
CPPFLAGS = -I../include -D_GNU_SOURCE
|
||||||
|
-CFLAGS = -g -std=c99 -Wall -Wextra -Werror -Wno-missing-field-initializers
|
||||||
|
+CFLAGS = -g -std=c99 -Wall -Wextra -Wno-missing-field-initializers
|
||||||
|
ifeq ($(USE_STATIC_LIBS),1)
|
||||||
|
LIBTOKUDB = tokufractaltree_static
|
||||||
|
LIBTOKUPORTABILITY = tokuportability_static
|
@ -0,0 +1,11 @@
|
|||||||
|
diff -uNr work.ORIG/mongo/src/mongo/shell/linenoise_utf8.h work/mongo/src/mongo/shell/linenoise_utf8.h
|
||||||
|
--- work.ORIG/mongo/src/mongo/shell/linenoise_utf8.h 2017-03-30 15:20:51.880842717 +0100
|
||||||
|
+++ work/mongo/src/mongo/shell/linenoise_utf8.h 2017-03-30 15:21:26.002844416 +0100
|
||||||
|
@@ -16,6 +16,7 @@
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <boost/smart_ptr/scoped_array.hpp>
|
||||||
|
+#include <algorithm>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
namespace linenoise_utf8 {
|
@ -0,0 +1,11 @@
|
|||||||
|
diff -auwrN a/src/third_party/ft-index/CMakeLists.txt b/src/third_party/ft-index/CMakeLists.txt
|
||||||
|
--- a/src/third_party/ft-index/CMakeLists.txt 2014-08-01 04:37:33.000000000 -0400
|
||||||
|
+++ b/src/third_party/ft-index/CMakeLists.txt 2014-08-01 10:38:28.134869689 -0400
|
||||||
|
@@ -35,7 +35,6 @@
|
||||||
|
include(TokuFeatureDetection)
|
||||||
|
include(TokuSetupCompiler)
|
||||||
|
include(TokuSetupCTest)
|
||||||
|
-include(TokuThirdParty)
|
||||||
|
|
||||||
|
set(TOKU_CMAKE_SCRIPT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||||
|
include(TokuMergeLibs)
|
@ -0,0 +1,75 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
CMAKE_BUILD_TYPE=Release
|
||||||
|
PYTHON_COMPAT=( python2_7 )
|
||||||
|
|
||||||
|
inherit python-r1 pax-utils cmake-utils
|
||||||
|
|
||||||
|
MY_P=${PN}-git-tag-${PV}
|
||||||
|
|
||||||
|
DESCRIPTION="An open source, high-performance distribution of MongoDB"
|
||||||
|
HOMEPAGE="http://www.tokutek.com/products/tokumx-for-mongodb/"
|
||||||
|
SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
|
||||||
|
|
||||||
|
LICENSE="AGPL-3 Apache-2.0"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64"
|
||||||
|
IUSE="pax_kernel"
|
||||||
|
|
||||||
|
RDEPEND="
|
||||||
|
dev-libs/jemalloc
|
||||||
|
>=dev-libs/boost-1.50[threads(+)]
|
||||||
|
>=dev-libs/libpcre-8.30[cxx]
|
||||||
|
net-libs/libpcap"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
sys-libs/ncurses
|
||||||
|
sys-libs/readline
|
||||||
|
pax_kernel? ( sys-apps/paxctl sys-apps/elfix )"
|
||||||
|
|
||||||
|
S="${WORKDIR}/mongo"
|
||||||
|
BUILD_DIR="${WORKDIR}/mongo/build"
|
||||||
|
QA_PRESTRIPPED="/usr/lib64/libHotBackup.so"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
cd "${WORKDIR}"
|
||||||
|
epatch "${FILESDIR}/${PV}-Werror.diff"
|
||||||
|
epatch "${FILESDIR}/${PV}-boost-57.diff"
|
||||||
|
epatch "${FILESDIR}/${PN}-disable-bundled-libs.patch"
|
||||||
|
cd "${S}"
|
||||||
|
cmake-utils_src_prepare
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
local mycmakeargs=(
|
||||||
|
-D TOKU_DEBUG_PARANOID=OFF
|
||||||
|
-D USE_VALGRIND=OFF
|
||||||
|
-D USE_BDB=OFF
|
||||||
|
-D BUILD_TESTING=OFF
|
||||||
|
-D TOKUMX_DISTNAME=${PV}
|
||||||
|
-D LIBJEMALLOC="jemalloc"
|
||||||
|
-D TOKUMX_STRIP_BINARIES=0
|
||||||
|
-D USE_SYSTEM_PCRE=1
|
||||||
|
-D USE_SYSTEM_BOOST=1
|
||||||
|
)
|
||||||
|
cmake-utils_src_configure
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
cmake-utils_src_install
|
||||||
|
pax-mark -m "${D}"/usr/bin/mongo
|
||||||
|
|
||||||
|
# Remove unnecessary files
|
||||||
|
rm -r "${D}usr/buildscripts" "${D}usr/scripts" "${D}usr/src" "${D}usr/include/db.h" || die
|
||||||
|
|
||||||
|
# Correctly install this python script
|
||||||
|
python_foreach_impl python_doscript scripts/tokumxstat.py
|
||||||
|
|
||||||
|
# Clean up documentation installed to /usr
|
||||||
|
pushd "${D}usr/" || die
|
||||||
|
rm GNU-AGPL-3.0 LICENSE.txt NEWS README README.md README-TOKUDB README-TOKUKV SConstruct THIRD-PARTY-NOTICES || die
|
||||||
|
popd || die
|
||||||
|
dodoc README.md distsrc/NEWS distsrc/README distsrc/THIRD-PARTY-NOTICES
|
||||||
|
newdoc src/third_party/ft-index/README-TOKUDB README-TOKUKV
|
||||||
|
}
|
@ -1,2 +1,3 @@
|
|||||||
DIST Text-BibTeX-0.78.tar.gz 295794 SHA256 53036462b539ee7401eecb38d8fb78f8c6b724917890aa2a243ab176461adad1 SHA512 b888e2273db40a104a1206462b172587140389aa69eb725db589f137a532b87958182bf31734f873bc5f1dec2f6bedc6ed93c0e40ed82c014a0aff3f573242b5 WHIRLPOOL fb2d4eddefbfc9568e9547e588a688ee4be843522e4b659e58240cddc70e9a38d66a5516af8f9d48fa764f9886cc9cd5630e6da1784c019e9974de7e8def2d19
|
DIST Text-BibTeX-0.78.tar.gz 295794 SHA256 53036462b539ee7401eecb38d8fb78f8c6b724917890aa2a243ab176461adad1 SHA512 b888e2273db40a104a1206462b172587140389aa69eb725db589f137a532b87958182bf31734f873bc5f1dec2f6bedc6ed93c0e40ed82c014a0aff3f573242b5 WHIRLPOOL fb2d4eddefbfc9568e9547e588a688ee4be843522e4b659e58240cddc70e9a38d66a5516af8f9d48fa764f9886cc9cd5630e6da1784c019e9974de7e8def2d19
|
||||||
DIST Text-BibTeX-0.79.tar.gz 296405 SHA256 0e3be08e0a9321860afb9ea048c6e3a95eea26dfc384dc8ee0438e288463d0e3 SHA512 dce031540f06b56c1a89de274e8972a0db475c77656f8ffd77eec9bf5b5be7348b0f42b63ede350207445b61d4eadc2f3561cec36cf42b9ae181f84115469d42 WHIRLPOOL 826a067b67b24926101363fbc22479bf1854de3f218ed2402baca3269c146b7ffa10dd57341a54bd4fe4b528288e3a26813ac37f42becdea76ead6959178f875
|
DIST Text-BibTeX-0.79.tar.gz 296405 SHA256 0e3be08e0a9321860afb9ea048c6e3a95eea26dfc384dc8ee0438e288463d0e3 SHA512 dce031540f06b56c1a89de274e8972a0db475c77656f8ffd77eec9bf5b5be7348b0f42b63ede350207445b61d4eadc2f3561cec36cf42b9ae181f84115469d42 WHIRLPOOL 826a067b67b24926101363fbc22479bf1854de3f218ed2402baca3269c146b7ffa10dd57341a54bd4fe4b528288e3a26813ac37f42becdea76ead6959178f875
|
||||||
|
DIST Text-BibTeX-0.80.tar.gz 296711 SHA256 86872d085ddb8d94a3e796987738afce95749f0b9a7d7f3c4f19023e4ceffb6b SHA512 5fe2840ddd644578a5c4757ddaff9f6b0c943c54b5c74a8bbcbf4e9d58a9e204cdba38736251ddb89c1702a524d511651cd016b4cb3d4a714bb389ccf8366b6f WHIRLPOOL 3613f48054e37a755479df40f4be519553ad7aa201c345d57216af82fd86413ff96d56cd8e4aafbfd8efa7fcfb05de0d19d9631205dee1cacbc2ea119ac0bd08
|
||||||
|
@ -0,0 +1,43 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
|
||||||
|
DIST_AUTHOR=AMBS
|
||||||
|
DIST_VERSION=0.80
|
||||||
|
DIST_EXAMPLES=( "examples/*" "scripts/*" )
|
||||||
|
|
||||||
|
inherit perl-module
|
||||||
|
|
||||||
|
DESCRIPTION="A Perl library for reading, parsing, and processing BibTeX files"
|
||||||
|
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE="test"
|
||||||
|
|
||||||
|
RDEPEND="
|
||||||
|
!dev-libs/btparse
|
||||||
|
virtual/perl-Encode
|
||||||
|
virtual/perl-Scalar-List-Utils
|
||||||
|
virtual/perl-Unicode-Normalize
|
||||||
|
"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
>=dev-perl/Config-AutoConf-0.160.0
|
||||||
|
>=dev-perl/ExtUtils-LibBuilder-0.20.0
|
||||||
|
>=virtual/perl-ExtUtils-CBuilder-0.270.0
|
||||||
|
>=dev-perl/Module-Build-0.360.300
|
||||||
|
test? (
|
||||||
|
>=dev-perl/Capture-Tiny-0.60.0
|
||||||
|
)
|
||||||
|
"
|
||||||
|
src_prepare() {
|
||||||
|
sed -i -e "/#include <stdio.h>/a #include <string.h>"\
|
||||||
|
btparse/tests/{tex,purify,postprocess,name,macro}_test.c || die
|
||||||
|
perl-module_src_prepare
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
perl-module_src_install
|
||||||
|
doheader btparse/src/btparse.h
|
||||||
|
doheader btparse/src/bt_config.h
|
||||||
|
}
|
@ -1,3 +1,2 @@
|
|||||||
DIST plumbum-1.5.0.tar.gz 57390 SHA256 b759f9e3b6771dff3332f01bc0683d1a56218f44d97942dabd906a0cd1cfb756 SHA512 68c248cf6e40281bc97ef9ba69ff03b3e5b486f44d2a66674fd6073313bbce49abc729f8c99ec1988d9a8881f4c1ff8cf70ac238a38eabf9a3da76d452be525f WHIRLPOOL 9d9660a81546348f4a2c3910fa455b597429f9a23cd9c9a053bc2728e352e38bdb5d2b89f6f3a741e937522b7aabb7f5071f7d34efcdbe82d88e647854d1678d
|
|
||||||
DIST plumbum-1.6.0.tar.gz 77092 SHA256 74c931a79d1c1851ee7a2d8b7f594c810930e46a6bdea7961e177d3670ed350e SHA512 0be9461720cb03c56aff8f56705b1753013e02df4b4d3dbc7e8379930b9efb3822df587483ca708f3a16f08d625f03459f8fe377bc50e59439d05f73669003cc WHIRLPOOL 27d24289327ed6e68f47fec995962b6929e804091d44220fcdbf115bd532b4dc0dca154d25077869c484f5682722238aed2cec5c1372846528d904cddefe88b6
|
DIST plumbum-1.6.0.tar.gz 77092 SHA256 74c931a79d1c1851ee7a2d8b7f594c810930e46a6bdea7961e177d3670ed350e SHA512 0be9461720cb03c56aff8f56705b1753013e02df4b4d3dbc7e8379930b9efb3822df587483ca708f3a16f08d625f03459f8fe377bc50e59439d05f73669003cc WHIRLPOOL 27d24289327ed6e68f47fec995962b6929e804091d44220fcdbf115bd532b4dc0dca154d25077869c484f5682722238aed2cec5c1372846528d904cddefe88b6
|
||||||
DIST plumbum-1.6.3.tar.gz 82109 SHA256 0249e708459f1b05627a7ca8787622c234e4db495a532acbbd1f1f17f28c7320 SHA512 998148db310d3ede1a641bd0e8875a5b3853a08329d5bc68eea163f9eaa1e0e05548f544084d72ad2d233fd9b9bd1ed7518b0f8047e0e737a7a014fa0cd8fe1f WHIRLPOOL 1b455baca137e09d43ceb0e57fe3e00cf80d0101f46bd882f8a3e57cd934e63c98221428ad40d138979d0a7b4159af9db3e1a11d7d06ff5e8cfe492157d708b9
|
DIST plumbum-1.6.3.tar.gz 82109 SHA256 0249e708459f1b05627a7ca8787622c234e4db495a532acbbd1f1f17f28c7320 SHA512 998148db310d3ede1a641bd0e8875a5b3853a08329d5bc68eea163f9eaa1e0e05548f544084d72ad2d233fd9b9bd1ed7518b0f8047e0e737a7a014fa0cd8fe1f WHIRLPOOL 1b455baca137e09d43ceb0e57fe3e00cf80d0101f46bd882f8a3e57cd934e63c98221428ad40d138979d0a7b4159af9db3e1a11d7d06ff5e8cfe492157d708b9
|
||||||
|
@ -1,14 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
PYTHON_COMPAT=( python2_7 python3_4 )
|
|
||||||
inherit distutils-r1
|
|
||||||
|
|
||||||
DESCRIPTION="A library for shell script-like programs in python"
|
|
||||||
HOMEPAGE="http://plumbum.readthedocs.org/"
|
|
||||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
|
||||||
LICENSE="MIT"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE=""
|
|
@ -1,3 +1,3 @@
|
|||||||
DIST prompt_toolkit-1.0.0.tar.gz 212138 SHA256 5108ed9e6e40d28cb1dc90ba563987859231289700d0def999007b08f4f74ea4 SHA512 84908871df84d82b0fd0e31c1bef63b3dde38d8e3c1459d3d5466cfda68ef48477eba5a2d4c5af831e7a3fa42ab57c56f771f8050b53223638683cee27281647 WHIRLPOOL a141f2ed1bc57ef9b663877094c9fe3e4a751a59f72c327da479872bfdd48b7b70ba78f3d4be2c397acb699d2adf272a8df5c8db7b3999b2711dd1b62d4a3d0d
|
DIST prompt_toolkit-1.0.0.tar.gz 212138 SHA256 5108ed9e6e40d28cb1dc90ba563987859231289700d0def999007b08f4f74ea4 SHA512 84908871df84d82b0fd0e31c1bef63b3dde38d8e3c1459d3d5466cfda68ef48477eba5a2d4c5af831e7a3fa42ab57c56f771f8050b53223638683cee27281647 WHIRLPOOL a141f2ed1bc57ef9b663877094c9fe3e4a751a59f72c327da479872bfdd48b7b70ba78f3d4be2c397acb699d2adf272a8df5c8db7b3999b2711dd1b62d4a3d0d
|
||||||
DIST prompt_toolkit-1.0.13.tar.gz 240895 SHA256 33d68ca09f76cd73287fde7df5748ffacf26a8238dd61ee81ac50860ea7c6776 SHA512 9018133a7cf20c40b85d78a1622ad63a12b32994d054c7b8a593502929b6f01138d407e25f2de549a44a5d5091074e440960bc230c357806ef1507f19e15b1dd WHIRLPOOL 9121b44db7300d489821555f0bef2effb472e059b2980c0705f4006fa8d112114832e59fb7ef6f1ff6e9b442c39a7b03f05a4de908b61e52e94df4f0166f438b
|
DIST prompt_toolkit-1.0.13.tar.gz 240895 SHA256 33d68ca09f76cd73287fde7df5748ffacf26a8238dd61ee81ac50860ea7c6776 SHA512 9018133a7cf20c40b85d78a1622ad63a12b32994d054c7b8a593502929b6f01138d407e25f2de549a44a5d5091074e440960bc230c357806ef1507f19e15b1dd WHIRLPOOL 9121b44db7300d489821555f0bef2effb472e059b2980c0705f4006fa8d112114832e59fb7ef6f1ff6e9b442c39a7b03f05a4de908b61e52e94df4f0166f438b
|
||||||
DIST prompt_toolkit-1.0.3.tar.gz 221875 SHA256 805e026f0cbad27467e93f9dd3e3777718d401a62788c1e84ca038e967ad8ba2 SHA512 c7615c42c7923bb2cefb8db536405976975d25a7df110698e9664f205d3428b6bbf6ca2aba8b0d85957296fcac0bf65752d025cabdb25c80f149f9b92c0c445d WHIRLPOOL 61390865c3f6ad7ed258c481484b6da9211c6053761ed3716977f43b00697c79e3f24443ee4695c1a4d1aea2105e2cf171df92685d42be62ac508c4f3deeb9f1
|
DIST prompt_toolkit-1.0.14.tar.gz 241612 SHA256 cc66413b1b4b17021675d9f2d15d57e640b06ddfd99bb724c73484126d22622f SHA512 909bf50bf0095a8cc37581fc7384f9035eb9d6fd0d16a914e8912693476262cfe0b0c78643ba1c629bd907c861981a9740155927148fcff554446ebb4fd80959 WHIRLPOOL 5967bab046f70bfb74ee8e548fb3a7c5cdfeb328498176db28cf3cea5c47233697e193d4e47f0ae688718c228867b4a9b8a1c7227ce0a94b3e9b30441ec44961
|
||||||
|
@ -0,0 +1,34 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
|
||||||
|
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
|
||||||
|
|
||||||
|
inherit distutils-r1 eutils
|
||||||
|
|
||||||
|
DESCRIPTION="Python REPL build on top of prompt_toolkit"
|
||||||
|
HOMEPAGE="https://pypi.python.org/pypi/ptpython/ https://github.com/jonathanslenders/ptpython"
|
||||||
|
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||||
|
|
||||||
|
SLOT="0"
|
||||||
|
LICENSE="BSD"
|
||||||
|
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
RDEPEND="
|
||||||
|
dev-python/docopt[${PYTHON_USEDEP}]
|
||||||
|
>=dev-python/jedi-0.9.0[${PYTHON_USEDEP}]
|
||||||
|
>=dev-python/prompt_toolkit-0.58[${PYTHON_USEDEP}]
|
||||||
|
dev-python/pygments[${PYTHON_USEDEP}]
|
||||||
|
"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||||
|
"
|
||||||
|
|
||||||
|
# Not included
|
||||||
|
RESTRICT=test
|
||||||
|
|
||||||
|
python_test() {
|
||||||
|
"${PYTHON}" tests/run_tests.py || die
|
||||||
|
}
|
@ -1,2 +1 @@
|
|||||||
DIST rpyc-3.2.3.tar.gz 48371 SHA256 80782d78863bc4f803b2534452dc37c5dcb6e85230af77fe0ce5a0206e37f661 SHA512 b0cc7a9429b062b0b796a7e4f6bc8056041db7e63b04dc8cbc67c5e2f343f1c1299e0e3fc88ff651f484caf5d3305cb4346523dee555e8315c9a1e1141da8b28 WHIRLPOOL 4fc6383571bb84aaed7c6e1b360c2e9b55c40f3ba2a7ca9dfd41527b889f3713003f5286edda625fcfbe4e293854389ddff437f54d18188187b3fd2a83a35cbe
|
|
||||||
DIST rpyc-3.3.0.tar.gz 53541 SHA256 43fa845314f0bf442f5f5fab15bb1d1b5fe2011a8fc603f92d8022575cef8b4b SHA512 c586ab79d2ab3a8e14128c7ac5ae49a3311de0723453f801edb805819b06037ae015825fda32ac7620d99fdeceacbcbc5d1b4fadc3c7b2ac778e883ba9406793 WHIRLPOOL c8cd0dbf8c5c45690b3443fcd6e8a62043fbbfafc8f778dd492467bb6d1e5916d2c489fdd668817006d1105a07e87b7b707e3483b250ae68e745d51ed10e05d4
|
DIST rpyc-3.3.0.tar.gz 53541 SHA256 43fa845314f0bf442f5f5fab15bb1d1b5fe2011a8fc603f92d8022575cef8b4b SHA512 c586ab79d2ab3a8e14128c7ac5ae49a3311de0723453f801edb805819b06037ae015825fda32ac7620d99fdeceacbcbc5d1b4fadc3c7b2ac778e883ba9406793 WHIRLPOOL c8cd0dbf8c5c45690b3443fcd6e8a62043fbbfafc8f778dd492467bb6d1e5916d2c489fdd668817006d1105a07e87b7b707e3483b250ae68e745d51ed10e05d4
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI="5"
|
EAPI="5"
|
||||||
PYTHON_COMPAT=( python{2_7,3_4} )
|
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
|
||||||
|
|
||||||
inherit distutils-r1
|
inherit distutils-r1
|
||||||
|
|
||||||
DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
|
DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
|
||||||
HOMEPAGE="http://rpyc.sourceforge.net/"
|
HOMEPAGE="http://rpyc.readthedocs.org/"
|
||||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||||
LICENSE="MIT"
|
LICENSE="MIT"
|
||||||
SLOT="0"
|
SLOT="0"
|
||||||
KEYWORDS="amd64 x86"
|
KEYWORDS="~amd64 ~x86"
|
||||||
IUSE=""
|
IUSE=""
|
||||||
RDEPEND=""
|
RDEPEND="dev-python/plumbum"
|
||||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
@ -1 +1 @@
|
|||||||
DIST its4-1.1.1.tgz 59759 SHA256 386ca694c969108863f3e5c0571ea8c5cbdc288dd13e12ba573a592844682df4
|
DIST its4-1.1.1.tgz 59759 SHA256 386ca694c969108863f3e5c0571ea8c5cbdc288dd13e12ba573a592844682df4 SHA512 c7bfa71eba114ab3aac586dfa5f30c7a935f06d72b78bae3c3d464f591085cf3419a1d23ab951376bd9c2d7e436711a45c9f5047c3125df5d731b746412be0f6 WHIRLPOOL b734a79abb2eb2a3df330f06852d35aee61c451419fe915fdc0788dbcc9eb51ef282f8bdc9aac2d712fa2bdc21b23a743da9a55dd66fa0a58229036bb1b2e8c8
|
||||||
|
@ -0,0 +1,45 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI="5"
|
||||||
|
|
||||||
|
inherit eutils
|
||||||
|
|
||||||
|
DESCRIPTION="ITS4: Software Security Tool"
|
||||||
|
HOMEPAGE="http://www.cigital.com/its4/"
|
||||||
|
SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tgz"
|
||||||
|
LICENSE="ITS4"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~x86 ~ppc ~amd64"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
DEPEND=""
|
||||||
|
RDEPEND=""
|
||||||
|
|
||||||
|
S="${WORKDIR}/${PN}"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
sed -i \
|
||||||
|
-e 's,iostream.h,iostream,g'\
|
||||||
|
"${S}"/configure || die
|
||||||
|
sed -i \
|
||||||
|
-e 's/$(CC) -o/$(CC) $(OPTIMIZATION) $(EXTRA_FLAGS) -o/' \
|
||||||
|
"${S}"/Makefile.in || die
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
# WARNING
|
||||||
|
# non-standard configure
|
||||||
|
# do NOT use econf
|
||||||
|
./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/its4 || die "configure failed"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
emake CC="$(tc-getCXX)" OPTIMIZATION="${CXXFLAGS}" EXTRA_FLAGS="${LDFLAGS}"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
# WARNING
|
||||||
|
# non-standard, do NOT use einstall or 'make install DESTDIR=...'
|
||||||
|
make install INSTALL_BINDIR="${D}/usr/bin" INSTALL_MANDIR="${D}/usr/share/man" INSTALL_DATADIR="${D}/usr/share/its4" || die "install failed"
|
||||||
|
}
|
@ -1,3 +1,4 @@
|
|||||||
DIST jenkins-bin-2.32.2.war 69874457 SHA256 73b216449cb5eacd4fe5a6ee2e089245705e5815b448e315fbc8b6de7809e55f SHA512 4c61ad7b2ad588df6daa7ccf3b3272443fa15f8c3dfe15adff141ddb96088e9eccb0ced9d68c72bddb6f177f655035db300b7f8866b3bc211db8b04a676c96e8 WHIRLPOOL 089f3758bdb640f1c8de29c009e9f149877b5da501f495346cef71b89485608f3371f99be4c83c721e5b760f1e312e140325b079ef819fb179f5819f6bf43313
|
DIST jenkins-bin-2.32.2.war 69874457 SHA256 73b216449cb5eacd4fe5a6ee2e089245705e5815b448e315fbc8b6de7809e55f SHA512 4c61ad7b2ad588df6daa7ccf3b3272443fa15f8c3dfe15adff141ddb96088e9eccb0ced9d68c72bddb6f177f655035db300b7f8866b3bc211db8b04a676c96e8 WHIRLPOOL 089f3758bdb640f1c8de29c009e9f149877b5da501f495346cef71b89485608f3371f99be4c83c721e5b760f1e312e140325b079ef819fb179f5819f6bf43313
|
||||||
DIST jenkins-bin-2.32.3.war 69875039 SHA256 3eb599dd78ecf00e5f177ec5c4b1ba4274be4e5f63236da6ac92401a66fa91e8 SHA512 afe6b935dad970e1b89d35413982635b06a216a794d9bf3b1587f193b8edc4e369f51bcd344c9354271d40838c1d1c5178461ecdd800bceb2df07ece8d8b4bf2 WHIRLPOOL 8efb195b29627be117f73d51136bc6785d2058e3e5a4ba89c489f64d194f8933160c233fe175c0310f595bd7644292a8b3c4d2cc278e20f20a5de501b15af90a
|
DIST jenkins-bin-2.32.3.war 69875039 SHA256 3eb599dd78ecf00e5f177ec5c4b1ba4274be4e5f63236da6ac92401a66fa91e8 SHA512 afe6b935dad970e1b89d35413982635b06a216a794d9bf3b1587f193b8edc4e369f51bcd344c9354271d40838c1d1c5178461ecdd800bceb2df07ece8d8b4bf2 WHIRLPOOL 8efb195b29627be117f73d51136bc6785d2058e3e5a4ba89c489f64d194f8933160c233fe175c0310f595bd7644292a8b3c4d2cc278e20f20a5de501b15af90a
|
||||||
DIST jenkins-bin-2.45.war 68649092 SHA256 0e57ee3645aec0742b8b2a0d4cd62cb80c3e6718b810200ab33851109f1f5488 SHA512 e2ec91827231efc39a1dd4b149239627e556391170d9b1b65eb8091f71787981863ecc5ee8a4b82d777672edb3ff0dbc59cd0dba68df9872af40661edcb4e615 WHIRLPOOL a0f4d3126020e8caecdfc2b54cb3f3f97d778f5f20c62722339494ec0884ce500b85938043dfc5fcfeb88853b21c871a9820900c0668e9cfbc08aafe3dbc93fc
|
DIST jenkins-bin-2.45.war 68649092 SHA256 0e57ee3645aec0742b8b2a0d4cd62cb80c3e6718b810200ab33851109f1f5488 SHA512 e2ec91827231efc39a1dd4b149239627e556391170d9b1b65eb8091f71787981863ecc5ee8a4b82d777672edb3ff0dbc59cd0dba68df9872af40661edcb4e615 WHIRLPOOL a0f4d3126020e8caecdfc2b54cb3f3f97d778f5f20c62722339494ec0884ce500b85938043dfc5fcfeb88853b21c871a9820900c0668e9cfbc08aafe3dbc93fc
|
||||||
|
DIST jenkins-bin-2.46.1.war 68669812 SHA256 33a3f4d983c6188a332291e1d974afa0a2ee96a0ae3cb6dd4f2098086525f9f1 SHA512 a15beda88320c80ff149972c880627c236421c0d2363d2194f4e6c6392891f3c386d7ff0738c03a2c9de449e71f059a9f5f5ebd00f048b18aa231dd0e45ef83c WHIRLPOOL 5be3076bfe669420837529d91920508f0e661ba782c8362246a8167b3772f9301fa6a4a484f29697eb315f8097a562ba7028bb9a886808f7d359eede894144a9
|
||||||
|
@ -0,0 +1,46 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
|
||||||
|
inherit user systemd
|
||||||
|
|
||||||
|
DESCRIPTION="Extensible continuous integration server"
|
||||||
|
HOMEPAGE="http://jenkins-ci.org/"
|
||||||
|
LICENSE="MIT"
|
||||||
|
SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
|
||||||
|
RESTRICT="mirror"
|
||||||
|
SLOT="lts"
|
||||||
|
KEYWORDS="~amd64 ~x86 ~amd64-linux"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
RDEPEND="media-fonts/dejavu
|
||||||
|
media-libs/freetype
|
||||||
|
!dev-util/jenkins-bin:0
|
||||||
|
>=virtual/jre-1.7.0"
|
||||||
|
|
||||||
|
S=${WORKDIR}
|
||||||
|
|
||||||
|
JENKINS_DIR=/var/lib/jenkins
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
enewgroup jenkins
|
||||||
|
enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
|
||||||
|
|
||||||
|
insinto /opt/jenkins
|
||||||
|
newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
|
||||||
|
|
||||||
|
insinto /etc/logrotate.d
|
||||||
|
newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
|
||||||
|
|
||||||
|
newinitd "${FILESDIR}"/${PN}.init2 jenkins
|
||||||
|
newconfd "${FILESDIR}"/${PN}.confd jenkins
|
||||||
|
|
||||||
|
systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
|
||||||
|
|
||||||
|
fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
|
||||||
|
}
|
@ -0,0 +1,46 @@
|
|||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2596
|
||||||
|
|
||||||
|
From d7520d28685b96a28421ef01fb66cea8d1a96dfc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Fri, 2 Dec 2016 21:56:56 +0000
|
||||||
|
Subject: [PATCH] * libtiff/tif_read.c, libtiff/tiffiop.h: fix uint32 overflow
|
||||||
|
in TIFFReadEncodedStrip() that caused an integer division by zero. Reported
|
||||||
|
by Agostino Sarubbo. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2596
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 7 +++++++
|
||||||
|
libtiff/tif_read.c | 4 ++--
|
||||||
|
libtiff/tiffiop.h | 6 +++++-
|
||||||
|
3 files changed, 14 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c
|
||||||
|
index 80035929f033..29a311db0cb7 100644
|
||||||
|
--- a/libtiff/tif_read.c
|
||||||
|
+++ b/libtiff/tif_read.c
|
||||||
|
@@ -346,7 +346,7 @@ TIFFReadEncodedStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size)
|
||||||
|
rowsperstrip=td->td_rowsperstrip;
|
||||||
|
if (rowsperstrip>td->td_imagelength)
|
||||||
|
rowsperstrip=td->td_imagelength;
|
||||||
|
- stripsperplane=((td->td_imagelength+rowsperstrip-1)/rowsperstrip);
|
||||||
|
+ stripsperplane= TIFFhowmany_32_maxuint_compat(td->td_imagelength, rowsperstrip);
|
||||||
|
stripinplane=(strip%stripsperplane);
|
||||||
|
plane=(uint16)(strip/stripsperplane);
|
||||||
|
rows=td->td_imagelength-stripinplane*rowsperstrip;
|
||||||
|
diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h
|
||||||
|
index 8bcd0c172c08..5294ee78ffaf 100644
|
||||||
|
--- a/libtiff/tiffiop.h
|
||||||
|
+++ b/libtiff/tiffiop.h
|
||||||
|
@@ -250,6 +250,10 @@ struct tiff {
|
||||||
|
#define TIFFhowmany_32(x, y) (((uint32)x < (0xffffffff - (uint32)(y-1))) ? \
|
||||||
|
((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y))) : \
|
||||||
|
0U)
|
||||||
|
+/* Variant of TIFFhowmany_32() that doesn't return 0 if x close to MAXUINT. */
|
||||||
|
+/* Caution: TIFFhowmany_32_maxuint_compat(x,y)*y might overflow */
|
||||||
|
+#define TIFFhowmany_32_maxuint_compat(x, y) \
|
||||||
|
+ (((uint32)(x) / (uint32)(y)) + ((((uint32)(x) % (uint32)(y)) != 0) ? 1 : 0))
|
||||||
|
#define TIFFhowmany8_32(x) (((x)&0x07)?((uint32)(x)>>3)+1:(uint32)(x)>>3)
|
||||||
|
#define TIFFroundup_32(x, y) (TIFFhowmany_32(x,y)*(y))
|
||||||
|
#define TIFFhowmany_64(x, y) ((((uint64)(x))+(((uint64)(y))-1))/((uint64)(y)))
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,53 @@
|
|||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2611
|
||||||
|
|
||||||
|
From bd06f6c97dff0b30de0f80227d782ea448c14b19 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sat, 3 Dec 2016 11:15:18 +0000
|
||||||
|
Subject: [PATCH] * libtiff/tif_ojpeg.c: make OJPEGDecode() early exit in case
|
||||||
|
of failure in OJPEGPreDecode(). This will avoid a divide by zero, and
|
||||||
|
potential other issues. Reported by Agostino Sarubbo. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2611
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 7 +++++++
|
||||||
|
libtiff/tif_ojpeg.c | 10 +++++++++-
|
||||||
|
2 files changed, 16 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c
|
||||||
|
index 30a1812634e0..93839d8f3e11 100644
|
||||||
|
--- a/libtiff/tif_ojpeg.c
|
||||||
|
+++ b/libtiff/tif_ojpeg.c
|
||||||
|
@@ -244,6 +244,7 @@ typedef enum {
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
TIFF* tif;
|
||||||
|
+ int decoder_ok;
|
||||||
|
#ifndef LIBJPEG_ENCAP_EXTERNAL
|
||||||
|
JMP_BUF exit_jmpbuf;
|
||||||
|
#endif
|
||||||
|
@@ -722,6 +723,7 @@ OJPEGPreDecode(TIFF* tif, uint16 s)
|
||||||
|
}
|
||||||
|
sp->write_curstrile++;
|
||||||
|
}
|
||||||
|
+ sp->decoder_ok = 1;
|
||||||
|
return(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -784,8 +786,14 @@ OJPEGPreDecodeSkipScanlines(TIFF* tif)
|
||||||
|
static int
|
||||||
|
OJPEGDecode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s)
|
||||||
|
{
|
||||||
|
+ static const char module[]="OJPEGDecode";
|
||||||
|
OJPEGState* sp=(OJPEGState*)tif->tif_data;
|
||||||
|
(void)s;
|
||||||
|
+ if( !sp->decoder_ok )
|
||||||
|
+ {
|
||||||
|
+ TIFFErrorExt(tif->tif_clientdata,module,"Cannot decode: decoder not correctly initialized");
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
if (sp->libjpeg_jpeg_query_style==0)
|
||||||
|
{
|
||||||
|
if (OJPEGDecodeRaw(tif,buf,cc)==0)
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,74 @@
|
|||||||
|
https://bugs.gentoo.org/610330
|
||||||
|
|
||||||
|
From 24bc05876f5a1a300a3c4eb0fa8e8cea6a256f9f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Wed, 11 Jan 2017 19:25:44 +0000
|
||||||
|
Subject: [PATCH] * tools/tiffcp.c: error out cleanly in cpContig2SeparateByRow
|
||||||
|
and cpSeparate2ContigByRow if BitsPerSample != 8 to avoid heap based
|
||||||
|
overflow. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2656 and
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2657
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 7 +++++++
|
||||||
|
tools/tiffcp.c | 26 +++++++++++++++++++++++---
|
||||||
|
2 files changed, 30 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/tiffcp.c b/tools/tiffcp.c
|
||||||
|
index 49c9d37125a6..489459a7f6a4 100644
|
||||||
|
--- a/tools/tiffcp.c
|
||||||
|
+++ b/tools/tiffcp.c
|
||||||
|
@@ -591,7 +591,7 @@ static copyFunc pickCopyFunc(TIFF*, TIFF*, uint16, uint16);
|
||||||
|
static int
|
||||||
|
tiffcp(TIFF* in, TIFF* out)
|
||||||
|
{
|
||||||
|
- uint16 bitspersample, samplesperpixel = 1;
|
||||||
|
+ uint16 bitspersample = 1, samplesperpixel = 1;
|
||||||
|
uint16 input_compression, input_photometric = PHOTOMETRIC_MINISBLACK;
|
||||||
|
copyFunc cf;
|
||||||
|
uint32 width, length;
|
||||||
|
@@ -1067,6 +1067,16 @@ DECLAREcpFunc(cpContig2SeparateByRow)
|
||||||
|
register uint32 n;
|
||||||
|
uint32 row;
|
||||||
|
tsample_t s;
|
||||||
|
+ uint16 bps = 0;
|
||||||
|
+
|
||||||
|
+ (void) TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps);
|
||||||
|
+ if( bps != 8 )
|
||||||
|
+ {
|
||||||
|
+ TIFFError(TIFFFileName(in),
|
||||||
|
+ "Error, can only handle BitsPerSample=8 in %s",
|
||||||
|
+ "cpContig2SeparateByRow");
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
inbuf = _TIFFmalloc(scanlinesizein);
|
||||||
|
outbuf = _TIFFmalloc(scanlinesizeout);
|
||||||
|
@@ -1120,6 +1130,16 @@ DECLAREcpFunc(cpSeparate2ContigByRow)
|
||||||
|
register uint32 n;
|
||||||
|
uint32 row;
|
||||||
|
tsample_t s;
|
||||||
|
+ uint16 bps = 0;
|
||||||
|
+
|
||||||
|
+ (void) TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps);
|
||||||
|
+ if( bps != 8 )
|
||||||
|
+ {
|
||||||
|
+ TIFFError(TIFFFileName(in),
|
||||||
|
+ "Error, can only handle BitsPerSample=8 in %s",
|
||||||
|
+ "cpSeparate2ContigByRow");
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
inbuf = _TIFFmalloc(scanlinesizein);
|
||||||
|
outbuf = _TIFFmalloc(scanlinesizeout);
|
||||||
|
@@ -1784,7 +1804,7 @@ pickCopyFunc(TIFF* in, TIFF* out, uint16 bitspersample, uint16 samplesperpixel)
|
||||||
|
uint32 w, l, tw, tl;
|
||||||
|
int bychunk;
|
||||||
|
|
||||||
|
- (void) TIFFGetField(in, TIFFTAG_PLANARCONFIG, &shortv);
|
||||||
|
+ (void) TIFFGetFieldDefaulted(in, TIFFTAG_PLANARCONFIG, &shortv);
|
||||||
|
if (shortv != config && bitspersample != 8 && samplesperpixel > 1) {
|
||||||
|
fprintf(stderr,
|
||||||
|
"%s: Cannot handle different planar configuration w/ bits/sample != 8\n",
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,112 @@
|
|||||||
|
From c2faaeaa7887c24c574297e8e2f36208df9dc229 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Wed, 11 Jan 2017 20:33:35 +0000
|
||||||
|
Subject: [PATCH] * libtiff/tif_luv.c, tif_lzw.c, tif_packbits.c: return 0 in
|
||||||
|
Encode functions instead of -1 when TIFFFlushData1() fails. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2130
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 6 ++++++
|
||||||
|
libtiff/tif_luv.c | 12 ++++++------
|
||||||
|
libtiff/tif_lzw.c | 8 +++++---
|
||||||
|
libtiff/tif_packbits.c | 6 +++---
|
||||||
|
4 files changed, 20 insertions(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_luv.c b/libtiff/tif_luv.c
|
||||||
|
index f42ac0131fee..1f6d8ba3ea5a 100644
|
||||||
|
--- a/libtiff/tif_luv.c
|
||||||
|
+++ b/libtiff/tif_luv.c
|
||||||
|
@@ -473,7 +473,7 @@ LogL16Encode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
|
||||||
|
tif->tif_rawcp = op;
|
||||||
|
tif->tif_rawcc = tif->tif_rawdatasize - occ;
|
||||||
|
if (!TIFFFlushData1(tif))
|
||||||
|
- return (-1);
|
||||||
|
+ return (0);
|
||||||
|
op = tif->tif_rawcp;
|
||||||
|
occ = tif->tif_rawdatasize - tif->tif_rawcc;
|
||||||
|
}
|
||||||
|
@@ -505,7 +505,7 @@ LogL16Encode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
|
||||||
|
tif->tif_rawcp = op;
|
||||||
|
tif->tif_rawcc = tif->tif_rawdatasize - occ;
|
||||||
|
if (!TIFFFlushData1(tif))
|
||||||
|
- return (-1);
|
||||||
|
+ return (0);
|
||||||
|
op = tif->tif_rawcp;
|
||||||
|
occ = tif->tif_rawdatasize - tif->tif_rawcc;
|
||||||
|
}
|
||||||
|
@@ -565,7 +565,7 @@ LogLuvEncode24(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
|
||||||
|
tif->tif_rawcp = op;
|
||||||
|
tif->tif_rawcc = tif->tif_rawdatasize - occ;
|
||||||
|
if (!TIFFFlushData1(tif))
|
||||||
|
- return (-1);
|
||||||
|
+ return (0);
|
||||||
|
op = tif->tif_rawcp;
|
||||||
|
occ = tif->tif_rawdatasize - tif->tif_rawcc;
|
||||||
|
}
|
||||||
|
@@ -624,7 +624,7 @@ LogLuvEncode32(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
|
||||||
|
tif->tif_rawcp = op;
|
||||||
|
tif->tif_rawcc = tif->tif_rawdatasize - occ;
|
||||||
|
if (!TIFFFlushData1(tif))
|
||||||
|
- return (-1);
|
||||||
|
+ return (0);
|
||||||
|
op = tif->tif_rawcp;
|
||||||
|
occ = tif->tif_rawdatasize - tif->tif_rawcc;
|
||||||
|
}
|
||||||
|
@@ -656,7 +656,7 @@ LogLuvEncode32(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
|
||||||
|
tif->tif_rawcp = op;
|
||||||
|
tif->tif_rawcc = tif->tif_rawdatasize - occ;
|
||||||
|
if (!TIFFFlushData1(tif))
|
||||||
|
- return (-1);
|
||||||
|
+ return (0);
|
||||||
|
op = tif->tif_rawcp;
|
||||||
|
occ = tif->tif_rawdatasize - tif->tif_rawcc;
|
||||||
|
}
|
||||||
|
diff --git a/libtiff/tif_lzw.c b/libtiff/tif_lzw.c
|
||||||
|
index 240e19c2e058..5ba35ec1305f 100644
|
||||||
|
--- a/libtiff/tif_lzw.c
|
||||||
|
+++ b/libtiff/tif_lzw.c
|
||||||
|
@@ -969,7 +969,8 @@ LZWEncode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
|
||||||
|
*/
|
||||||
|
if (op > limit) {
|
||||||
|
tif->tif_rawcc = (tmsize_t)(op - tif->tif_rawdata);
|
||||||
|
- TIFFFlushData1(tif);
|
||||||
|
+ if( !TIFFFlushData1(tif) )
|
||||||
|
+ return 0;
|
||||||
|
op = tif->tif_rawdata;
|
||||||
|
}
|
||||||
|
PutNextCode(op, ent);
|
||||||
|
@@ -1054,7 +1055,8 @@ LZWPostEncode(TIFF* tif)
|
||||||
|
|
||||||
|
if (op > sp->enc_rawlimit) {
|
||||||
|
tif->tif_rawcc = (tmsize_t)(op - tif->tif_rawdata);
|
||||||
|
- TIFFFlushData1(tif);
|
||||||
|
+ if( !TIFFFlushData1(tif) )
|
||||||
|
+ return 0;
|
||||||
|
op = tif->tif_rawdata;
|
||||||
|
}
|
||||||
|
if (sp->enc_oldcode != (hcode_t) -1) {
|
||||||
|
diff --git a/libtiff/tif_packbits.c b/libtiff/tif_packbits.c
|
||||||
|
index d2a0165de9dd..0495e688a6be 100644
|
||||||
|
--- a/libtiff/tif_packbits.c
|
||||||
|
+++ b/libtiff/tif_packbits.c
|
||||||
|
@@ -99,7 +99,7 @@ PackBitsEncode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s)
|
||||||
|
slop = (long)(op - lastliteral);
|
||||||
|
tif->tif_rawcc += (tmsize_t)(lastliteral - tif->tif_rawcp);
|
||||||
|
if (!TIFFFlushData1(tif))
|
||||||
|
- return (-1);
|
||||||
|
+ return (0);
|
||||||
|
op = tif->tif_rawcp;
|
||||||
|
while (slop-- > 0)
|
||||||
|
*op++ = *lastliteral++;
|
||||||
|
@@ -107,7 +107,7 @@ PackBitsEncode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s)
|
||||||
|
} else {
|
||||||
|
tif->tif_rawcc += (tmsize_t)(op - tif->tif_rawcp);
|
||||||
|
if (!TIFFFlushData1(tif))
|
||||||
|
- return (-1);
|
||||||
|
+ return (0);
|
||||||
|
op = tif->tif_rawcp;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,54 @@
|
|||||||
|
From c4e376852d82936885833441169684267983691f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Wed, 11 Jan 2017 12:51:59 +0000
|
||||||
|
Subject: [PATCH] * libtiff/tif_dirwrite.c: in
|
||||||
|
TIFFWriteDirectoryTagCheckedRational, replace assertion by runtime check to
|
||||||
|
error out if passed value is strictly negative. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2535
|
||||||
|
|
||||||
|
* tools/tiffcrop.c: remove extraneous TIFFClose() in error code path, that
|
||||||
|
caused double free.
|
||||||
|
Related to http://bugzilla.maptools.org/show_bug.cgi?id=2535
|
||||||
|
---
|
||||||
|
ChangeLog | 11 +++++++++++
|
||||||
|
libtiff/tif_dirwrite.c | 11 ++++++++---
|
||||||
|
tools/tiffcrop.c | 3 +--
|
||||||
|
3 files changed, 20 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
|
||||||
|
index d34f6f611d39..055324db078f 100644
|
||||||
|
--- a/libtiff/tif_dirwrite.c
|
||||||
|
+++ b/libtiff/tif_dirwrite.c
|
||||||
|
@@ -2094,10 +2094,15 @@ TIFFWriteDirectoryTagCheckedSlong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* d
|
||||||
|
static int
|
||||||
|
TIFFWriteDirectoryTagCheckedRational(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, double value)
|
||||||
|
{
|
||||||
|
+ static const char module[] = "TIFFWriteDirectoryTagCheckedRational";
|
||||||
|
uint32 m[2];
|
||||||
|
- assert(value>=0.0);
|
||||||
|
assert(sizeof(uint32)==4);
|
||||||
|
- if (value<=0.0)
|
||||||
|
+ if( value < 0 )
|
||||||
|
+ {
|
||||||
|
+ TIFFErrorExt(tif->tif_clientdata,module,"Negative value is illegal");
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else if (value==0.0)
|
||||||
|
{
|
||||||
|
m[0]=0;
|
||||||
|
m[1]=1;
|
||||||
|
diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
|
||||||
|
index 21dd08720d77..c69177e052d4 100644
|
||||||
|
--- a/tools/tiffcrop.c
|
||||||
|
+++ b/tools/tiffcrop.c
|
||||||
|
@@ -7996,7 +7996,6 @@ writeCroppedImage(TIFF *in, TIFF *out, struct image_data *image,
|
||||||
|
if (!TIFFWriteDirectory(out))
|
||||||
|
{
|
||||||
|
TIFFError("","Failed to write IFD for page number %d", pagenum);
|
||||||
|
- TIFFClose(out);
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,28 @@
|
|||||||
|
From a56820e2022e23610c1ea99fbf621d73d1e36348 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sat, 3 Dec 2016 14:18:48 +0000
|
||||||
|
Subject: [PATCH] * tools/tiffinfo.c: fix null pointer dereference in -r mode
|
||||||
|
when the image has no StripByteCount tag. Reported by Agostino Sarubbo. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2594
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 7 +++++++
|
||||||
|
tools/tiffinfo.c | 4 ++--
|
||||||
|
2 files changed, 9 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/tiffinfo.c b/tools/tiffinfo.c
|
||||||
|
index b02c7d46bed0..4d58055de85c 100644
|
||||||
|
--- a/tools/tiffinfo.c
|
||||||
|
+++ b/tools/tiffinfo.c
|
||||||
|
@@ -417,7 +417,7 @@ TIFFReadRawData(TIFF* tif, int bitrev)
|
||||||
|
uint64* stripbc=NULL;
|
||||||
|
|
||||||
|
TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &stripbc);
|
||||||
|
- if (nstrips > 0) {
|
||||||
|
+ if (stripbc != NULL && nstrips > 0) {
|
||||||
|
uint32 bufsize = (uint32) stripbc[0];
|
||||||
|
tdata_t buf = _TIFFmalloc(bufsize);
|
||||||
|
tstrip_t s;
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,41 @@
|
|||||||
|
From 5ad5e64f8530a827482645986f5bb4e4613d0aa7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sat, 3 Dec 2016 14:42:40 +0000
|
||||||
|
Subject: [PATCH] * tools/tiffcp.c: avoid potential division by zero is
|
||||||
|
BitsPerSamples tag is missing. Reported by Agostino sarubbo. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2597
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 7 +++++++
|
||||||
|
tools/tiffcp.c | 10 ++++++++--
|
||||||
|
2 files changed, 15 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/tiffcp.c b/tools/tiffcp.c
|
||||||
|
index 6dfb9a91bfa9..c8e48c3c2bb3 100644
|
||||||
|
--- a/tools/tiffcp.c
|
||||||
|
+++ b/tools/tiffcp.c
|
||||||
|
@@ -1378,7 +1378,7 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
|
||||||
|
uint8* bufp = (uint8*) buf;
|
||||||
|
uint32 tw, tl;
|
||||||
|
uint32 row;
|
||||||
|
- uint16 bps, bytes_per_sample;
|
||||||
|
+ uint16 bps = 0, bytes_per_sample;
|
||||||
|
|
||||||
|
tilebuf = _TIFFmalloc(tilesize);
|
||||||
|
if (tilebuf == 0)
|
||||||
|
@@ -1387,6 +1387,12 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
|
||||||
|
(void) TIFFGetField(in, TIFFTAG_TILEWIDTH, &tw);
|
||||||
|
(void) TIFFGetField(in, TIFFTAG_TILELENGTH, &tl);
|
||||||
|
(void) TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps);
|
||||||
|
+ if( bps == 0 )
|
||||||
|
+ {
|
||||||
|
+ TIFFError(TIFFFileName(in), "Error, cannot read BitsPerSample");
|
||||||
|
+ status = 0;
|
||||||
|
+ goto done;
|
||||||
|
+ }
|
||||||
|
assert( bps % 8 == 0 );
|
||||||
|
bytes_per_sample = bps/8;
|
||||||
|
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,31 @@
|
|||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2598
|
||||||
|
|
||||||
|
From bc3d7392e43545c7c6375897458a7a3e8ee4d9d8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Fri, 2 Dec 2016 22:13:32 +0000
|
||||||
|
Subject: [PATCH] * tools/tiffcp.c: avoid uint32 underflow in cpDecodedStrips
|
||||||
|
that can cause various issues, such as buffer overflows in the library.
|
||||||
|
Reported by Agostino Sarubbo. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2598
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 7 +++++++
|
||||||
|
tools/tiffcp.c | 4 ++--
|
||||||
|
2 files changed, 9 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/tiffcp.c b/tools/tiffcp.c
|
||||||
|
index 338a3d113bf8..6dfb9a91bfa9 100644
|
||||||
|
--- a/tools/tiffcp.c
|
||||||
|
+++ b/tools/tiffcp.c
|
||||||
|
@@ -985,7 +985,7 @@ DECLAREcpFunc(cpDecodedStrips)
|
||||||
|
tstrip_t s, ns = TIFFNumberOfStrips(in);
|
||||||
|
uint32 row = 0;
|
||||||
|
_TIFFmemset(buf, 0, stripsize);
|
||||||
|
- for (s = 0; s < ns; s++) {
|
||||||
|
+ for (s = 0; s < ns && row < imagelength; s++) {
|
||||||
|
tsize_t cc = (row + rowsperstrip > imagelength) ?
|
||||||
|
TIFFVStripSize(in, imagelength - row) : stripsize;
|
||||||
|
if (TIFFReadEncodedStrip(in, s, buf, cc) < 0
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,54 @@
|
|||||||
|
From 9bbbe303c8e5db20d7f687ee1ca19c98fb852044 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sat, 3 Dec 2016 15:30:31 +0000
|
||||||
|
Subject: [PATCH] * tools/tif_dir.c: when TIFFGetField(, TIFFTAG_NUMBEROFINKS,
|
||||||
|
) is called, limit the return number of inks to SamplesPerPixel, so that code
|
||||||
|
that parses ink names doesn't go past the end of the buffer. Reported by
|
||||||
|
Agostino Sarubbo. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2599
|
||||||
|
|
||||||
|
Reported by Agostino Sarubbo.
|
||||||
|
---
|
||||||
|
ChangeLog | 10 +++++++++-
|
||||||
|
libtiff/tif_dir.c | 28 +++++++++++++++++++++++++++-
|
||||||
|
2 files changed, 36 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c
|
||||||
|
index ad21655a6ee9..2574e748b3be 100644
|
||||||
|
--- a/libtiff/tif_dir.c
|
||||||
|
+++ b/libtiff/tif_dir.c
|
||||||
|
@@ -854,6 +854,32 @@ _TIFFVGetField(TIFF* tif, uint32 tag, va_list ap)
|
||||||
|
if( fip == NULL ) /* cannot happen since TIFFGetField() already checks it */
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
+ if( tag == TIFFTAG_NUMBEROFINKS )
|
||||||
|
+ {
|
||||||
|
+ int i;
|
||||||
|
+ for (i = 0; i < td->td_customValueCount; i++) {
|
||||||
|
+ uint16 val;
|
||||||
|
+ TIFFTagValue *tv = td->td_customValues + i;
|
||||||
|
+ if (tv->info->field_tag != tag)
|
||||||
|
+ continue;
|
||||||
|
+ val = *(uint16 *)tv->value;
|
||||||
|
+ /* Truncate to SamplesPerPixel, since the */
|
||||||
|
+ /* setting code for INKNAMES assume that there are SamplesPerPixel */
|
||||||
|
+ /* inknames. */
|
||||||
|
+ /* Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2599 */
|
||||||
|
+ if( val > td->td_samplesperpixel )
|
||||||
|
+ {
|
||||||
|
+ TIFFWarningExt(tif->tif_clientdata,"_TIFFVGetField",
|
||||||
|
+ "Truncating NumberOfInks from %u to %u",
|
||||||
|
+ val, td->td_samplesperpixel);
|
||||||
|
+ val = td->td_samplesperpixel;
|
||||||
|
+ }
|
||||||
|
+ *va_arg(ap, uint16*) = val;
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* We want to force the custom code to be used for custom
|
||||||
|
* fields even if the tag happens to match a well known
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,108 @@
|
|||||||
|
From ebc6029128555df725e6ad77a983134350bfc831 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Fri, 2 Dec 2016 23:05:51 +0000
|
||||||
|
Subject: [PATCH] * libtiff/tif_pixarlog.c, libtiff/tif_luv.c: fix heap-based
|
||||||
|
buffer overflow on generation of PixarLog / LUV compressed files, with
|
||||||
|
ColorMap, TransferFunction attached and nasty plays with bitspersample. The
|
||||||
|
fix for LUV has not been tested, but suffers from the same kind of issue of
|
||||||
|
PixarLog. Reported by Agostino Sarubbo. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2604
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 10 ++++++++++
|
||||||
|
libtiff/tif_luv.c | 20 +++++++++++++++-----
|
||||||
|
libtiff/tif_pixarlog.c | 19 ++++++++++++++++---
|
||||||
|
3 files changed, 41 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_luv.c b/libtiff/tif_luv.c
|
||||||
|
index ca08f30a76b6..f42ac0131fee 100644
|
||||||
|
--- a/libtiff/tif_luv.c
|
||||||
|
+++ b/libtiff/tif_luv.c
|
||||||
|
@@ -158,6 +158,7 @@
|
||||||
|
typedef struct logLuvState LogLuvState;
|
||||||
|
|
||||||
|
struct logLuvState {
|
||||||
|
+ int encoder_state; /* 1 if encoder correctly initialized */
|
||||||
|
int user_datafmt; /* user data format */
|
||||||
|
int encode_meth; /* encoding method */
|
||||||
|
int pixel_size; /* bytes per pixel */
|
||||||
|
@@ -1552,6 +1553,7 @@ LogLuvSetupEncode(TIFF* tif)
|
||||||
|
td->td_photometric, "must be either LogLUV or LogL");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
+ sp->encoder_state = 1;
|
||||||
|
return (1);
|
||||||
|
notsupported:
|
||||||
|
TIFFErrorExt(tif->tif_clientdata, module,
|
||||||
|
@@ -1563,19 +1565,27 @@ notsupported:
|
||||||
|
static void
|
||||||
|
LogLuvClose(TIFF* tif)
|
||||||
|
{
|
||||||
|
+ LogLuvState* sp = (LogLuvState*) tif->tif_data;
|
||||||
|
TIFFDirectory *td = &tif->tif_dir;
|
||||||
|
|
||||||
|
+ assert(sp != 0);
|
||||||
|
/*
|
||||||
|
* For consistency, we always want to write out the same
|
||||||
|
* bitspersample and sampleformat for our TIFF file,
|
||||||
|
* regardless of the data format being used by the application.
|
||||||
|
* Since this routine is called after tags have been set but
|
||||||
|
* before they have been recorded in the file, we reset them here.
|
||||||
|
+ * Note: this is really a nasty approach. See PixarLogClose
|
||||||
|
*/
|
||||||
|
- td->td_samplesperpixel =
|
||||||
|
- (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3;
|
||||||
|
- td->td_bitspersample = 16;
|
||||||
|
- td->td_sampleformat = SAMPLEFORMAT_INT;
|
||||||
|
+ if( sp->encoder_state )
|
||||||
|
+ {
|
||||||
|
+ /* See PixarLogClose. Might avoid issues with tags whose size depends
|
||||||
|
+ * on those below, but not completely sure this is enough. */
|
||||||
|
+ td->td_samplesperpixel =
|
||||||
|
+ (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3;
|
||||||
|
+ td->td_bitspersample = 16;
|
||||||
|
+ td->td_sampleformat = SAMPLEFORMAT_INT;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c
|
||||||
|
index f4af2bab7ce5..9836dce63450 100644
|
||||||
|
--- a/libtiff/tif_pixarlog.c
|
||||||
|
+++ b/libtiff/tif_pixarlog.c
|
||||||
|
@@ -1233,8 +1233,10 @@ PixarLogPostEncode(TIFF* tif)
|
||||||
|
static void
|
||||||
|
PixarLogClose(TIFF* tif)
|
||||||
|
{
|
||||||
|
+ PixarLogState* sp = (PixarLogState*) tif->tif_data;
|
||||||
|
TIFFDirectory *td = &tif->tif_dir;
|
||||||
|
|
||||||
|
+ assert(sp != 0);
|
||||||
|
/* In a really sneaky (and really incorrect, and untruthful, and
|
||||||
|
* troublesome, and error-prone) maneuver that completely goes against
|
||||||
|
* the spirit of TIFF, and breaks TIFF, on close, we covertly
|
||||||
|
@@ -1243,8 +1245,19 @@ PixarLogClose(TIFF* tif)
|
||||||
|
* readers that don't know about PixarLog, or how to set
|
||||||
|
* the PIXARLOGDATFMT pseudo-tag.
|
||||||
|
*/
|
||||||
|
- td->td_bitspersample = 8;
|
||||||
|
- td->td_sampleformat = SAMPLEFORMAT_UINT;
|
||||||
|
+
|
||||||
|
+ if (sp->state&PLSTATE_INIT) {
|
||||||
|
+ /* We test the state to avoid an issue such as in
|
||||||
|
+ * http://bugzilla.maptools.org/show_bug.cgi?id=2604
|
||||||
|
+ * What appends in that case is that the bitspersample is 1 and
|
||||||
|
+ * a TransferFunction is set. The size of the TransferFunction
|
||||||
|
+ * depends on 1<<bitspersample. So if we increase it, an access
|
||||||
|
+ * out of the buffer will happen at directory flushing.
|
||||||
|
+ * Another option would be to clear those targs.
|
||||||
|
+ */
|
||||||
|
+ td->td_bitspersample = 8;
|
||||||
|
+ td->td_sampleformat = SAMPLEFORMAT_UINT;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,55 @@
|
|||||||
|
From cd4832257daf222833ae172b3923268fec5b71b9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sat, 3 Dec 2016 16:50:02 +0000
|
||||||
|
Subject: [PATCH] * tools/tiffcp.c: replace assert( (bps % 8) == 0 ) by a non
|
||||||
|
assert check. Reported by Agostino Sarubbo. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2605
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 6 ++++++
|
||||||
|
tools/tiffcp.c | 17 +++++++++++++----
|
||||||
|
2 files changed, 19 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/tiffcp.c b/tools/tiffcp.c
|
||||||
|
index 6d96bb89f555..49c9d37125a6 100644
|
||||||
|
--- a/tools/tiffcp.c
|
||||||
|
+++ b/tools/tiffcp.c
|
||||||
|
@@ -45,7 +45,6 @@
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include <ctype.h>
|
||||||
|
-#include <assert.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_UNISTD_H
|
||||||
|
# include <unistd.h>
|
||||||
|
@@ -1393,7 +1392,12 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
|
||||||
|
status = 0;
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
- assert( bps % 8 == 0 );
|
||||||
|
+ if( (bps % 8) != 0 )
|
||||||
|
+ {
|
||||||
|
+ TIFFError(TIFFFileName(in), "Error, cannot handle BitsPerSample that is not a multiple of 8");
|
||||||
|
+ status = 0;
|
||||||
|
+ goto done;
|
||||||
|
+ }
|
||||||
|
bytes_per_sample = bps/8;
|
||||||
|
|
||||||
|
for (row = 0; row < imagelength; row += tl) {
|
||||||
|
@@ -1584,7 +1588,12 @@ DECLAREwriteFunc(writeBufferToSeparateTiles)
|
||||||
|
_TIFFfree(obuf);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
- assert( bps % 8 == 0 );
|
||||||
|
+ if( (bps % 8) != 0 )
|
||||||
|
+ {
|
||||||
|
+ TIFFError(TIFFFileName(out), "Error, cannot handle BitsPerSample that is not a multiple of 8");
|
||||||
|
+ _TIFFfree(obuf);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
bytes_per_sample = bps/8;
|
||||||
|
|
||||||
|
for (row = 0; row < imagelength; row += tl) {
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,41 @@
|
|||||||
|
From c99f44478d6f0491da5b98c8cea14f565a021e22 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sat, 3 Dec 2016 15:44:15 +0000
|
||||||
|
Subject: [PATCH] * tools/tiffcp.c: avoid potential division by zero is
|
||||||
|
BitsPerSamples tag is missing. Reported by Agostino Sarubbo. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2607
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 7 +++++++
|
||||||
|
tools/tiffcp.c | 10 ++++++++--
|
||||||
|
2 files changed, 15 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/tiffcp.c b/tools/tiffcp.c
|
||||||
|
index c8e48c3c2bb3..142cbb0ecfc2 100644
|
||||||
|
--- a/tools/tiffcp.c
|
||||||
|
+++ b/tools/tiffcp.c
|
||||||
|
@@ -1569,7 +1569,7 @@ DECLAREwriteFunc(writeBufferToSeparateTiles)
|
||||||
|
uint8* bufp = (uint8*) buf;
|
||||||
|
uint32 tl, tw;
|
||||||
|
uint32 row;
|
||||||
|
- uint16 bps, bytes_per_sample;
|
||||||
|
+ uint16 bps = 0, bytes_per_sample;
|
||||||
|
|
||||||
|
obuf = _TIFFmalloc(TIFFTileSize(out));
|
||||||
|
if (obuf == NULL)
|
||||||
|
@@ -1578,6 +1578,12 @@ DECLAREwriteFunc(writeBufferToSeparateTiles)
|
||||||
|
(void) TIFFGetField(out, TIFFTAG_TILELENGTH, &tl);
|
||||||
|
(void) TIFFGetField(out, TIFFTAG_TILEWIDTH, &tw);
|
||||||
|
(void) TIFFGetField(out, TIFFTAG_BITSPERSAMPLE, &bps);
|
||||||
|
+ if( bps == 0 )
|
||||||
|
+ {
|
||||||
|
+ TIFFError(TIFFFileName(out), "Error, cannot read BitsPerSample");
|
||||||
|
+ _TIFFfree(obuf);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
assert( bps % 8 == 0 );
|
||||||
|
bytes_per_sample = bps/8;
|
||||||
|
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,104 @@
|
|||||||
|
From 92adbddc283782d71d81dbccf72ed2c279f90097 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sat, 3 Dec 2016 11:02:15 +0000
|
||||||
|
Subject: [PATCH] * libtiff/tif_dirread.c: modify
|
||||||
|
ChopUpSingleUncompressedStrip() to instanciate compute ntrips as
|
||||||
|
TIFFhowmany_32(td->td_imagelength, rowsperstrip), instead of a logic based on
|
||||||
|
the total size of data. Which is faulty is the total size of data is not
|
||||||
|
sufficient to fill the whole image, and thus results in reading outside of
|
||||||
|
the StripByCounts/StripOffsets arrays when using TIFFReadScanline(). Reported
|
||||||
|
by Agostino Sarubbo. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2608.
|
||||||
|
|
||||||
|
* libtiff/tif_strip.c: revert the change in TIFFNumberOfStrips() done
|
||||||
|
for http://bugzilla.maptools.org/show_bug.cgi?id=2587 / CVE-2016-9273 since
|
||||||
|
the above change is a better fix that makes it unnecessary.
|
||||||
|
---
|
||||||
|
ChangeLog | 15 +++++++++++++++
|
||||||
|
libtiff/tif_dirread.c | 24 +++++++++++-------------
|
||||||
|
libtiff/tif_strip.c | 11 +----------
|
||||||
|
3 files changed, 27 insertions(+), 23 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
|
||||||
|
index 01070f2ecebd..f2905286c0d0 100644
|
||||||
|
--- a/libtiff/tif_dirread.c
|
||||||
|
+++ b/libtiff/tif_dirread.c
|
||||||
|
@@ -5502,8 +5502,7 @@ ChopUpSingleUncompressedStrip(TIFF* tif)
|
||||||
|
uint64 rowblockbytes;
|
||||||
|
uint64 stripbytes;
|
||||||
|
uint32 strip;
|
||||||
|
- uint64 nstrips64;
|
||||||
|
- uint32 nstrips32;
|
||||||
|
+ uint32 nstrips;
|
||||||
|
uint32 rowsperstrip;
|
||||||
|
uint64* newcounts;
|
||||||
|
uint64* newoffsets;
|
||||||
|
@@ -5534,18 +5533,17 @@ ChopUpSingleUncompressedStrip(TIFF* tif)
|
||||||
|
return;
|
||||||
|
|
||||||
|
/*
|
||||||
|
- * never increase the number of strips in an image
|
||||||
|
+ * never increase the number of rows per strip
|
||||||
|
*/
|
||||||
|
if (rowsperstrip >= td->td_rowsperstrip)
|
||||||
|
return;
|
||||||
|
- nstrips64 = TIFFhowmany_64(bytecount, stripbytes);
|
||||||
|
- if ((nstrips64==0)||(nstrips64>0xFFFFFFFF)) /* something is wonky, do nothing. */
|
||||||
|
- return;
|
||||||
|
- nstrips32 = (uint32)nstrips64;
|
||||||
|
+ nstrips = TIFFhowmany_32(td->td_imagelength, rowsperstrip);
|
||||||
|
+ if( nstrips == 0 )
|
||||||
|
+ return;
|
||||||
|
|
||||||
|
- newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64),
|
||||||
|
+ newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64),
|
||||||
|
"for chopped \"StripByteCounts\" array");
|
||||||
|
- newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64),
|
||||||
|
+ newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64),
|
||||||
|
"for chopped \"StripOffsets\" array");
|
||||||
|
if (newcounts == NULL || newoffsets == NULL) {
|
||||||
|
/*
|
||||||
|
@@ -5562,18 +5560,18 @@ ChopUpSingleUncompressedStrip(TIFF* tif)
|
||||||
|
* Fill the strip information arrays with new bytecounts and offsets
|
||||||
|
* that reflect the broken-up format.
|
||||||
|
*/
|
||||||
|
- for (strip = 0; strip < nstrips32; strip++) {
|
||||||
|
+ for (strip = 0; strip < nstrips; strip++) {
|
||||||
|
if (stripbytes > bytecount)
|
||||||
|
stripbytes = bytecount;
|
||||||
|
newcounts[strip] = stripbytes;
|
||||||
|
- newoffsets[strip] = offset;
|
||||||
|
+ newoffsets[strip] = stripbytes ? offset : 0;
|
||||||
|
offset += stripbytes;
|
||||||
|
bytecount -= stripbytes;
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* Replace old single strip info with multi-strip info.
|
||||||
|
*/
|
||||||
|
- td->td_stripsperimage = td->td_nstrips = nstrips32;
|
||||||
|
+ td->td_stripsperimage = td->td_nstrips = nstrips;
|
||||||
|
TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, rowsperstrip);
|
||||||
|
|
||||||
|
_TIFFfree(td->td_stripbytecount);
|
||||||
|
diff --git a/libtiff/tif_strip.c b/libtiff/tif_strip.c
|
||||||
|
index b6098dd31241..6e9f2ef6ddf2 100644
|
||||||
|
--- a/libtiff/tif_strip.c
|
||||||
|
+++ b/libtiff/tif_strip.c
|
||||||
|
@@ -63,15 +63,6 @@ TIFFNumberOfStrips(TIFF* tif)
|
||||||
|
TIFFDirectory *td = &tif->tif_dir;
|
||||||
|
uint32 nstrips;
|
||||||
|
|
||||||
|
- /* If the value was already computed and store in td_nstrips, then return it,
|
||||||
|
- since ChopUpSingleUncompressedStrip might have altered and resized the
|
||||||
|
- since the td_stripbytecount and td_stripoffset arrays to the new value
|
||||||
|
- after the initial affectation of td_nstrips = TIFFNumberOfStrips() in
|
||||||
|
- tif_dirread.c ~line 3612.
|
||||||
|
- See http://bugzilla.maptools.org/show_bug.cgi?id=2587 */
|
||||||
|
- if( td->td_nstrips )
|
||||||
|
- return td->td_nstrips;
|
||||||
|
-
|
||||||
|
nstrips = (td->td_rowsperstrip == (uint32) -1 ? 1 :
|
||||||
|
TIFFhowmany_32(td->td_imagelength, td->td_rowsperstrip));
|
||||||
|
if (td->td_planarconfig == PLANARCONFIG_SEPARATE)
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,46 @@
|
|||||||
|
From ee00edfbe833647d59ad87cac82f1b4c0c902179 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sat, 3 Dec 2016 16:40:01 +0000
|
||||||
|
Subject: [PATCH] * tools/tiffcp.c: fix uint32 underflow/overflow that can
|
||||||
|
cause heap-based buffer overflow. Reported by Agostino Sarubbo. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2610
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 7 +++++++
|
||||||
|
tools/tiffcp.c | 8 ++++----
|
||||||
|
2 files changed, 11 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/tiffcp.c b/tools/tiffcp.c
|
||||||
|
index 142cbb0ecfc2..6d96bb89f555 100644
|
||||||
|
--- a/tools/tiffcp.c
|
||||||
|
+++ b/tools/tiffcp.c
|
||||||
|
@@ -1163,7 +1163,7 @@ bad:
|
||||||
|
|
||||||
|
static void
|
||||||
|
cpStripToTile(uint8* out, uint8* in,
|
||||||
|
- uint32 rows, uint32 cols, int outskew, int inskew)
|
||||||
|
+ uint32 rows, uint32 cols, int outskew, int64 inskew)
|
||||||
|
{
|
||||||
|
while (rows-- > 0) {
|
||||||
|
uint32 j = cols;
|
||||||
|
@@ -1320,7 +1320,7 @@ DECLAREreadFunc(readContigTilesIntoBuffer)
|
||||||
|
tdata_t tilebuf;
|
||||||
|
uint32 imagew = TIFFScanlineSize(in);
|
||||||
|
uint32 tilew = TIFFTileRowSize(in);
|
||||||
|
- int iskew = imagew - tilew;
|
||||||
|
+ int64 iskew = (int64)imagew - (int64)tilew;
|
||||||
|
uint8* bufp = (uint8*) buf;
|
||||||
|
uint32 tw, tl;
|
||||||
|
uint32 row;
|
||||||
|
@@ -1348,7 +1348,7 @@ DECLAREreadFunc(readContigTilesIntoBuffer)
|
||||||
|
status = 0;
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
- if (colb + tilew > imagew) {
|
||||||
|
+ if (colb > iskew) {
|
||||||
|
uint32 width = imagew - colb;
|
||||||
|
uint32 oskew = tilew - width;
|
||||||
|
cpStripToTile(bufp + colb,
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,46 @@
|
|||||||
|
From cb840651f037c59895b67d44b46a34127bb082dd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sat, 3 Dec 2016 13:00:03 +0000
|
||||||
|
Subject: [PATCH] * tools/tiffcrop.c: fix integer division by zero when
|
||||||
|
BitsPerSample is missing. Reported by Agostina Sarubo. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2619
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 6 ++++++
|
||||||
|
tools/tiffcrop.c | 8 ++++----
|
||||||
|
2 files changed, 10 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
|
||||||
|
index 9122aab37530..21dd08720d77 100644
|
||||||
|
--- a/tools/tiffcrop.c
|
||||||
|
+++ b/tools/tiffcrop.c
|
||||||
|
@@ -1164,7 +1164,7 @@ writeBufferToSeparateStrips (TIFF* out, uint8* buf,
|
||||||
|
tdata_t obuf;
|
||||||
|
|
||||||
|
(void) TIFFGetFieldDefaulted(out, TIFFTAG_ROWSPERSTRIP, &rowsperstrip);
|
||||||
|
- (void) TIFFGetField(out, TIFFTAG_BITSPERSAMPLE, &bps);
|
||||||
|
+ (void) TIFFGetFieldDefaulted(out, TIFFTAG_BITSPERSAMPLE, &bps);
|
||||||
|
bytes_per_sample = (bps + 7) / 8;
|
||||||
|
if( width == 0 ||
|
||||||
|
(uint32)bps * (uint32)spp > TIFF_UINT32_MAX / width ||
|
||||||
|
@@ -4760,7 +4760,7 @@ static int readSeparateStripsIntoBuffer (TIFF *in, uint8 *obuf, uint32 length,
|
||||||
|
int i, bytes_per_sample, bytes_per_pixel, shift_width, result = 1;
|
||||||
|
uint32 j;
|
||||||
|
int32 bytes_read = 0;
|
||||||
|
- uint16 bps, planar;
|
||||||
|
+ uint16 bps = 0, planar;
|
||||||
|
uint32 nstrips;
|
||||||
|
uint32 strips_per_sample;
|
||||||
|
uint32 src_rowsize, dst_rowsize, rows_processed, rps;
|
||||||
|
@@ -4780,7 +4780,7 @@ static int readSeparateStripsIntoBuffer (TIFF *in, uint8 *obuf, uint32 length,
|
||||||
|
}
|
||||||
|
|
||||||
|
memset (srcbuffs, '\0', sizeof(srcbuffs));
|
||||||
|
- TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps);
|
||||||
|
+ TIFFGetFieldDefaulted(in, TIFFTAG_BITSPERSAMPLE, &bps);
|
||||||
|
TIFFGetFieldDefaulted(in, TIFFTAG_PLANARCONFIG, &planar);
|
||||||
|
TIFFGetFieldDefaulted(in, TIFFTAG_ROWSPERSTRIP, &rps);
|
||||||
|
if (rps > length)
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,29 @@
|
|||||||
|
From 76c4b35f114bc9614700accd22cc4a0b4b6b92d3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sat, 3 Dec 2016 11:35:56 +0000
|
||||||
|
Subject: [PATCH] * tools/tiffcrop.c: fix readContigStripsIntoBuffer() in -i
|
||||||
|
(ignore) mode so that the output buffer is correctly incremented to avoid
|
||||||
|
write outside bounds. Reported by Agostino Sarubbo. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2620
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 7 +++++++
|
||||||
|
tools/tiffcrop.c | 4 ++--
|
||||||
|
2 files changed, 9 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
|
||||||
|
index 722b132cee6d..bdcbd63ed70b 100644
|
||||||
|
--- a/tools/tiffcrop.c
|
||||||
|
+++ b/tools/tiffcrop.c
|
||||||
|
@@ -3698,7 +3698,7 @@ static int readContigStripsIntoBuffer (TIFF* in, uint8* buf)
|
||||||
|
(unsigned long) strip, (unsigned long)rows);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
- bufp += bytes_read;
|
||||||
|
+ bufp += stripsize;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,49 @@
|
|||||||
|
From d7045ed1501ec99c4e56174813bb1cb5c9a559ef Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sat, 3 Dec 2016 12:19:32 +0000
|
||||||
|
Subject: [PATCH] * tools/tiffcrop.c: add 3 extra bytes at end of strip buffer
|
||||||
|
in readSeparateStripsIntoBuffer() to avoid read outside of heap allocated
|
||||||
|
buffer. Reported by Agostina Sarubo. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2621
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 7 +++++++
|
||||||
|
tools/tiffcrop.c | 14 ++++++++++++--
|
||||||
|
2 files changed, 19 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
|
||||||
|
index bdcbd63ed70b..9122aab37530 100644
|
||||||
|
--- a/tools/tiffcrop.c
|
||||||
|
+++ b/tools/tiffcrop.c
|
||||||
|
@@ -4815,10 +4815,17 @@ static int readSeparateStripsIntoBuffer (TIFF *in, uint8 *obuf, uint32 length,
|
||||||
|
nstrips = TIFFNumberOfStrips(in);
|
||||||
|
strips_per_sample = nstrips /spp;
|
||||||
|
|
||||||
|
+ /* Add 3 padding bytes for combineSeparateSamples32bits */
|
||||||
|
+ if( (size_t) stripsize > 0xFFFFFFFFU - 3U )
|
||||||
|
+ {
|
||||||
|
+ TIFFError("readSeparateStripsIntoBuffer", "Integer overflow when calculating buffer size.");
|
||||||
|
+ exit(-1);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
|
||||||
|
{
|
||||||
|
srcbuffs[s] = NULL;
|
||||||
|
- buff = _TIFFmalloc(stripsize);
|
||||||
|
+ buff = _TIFFmalloc(stripsize + 3);
|
||||||
|
if (!buff)
|
||||||
|
{
|
||||||
|
TIFFError ("readSeparateStripsIntoBuffer",
|
||||||
|
@@ -4827,6 +4834,9 @@ static int readSeparateStripsIntoBuffer (TIFF *in, uint8 *obuf, uint32 length,
|
||||||
|
_TIFFfree (srcbuffs[i]);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
+ buff[stripsize] = 0;
|
||||||
|
+ buff[stripsize+1] = 0;
|
||||||
|
+ buff[stripsize+2] = 0;
|
||||||
|
srcbuffs[s] = buff;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,59 @@
|
|||||||
|
From f88bfadb6d1fac1d0d081058216da659e1f5a628 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sun, 18 Dec 2016 22:28:42 +0000
|
||||||
|
Subject: [PATCH] * libtiff/tif_getimage.c: fix potential memory leaks in error
|
||||||
|
code path of TIFFRGBAImageBegin(). Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2627
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 6 ++++++
|
||||||
|
libtiff/tif_getimage.c | 21 +++++++++------------
|
||||||
|
2 files changed, 15 insertions(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
|
||||||
|
index c0eb6df0b09a..2ea838556732 100644
|
||||||
|
--- a/libtiff/tif_getimage.c
|
||||||
|
+++ b/libtiff/tif_getimage.c
|
||||||
|
@@ -283,6 +283,13 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int stop, char emsg[1024])
|
||||||
|
img->redcmap = NULL;
|
||||||
|
img->greencmap = NULL;
|
||||||
|
img->bluecmap = NULL;
|
||||||
|
+ img->Map = NULL;
|
||||||
|
+ img->BWmap = NULL;
|
||||||
|
+ img->PALmap = NULL;
|
||||||
|
+ img->ycbcr = NULL;
|
||||||
|
+ img->cielab = NULL;
|
||||||
|
+ img->UaToAa = NULL;
|
||||||
|
+ img->Bitdepth16To8 = NULL;
|
||||||
|
img->req_orientation = ORIENTATION_BOTLEFT; /* It is the default */
|
||||||
|
|
||||||
|
img->tif = tif;
|
||||||
|
@@ -468,13 +475,6 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int stop, char emsg[1024])
|
||||||
|
photoTag, img->photometric);
|
||||||
|
goto fail_return;
|
||||||
|
}
|
||||||
|
- img->Map = NULL;
|
||||||
|
- img->BWmap = NULL;
|
||||||
|
- img->PALmap = NULL;
|
||||||
|
- img->ycbcr = NULL;
|
||||||
|
- img->cielab = NULL;
|
||||||
|
- img->UaToAa = NULL;
|
||||||
|
- img->Bitdepth16To8 = NULL;
|
||||||
|
TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &img->width);
|
||||||
|
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &img->height);
|
||||||
|
TIFFGetFieldDefaulted(tif, TIFFTAG_ORIENTATION, &img->orientation);
|
||||||
|
@@ -494,10 +494,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int stop, char emsg[1024])
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
fail_return:
|
||||||
|
- _TIFFfree( img->redcmap );
|
||||||
|
- _TIFFfree( img->greencmap );
|
||||||
|
- _TIFFfree( img->bluecmap );
|
||||||
|
- img->redcmap = img->greencmap = img->bluecmap = NULL;
|
||||||
|
+ TIFFRGBAImageEnd( img );
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,34 @@
|
|||||||
|
From 101253c74cde97203dab28c4f3bd0994cea5804c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sat, 14 Jan 2017 13:12:33 +0000
|
||||||
|
Subject: [PATCH] * tools/raw2tiff.c: avoid integer division by zero. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2631
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 5 +++++
|
||||||
|
tools/raw2tiff.c | 10 ++++++++--
|
||||||
|
2 files changed, 13 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/raw2tiff.c b/tools/raw2tiff.c
|
||||||
|
index 7298e80a95c9..083e9ee73f0f 100644
|
||||||
|
--- a/tools/raw2tiff.c
|
||||||
|
+++ b/tools/raw2tiff.c
|
||||||
|
@@ -408,8 +408,14 @@ guessSize(int fd, TIFFDataType dtype, _TIFF_off_t hdr_size, uint32 nbands,
|
||||||
|
} else if (*width == 0 && *length == 0) {
|
||||||
|
unsigned int fail = 0;
|
||||||
|
fprintf(stderr, "Image width and height are not specified.\n");
|
||||||
|
+ w = (uint32) sqrt(imagesize / longt);
|
||||||
|
+ if( w == 0 )
|
||||||
|
+ {
|
||||||
|
+ fprintf(stderr, "Too small image size.\n");
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- for (w = (uint32) sqrt(imagesize / longt);
|
||||||
|
+ for (;
|
||||||
|
w < sqrt(imagesize * longt);
|
||||||
|
w++) {
|
||||||
|
if (imagesize % w == 0) {
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,41 @@
|
|||||||
|
From 95a32fbbadf54e7527c7e3b66fd603503b29dde9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sat, 17 Dec 2016 19:45:28 +0000
|
||||||
|
Subject: [PATCH] * tools/tiff2ps.c: fix 2 heap-based buffer overflows (in
|
||||||
|
PSDataBW and PSDataColorContig). Reported by Agostino Sarubbo. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2633 and
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2634.
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 7 +++++++
|
||||||
|
tools/tiff2ps.c | 9 +++++++--
|
||||||
|
2 files changed, 14 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/tiff2ps.c b/tools/tiff2ps.c
|
||||||
|
index 82a5d84b41f5..71df4309ee0c 100644
|
||||||
|
--- a/tools/tiff2ps.c
|
||||||
|
+++ b/tools/tiff2ps.c
|
||||||
|
@@ -2440,6 +2440,11 @@ PSDataColorContig(FILE* fd, TIFF* tif, uint32 w, uint32 h, int nc)
|
||||||
|
unsigned char *cp, c;
|
||||||
|
|
||||||
|
(void) w;
|
||||||
|
+ if( es <= 0 )
|
||||||
|
+ {
|
||||||
|
+ TIFFError(filename, "Inconsistent value of es: %d", es);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
tf_buf = (unsigned char *) _TIFFmalloc(tf_bytesperrow);
|
||||||
|
if (tf_buf == NULL) {
|
||||||
|
TIFFError(filename, "No space for scanline buffer");
|
||||||
|
@@ -2692,7 +2697,7 @@ PSDataBW(FILE* fd, TIFF* tif, uint32 w, uint32 h)
|
||||||
|
|
||||||
|
if (alpha) {
|
||||||
|
int adjust;
|
||||||
|
- while (cc-- > 0) {
|
||||||
|
+ while (cc-- > 1) {
|
||||||
|
DOBREAK(breaklen, 1, fd);
|
||||||
|
/*
|
||||||
|
* For images with alpha, matte against
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,33 @@
|
|||||||
|
From a7b470d67f2b98599b2c9cd9945db6eea735cc47 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sun, 18 Dec 2016 10:37:59 +0000
|
||||||
|
Subject: [PATCH] * tools/tiff2pdf.c: prevent heap-based buffer overflow in -j
|
||||||
|
mode on a paletted image. Note: this fix errors out before the overflow
|
||||||
|
happens. There could probably be a better fix. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2635
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 7 +++++++
|
||||||
|
tools/tiff2pdf.c | 8 +++++++-
|
||||||
|
2 files changed, 14 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
|
||||||
|
index fe8a6ea7e101..afea414bebf6 100644
|
||||||
|
--- a/tools/tiff2pdf.c
|
||||||
|
+++ b/tools/tiff2pdf.c
|
||||||
|
@@ -3654,6 +3654,12 @@ tsize_t t2p_sample_realize_palette(T2P* t2p, unsigned char* buffer){
|
||||||
|
uint32 j=0;
|
||||||
|
sample_count=t2p->tiff_width*t2p->tiff_length;
|
||||||
|
component_count=t2p->tiff_samplesperpixel;
|
||||||
|
+ if( sample_count * component_count > t2p->tiff_datasize )
|
||||||
|
+ {
|
||||||
|
+ TIFFError(TIFF2PDF_MODULE, "Error: sample_count * component_count > t2p->tiff_datasize");
|
||||||
|
+ t2p->t2p_error = T2P_ERR_ERROR;
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
for(i=sample_count;i>0;i--){
|
||||||
|
palette_offset=buffer[i-1] * component_count;
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,29 @@
|
|||||||
|
From 9f5536843f2ae641542bb81a3023dbc581fac184 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Tue, 20 Dec 2016 17:13:26 +0000
|
||||||
|
Subject: [PATCH] * tools/tiff2pdf.c: fix wrong usage of memcpy() that can
|
||||||
|
trigger unspecified behaviour. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2638
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 6 ++++++
|
||||||
|
tools/tiff2pdf.c | 5 +++--
|
||||||
|
2 files changed, 9 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
|
||||||
|
index afea414bebf6..78ffa77d123a 100644
|
||||||
|
--- a/tools/tiff2pdf.c
|
||||||
|
+++ b/tools/tiff2pdf.c
|
||||||
|
@@ -3593,7 +3593,8 @@ void t2p_tile_collapse_left(
|
||||||
|
|
||||||
|
edgescanwidth = (scanwidth * edgetilewidth + (tilewidth - 1))/ tilewidth;
|
||||||
|
for(i=0;i<tilelength;i++){
|
||||||
|
- _TIFFmemcpy(
|
||||||
|
+ /* We use memmove() since there can be overlaps in src and dst buffers for the first items */
|
||||||
|
+ memmove(
|
||||||
|
&(((char*)buffer)[edgescanwidth*i]),
|
||||||
|
&(((char*)buffer)[scanwidth*i]),
|
||||||
|
edgescanwidth);
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,58 @@
|
|||||||
|
From 6a61192a98665d870dcb835452cb9c5757ccd27c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Tue, 20 Dec 2016 17:24:35 +0000
|
||||||
|
Subject: [PATCH] * tools/tiff2pdf.c: avoid potential invalid memory read in
|
||||||
|
t2p_writeproc. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2639
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 6 ++++++
|
||||||
|
tools/tiff2pdf.c | 20 +++++++++++---------
|
||||||
|
2 files changed, 17 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
|
||||||
|
index 78ffa77d123a..5348f1a765fe 100644
|
||||||
|
--- a/tools/tiff2pdf.c
|
||||||
|
+++ b/tools/tiff2pdf.c
|
||||||
|
@@ -2896,6 +2896,7 @@ tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output, ttile_
|
||||||
|
}
|
||||||
|
if(TIFFGetField(input, TIFFTAG_JPEGTABLES, &count, &jpt) != 0) {
|
||||||
|
if (count >= 4) {
|
||||||
|
+ int retTIFFReadRawTile;
|
||||||
|
/* Ignore EOI marker of JpegTables */
|
||||||
|
_TIFFmemcpy(buffer, jpt, count - 2);
|
||||||
|
bufferoffset += count - 2;
|
||||||
|
@@ -2903,22 +2904,23 @@ tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output, ttile_
|
||||||
|
table_end[0] = buffer[bufferoffset-2];
|
||||||
|
table_end[1] = buffer[bufferoffset-1];
|
||||||
|
xuint32 = bufferoffset;
|
||||||
|
- bufferoffset -= 2;
|
||||||
|
- bufferoffset += TIFFReadRawTile(
|
||||||
|
+ bufferoffset -= 2;
|
||||||
|
+ retTIFFReadRawTile= TIFFReadRawTile(
|
||||||
|
input,
|
||||||
|
tile,
|
||||||
|
(tdata_t) &(((unsigned char*)buffer)[bufferoffset]),
|
||||||
|
-1);
|
||||||
|
+ if( retTIFFReadRawTile < 0 )
|
||||||
|
+ {
|
||||||
|
+ _TIFFfree(buffer);
|
||||||
|
+ t2p->t2p_error = T2P_ERR_ERROR;
|
||||||
|
+ return(0);
|
||||||
|
+ }
|
||||||
|
+ bufferoffset += retTIFFReadRawTile;
|
||||||
|
/* Overwrite SOI marker of image scan with previously */
|
||||||
|
/* saved end of JpegTables */
|
||||||
|
buffer[xuint32-2]=table_end[0];
|
||||||
|
buffer[xuint32-1]=table_end[1];
|
||||||
|
- } else {
|
||||||
|
- bufferoffset += TIFFReadRawTile(
|
||||||
|
- input,
|
||||||
|
- tile,
|
||||||
|
- (tdata_t) &(((unsigned char*)buffer)[bufferoffset]),
|
||||||
|
- -1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
t2pWriteFile(output, (tdata_t) buffer, bufferoffset);
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,28 @@
|
|||||||
|
From 548b62fae49637b621766c721884d59a55c9a2d8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Tue, 20 Dec 2016 17:28:17 +0000
|
||||||
|
Subject: [PATCH] * tools/tiff2pdf.c: avoid potential heap-based overflow in
|
||||||
|
t2p_readwrite_pdf_image_tile(). Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2640
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 6 ++++++
|
||||||
|
tools/tiff2pdf.c | 4 ++--
|
||||||
|
2 files changed, 8 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
|
||||||
|
index 5348f1a765fe..8e4e24ef9e82 100644
|
||||||
|
--- a/tools/tiff2pdf.c
|
||||||
|
+++ b/tools/tiff2pdf.c
|
||||||
|
@@ -2895,7 +2895,7 @@ tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output, ttile_
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
|
if(TIFFGetField(input, TIFFTAG_JPEGTABLES, &count, &jpt) != 0) {
|
||||||
|
- if (count >= 4) {
|
||||||
|
+ if (count > 4) {
|
||||||
|
int retTIFFReadRawTile;
|
||||||
|
/* Ignore EOI marker of JpegTables */
|
||||||
|
_TIFFmemcpy(buffer, jpt, count - 2);
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,278 @@
|
|||||||
|
From f049eba476a1ed60adc6534452ccf0022c2d1908 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Wed, 11 Jan 2017 16:09:02 +0000
|
||||||
|
Subject: [PATCH] * libtiff/tif_dir.c, tif_dirread.c, tif_dirwrite.c: implement
|
||||||
|
various clampings of double to other data types to avoid undefined behaviour
|
||||||
|
if the output range isn't big enough to hold the input value. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2643
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2642
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2646
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2647
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 10 ++++++
|
||||||
|
libtiff/tif_dir.c | 20 ++++++++---
|
||||||
|
libtiff/tif_dirread.c | 12 +++++--
|
||||||
|
libtiff/tif_dirwrite.c | 92 ++++++++++++++++++++++++++++++++++++++++++++------
|
||||||
|
4 files changed, 116 insertions(+), 18 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c
|
||||||
|
index 2574e748b3be..36c7ae57641a 100644
|
||||||
|
--- a/libtiff/tif_dir.c
|
||||||
|
+++ b/libtiff/tif_dir.c
|
||||||
|
@@ -31,6 +31,7 @@
|
||||||
|
* (and also some miscellaneous stuff)
|
||||||
|
*/
|
||||||
|
#include "tiffiop.h"
|
||||||
|
+#include <float.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* These are used in the backwards compatibility code...
|
||||||
|
@@ -154,6 +155,15 @@ bad:
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
+static float TIFFClampDoubleToFloat( double val )
|
||||||
|
+{
|
||||||
|
+ if( val > FLT_MAX )
|
||||||
|
+ return FLT_MAX;
|
||||||
|
+ if( val < -FLT_MAX )
|
||||||
|
+ return -FLT_MAX;
|
||||||
|
+ return (float)val;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static int
|
||||||
|
_TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
|
||||||
|
{
|
||||||
|
@@ -312,13 +322,13 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
|
||||||
|
dblval = va_arg(ap, double);
|
||||||
|
if( dblval < 0 )
|
||||||
|
goto badvaluedouble;
|
||||||
|
- td->td_xresolution = (float) dblval;
|
||||||
|
+ td->td_xresolution = TIFFClampDoubleToFloat( dblval );
|
||||||
|
break;
|
||||||
|
case TIFFTAG_YRESOLUTION:
|
||||||
|
dblval = va_arg(ap, double);
|
||||||
|
if( dblval < 0 )
|
||||||
|
goto badvaluedouble;
|
||||||
|
- td->td_yresolution = (float) dblval;
|
||||||
|
+ td->td_yresolution = TIFFClampDoubleToFloat( dblval );
|
||||||
|
break;
|
||||||
|
case TIFFTAG_PLANARCONFIG:
|
||||||
|
v = (uint16) va_arg(ap, uint16_vap);
|
||||||
|
@@ -327,10 +337,10 @@ _TIFFVSetField(TIFF* tif, uint32 tag, va_list ap)
|
||||||
|
td->td_planarconfig = (uint16) v;
|
||||||
|
break;
|
||||||
|
case TIFFTAG_XPOSITION:
|
||||||
|
- td->td_xposition = (float) va_arg(ap, double);
|
||||||
|
+ td->td_xposition = TIFFClampDoubleToFloat( va_arg(ap, double) );
|
||||||
|
break;
|
||||||
|
case TIFFTAG_YPOSITION:
|
||||||
|
- td->td_yposition = (float) va_arg(ap, double);
|
||||||
|
+ td->td_yposition = TIFFClampDoubleToFloat( va_arg(ap, double) );
|
||||||
|
break;
|
||||||
|
case TIFFTAG_RESOLUTIONUNIT:
|
||||||
|
v = (uint16) va_arg(ap, uint16_vap);
|
||||||
|
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
|
||||||
|
index eae3430612d0..f8628fd6d5d2 100644
|
||||||
|
--- a/libtiff/tif_dirread.c
|
||||||
|
+++ b/libtiff/tif_dirread.c
|
||||||
|
@@ -40,6 +40,7 @@
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "tiffiop.h"
|
||||||
|
+#include <float.h>
|
||||||
|
|
||||||
|
#define IGNORE 0 /* tag placeholder used below */
|
||||||
|
#define FAILED_FII ((uint32) -1)
|
||||||
|
@@ -2406,7 +2407,14 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryFloatArray(TIFF* tif, TIFFDirEnt
|
||||||
|
ma=(double*)origdata;
|
||||||
|
mb=data;
|
||||||
|
for (n=0; n<count; n++)
|
||||||
|
- *mb++=(float)(*ma++);
|
||||||
|
+ {
|
||||||
|
+ double val = *ma++;
|
||||||
|
+ if( val > FLT_MAX )
|
||||||
|
+ val = FLT_MAX;
|
||||||
|
+ else if( val < -FLT_MAX )
|
||||||
|
+ val = -FLT_MAX;
|
||||||
|
+ *mb++=(float)val;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
|
||||||
|
index 055324db078f..f7339685130d 100644
|
||||||
|
--- a/libtiff/tif_dirwrite.c
|
||||||
|
+++ b/libtiff/tif_dirwrite.c
|
||||||
|
@@ -30,6 +30,7 @@
|
||||||
|
* Directory Write Support Routines.
|
||||||
|
*/
|
||||||
|
#include "tiffiop.h"
|
||||||
|
+#include <float.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_IEEEFP
|
||||||
|
#define TIFFCvtNativeToIEEEFloat(tif, n, fp)
|
||||||
|
@@ -939,6 +940,69 @@ bad:
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
+static float TIFFClampDoubleToFloat( double val )
|
||||||
|
+{
|
||||||
|
+ if( val > FLT_MAX )
|
||||||
|
+ return FLT_MAX;
|
||||||
|
+ if( val < -FLT_MAX )
|
||||||
|
+ return -FLT_MAX;
|
||||||
|
+ return (float)val;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int8 TIFFClampDoubleToInt8( double val )
|
||||||
|
+{
|
||||||
|
+ if( val > 127 )
|
||||||
|
+ return 127;
|
||||||
|
+ if( val < -128 || val != val )
|
||||||
|
+ return -128;
|
||||||
|
+ return (int8)val;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int16 TIFFClampDoubleToInt16( double val )
|
||||||
|
+{
|
||||||
|
+ if( val > 32767 )
|
||||||
|
+ return 32767;
|
||||||
|
+ if( val < -32768 || val != val )
|
||||||
|
+ return -32768;
|
||||||
|
+ return (int16)val;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int32 TIFFClampDoubleToInt32( double val )
|
||||||
|
+{
|
||||||
|
+ if( val > 0x7FFFFFFF )
|
||||||
|
+ return 0x7FFFFFFF;
|
||||||
|
+ if( val < -0x7FFFFFFF-1 || val != val )
|
||||||
|
+ return -0x7FFFFFFF-1;
|
||||||
|
+ return (int32)val;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static uint8 TIFFClampDoubleToUInt8( double val )
|
||||||
|
+{
|
||||||
|
+ if( val < 0 )
|
||||||
|
+ return 0;
|
||||||
|
+ if( val > 255 || val != val )
|
||||||
|
+ return 255;
|
||||||
|
+ return (uint8)val;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static uint16 TIFFClampDoubleToUInt16( double val )
|
||||||
|
+{
|
||||||
|
+ if( val < 0 )
|
||||||
|
+ return 0;
|
||||||
|
+ if( val > 65535 || val != val )
|
||||||
|
+ return 65535;
|
||||||
|
+ return (uint16)val;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static uint32 TIFFClampDoubleToUInt32( double val )
|
||||||
|
+{
|
||||||
|
+ if( val < 0 )
|
||||||
|
+ return 0;
|
||||||
|
+ if( val > 0xFFFFFFFFU || val != val )
|
||||||
|
+ return 0xFFFFFFFFU;
|
||||||
|
+ return (uint32)val;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static int
|
||||||
|
TIFFWriteDirectoryTagSampleformatArray(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, uint16 tag, uint32 count, double* value)
|
||||||
|
{
|
||||||
|
@@ -959,7 +1023,7 @@ TIFFWriteDirectoryTagSampleformatArray(TIFF* tif, uint32* ndir, TIFFDirEntry* di
|
||||||
|
if (tif->tif_dir.td_bitspersample<=32)
|
||||||
|
{
|
||||||
|
for (i = 0; i < count; ++i)
|
||||||
|
- ((float*)conv)[i] = (float)value[i];
|
||||||
|
+ ((float*)conv)[i] = TIFFClampDoubleToFloat(value[i]);
|
||||||
|
ok = TIFFWriteDirectoryTagFloatArray(tif,ndir,dir,tag,count,(float*)conv);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
@@ -971,19 +1035,19 @@ TIFFWriteDirectoryTagSampleformatArray(TIFF* tif, uint32* ndir, TIFFDirEntry* di
|
||||||
|
if (tif->tif_dir.td_bitspersample<=8)
|
||||||
|
{
|
||||||
|
for (i = 0; i < count; ++i)
|
||||||
|
- ((int8*)conv)[i] = (int8)value[i];
|
||||||
|
+ ((int8*)conv)[i] = TIFFClampDoubleToInt8(value[i]);
|
||||||
|
ok = TIFFWriteDirectoryTagSbyteArray(tif,ndir,dir,tag,count,(int8*)conv);
|
||||||
|
}
|
||||||
|
else if (tif->tif_dir.td_bitspersample<=16)
|
||||||
|
{
|
||||||
|
for (i = 0; i < count; ++i)
|
||||||
|
- ((int16*)conv)[i] = (int16)value[i];
|
||||||
|
+ ((int16*)conv)[i] = TIFFClampDoubleToInt16(value[i]);
|
||||||
|
ok = TIFFWriteDirectoryTagSshortArray(tif,ndir,dir,tag,count,(int16*)conv);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for (i = 0; i < count; ++i)
|
||||||
|
- ((int32*)conv)[i] = (int32)value[i];
|
||||||
|
+ ((int32*)conv)[i] = TIFFClampDoubleToInt32(value[i]);
|
||||||
|
ok = TIFFWriteDirectoryTagSlongArray(tif,ndir,dir,tag,count,(int32*)conv);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
@@ -991,19 +1055,19 @@ TIFFWriteDirectoryTagSampleformatArray(TIFF* tif, uint32* ndir, TIFFDirEntry* di
|
||||||
|
if (tif->tif_dir.td_bitspersample<=8)
|
||||||
|
{
|
||||||
|
for (i = 0; i < count; ++i)
|
||||||
|
- ((uint8*)conv)[i] = (uint8)value[i];
|
||||||
|
+ ((uint8*)conv)[i] = TIFFClampDoubleToUInt8(value[i]);
|
||||||
|
ok = TIFFWriteDirectoryTagByteArray(tif,ndir,dir,tag,count,(uint8*)conv);
|
||||||
|
}
|
||||||
|
else if (tif->tif_dir.td_bitspersample<=16)
|
||||||
|
{
|
||||||
|
for (i = 0; i < count; ++i)
|
||||||
|
- ((uint16*)conv)[i] = (uint16)value[i];
|
||||||
|
+ ((uint16*)conv)[i] = TIFFClampDoubleToUInt16(value[i]);
|
||||||
|
ok = TIFFWriteDirectoryTagShortArray(tif,ndir,dir,tag,count,(uint16*)conv);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for (i = 0; i < count; ++i)
|
||||||
|
- ((uint32*)conv)[i] = (uint32)value[i];
|
||||||
|
+ ((uint32*)conv)[i] = TIFFClampDoubleToUInt32(value[i]);
|
||||||
|
ok = TIFFWriteDirectoryTagLongArray(tif,ndir,dir,tag,count,(uint32*)conv);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
@@ -2102,12 +2166,17 @@ TIFFWriteDirectoryTagCheckedRational(TIFF* tif, uint32* ndir, TIFFDirEntry* dir,
|
||||||
|
TIFFErrorExt(tif->tif_clientdata,module,"Negative value is illegal");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
+ else if( value != value )
|
||||||
|
+ {
|
||||||
|
+ TIFFErrorExt(tif->tif_clientdata,module,"Not-a-number value is illegal");
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
else if (value==0.0)
|
||||||
|
{
|
||||||
|
m[0]=0;
|
||||||
|
m[1]=1;
|
||||||
|
}
|
||||||
|
- else if (value==(double)(uint32)value)
|
||||||
|
+ else if (value <= 0xFFFFFFFFU && value==(double)(uint32)value)
|
||||||
|
{
|
||||||
|
m[0]=(uint32)value;
|
||||||
|
m[1]=1;
|
||||||
|
@@ -2148,12 +2217,13 @@ TIFFWriteDirectoryTagCheckedRationalArray(TIFF* tif, uint32* ndir, TIFFDirEntry*
|
||||||
|
}
|
||||||
|
for (na=value, nb=m, nc=0; nc<count; na++, nb+=2, nc++)
|
||||||
|
{
|
||||||
|
- if (*na<=0.0)
|
||||||
|
+ if (*na<=0.0 || *na != *na)
|
||||||
|
{
|
||||||
|
nb[0]=0;
|
||||||
|
nb[1]=1;
|
||||||
|
}
|
||||||
|
- else if (*na==(float)(uint32)(*na))
|
||||||
|
+ else if (*na >= 0 && *na <= (float)0xFFFFFFFFU &&
|
||||||
|
+ *na==(float)(uint32)(*na))
|
||||||
|
{
|
||||||
|
nb[0]=(uint32)(*na);
|
||||||
|
nb[1]=1;
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,45 @@
|
|||||||
|
From 699097af4e22e48fc78ae7ae02807ec37f0d31fe Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Wed, 11 Jan 2017 13:28:01 +0000
|
||||||
|
Subject: [PATCH] * libtiff/tif_dirread.c: avoid division by floating point 0
|
||||||
|
in TIFFReadDirEntryCheckedRational() and TIFFReadDirEntryCheckedSrational(),
|
||||||
|
and return 0 in that case (instead of infinity as before presumably)
|
||||||
|
Apparently some sanitizers do not like those divisions by zero. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2644
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 8 ++++++++
|
||||||
|
libtiff/tif_dirread.c | 12 +++++++++---
|
||||||
|
2 files changed, 17 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
|
||||||
|
index f2905286c0d0..eae3430612d0 100644
|
||||||
|
--- a/libtiff/tif_dirread.c
|
||||||
|
+++ b/libtiff/tif_dirread.c
|
||||||
|
@@ -2872,7 +2872,10 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryCheckedRational(TIFF* tif, TIFFD
|
||||||
|
m.l = direntry->tdir_offset.toff_long8;
|
||||||
|
if (tif->tif_flags&TIFF_SWAB)
|
||||||
|
TIFFSwabArrayOfLong(m.i,2);
|
||||||
|
- if (m.i[0]==0)
|
||||||
|
+ /* Not completely sure what we should do when m.i[1]==0, but some */
|
||||||
|
+ /* sanitizers do not like division by 0.0: */
|
||||||
|
+ /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */
|
||||||
|
+ if (m.i[0]==0 || m.i[1]==0)
|
||||||
|
*value=0.0;
|
||||||
|
else
|
||||||
|
*value=(double)m.i[0]/(double)m.i[1];
|
||||||
|
@@ -2900,7 +2903,10 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryCheckedSrational(TIFF* tif, TIFF
|
||||||
|
m.l=direntry->tdir_offset.toff_long8;
|
||||||
|
if (tif->tif_flags&TIFF_SWAB)
|
||||||
|
TIFFSwabArrayOfLong(m.i,2);
|
||||||
|
- if ((int32)m.i[0]==0)
|
||||||
|
+ /* Not completely sure what we should do when m.i[1]==0, but some */
|
||||||
|
+ /* sanitizers do not like division by 0.0: */
|
||||||
|
+ /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */
|
||||||
|
+ if ((int32)m.i[0]==0 || m.i[1]==0)
|
||||||
|
*value=0.0;
|
||||||
|
else
|
||||||
|
*value=(double)((int32)m.i[0])/(double)m.i[1];
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,33 @@
|
|||||||
|
From 569ffefa61f3237fa2221730621c869216c465a6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Wed, 11 Jan 2017 16:13:50 +0000
|
||||||
|
Subject: [PATCH] * libtiff/tif_jpeg.c: validate BitsPerSample in
|
||||||
|
JPEGSetupEncode() to avoid undefined behaviour caused by invalid shift
|
||||||
|
exponent. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2648
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 6 ++++++
|
||||||
|
libtiff/tif_jpeg.c | 9 ++++++++-
|
||||||
|
2 files changed, 14 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c
|
||||||
|
index 09ef4949f9ee..e45e2a4e17f8 100644
|
||||||
|
--- a/libtiff/tif_jpeg.c
|
||||||
|
+++ b/libtiff/tif_jpeg.c
|
||||||
|
@@ -1632,6 +1632,13 @@ JPEGSetupEncode(TIFF* tif)
|
||||||
|
"Invalig horizontal/vertical sampling value");
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
+ if( td->td_bitspersample > 16 )
|
||||||
|
+ {
|
||||||
|
+ TIFFErrorExt(tif->tif_clientdata, module,
|
||||||
|
+ "BitsPerSample %d not allowed for JPEG",
|
||||||
|
+ td->td_bitspersample);
|
||||||
|
+ return (0);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
/*
|
||||||
|
* A ReferenceBlackWhite field *must* be present since the
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,26 @@
|
|||||||
|
From 08e5d199b0a1c80fc81a1cc718e5d9d019517e37 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Wed, 11 Jan 2017 17:48:11 +0000
|
||||||
|
Subject: [PATCH] Initialize variable to fix MSVC warning (caused by previous
|
||||||
|
commit)
|
||||||
|
|
||||||
|
---
|
||||||
|
libtiff/tif_read.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c
|
||||||
|
index 8c5af6a8f5f7..b2edb029a90c 100644
|
||||||
|
--- a/libtiff/tif_read.c
|
||||||
|
+++ b/libtiff/tif_read.c
|
||||||
|
@@ -420,7 +420,7 @@ TIFFReadRawStrip1(TIFF* tif, uint32 strip, void* buf, tmsize_t size,
|
||||||
|
return ((tmsize_t)(-1));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
- tmsize_t ma;
|
||||||
|
+ tmsize_t ma = 0;
|
||||||
|
tmsize_t n;
|
||||||
|
if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)||
|
||||||
|
((ma=(tmsize_t)td->td_stripoffset[strip])>tif->tif_size))
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,54 @@
|
|||||||
|
From 5368b55d0f88a34ede3d21782d3142b2e11e6eb9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Wed, 11 Jan 2017 16:33:34 +0000
|
||||||
|
Subject: [PATCH] * libtiff/tif_read.c: avoid potential undefined behaviour on
|
||||||
|
signed integer addition in TIFFReadRawStrip1() in isMapped() case. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2650
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 6 ++++++
|
||||||
|
libtiff/tif_read.c | 29 +++++++++++++++++++----------
|
||||||
|
2 files changed, 25 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c
|
||||||
|
index 29a311db0cb7..8c5af6a8f5f7 100644
|
||||||
|
--- a/libtiff/tif_read.c
|
||||||
|
+++ b/libtiff/tif_read.c
|
||||||
|
@@ -420,16 +420,25 @@ TIFFReadRawStrip1(TIFF* tif, uint32 strip, void* buf, tmsize_t size,
|
||||||
|
return ((tmsize_t)(-1));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
- tmsize_t ma,mb;
|
||||||
|
+ tmsize_t ma;
|
||||||
|
tmsize_t n;
|
||||||
|
- ma=(tmsize_t)td->td_stripoffset[strip];
|
||||||
|
- mb=ma+size;
|
||||||
|
- if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)||(ma>tif->tif_size))
|
||||||
|
- n=0;
|
||||||
|
- else if ((mb<ma)||(mb<size)||(mb>tif->tif_size))
|
||||||
|
- n=tif->tif_size-ma;
|
||||||
|
- else
|
||||||
|
- n=size;
|
||||||
|
+ if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)||
|
||||||
|
+ ((ma=(tmsize_t)td->td_stripoffset[strip])>tif->tif_size))
|
||||||
|
+ {
|
||||||
|
+ n=0;
|
||||||
|
+ }
|
||||||
|
+ else if( ma > TIFF_TMSIZE_T_MAX - size )
|
||||||
|
+ {
|
||||||
|
+ n=0;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ tmsize_t mb=ma+size;
|
||||||
|
+ if (mb>tif->tif_size)
|
||||||
|
+ n=tif->tif_size-ma;
|
||||||
|
+ else
|
||||||
|
+ n=size;
|
||||||
|
+ }
|
||||||
|
if (n!=size) {
|
||||||
|
#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
|
||||||
|
TIFFErrorExt(tif->tif_clientdata, module,
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,86 @@
|
|||||||
|
From 669faf71833c4c2e72774b2e732ca4d28b149c83 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Wed, 11 Jan 2017 19:02:49 +0000
|
||||||
|
Subject: [PATCH] * libtiff/tiffiop.h, tif_unix.c, tif_win32.c, tif_vms.c: add
|
||||||
|
_TIFFcalloc()
|
||||||
|
|
||||||
|
* libtiff/tif_read.c: TIFFReadBufferSetup(): use _TIFFcalloc() to zero
|
||||||
|
initialize tif_rawdata.
|
||||||
|
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2651
|
||||||
|
---
|
||||||
|
ChangeLog | 8 ++++++++
|
||||||
|
libtiff/tif_read.c | 6 ++++--
|
||||||
|
libtiff/tif_unix.c | 10 +++++++++-
|
||||||
|
libtiff/tif_vms.c | 10 +++++++++-
|
||||||
|
libtiff/tif_win32.c | 10 +++++++++-
|
||||||
|
libtiff/tiffio.h | 3 ++-
|
||||||
|
6 files changed, 41 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c
|
||||||
|
index b2edb029a90c..6a8c7daf3dfa 100644
|
||||||
|
--- a/libtiff/tif_read.c
|
||||||
|
+++ b/libtiff/tif_read.c
|
||||||
|
@@ -985,7 +985,9 @@ TIFFReadBufferSetup(TIFF* tif, void* bp, tmsize_t size)
|
||||||
|
"Invalid buffer size");
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
- tif->tif_rawdata = (uint8*) _TIFFmalloc(tif->tif_rawdatasize);
|
||||||
|
+ /* Initialize to zero to avoid uninitialized buffers in case of */
|
||||||
|
+ /* short reads (http://bugzilla.maptools.org/show_bug.cgi?id=2651) */
|
||||||
|
+ tif->tif_rawdata = (uint8*) _TIFFcalloc(1, tif->tif_rawdatasize);
|
||||||
|
tif->tif_flags |= TIFF_MYBUFFER;
|
||||||
|
}
|
||||||
|
if (tif->tif_rawdata == NULL) {
|
||||||
|
diff --git a/libtiff/tif_unix.c b/libtiff/tif_unix.c
|
||||||
|
index 81e9d6653c2a..80c437cfa37a 100644
|
||||||
|
--- a/libtiff/tif_unix.c
|
||||||
|
+++ b/libtiff/tif_unix.c
|
||||||
|
@@ -316,6 +316,14 @@ _TIFFmalloc(tmsize_t s)
|
||||||
|
return (malloc((size_t) s));
|
||||||
|
}
|
||||||
|
|
||||||
|
+void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz)
|
||||||
|
+{
|
||||||
|
+ if( nmemb == 0 || siz == 0 )
|
||||||
|
+ return ((void *) NULL);
|
||||||
|
+
|
||||||
|
+ return calloc((size_t) nmemb, (size_t)siz);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
_TIFFfree(void* p)
|
||||||
|
{
|
||||||
|
diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c
|
||||||
|
index 24b824f1bd56..090baed87135 100644
|
||||||
|
--- a/libtiff/tif_win32.c
|
||||||
|
+++ b/libtiff/tif_win32.c
|
||||||
|
@@ -360,6 +360,14 @@ _TIFFmalloc(tmsize_t s)
|
||||||
|
return (malloc((size_t) s));
|
||||||
|
}
|
||||||
|
|
||||||
|
+void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz)
|
||||||
|
+{
|
||||||
|
+ if( nmemb == 0 || siz == 0 )
|
||||||
|
+ return ((void *) NULL);
|
||||||
|
+
|
||||||
|
+ return calloc((size_t) nmemb, (size_t)siz);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
_TIFFfree(void* p)
|
||||||
|
{
|
||||||
|
diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h
|
||||||
|
index 6e508181dbce..ef61b5c06a03 100644
|
||||||
|
--- a/libtiff/tiffio.h
|
||||||
|
+++ b/libtiff/tiffio.h
|
||||||
|
@@ -293,6 +293,7 @@ extern TIFFCodec* TIFFGetConfiguredCODECs(void);
|
||||||
|
*/
|
||||||
|
|
||||||
|
extern void* _TIFFmalloc(tmsize_t s);
|
||||||
|
+extern void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz);
|
||||||
|
extern void* _TIFFrealloc(void* p, tmsize_t s);
|
||||||
|
extern void _TIFFmemset(void* p, int v, tmsize_t c);
|
||||||
|
extern void _TIFFmemcpy(void* d, const void* s, tmsize_t c);
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,33 @@
|
|||||||
|
From 5083c41f3a6824f392adf3a6dce1548afded4211 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Wed, 11 Jan 2017 12:15:01 +0000
|
||||||
|
Subject: [PATCH] * libtiff/tif_jpeg.c: avoid integer division by zero in
|
||||||
|
JPEGSetupEncode() when horizontal or vertical sampling is set to 0. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2653
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 6 ++++++
|
||||||
|
libtiff/tif_jpeg.c | 9 ++++++++-
|
||||||
|
2 files changed, 14 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c
|
||||||
|
index dc4364c821a4..09ef4949f9ee 100644
|
||||||
|
--- a/libtiff/tif_jpeg.c
|
||||||
|
+++ b/libtiff/tif_jpeg.c
|
||||||
|
@@ -1626,6 +1626,13 @@ JPEGSetupEncode(TIFF* tif)
|
||||||
|
case PHOTOMETRIC_YCBCR:
|
||||||
|
sp->h_sampling = td->td_ycbcrsubsampling[0];
|
||||||
|
sp->v_sampling = td->td_ycbcrsubsampling[1];
|
||||||
|
+ if( sp->h_sampling == 0 || sp->v_sampling == 0 )
|
||||||
|
+ {
|
||||||
|
+ TIFFErrorExt(tif->tif_clientdata, module,
|
||||||
|
+ "Invalig horizontal/vertical sampling value");
|
||||||
|
+ return (0);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* A ReferenceBlackWhite field *must* be present since the
|
||||||
|
* default value is inappropriate for YCbCr. Fill in the
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,33 @@
|
|||||||
|
From 928f0b0b2881ac32b32d9e165e88e3c9aed0fb9c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Wed, 11 Jan 2017 16:38:26 +0000
|
||||||
|
Subject: [PATCH] =?UTF-8?q?*=20libtiff/tif=5Fgetimage.c:=20add=20explicit?=
|
||||||
|
=?UTF-8?q?=20uint32=20cast=20in=20putagreytile=20to=20avoid=20UndefinedBe?=
|
||||||
|
=?UTF-8?q?haviorSanitizer=20warning.=20Patch=20by=20Nicol=C3=A1s=20Pe?=
|
||||||
|
=?UTF-8?q?=C3=B1a.=20Fixes=20http://bugzilla.maptools.org/show=5Fbug.cgi?=
|
||||||
|
=?UTF-8?q?=3Fid=3D2658?=
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 7 +++++++
|
||||||
|
libtiff/tif_getimage.c | 4 ++--
|
||||||
|
2 files changed, 9 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
|
||||||
|
index 2ea838556732..52a2402f7171 100644
|
||||||
|
--- a/libtiff/tif_getimage.c
|
||||||
|
+++ b/libtiff/tif_getimage.c
|
||||||
|
@@ -1302,7 +1302,7 @@ DECLAREContigPutFunc(putagreytile)
|
||||||
|
while (h-- > 0) {
|
||||||
|
for (x = w; x-- > 0;)
|
||||||
|
{
|
||||||
|
- *cp++ = BWmap[*pp][0] & (*(pp+1) << 24 | ~A1);
|
||||||
|
+ *cp++ = BWmap[*pp][0] & ((uint32)*(pp+1) << 24 | ~A1);
|
||||||
|
pp += samplesperpixel;
|
||||||
|
}
|
||||||
|
cp += toskew;
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,41 @@
|
|||||||
|
From 41236c5f744eaa691e23e55f5a5dd556a65e211e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Thu, 12 Jan 2017 19:23:20 +0000
|
||||||
|
Subject: [PATCH] * libtiff/tif_ojpeg.c: fix leak in
|
||||||
|
OJPEGReadHeaderInfoSecTablesQTable, OJPEGReadHeaderInfoSecTablesDcTable and
|
||||||
|
OJPEGReadHeaderInfoSecTablesAcTable
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 3 ++-
|
||||||
|
libtiff/tif_ojpeg.c | 8 +++++++-
|
||||||
|
2 files changed, 9 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c
|
||||||
|
index ac70d1b14c4f..bd4cff5d8921 100644
|
||||||
|
--- a/libtiff/tif_ojpeg.c
|
||||||
|
+++ b/libtiff/tif_ojpeg.c
|
||||||
|
@@ -1790,7 +1790,10 @@ OJPEGReadHeaderInfoSecTablesQTable(TIFF* tif)
|
||||||
|
TIFFSeekFile(tif,sp->qtable_offset[m],SEEK_SET);
|
||||||
|
p=(uint32)TIFFReadFile(tif,&ob[sizeof(uint32)+5],64);
|
||||||
|
if (p!=64)
|
||||||
|
+ {
|
||||||
|
+ _TIFFfree(ob);
|
||||||
|
return(0);
|
||||||
|
+ }
|
||||||
|
sp->qtable[m]=ob;
|
||||||
|
sp->sof_tq[m]=m;
|
||||||
|
}
|
||||||
|
@@ -1854,7 +1857,10 @@ OJPEGReadHeaderInfoSecTablesDcTable(TIFF* tif)
|
||||||
|
rb[sizeof(uint32)+5+n]=o[n];
|
||||||
|
p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q);
|
||||||
|
if (p!=q)
|
||||||
|
+ {
|
||||||
|
+ _TIFFfree(rb);
|
||||||
|
return(0);
|
||||||
|
+ }
|
||||||
|
sp->dctable[m]=rb;
|
||||||
|
sp->sos_tda[m]=(m<<4);
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,34 @@
|
|||||||
|
From 7c501dbfb5315f31798f9123026210260cbe7432 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Thu, 12 Jan 2017 17:43:25 +0000
|
||||||
|
Subject: [PATCH] =?UTF-8?q?*=20libtiff/tif=5Fojpeg.c:=20fix=20leak=20in=20?=
|
||||||
|
=?UTF-8?q?OJPEGReadHeaderInfoSecTablesAcTable=20when=20read=20fails.=20Pa?=
|
||||||
|
=?UTF-8?q?tch=20by=20Nicol=C3=A1s=20Pe=C3=B1a.=20Fixes=20http://bugzilla.?=
|
||||||
|
=?UTF-8?q?maptools.org/show=5Fbug.cgi=3Fid=3D2659?=
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 7 +++++++
|
||||||
|
libtiff/tif_ojpeg.c | 5 ++++-
|
||||||
|
2 files changed, 11 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c
|
||||||
|
index 93839d8f3e11..ac70d1b14c4f 100644
|
||||||
|
--- a/libtiff/tif_ojpeg.c
|
||||||
|
+++ b/libtiff/tif_ojpeg.c
|
||||||
|
@@ -1918,7 +1918,10 @@ OJPEGReadHeaderInfoSecTablesAcTable(TIFF* tif)
|
||||||
|
rb[sizeof(uint32)+5+n]=o[n];
|
||||||
|
p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q);
|
||||||
|
if (p!=q)
|
||||||
|
+ {
|
||||||
|
+ _TIFFfree(rb);
|
||||||
|
return(0);
|
||||||
|
+ }
|
||||||
|
sp->actable[m]=rb;
|
||||||
|
sp->sos_tda[m]=(sp->sos_tda[m]|m);
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,43 @@
|
|||||||
|
From e345ce2ad81c85eb8e469b7b959067b2681957ca Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Sat, 18 Feb 2017 20:30:26 +0000
|
||||||
|
Subject: [PATCH] =?UTF-8?q?*=20libtiff/tif=5Fpixarlog.c:=20fix=20memory=20?=
|
||||||
|
=?UTF-8?q?leak=20in=20error=20code=20path=20of=20PixarLogSetupDecode().?=
|
||||||
|
=?UTF-8?q?=20Patch=20by=20Nicol=C3=A1s=20Pe=C3=B1a.=20Fixes=20http://bugz?=
|
||||||
|
=?UTF-8?q?illa.maptools.org/show=5Fbug.cgi=3Fid=3D2665?=
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 6 ++++++
|
||||||
|
libtiff/tif_pixarlog.c | 8 +++++++-
|
||||||
|
2 files changed, 13 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c
|
||||||
|
index 9836dce63450..972ee75e0324 100644
|
||||||
|
--- a/libtiff/tif_pixarlog.c
|
||||||
|
+++ b/libtiff/tif_pixarlog.c
|
||||||
|
@@ -699,6 +699,9 @@ PixarLogSetupDecode(TIFF* tif)
|
||||||
|
if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN)
|
||||||
|
sp->user_datafmt = PixarLogGuessDataFmt(td);
|
||||||
|
if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) {
|
||||||
|
+ _TIFFfree(sp->tbuf);
|
||||||
|
+ sp->tbuf = NULL;
|
||||||
|
+ sp->tbuf_size = 0;
|
||||||
|
TIFFErrorExt(tif->tif_clientdata, module,
|
||||||
|
"PixarLog compression can't handle bits depth/data format combination (depth: %d)",
|
||||||
|
td->td_bitspersample);
|
||||||
|
@@ -706,6 +709,9 @@ PixarLogSetupDecode(TIFF* tif)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (inflateInit(&sp->stream) != Z_OK) {
|
||||||
|
+ _TIFFfree(sp->tbuf);
|
||||||
|
+ sp->tbuf = NULL;
|
||||||
|
+ sp->tbuf_size = 0;
|
||||||
|
TIFFErrorExt(tif->tif_clientdata, module, "%s", sp->stream.msg ? sp->stream.msg : "(null)");
|
||||||
|
return (0);
|
||||||
|
} else {
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,39 @@
|
|||||||
|
https://bugs.gentoo.org/598938
|
||||||
|
|
||||||
|
From 82c53c6f19d8d7854b9b88aa16802f31b1cc258c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
|
||||||
|
Date: Sun, 20 Nov 2016 18:04:52 +0000
|
||||||
|
Subject: [PATCH] =?UTF-8?q?*=20tools/fax2tiff.c=20(main):=20Applied=20patc?=
|
||||||
|
=?UTF-8?q?h=20by=20J=C3=B6rg=20Ahrens=20to=20fix=20passing=20client=20dat?=
|
||||||
|
=?UTF-8?q?a=20for=20Win32=20builds=20using=20tif=5Fwin32.c=20(USE=5FWIN32?=
|
||||||
|
=?UTF-8?q?=5FFILEIO=20defined)=20for=20file=20I/O.=20=20Patch=20was=20pro?=
|
||||||
|
=?UTF-8?q?vided=20via=20email=20on=20November=2020,=202016.?=
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 7 +++++++
|
||||||
|
tools/fax2tiff.c | 5 +++--
|
||||||
|
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/fax2tiff.c b/tools/fax2tiff.c
|
||||||
|
index e00de5277bc2..01f85540ac9c 100644
|
||||||
|
--- a/tools/fax2tiff.c
|
||||||
|
+++ b/tools/fax2tiff.c
|
||||||
|
@@ -283,10 +283,11 @@ main(int argc, char* argv[])
|
||||||
|
}
|
||||||
|
#if defined(_WIN32) && defined(USE_WIN32_FILEIO)
|
||||||
|
client_data.fh = _get_osfhandle(fileno(in));
|
||||||
|
+ TIFFSetClientdata(faxTIFF, (thandle_t) client_data.fh);
|
||||||
|
#else
|
||||||
|
client_data.fd = fileno(in);
|
||||||
|
+ TIFFSetClientdata(faxTIFF, (thandle_t) client_data.fd);
|
||||||
|
#endif
|
||||||
|
- TIFFSetClientdata(faxTIFF, (thandle_t) &client_data);
|
||||||
|
TIFFSetFileName(faxTIFF, (const char*)argv[optind]);
|
||||||
|
TIFFSetField(out, TIFFTAG_IMAGEWIDTH, xsize);
|
||||||
|
TIFFSetField(out, TIFFTAG_BITSPERSAMPLE, 1);
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,38 @@
|
|||||||
|
https://bugs.gentoo.org/612172
|
||||||
|
|
||||||
|
From 96bb01f5d834e0b01c0231768c43b8d309aede34 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Even Rouault <even.rouault@spatialys.com>
|
||||||
|
Date: Tue, 13 Dec 2016 18:15:48 +0000
|
||||||
|
Subject: [PATCH] * libtiff/tif_fax3.h: revert change done on 2016-01-09 that
|
||||||
|
made Param member of TIFFFaxTabEnt structure a uint16 to reduce size of the
|
||||||
|
binary. It happens that the Hylafax software uses the tables that follow this
|
||||||
|
typedef (TIFFFaxMainTable, TIFFFaxWhiteTable, TIFFFaxBlackTable), also they
|
||||||
|
are not in a public libtiff header. Raised by Lee Howard. Fixes
|
||||||
|
http://bugzilla.maptools.org/show_bug.cgi?id=2636
|
||||||
|
|
||||||
|
---
|
||||||
|
ChangeLog | 10 ++++++++++
|
||||||
|
libtiff/tif_fax3.h | 6 ++++--
|
||||||
|
2 files changed, 14 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libtiff/tif_fax3.h b/libtiff/tif_fax3.h
|
||||||
|
index e0b2ca6bfc9d..45ce43f1cf2e 100644
|
||||||
|
--- a/libtiff/tif_fax3.h
|
||||||
|
+++ b/libtiff/tif_fax3.h
|
||||||
|
@@ -81,10 +81,12 @@ extern void _TIFFFax3fillruns(unsigned char*, uint32*, uint32*, uint32);
|
||||||
|
#define S_MakeUp 11
|
||||||
|
#define S_EOL 12
|
||||||
|
|
||||||
|
+/* WARNING: do not change the layout of this structure as the Halyfax software */
|
||||||
|
+/* really depends on it. See http://bugzilla.maptools.org/show_bug.cgi?id=2636 */
|
||||||
|
typedef struct { /* state table entry */
|
||||||
|
unsigned char State; /* see above */
|
||||||
|
unsigned char Width; /* width of code in bits */
|
||||||
|
- uint16 Param; /* unsigned 16-bit run length in bits */
|
||||||
|
+ uint32 Param; /* unsigned 32-bit run length in bits (holds on 16 bit actually, but cannot be changed. See above warning) */
|
||||||
|
} TIFFFaxTabEnt;
|
||||||
|
|
||||||
|
extern const TIFFFaxTabEnt TIFFFaxMainTable[];
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
@ -0,0 +1,113 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI="6"
|
||||||
|
inherit autotools eutils libtool multilib-minimal
|
||||||
|
|
||||||
|
DESCRIPTION="Tag Image File Format (TIFF) library"
|
||||||
|
HOMEPAGE="http://libtiff.maptools.org"
|
||||||
|
SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
|
||||||
|
ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="libtiff"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||||
|
IUSE="+cxx jbig jpeg lzma static-libs test zlib"
|
||||||
|
|
||||||
|
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
|
||||||
|
jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
|
||||||
|
lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
|
||||||
|
zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
|
||||||
|
abi_x86_32? (
|
||||||
|
!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
|
||||||
|
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
|
||||||
|
)"
|
||||||
|
DEPEND="${RDEPEND}"
|
||||||
|
|
||||||
|
REQUIRED_USE="test? ( jpeg )" #483132
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/${P}-fax2tiff.patch #598938
|
||||||
|
"${FILESDIR}"/${P}-CVE-2016-10266.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2598.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2604.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2608.patch
|
||||||
|
"${FILESDIR}"/${P}-CVE-2016-10267.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2620.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2621.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2619.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2594.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2597.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2599.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2607.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2610.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2605.patch
|
||||||
|
"${FILESDIR}"/${P}-hylafax-hack.patch #612172
|
||||||
|
"${FILESDIR}"/${P}-bug2633-bug2634.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2635.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2627.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2638.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2639.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2640.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2653.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2535.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2644.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2642-bug2643-bug2646-bug2647.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2648.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2650.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2658.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2650-2.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2651.patch
|
||||||
|
"${FILESDIR}"/${P}-CVE-2017-5225.patch #610330
|
||||||
|
"${FILESDIR}"/${P}-bug2130.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2659.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2659-2.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2631.patch
|
||||||
|
"${FILESDIR}"/${P}-bug2665.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
MULTILIB_WRAPPED_HEADERS=(
|
||||||
|
/usr/include/tiffconf.h
|
||||||
|
)
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
default
|
||||||
|
|
||||||
|
# tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
|
||||||
|
sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
|
||||||
|
|
||||||
|
eautoreconf
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_configure() {
|
||||||
|
ECONF_SOURCE="${S}" econf \
|
||||||
|
$(use_enable static-libs static) \
|
||||||
|
$(use_enable zlib) \
|
||||||
|
$(use_enable jpeg) \
|
||||||
|
$(use_enable jbig) \
|
||||||
|
$(use_enable lzma) \
|
||||||
|
$(use_enable cxx) \
|
||||||
|
--without-x
|
||||||
|
|
||||||
|
# remove useless subdirs
|
||||||
|
if ! multilib_is_native_abi ; then
|
||||||
|
sed -i \
|
||||||
|
-e 's/ tools//' \
|
||||||
|
-e 's/ contrib//' \
|
||||||
|
-e 's/ man//' \
|
||||||
|
-e 's/ html//' \
|
||||||
|
Makefile || die
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_test() {
|
||||||
|
if ! multilib_is_native_abi ; then
|
||||||
|
emake -C tools
|
||||||
|
fi
|
||||||
|
emake check
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_install_all() {
|
||||||
|
prune_libtool_files --all
|
||||||
|
rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
|
||||||
|
}
|
@ -1 +1 @@
|
|||||||
Thu, 30 Mar 2017 14:09:23 +0000
|
Fri, 31 Mar 2017 05:09:25 +0000
|
||||||
|
@ -1 +1 @@
|
|||||||
Thu, 30 Mar 2017 14:09:23 +0000
|
Fri, 31 Mar 2017 05:09:25 +0000
|
||||||
|
@ -0,0 +1,12 @@
|
|||||||
|
DEFINED_PHASES=compile install test unpack
|
||||||
|
DEPEND=>=dev-lang/go-1.7:=
|
||||||
|
DESCRIPTION=Cloudflare's PKI and TLS toolkit
|
||||||
|
EAPI=6
|
||||||
|
HOMEPAGE=https://github.com/cloudflare/cfssl
|
||||||
|
IUSE=hardened
|
||||||
|
KEYWORDS=~amd64
|
||||||
|
LICENSE=BSD-2
|
||||||
|
SLOT=0
|
||||||
|
SRC_URI=https://github.com/cloudflare/cfssl/archive/1a5ac2e68991e01380068b96f50f5ff982d9bb14.tar.gz -> cfssl-1.2.0_p20170322.tar.gz https://github.com/juju/ratelimit/archive/acf38b000a03e4ab89e40f20f1e548f4e6ac7f72.tar.gz -> github.com-juju-ratelimit-acf38b000a03e4ab89e40f20f1e548f4e6ac7f72.tar.gz
|
||||||
|
_eclasses_=golang-base 2983c8674b8e3b3a99ec61986356c76a golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 7fb5d554a7e656be19ec465fa5bb66db
|
||||||
|
_md5_=d337cefc3a28813f9fbe54cb8b3d67c4
|
@ -1,14 +0,0 @@
|
|||||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
|
|
||||||
DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= media-libs/harfbuzz:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb(-)] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 )
|
|
||||||
DESCRIPTION=A full office productivity suite
|
|
||||||
EAPI=6
|
|
||||||
HOMEPAGE=http://www.libreoffice.org
|
|
||||||
IUSE=bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java aqua kde python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
|
|
||||||
LICENSE=|| ( LGPL-3 MPL-1.1 )
|
|
||||||
PDEPEND==app-office/libreoffice-l10n-5.3*
|
|
||||||
RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= media-libs/harfbuzz:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb(-)] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts media-fonts/libertine media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 )
|
|
||||||
REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-5.3.1.2.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.3.1.2.tar.xz http://download.documentfoundation.org/libreoffice/src/5.3.1//libreoffice-5.3.1.2.tar.xz http://download.documentfoundation.org/libreoffice/src/5.3.1//libreoffice-help-5.3.1.2.tar.xz http://download.documentfoundation.org/libreoffice/old/5.3.1.2//libreoffice-5.3.1.2.tar.xz http://download.documentfoundation.org/libreoffice/old/5.3.1.2//libreoffice-help-5.3.1.2.tar.xz http://dev-www.libreoffice.org/src//86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
|
|
||||||
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnome2-utils 6d2af8c7ab84825693c3f065a37b923c java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd kde4-base def4522579b4ee66103372bbb0314c35 kde4-functions 388bbabf76d84194e7d234ba7c7afee2 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 multiprocessing 284a473719153462f3e974d86c8cb81c pax-utils 4f95120230a315c8caaabeb2307b7eee python-single-r1 c3e54dd0dc1e70c6252f2551a55bf053 python-utils-r1 a166d0f5815d7f1e67bb60a196f1bf7e qmake-utils ea78a9056543346cdc8cbbd07f16c6fb toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
|
|
||||||
_md5_=5868b8472502c004adc825e1ac313ec0
|
|
@ -1,14 +0,0 @@
|
|||||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
|
|
||||||
DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= media-libs/harfbuzz:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb(-)] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 )
|
|
||||||
DESCRIPTION=A full office productivity suite
|
|
||||||
EAPI=6
|
|
||||||
HOMEPAGE=http://www.libreoffice.org
|
|
||||||
IUSE=bluetooth +branding coinmp collada +cups dbus debug eds gltf gnome googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java aqua kde python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
|
|
||||||
LICENSE=|| ( LGPL-3 MPL-1.1 )
|
|
||||||
PDEPEND==app-office/libreoffice-l10n-5.3*
|
|
||||||
RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= media-libs/harfbuzz:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb(-)] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts media-fonts/libertine media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 )
|
|
||||||
REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-5.3.2.1.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.3.2.1.tar.xz http://download.documentfoundation.org/libreoffice/src/5.3.2//libreoffice-5.3.2.1.tar.xz http://download.documentfoundation.org/libreoffice/src/5.3.2//libreoffice-help-5.3.2.1.tar.xz http://download.documentfoundation.org/libreoffice/old/5.3.2.1//libreoffice-5.3.2.1.tar.xz http://download.documentfoundation.org/libreoffice/old/5.3.2.1//libreoffice-help-5.3.2.1.tar.xz http://dev-www.libreoffice.org/src//86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
|
|
||||||
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnome2-utils 6d2af8c7ab84825693c3f065a37b923c java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd kde4-base def4522579b4ee66103372bbb0314c35 kde4-functions 388bbabf76d84194e7d234ba7c7afee2 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 multiprocessing 284a473719153462f3e974d86c8cb81c pax-utils 4f95120230a315c8caaabeb2307b7eee python-single-r1 c3e54dd0dc1e70c6252f2551a55bf053 python-utils-r1 a166d0f5815d7f1e67bb60a196f1bf7e qmake-utils ea78a9056543346cdc8cbbd07f16c6fb toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
|
|
||||||
_md5_=b4ab1a9032e832cf3f4fbebc7f3a8dbc
|
|
@ -0,0 +1,14 @@
|
|||||||
|
DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
|
||||||
|
DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= media-libs/harfbuzz:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb(-)] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 )
|
||||||
|
DESCRIPTION=A full office productivity suite
|
||||||
|
EAPI=6
|
||||||
|
HOMEPAGE=http://www.libreoffice.org
|
||||||
|
IUSE=bluetooth +branding coinmp collada +cups dbus debug eds gltf gnome googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java aqua kde python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
|
||||||
|
LICENSE=|| ( LGPL-3 MPL-1.1 )
|
||||||
|
PDEPEND==app-office/libreoffice-l10n-5.3*
|
||||||
|
RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= media-libs/harfbuzz:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb(-)] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts media-fonts/libertine media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 )
|
||||||
|
REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
|
||||||
|
SLOT=0
|
||||||
|
SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-5.3.2.2.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.3.2.2.tar.xz http://download.documentfoundation.org/libreoffice/src/5.3.2//libreoffice-5.3.2.2.tar.xz http://download.documentfoundation.org/libreoffice/src/5.3.2//libreoffice-help-5.3.2.2.tar.xz http://download.documentfoundation.org/libreoffice/old/5.3.2.2//libreoffice-5.3.2.2.tar.xz http://download.documentfoundation.org/libreoffice/old/5.3.2.2//libreoffice-help-5.3.2.2.tar.xz http://dev-www.libreoffice.org/src//86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
|
||||||
|
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnome2-utils 6d2af8c7ab84825693c3f065a37b923c java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd kde4-base def4522579b4ee66103372bbb0314c35 kde4-functions 388bbabf76d84194e7d234ba7c7afee2 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 multiprocessing 284a473719153462f3e974d86c8cb81c pax-utils 4f95120230a315c8caaabeb2307b7eee python-single-r1 c3e54dd0dc1e70c6252f2551a55bf053 python-utils-r1 a166d0f5815d7f1e67bb60a196f1bf7e qmake-utils ea78a9056543346cdc8cbbd07f16c6fb toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
|
||||||
|
_md5_=826149c3b05135f68274309e78e866c2
|
@ -1,14 +1,14 @@
|
|||||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
|
DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
|
||||||
DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= media-libs/harfbuzz:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb(-)] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 )
|
DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= media-libs/harfbuzz:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb(-)] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 )
|
||||||
DESCRIPTION=A full office productivity suite
|
DESCRIPTION=A full office productivity suite
|
||||||
EAPI=6
|
EAPI=6
|
||||||
HOMEPAGE=http://www.libreoffice.org
|
HOMEPAGE=http://www.libreoffice.org
|
||||||
IUSE=bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java aqua kde python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
|
IUSE=bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java aqua kde python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
|
||||||
LICENSE=|| ( LGPL-3 MPL-1.1 )
|
LICENSE=|| ( LGPL-3 MPL-1.1 )
|
||||||
PDEPEND=!app-office/libreoffice-l10n
|
PDEPEND=!app-office/libreoffice-l10n
|
||||||
RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= media-libs/harfbuzz:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb(-)] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts media-fonts/libertine media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 )
|
RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= media-libs/harfbuzz:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb(-)] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts media-fonts/libertine media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 )
|
||||||
REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
|
REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
|
||||||
SLOT=0
|
SLOT=0
|
||||||
SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-www.libreoffice.org/src//86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
|
SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-www.libreoffice.org/src//86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
|
||||||
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 68d35a154123e27007638d8220886ee1 gnome2-utils 6d2af8c7ab84825693c3f065a37b923c java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd kde4-base def4522579b4ee66103372bbb0314c35 kde4-functions 388bbabf76d84194e7d234ba7c7afee2 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 multiprocessing 284a473719153462f3e974d86c8cb81c pax-utils 4f95120230a315c8caaabeb2307b7eee python-single-r1 c3e54dd0dc1e70c6252f2551a55bf053 python-utils-r1 a166d0f5815d7f1e67bb60a196f1bf7e qmake-utils ea78a9056543346cdc8cbbd07f16c6fb toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
|
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 68d35a154123e27007638d8220886ee1 gnome2-utils 6d2af8c7ab84825693c3f065a37b923c java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd kde4-base def4522579b4ee66103372bbb0314c35 kde4-functions 388bbabf76d84194e7d234ba7c7afee2 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 multiprocessing 284a473719153462f3e974d86c8cb81c pax-utils 4f95120230a315c8caaabeb2307b7eee python-single-r1 c3e54dd0dc1e70c6252f2551a55bf053 python-utils-r1 a166d0f5815d7f1e67bb60a196f1bf7e qmake-utils ea78a9056543346cdc8cbbd07f16c6fb toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
|
||||||
_md5_=386bc31dd6096d7551de2519594e120a
|
_md5_=65e3990111fab4fed17aca3c0015db2e
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
|
DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
|
||||||
DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb(-)] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 )
|
DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb(-)] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 )
|
||||||
DESCRIPTION=A full office productivity suite
|
DESCRIPTION=A full office productivity suite
|
||||||
EAPI=6
|
EAPI=6
|
||||||
HOMEPAGE=http://www.libreoffice.org
|
HOMEPAGE=http://www.libreoffice.org
|
||||||
IUSE=bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java aqua kde python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
|
IUSE=bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java aqua kde python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
|
||||||
LICENSE=|| ( LGPL-3 MPL-1.1 )
|
LICENSE=|| ( LGPL-3 MPL-1.1 )
|
||||||
PDEPEND=!app-office/libreoffice-l10n
|
PDEPEND=!app-office/libreoffice-l10n
|
||||||
RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb(-)] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts media-fonts/libertine media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 )
|
RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb(-)] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts media-fonts/libertine media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4 )
|
||||||
REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
|
REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
|
||||||
SLOT=0
|
SLOT=0
|
||||||
SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-www.libreoffice.org/src//86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
|
SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-www.libreoffice.org/src//86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
|
||||||
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 68d35a154123e27007638d8220886ee1 gnome2-utils 6d2af8c7ab84825693c3f065a37b923c java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd kde4-base def4522579b4ee66103372bbb0314c35 kde4-functions 388bbabf76d84194e7d234ba7c7afee2 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 multiprocessing 284a473719153462f3e974d86c8cb81c pax-utils 4f95120230a315c8caaabeb2307b7eee python-single-r1 c3e54dd0dc1e70c6252f2551a55bf053 python-utils-r1 a166d0f5815d7f1e67bb60a196f1bf7e qmake-utils ea78a9056543346cdc8cbbd07f16c6fb toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
|
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 68d35a154123e27007638d8220886ee1 gnome2-utils 6d2af8c7ab84825693c3f065a37b923c java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd kde4-base def4522579b4ee66103372bbb0314c35 kde4-functions 388bbabf76d84194e7d234ba7c7afee2 libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 multiprocessing 284a473719153462f3e974d86c8cb81c pax-utils 4f95120230a315c8caaabeb2307b7eee python-single-r1 c3e54dd0dc1e70c6252f2551a55bf053 python-utils-r1 a166d0f5815d7f1e67bb60a196f1bf7e qmake-utils ea78a9056543346cdc8cbbd07f16c6fb toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
|
||||||
_md5_=17a8bab09a9c1ecc34fc5740fe6310ca
|
_md5_=e33bfcb1a86320bb384af6a7f70e7749
|
||||||
|
File diff suppressed because one or more lines are too long
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue