parent
1eaf63dfe2
commit
4a322b6bd3
@ -1,3 +1,4 @@
|
|||||||
DIST Rex-0.37.0.tar.gz 131952 SHA256 078de412da3302997a8f426f2b27eabb77d07ee3e74b1ab7cce4c74503ec0abc SHA512 3706ac8dcaf45ad10b8c161df9123e0256821411831f245fa036c73f68d165a183f98ec513764f97fd43591738372e22ad85f8f151129de62ef4ea87d7ef59e2 WHIRLPOOL c0064bff57ce0185e98ebb2b064a6dc61fe89de9ef80aa56ddd7078b4e9259fe6161cf643dfbb96b9be4bd7a40d95db39f64800b25d5eccf2654a7bf12819508
|
DIST Rex-0.37.0.tar.gz 131952 SHA256 078de412da3302997a8f426f2b27eabb77d07ee3e74b1ab7cce4c74503ec0abc SHA512 3706ac8dcaf45ad10b8c161df9123e0256821411831f245fa036c73f68d165a183f98ec513764f97fd43591738372e22ad85f8f151129de62ef4ea87d7ef59e2 WHIRLPOOL c0064bff57ce0185e98ebb2b064a6dc61fe89de9ef80aa56ddd7078b4e9259fe6161cf643dfbb96b9be4bd7a40d95db39f64800b25d5eccf2654a7bf12819508
|
||||||
DIST Rex-0.37.1.tar.gz 131945 SHA256 0100038308c27bed71d45623445965a73f3f50a24fcbbdb736b6011485d6f177 SHA512 d8bba4b8ed4a643151366e43f4c3bdc84aaef7e503bf77a1f60cffb23b0dae30a3baafc395139cc1c8ccbe374d72fc9c708189feb74a5621dd16d955b89ab956 WHIRLPOOL a7f319df93af4819ad34679265942efbcf117966847c113e81eb2815b7edf5355b3453f1bab3f49549ee98924c54a07fa7e6761a2ca6c0ed85aaca4f2fac02bf
|
DIST Rex-0.37.1.tar.gz 131945 SHA256 0100038308c27bed71d45623445965a73f3f50a24fcbbdb736b6011485d6f177 SHA512 d8bba4b8ed4a643151366e43f4c3bdc84aaef7e503bf77a1f60cffb23b0dae30a3baafc395139cc1c8ccbe374d72fc9c708189feb74a5621dd16d955b89ab956 WHIRLPOOL a7f319df93af4819ad34679265942efbcf117966847c113e81eb2815b7edf5355b3453f1bab3f49549ee98924c54a07fa7e6761a2ca6c0ed85aaca4f2fac02bf
|
||||||
DIST Rex-0.38.0.tar.gz 137409 SHA256 31d26bd279f4c57fc7e00d3288afba331c70ebeaaf3e5b5fa52343391db1913e SHA512 ffa25696887fb0a4a1eaeebb7b4185efaf27e84ec186823e63cfe9d277bf5040c382b18f672031abc940c3a07ad3869d2b1afac184edf02cab41b5bc65718bbb WHIRLPOOL 3da1eb3fcc99092bfdf04de45aad90cc9a1b905c121d894e5c2fcf84b60385041202593e2a377e49dfb92b8797faa5d6ba8ebc7f3a4673a23b12e56d0f991c37
|
DIST Rex-0.38.0.tar.gz 137409 SHA256 31d26bd279f4c57fc7e00d3288afba331c70ebeaaf3e5b5fa52343391db1913e SHA512 ffa25696887fb0a4a1eaeebb7b4185efaf27e84ec186823e63cfe9d277bf5040c382b18f672031abc940c3a07ad3869d2b1afac184edf02cab41b5bc65718bbb WHIRLPOOL 3da1eb3fcc99092bfdf04de45aad90cc9a1b905c121d894e5c2fcf84b60385041202593e2a377e49dfb92b8797faa5d6ba8ebc7f3a4673a23b12e56d0f991c37
|
||||||
|
DIST Rex-0.39.0.tar.gz 138146 SHA256 6b199278f291d896c663a152d6479e1775b5a69798c25b33cbfaf9d51847c6f2 SHA512 ab65afbcb0ed89fae4a34bf485c6b69fd66fec7b267d047c104a164a47fff1f2996b0029746dcabba0c1010805b9f2d9febdaf46ccafc684e65646aede39e1fc WHIRLPOOL 2d584ab2d8a2c2874e8bf372cae404cea7eba6e80da7166ce31d678ab0b2c4eb4d99d72f9e3f086c8f5006a38f0823de10d240b7175092df2b9def6d9ce05ff3
|
||||||
|
@ -0,0 +1,29 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-admin/rex/rex-0.39.0.ebuild,v 1.1 2013/02/21 04:01:19 patrick Exp $
|
||||||
|
|
||||||
|
EAPI=4
|
||||||
|
|
||||||
|
MODULE_AUTHOR=JFRIED
|
||||||
|
MODULE_VERSION=${PV}
|
||||||
|
MY_P="Rex-${MODULE_VERSION}"
|
||||||
|
inherit perl-module
|
||||||
|
|
||||||
|
DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands."
|
||||||
|
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
RDEPEND="dev-perl/Net-SSH2"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
dev-perl/JSON-XS
|
||||||
|
dev-perl/XML-Simple
|
||||||
|
dev-perl/Digest-SHA1
|
||||||
|
dev-perl/Digest-HMAC
|
||||||
|
dev-perl/Expect
|
||||||
|
dev-perl/DBI
|
||||||
|
dev-perl/yaml
|
||||||
|
dev-perl/libwww-perl"
|
||||||
|
|
||||||
|
SRC_TEST="do"
|
@ -0,0 +1,82 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-crypt/shishi/shishi-1.0.1-r2.ebuild,v 1.1 2013/02/20 15:21:58 eras Exp $
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
inherit autotools eutils flag-o-matic multilib
|
||||||
|
|
||||||
|
DESCRIPTION="A free implementation of the Kerberos 5 network security system"
|
||||||
|
HOMEPAGE="https://www.gnu.org/software/shishi/"
|
||||||
|
SRC_URI="mirror://gnu/shishi/${P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="GPL-3"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64"
|
||||||
|
IUSE="gnutls idn ipv6 nls pam +des +3des +aes +md +null +arcfour static-libs"
|
||||||
|
|
||||||
|
DEPEND="gnutls? ( net-libs/gnutls )
|
||||||
|
idn? ( net-dns/libidn )
|
||||||
|
dev-libs/libtasn1
|
||||||
|
dev-libs/libgcrypt
|
||||||
|
dev-libs/libgpg-error
|
||||||
|
virtual/libiconv
|
||||||
|
virtual/libintl"
|
||||||
|
RDEPEND="${DEPEND}"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
# fix finding libresolv.so
|
||||||
|
epatch "${FILESDIR}/${PN}_resolv.patch"
|
||||||
|
# fix building with automake-1.12 bug #424095
|
||||||
|
epatch "${FILESDIR}/${PN}_automake-1.12.patch"
|
||||||
|
# fix building with glibc-2.16.0
|
||||||
|
epatch "${FILESDIR}/${PN}_gets.patch"
|
||||||
|
|
||||||
|
# don't create a new database
|
||||||
|
sed -i -e '/install-data-hook/s/^/#/' Makefile.am || die
|
||||||
|
|
||||||
|
eautoreconf
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
append-cppflags -DMAX_ERROR_DESCRIPTION_SIZE=ASN1_MAX_ERROR_DESCRIPTION_SIZE
|
||||||
|
econf \
|
||||||
|
$(use_enable pam) \
|
||||||
|
$(use_enable nls) \
|
||||||
|
$(use_enable ipv6) \
|
||||||
|
$(use_with idn libidn-prefix) \
|
||||||
|
$(use_enable gnutls starttls) \
|
||||||
|
$(use_enable des) \
|
||||||
|
$(use_enable 3des) \
|
||||||
|
$(use_enable aes) \
|
||||||
|
$(use_enable md) \
|
||||||
|
$(use_enable null) \
|
||||||
|
$(use_enable arcfour) \
|
||||||
|
$(use_enable static-libs static) \
|
||||||
|
--with-system-asn1 \
|
||||||
|
--with-libgcrypt \
|
||||||
|
--with-html-dir=/usr/share/doc/${P} \
|
||||||
|
--with-db-dir=/var/shishi \
|
||||||
|
--with-pam-dir=/$(get_libdir)/security \
|
||||||
|
--disable-rpath \
|
||||||
|
--with-packager="Gentoo" \
|
||||||
|
--with-packager-bug-reports="https://bugs.gentoo.org/"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
emake DESTDIR="${D}" install
|
||||||
|
|
||||||
|
keepdir /var/shishi
|
||||||
|
fperms 0700 /var/shishi
|
||||||
|
echo "db file /var/shishi" >> "${D}/etc/shishi/shisa.conf" || die
|
||||||
|
|
||||||
|
newinitd "${FILESDIR}/shishid.init" shishid
|
||||||
|
newconfd "${FILESDIR}/shishid.confd" shishid
|
||||||
|
|
||||||
|
dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS
|
||||||
|
doman doc/man/* doc/*.1
|
||||||
|
dohtml doc/reference/html/*
|
||||||
|
doinfo doc/*.info*
|
||||||
|
|
||||||
|
rm -f "${D}/$(get_libdir)/security/pam_shishi.la"
|
||||||
|
use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
|
||||||
|
}
|
@ -1,2 +1,2 @@
|
|||||||
DIST jre-6u38-linux-i586.bin 21709114 SHA256 26ffa4f61d0dd542f3fe80a55cef43504263d3656953e37a9ca670e8e183b5ba SHA512 cf36e75f037722a5dc5fd30f1caef1b9da3f76c4435f5439be2d405e5d3f90a40bf79562a62345bb9c6d90d89bdc1e0628ed103ca93dc205d797552d104c4bf7 WHIRLPOOL f1e02a2dbf7b1370a3ab9c801d441a4723ee36fcbab7799119ad353b5dd81461227a1885f18a7a09153951e17b7681a06e6523fef77281d800d4ceaf34b7b133
|
|
||||||
DIST jre-6u39-linux-i586.bin 21712508 SHA256 7d1f855e33cc756875ce2f0595254ac7ff694d99540102a6f4426824657f191b SHA512 ea7c6e3e10be63ef6afd6e138ca3bc7d3a27102ee929636b7eceb3d542e0b58e9cf1ea776a627ef12aec02940a4e2201d13b7c410715a651b1032d8175c41301 WHIRLPOOL b5dba1fb60dc0862939e8b993f89411eeb36d026941d8c1674b982489590684de2220e0996ecb8aebd3f737cd2718cc3ea9f3089d8677ee9b45448725991f98f
|
DIST jre-6u39-linux-i586.bin 21712508 SHA256 7d1f855e33cc756875ce2f0595254ac7ff694d99540102a6f4426824657f191b SHA512 ea7c6e3e10be63ef6afd6e138ca3bc7d3a27102ee929636b7eceb3d542e0b58e9cf1ea776a627ef12aec02940a4e2201d13b7c410715a651b1032d8175c41301 WHIRLPOOL b5dba1fb60dc0862939e8b993f89411eeb36d026941d8c1674b982489590684de2220e0996ecb8aebd3f737cd2718cc3ea9f3089d8677ee9b45448725991f98f
|
||||||
|
DIST jre-6u41-linux-i586.bin 21726301 SHA256 e89181b56652face6db2704cfbeded2774c27e413f080875a2cea90a45519ad0 SHA512 ddb05f6ecc2cb25122125a16575249002919866a1ab31fdc200bfd4cffeb4b31466987dd434b8efe3b87be1740bcc97162091eaeb2058ee0a34cc684518d2623 WHIRLPOOL f6dea559c0d97b9a465c7d68601fe96603e51c0814e34e93f49c851aa06254389a30e84130549c8ffdcbb3fb360dc261825ef0c01dac5f7d1700571a00bcc2b8
|
||||||
|
@ -1,4 +1,2 @@
|
|||||||
DIST byobu_5.16.orig.tar.gz 344159 SHA256 9b4639b502c6d6e2ad0531690274381768395480d5bece3fae8993c7706535ca SHA512 a2d2ec5c267dd304467992d9df567f7ab7d8603fa87fe51466a960a65cb93e98a98e1d7f797f53cf08ea57ccfb1a15528d065bd232e81f718532a37f91384f0a WHIRLPOOL fb6838195c994d687509cb707d7fde1ed54a460dff6a143f96dfeb960ddbef6e8c84b1c3c3f5acee694257a74746737b152972a56370228d0945503660a93af8
|
|
||||||
DIST byobu_5.18.orig.tar.gz 307685 SHA256 cd71f2e994a03e6148a643145d1c3030e8416352144aa73dc452e3a6b559da14 SHA512 30a8af9248ba477c0a7ea331082bd570d799a9b1307e7004ea608ba93edb882509d325668f82a3e0f4eece7c9cc40a0bd9fc088bd844c845e2c3371fc1cbf7f5 WHIRLPOOL bbb80a5115b45f8671668124b6b3506436e8e576241964f05bb65ab8876079e43b2ee4ea9188c36dfe3fda0339a77ef507ef61b9fb8171c72b3d5b242daa3e84
|
|
||||||
DIST byobu_5.27.orig.tar.gz 329656 SHA256 8946f215b3078e83c653745cb8400b6cf2a6344e55b7adc32a374169facbad47 SHA512 5bb7dfc40711c89ad2a373611839274dd6296517b6b286834d00125b02fc5e870b9e6fe7ec08fce6f458f5f20167c4b2c02e18af078023a0adec57aecb20750d WHIRLPOOL 4e1e4e021c4c44819b86b2fd76c167008a714e59efa30114976ece6613d1cf1226ad87d2f8565572986f6a92df862b749af9e59fa4c59f9f88b00013b4698311
|
|
||||||
DIST byobu_5.29.orig.tar.gz 328310 SHA256 12e418f9dd979bb3be045170ee851ab780fd7f3bd15625c9deeb9e157f8322df SHA512 2b45fa5a8c680137b3aa210924bbc3c2b29b4c54003f154e3a72332146a69a41c21d5121843e090bfab0ebf73677e662fd678ee801ff3d89af447244f24477a1 WHIRLPOOL d23cb861c8fb26536c95bf24886689af91011f4baae88f510e248a00133d8f9fedaa37dc4995e1580b5e391337e6d646675fddc589d58153da0fb9d20e5dbffe
|
DIST byobu_5.29.orig.tar.gz 328310 SHA256 12e418f9dd979bb3be045170ee851ab780fd7f3bd15625c9deeb9e157f8322df SHA512 2b45fa5a8c680137b3aa210924bbc3c2b29b4c54003f154e3a72332146a69a41c21d5121843e090bfab0ebf73677e662fd678ee801ff3d89af447244f24477a1 WHIRLPOOL d23cb861c8fb26536c95bf24886689af91011f4baae88f510e248a00133d8f9fedaa37dc4995e1580b5e391337e6d646675fddc589d58153da0fb9d20e5dbffe
|
||||||
|
DIST byobu_5.33.orig.tar.gz 600437 SHA256 14beba36f99b96a804be2e2d8a065290266d943a0a075282ef88a1c36d64b9e5 SHA512 c508ed2edc3a8158fbd7989bade907f24a0a6e30efa92acd9d5789681bf090f4b975f9644a4cedaab6e2234847d1f94a237963cfb00ca571b1ee8d1726c55809 WHIRLPOOL c8068d893b7bc22247f30b31e7294c0264d03b2f65e41a3cff406040da4dc93159594a6838da98c498d40494f1f2123b231524df1f4e503c6ca258983027e558
|
||||||
|
@ -1,38 +0,0 @@
|
|||||||
# Copyright 1999-2012 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-5.16.ebuild,v 1.1 2012/03/13 06:46:20 radhermit Exp $
|
|
||||||
|
|
||||||
EAPI="4"
|
|
||||||
PYTHON_DEPEND="2"
|
|
||||||
|
|
||||||
inherit python
|
|
||||||
|
|
||||||
DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
|
|
||||||
HOMEPAGE="https://launchpad.net/byobu"
|
|
||||||
SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-3"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE="screen"
|
|
||||||
|
|
||||||
RDEPEND="screen? ( app-misc/screen )
|
|
||||||
!screen? ( app-misc/tmux )
|
|
||||||
dev-libs/newt"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
python_convert_shebangs -r 2 .
|
|
||||||
|
|
||||||
# Set default system backend to screen
|
|
||||||
if use screen ; then
|
|
||||||
sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake DESTDIR="${D}" install
|
|
||||||
|
|
||||||
# Create symlinks for backends
|
|
||||||
dosym ${PN} /usr/bin/${PN}-screen
|
|
||||||
dosym ${PN} /usr/bin/${PN}-tmux
|
|
||||||
}
|
|
@ -1,38 +0,0 @@
|
|||||||
# Copyright 1999-2012 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-5.18.ebuild,v 1.1 2012/05/31 14:33:30 radhermit Exp $
|
|
||||||
|
|
||||||
EAPI="4"
|
|
||||||
PYTHON_DEPEND="2"
|
|
||||||
|
|
||||||
inherit python
|
|
||||||
|
|
||||||
DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
|
|
||||||
HOMEPAGE="https://launchpad.net/byobu"
|
|
||||||
SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-3"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE="screen"
|
|
||||||
|
|
||||||
RDEPEND="screen? ( app-misc/screen )
|
|
||||||
!screen? ( app-misc/tmux )
|
|
||||||
dev-libs/newt"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
python_convert_shebangs -r 2 .
|
|
||||||
|
|
||||||
# Set default system backend to screen
|
|
||||||
if use screen ; then
|
|
||||||
sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake DESTDIR="${D}" install
|
|
||||||
|
|
||||||
# Create symlinks for backends
|
|
||||||
dosym ${PN} /usr/bin/${PN}-screen
|
|
||||||
dosym ${PN} /usr/bin/${PN}-tmux
|
|
||||||
}
|
|
@ -0,0 +1,65 @@
|
|||||||
|
[options]
|
||||||
|
|
||||||
|
# General options:
|
||||||
|
admin_passwd = admin
|
||||||
|
|
||||||
|
pidfile = /run/openerp/openerp-server.pid
|
||||||
|
interface =
|
||||||
|
port = 8069
|
||||||
|
netinterface =
|
||||||
|
netport = 8070
|
||||||
|
netrpc = True
|
||||||
|
xmlrpc = True
|
||||||
|
init =
|
||||||
|
without_demo = False
|
||||||
|
demo = {}
|
||||||
|
update =
|
||||||
|
cache_timeout = 100000
|
||||||
|
stop_after_init = False
|
||||||
|
debug_mode = False
|
||||||
|
assert_exit_level = warn
|
||||||
|
price_accuracy = 2
|
||||||
|
|
||||||
|
# SSL Configuration:
|
||||||
|
secure = False
|
||||||
|
secure_cert_file = server.cert
|
||||||
|
secure_pkey_file = server.pkey
|
||||||
|
|
||||||
|
# Logging Configuration:
|
||||||
|
logfile = /var/log/openerp/openerp-server.log
|
||||||
|
syslog = False
|
||||||
|
log_level = debug
|
||||||
|
|
||||||
|
# SMTP Configuration:
|
||||||
|
email_from = False
|
||||||
|
smtp = localhost
|
||||||
|
smtp_port = 25
|
||||||
|
smtp_ssl = False
|
||||||
|
smtp_user = False
|
||||||
|
smtp_password = False
|
||||||
|
|
||||||
|
# pg_path points at local pg instance - please change as needed
|
||||||
|
# Database related options:
|
||||||
|
db_user = openerp
|
||||||
|
db_password = change_this
|
||||||
|
pg_path = /run/postgresql/.s.PGSQL.5432
|
||||||
|
db_name = False
|
||||||
|
db_host = False
|
||||||
|
db_port = False
|
||||||
|
db_maxconn = 64
|
||||||
|
import_partial =
|
||||||
|
|
||||||
|
# Internationalisation options:
|
||||||
|
language =
|
||||||
|
translate_out =
|
||||||
|
translate_in =
|
||||||
|
translate_modules = ['all']
|
||||||
|
|
||||||
|
# Security-related options:
|
||||||
|
list_db = True
|
||||||
|
server_actions_allow_code = False
|
||||||
|
|
||||||
|
addons_path = /usr/openerp/addons
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1 +1,2 @@
|
|||||||
|
DIST yagf-0.9.2.tar.gz 258305 SHA256 1099760462c029aa9919ef96809a1b0252d8d735d9d0807ce790f9d3e1e271b8 SHA512 7348b1611654e9478ef915a5c56f729495382e083bf99ad85284a19499027ad380f7781466aa6c21796859623ca3526ce0965f690c784aa2d459a22d201ef98f WHIRLPOOL b91ef8688801951fe780bdb6e005abd3b97ac42ab7f8d0e9b13ab83a7a163caa445d95b6668328ed1336137ca4bfb5391078347f06fd97ca1a3721b7a90db384
|
||||||
DIST yagf-0.9.tar.gz 224788 SHA256 49767685cbcb9def268f86ed1a081446588081e0d1d1184be08e7b370e27860a SHA512 db1235dc479c902b9f72e1142f477537f421893975b2329a9c5e57af721c44a1e523c9c5a402b8849158cf68ddc94f7f2dc8c07050447bf6dc0b5dca564374eb WHIRLPOOL 7fbc435a97932405d05daf0b9ccaf2c54f3fd952d7453ac4392787e1fa50a4ec5dab00112d43879b217eef2a125ffa8ffa334b3361cc02f9049bf9de63845778
|
DIST yagf-0.9.tar.gz 224788 SHA256 49767685cbcb9def268f86ed1a081446588081e0d1d1184be08e7b370e27860a SHA512 db1235dc479c902b9f72e1142f477537f421893975b2329a9c5e57af721c44a1e523c9c5a402b8849158cf68ddc94f7f2dc8c07050447bf6dc0b5dca564374eb WHIRLPOOL 7fbc435a97932405d05daf0b9ccaf2c54f3fd952d7453ac4392787e1fa50a4ec5dab00112d43879b217eef2a125ffa8ffa334b3361cc02f9049bf9de63845778
|
||||||
|
@ -0,0 +1,44 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-text/yagf/yagf-0.9.2.ebuild,v 1.1 2013/02/20 12:45:15 pinkbyte Exp $
|
||||||
|
|
||||||
|
EAPI="5"
|
||||||
|
|
||||||
|
CMAKE_IN_SOURCE_BUILD=1
|
||||||
|
PLOCALES="de lt pl ru uk"
|
||||||
|
inherit cmake-utils l10n
|
||||||
|
|
||||||
|
DESCRIPTION="Graphical front-end for cuneiform and tesseract OCR tools"
|
||||||
|
HOMEPAGE="http://symmetrica.net/cuneiform-linux/yagf-en.html"
|
||||||
|
SRC_URI="http://symmetrica.net/cuneiform-linux/${P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="GPL-3"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE="scanner +cuneiform tesseract pdf"
|
||||||
|
|
||||||
|
REQUIRED_USE="|| ( cuneiform tesseract )"
|
||||||
|
|
||||||
|
DEPEND=">=x11-libs/qt-gui-4.7:4
|
||||||
|
app-text/aspell"
|
||||||
|
RDEPEND="${DEPEND}
|
||||||
|
cuneiform? ( app-text/cuneiform )
|
||||||
|
tesseract? ( app-text/tesseract )
|
||||||
|
scanner? ( media-gfx/xsane )
|
||||||
|
pdf? ( || ( app-text/poppler[utils] app-text/ghostscript-gpl ) )"
|
||||||
|
|
||||||
|
DOCS=( AUTHORS ChangeLog DESCRIPTION README )
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
l10n_find_plocales_changes "src/translations" "${PN}_" '.ts'
|
||||||
|
|
||||||
|
epatch_user
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
remove_translation() {
|
||||||
|
rm "${ED}/usr/share/yagf/translations/${PN}_${1}.qm" || die "remove '${PN}_${1}.qm' file failed"
|
||||||
|
}
|
||||||
|
cmake-utils_src_install
|
||||||
|
l10n_for_each_disabled_locale_do remove_translation
|
||||||
|
}
|
@ -1,2 +1,3 @@
|
|||||||
DIST undotree-4.1.tar.gz 11136 SHA256 037b9ddc313d9e3b7363e4cd0915ca6ca342b821fee2523ed0aa8b0fb5a82ec7 SHA512 192e7293f8816a90464856c09cd6289c2d28aa69d4665f837a02e4344d27eb44a3944e23f9d3b93215d353db326ce8a0d09f3b07cb373d4325ce37eaaaf89777 WHIRLPOOL 56992339a6d8a7173e828d5ed252bbd7bc284212696574f7c2d11b43e62cbe83d5c6c64e8a08bfad654e41fa470c5ec8c952d473d034d1966b5949260bddac20
|
DIST undotree-4.1.tar.gz 11136 SHA256 037b9ddc313d9e3b7363e4cd0915ca6ca342b821fee2523ed0aa8b0fb5a82ec7 SHA512 192e7293f8816a90464856c09cd6289c2d28aa69d4665f837a02e4344d27eb44a3944e23f9d3b93215d353db326ce8a0d09f3b07cb373d4325ce37eaaaf89777 WHIRLPOOL 56992339a6d8a7173e828d5ed252bbd7bc284212696574f7c2d11b43e62cbe83d5c6c64e8a08bfad654e41fa470c5ec8c952d473d034d1966b5949260bddac20
|
||||||
DIST undotree-4.2.tar.gz 11166 SHA256 89228c31478d3bfec04f01e7848a2685defc7bdb42c9069c9d7b1f114a7575a9 SHA512 3e8b9f98e4ffaa1dec278b3bf05a595aa58f780ef4a9caaede3abcc8faff1cbd379ef811a4d26f75b2be0d31357a9167b9b904bb4ec75ac17673a3c774ebae5e WHIRLPOOL 49822a2d7d47b9f30810298c992f0de21fd0606da51bf841225640a877fd576a2f16904ed7ed53801f1b027293c595375c3a84ac5c18231925ce674c6c3108a3
|
DIST undotree-4.2.tar.gz 11166 SHA256 89228c31478d3bfec04f01e7848a2685defc7bdb42c9069c9d7b1f114a7575a9 SHA512 3e8b9f98e4ffaa1dec278b3bf05a595aa58f780ef4a9caaede3abcc8faff1cbd379ef811a4d26f75b2be0d31357a9167b9b904bb4ec75ac17673a3c774ebae5e WHIRLPOOL 49822a2d7d47b9f30810298c992f0de21fd0606da51bf841225640a877fd576a2f16904ed7ed53801f1b027293c595375c3a84ac5c18231925ce674c6c3108a3
|
||||||
|
DIST undotree-4.3.tar.gz 11556 SHA256 45a700e8d6c0924144ded612af7ac66a63b6f1927b4b0044557c3bc7a5cac46a SHA512 8143be996230d15ff538e007ebe7d8d7f71f8115f450bffabd47706ae6052316b251b3cfc1187039ecc351c9d5765763c9150fb14944944c65768ccc434f244d WHIRLPOOL 4000274dbdb6a2c9a92ca08a88377df8c2d94f20daffc0d82c87b5e3f47bd2a10846222b7c154a2628e0a19797493d5e88492c417b9d966961e17c5af8bfbc00
|
||||||
|
@ -0,0 +1,13 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-vim/undotree/undotree-4.3.ebuild,v 1.1 2013/02/21 07:39:35 radhermit Exp $
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
inherit vim-plugin vcs-snapshot
|
||||||
|
|
||||||
|
DESCRIPTION="vim plugin: display your undo history in a graph"
|
||||||
|
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree"
|
||||||
|
SRC_URI="https://github.com/mbbill/${PN}/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
|
||||||
|
LICENSE="BSD"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
@ -1,2 +1,3 @@
|
|||||||
DIST vim-r-0.9.7.tar.bz2 116621 SHA256 6ef80b5c8308c65cdbf1df08d81b440cef4649ed205e48601c12cd9999960f01 SHA512 44f382e009ab02c892803fc05021c04b21eabe85b9228d9cac3972bc1c84ef513733937fe81dce2524f4d612d8098685201f14d4de6935ea5fecb316b4d3c9a1 WHIRLPOOL f196d7bc8454e56dca476ca279bd2b181871190fb78f0a98e1abb2ee196ddc733faf102f21dd58f5525c0e6ce9b0efc71747af735bad5c9299612a4f44103298
|
DIST vim-r-0.9.7.tar.bz2 116621 SHA256 6ef80b5c8308c65cdbf1df08d81b440cef4649ed205e48601c12cd9999960f01 SHA512 44f382e009ab02c892803fc05021c04b21eabe85b9228d9cac3972bc1c84ef513733937fe81dce2524f4d612d8098685201f14d4de6935ea5fecb316b4d3c9a1 WHIRLPOOL f196d7bc8454e56dca476ca279bd2b181871190fb78f0a98e1abb2ee196ddc733faf102f21dd58f5525c0e6ce9b0efc71747af735bad5c9299612a4f44103298
|
||||||
DIST vim-r-0.9.9.1.tar.bz2 125040 SHA256 510e971de66fac30ad6cb92094cc4b413547de74efdaa9b98b915e1a3b14abe7 SHA512 262135b8db7523347c0299caf2794a2ebb2f26faa160afdb80e78f7bde30d7f45241c7e25465e2e67ac50ab93f32b820b53cf8577b87927a44608bac4f1c64ba WHIRLPOOL 6b7d8f6d40a907603d1a8bebb7f36a095e3aa274c125a349ae29a74d19e637970ea61060f5e06b1a915b95c865a1043c96c9f2b9a01c4e057f2364685406b2f2
|
DIST vim-r-0.9.9.1.tar.bz2 125040 SHA256 510e971de66fac30ad6cb92094cc4b413547de74efdaa9b98b915e1a3b14abe7 SHA512 262135b8db7523347c0299caf2794a2ebb2f26faa160afdb80e78f7bde30d7f45241c7e25465e2e67ac50ab93f32b820b53cf8577b87927a44608bac4f1c64ba WHIRLPOOL 6b7d8f6d40a907603d1a8bebb7f36a095e3aa274c125a349ae29a74d19e637970ea61060f5e06b1a915b95c865a1043c96c9f2b9a01c4e057f2364685406b2f2
|
||||||
|
DIST vim-r-0.9.9.2.tar.bz2 125721 SHA256 4e6f73f9c2c9032e5e0480b0ffc52e8967bf24188545599ad5eda6021a449340 SHA512 c6e4ad970e0f80c35883cb059a7649b182c3c89587725a992b0e5190b113b7bbe4a130ff6d99c6f5d480f21e9dfcd241d87b57e59a2fe6e02ac7ee7a630f38f4 WHIRLPOOL 257445cba31341523c3c245f92e36705783539015c61caeb3bb38b228fd2ecc2586dc0e2dcd5050b66ab414dc55ea1d46a70a8bad158f8a7754ea09ff5065499
|
||||||
|
@ -0,0 +1,17 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-vim/vim-r/vim-r-0.9.9.2.ebuild,v 1.1 2013/02/21 07:42:47 radhermit Exp $
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
inherit vim-plugin
|
||||||
|
|
||||||
|
DESCRIPTION="vim plugin: integrate vim with R"
|
||||||
|
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2628"
|
||||||
|
LICENSE="public-domain"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
|
||||||
|
RDEPEND="dev-lang/R
|
||||||
|
|| ( app-vim/conque app-vim/screen )"
|
||||||
|
|
||||||
|
VIM_PLUGIN_HELPFILES="r-plugin.txt"
|
@ -1,2 +1,2 @@
|
|||||||
DIST simgear-2.4.0.tar.bz2 834501 SHA256 e26007ed015e75a61e140e3ab6a446d8163ea3cfd2baeaa763355db0be4dddf6 SHA512 edd764d7304a595361db1bdfd68e7e3314f8e9d7198f71792ca7976d953d13123d5e92dec8b3295134bf56b01cfb198b1f867a6f93cb56b947db72597e841414 WHIRLPOOL b0c65c2e1412b7182f9fe33cf3bcfb58e93524efa80064792ae302df9a95412b1b6aa0a4c19db72e98dc431307954a1168ed865d44adbcc44db324788892df94
|
DIST simgear-2.10.0.tar.bz2 879537 SHA256 582c0d547a58f7dbe841a0ba9eba5a894aae2b65f14ef06361e196b12022615d SHA512 4f994f699b8e06c432e51fcd9b7e15b8d143f6e244b14a6271fab02efd70199fd396aab42ed5fcf05c2c7c8d29bdd0f61f15486a48ea09a13b4924941eb20b56 WHIRLPOOL 4f7e41ca7fc5fd5a0c4428c156defaae495c93c319b14df555ae7e24dd33f6160ed652569155c099d31f0f58b53b02b3437d6522c610e8f88ba4f0ce487c5d17
|
||||||
DIST simgear-2.8.0.tar.bz2 766340 SHA256 24758b0d59ba6d03659398c19145d92c2179174040f42739fc2f9c03c0bf90f7 SHA512 ead06fd394b10a7ae3c98422cc469b3c97450162f6994c40c7cb4818f88e0d25cf0b5dc9c39a10e2b9c0fd849dd322451df93e4febcbacf2fc23fe1860917064 WHIRLPOOL 77b0f59478c4c89a3ea02c48a97312b91df8ab9410cdc75bdbd516c2497f2e9941caf689c3115b2ccfb3419ef2cbdad7b2025d59fd1318b112b8a09bf6d5cd34
|
DIST simgear-2.8.0.tar.bz2 766340 SHA256 24758b0d59ba6d03659398c19145d92c2179174040f42739fc2f9c03c0bf90f7 SHA512 ead06fd394b10a7ae3c98422cc469b3c97450162f6994c40c7cb4818f88e0d25cf0b5dc9c39a10e2b9c0fd849dd322451df93e4febcbacf2fc23fe1860917064 WHIRLPOOL 77b0f59478c4c89a3ea02c48a97312b91df8ab9410cdc75bdbd516c2497f2e9941caf689c3115b2ccfb3419ef2cbdad7b2025d59fd1318b112b8a09bf6d5cd34
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
--- simgear-2.4.0/simgear/structure/Singleton.hxx
|
|
||||||
+++ simgear-2.4.0/simgear/structure/Singleton.hxx
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
#ifndef SIMGEAR_SINGLETON_HXX
|
|
||||||
#define SIMGEAR_SINGLETON_HXX 1
|
|
||||||
|
|
||||||
-#include <boost/pool/detail/singleton.hpp>
|
|
||||||
+#include "boost/thread/detail/singleton.hpp"
|
|
||||||
|
|
||||||
#include <osg/Referenced>
|
|
||||||
#include <osg/ref_ptr>
|
|
||||||
@@ -22,7 +22,7 @@
|
|
||||||
static Class* instance()
|
|
||||||
{
|
|
||||||
Class& singleton
|
|
||||||
- = boost::details::pool::singleton_default<Class>::instance();
|
|
||||||
+ = boost::detail::thread::singleton<Class>::instance();
|
|
||||||
return &singleton;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -38,7 +38,7 @@
|
|
||||||
static RefClass* instance()
|
|
||||||
{
|
|
||||||
SingletonRefPtr& singleton
|
|
||||||
- = boost::details::pool::singleton_default<SingletonRefPtr>::instance();
|
|
||||||
+ = boost::detail::thread::singleton<SingletonRefPtr>::instance();
|
|
||||||
return singleton.ptr.get();
|
|
||||||
}
|
|
||||||
private:
|
|
@ -0,0 +1,49 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-2.10.0.ebuild,v 1.1 2013/02/20 21:21:42 reavertm Exp $
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
inherit eutils cmake-utils
|
||||||
|
|
||||||
|
DESCRIPTION="Development library for simulation games"
|
||||||
|
HOMEPAGE="http://www.simgear.org/"
|
||||||
|
SRC_URI="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${P}.tar.bz2"
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
KEYWORDS="~amd64 ~ppc ~x86"
|
||||||
|
SLOT="0"
|
||||||
|
IUSE="debug jpeg subversion test"
|
||||||
|
|
||||||
|
COMMON_DEPEND="
|
||||||
|
dev-libs/expat
|
||||||
|
>=dev-games/openscenegraph-3.0.1
|
||||||
|
media-libs/openal
|
||||||
|
sys-libs/zlib
|
||||||
|
virtual/opengl
|
||||||
|
jpeg? ( virtual/jpeg )
|
||||||
|
subversion? (
|
||||||
|
dev-libs/apr
|
||||||
|
dev-vcs/subversion
|
||||||
|
)
|
||||||
|
"
|
||||||
|
DEPEND="${COMMON_DEPEND}
|
||||||
|
>=dev-libs/boost-1.44
|
||||||
|
"
|
||||||
|
RDEPEND="${COMMON_DEPEND}"
|
||||||
|
|
||||||
|
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
local mycmakeargs=(
|
||||||
|
-DENABLE_RTI=OFF
|
||||||
|
-DENABLE_SOUND=ON
|
||||||
|
-DSIMGEAR_HEADLESS=OFF
|
||||||
|
-DSIMGEAR_SHARED=ON
|
||||||
|
-DSYSTEM_EXPAT=ON
|
||||||
|
$(cmake-utils_use jpeg JPEG_FACTORY)
|
||||||
|
$(cmake-utils_use_enable subversion LIBSVN)
|
||||||
|
$(cmake-utils_use_enable test TESTS)
|
||||||
|
)
|
||||||
|
cmake-utils_src_configure
|
||||||
|
}
|
@ -1,41 +0,0 @@
|
|||||||
# Copyright 1999-2012 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-2.4.0.ebuild,v 1.5 2012/07/10 04:52:20 xmw Exp $
|
|
||||||
|
|
||||||
EAPI=4
|
|
||||||
|
|
||||||
inherit autotools-utils eutils
|
|
||||||
|
|
||||||
DESCRIPTION="Development library for simulation games"
|
|
||||||
HOMEPAGE="http://www.simgear.org/"
|
|
||||||
SRC_URI="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${P}.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 ppc x86"
|
|
||||||
IUSE="debug"
|
|
||||||
|
|
||||||
RESTRICT="test"
|
|
||||||
|
|
||||||
RDEPEND=">=dev-games/openscenegraph-3.0.1
|
|
||||||
>=dev-libs/boost-1.37
|
|
||||||
dev-vcs/subversion
|
|
||||||
media-libs/freealut
|
|
||||||
media-libs/openal
|
|
||||||
>=media-libs/plib-1.8.5"
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
|
|
||||||
DOCS=(AUTHORS NEWS TODO)
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${FILESDIR}"/${P}-boost148.patch
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
myeconfargs=(
|
|
||||||
--with-jpeg-factory
|
|
||||||
$(use_with debug logging)
|
|
||||||
)
|
|
||||||
|
|
||||||
autotools-utils_src_configure
|
|
||||||
}
|
|
@ -0,0 +1,317 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.3.ebuild,v 1.1 2013/02/20 09:07:52 sera Exp $
|
||||||
|
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
|
||||||
|
|
||||||
|
# *********************************************************
|
||||||
|
# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
|
||||||
|
# *********************************************************
|
||||||
|
|
||||||
|
EAPI="4"
|
||||||
|
|
||||||
|
inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
|
||||||
|
|
||||||
|
ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
|
||||||
|
OPENJDK_BUILD="27"
|
||||||
|
OPENJDK_DATE="26_oct_2012"
|
||||||
|
OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
|
||||||
|
JAXP_TARBALL="jaxp144_04.zip"
|
||||||
|
JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip"
|
||||||
|
JAF_TARBALL="jdk6-jaf-b20.zip"
|
||||||
|
# Download cacao and jamvm regardless for use with EXTRA_ECONF
|
||||||
|
CACAO_TARBALL="68fe50ac34ec.tar.gz"
|
||||||
|
JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz"
|
||||||
|
|
||||||
|
DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
|
||||||
|
HOMEPAGE="http://icedtea.classpath.org"
|
||||||
|
SRC_URI="
|
||||||
|
http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
|
||||||
|
http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
|
||||||
|
http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
|
||||||
|
http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
|
||||||
|
http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
|
||||||
|
http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
|
||||||
|
http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}"
|
||||||
|
|
||||||
|
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
|
||||||
|
SLOT="6"
|
||||||
|
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
|
||||||
|
|
||||||
|
IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap +nsplugin
|
||||||
|
+nss pax_kernel pulseaudio +source systemtap test +webstart"
|
||||||
|
|
||||||
|
# Ideally the following were optional at build time.
|
||||||
|
ALSA_COMMON_DEP="
|
||||||
|
>=media-libs/alsa-lib-1.0"
|
||||||
|
CUPS_COMMON_DEP="
|
||||||
|
>=net-print/cups-1.2.12"
|
||||||
|
X_COMMON_DEP="
|
||||||
|
dev-libs/glib
|
||||||
|
>=media-libs/freetype-2.3.5
|
||||||
|
>=x11-libs/gtk+-2.8:2
|
||||||
|
>=x11-libs/libX11-1.1.3
|
||||||
|
>=x11-libs/libXext-1.1.1
|
||||||
|
>=x11-libs/libXi-1.1.3
|
||||||
|
>=x11-libs/libXrender-0.9.4
|
||||||
|
>=x11-libs/libXtst-1.0.3"
|
||||||
|
X_DEPEND="
|
||||||
|
>=x11-libs/libXau-1.0.3
|
||||||
|
>=x11-libs/libXdmcp-1.0.2
|
||||||
|
>=x11-libs/libXinerama-1.0.2
|
||||||
|
>=x11-libs/libXp-1.0.0
|
||||||
|
x11-proto/inputproto
|
||||||
|
>=x11-proto/xextproto-7.1.1
|
||||||
|
x11-proto/xineramaproto
|
||||||
|
x11-proto/xproto"
|
||||||
|
|
||||||
|
COMMON_DEP="
|
||||||
|
>=media-libs/giflib-4.1.6
|
||||||
|
>=media-libs/libpng-1.2
|
||||||
|
>=sys-libs/zlib-1.2.3
|
||||||
|
virtual/jpeg
|
||||||
|
javascript? ( dev-java/rhino:1.6 )
|
||||||
|
nss? ( >=dev-libs/nss-3.12.5-r1 )
|
||||||
|
pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
|
||||||
|
systemtap? ( >=dev-util/systemtap-1 )"
|
||||||
|
|
||||||
|
# media-fonts/lklug needs ppc ppc64 keywords
|
||||||
|
RDEPEND="${COMMON_DEP}
|
||||||
|
!dev-java/icedtea6
|
||||||
|
X? (
|
||||||
|
${X_COMMON_DEP}
|
||||||
|
media-fonts/dejavu
|
||||||
|
cjk? (
|
||||||
|
media-fonts/arphicfonts
|
||||||
|
media-fonts/baekmuk-fonts
|
||||||
|
!ppc? ( !ppc64? ( media-fonts/lklug ) )
|
||||||
|
media-fonts/lohit-fonts
|
||||||
|
media-fonts/sazanami
|
||||||
|
)
|
||||||
|
)
|
||||||
|
alsa? ( ${ALSA_COMMON_DEP} )
|
||||||
|
cups? ( ${CUPS_COMMON_DEP} )"
|
||||||
|
|
||||||
|
# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
|
||||||
|
# ca-certificates, perl and openssl are used for the cacerts keystore generation
|
||||||
|
# xext headers have two variants depending on version - bug #288855
|
||||||
|
# !eclipse-ecj-3.7 - bug #392587
|
||||||
|
# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
|
||||||
|
DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
|
||||||
|
|| (
|
||||||
|
>=dev-java/gcj-jdk-4.3
|
||||||
|
dev-java/icedtea-bin:6
|
||||||
|
dev-java/icedtea:6
|
||||||
|
)
|
||||||
|
app-arch/cpio
|
||||||
|
app-arch/unzip
|
||||||
|
app-arch/zip
|
||||||
|
app-misc/ca-certificates
|
||||||
|
>=dev-java/ant-core-1.8.1
|
||||||
|
dev-java/ant-nodeps
|
||||||
|
dev-lang/perl
|
||||||
|
>=dev-libs/libxslt-1.1.26
|
||||||
|
dev-libs/openssl
|
||||||
|
virtual/pkgconfig
|
||||||
|
sys-apps/lsb-release
|
||||||
|
${X_DEPEND}
|
||||||
|
pax_kernel? ( sys-apps/paxctl )"
|
||||||
|
|
||||||
|
PDEPEND="webstart? ( dev-java/icedtea-web:6 )
|
||||||
|
nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
|
||||||
|
|
||||||
|
S="${WORKDIR}"/${ICEDTEA_PKG}
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
JAVA_PKG_WANT_BUILD_VM="
|
||||||
|
icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
|
||||||
|
gcj-jdk"
|
||||||
|
JAVA_PKG_WANT_SOURCE="1.5"
|
||||||
|
JAVA_PKG_WANT_TARGET="1.5"
|
||||||
|
|
||||||
|
java-vm-2_pkg_setup
|
||||||
|
java-pkg-2_pkg_setup
|
||||||
|
}
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
unpack ${ICEDTEA_PKG}.tar.gz
|
||||||
|
}
|
||||||
|
|
||||||
|
java_prepare() {
|
||||||
|
# icedtea doesn't like some locales. #330433 #389717
|
||||||
|
export LANG="C" LC_ALL="C"
|
||||||
|
}
|
||||||
|
|
||||||
|
bootstrap_impossible() {
|
||||||
|
# Fill this according to testing what works and what not
|
||||||
|
has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
local config bootstrap enable_cacao
|
||||||
|
local vm=$(java-pkg_get-current-vm)
|
||||||
|
|
||||||
|
# IcedTea6 can't be built using IcedTea7; its class files are too new
|
||||||
|
# Whether to bootstrap
|
||||||
|
bootstrap="disable"
|
||||||
|
if use jbootstrap; then
|
||||||
|
if bootstrap_impossible "${vm}"; then
|
||||||
|
einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
|
||||||
|
else
|
||||||
|
bootstrap="enable"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if has "${vm}" gcj-jdk; then
|
||||||
|
# gcj-jdk ensures ecj is present.
|
||||||
|
use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
|
||||||
|
bootstrap="enable"
|
||||||
|
fi
|
||||||
|
|
||||||
|
config="${config} --${bootstrap}-bootstrap"
|
||||||
|
|
||||||
|
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
|
||||||
|
# Otherwise use CACAO
|
||||||
|
if ! has "${ARCH}" amd64 sparc x86; then
|
||||||
|
enable_cacao=yes
|
||||||
|
elif use cacao; then
|
||||||
|
ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
|
||||||
|
ewarn 'If so, please rebuild with USE="-cacao"'
|
||||||
|
enable_cacao=yes
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ${enable_cacao} ]]; then
|
||||||
|
config="${config} --enable-cacao"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# OpenJDK-specific parallelism support. Bug #389791, #337827
|
||||||
|
# Implementation modified from waf-utils.eclass
|
||||||
|
# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
|
||||||
|
local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
|
||||||
|
config="${config} --with-parallel-jobs=${procs}";
|
||||||
|
einfo "Configuring using --with-parallel-jobs=${procs}"
|
||||||
|
|
||||||
|
if use javascript ; then
|
||||||
|
config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
|
||||||
|
else
|
||||||
|
config="${config} --without-rhino"
|
||||||
|
fi
|
||||||
|
|
||||||
|
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
|
||||||
|
|
||||||
|
econf ${config} \
|
||||||
|
--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
|
||||||
|
--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
|
||||||
|
--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
|
||||||
|
--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
|
||||||
|
--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
|
||||||
|
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
|
||||||
|
--with-jdk-home="$(java-config -O)" \
|
||||||
|
--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
|
||||||
|
--disable-downloading \
|
||||||
|
$(use_enable !debug optimizations) \
|
||||||
|
$(use_enable doc docs) \
|
||||||
|
$(use_enable nss) \
|
||||||
|
$(use_enable pulseaudio pulse-java) \
|
||||||
|
$(use_enable systemtap) \
|
||||||
|
$(use_with pax_kernel pax paxctl)
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
# Would use GENTOO_VM otherwise.
|
||||||
|
export ANT_RESPECT_JAVA_HOME=TRUE
|
||||||
|
|
||||||
|
# Load the least that's needed to avoid possible classpath collisions.
|
||||||
|
export ANT_TASKS="ant-nodeps"
|
||||||
|
|
||||||
|
emake
|
||||||
|
}
|
||||||
|
|
||||||
|
src_test() {
|
||||||
|
# Use Xvfb for tests
|
||||||
|
unset DISPLAY
|
||||||
|
|
||||||
|
Xemake check
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
local dest="/usr/$(get_libdir)/icedtea${SLOT}"
|
||||||
|
local ddest="${ED}/${dest}"
|
||||||
|
dodir "${dest}"
|
||||||
|
|
||||||
|
dodoc README NEWS AUTHORS THANKYOU
|
||||||
|
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
|
||||||
|
|
||||||
|
cd openjdk.build/j2sdk-image || die
|
||||||
|
|
||||||
|
# Ensures HeadlessGraphicsEnvironment is used.
|
||||||
|
if ! use X; then
|
||||||
|
rm -r jre/lib/$(get_system_arch)/xawt || die
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Don't hide classes
|
||||||
|
rm lib/ct.sym || die
|
||||||
|
|
||||||
|
#402507
|
||||||
|
mkdir jre/.systemPrefs || die
|
||||||
|
touch jre/.systemPrefs/.system.lock || die
|
||||||
|
touch jre/.systemPrefs/.systemRootModFile || die
|
||||||
|
|
||||||
|
# doins can't handle symlinks.
|
||||||
|
cp -vRP bin include jre lib man "${ddest}" || die
|
||||||
|
|
||||||
|
dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
|
||||||
|
|
||||||
|
if use doc; then
|
||||||
|
# java-pkg_dohtml needed for package-list #302654
|
||||||
|
java-pkg_dohtml -r ../docs/* || die
|
||||||
|
fi
|
||||||
|
|
||||||
|
if use examples; then
|
||||||
|
dodir "${dest}/share";
|
||||||
|
cp -vRP demo sample "${ddest}/share/" || die
|
||||||
|
fi
|
||||||
|
|
||||||
|
if use source; then
|
||||||
|
cp src.zip "${ddest}" || die
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Fix the permissions.
|
||||||
|
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
|
||||||
|
|
||||||
|
# Needs to be done before generating cacerts
|
||||||
|
java-vm_set-pax-markings "${ddest}"
|
||||||
|
|
||||||
|
# We need to generate keystore - bug #273306
|
||||||
|
einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
|
||||||
|
mkdir "${T}/certgen" && cd "${T}/certgen" || die
|
||||||
|
cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
|
||||||
|
for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
|
||||||
|
openssl x509 -text -in "${c}" >> all.crt || die
|
||||||
|
done
|
||||||
|
./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
|
||||||
|
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
|
||||||
|
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
|
||||||
|
|
||||||
|
# Bug 390663
|
||||||
|
cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
|
||||||
|
eprefixify "${T}"/fontconfig.Gentoo.properties
|
||||||
|
insinto "${dest}"/jre/lib
|
||||||
|
doins "${T}"/fontconfig.Gentoo.properties
|
||||||
|
|
||||||
|
set_java_env "${FILESDIR}/icedtea.env"
|
||||||
|
if ! use X || ! use alsa || ! use cups; then
|
||||||
|
java-vm_revdep-mask "${dest}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_preinst() {
|
||||||
|
if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
|
||||||
|
# portage would preserve the symlink otherwise, related to bug #384397
|
||||||
|
rm -f "${EROOT}/usr/lib/jvm/icedtea6"
|
||||||
|
elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
|
||||||
|
elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
|
||||||
|
elog "If you had icedtea6 as system VM, the change should be automatic, however"
|
||||||
|
elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
|
||||||
|
elog "and the same holds for any user VM settings. Sorry for the inconvenience."
|
||||||
|
fi
|
||||||
|
}
|
@ -1,238 +0,0 @@
|
|||||||
# Copyright 1999-2012 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.9.ebuild,v 1.2 2012/10/23 05:06:57 nativemad Exp $
|
|
||||||
|
|
||||||
EAPI="4"
|
|
||||||
|
|
||||||
inherit java-vm-2 eutils prefix versionator
|
|
||||||
|
|
||||||
# This URIs need to be updated when bumping!
|
|
||||||
JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7u9-downloads-1859576.html"
|
|
||||||
# api and fx docs for 7u6
|
|
||||||
#DOCS_URI=http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html
|
|
||||||
JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
|
|
||||||
|
|
||||||
# This is a list of archs supported by this update
|
|
||||||
# arm currently missing
|
|
||||||
JDK_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris )
|
|
||||||
DEMOS_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris )
|
|
||||||
|
|
||||||
FX_VERSION="2_2_3"
|
|
||||||
UPDATE="$(get_version_component_range 4)"
|
|
||||||
MY_PV="$(get_version_component_range 2)u${UPDATE}"
|
|
||||||
S="${WORKDIR}/jdk$(get_version_component_range 1-3)_0${UPDATE}"
|
|
||||||
# for when oracle messes with us again.
|
|
||||||
DEMOS_PV="${MY_PV}"
|
|
||||||
DEMOS_S="${S}"
|
|
||||||
|
|
||||||
at_x86="jdk-${MY_PV}-linux-i586.tar.gz"
|
|
||||||
at_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
|
|
||||||
at_arm="jdk-${MY_PV}-linux-arm-sfp.tar.gz"
|
|
||||||
at_x86_solaris="jdk-${MY_PV}-solaris-i586.tar.gz"
|
|
||||||
at_x64_solaris="${at_x86_solaris} jdk-${MY_PV}-solaris-x64.tar.gz"
|
|
||||||
at_sparc_solaris="jdk-${MY_PV}-solaris-sparc.tar.gz"
|
|
||||||
at_sparc64_solaris="${at_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
|
|
||||||
|
|
||||||
fx_demos_linux="javafx_samples-${FX_VERSION}-linux.zip"
|
|
||||||
demos_x86="${fx_demos_linux} jdk-${DEMOS_PV}-linux-i586-demos.tar.gz"
|
|
||||||
demos_amd64="${fx_demos_linux} jdk-${DEMOS_PV}-linux-x64-demos.tar.gz"
|
|
||||||
demos_arm="${fx_demos_linux} jdk-${DEMOS_PV}-linux-arm-sfp-demos.tar.gz"
|
|
||||||
demos_x86_solaris="jdk-${DEMOS_PV}-solaris-i586-demos.tar.gz"
|
|
||||||
demos_x64_solaris="${demos_x86_solaris} jdk-${DEMOS_PV}-solaris-x64-demos.tar.gz"
|
|
||||||
demos_sparc_solaris="jdk-${DEMOS_PV}-solaris-sparc-demos.tar.gz"
|
|
||||||
demos_sparc64_solaris="${demos_sparc_solaris} jdk-${DEMOS_PV}-solaris-sparcv9-demos.tar.gz"
|
|
||||||
|
|
||||||
# docs #67266
|
|
||||||
#JDK_API_DOCS="jdk-${MY_PV}-apidocs.zip"
|
|
||||||
#FX_API_DOCS="javafx-${FX_VERSION}-apidocs.zip"
|
|
||||||
|
|
||||||
JCE_DIR="UnlimitedJCEPolicy"
|
|
||||||
JCE_FILE="${JCE_DIR}JDK7.zip"
|
|
||||||
|
|
||||||
DESCRIPTION="Oracle's Java SE Development Kit"
|
|
||||||
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
|
|
||||||
for d in "${JDK_AVAILABLE[@]}"; do
|
|
||||||
SRC_URI+=" ${d}? ("
|
|
||||||
SRC_URI+=" $(eval "echo \${$(echo at_${d/-/_})}")"
|
|
||||||
if has ${d} "${DEMOS_AVAILABLE[@]}"; then
|
|
||||||
SRC_URI+=" examples? ( $(eval "echo \${$(echo demos_${d/-/_})}") )"
|
|
||||||
fi
|
|
||||||
SRC_URI+=" )"
|
|
||||||
done
|
|
||||||
unset d
|
|
||||||
SRC_URI+=" jce? ( ${JCE_FILE} )"
|
|
||||||
|
|
||||||
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" # doc? ( Oracle-DLA-JavaSE )
|
|
||||||
SLOT="1.7"
|
|
||||||
KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
|
||||||
IUSE="+X alsa derby doc examples +fontconfig jce nsplugin pax_kernel +source"
|
|
||||||
|
|
||||||
RESTRICT="fetch strip"
|
|
||||||
QA_PREBUILT="*"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
X? (
|
|
||||||
x11-libs/libXext
|
|
||||||
x11-libs/libXi
|
|
||||||
x11-libs/libXrender
|
|
||||||
x11-libs/libXtst
|
|
||||||
x11-libs/libX11
|
|
||||||
)
|
|
||||||
alsa? ( media-libs/alsa-lib )
|
|
||||||
doc? ( dev-java/java-sdk-docs:1.7 )
|
|
||||||
fontconfig? ( media-libs/fontconfig )
|
|
||||||
!prefix? ( sys-libs/glibc )"
|
|
||||||
# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
|
|
||||||
# marking. #427642
|
|
||||||
DEPEND="
|
|
||||||
jce? ( app-arch/unzip )
|
|
||||||
examples? ( kernel_linux? ( app-arch/unzip ) )
|
|
||||||
pax_kernel? ( sys-apps/paxctl )"
|
|
||||||
|
|
||||||
check_tarballs_available() {
|
|
||||||
local uri=$1; shift
|
|
||||||
local dl= unavailable=
|
|
||||||
for dl in "${@}"; do
|
|
||||||
[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
|
|
||||||
done
|
|
||||||
|
|
||||||
if [[ -n "${unavailable}" ]]; then
|
|
||||||
if [[ -z ${_check_tarballs_available_once} ]]; then
|
|
||||||
einfo
|
|
||||||
einfo "Oracle requires you to download the needed files manually after"
|
|
||||||
einfo "accepting their license through a javascript capable web browser."
|
|
||||||
einfo
|
|
||||||
_check_tarballs_available_once=done
|
|
||||||
fi
|
|
||||||
einfo "Downlod the following files:"
|
|
||||||
for dl in ${unavailable}; do
|
|
||||||
einfo " ${dl}"
|
|
||||||
done
|
|
||||||
einfo "at '${uri}'"
|
|
||||||
einfo "and move them to '${DISTDIR}'"
|
|
||||||
einfo
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_nofetch() {
|
|
||||||
local distfiles=( $(eval "echo \${$(echo at_${ARCH/-/_})}") )
|
|
||||||
if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
|
|
||||||
distfiles+=( $(eval "echo \${$(echo demos_${ARCH/-/_})}") )
|
|
||||||
fi
|
|
||||||
check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
|
|
||||||
|
|
||||||
use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
if use jce; then
|
|
||||||
mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
# This needs to be done before CDS - #215225
|
|
||||||
java-vm_set-pax-markings "${S}"
|
|
||||||
|
|
||||||
# see bug #207282
|
|
||||||
einfo "Creating the Class Data Sharing archives"
|
|
||||||
if use x86; then
|
|
||||||
bin/java -client -Xshare:dump || die
|
|
||||||
fi
|
|
||||||
bin/java -server -Xshare:dump || die
|
|
||||||
|
|
||||||
# Create files used as storage for system preferences.
|
|
||||||
mkdir jre/.systemPrefs || die
|
|
||||||
touch jre/.systemPrefs/.system.lock || die
|
|
||||||
touch jre/.systemPrefs/.systemRootModFile || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
local dest="/opt/${P}"
|
|
||||||
local ddest="${ED}${dest}"
|
|
||||||
|
|
||||||
dodoc COPYRIGHT
|
|
||||||
dohtml README.html
|
|
||||||
|
|
||||||
# We should not need the ancient plugin for Firefox 2 anymore, plus it has
|
|
||||||
# writable executable segments
|
|
||||||
if use x86; then
|
|
||||||
rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
|
|
||||||
{,jre/}lib/i386/libjavaplugin_nscp*.so
|
|
||||||
rm -vrf jre/plugin/i386
|
|
||||||
fi
|
|
||||||
# Without nsplugin flag, also remove the new plugin
|
|
||||||
local arch=${ARCH};
|
|
||||||
use x86 && arch=i386;
|
|
||||||
if ! use nsplugin; then
|
|
||||||
rm -vf {,jre/}lib/${arch}/libnpjp2.so \
|
|
||||||
{,jre/}lib/${arch}/libjavaplugin_jni.so
|
|
||||||
fi
|
|
||||||
|
|
||||||
dodir "${dest}"
|
|
||||||
cp -pPR bin include jre lib man "${ddest}" || die
|
|
||||||
|
|
||||||
if use derby; then
|
|
||||||
cp -pPR db "${ddest}" || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use examples; then
|
|
||||||
cp -pPR "${DEMOS_S}"/{demo,sample} "${ddest}" || die
|
|
||||||
if use kernel_linux && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
|
|
||||||
cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
|
|
||||||
"${ddest}"/javafx-samples || die
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use jce; then
|
|
||||||
dodir "${dest}"/jre/lib/security/strong-jce
|
|
||||||
mv "${ddest}"/jre/lib/security/US_export_policy.jar \
|
|
||||||
"${ddest}"/jre/lib/security/strong-jce || die
|
|
||||||
mv "${ddest}"/jre/lib/security/local_policy.jar \
|
|
||||||
"${ddest}"/jre/lib/security/strong-jce || die
|
|
||||||
dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
|
|
||||||
"${dest}"/jre/lib/security/US_export_policy.jar
|
|
||||||
dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
|
|
||||||
"${dest}"/jre/lib/security/local_policy.jar
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use nsplugin; then
|
|
||||||
install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use source; then
|
|
||||||
cp src.zip "${ddest}" || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Install desktop file for the Java Control Panel.
|
|
||||||
# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
|
|
||||||
# make_desktop_entry can't be used as ${P} would end up in filename.
|
|
||||||
newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
|
|
||||||
sun-jcontrol-${PN}-${SLOT}.png || die
|
|
||||||
sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
|
|
||||||
-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
|
|
||||||
-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
|
|
||||||
-e "s#Application;##" \
|
|
||||||
-e "/Encoding/d" \
|
|
||||||
jre/lib/desktop/applications/sun_java.desktop > \
|
|
||||||
"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
|
|
||||||
domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
|
|
||||||
|
|
||||||
# Prune all fontconfig files so libfontconfig will be used and only install
|
|
||||||
# a Gentoo specific one if fontconfig is disabled.
|
|
||||||
# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
|
|
||||||
rm "${ddest}"/jre/lib/fontconfig.*
|
|
||||||
if ! use fontconfig; then
|
|
||||||
cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
|
|
||||||
eprefixify "${T}"/fontconfig.properties
|
|
||||||
insinto "${dest}"/jre/lib/
|
|
||||||
doins "${T}"/fontconfig.properties
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove empty dirs we might have copied
|
|
||||||
find "${D}" -type d -empty -exec rmdir {} + || die
|
|
||||||
|
|
||||||
set_java_env
|
|
||||||
java-vm_revdep-mask
|
|
||||||
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
|
|
||||||
}
|
|
@ -1,5 +1,5 @@
|
|||||||
DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
|
DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
|
||||||
DIST jre-7u13-linux-i586.tar.gz 48124432 SHA256 a2248269a728efc686f0a246018e9007ebdabdfa4fd29dd9597ab8c66fce6f95 SHA512 4037118012c2ef706a282b03a252d08ea6db4328e91a889c41dc3c463e43125203543717501670def1bf4cb096322e657294c4b5c11d42a3831230e8117910ec WHIRLPOOL 2f04b350ca9ae3afc4d0bdcdf8f892c0ea34e7a51ead4f8c3e4160abd979dfbe71e31693eeafa0ccc2f2e1ecea094380df22dac41a48335e29b41db5e20a75bd
|
DIST jre-7u13-linux-i586.tar.gz 48124432 SHA256 a2248269a728efc686f0a246018e9007ebdabdfa4fd29dd9597ab8c66fce6f95 SHA512 4037118012c2ef706a282b03a252d08ea6db4328e91a889c41dc3c463e43125203543717501670def1bf4cb096322e657294c4b5c11d42a3831230e8117910ec WHIRLPOOL 2f04b350ca9ae3afc4d0bdcdf8f892c0ea34e7a51ead4f8c3e4160abd979dfbe71e31693eeafa0ccc2f2e1ecea094380df22dac41a48335e29b41db5e20a75bd
|
||||||
DIST jre-7u13-linux-x64.tar.gz 46795985 SHA256 ecb6ecaa82fc166bac9ed1fb2f03d57749e611a19c907e793cb4bf38cf5b6e90 SHA512 60458b74cdd7e59151cf0b688b109b9bed3fdf0874cec27dcbf10fef3b8b0d48f23540ad5834bcfbc309554ad81a6b991051c3394afc8ba49080e1b32b23ef4b WHIRLPOOL 32912d1f8be1c4bb77d9e5456f9b0f3a5e17f70bda6f88188e645008b7c19cc00e853dd5472022c6d5b0e223d05dde653222348c88866abf202fee10935a6a7a
|
DIST jre-7u13-linux-x64.tar.gz 46795985 SHA256 ecb6ecaa82fc166bac9ed1fb2f03d57749e611a19c907e793cb4bf38cf5b6e90 SHA512 60458b74cdd7e59151cf0b688b109b9bed3fdf0874cec27dcbf10fef3b8b0d48f23540ad5834bcfbc309554ad81a6b991051c3394afc8ba49080e1b32b23ef4b WHIRLPOOL 32912d1f8be1c4bb77d9e5456f9b0f3a5e17f70bda6f88188e645008b7c19cc00e853dd5472022c6d5b0e223d05dde653222348c88866abf202fee10935a6a7a
|
||||||
DIST jre-7u9-linux-i586.tar.gz 47995690 SHA256 37310199e770f10d8e5f9410757062655b66723ca2b8c4dd29d9a4e9bd7d98bd SHA512 f3d4fcbd14e3b7c12a3caec5458f60378d1d5e86de89669bd8baa0d137915bba5049cce50304f7e9241e4f3baf96371be80a157763581faa9b87b0f1defffe3f WHIRLPOOL 478482805554188d844ac7d1ced6c6e7fcd1ae5d07a3f527c4a388de887f075e1f4cd840d7859a81cc6176e34db354c6229064619c57e841368974f5325afb52
|
DIST jre-7u15-linux-i586.tar.gz 48129053 SHA256 a3eff3cae940c6b8dce5f5155b1a68137b2d0399d8920c53b794a5cd68072651 SHA512 fa8e7658c4701ced9430402c1d09e04e36034cd0665d8b9906175719cc1e2ed412adef9a190c7b20c728c2028a2330ab8f44b4e0894fd4ac8ef99b49eec42f0a WHIRLPOOL 9d587f3826f26ee4a42454ac9ee353ed5e855ea3186052ea1ce115b8d8e9457ba7096a2b7965e0f293936317a3077e3c34ca30a948e5fa09ab2649c82f98eec8
|
||||||
DIST jre-7u9-linux-x64.tar.gz 46684531 SHA256 16b573b3f4c18f088fc30786e5d62efc594448e7407180ffaf13a3c67cc4ed0b SHA512 390c9118c0f93f36b37488b9efa29cf1dafb1e17ae8396c89b19b2da6a42fb3e3ad748c629fa6fe07b88ed33baaa17cefc0c7eefe702a87b879826bdf8fa1be6 WHIRLPOOL 20b908a64dbb3a96843f09e514436bec2d70ffa5e1f749b7336954fc2aaf96fb5c487ca95f12ea888b30a23aff213893e95b451ff7ea03e032f9ba1d7a4cf0cc
|
DIST jre-7u15-linux-x64.tar.gz 46794487 SHA256 0379bcc1efb491e66422ffa1ee29b391638fd851082192296e25722096fcf29c SHA512 886ca41fcaf85f203a4cce17ec26f400a140a72ecd308f32a97bb251268e0c2d329908491dcb250d5a7bc479eaf67036b69d9bb68a1f77724427c69ce3c4b46d WHIRLPOOL e7b866290da7a35640bf0531a5fa6efb890f318fc5ab3ee8443e58ce518a7f9a92a2bad7d85f9d7a066193b50b1cbcc4b68482908e4bd6cefc2df52762f3419b
|
||||||
|
@ -1,23 +1,21 @@
|
|||||||
DIST jce_policy-6.zip 9101 SHA256 d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262 SHA512 a1aa55f2ad919efcf63452aaa96303328b7449626efb342a7f8d9e7a4fe9c06ce22ce33fb89e768602b172b7d9538c432e82523addb0bbd4d1be22f934576b56 WHIRLPOOL 144a4891ca3f5f88f72c1a13283823845bd7e46b5fe941b4c192705e20e9fcbbf27819ee926577218dd3b222e41f7ee149cab6f9eea5a46febebea00ad2ed3bc
|
DIST jce_policy-6.zip 9101 SHA256 d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262 SHA512 a1aa55f2ad919efcf63452aaa96303328b7449626efb342a7f8d9e7a4fe9c06ce22ce33fb89e768602b172b7d9538c432e82523addb0bbd4d1be22f934576b56 WHIRLPOOL 144a4891ca3f5f88f72c1a13283823845bd7e46b5fe941b4c192705e20e9fcbbf27819ee926577218dd3b222e41f7ee149cab6f9eea5a46febebea00ad2ed3bc
|
||||||
DIST jdk-6u38-linux-i586-demos.tar.gz 12073550 SHA256 cb69d792495c554db2de171893cf5eac936a4ffb11491d30e4a282ba4c64e08a SHA512 b35c7cb59272162431bfff9b4aa32956017ec7465a28010612bd9e214e80c3a9927151d1a025a2365d55b6171c2ab3e5dec3876e66b6d0ccd38df32d2df70d7d WHIRLPOOL 7ef4ad0131e5aa07522ce4471b87351a5075405f6d5d600ce5a27c74b1a3637ff3772b4dd1e2369e8267a8af680f100d379a3b6c141093e86146085d73bdb20a
|
|
||||||
DIST jdk-6u38-linux-i586.bin 71771782 SHA256 34b698c3f27f961c092cd982843a890fccf1ce1f9928c7e53333527dd60a63b0 SHA512 4b1a93b5d669181aef961a017efb50f1370ceeaee2a1cbeb16fbbf51c15ec9efda2a3744d7d4e4601b3357187232f9a35e4e01e095b582bed5934cb9201a2567 WHIRLPOOL 1a1311f242391e96f30ebf88027504385aca0b64ab3a79cddb688bedc0efba229f43a3603f81861e033f11fb82be4281ca3a3afd1082998307be19bc78ab09fb
|
|
||||||
DIST jdk-6u38-linux-x64-demos.tar.gz 12106066 SHA256 59801687ef42dc8a0022c036bad738f430285e57dfcc073c51390171f0047fcc SHA512 d574d48e1c2eda1a16b8d6bd649252dc76fc8d71bd953829875af7fae8c18de3bf6ee574f6a0b0d7e481f9e83ee64981f263a15c3d753ab9b0c20091b9d1b6de WHIRLPOOL 98faad9323bd0ea41c1c02e8e4e77feed12e73d80ec03d20d2a60a8852081ab4cd08b8d06db2e7c7e3714092ad272490c650e9f99ae7dedf936ee3c580cce7dd
|
|
||||||
DIST jdk-6u38-linux-x64.bin 72058033 SHA256 0a14ef5e60a90cf6de38e0b7744045b4c5eaf9513a7174c8e6d93f21358fd799 SHA512 81eb9768aa78df0981721c9bf69dae73f45d8e529f62f5c960a495fff362931cda5abcd6a0f0e097c8ee154163f91c90a6c73f5bbe65acd0f43139fb820aa195 WHIRLPOOL c82b9cfe2bf2a9bc8b48849cd745c1cdaebccda6e844fd1c7b8436fdbbdbcfa8abfb5fa3f9814a467257378b3b0c1dd6e019fbddc311225dde33634f226b71bd
|
|
||||||
DIST jdk-6u38-solaris-i586-demos.tar.Z 17928469 SHA256 0d4b433e0f74649137e484ff87f5306cf1cb75afec1f3b18c04c7d25404ded6b SHA512 a3a75baca65bdfdd2a2680dd00df6b77e0b6c7f09101b249c9d148089019a23147f302ac1bd915bac82b396201f0c30ae275bcd91161b01859731864164f0274 WHIRLPOOL 66ecbfe3676306022b384db479b2829ecc671e12fe4877432f9bdf2374a991c0a71f9b45f9477b785ccf481a49303cdbcd5f9c1a7e9e15b01960d2c370256885
|
|
||||||
DIST jdk-6u38-solaris-i586.sh 71682398 SHA256 942720c56c175c21fdeecd5a7bfa0aae9d57bc0693e094674077e4a40a64fa5c SHA512 d50212b04a791ed3e0340378dea9bd937d4d69697c72b7079d5f5af49f2138afe2d57d9540dd9dca0cee68ac8b7765653cf71f1183d5aba3edbca4c161e9c9da WHIRLPOOL 341b079b40dc95a980f8066e5b0ce6ae8864b5aeb28bd77e0dd8c009918ee152488fc580a042c4941f59309bee66f6d2ebef08d5c6e4580b67576627714103fa
|
|
||||||
DIST jdk-6u38-solaris-sparc-demos.tar.Z 17888763 SHA256 65b31b07e522204b20d89cf7e901fdbcf5c0392cd6dbe7e4bd36af3c201f9cb4 SHA512 01637f56edf7aef64c60391212c7043e3f520f645ba426a4ea7512f1f556b4a88beb39647bbbe78038201ad0c5083f571048ab8ce4d12df558a54a481b0ce2ac WHIRLPOOL 4b019920c0519f25e667584ca64f32340b9a81da55e6a748947033b0e0372097b0c31554445e544c51680d2f511ae28bc080ee2310a9cbc31b572f715737971e
|
|
||||||
DIST jdk-6u38-solaris-sparc.sh 76916503 SHA256 8ee327fe04b310be48db9bcc1712c2abd8405c38516bcf0d96f325b477063c89 SHA512 07549c17190f97677790e9854d74079b61aac86d0632dad15e2a5e96aad3c6b985b4876a2eed3c54fa64a146f2b365ae7be71719b7438059855c6b91ad677490 WHIRLPOOL 00121a3946c2da2bb8207abeced5095ba43dd011b7dea5f29b6bf3ce091a8f5934de17c66fa0402e528f1b4fe1269d5f9aef7a61d8644b654c056d9d71ce9919
|
|
||||||
DIST jdk-6u38-solaris-sparcv9-demos.tar.Z 66913 SHA256 4dc24d49cc2dcd4e1f4afc96ccf7e7113dbb545c08104f88050f1e17d119b164 SHA512 935a5a45fb794ec639f6c41ef32cbaaf4c94dad648e973b0b48932910a9c5a8e3884d04181fd6b2a92b3c7836cffea7de01429454610988e6ab1e139c8111ad3 WHIRLPOOL a706460b678b60f4bc59b76c92e159447abbe1fdae79f4334d400bd0f77a7d0eba9354867401ac0894df3294fdbfb455deb2180616226255046d25dcf3bc1b1c
|
|
||||||
DIST jdk-6u38-solaris-sparcv9.sh 12721403 SHA256 1caa5b1a2e901872c3fec1446aa8df1b48413b4265b9fe6a06d121782800c3da SHA512 668d99a30d5743a04dff8a3a56635332702ec18417c700948bf814c9486d672a0653bb6ea6d173a5e1216e103593350594e4b3864e8e5dfb4ff3283aa3a3b94c WHIRLPOOL 1bcc2522c312eaddbef5ca9058b05cc6934915efa5f19fcf5bf2d3875f71f47ff565531a7df797234cfdcea7a902cc782c92b001eca20e5abd5e3fb5a6334493
|
|
||||||
DIST jdk-6u38-solaris-x64-demos.tar.Z 71907 SHA256 71fcc7b04108b8f12bdc2570d5ac2b14ea8828ac2a24b20037932d496fbb91d1 SHA512 1fc4a0e2167855373d10d66178741dc7259d02b672cd58b2bb49e954c2a1e74f26147415f5eccec9028d33d9b3643be778fd85d2460ab048259d10f51ee2f8f0 WHIRLPOOL 87f03c2e628e4a65625bdaeb22b77ec4f91c9409d56cbb537b211dc50fed1f9f72d484b5934bb1713d31fd63d119031d87bfa03f2df7c98549e8b3f4bbdf647f
|
|
||||||
DIST jdk-6u38-solaris-x64.sh 8859356 SHA256 e7b4f09dc6c66e7aac45d155cfa8cefde15ed5b0c23e5fa6c03a45d5bbb75248 SHA512 45bd7cd382ca82bb3f84c3fdfee4ed092c90d079f2cd67627539b4ccddc833583fde3280aa50e5102a04a8e9a1e8e7274263b2b910911fd6c81742aa50221f25 WHIRLPOOL 5644176454ac8c8e1254724b73e321e959da0855326d2bdeb3fd5252c67ad86c8cb53d95627e720eb563ca1fdd2d8463e60fb5a7ba5524ead42780f9c7bb615e
|
|
||||||
DIST jdk-6u39-linux-i586-demos.tar.gz 12073475 SHA256 8f1f3b6c89c62363a892dc310ad81afb6e6cec689274210e6efb4805d2e2f1cd SHA512 1aa2b35d31312a3ed4412550bb7262a6b217d497260d3aa2a6b09498d5f965c3c0f77bf59e80e1682ad80b1df835833bd355280afc96be12bd9118b9c60c98d3 WHIRLPOOL b137601c7afbf9d947bc9c7eed134110d4feeac58f2f15653c8ccd06dbc5994a174da8bc3a8b8d94c305a6143dc15a78c180780478174032fc58767a17efcc57
|
|
||||||
DIST jdk-6u39-linux-i586.bin 71756435 SHA256 98211a71eef47f9e73a57b32995ca4b698d12b4282c90ffff8c533fa8b96d103 SHA512 22a001deec16c800fc9ab5efda474463a95c0b41055b181ea02a5310b39457fb6dfbb99353be5ff7572699371d613a02d81f3d129de0a94221b25a79a321052b WHIRLPOOL 21ba8f4d51fe1a544c18f4f1de666e65e8ac7d6c141fcda97fceb171173ac2af505317797f7839acd90e37e66f2bb73a3f49d72bd22042dbe263418ba8d12a0d
|
DIST jdk-6u39-linux-i586.bin 71756435 SHA256 98211a71eef47f9e73a57b32995ca4b698d12b4282c90ffff8c533fa8b96d103 SHA512 22a001deec16c800fc9ab5efda474463a95c0b41055b181ea02a5310b39457fb6dfbb99353be5ff7572699371d613a02d81f3d129de0a94221b25a79a321052b WHIRLPOOL 21ba8f4d51fe1a544c18f4f1de666e65e8ac7d6c141fcda97fceb171173ac2af505317797f7839acd90e37e66f2bb73a3f49d72bd22042dbe263418ba8d12a0d
|
||||||
DIST jdk-6u39-linux-ia64-demos.tar.gz 6858928 SHA256 9eb9f05ed043d5066485e791912ec56a1558c3b61c99250b49d525c2a2e9a701 SHA512 b02a3834356c6a464fa21e86e4aa1ecb6d671b9125d614e1a3f2433007e4abcd7c2274dc7795fd7fa629f48b20c91ffeb49f40a9f4fcd55abbc6793483133f3e WHIRLPOOL 73fc8c1118d400d247b9b8526942106cebd0f7a30d4bfa223ff1cd356d10dc3304924ca5b69162397e4c822e748cfb08544597d95a380a59d9ee4beca7d26743
|
|
||||||
DIST jdk-6u39-linux-ia64.bin 63589118 SHA256 9c6c430a5fe68f16e41907bdd96263a0cc238719ba1c1607294a2b3f80e6a905 SHA512 410c57a8ed2122190d1cfac52ffef50cc8560a285e58a58ca45dfc452de8d88eca81e83e053c2a4dd9f0b78c61addd48ea1d5a164454b834d76a0a16228e359e WHIRLPOOL 72e1ad9ec4432121763a19c3dc353af5e4412b1f082d64e408636e6de7a0b0f936db8f10ed0ef9c3381cbf630245e553d603219f819552daaf9fe8fd23ade303
|
|
||||||
DIST jdk-6u39-linux-x64-demos.tar.gz 12104230 SHA256 ac70e15db96a3426f7338c3425f255bc5269edc5664aca4679b75589c5c3cd62 SHA512 f6cf6bb65e23fdad6884f30de983c01a5a746247d8acc9805461e5d987408a1e228c3eae4fcb4b5b22cc03cb8a22accc0d8a00da06839409cdaa47b36554299d WHIRLPOOL 73b29c4dfc440dbdcf14c6655cf663d320dd78ffe34f9e9d37e212eb8a84352b2fd482fdaa7978b9db0583143ec0893513dd826fa68639371d6a0bbbe651e702
|
|
||||||
DIST jdk-6u39-linux-x64.bin 72037515 SHA256 3d7ff1130d1200c087c54749f1c72856b8d384033cbff6343abb953e4c152b59 SHA512 c35dfb7968d2435dfe1262184143c482c9a49a4e65ccbde8160ea08ea146c104b0fb4cd1e5eb0bb2eeb9e750ef39a2ba057291c94bc355c268af30768970bb40 WHIRLPOOL 4e56fb814604d6146b8b7a603d43a460af4c55ee4b4fe2cde244ece31797a036350b6fee645f1a6c23b2ab2bdca8ea167854b7f4dc69f80e349c20638ae836f2
|
DIST jdk-6u39-linux-x64.bin 72037515 SHA256 3d7ff1130d1200c087c54749f1c72856b8d384033cbff6343abb953e4c152b59 SHA512 c35dfb7968d2435dfe1262184143c482c9a49a4e65ccbde8160ea08ea146c104b0fb4cd1e5eb0bb2eeb9e750ef39a2ba057291c94bc355c268af30768970bb40 WHIRLPOOL 4e56fb814604d6146b8b7a603d43a460af4c55ee4b4fe2cde244ece31797a036350b6fee645f1a6c23b2ab2bdca8ea167854b7f4dc69f80e349c20638ae836f2
|
||||||
DIST jdk-6u39-solaris-i586.sh 71664523 SHA256 7119cbea5ee877319ac5b6cab928d32db8b1ffecc809fd74d74b81f8a3e97338 SHA512 7f1977c5f846f69e8d243d618cb179e3b199ca4e46660894805b38ec015c98c4eb5017eb2f137d720801625ded73b713d4020275a552ec80192a66274e708135 WHIRLPOOL cbe3866070226ba07a2f3e60d96e6e19c23ae2a0bd216788967b064dbebcc9fcb62003fb2738629d5ec06cd11f0abc2989a43701fa722c6c5faab5601235f547
|
DIST jdk-6u39-solaris-i586.sh 71664523 SHA256 7119cbea5ee877319ac5b6cab928d32db8b1ffecc809fd74d74b81f8a3e97338 SHA512 7f1977c5f846f69e8d243d618cb179e3b199ca4e46660894805b38ec015c98c4eb5017eb2f137d720801625ded73b713d4020275a552ec80192a66274e708135 WHIRLPOOL cbe3866070226ba07a2f3e60d96e6e19c23ae2a0bd216788967b064dbebcc9fcb62003fb2738629d5ec06cd11f0abc2989a43701fa722c6c5faab5601235f547
|
||||||
DIST jdk-6u39-solaris-sparc.sh 76915886 SHA256 d3432bb364fed257f593297d6752128fe728ba9b1f965d2ea99cc0a8753a22a3 SHA512 1837823f9b54336ccc1f4269beddfea6c61bb025c0ce44fe5caf8fb7f027186284ed7cfea914d0d5297187623d6d1c71c433ea0dde758cf42ffbccbf8075b52b WHIRLPOOL 547bc12721ccfd0fcc149f684b96b57b6f40f177a7bfec83126075338245ca746bdea1ebfc653966968b69baa692ba320146aeb5522aa550da17e92a95c98535
|
DIST jdk-6u39-solaris-sparc.sh 76915886 SHA256 d3432bb364fed257f593297d6752128fe728ba9b1f965d2ea99cc0a8753a22a3 SHA512 1837823f9b54336ccc1f4269beddfea6c61bb025c0ce44fe5caf8fb7f027186284ed7cfea914d0d5297187623d6d1c71c433ea0dde758cf42ffbccbf8075b52b WHIRLPOOL 547bc12721ccfd0fcc149f684b96b57b6f40f177a7bfec83126075338245ca746bdea1ebfc653966968b69baa692ba320146aeb5522aa550da17e92a95c98535
|
||||||
DIST jdk-6u39-solaris-sparcv9.sh 12725295 SHA256 435a9565edb36580d7cfa9a06f86b9aec91fdd434432748896eba807dbfeb2af SHA512 f4f26fe1655cc8b1273dd3cb6b8f80a40d6e0008cfddaed6b2ccfabc5548c58183175c038b7fb4929018ba637cb4b560046fa45de1e4c21c97b264b2d0ee66d6 WHIRLPOOL c10ed6684cc6c4cd8c6c38523dd20af2bcae6ece67a0256bf85a56240c095e5fd33b9ef93de2aa7e6854b49adf3c131966cb0bf507d737aae494406c77e26225
|
DIST jdk-6u39-solaris-sparcv9.sh 12725295 SHA256 435a9565edb36580d7cfa9a06f86b9aec91fdd434432748896eba807dbfeb2af SHA512 f4f26fe1655cc8b1273dd3cb6b8f80a40d6e0008cfddaed6b2ccfabc5548c58183175c038b7fb4929018ba637cb4b560046fa45de1e4c21c97b264b2d0ee66d6 WHIRLPOOL c10ed6684cc6c4cd8c6c38523dd20af2bcae6ece67a0256bf85a56240c095e5fd33b9ef93de2aa7e6854b49adf3c131966cb0bf507d737aae494406c77e26225
|
||||||
DIST jdk-6u39-solaris-x64.sh 8861523 SHA256 161e859d2fadb045df7f69d88a72402bc04835caf646482a7e13bc04a3912a01 SHA512 8e5e886e897b6247f7347baf55a30ce8962fc117328376dc8c0e23d63d9528a8c3fb005d4eee1094cc90bb9b3c36efefa4261774bca67fa33ff52ec8cd1bc714 WHIRLPOOL ce92211ab1b0cd34fab7beb0fd82daf9a6c413207e043bc19bbeceaf8334f37cd5bc60dad5af4b64c7a013e8261fad64e72d178ef40d6d0f8c7b786918e9d904
|
DIST jdk-6u39-solaris-x64.sh 8861523 SHA256 161e859d2fadb045df7f69d88a72402bc04835caf646482a7e13bc04a3912a01 SHA512 8e5e886e897b6247f7347baf55a30ce8962fc117328376dc8c0e23d63d9528a8c3fb005d4eee1094cc90bb9b3c36efefa4261774bca67fa33ff52ec8cd1bc714 WHIRLPOOL ce92211ab1b0cd34fab7beb0fd82daf9a6c413207e043bc19bbeceaf8334f37cd5bc60dad5af4b64c7a013e8261fad64e72d178ef40d6d0f8c7b786918e9d904
|
||||||
|
DIST jdk-6u41-linux-i586-demos.tar.gz 12073494 SHA256 d43f7e5fa800e2bdf15e5ca18b6d72b4e873d1de95893e9f94a8bb01192ffc17 SHA512 3d6963fa1e51f3bdfa6b2cfd41c00c952b079459726fa6dedf9dc46af816c10c912936430681a422401658c03cd541378b78e2a3c9e70bfd5deca0248b1ff71a WHIRLPOOL c3f6cba5bfc0c2bdf1635e20b7b9d98ec1055115d252958682da156671f595995b308a5ec8411bf3e4a9b9166b287e1bee7ee6018d0a2f873e4b1a9dba5cb293
|
||||||
|
DIST jdk-6u41-linux-i586.bin 71769939 SHA256 f689675399f3409b883f2e5d458d0819effae9fe3a61a98bfc4af40e724e8517 SHA512 feab042a57208a4a64c28d59a7d49fea2934d2c8004c86f60b0e94344aeb3004bcb20e5256b2c34f7c1c389133336c972b8b985d932271e8fb71dee397f4b798 WHIRLPOOL 837fb3106b971fca732200e364c29bf278b15ed416ed3f46fe639a9d943fbb05dce03bb013ed17f4b33df04d485cbb807331827c5aa98fc04a1f89a017107637
|
||||||
|
DIST jdk-6u41-linux-ia64-demos.tar.gz 6858797 SHA256 df5d584957fac5fc3a469838d48048cf8cc56195dfeb36ce40b8a0725d0216ce SHA512 320eb781a140b5a984b80933a1965d59dc3d4819bb25f1cc165a07080e74da3f5dcd49c786dbca32f8ed1e02f649f7dbcd5f7dfa9029866a0eb3bfbb9782a564 WHIRLPOOL 51626b68106a630e21b04e73c5f859fdf139fc8d3e6f4da0c9796713f2ff53aa7fdf21d4b9976ebe15c1dbd87eee32887897b7178a90b4ebaa93db05d9f3df96
|
||||||
|
DIST jdk-6u41-linux-ia64.bin 63594332 SHA256 5bca77c745c1c9b4f084867a4eacdabac9274967689fd6568a0c2d421b1fbd3c SHA512 3f5a23d03ffe01e82b4f4844b4a7ec4d175fd0a090b2353d64e516140346c926badf4ee1b834aec9868bfb9a4596fc6af60408285dee6e2aebfafeb1ec4d0a93 WHIRLPOOL b282e93fa4edba4a3d0c42a8e260fd2bac7506cb78812f8c14ebc3cf68a78b406be0bdc11245653b085c37a8649f90201bc6cd9e3b6a86b594cfe9f48110e88b
|
||||||
|
DIST jdk-6u41-linux-x64-demos.tar.gz 12104183 SHA256 0772ccdd440743cf44a359415d0262d70102fac0452c70cb6ef68af73af94ec8 SHA512 9ccf9691c92d12d9d88ef47cac56d5f43f3d448a502005f7fcd60596959a0d0ece2c8b65a85ee26a8cfb39a11fae5c85cb50b64d0e23aa3e269f51900849f4c8 WHIRLPOOL 0b7232582700a59aa73aa96000c6cc46385581bd8981887ffb0454eae588ca80b9e0cadb68ae94906fa25c9c9d38bd38139e58e8aabdf6877c2ffd807d018cad
|
||||||
|
DIST jdk-6u41-linux-x64.bin 72041996 SHA256 c87ae51533efa3d41a2c4086d8bf1f6887e2bd7d0b1beadba667d64f89d55598 SHA512 445c13771528235a8cc66ff7d326a70f0820ace312fc7e4bdfa6d49bea8454f22384ed31bf6a9cf5dc2be21ac661f43e7aa2db07e5f51272b254132562d3544e WHIRLPOOL 2e82d56fac58a7b7af92d2425ac6a469cf5a204b763fbb566a123be735d28ae852729d4fface4e16225f2b81f21781c68f174b19d46f72a68d3cb79ff5bf1207
|
||||||
|
DIST jdk-6u41-solaris-i586-demos.tar.Z 17942069 SHA256 4bca4fcdc5948e564cfa0e47facf1ff823ed6eccfb195a812e9be9f31276d7b6 SHA512 a1be70635094b5fc50e5032f823ba19a4c7d44d3ec4484b758d7ebfdf41c42b4ca3e5571e60f3e74085cf595abbf028c9a06f8b64f4422dcde3d16c6ac0f7654 WHIRLPOOL 4d4310d41167c957352914418791139797eef5636cd764bcc490b6567e8fbfb9fcc3618e052e212d1843d3f05f4b4084cdc2f6c6acdfeecefe9ea8e4f9f784aa
|
||||||
|
DIST jdk-6u41-solaris-i586.sh 71669855 SHA256 bc4e157367e8596a4897fd17162c4f2038ad33616ea9931b1036a051d711030f SHA512 ece19c7f26c9a98149159c3869346ecc7627284abd768e2e431e35a6df0b90796a8a3f3bd76023b9c642279c229359c65254ae8eade917b039c584eaec219501 WHIRLPOOL b0efbc866605b7b1cf2024f9f471fe79322f52f8608e766b0010f75c347c884ea1c54566bc769375e61d0fda462dbbbbae38e42734982164ec80f7a307400ff4
|
||||||
|
DIST jdk-6u41-solaris-sparc-demos.tar.Z 17927425 SHA256 31d39628c6df60d51fc1acf1bcd98e2ad98b51f2042380a9d249a83bfac32f86 SHA512 37ef85e228cb126baec13d7fe1b5feef075b6cdf74a4176a2fa13cd5fb4edd868bfdb01ac3e894b2926d77e304ef67a9f76e41df52f32ba33b0ffabd35a24f70 WHIRLPOOL 8f06b41a21b3e05c13dd95336dc3daee03cbe84b6c926b779ad56bfde3b398ddea2163c2332b1a96f22a73ecb55e8c88332e683d5035b69a34553415c511ffcb
|
||||||
|
DIST jdk-6u41-solaris-sparc.sh 76904663 SHA256 b376da56035d3690605153c54125146775b091476313744ad5a2cabe93f23476 SHA512 5e4f1f1a13295404e8b23839bf02446e8dcaaa91dfbc2405f2f3e0ddd0e1ebd72c6c254fd97d43f0d679cf050afa93892e4dbaa4fd9d8dd64993ec6298ce3f22 WHIRLPOOL 5e3ed60f0875e131f2c4835474bb0d9396ef0fb8adda037cddc9187bbdb2a9aac24e33537f01d9d19e6185e262ff0ec7dac38156d82f22d3a281afe582919e45
|
||||||
|
DIST jdk-6u41-solaris-sparcv9-demos.tar.Z 66771 SHA256 f0fd7cf6f7d8b92fbc47adfeffc2fd9820073d06c64d6c03c4bb1eca35717c90 SHA512 7abfc53b64852af5967df997d199967b78214e6d90843beb5f78a9bef5ff03c053d656cd11c6b3e1d29a91275444e624c59ddd1a124c2787ee5c75108920ebd6 WHIRLPOOL b157c5f460ec0ae059c39106405fe59ba82b0178dc966070bd8cbe5532c9a01d1c8c44829ad9403ca0dd8ea118d1b992bf4467d5f899d9a96c65407876d4ad60
|
||||||
|
DIST jdk-6u41-solaris-sparcv9.sh 12725269 SHA256 77475ad2b6927bc790c34f092efc4f20c38a1804711d95f4bf4e8208d886bee5 SHA512 fbcf2f5797e2461279d9d47dd68148ac9b48664a6b50393af1bcafb1a4d3fdcfe54c55e8724e6cb421cdf6c5058538966535c35b65ce59d7db4b4dba1b57fefc WHIRLPOOL 514896860d642925be4770945c2b530442f0ecb3de3a847c4a7c07d6c3f0559ee68560f3ebb38373c4cbeda47bf661c9ef1d46f199b0fff0efc5b3f0b6408101
|
||||||
|
DIST jdk-6u41-solaris-x64-demos.tar.Z 71901 SHA256 408d5d79d12bce2d79092e87cbf7387d6fac73ad8decb2a3eb518f5548fcd869 SHA512 a47e8056a248872410542bd8708f94b66bda53ac485d53eec0de4f49653a6ad09e6c47da5a8d24f569df89da9c9e80239045b2fda3093616f42f0d499756a636 WHIRLPOOL 795a4d52ee06431a67d81921bc1a6317188648a20d7951cb9c62a3fc5934fbed8689a8aa37abbe6700dc42b67a9b0ed53115fed1a49c1a9ac2fc6e4f9d1390f6
|
||||||
|
DIST jdk-6u41-solaris-x64.sh 8861515 SHA256 210ebcb157bc1dfe2a3482f411e910da13764343a26e83cf83320bcd1cce91d4 SHA512 67520181369f4cbd5dc50e8ed7ddfdb878500582ff0c592fae20ee50ef1bf633518ed6ae0a3fd2d1b414f0ef90e2953259f7517c5f5c33bd4506bc63c6106bf5 WHIRLPOOL 5841a430aeb846b0beb3cedd72a26b97af67b22a6e53e60d8431230d87e2e4ae5c4af56c130c518867b87c3aea3e0e11bb717235bb96ec4e0c984faea3950dac
|
||||||
|
@ -1,249 +0,0 @@
|
|||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.38.ebuild,v 1.3 2013/01/27 16:41:28 ago Exp $
|
|
||||||
|
|
||||||
EAPI="5"
|
|
||||||
|
|
||||||
inherit eutils java-vm-2 prefix versionator
|
|
||||||
|
|
||||||
# This URIs need to be updated when bumping!
|
|
||||||
JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk6u38-downloads-1877406.html"
|
|
||||||
JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html"
|
|
||||||
# This is a list of archs supported by this update. Currently ia64 comes and goes ...
|
|
||||||
AT_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris )
|
|
||||||
# somtimes the demos are missing
|
|
||||||
DEMOS_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris )
|
|
||||||
|
|
||||||
MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
|
|
||||||
S_PV="$(replace_version_separator 3 '_')"
|
|
||||||
|
|
||||||
AT_x86="jdk-${MY_PV}-linux-i586.bin"
|
|
||||||
AT_amd64="jdk-${MY_PV}-linux-x64.bin"
|
|
||||||
AT_ia64="jdk-${MY_PV}-linux-ia64.bin"
|
|
||||||
AT_x86_solaris="jdk-${MY_PV}-solaris-i586.sh"
|
|
||||||
AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.sh"
|
|
||||||
AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.sh"
|
|
||||||
AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.sh"
|
|
||||||
|
|
||||||
DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
|
|
||||||
DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
|
|
||||||
DEMOS_ia64="jdk-${MY_PV}-linux-ia64-demos.tar.gz"
|
|
||||||
DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.Z"
|
|
||||||
DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.Z"
|
|
||||||
DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.Z"
|
|
||||||
DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.Z"
|
|
||||||
|
|
||||||
JCE_FILE="jce_policy-6.zip"
|
|
||||||
|
|
||||||
DESCRIPTION="Oracle's Java SE Development Kit"
|
|
||||||
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
|
|
||||||
for d in "${AT_AVAILABLE[@]}"; do
|
|
||||||
SRC_URI+=" ${d}? ("
|
|
||||||
SRC_URI+=" $(eval "echo \${$(echo AT_${d/-/_})}")"
|
|
||||||
if has ${d} "${DEMOS_AVAILABLE[@]}"; then
|
|
||||||
SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
|
|
||||||
fi
|
|
||||||
SRC_URI+=" )"
|
|
||||||
done
|
|
||||||
unset d
|
|
||||||
SRC_URI+=" jce? ( ${JCE_FILE} )"
|
|
||||||
|
|
||||||
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
|
|
||||||
SLOT="1.6"
|
|
||||||
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
|
||||||
IUSE="+X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel source"
|
|
||||||
|
|
||||||
RESTRICT="fetch strip"
|
|
||||||
QA_PREBUILT="*"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
X? (
|
|
||||||
x11-libs/libX11
|
|
||||||
x11-libs/libXext
|
|
||||||
x11-libs/libXi
|
|
||||||
x11-libs/libXt
|
|
||||||
x11-libs/libXtst
|
|
||||||
)
|
|
||||||
alsa? ( media-libs/alsa-lib )
|
|
||||||
doc? ( dev-java/java-sdk-docs:1.6.0 )
|
|
||||||
!prefix? ( sys-libs/glibc )"
|
|
||||||
# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
|
|
||||||
# marking. #427642
|
|
||||||
DEPEND="
|
|
||||||
jce? ( app-arch/unzip )
|
|
||||||
kernel_SunOS? ( app-arch/unzip )
|
|
||||||
pax_kernel? ( sys-apps/paxctl )"
|
|
||||||
|
|
||||||
S="${WORKDIR}"/jdk${S_PV}
|
|
||||||
|
|
||||||
check_tarballs_available() {
|
|
||||||
local uri=$1; shift
|
|
||||||
local dl= unavailable=
|
|
||||||
for dl in "${@}"; do
|
|
||||||
[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
|
|
||||||
done
|
|
||||||
|
|
||||||
if [[ -n "${unavailable}" ]]; then
|
|
||||||
if [[ -z ${_check_tarballs_available_once} ]]; then
|
|
||||||
einfo
|
|
||||||
einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
|
|
||||||
einfo "has become fetch restricted again. Alternatives are switching to"
|
|
||||||
einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
|
|
||||||
einfo
|
|
||||||
einfo "Oracle requires you to download the needed files manually after"
|
|
||||||
einfo "accepting their license through a javascript capable web browser."
|
|
||||||
einfo
|
|
||||||
_check_tarballs_available_once=1
|
|
||||||
fi
|
|
||||||
einfo "Downlod the following files:"
|
|
||||||
for dl in ${unavailable}; do
|
|
||||||
einfo " ${dl}"
|
|
||||||
done
|
|
||||||
einfo "at '${uri}'"
|
|
||||||
einfo "and move them to '${DISTDIR}'"
|
|
||||||
einfo
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_nofetch() {
|
|
||||||
local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
|
|
||||||
if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
|
|
||||||
distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
|
|
||||||
fi
|
|
||||||
check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
|
|
||||||
|
|
||||||
use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
AT=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
|
|
||||||
DEMOS=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
|
|
||||||
|
|
||||||
if use kernel_SunOS; then
|
|
||||||
for i in ${AT}; do
|
|
||||||
rm -f "${S}"/jre/{LICENSE,README} "${S}"/LICENSE
|
|
||||||
# don't die on unzip, it always "fails"
|
|
||||||
unzip "${DISTDIR}"/${i}
|
|
||||||
done
|
|
||||||
for f in $(find "${S}" -name "*.pack") ; do
|
|
||||||
"${S}"/bin/unpack200 ${f} ${f%.pack}.jar
|
|
||||||
rm ${f}
|
|
||||||
done
|
|
||||||
else
|
|
||||||
sh "${DISTDIR}"/${AT} -noregister || die "Failed to unpack"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use examples ; then
|
|
||||||
unpack ${DEMOS}
|
|
||||||
if use kernel_SunOS; then
|
|
||||||
mv "${WORKDIR}"/SUNWj6dmo/reloc/jdk/instances/jdk1.6.0/{demo,sample} "${S}"/ || die
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use jce; then
|
|
||||||
unpack ${JCE_FILE}
|
|
||||||
mv jce "${S}"/jre/lib/security/unlimited-jce || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
# This needs to be done before CDS - #215225
|
|
||||||
java-vm_set-pax-markings "${S}"
|
|
||||||
|
|
||||||
# see bug #207282
|
|
||||||
einfo "Creating the Class Data Sharing archives"
|
|
||||||
if use x86; then
|
|
||||||
bin/java -client -Xshare:dump || die
|
|
||||||
fi
|
|
||||||
# limit heap size for large memory on x86 #405239
|
|
||||||
# this is a workaround and shouldn't be needed.
|
|
||||||
bin/java -server -Xmx64m -Xshare:dump || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
local dest="/opt/${P}"
|
|
||||||
local ddest="${ED}${dest}"
|
|
||||||
|
|
||||||
# We should not need the ancient plugin for Firefox 2 anymore, plus it has
|
|
||||||
# writable executable segments
|
|
||||||
if use x86; then
|
|
||||||
rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
|
|
||||||
{,jre/}lib/i386/libjavaplugin_nscp*.so
|
|
||||||
rm -vrf jre/plugin/i386
|
|
||||||
fi
|
|
||||||
# Without nsplugin flag, also remove the new plugin
|
|
||||||
local arch=${ARCH};
|
|
||||||
use x86 && arch=i386;
|
|
||||||
if ! use nsplugin; then
|
|
||||||
rm -vf {,jre/}lib/${arch}/libnpjp2.so \
|
|
||||||
{,jre/}lib/${arch}/libjavaplugin_jni.so
|
|
||||||
fi
|
|
||||||
|
|
||||||
dodoc COPYRIGHT
|
|
||||||
dohtml README.html
|
|
||||||
|
|
||||||
dodir "${dest}"
|
|
||||||
cp -pPR bin include jre lib man "${ddest}" || die
|
|
||||||
|
|
||||||
if use derby; then
|
|
||||||
cp -pPR db "${ddest}" || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
|
|
||||||
cp -pPR demo sample "${ddest}" || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use jce; then
|
|
||||||
dodir "${dest}"/jre/lib/security/strong-jce
|
|
||||||
mv "${ddest}"/jre/lib/security/US_export_policy.jar \
|
|
||||||
"${ddest}"/jre/lib/security/strong-jce || die
|
|
||||||
mv "${ddest}"/jre/lib/security/local_policy.jar \
|
|
||||||
"${ddest}"/jre/lib/security/strong-jce || die
|
|
||||||
dosym "${dest}"/jre/lib/security/unlimited-jce/US_export_policy.jar \
|
|
||||||
"${dest}"/jre/lib/security/US_export_policy.jar
|
|
||||||
dosym "${dest}"/jre/lib/security/unlimited-jce/local_policy.jar \
|
|
||||||
"${dest}"/jre/lib/security/local_policy.jar
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use nsplugin; then
|
|
||||||
install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use source; then
|
|
||||||
cp src.zip "${ddest}" || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Install desktop file for the Java Control Panel.
|
|
||||||
# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
|
|
||||||
# make_desktop_entry can't be used as ${P} would end up in filename.
|
|
||||||
newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
|
|
||||||
sun-jcontrol-${PN}-${SLOT}.png || die
|
|
||||||
sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (sun-jdk)#" \
|
|
||||||
-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
|
|
||||||
-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
|
|
||||||
-e "s#Application;##" \
|
|
||||||
-e "/Encoding/d" \
|
|
||||||
jre/lib/desktop/applications/sun_java.desktop \
|
|
||||||
> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
|
|
||||||
domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
|
|
||||||
|
|
||||||
# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
|
|
||||||
rm "${ddest}"/jre/lib/fontconfig.* || die
|
|
||||||
cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
|
|
||||||
eprefixify "${T}"/fontconfig.properties
|
|
||||||
insinto "${dest}"/jre/lib/
|
|
||||||
doins "${T}"/fontconfig.properties
|
|
||||||
|
|
||||||
# Remove empty dirs we might have copied
|
|
||||||
find "${D}" -type d -empty -exec rmdir -v {} + || die
|
|
||||||
|
|
||||||
set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
|
|
||||||
java-vm_revdep-mask
|
|
||||||
java-vm_sandbox-predict /dev/random
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
java-vm-2_pkg_postinst
|
|
||||||
|
|
||||||
elog "If you want Oracles JDK 7 'emerge oracle-jdk-bin' instead."
|
|
||||||
}
|
|
@ -1,4 +1,4 @@
|
|||||||
DIST jre-6u38-linux-i586.bin 21709114 SHA256 26ffa4f61d0dd542f3fe80a55cef43504263d3656953e37a9ca670e8e183b5ba SHA512 cf36e75f037722a5dc5fd30f1caef1b9da3f76c4435f5439be2d405e5d3f90a40bf79562a62345bb9c6d90d89bdc1e0628ed103ca93dc205d797552d104c4bf7 WHIRLPOOL f1e02a2dbf7b1370a3ab9c801d441a4723ee36fcbab7799119ad353b5dd81461227a1885f18a7a09153951e17b7681a06e6523fef77281d800d4ceaf34b7b133
|
|
||||||
DIST jre-6u38-linux-x64.bin 21316813 SHA256 594791f98febf4a0c9723f86cf033a5905a13817a952952138a8f9d407913b23 SHA512 ed252cccb87347d64e490f70450ced9a720d8e3d1a6fb4207d3bea39cb1440248c78370b2cb6420688cfe796b9b9cf0cdf52b5e9f864f370e058ba5132479280 WHIRLPOOL 1598fa72c202d682fe1bd321a687e69303c4881b3e231f13cfe9b0bbd5ac694928c245524c67700fb1354a6ce9d365037c975b6f83377e5a6ca56464cd78d4ca
|
|
||||||
DIST jre-6u39-linux-i586.bin 21712508 SHA256 7d1f855e33cc756875ce2f0595254ac7ff694d99540102a6f4426824657f191b SHA512 ea7c6e3e10be63ef6afd6e138ca3bc7d3a27102ee929636b7eceb3d542e0b58e9cf1ea776a627ef12aec02940a4e2201d13b7c410715a651b1032d8175c41301 WHIRLPOOL b5dba1fb60dc0862939e8b993f89411eeb36d026941d8c1674b982489590684de2220e0996ecb8aebd3f737cd2718cc3ea9f3089d8677ee9b45448725991f98f
|
DIST jre-6u39-linux-i586.bin 21712508 SHA256 7d1f855e33cc756875ce2f0595254ac7ff694d99540102a6f4426824657f191b SHA512 ea7c6e3e10be63ef6afd6e138ca3bc7d3a27102ee929636b7eceb3d542e0b58e9cf1ea776a627ef12aec02940a4e2201d13b7c410715a651b1032d8175c41301 WHIRLPOOL b5dba1fb60dc0862939e8b993f89411eeb36d026941d8c1674b982489590684de2220e0996ecb8aebd3f737cd2718cc3ea9f3089d8677ee9b45448725991f98f
|
||||||
DIST jre-6u39-linux-x64.bin 21319520 SHA256 84ce40370e60096167221d7577806d83206b988fb06d96990f3160136c9361b5 SHA512 9800bf965f3fc56d9d4a54d56203ac43758385eb39b77979455a6e156f9129122fbcf6567da3a36a2399b8217a7fe2f1d4afe8fc93385328c7b0d45140eabc38 WHIRLPOOL f894c6f03ca7c87f20927a18f86c5741d695b09afed7f4c0feea1a021884c9edde6ca2daf24b95270ae4c3931558a85f4be86095336b6205928889da1e9d2c04
|
DIST jre-6u39-linux-x64.bin 21319520 SHA256 84ce40370e60096167221d7577806d83206b988fb06d96990f3160136c9361b5 SHA512 9800bf965f3fc56d9d4a54d56203ac43758385eb39b77979455a6e156f9129122fbcf6567da3a36a2399b8217a7fe2f1d4afe8fc93385328c7b0d45140eabc38 WHIRLPOOL f894c6f03ca7c87f20927a18f86c5741d695b09afed7f4c0feea1a021884c9edde6ca2daf24b95270ae4c3931558a85f4be86095336b6205928889da1e9d2c04
|
||||||
|
DIST jre-6u41-linux-i586.bin 21726301 SHA256 e89181b56652face6db2704cfbeded2774c27e413f080875a2cea90a45519ad0 SHA512 ddb05f6ecc2cb25122125a16575249002919866a1ab31fdc200bfd4cffeb4b31466987dd434b8efe3b87be1740bcc97162091eaeb2058ee0a34cc684518d2623 WHIRLPOOL f6dea559c0d97b9a465c7d68601fe96603e51c0814e34e93f49c851aa06254389a30e84130549c8ffdcbb3fb360dc261825ef0c01dac5f7d1700571a00bcc2b8
|
||||||
|
DIST jre-6u41-linux-x64.bin 21326570 SHA256 ed96bd190537146784e645667137e54192566c32cf3cd7dab610d37888d9ed8c SHA512 0b5e16074fc4b0b62deb30746dbb5a4ec3a70fe48c975228bdd0d1aed0eaafd38dff3b71f6ebc841aa9246c17e87ad126cbbbeb9c934fd03ffc85eace8bc3dff WHIRLPOOL c39f67d460abee07f9ea2f2929a1c42d8eafbdc7ce3bb3bfa5f40dcb5a42884cbcf2ab380e8ae0231268baa9fa619ca97026f99f6e634500378b36cbc206917f
|
||||||
|
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 31d0a25..60e5bda 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -1,6 +1,7 @@
|
||||||
|
+AC_INIT
|
||||||
|
+
|
||||||
|
orig_CFLAGS="$CFLAGS"
|
||||||
|
|
||||||
|
-AC_INIT
|
||||||
|
AC_CONFIG_SRCDIR([ev_epoll.c])
|
||||||
|
|
||||||
|
AM_INIT_AUTOMAKE(libev,4.11) dnl also update ev.h!
|
@ -0,0 +1,54 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-4.11-r1.ebuild,v 1.1 2013/02/21 10:38:55 tomka Exp $
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
inherit autotools eutils multilib
|
||||||
|
|
||||||
|
MY_P="${P}"
|
||||||
|
|
||||||
|
DESCRIPTION="A high-performance event loop/event model with lots of feature"
|
||||||
|
HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
|
||||||
|
SRC_URI="http://dist.schmorp.de/libev/${MY_P}.tar.gz
|
||||||
|
http://dist.schmorp.de/libev/Attic/${MY_P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="|| ( BSD GPL-2 )"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||||
|
IUSE="elibc_glibc static-libs"
|
||||||
|
|
||||||
|
# Bug #283558
|
||||||
|
DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )"
|
||||||
|
RDEPEND="${DEPEND}"
|
||||||
|
|
||||||
|
S="${WORKDIR}/${MY_P}"
|
||||||
|
|
||||||
|
DOCS=( Changes README )
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
epatch "${FILESDIR}/4.01-gentoo.patch"
|
||||||
|
# bug #411847
|
||||||
|
epatch "${FILESDIR}/${PN}-pc.patch"
|
||||||
|
# bug 429526
|
||||||
|
epatch "${FILESDIR}/${P}-gentoo.patch"
|
||||||
|
|
||||||
|
eautoreconf
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
econf $(use_enable static-libs static)
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
default
|
||||||
|
use static-libs || prune_libtool_files
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_preinst() {
|
||||||
|
preserve_old_lib /usr/$(get_libdir)/libev.so.3.0.0
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
preserve_old_lib_notify /usr/$(get_libdir)/libev.so.3.0.0
|
||||||
|
}
|
@ -0,0 +1,156 @@
|
|||||||
|
From 23f05e0c33987d6605387b300c4be5da2120a7ab Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daniel Veillard <veillard@redhat.com>
|
||||||
|
Date: Tue, 19 Feb 2013 10:21:49 +0800
|
||||||
|
Subject: [PATCH] Detect excessive entities expansion upon replacement
|
||||||
|
|
||||||
|
If entities expansion in the XML parser is asked for,
|
||||||
|
it is possble to craft relatively small input document leading
|
||||||
|
to excessive on-the-fly content generation.
|
||||||
|
This patch accounts for those replacement and stop parsing
|
||||||
|
after a given threshold. it can be bypassed as usual with the
|
||||||
|
HUGE parser option.
|
||||||
|
---
|
||||||
|
include/libxml/parser.h | 1 +
|
||||||
|
parser.c | 44 ++++++++++++++++++++++++++++++++++++++------
|
||||||
|
parserInternals.c | 2 ++
|
||||||
|
3 files changed, 41 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
|
||||||
|
index e1346e4..3f5730d 100644
|
||||||
|
--- a/include/libxml/parser.h
|
||||||
|
+++ b/include/libxml/parser.h
|
||||||
|
@@ -310,6 +310,7 @@ struct _xmlParserCtxt {
|
||||||
|
xmlParserNodeInfo *nodeInfoTab; /* array of nodeInfos */
|
||||||
|
|
||||||
|
int input_id; /* we need to label inputs */
|
||||||
|
+ unsigned long sizeentcopy; /* volume of entity copy */
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
diff --git a/parser.c b/parser.c
|
||||||
|
index 91f8c90..ddf3b5b 100644
|
||||||
|
--- a/parser.c
|
||||||
|
+++ b/parser.c
|
||||||
|
@@ -122,7 +122,7 @@ xmlCreateEntityParserCtxtInternal(const xmlChar *URL, const xmlChar *ID,
|
||||||
|
*/
|
||||||
|
static int
|
||||||
|
xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
|
||||||
|
- xmlEntityPtr ent)
|
||||||
|
+ xmlEntityPtr ent, size_t replacement)
|
||||||
|
{
|
||||||
|
size_t consumed = 0;
|
||||||
|
|
||||||
|
@@ -130,7 +130,24 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
|
||||||
|
return (0);
|
||||||
|
if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP)
|
||||||
|
return (1);
|
||||||
|
- if (size != 0) {
|
||||||
|
+ if (replacement != 0) {
|
||||||
|
+ if (replacement < XML_MAX_TEXT_LENGTH)
|
||||||
|
+ return(0);
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * If the volume of entity copy reaches 10 times the
|
||||||
|
+ * amount of parsed data and over the large text threshold
|
||||||
|
+ * then that's very likely to be an abuse.
|
||||||
|
+ */
|
||||||
|
+ if (ctxt->input != NULL) {
|
||||||
|
+ consumed = ctxt->input->consumed +
|
||||||
|
+ (ctxt->input->cur - ctxt->input->base);
|
||||||
|
+ }
|
||||||
|
+ consumed += ctxt->sizeentities;
|
||||||
|
+
|
||||||
|
+ if (replacement < XML_PARSER_NON_LINEAR * consumed)
|
||||||
|
+ return(0);
|
||||||
|
+ } else if (size != 0) {
|
||||||
|
/*
|
||||||
|
* Do the check based on the replacement size of the entity
|
||||||
|
*/
|
||||||
|
@@ -176,7 +193,6 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
|
||||||
|
*/
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
-
|
||||||
|
xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL);
|
||||||
|
return (1);
|
||||||
|
}
|
||||||
|
@@ -2743,7 +2759,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
|
||||||
|
while (*current != 0) { /* non input consuming loop */
|
||||||
|
buffer[nbchars++] = *current++;
|
||||||
|
if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
|
||||||
|
- if (xmlParserEntityCheck(ctxt, nbchars, ent))
|
||||||
|
+ if (xmlParserEntityCheck(ctxt, nbchars, ent, 0))
|
||||||
|
goto int_error;
|
||||||
|
growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
|
||||||
|
}
|
||||||
|
@@ -2785,7 +2801,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
|
||||||
|
while (*current != 0) { /* non input consuming loop */
|
||||||
|
buffer[nbchars++] = *current++;
|
||||||
|
if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
|
||||||
|
- if (xmlParserEntityCheck(ctxt, nbchars, ent))
|
||||||
|
+ if (xmlParserEntityCheck(ctxt, nbchars, ent, 0))
|
||||||
|
goto int_error;
|
||||||
|
growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
|
||||||
|
}
|
||||||
|
@@ -7203,7 +7219,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
|
||||||
|
xmlFreeNodeList(list);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
- if (xmlParserEntityCheck(ctxt, 0, ent)) {
|
||||||
|
+ if (xmlParserEntityCheck(ctxt, 0, ent, 0)) {
|
||||||
|
xmlFreeNodeList(list);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
@@ -7361,6 +7377,13 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
|
||||||
|
xmlNodePtr nw = NULL, cur, firstChild = NULL;
|
||||||
|
|
||||||
|
/*
|
||||||
|
+ * We are copying here, make sure there is no abuse
|
||||||
|
+ */
|
||||||
|
+ ctxt->sizeentcopy += ent->length;
|
||||||
|
+ if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy))
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
* when operating on a reader, the entities definitions
|
||||||
|
* are always owning the entities subtree.
|
||||||
|
if (ctxt->parseMode == XML_PARSE_READER)
|
||||||
|
@@ -7400,6 +7423,14 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
|
||||||
|
} else if ((list == NULL) || (ctxt->inputNr > 0)) {
|
||||||
|
xmlNodePtr nw = NULL, cur, next, last,
|
||||||
|
firstChild = NULL;
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * We are copying here, make sure there is no abuse
|
||||||
|
+ */
|
||||||
|
+ ctxt->sizeentcopy += ent->length;
|
||||||
|
+ if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy))
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* Copy the entity child list and make it the new
|
||||||
|
* entity child list. The goal is to make sure any
|
||||||
|
@@ -14767,6 +14798,7 @@ xmlCtxtReset(xmlParserCtxtPtr ctxt)
|
||||||
|
ctxt->catalogs = NULL;
|
||||||
|
ctxt->nbentities = 0;
|
||||||
|
ctxt->sizeentities = 0;
|
||||||
|
+ ctxt->sizeentcopy = 0;
|
||||||
|
xmlInitNodeInfoSeq(&ctxt->node_seq);
|
||||||
|
|
||||||
|
if (ctxt->attsDefault != NULL) {
|
||||||
|
diff --git a/parserInternals.c b/parserInternals.c
|
||||||
|
index 02032d5..f8a7041 100644
|
||||||
|
--- a/parserInternals.c
|
||||||
|
+++ b/parserInternals.c
|
||||||
|
@@ -1719,6 +1719,8 @@ xmlInitParserCtxt(xmlParserCtxtPtr ctxt)
|
||||||
|
ctxt->charset = XML_CHAR_ENCODING_UTF8;
|
||||||
|
ctxt->catalogs = NULL;
|
||||||
|
ctxt->nbentities = 0;
|
||||||
|
+ ctxt->sizeentities = 0;
|
||||||
|
+ ctxt->sizeentcopy = 0;
|
||||||
|
ctxt->input_id = 1;
|
||||||
|
xmlInitNodeInfoSeq(&ctxt->node_seq);
|
||||||
|
return(0);
|
||||||
|
--
|
||||||
|
1.8.1.2
|
||||||
|
|
@ -0,0 +1,656 @@
|
|||||||
|
http://rt.openssl.org/Ticket/Display.html?id=2051
|
||||||
|
user/pass: guest/guest
|
||||||
|
|
||||||
|
Index: apps/s_apps.h
|
||||||
|
===================================================================
|
||||||
|
RCS file: /v/openssl/cvs/openssl/apps/s_apps.h,v
|
||||||
|
retrieving revision 1.21.2.1
|
||||||
|
diff -u -r1.21.2.1 s_apps.h
|
||||||
|
--- apps/s_apps.h 4 Sep 2009 17:42:04 -0000 1.21.2.1
|
||||||
|
+++ apps/s_apps.h 28 Dec 2011 00:28:14 -0000
|
||||||
|
@@ -148,7 +148,7 @@
|
||||||
|
#define PORT_STR "4433"
|
||||||
|
#define PROTOCOL "tcp"
|
||||||
|
|
||||||
|
-int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
|
||||||
|
+int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6);
|
||||||
|
#ifdef HEADER_X509_H
|
||||||
|
int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
|
||||||
|
#endif
|
||||||
|
@@ -156,7 +156,7 @@
|
||||||
|
int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
|
||||||
|
int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);
|
||||||
|
#endif
|
||||||
|
-int init_client(int *sock, char *server, int port, int type);
|
||||||
|
+int init_client(int *sock, char *server, int port, int type, int use_ipv4, int use_ipv6);
|
||||||
|
int should_retry(int i);
|
||||||
|
int extract_port(char *str, short *port_ptr);
|
||||||
|
int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
|
||||||
|
Index: apps/s_client.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /v/openssl/cvs/openssl/apps/s_client.c,v
|
||||||
|
retrieving revision 1.123.2.6.2.10
|
||||||
|
diff -u -r1.123.2.6.2.10 s_client.c
|
||||||
|
--- apps/s_client.c 14 Dec 2011 22:18:02 -0000 1.123.2.6.2.10
|
||||||
|
+++ apps/s_client.c 28 Dec 2011 00:28:14 -0000
|
||||||
|
@@ -285,6 +285,10 @@
|
||||||
|
{
|
||||||
|
BIO_printf(bio_err,"usage: s_client args\n");
|
||||||
|
BIO_printf(bio_err,"\n");
|
||||||
|
+ BIO_printf(bio_err," -4 - use IPv4 only\n");
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ BIO_printf(bio_err," -6 - use IPv6 only\n");
|
||||||
|
+#endif
|
||||||
|
BIO_printf(bio_err," -host host - use -connect instead\n");
|
||||||
|
BIO_printf(bio_err," -port port - use -connect instead\n");
|
||||||
|
BIO_printf(bio_err," -connect host:port - who to connect to (default is %s:%s)\n",SSL_HOST_NAME,PORT_STR);
|
||||||
|
@@ -564,6 +567,7 @@
|
||||||
|
int sbuf_len,sbuf_off;
|
||||||
|
fd_set readfds,writefds;
|
||||||
|
short port=PORT;
|
||||||
|
+ int use_ipv4, use_ipv6;
|
||||||
|
int full_log=1;
|
||||||
|
char *host=SSL_HOST_NAME;
|
||||||
|
char *cert_file=NULL,*key_file=NULL;
|
||||||
|
@@ -609,7 +613,11 @@
|
||||||
|
#endif
|
||||||
|
char *sess_in = NULL;
|
||||||
|
char *sess_out = NULL;
|
||||||
|
- struct sockaddr peer;
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ struct sockaddr_storage peer;
|
||||||
|
+#else
|
||||||
|
+ struct sockaddr_in peer;
|
||||||
|
+#endif
|
||||||
|
int peerlen = sizeof(peer);
|
||||||
|
int enable_timeouts = 0 ;
|
||||||
|
long socket_mtu = 0;
|
||||||
|
@@ -630,6 +638,12 @@
|
||||||
|
meth=SSLv2_client_method();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ use_ipv4 = 1;
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ use_ipv6 = 1;
|
||||||
|
+#else
|
||||||
|
+ use_ipv6 = 0;
|
||||||
|
+#endif
|
||||||
|
apps_startup();
|
||||||
|
c_Pause=0;
|
||||||
|
c_quiet=0;
|
||||||
|
@@ -951,6 +961,18 @@
|
||||||
|
jpake_secret = *++argv;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
+ else if (strcmp(*argv,"-4") == 0)
|
||||||
|
+ {
|
||||||
|
+ use_ipv4 = 1;
|
||||||
|
+ use_ipv6 = 0;
|
||||||
|
+ }
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ else if (strcmp(*argv,"-6") == 0)
|
||||||
|
+ {
|
||||||
|
+ use_ipv4 = 0;
|
||||||
|
+ use_ipv6 = 1;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
#ifndef OPENSSL_NO_SRTP
|
||||||
|
else if (strcmp(*argv,"-use_srtp") == 0)
|
||||||
|
{
|
||||||
|
@@ -1259,7 +1276,7 @@
|
||||||
|
|
||||||
|
re_start:
|
||||||
|
|
||||||
|
- if (init_client(&s,host,port,socket_type) == 0)
|
||||||
|
+ if (init_client(&s,host,port,socket_type,use_ipv4,use_ipv6) == 0)
|
||||||
|
{
|
||||||
|
BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error());
|
||||||
|
SHUTDOWN(s);
|
||||||
|
@@ -1285,7 +1302,7 @@
|
||||||
|
{
|
||||||
|
|
||||||
|
sbio=BIO_new_dgram(s,BIO_NOCLOSE);
|
||||||
|
- if (getsockname(s, &peer, (void *)&peerlen) < 0)
|
||||||
|
+ if (getsockname(s, (struct sockaddr *)&peer, (void *)&peerlen) < 0)
|
||||||
|
{
|
||||||
|
BIO_printf(bio_err, "getsockname:errno=%d\n",
|
||||||
|
get_last_socket_error());
|
||||||
|
===================================================================
|
||||||
|
RCS file: /v/openssl/cvs/openssl/apps/s_server.c,v
|
||||||
|
retrieving revision 1.136.2.15.2.13
|
||||||
|
diff -u -r1.136.2.15.2.13 s_server.c
|
||||||
|
--- apps/s_server.c 27 Dec 2011 14:23:22 -0000 1.136.2.15.2.13
|
||||||
|
+++ apps/s_server.c 28 Dec 2011 00:28:14 -0000
|
||||||
|
@@ -558,6 +558,10 @@
|
||||||
|
# endif
|
||||||
|
BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list");
|
||||||
|
#endif
|
||||||
|
+ BIO_printf(bio_err," -4 - use IPv4 only\n");
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ BIO_printf(bio_err," -6 - use IPv6 only\n");
|
||||||
|
+#endif
|
||||||
|
BIO_printf(bio_err," -keymatexport label - Export keying material using label\n");
|
||||||
|
BIO_printf(bio_err," -keymatexportlen len - Export len bytes of keying material (default 20)\n");
|
||||||
|
}
|
||||||
|
@@ -943,6 +947,7 @@
|
||||||
|
int state=0;
|
||||||
|
const SSL_METHOD *meth=NULL;
|
||||||
|
int socket_type=SOCK_STREAM;
|
||||||
|
+ int use_ipv4, use_ipv6;
|
||||||
|
ENGINE *e=NULL;
|
||||||
|
char *inrand=NULL;
|
||||||
|
int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM;
|
||||||
|
@@ -981,6 +986,12 @@
|
||||||
|
/* #error no SSL version enabled */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ use_ipv4 = 1;
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ use_ipv6 = 1;
|
||||||
|
+#else
|
||||||
|
+ use_ipv6 = 0;
|
||||||
|
+#endif
|
||||||
|
local_argc=argc;
|
||||||
|
local_argv=argv;
|
||||||
|
|
||||||
|
@@ -1329,6 +1340,18 @@
|
||||||
|
jpake_secret = *(++argv);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
+ else if (strcmp(*argv,"-4") == 0)
|
||||||
|
+ {
|
||||||
|
+ use_ipv4 = 1;
|
||||||
|
+ use_ipv6 = 0;
|
||||||
|
+ }
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ else if (strcmp(*argv,"-6") == 0)
|
||||||
|
+ {
|
||||||
|
+ use_ipv4 = 0;
|
||||||
|
+ use_ipv6 = 1;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
#ifndef OPENSSL_NO_SRTP
|
||||||
|
else if (strcmp(*argv,"-use_srtp") == 0)
|
||||||
|
{
|
||||||
|
@@ -1884,9 +1907,9 @@
|
||||||
|
BIO_printf(bio_s_out,"ACCEPT\n");
|
||||||
|
(void)BIO_flush(bio_s_out);
|
||||||
|
if (www)
|
||||||
|
- do_server(port,socket_type,&accept_socket,www_body, context);
|
||||||
|
+ do_server(port,socket_type,&accept_socket,www_body, context, use_ipv4, use_ipv6);
|
||||||
|
else
|
||||||
|
- do_server(port,socket_type,&accept_socket,sv_body, context);
|
||||||
|
+ do_server(port,socket_type,&accept_socket,sv_body, context, use_ipv4, use_ipv6);
|
||||||
|
print_stats(bio_s_out,ctx);
|
||||||
|
ret=0;
|
||||||
|
end:
|
||||||
|
Index: apps/s_socket.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /v/openssl/cvs/openssl/apps/s_socket.c,v
|
||||||
|
retrieving revision 1.43.2.3.2.2
|
||||||
|
diff -u -r1.43.2.3.2.2 s_socket.c
|
||||||
|
--- apps/s_socket.c 2 Dec 2011 14:39:40 -0000 1.43.2.3.2.2
|
||||||
|
+++ apps/s_socket.c 28 Dec 2011 00:28:14 -0000
|
||||||
|
@@ -97,16 +97,16 @@
|
||||||
|
#include "netdb.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-static struct hostent *GetHostByName(char *name);
|
||||||
|
+static struct hostent *GetHostByName(char *name, int domain);
|
||||||
|
#if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
|
||||||
|
static void ssl_sock_cleanup(void);
|
||||||
|
#endif
|
||||||
|
static int ssl_sock_init(void);
|
||||||
|
-static int init_client_ip(int *sock,unsigned char ip[4], int port, int type);
|
||||||
|
-static int init_server(int *sock, int port, int type);
|
||||||
|
-static int init_server_long(int *sock, int port,char *ip, int type);
|
||||||
|
+static int init_client_ip(int *sock,unsigned char *ip, int port, int type, int domain);
|
||||||
|
+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6);
|
||||||
|
+static int init_server_long(int *sock, int port,char *ip, int type, int use_ipv4, int use_ipv6);
|
||||||
|
static int do_accept(int acc_sock, int *sock, char **host);
|
||||||
|
-static int host_ip(char *str, unsigned char ip[4]);
|
||||||
|
+static int host_ip(char *str, unsigned char *ip, int domain);
|
||||||
|
|
||||||
|
#ifdef OPENSSL_SYS_WIN16
|
||||||
|
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
|
||||||
|
@@ -234,38 +234,68 @@
|
||||||
|
return(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
-int init_client(int *sock, char *host, int port, int type)
|
||||||
|
+int init_client(int *sock, char *host, int port, int type, int use_ipv4, int use_ipv6)
|
||||||
|
{
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ unsigned char ip[16];
|
||||||
|
+#else
|
||||||
|
unsigned char ip[4];
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
- memset(ip, '\0', sizeof ip);
|
||||||
|
- if (!host_ip(host,&(ip[0])))
|
||||||
|
- return 0;
|
||||||
|
- return init_client_ip(sock,ip,port,type);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
|
||||||
|
- {
|
||||||
|
- unsigned long addr;
|
||||||
|
+ if (use_ipv4)
|
||||||
|
+ if (host_ip(host,ip,AF_INET))
|
||||||
|
+ return(init_client_ip(sock,ip,port,type,AF_INET));
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ if (use_ipv6)
|
||||||
|
+ if (host_ip(host,ip,AF_INET6))
|
||||||
|
+ return(init_client_ip(sock,ip,port,type,AF_INET6));
|
||||||
|
+#endif
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+static int init_client_ip(int *sock, unsigned char ip[4], int port, int type, int domain)
|
||||||
|
+ {
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ struct sockaddr_storage them;
|
||||||
|
+ struct sockaddr_in *them_in = (struct sockaddr_in *)&them;
|
||||||
|
+ struct sockaddr_in6 *them_in6 = (struct sockaddr_in6 *)&them;
|
||||||
|
+#else
|
||||||
|
struct sockaddr_in them;
|
||||||
|
+ struct sockaddr_in *them_in = &them;
|
||||||
|
+#endif
|
||||||
|
+ socklen_t addr_len;
|
||||||
|
int s,i;
|
||||||
|
|
||||||
|
if (!ssl_sock_init()) return(0);
|
||||||
|
|
||||||
|
memset((char *)&them,0,sizeof(them));
|
||||||
|
- them.sin_family=AF_INET;
|
||||||
|
- them.sin_port=htons((unsigned short)port);
|
||||||
|
- addr=(unsigned long)
|
||||||
|
- ((unsigned long)ip[0]<<24L)|
|
||||||
|
- ((unsigned long)ip[1]<<16L)|
|
||||||
|
- ((unsigned long)ip[2]<< 8L)|
|
||||||
|
- ((unsigned long)ip[3]);
|
||||||
|
- them.sin_addr.s_addr=htonl(addr);
|
||||||
|
+ if (domain == AF_INET)
|
||||||
|
+ {
|
||||||
|
+ addr_len = (socklen_t)sizeof(struct sockaddr_in);
|
||||||
|
+ them_in->sin_family=AF_INET;
|
||||||
|
+ them_in->sin_port=htons((unsigned short)port);
|
||||||
|
+#ifndef BIT_FIELD_LIMITS
|
||||||
|
+ memcpy(&them_in->sin_addr.s_addr, ip, 4);
|
||||||
|
+#else
|
||||||
|
+ memcpy(&them_in->sin_addr, ip, 4);
|
||||||
|
+#endif
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ {
|
||||||
|
+ addr_len = (socklen_t)sizeof(struct sockaddr_in6);
|
||||||
|
+ them_in6->sin6_family=AF_INET6;
|
||||||
|
+ them_in6->sin6_port=htons((unsigned short)port);
|
||||||
|
+ memcpy(&(them_in6->sin6_addr), ip, sizeof(struct in6_addr));
|
||||||
|
+ }
|
||||||
|
+#else
|
||||||
|
+ return(0);
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
if (type == SOCK_STREAM)
|
||||||
|
- s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
|
||||||
|
+ s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL);
|
||||||
|
else /* ( type == SOCK_DGRAM) */
|
||||||
|
- s=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
|
||||||
|
+ s=socket(domain,SOCK_DGRAM,IPPROTO_UDP);
|
||||||
|
|
||||||
|
if (s == INVALID_SOCKET) { perror("socket"); return(0); }
|
||||||
|
|
||||||
|
@@ -277,29 +315,27 @@
|
||||||
|
if (i < 0) { perror("keepalive"); return(0); }
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
-
|
||||||
|
- if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
|
||||||
|
+ if (connect(s,(struct sockaddr *)&them,addr_len) == -1)
|
||||||
|
{ closesocket(s); perror("connect"); return(0); }
|
||||||
|
*sock=s;
|
||||||
|
return(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
-int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
|
||||||
|
+int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6)
|
||||||
|
{
|
||||||
|
int sock;
|
||||||
|
char *name = NULL;
|
||||||
|
int accept_socket = 0;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
- if (!init_server(&accept_socket,port,type)) return(0);
|
||||||
|
-
|
||||||
|
+ if (!init_server(&accept_socket,port,type, use_ipv4, use_ipv6)) return(0);
|
||||||
|
if (ret != NULL)
|
||||||
|
{
|
||||||
|
*ret=accept_socket;
|
||||||
|
/* return(1);*/
|
||||||
|
}
|
||||||
|
- for (;;)
|
||||||
|
- {
|
||||||
|
+ for (;;)
|
||||||
|
+ {
|
||||||
|
if (type==SOCK_STREAM)
|
||||||
|
{
|
||||||
|
if (do_accept(accept_socket,&sock,&name) == 0)
|
||||||
|
@@ -322,41 +358,88 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int init_server_long(int *sock, int port, char *ip, int type)
|
||||||
|
+static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6)
|
||||||
|
{
|
||||||
|
int ret=0;
|
||||||
|
+ int domain;
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ struct sockaddr_storage server;
|
||||||
|
+ struct sockaddr_in *server_in = (struct sockaddr_in *)&server;
|
||||||
|
+ struct sockaddr_in6 *server_in6 = (struct sockaddr_in6 *)&server;
|
||||||
|
+#else
|
||||||
|
struct sockaddr_in server;
|
||||||
|
+ struct sockaddr_in *server_in = &server;
|
||||||
|
+#endif
|
||||||
|
+ socklen_t addr_len;
|
||||||
|
int s= -1;
|
||||||
|
|
||||||
|
+ if (!use_ipv4 && !use_ipv6)
|
||||||
|
+ goto err;
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ /* we are fine here */
|
||||||
|
+#else
|
||||||
|
+ if (use_ipv6)
|
||||||
|
+ goto err;
|
||||||
|
+#endif
|
||||||
|
if (!ssl_sock_init()) return(0);
|
||||||
|
|
||||||
|
- memset((char *)&server,0,sizeof(server));
|
||||||
|
- server.sin_family=AF_INET;
|
||||||
|
- server.sin_port=htons((unsigned short)port);
|
||||||
|
- if (ip == NULL)
|
||||||
|
- server.sin_addr.s_addr=INADDR_ANY;
|
||||||
|
- else
|
||||||
|
-/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
|
||||||
|
-#ifndef BIT_FIELD_LIMITS
|
||||||
|
- memcpy(&server.sin_addr.s_addr,ip,4);
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ domain = use_ipv6 ? AF_INET6 : AF_INET;
|
||||||
|
#else
|
||||||
|
- memcpy(&server.sin_addr,ip,4);
|
||||||
|
+ domain = AF_INET;
|
||||||
|
#endif
|
||||||
|
-
|
||||||
|
- if (type == SOCK_STREAM)
|
||||||
|
- s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
|
||||||
|
- else /* type == SOCK_DGRAM */
|
||||||
|
- s=socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP);
|
||||||
|
+ if (type == SOCK_STREAM)
|
||||||
|
+ s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL);
|
||||||
|
+ else /* type == SOCK_DGRAM */
|
||||||
|
+ s=socket(domain, SOCK_DGRAM,IPPROTO_UDP);
|
||||||
|
|
||||||
|
if (s == INVALID_SOCKET) goto err;
|
||||||
|
#if defined SOL_SOCKET && defined SO_REUSEADDR
|
||||||
|
+ {
|
||||||
|
+ int j = 1;
|
||||||
|
+ setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
|
||||||
|
+ (void *) &j, sizeof j);
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ if ((use_ipv4 == 0) && (use_ipv6 == 1))
|
||||||
|
{
|
||||||
|
- int j = 1;
|
||||||
|
- setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
|
||||||
|
- (void *) &j, sizeof j);
|
||||||
|
+ const int on = 1;
|
||||||
|
+
|
||||||
|
+ setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
|
||||||
|
+ (const void *) &on, sizeof(int));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
- if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
|
||||||
|
+ if (domain == AF_INET)
|
||||||
|
+ {
|
||||||
|
+ addr_len = (socklen_t)sizeof(struct sockaddr_in);
|
||||||
|
+ memset(server_in, 0, sizeof(struct sockaddr_in));
|
||||||
|
+ server_in->sin_family=AF_INET;
|
||||||
|
+ server_in->sin_port = htons((unsigned short)port);
|
||||||
|
+ if (ip == NULL)
|
||||||
|
+ server_in->sin_addr.s_addr = htonl(INADDR_ANY);
|
||||||
|
+ else
|
||||||
|
+/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
|
||||||
|
+#ifndef BIT_FIELD_LIMITS
|
||||||
|
+ memcpy(&server_in->sin_addr.s_addr, ip, 4);
|
||||||
|
+#else
|
||||||
|
+ memcpy(&server_in->sin_addr, ip, 4);
|
||||||
|
+#endif
|
||||||
|
+ }
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ addr_len = (socklen_t)sizeof(struct sockaddr_in6);
|
||||||
|
+ memset(server_in6, 0, sizeof(struct sockaddr_in6));
|
||||||
|
+ server_in6->sin6_family = AF_INET6;
|
||||||
|
+ server_in6->sin6_port = htons((unsigned short)port);
|
||||||
|
+ if (ip == NULL)
|
||||||
|
+ server_in6->sin6_addr = in6addr_any;
|
||||||
|
+ else
|
||||||
|
+ memcpy(&server_in6->sin6_addr, ip, sizeof(struct in6_addr));
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+ if (bind(s, (struct sockaddr *)&server, addr_len) == -1)
|
||||||
|
{
|
||||||
|
#ifndef OPENSSL_SYS_WINDOWS
|
||||||
|
perror("bind");
|
||||||
|
@@ -375,16 +458,23 @@
|
||||||
|
return(ret);
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int init_server(int *sock, int port, int type)
|
||||||
|
+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6)
|
||||||
|
{
|
||||||
|
- return(init_server_long(sock, port, NULL, type));
|
||||||
|
+ return(init_server_long(sock, port, NULL, type, use_ipv4, use_ipv6));
|
||||||
|
}
|
||||||
|
|
||||||
|
static int do_accept(int acc_sock, int *sock, char **host)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
struct hostent *h1,*h2;
|
||||||
|
- static struct sockaddr_in from;
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ struct sockaddr_storage from;
|
||||||
|
+ struct sockaddr_in *from_in = (struct sockaddr_in *)&from;
|
||||||
|
+ struct sockaddr_in6 *from_in6 = (struct sockaddr_in6 *)&from;
|
||||||
|
+#else
|
||||||
|
+ struct sockaddr_in from;
|
||||||
|
+ struct sockaddr_in *from_in = &from;
|
||||||
|
+#endif
|
||||||
|
int len;
|
||||||
|
/* struct linger ling; */
|
||||||
|
|
||||||
|
@@ -431,13 +521,23 @@
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (host == NULL) goto end;
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ if (from.ss_family == AF_INET)
|
||||||
|
+#else
|
||||||
|
+ if (from.sin_family == AF_INET)
|
||||||
|
+#endif
|
||||||
|
#ifndef BIT_FIELD_LIMITS
|
||||||
|
- /* I should use WSAAsyncGetHostByName() under windows */
|
||||||
|
- h1=gethostbyaddr((char *)&from.sin_addr.s_addr,
|
||||||
|
- sizeof(from.sin_addr.s_addr),AF_INET);
|
||||||
|
+ /* I should use WSAAsyncGetHostByName() under windows */
|
||||||
|
+ h1=gethostbyaddr((char *)&from_in->sin_addr.s_addr,
|
||||||
|
+ sizeof(from_in->sin_addr.s_addr), AF_INET);
|
||||||
|
#else
|
||||||
|
- h1=gethostbyaddr((char *)&from.sin_addr,
|
||||||
|
- sizeof(struct in_addr),AF_INET);
|
||||||
|
+ h1=gethostbyaddr((char *)&from_in->sin_addr,
|
||||||
|
+ sizeof(struct in_addr), AF_INET);
|
||||||
|
+#endif
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ else
|
||||||
|
+ h1=gethostbyaddr((char *)&from_in6->sin6_addr,
|
||||||
|
+ sizeof(struct in6_addr), AF_INET6);
|
||||||
|
#endif
|
||||||
|
if (h1 == NULL)
|
||||||
|
{
|
||||||
|
@@ -454,15 +554,23 @@
|
||||||
|
}
|
||||||
|
BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1);
|
||||||
|
|
||||||
|
- h2=GetHostByName(*host);
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ h2=GetHostByName(*host, from.ss_family);
|
||||||
|
+#else
|
||||||
|
+ h2=GetHostByName(*host, from.sin_family);
|
||||||
|
+#endif
|
||||||
|
if (h2 == NULL)
|
||||||
|
{
|
||||||
|
BIO_printf(bio_err,"gethostbyname failure\n");
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
|
- if (h2->h_addrtype != AF_INET)
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ if (h2->h_addrtype != from.ss_family)
|
||||||
|
+#else
|
||||||
|
+ if (h2->h_addrtype != from.sin_family)
|
||||||
|
+#endif
|
||||||
|
{
|
||||||
|
- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
|
||||||
|
+ BIO_printf(bio_err,"gethostbyname addr address is not correct\n");
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -477,7 +585,7 @@
|
||||||
|
char *h,*p;
|
||||||
|
|
||||||
|
h=str;
|
||||||
|
- p=strchr(str,':');
|
||||||
|
+ p=strrchr(str,':');
|
||||||
|
if (p == NULL)
|
||||||
|
{
|
||||||
|
BIO_printf(bio_err,"no port defined\n");
|
||||||
|
@@ -485,7 +593,7 @@
|
||||||
|
}
|
||||||
|
*(p++)='\0';
|
||||||
|
|
||||||
|
- if ((ip != NULL) && !host_ip(str,ip))
|
||||||
|
+ if ((ip != NULL) && !host_ip(str,ip,AF_INET))
|
||||||
|
goto err;
|
||||||
|
if (host_ptr != NULL) *host_ptr=h;
|
||||||
|
|
||||||
|
@@ -496,48 +604,58 @@
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int host_ip(char *str, unsigned char ip[4])
|
||||||
|
+static int host_ip(char *str, unsigned char *ip, int domain)
|
||||||
|
{
|
||||||
|
- unsigned int in[4];
|
||||||
|
+ unsigned int in[4];
|
||||||
|
+ unsigned long l;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
- if (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4)
|
||||||
|
+ if ((domain == AF_INET) &&
|
||||||
|
+ (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4))
|
||||||
|
{
|
||||||
|
+
|
||||||
|
for (i=0; i<4; i++)
|
||||||
|
if (in[i] > 255)
|
||||||
|
{
|
||||||
|
BIO_printf(bio_err,"invalid IP address\n");
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
- ip[0]=in[0];
|
||||||
|
- ip[1]=in[1];
|
||||||
|
- ip[2]=in[2];
|
||||||
|
- ip[3]=in[3];
|
||||||
|
- }
|
||||||
|
+ l=htonl((in[0]<<24L)|(in[1]<<16L)|(in[2]<<8L)|in[3]);
|
||||||
|
+ memcpy(ip, &l, 4);
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ else if ((domain == AF_INET6) &&
|
||||||
|
+ (inet_pton(AF_INET6, str, ip) == 1))
|
||||||
|
+ return 1;
|
||||||
|
+#endif
|
||||||
|
else
|
||||||
|
{ /* do a gethostbyname */
|
||||||
|
struct hostent *he;
|
||||||
|
|
||||||
|
if (!ssl_sock_init()) return(0);
|
||||||
|
|
||||||
|
- he=GetHostByName(str);
|
||||||
|
+ he=GetHostByName(str,domain);
|
||||||
|
if (he == NULL)
|
||||||
|
{
|
||||||
|
BIO_printf(bio_err,"gethostbyname failure\n");
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
/* cast to short because of win16 winsock definition */
|
||||||
|
- if ((short)he->h_addrtype != AF_INET)
|
||||||
|
+ if ((short)he->h_addrtype != domain)
|
||||||
|
{
|
||||||
|
- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
|
||||||
|
+ BIO_printf(bio_err,"gethostbyname addr family is not correct\n");
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
|
- ip[0]=he->h_addr_list[0][0];
|
||||||
|
- ip[1]=he->h_addr_list[0][1];
|
||||||
|
- ip[2]=he->h_addr_list[0][2];
|
||||||
|
- ip[3]=he->h_addr_list[0][3];
|
||||||
|
+ if (domain == AF_INET)
|
||||||
|
+ memset(ip, 0, 4);
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ else
|
||||||
|
+ memset(ip, 0, 16);
|
||||||
|
+#endif
|
||||||
|
+ memcpy(ip, he->h_addr_list[0], he->h_length);
|
||||||
|
+ return 1;
|
||||||
|
}
|
||||||
|
- return(1);
|
||||||
|
err:
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
|
@@ -574,7 +692,7 @@
|
||||||
|
static unsigned long ghbn_hits=0L;
|
||||||
|
static unsigned long ghbn_miss=0L;
|
||||||
|
|
||||||
|
-static struct hostent *GetHostByName(char *name)
|
||||||
|
+static struct hostent *GetHostByName(char *name, int domain)
|
||||||
|
{
|
||||||
|
struct hostent *ret;
|
||||||
|
int i,lowi=0;
|
||||||
|
@@ -589,14 +707,20 @@
|
||||||
|
}
|
||||||
|
if (ghbn_cache[i].order > 0)
|
||||||
|
{
|
||||||
|
- if (strncmp(name,ghbn_cache[i].name,128) == 0)
|
||||||
|
+ if ((strncmp(name,ghbn_cache[i].name,128) == 0) &&
|
||||||
|
+ (ghbn_cache[i].ent.h_addrtype == domain))
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (i == GHBN_NUM) /* no hit*/
|
||||||
|
{
|
||||||
|
ghbn_miss++;
|
||||||
|
- ret=gethostbyname(name);
|
||||||
|
+ if (domain == AF_INET)
|
||||||
|
+ ret=gethostbyname(name);
|
||||||
|
+#if OPENSSL_USE_IPV6
|
||||||
|
+ else
|
||||||
|
+ ret=gethostbyname2(name, AF_INET6);
|
||||||
|
+#endif
|
||||||
|
if (ret == NULL) return(NULL);
|
||||||
|
/* else add to cache */
|
||||||
|
if(strlen(name) < sizeof ghbn_cache[0].name)
|
@ -0,0 +1,221 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1e.ebuild,v 1.1 2013/02/20 19:14:48 vapier Exp $
|
||||||
|
|
||||||
|
EAPI="4"
|
||||||
|
|
||||||
|
inherit eutils flag-o-matic toolchain-funcs multilib
|
||||||
|
|
||||||
|
REV="1.7"
|
||||||
|
DESCRIPTION="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)"
|
||||||
|
HOMEPAGE="http://www.openssl.org/"
|
||||||
|
SRC_URI="mirror://openssl/source/${P}.tar.gz
|
||||||
|
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"
|
||||||
|
|
||||||
|
LICENSE="openssl"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
|
||||||
|
IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib"
|
||||||
|
|
||||||
|
# Have the sub-libs in RDEPEND with [static-libs] since, logically,
|
||||||
|
# our libssl.a depends on libz.a/etc... at runtime.
|
||||||
|
LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] )
|
||||||
|
zlib? ( sys-libs/zlib[static-libs(+)] )
|
||||||
|
kerberos? ( app-crypt/mit-krb5 )"
|
||||||
|
# The blocks are temporary just to make sure people upgrade to a
|
||||||
|
# version that lack runtime version checking. We'll drop them in
|
||||||
|
# the future.
|
||||||
|
RDEPEND="static-libs? ( ${LIB_DEPEND} )
|
||||||
|
!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
|
||||||
|
!<net-misc/openssh-5.9_p1-r4
|
||||||
|
!<net-libs/neon-0.29.6-r1"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
sys-apps/diffutils
|
||||||
|
>=dev-lang/perl-5
|
||||||
|
test? ( sys-devel/bc )"
|
||||||
|
PDEPEND="app-misc/ca-certificates"
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
unpack ${P}.tar.gz
|
||||||
|
SSL_CNF_DIR="/etc/ssl"
|
||||||
|
sed \
|
||||||
|
-e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
|
||||||
|
-e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
|
||||||
|
"${DISTDIR}"/${PN}-c_rehash.sh.${REV} \
|
||||||
|
> "${WORKDIR}"/c_rehash || die #416717
|
||||||
|
}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
# Make sure we only ever touch Makefile.org and avoid patching a file
|
||||||
|
# that gets blown away anyways by the Configure script in src_configure
|
||||||
|
rm -f Makefile
|
||||||
|
|
||||||
|
if ! use vanilla ; then
|
||||||
|
epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
|
||||||
|
epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
|
||||||
|
epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-1.0.1-parallel-build.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-1.0.1-x32.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-1.0.1e-ipv6.patch
|
||||||
|
epatch_user #332661
|
||||||
|
fi
|
||||||
|
|
||||||
|
# disable fips in the build
|
||||||
|
# make sure the man pages are suffixed #302165
|
||||||
|
# don't bother building man pages if they're disabled
|
||||||
|
sed -i \
|
||||||
|
-e '/DIRS/s: fips : :g' \
|
||||||
|
-e '/^MANSUFFIX/s:=.*:=ssl:' \
|
||||||
|
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
|
||||||
|
-e $(has noman FEATURES \
|
||||||
|
&& echo '/^install:/s:install_docs::' \
|
||||||
|
|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
|
||||||
|
Makefile.org \
|
||||||
|
|| die
|
||||||
|
# show the actual commands in the log
|
||||||
|
sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
|
||||||
|
|
||||||
|
# allow openssl to be cross-compiled
|
||||||
|
cp "${FILESDIR}"/gentoo.config-1.0.0 gentoo.config || die
|
||||||
|
chmod a+rx gentoo.config
|
||||||
|
|
||||||
|
append-flags -fno-strict-aliasing
|
||||||
|
append-flags $(test-flags-CC -Wa,--noexecstack)
|
||||||
|
|
||||||
|
sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
|
||||||
|
./config --test-sanity || die "I AM NOT SANE"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
unset APPS #197996
|
||||||
|
unset SCRIPTS #312551
|
||||||
|
unset CROSS_COMPILE #311473
|
||||||
|
|
||||||
|
tc-export CC AR RANLIB RC
|
||||||
|
|
||||||
|
# Clean out patent-or-otherwise-encumbered code
|
||||||
|
# Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher)
|
||||||
|
# IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
|
||||||
|
# EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
|
||||||
|
# MDC2: Expired http://en.wikipedia.org/wiki/MDC-2
|
||||||
|
# RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5
|
||||||
|
|
||||||
|
use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
|
||||||
|
echoit() { echo "$@" ; "$@" ; }
|
||||||
|
|
||||||
|
local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
|
||||||
|
|
||||||
|
local sslout=$(./gentoo.config)
|
||||||
|
einfo "Use configuration ${sslout:-(openssl knows best)}"
|
||||||
|
local config="Configure"
|
||||||
|
[[ -z ${sslout} ]] && config="config"
|
||||||
|
echoit \
|
||||||
|
./${config} \
|
||||||
|
${sslout} \
|
||||||
|
$(use sse2 || echo "no-sse2") \
|
||||||
|
enable-camellia \
|
||||||
|
$(use_ssl !bindist ec) \
|
||||||
|
enable-idea \
|
||||||
|
enable-mdc2 \
|
||||||
|
$(use_ssl !bindist rc5) \
|
||||||
|
enable-tlsext \
|
||||||
|
$(use_ssl gmp gmp -lgmp) \
|
||||||
|
$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
|
||||||
|
$(use_ssl rfc3779) \
|
||||||
|
$(use_ssl zlib) \
|
||||||
|
--prefix="${EPREFIX}"/usr \
|
||||||
|
--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
|
||||||
|
--libdir=$(get_libdir) \
|
||||||
|
shared threads \
|
||||||
|
|| die
|
||||||
|
|
||||||
|
# Clean out hardcoded flags that openssl uses
|
||||||
|
local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
|
||||||
|
-e 's:^CFLAG=::' \
|
||||||
|
-e 's:-fomit-frame-pointer ::g' \
|
||||||
|
-e 's:-O[0-9] ::g' \
|
||||||
|
-e 's:-march=[-a-z0-9]* ::g' \
|
||||||
|
-e 's:-mcpu=[-a-z0-9]* ::g' \
|
||||||
|
-e 's:-m[a-z0-9]* ::g' \
|
||||||
|
)
|
||||||
|
sed -i \
|
||||||
|
-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
|
||||||
|
-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
|
||||||
|
Makefile || die
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
# depend is needed to use $confopts; it also doesn't matter
|
||||||
|
# that it's -j1 as the code itself serializes subdirs
|
||||||
|
emake -j1 depend
|
||||||
|
emake all
|
||||||
|
# rehash is needed to prep the certs/ dir; do this
|
||||||
|
# separately to avoid parallel build issues.
|
||||||
|
emake rehash
|
||||||
|
}
|
||||||
|
|
||||||
|
src_test() {
|
||||||
|
emake -j1 test
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
emake INSTALL_PREFIX="${D}" install
|
||||||
|
dobin "${WORKDIR}"/c_rehash #333117
|
||||||
|
dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
|
||||||
|
dohtml -r doc/*
|
||||||
|
use rfc3779 && dodoc engines/ccgost/README.gost
|
||||||
|
|
||||||
|
# This is crappy in that the static archives are still built even
|
||||||
|
# when USE=static-libs. But this is due to a failing in the openssl
|
||||||
|
# build system: the static archives are built as PIC all the time.
|
||||||
|
# Only way around this would be to manually configure+compile openssl
|
||||||
|
# twice; once with shared lib support enabled and once without.
|
||||||
|
use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
|
||||||
|
|
||||||
|
# create the certs directory
|
||||||
|
dodir ${SSL_CNF_DIR}/certs
|
||||||
|
cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
|
||||||
|
rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
|
||||||
|
|
||||||
|
# Namespace openssl programs to prevent conflicts with other man pages
|
||||||
|
cd "${ED}"/usr/share/man
|
||||||
|
local m d s
|
||||||
|
for m in $(find . -type f | xargs grep -L '#include') ; do
|
||||||
|
d=${m%/*} ; d=${d#./} ; m=${m##*/}
|
||||||
|
[[ ${m} == openssl.1* ]] && continue
|
||||||
|
[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
|
||||||
|
mv ${d}/{,ssl-}${m}
|
||||||
|
# fix up references to renamed man pages
|
||||||
|
sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
|
||||||
|
ln -s ssl-${m} ${d}/openssl-${m}
|
||||||
|
# locate any symlinks that point to this man page ... we assume
|
||||||
|
# that any broken links are due to the above renaming
|
||||||
|
for s in $(find -L ${d} -type l) ; do
|
||||||
|
s=${s##*/}
|
||||||
|
rm -f ${d}/${s}
|
||||||
|
ln -s ssl-${m} ${d}/ssl-${s}
|
||||||
|
ln -s ssl-${s} ${d}/openssl-${s}
|
||||||
|
done
|
||||||
|
done
|
||||||
|
[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
|
||||||
|
|
||||||
|
dodir /etc/sandbox.d #254521
|
||||||
|
echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
|
||||||
|
|
||||||
|
diropts -m0700
|
||||||
|
keepdir ${SSL_CNF_DIR}/private
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_preinst() {
|
||||||
|
has_version ${CATEGORY}/${PN}:0.9.8 && return 0
|
||||||
|
preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
|
||||||
|
c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
|
||||||
|
eend $?
|
||||||
|
|
||||||
|
has_version ${CATEGORY}/${PN}:0.9.8 && return 0
|
||||||
|
preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
|
||||||
|
}
|
@ -0,0 +1,128 @@
|
|||||||
|
Index: radlib-2.12.0/debug/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- radlib-2.12.0.orig/debug/Makefile.am
|
||||||
|
+++ radlib-2.12.0/debug/Makefile.am
|
||||||
|
@@ -13,32 +13,4 @@ raddebug_SOURCES = \
|
||||||
|
$(top_srcdir)/debug/raddebug.c
|
||||||
|
|
||||||
|
# define libraries
|
||||||
|
-raddebug_LDADD = -lrad -lpthread
|
||||||
|
-
|
||||||
|
-if MYSQL
|
||||||
|
-raddebug_LDADD += -lmysqlclient
|
||||||
|
-else
|
||||||
|
-if PGRESQL
|
||||||
|
-raddebug_LDADD += -lpq
|
||||||
|
-endif
|
||||||
|
-endif
|
||||||
|
-if SQLITE
|
||||||
|
-raddebug_LDADD += -lsqlite3
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
-# define library directories
|
||||||
|
-raddebug_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib
|
||||||
|
-INCLUDES += -I$(prefix)/include -I/usr/include
|
||||||
|
-
|
||||||
|
-if MYSQL
|
||||||
|
-raddebug_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql
|
||||||
|
-else
|
||||||
|
-if PGRESQL
|
||||||
|
-raddebug_LDFLAGS += -L$(prefix)/pgsql/lib
|
||||||
|
-INCLUDES += -I$(prefix)/pgsql/include
|
||||||
|
-endif
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
-if CROSSCOMPILE
|
||||||
|
-raddebug_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
|
||||||
|
-endif
|
||||||
|
+raddebug_LDADD = ../src/librad.la
|
||||||
|
Index: radlib-2.12.0/msgRouter/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- radlib-2.12.0.orig/msgRouter/Makefile.am
|
||||||
|
+++ radlib-2.12.0/msgRouter/Makefile.am
|
||||||
|
@@ -13,32 +13,4 @@ radmrouted_SOURCES = \
|
||||||
|
$(top_srcdir)/msgRouter/msgRouter.c
|
||||||
|
|
||||||
|
# define libraries
|
||||||
|
-radmrouted_LDADD = -lrad -lpthread
|
||||||
|
-
|
||||||
|
-if MYSQL
|
||||||
|
-radmrouted_LDADD += -lmysqlclient
|
||||||
|
-else
|
||||||
|
-if PGRESQL
|
||||||
|
-radmrouted_LDADD += -lpq
|
||||||
|
-endif
|
||||||
|
-endif
|
||||||
|
-if SQLITE
|
||||||
|
-radmrouted_LDADD += -lsqlite3
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
-# define library directories
|
||||||
|
-radmrouted_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib
|
||||||
|
-INCLUDES += -I$(prefix)/include -I/usr/include
|
||||||
|
-
|
||||||
|
-if MYSQL
|
||||||
|
-radmrouted_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql
|
||||||
|
-else
|
||||||
|
-if PGRESQL
|
||||||
|
-radmrouted_LDFLAGS += -L$(prefix)/lib -L$(prefix)/pgsql/lib
|
||||||
|
-INCLUDES += -I$(prefix)/pgsql/include
|
||||||
|
-endif
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
-if CROSSCOMPILE
|
||||||
|
-radmrouted_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
|
||||||
|
-endif
|
||||||
|
+radmrouted_LDADD = ../src/librad.la
|
||||||
|
Index: radlib-2.12.0/src/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- radlib-2.12.0.orig/src/Makefile.am
|
||||||
|
+++ radlib-2.12.0/src/Makefile.am
|
||||||
|
@@ -12,6 +12,9 @@ SUBDIRS =
|
||||||
|
#define the library to be built
|
||||||
|
lib_LTLIBRARIES = librad.la
|
||||||
|
|
||||||
|
+librad_la_LDFLAGS =
|
||||||
|
+librad_la_LIBADD = -lpthread
|
||||||
|
+
|
||||||
|
if MYSQL
|
||||||
|
MY_INCLUDES = \
|
||||||
|
-I$(prefix)/include/mysql \
|
||||||
|
@@ -21,32 +24,30 @@ MY_SOURCES = \
|
||||||
|
$(top_srcdir)/src/raddatabase.c
|
||||||
|
MYSQL_HDRS = \
|
||||||
|
$(top_srcdir)/h/raddatabase.h
|
||||||
|
+librad_la_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql
|
||||||
|
+librad_la_LIBADD += -lmysqlclient
|
||||||
|
endif
|
||||||
|
if PGRESQL
|
||||||
|
-PG_INCLUDES = \
|
||||||
|
- -I$(prefix)/include \
|
||||||
|
- -I/usr/include
|
||||||
|
PG_SOURCES = \
|
||||||
|
$(top_srcdir)/database/postgresql/pg_database.c \
|
||||||
|
$(top_srcdir)/src/raddatabase.c
|
||||||
|
PGSQL_HDRS = \
|
||||||
|
$(top_srcdir)/h/raddatabase.h \
|
||||||
|
$(top_srcdir)/database/postgresql/_pg-types.h
|
||||||
|
+librad_la_LDFLAGS += -L$(prefix)/lib -L$(prefix)/pgsql/lib
|
||||||
|
+librad_la_LIBADD += -lpq
|
||||||
|
endif
|
||||||
|
if SQLITE
|
||||||
|
-SQ_INCLUDES = \
|
||||||
|
- -I$(prefix)/include \
|
||||||
|
- -I/usr/include
|
||||||
|
SQ_SOURCES = \
|
||||||
|
$(top_srcdir)/src/radsqlite.c
|
||||||
|
SQLITE_HDRS = \
|
||||||
|
$(top_srcdir)/h/radsqlite.h
|
||||||
|
+librad_la_LIBADD += -lsqlite3
|
||||||
|
endif
|
||||||
|
|
||||||
|
# define include directories
|
||||||
|
INCLUDES = \
|
||||||
|
-I$(top_srcdir)/h \
|
||||||
|
- -I$(prefix)/include \
|
||||||
|
-D_GNU_SOURCE \
|
||||||
|
$(MY_INCLUDES) \
|
||||||
|
$(PG_INCLUDES) \
|
@ -1,4 +1,5 @@
|
|||||||
DIST sord-0.10.0.tar.bz2 272243 SHA256 d8233b3f1386d9ab6c7735a65f41cd75f7f97d68eeeb38985e77087acd81f1b5 SHA512 4550f3d0fb5f61582b59a708d0f556ae686e3a6c3e29c0ce1011b0543217943325905b00d2851ff485c1139863704134818baeeb71d530d0f1509f3167857d82 WHIRLPOOL b88b94746474f41becb54c8fcfaac67d706094160f6320405d29f6b4028a40e8ff302c55c29f26c562d34037d8d147f14a0e62aac62fe5c2d80c25c0d2c135a5
|
DIST sord-0.10.0.tar.bz2 272243 SHA256 d8233b3f1386d9ab6c7735a65f41cd75f7f97d68eeeb38985e77087acd81f1b5 SHA512 4550f3d0fb5f61582b59a708d0f556ae686e3a6c3e29c0ce1011b0543217943325905b00d2851ff485c1139863704134818baeeb71d530d0f1509f3167857d82 WHIRLPOOL b88b94746474f41becb54c8fcfaac67d706094160f6320405d29f6b4028a40e8ff302c55c29f26c562d34037d8d147f14a0e62aac62fe5c2d80c25c0d2c135a5
|
||||||
DIST sord-0.10.4.tar.bz2 275574 SHA256 188b8b22c6aa05a36989093e771264676e8d4f3c43592e805bf26f8422d20f3f SHA512 7e4797631f8a16600eeaddd945418607de504c0c0c15a11f2124240095edcddbd314f96f06cc41045d9cf62b5a683b9759917de54ea96e1eaaf376141e3c1265 WHIRLPOOL 03c9f282a3d333d9c54332cfdc84ac4f2d8b01e38cc78ca3f799ee1c255fb666bf5416f9e3b4200486c58c2cf41233025922cdf7f54b53a4c4301c1a4334b54f
|
DIST sord-0.10.4.tar.bz2 275574 SHA256 188b8b22c6aa05a36989093e771264676e8d4f3c43592e805bf26f8422d20f3f SHA512 7e4797631f8a16600eeaddd945418607de504c0c0c15a11f2124240095edcddbd314f96f06cc41045d9cf62b5a683b9759917de54ea96e1eaaf376141e3c1265 WHIRLPOOL 03c9f282a3d333d9c54332cfdc84ac4f2d8b01e38cc78ca3f799ee1c255fb666bf5416f9e3b4200486c58c2cf41233025922cdf7f54b53a4c4301c1a4334b54f
|
||||||
|
DIST sord-0.12.0.tar.bz2 285075 SHA256 126baa06480b6930f874e8c519d4168d8224f7a3203a49b287e24c6bfdf91cb8 SHA512 c24c82fd4d9f74d10923d0cf405d2eabbaabd66b3b11e29719115515edcd8ccbc4a32866ca510dc676ca6ca833b0d9c8ccf43d36f6b0ef010d0211cee821db02 WHIRLPOOL 76d392bd63270fc2c0cb19ce89fc5bc1cc0777ae230912d831ed74705df96d6b7528f36679e53f0d929825db9042592f88746a31af8d65ee187bcb40ae7d1a1c
|
||||||
DIST sord-0.5.0.tar.bz2 279917 SHA256 0f18879ed9d5c4d056cddb5af9057090d1de874d3f3996386cf716d8060625ef SHA512 620d6bab583f91c60fb635f2470bf73ab1e55912cbe1a8a97c6e51ea281e8dd78f3e480696fc7c0c5170594c75715b1778e94a11192fd8a3604bf16d1b192360 WHIRLPOOL 311aebae8f8540f0974571f6c0c455712b0c0042d55e62e10d39e9ab0ad56572704f7fd45a4149d1bffcdfd8795c281fccf981fdcf13f9c97c8d0fe1a1dbbde9
|
DIST sord-0.5.0.tar.bz2 279917 SHA256 0f18879ed9d5c4d056cddb5af9057090d1de874d3f3996386cf716d8060625ef SHA512 620d6bab583f91c60fb635f2470bf73ab1e55912cbe1a8a97c6e51ea281e8dd78f3e480696fc7c0c5170594c75715b1778e94a11192fd8a3604bf16d1b192360 WHIRLPOOL 311aebae8f8540f0974571f6c0c455712b0c0042d55e62e10d39e9ab0ad56572704f7fd45a4149d1bffcdfd8795c281fccf981fdcf13f9c97c8d0fe1a1dbbde9
|
||||||
DIST sord-0.8.0.tar.bz2 286325 SHA256 99df73a0a859fbfc6423a7d5930d019c8c0e17e04ed101114c54f1911dbd8a59 SHA512 d8b2110851c653806b27e052884f4d6260e24ffffba6f2fdf4164629f867eca50d3e28ee411f8fc6881a016e2277b9891700ccb6aa8895caeb3a3fcf457d2b41 WHIRLPOOL 7ed9f3f43d55f4416644bcc799a06b8e9438b002f71cec91c347c47c4a9e7bb255816d51f5df6e150b229b1c246cce0bc39c066d827d5ff6654a97e7a29eb09b
|
DIST sord-0.8.0.tar.bz2 286325 SHA256 99df73a0a859fbfc6423a7d5930d019c8c0e17e04ed101114c54f1911dbd8a59 SHA512 d8b2110851c653806b27e052884f4d6260e24ffffba6f2fdf4164629f867eca50d3e28ee411f8fc6881a016e2277b9891700ccb6aa8895caeb3a3fcf457d2b41 WHIRLPOOL 7ed9f3f43d55f4416644bcc799a06b8e9438b002f71cec91c347c47c4a9e7bb255816d51f5df6e150b229b1c246cce0bc39c066d827d5ff6654a97e7a29eb09b
|
||||||
|
@ -0,0 +1,39 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-libs/sord/sord-0.12.0.ebuild,v 1.1 2013/02/21 10:12:33 aballier Exp $
|
||||||
|
|
||||||
|
EAPI=4
|
||||||
|
|
||||||
|
inherit waf-utils
|
||||||
|
|
||||||
|
DESCRIPTION="Library for storing RDF data in memory"
|
||||||
|
HOMEPAGE="http://drobilla.net/software/sord/"
|
||||||
|
SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
|
||||||
|
|
||||||
|
LICENSE="ISC"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~ppc ~x86"
|
||||||
|
IUSE="doc static-libs test"
|
||||||
|
|
||||||
|
RDEPEND=">=dev-libs/serd-0.14.0"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
doc? ( app-doc/doxygen )
|
||||||
|
virtual/pkgconfig"
|
||||||
|
|
||||||
|
DOCS=( "AUTHORS" "NEWS" "README" )
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
waf-utils_src_configure \
|
||||||
|
--docdir=/usr/share/doc/${PF} \
|
||||||
|
$(use test && echo "--test") \
|
||||||
|
$(use doc && echo "--docs") \
|
||||||
|
$(use static-libs && echo "--static")
|
||||||
|
}
|
||||||
|
|
||||||
|
src_test() {
|
||||||
|
./waf test || die
|
||||||
|
}
|
@ -0,0 +1,27 @@
|
|||||||
|
# Copyright 1999-2013 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-perl/AnyEvent-I3/AnyEvent-I3-0.150.0.ebuild,v 1.1 2013/02/20 18:33:08 tove Exp $
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
MODULE_AUTHOR=MSTPLBG
|
||||||
|
MODULE_VERSION=0.15
|
||||||
|
inherit perl-module
|
||||||
|
|
||||||
|
DESCRIPTION="Communicate with the i3 window manager"
|
||||||
|
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
COMMON_DEPEND="
|
||||||
|
dev-perl/AnyEvent
|
||||||
|
dev-perl/JSON-XS
|
||||||
|
"
|
||||||
|
DEPEND="
|
||||||
|
${COMMON_DEPEND}
|
||||||
|
"
|
||||||
|
RDEPEND="
|
||||||
|
${COMMON_DEPEND}
|
||||||
|
"
|
||||||
|
#SRC_TEST="do"
|
@ -1,2 +1,3 @@
|
|||||||
DIST AnyEvent-I3-0.09.tar.gz 22706 SHA256 47e7a06cb05e0d1ec7bb0d15b37c7252d970267f89ea0c69a8fc6a215618ab6e SHA512 764303f58a4406a1cb3a84f2b3e2fb2845212bc77a08f7c4f3ceb8819c6aa330d8914a438846180d7db6245a12e230759ad4d656554924b99385108a6293d90c WHIRLPOOL 87e433f346867e69ca6c4282ecf4a11607ea256f968b5b80e541f6cce5df61ac0ddaec2c7470456703f9d2ab3917709f7053c348b9aa4c08a88e1e5a31ff079f
|
DIST AnyEvent-I3-0.09.tar.gz 22706 SHA256 47e7a06cb05e0d1ec7bb0d15b37c7252d970267f89ea0c69a8fc6a215618ab6e SHA512 764303f58a4406a1cb3a84f2b3e2fb2845212bc77a08f7c4f3ceb8819c6aa330d8914a438846180d7db6245a12e230759ad4d656554924b99385108a6293d90c WHIRLPOOL 87e433f346867e69ca6c4282ecf4a11607ea256f968b5b80e541f6cce5df61ac0ddaec2c7470456703f9d2ab3917709f7053c348b9aa4c08a88e1e5a31ff079f
|
||||||
DIST AnyEvent-I3-0.14.tar.gz 24641 SHA256 1503787e452f24f19ff262c7e97ae2e6401f7505f17bf4fb3f0af9e9e1d75109 SHA512 a65c7d2876292add4b0fd72797d29d1f28285c319d53570c877f1ae00122e07b7b8f9a6c0cc622ef57b3239987fad5a2495d7056fd2772244c6bc1f3bab7c024 WHIRLPOOL ca591979df43354f6eee7bbd9f0340bb95cc419bfba921300f6dc76d89d2b138731f673b91641077825a12578cab6e798d06236220bbd4d0a7454f0bde7db725
|
DIST AnyEvent-I3-0.14.tar.gz 24641 SHA256 1503787e452f24f19ff262c7e97ae2e6401f7505f17bf4fb3f0af9e9e1d75109 SHA512 a65c7d2876292add4b0fd72797d29d1f28285c319d53570c877f1ae00122e07b7b8f9a6c0cc622ef57b3239987fad5a2495d7056fd2772244c6bc1f3bab7c024 WHIRLPOOL ca591979df43354f6eee7bbd9f0340bb95cc419bfba921300f6dc76d89d2b138731f673b91641077825a12578cab6e798d06236220bbd4d0a7454f0bde7db725
|
||||||
|
DIST AnyEvent-I3-0.15.tar.gz 24665 SHA256 116f28225cb8d422eb6f30941c0430b786d340c731b763bb7a6d1d630c881f75 SHA512 0dab5b5cfc3aa454f8acfb09ab27e70e9cb999bcf881cd8b8ae9d0414169b5c59c27619c36bcadcad1d819ff96be8f102036c475bd7f24d1762c50b63597be68 WHIRLPOOL 7cdfd40426ac4cfa119dde24dee4af219155bdf1361bf3eb137d76d98f945c2c19d77430ceca9ef5182f34e84900fec0f8769f55a99db192d36fbb91bea672c9
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue