Skip to content

Commit

Permalink
dev-java/icedtea-bin: Bump to 7.2.6.6 wrt security bug #581028
Browse files Browse the repository at this point in the history
icedtea-bin:7 for arm is being dropped, at least temporarily, as the
performance benefit it provides over icedtea-bin:8 is currently
broken.

Package-Manager: portage-2.2.28
  • Loading branch information
chewi committed Apr 24, 2016
1 parent 515d298 commit 7851955
Show file tree
Hide file tree
Showing 2 changed files with 192 additions and 0 deletions.
6 changes: 6 additions & 0 deletions dev-java/icedtea-bin/Manifest
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ DIST icedtea-bin-core-3.0.0_pre10-x86.tar.xz 56360920 SHA256 61c45704a8302d196ec
DIST icedtea-bin-core-7.2.6.5-amd64.tar.xz 53018784 SHA256 6adb5ae0e07b29f89cf3ee4a4ed8739ad92f3eb6d276e38ac56056570b70f263 SHA512 9b65828ae84939a7951ed26ed1e55abe42bc8362447b8c8b408e6ea64b80252d1de49a2ab17493dbd920fbc8b496b530486e35946c87094bf5ade452100c80ef WHIRLPOOL 0ab1babb5cdfb17f69692f4430226a0217de6b9ac4f691b700dbdd123b5f221592092f68ba548834692387b580633f704388d12ab20d2212a23793cfbfc243d9
DIST icedtea-bin-core-7.2.6.5-arm.tar.xz 43997476 SHA256 d897fbcb7e0587ebb3c1cda83b558eb231983bb44cb2fc306b0fe30c0692d4f9 SHA512 8a328f5f508a815b2e13f0cf27d21a724c29e6228007e6dde418f1a41981d3c3d8c205586560c1f0110e68a176cb58329cd80510a3e33aca0994a78a4456bd89 WHIRLPOOL 4ef90a28853456c16e6698f6e6fe4d46eb745062773da10cd8c75071c5a7b7dc73ae1da21dac1474f156e06cda98a5ceb94a65fe8b79b1415c722126deacf43c
DIST icedtea-bin-core-7.2.6.5-x86.tar.xz 54670860 SHA256 ffdee3645634771922e6b160012ba2200c7f59e91dd890e8e61f2b35126751ca SHA512 7ec33501a2118f85f3bd14435eb9aca5711b77fa379db21b63d50d5f20da33cb3818d876f8be3ab40d7cbd8df7120d0b73d06415284463d50614510a59ebd41d WHIRLPOOL 7cfec521ab9cad48cd1296c76c12d8cc57a830a416fba591d0d7e0d7ef195341a3b401196049516c0a905dafcb36323bb68bb013b4cb4ea6b6a702972a984800
DIST icedtea-bin-core-7.2.6.6-amd64.tar.xz 53051836 SHA256 9729ac37ed34b60f6a9c18c6865e99648379c79e24f189842c0f8dc81424fd9b SHA512 ee621f3dfcc19fb274acb8b936f7256b2053ff97864340732e6cf97db5a265d81ace7269c9f90ee7e4135b4299d7ecdd2b660f5e806ede64e4d74a4dd80b0592 WHIRLPOOL bfd8dd85fd074f7f16d296a41bf7ccaaa167fbeeb3bfcde4119c2b2ee8a59aa2dad9e627a15dd3790f318b9fc8fa8328ead9c472af527a82a93c153b1d92de02
DIST icedtea-bin-core-7.2.6.6-x86.tar.xz 54697212 SHA256 c33e89990e1207458abc56ab0b2720b239ee0a3924e73360e19f52e7a29f8ee6 SHA512 7ebca976f2864cee1e08ed858e93c0dbbc850d127c9359b7e1edb7abacd7e14e0b5cdbb1f042ffd40232cbcea72f21074caad2a669096a5a5a7808c246d4e04d WHIRLPOOL 6640c59170b451f81541cf98451325d596115ad8e530b9d5fabb6f060e4e32e09c9ac49b6799694508108f09b58b82f98c4bd4d678ea8d9319c5653ba342d873
DIST icedtea-bin-doc-3.0.0.tar.xz 11682788 SHA256 41bcb752716f54a2b4f0d3c25de4a95d77dab3e735cdd785ed79bb04614feff2 SHA512 ec57ce1f403952960c6accd691e375882ead088b28308231cec5ef05e61701fd56c15c98c7ba7b34ea41f338ad3b26cd13cb6b673a2a3ec9b0402066df3b4484 WHIRLPOOL 27b588ff1c479de6398d1a912edca9a2ee150473cc17b435d0356520b7d3dba0c7018dffb440d8966850b5e8fa2b6ea58d8c3e891f049583f6b30356b85dd631
DIST icedtea-bin-doc-3.0.0_pre10.tar.xz 11688120 SHA256 cc26fcea4f5208e11ecd00a5c99c4bd5b0541e14ced37aa4a8e0e396c7565797 SHA512 ecf6a8654caed4c7fc07baff10010854e6751fe2eb2377979c1e68e6f1530ed60df0574df422b6f03f6acc20e9b943fd4db2e883eafa00480abb4bd14bf12f9c WHIRLPOOL 760dd0cba2e0438eb65d75002995d64fa9b968bdcdb8b07da61552b1f2044312c5cd6b3981a64e1063f14974ac7ca080d0eb3aa3884553844ba97992bca63da9
DIST icedtea-bin-doc-7.2.6.5.tar.xz 10605544 SHA256 ae3e5078e8705fffbd95e986c99ce5ed8f8e76474f2c3c005aed0eef67b55377 SHA512 e24f52b8d39e329fed5e8f76a6d15a168454c252db653b46eb4fc5dad63483afefab07794718b9149a76bb62ccdb9f6eda8da9229043eab362bf359b04b118dc WHIRLPOOL 42693d3769ee3ab9af6200d7702244a941a07a01f41f3db655cae28b5bddc527989860dbfdc93681cb4ef22ea5b0c2a489ffc765abb15317ee07762a46f2b863
DIST icedtea-bin-doc-7.2.6.6.tar.xz 10603724 SHA256 150a8aa157b442569b60491c5261909a7a381e0a253070e2bf6d9fd8d0344708 SHA512 39ab65e002d9f780c881cbdea41a4fbae792080399a020c189d7fccf24a83c604ecc90b6fad47b9657eba11254b1021d8c45d83cb8a0dcfe62011f9cede53ce3 WHIRLPOOL 480fb25b1b551699163fc07ad5bf31e774c38f4ef51694d906d0f5c5c5d3f4941806b352ee472fdc3e02c007d96a28d395c41adc4d4965f826babb2465011bb9
DIST icedtea-bin-examples-3.0.0-amd64.tar.xz 1811800 SHA256 b08dad2eae1f91cc2db9124f66cfd3c11c8aa8001f2e1be7fd1ad0c214db3ab2 SHA512 5e37b6f5c5e4ee651af43b5ffebdb91ed995f26693f333b50a355fdce508c3a349e9a01d1c74640bb7cc56825da88b003175c9ef4a274e2b4304976c40257158 WHIRLPOOL 80f991e760f743b60b7c4d052b5593ed57f2f1d87297b0ea716bbc1c467753fb1c1709f198b55ab8cd2f87b303a88c328205e7ce21f5ef2e32e0a27877bae280
DIST icedtea-bin-examples-3.0.0-arm.tar.xz 1794400 SHA256 2fcab4acb1aa08b4a3428e0aaa0c628269cf8fe7fbf3ec89f816391ec45a4e02 SHA512 409d80d2b7fac2bdd21886fc6852f7a4f31da6fc790519dabfbefca8da7c4beb17080eb38e5a707a63f9922d3839b96c0a9484be7104ac4569b9ae23b59c9ffd WHIRLPOOL 513feee6807661d90fa1eecb47c7c9e87eae58b3cad7e6814231d004edb3648f1ac3424b0607a7b505ab67ccaa37481336ab9c8a6eb0450ea7e63d6a6339157f
DIST icedtea-bin-examples-3.0.0-x86.tar.xz 1817080 SHA256 6bc424021b45d1e957cab1bd14d1de21e9be12650e24ead2aa21a53ca52e2e3d SHA512 65ef2dcea0be74dd7e2f5b3c6f0023c8c87e11e7f6ac8fb500e3a2ca0ca401bb0ab806b64f78fefabbfb69dba66877d2866cecc5d9e76ed2cfd55f0e8c1d81b1 WHIRLPOOL 9817369422ca16c11e6e4023e9f356be277b705cc59cf66ad9d2d6e46534e57be7cffe03180191760d39cd990177af8ad9c7554908e21da5f8148273c7b1e5be
Expand All @@ -21,6 +24,9 @@ DIST icedtea-bin-examples-3.0.0_pre10-x86.tar.xz 1817288 SHA256 56092226edba7270
DIST icedtea-bin-examples-7.2.6.5-amd64.tar.xz 1796824 SHA256 9730fca1e431168169e71a6cd28120e2da97894771ff99bcfd3fc814ed85402d SHA512 a931737a56fffd65ba3dee00d68a22ee365c783e87cf37cf0fd69620465acb9b5f64bd36ba3798a5d9549f96f7290500a0abbe5d5cee40fc66c5db15b44ecdc5 WHIRLPOOL 5affef2b772efbd96d6fe799bd686b7155fcfff1b3738f116cd8265fa2e784dcece7867d456657f0a213b663c8d7ffe4799cf1ba30e1dab1d9ed57b256121081
DIST icedtea-bin-examples-7.2.6.5-arm.tar.xz 1779800 SHA256 563ac5025c8d3a6f0066ca479d9f0053e6bd2440dbe07b2dbfbcf3aee6a87699 SHA512 3c98a62aebf83e5e6e36443b8c42925a2534e15cc369cef4d06d39b81e82057007758462c5b7731a36e862d93a7e547ef2051b9aef313f24fa261277715771b7 WHIRLPOOL 4dc678d1b9e5a9245fb01fb93fd76e6892783444a2026cbd44ccc843cb8229328a43687688c849605e933605366b6904abfea9c152477f9db50b4f7b91ba0c06
DIST icedtea-bin-examples-7.2.6.5-x86.tar.xz 1796620 SHA256 1571042672d5d53e4f56e84397411273639e45d05ac706d0b845ac8355f82484 SHA512 ee59bc512af1555480a9219cd01bf2e4f935534c2ba93f8323b4e1dcd69131920dd9ab621e3dd8e68e9cd3cd6fb63ef19274a37b4e954d4570f98211a501e005 WHIRLPOOL 9abc2a7198e31cf33796df0c6ac5b5008ab53d286da086e7e5f526e366339fe68e1c506276cb7044fb7eaf07070de2d00a979b941931665f3a20f9b899bba273
DIST icedtea-bin-examples-7.2.6.6-amd64.tar.xz 1796808 SHA256 b6add78d86e3420f589f6bcfee1e4a9fb983fc4d0b6a905fe162dfca56e73500 SHA512 38e2d91f6621e38959c2d0bef84f4d566370303a5b50cc468cae6fc97da46d752fccd8c980b6490f43709c0c6340c3af88dd9f7c9a0d7f400289127aa568b3ac WHIRLPOOL c212b2a953f784a05759a1b82d7120fbb5f642d8d7f014750f8c509aa44c29f193f17dc86257b1b653f0e5334e167054f71021726745adc8b8d1c57273902223
DIST icedtea-bin-examples-7.2.6.6-x86.tar.xz 1796496 SHA256 5f7a4f52ed2f36d06ecc6c37041e2b400ed84c56ef4921375a925682b4523d88 SHA512 e80c965ca8cccf60561138fb5c4f21e293b6e44b5a4cecc97d94ffbccffe4f18da40942e2659c7264df54563c8db327b5e7a7f71fbf6ef873a4e74afc122050a WHIRLPOOL 402a1e10aa17e875dd83adff72dbe9d37c05b40a44c26e3212658ea690efec3dc9a61b57aebe24c77f16c52961dcd925f412c645e828e9e0456ae3a8d77ebd9a
DIST icedtea-bin-src-3.0.0.tar.xz 45650888 SHA256 b5be2bce2d1ae180edc153ccd8ad5549aa8fcae1f33423b42794cb98283eebaf SHA512 95ef74d7be58e82e1e873f3b9ff4dfcf6a8e172d59bbeebbe85df53662ecef2eff9ae19e6d6f952f873f14dcc1d38e1045230224f5ed27b930436bff8a77a8ac WHIRLPOOL 978f52a370259912be366e2bd1c7998743fa00065d39c713f73f6c983bcfcd393791435c6e1ecabc5e7293234ca0b3272395074fca3b4bd99f4588be2ccae19d
DIST icedtea-bin-src-3.0.0_pre10.tar.xz 45654080 SHA256 48f2402a183b21cbe9af45eb0fd47b07f22b007c27c2730bf99b7cb588fa5718 SHA512 c5bdde545f997c4451fdeb2b20a6e7eae9519419b84e716ae6789ed5f0828ff3ab22c2d1f86bda907175a31c4d0f8ad4fbc45548c5a77f7d9bc2bb2125edfd85 WHIRLPOOL 1582af0d78242f0ba7d1a84c326678f9231d6c6b81e9944a093e9ef7ee748eb6a74bb4cba65751da2f8937496e0084cfa6d6eaf9dbf0788adff2f55cd2eef127
DIST icedtea-bin-src-7.2.6.5.tar.xz 40046964 SHA256 85bd4d4bc2abed47ef2bf7dd5eadbf5837efe67fe4cc322dea8096d47a980930 SHA512 cc5de0f6ede1a342380d5a1ce9ec279ae7f7bab46ea5504c0c39318ece75ad867fbb095e8a8aac5ecc64a02bc8376cf283b36f9a21fbcd485b8d0be636ebd047 WHIRLPOOL 276845b53eea26df67542e240c7f3068fa554c610be1ff7cd43729a57bb74ced6082f5920cc7deee81b8b286bedd24866c67909fa82574aba73e7ca19411e46e
DIST icedtea-bin-src-7.2.6.6.tar.xz 40045788 SHA256 4d759dfc12a39ff44650b61a5a89f2ee4dcc5d6d0a863c54f8c6e2c86023ce8c SHA512 13cf426366bd7ced497d16b76dd5d49aadfac45e9686b78c185b4d7c95b47f96fecfc789b14138780592580c39857a2d68d8d35a6d016fb4ba1c0c8103b74f9f WHIRLPOOL f645c6da2a5c08e48bd6598bda025776d4e4fceb3a92898b4c5d9ca7321797e834df572656c07cf24fbd2eb0cde097b38137472857d968b663ccba2788406c07
186 changes: 186 additions & 0 deletions dev-java/icedtea-bin/icedtea-bin-7.2.6.6.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$

EAPI="5"

inherit java-vm-2 multilib prefix toolchain-funcs versionator

dist="https://dev.gentoo.org/~chewi/distfiles"
TARBALL_VERSION="${PV}"

DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
HOMEPAGE="http://icedtea.classpath.org"
SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"

for arch in amd64 x86; do
SRC_URI+="
${arch}? (
${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
)"
done

LICENSE="GPL-2-with-linking-exception"
SLOT="7"
KEYWORDS="-* ~amd64 ~x86"

IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source +webstart"
REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"

RESTRICT="preserve-libs strip"
QA_PREBUILT="opt/.*"

# gsettings-desktop-schemas is needed for native proxy support. #431972
RDEPEND=">=dev-libs/glib-2.42:2
>=dev-libs/nss-3.16.1-r1
>=dev-libs/nspr-4.10
>=gnome-base/gsettings-desktop-schemas-3.12.2
media-fonts/dejavu
>=media-libs/fontconfig-2.11:1.0
>=media-libs/freetype-2.5.5:2
>=media-libs/lcms-2.6:2
>=sys-devel/gcc-4.9.3
>=sys-libs/glibc-2.21
>=sys-libs/zlib-1.2.8-r1
virtual/jpeg:62
alsa? ( >=media-libs/alsa-lib-1.0 )
!headless-awt? (
>=media-libs/giflib-4.1.6-r1
media-libs/libpng:0/16
>=x11-libs/libX11-1.6
>=x11-libs/libXcomposite-0.4
>=x11-libs/libXext-1.3
>=x11-libs/libXi-1.7
>=x11-libs/libXrender-0.9.8
>=x11-libs/libXtst-1.2
)
cjk? (
media-fonts/arphicfonts
media-fonts/baekmuk-fonts
media-fonts/lklug
media-fonts/lohit-fonts
media-fonts/sazanami
)
cups? ( >=net-print/cups-2.0 )
gtk? (
>=dev-libs/atk-2.16.0
>=x11-libs/cairo-1.14.2
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-2.24:2
>=x11-libs/pango-1.36
)
selinux? ( sec-policy/selinux-java )"

DEPEND="!arm? ( dev-util/patchelf )"

PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7(+)] )
nsplugin? ( dev-java/icedtea-web:0[icedtea7(+),nsplugin] )
pulseaudio? ( dev-java/icedtea-sound )"

pkg_pretend() {
if [[ "$(tc-is-softfloat)" != "no" ]]; then
die "These binaries require a hardfloat system."
fi
}

src_prepare() {
if ! use alsa; then
rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
fi

if use headless-awt; then
rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
{,jre/}bin/policytool bin/appletviewer || die
fi

if ! use gtk; then
rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
fi

# NSS is already required because of SunEC. The nss flag in the
# icedtea package just comments or uncomments this line.
sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" jre/lib/security/java.security || die

if [[ -n "${EPREFIX}" ]]; then
# The binaries are built on a non-prefixed system so the
# fontconfig needs to have prefixes inserted.
sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
eprefixify jre/lib/fontconfig.Gentoo.properties
fi

# Fix the RPATHs, except on arm.
# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
# https://github.com/NixOS/patchelf/issues/8
if use arm; then
ewarn "The RPATHs on these binaries are normally modified to avoid"
ewarn "conflicts with an icedtea installation built from source. This"
ewarn "is currently not possible on ARM so please refrain from"
ewarn "installing dev-java/icedtea on the same system."
else
local old="/usr/$(get_libdir)/icedtea${SLOT}"
local new="${EPREFIX}/opt/${P}"
local elf rpath

for elf in $(find -type f -executable ! -name "*.cgi" || die); do
rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")

if [[ -n "${rpath}" ]]; then
patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
fi
done
fi
}

src_install() {
local dest="/opt/${P}"
local ddest="${ED}${dest#/}"
dodir "${dest}"

# doins doesn't preserve executable bits.
cp -pRP bin include jre lib man "${ddest}" || die

dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
use doc && dodoc -r doc/html

if use examples; then
cp -pRP demo sample "${ddest}" || die
fi

if use source; then
cp src.zip "${ddest}" || die
fi

if use webstart || use nsplugin; then
dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
fi
if use webstart; then
dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
fi

# Both icedtea itself and the icedtea ebuild set PAX markings but we
# disable them for the icedtea-bin build because the line below will
# respect end-user settings when icedtea-bin is actually installed.
java-vm_set-pax-markings "${ddest}"

set_java_env
java-vm_revdep-mask "${dest}"
java-vm_sandbox-predict /proc/self/coredump_filter
}

pkg_postinst() {
if use nsplugin; then
if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
elog "The switch should complete properly during the subsequent installation of icedtea-web"
elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
fi
fi

# Set as default VM if none exists
java-vm-2_pkg_postinst
}

0 comments on commit 7851955

Please sign in to comment.