root
11 years ago
parent
882e51303e
commit
6f4f88c8d6
@ -1,23 +1,16 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST espeak-1.42.04-source.zip 1537076 SHA256 3791bb853e9283950d58c02396b3b9b1313adf27c0004bcd1e0cdaf87a683eeb SHA512 e8b1d407b5fe3334c3f244475520f6eeefb7837ed4a88c1c1f2d9846ad1daeaad52de3b01eff31af98422ef377aee84e9ff52c586fb29118f636f73a499c9f67 WHIRLPOOL c55b2fc842c5624708209da70ca400d96af6428a010edc3873713a97bca8d4b72aecbc5338be07d6f5b4dfc4d25389fa6a49eda3eb512eee8320cd4004b6e9e2
|
||||
DIST espeak-1.45.03-source.zip 1894722 SHA256 74ed21cb0f4f4a040db93ffa9f4dac463a53281fe47ef4e63605a3ee3e8e0eea SHA512 c63a8baff5fd34605d410483b1ccd35dfc2f3a57c3a65cf958ceb698e78ba404ae4c4c8bb83436ebb063fdb112ff60bc64829c5e0518728e8dc6a32657d517e7 WHIRLPOOL 693dcea214e1c272a069cb8ac251f77c280d5223ca3433f10ad24a3860c3f4d62ceed395dd8affa6d16bc2200715d73aadfbac95ea260c9c1cd12a09143a1843
|
||||
DIST espeak-1.45.04-source.zip 1904805 SHA256 816825f8aadb8ce9487808d35f698a9ac39b158cf43ad0aa98e8b4d7c5ab9780 SHA512 2bf93c9bae151b4ccd8433e9c60e079fa33afe092e7703394884400ab279a42b8106bbcaf48d731bcad40a1fee0d145d22f1f77fd16b5a4ae92bbe34ae60b29f WHIRLPOOL c7307f6671348908a314cfee46cd94049fa53b09db76760b7120c1a5bf18135292c09db68f1b8271aa384139fb69074cb4c8decc4e6719cab12915b519a9cfb5
|
||||
DIST espeak-1.46.01-source.zip 2371712 SHA256 87fc4fdeea9d5151909515ab6258ca0cccea78356037380fa8dcf09953e93de4 SHA512 585152d190cb07318bf3f86f2f68639248afc750d211a46bac5ca392fbe19a481fb60068fc9cb4bbade95bc76772f1c43b40542151507c97064b149ef875eefb WHIRLPOOL fc3dc72665ab6dcb2a5db3bd96e8dd3ba3cfa9feba4d6bd55ef1a6d2a6d57f6c9278b508a6b7022889a65b0ffe14977bdf4f7d1af0e2ce2f5e51b85c2fc1d9de
|
||||
DIST espeak-1.47.11-source.zip 2813649 SHA256 9bd4d0569af48a2cb13fa76704dec3124d27025a3f21c87598457976472b360c SHA512 77c3989fbd0e4aadae0da2d7f1c587854895ae103633704ee5b4042b0618897d01edffa80b1f13e6cbf356f2f31beaf4fdb7e90e4ab641d5286d559aaefe932b WHIRLPOOL c26f481d4c3c485ba0eb3fe7ae3bcf36e7001d49e0e27a6f0934fdb9c91cfef4974c1d34daebd0286694346a44c647cfb96769da54536e0b4380778af755673c
|
||||
EBUILD espeak-1.42.04.ebuild 1974 SHA256 dcae748864f34fde8cf2cd110ad1c0631d66c233289d42eb1998e08a4969f59d SHA512 e1c6016373162fd2e9af8b872728871d51fd4d45d2a80d3b43bd7580abd8c5dbccf37585e146cc7a3c12a39e6f902b2375b26b23063fa8daf18b5d775abc6250 WHIRLPOOL 49ab703fa01a1514a9ae801036aa3a78841f342d0734a8854fe26d20d193d25cb41fd5b8062048f8d4d6f568f5770df213d7c05103461495fa13ba944443d354
|
||||
EBUILD espeak-1.45.03.ebuild 1926 SHA256 fe533c6ca9c6c815fb31008a4f0fef15a0e3a2067a858a773cf8b280741de631 SHA512 b26ac4bda8b78260bdb691219f99b9314f4e3635a266693226cc204085dfb1413387a08fca1b85b9f647eff8ba20329eefee6875a60e4378d26599456744c1b1 WHIRLPOOL 8e9a16ce16015508f1f44c8033fc490693c0ef5510325d2b9216582e6942970059f08e9631fe7196f59649e056229b1f4df4d154258b59376be5d7cfd2f8a40c
|
||||
EBUILD espeak-1.45.04.ebuild 1918 SHA256 6909a3d5436e69aca518280721c22cb59229b6d3375ff75029aac5fc181faee2 SHA512 1a4fbb3455d19711debc79b1b809199b95dc47ef75f22ad7dee73f1a3ac10ebed79c80d30a8f3777d8b70b1630445cae988c80efced04a226b314e4e5f43338a WHIRLPOOL f23ac11d01c51d5a2ef5c3b75fe65bb14d31a45f1865498675b13502e863a4b9473eb821c586e03b94176167bb86f921c8f002f42e330f06146ca05bacebb588
|
||||
EBUILD espeak-1.46.01.ebuild 1942 SHA256 8bf7192b9ed081842e5956ecf9067af6e7786d7f90722ea78a04594376e7feed SHA512 0627f0681372c871be5b32ba5a57b3b8fa7fc7e3a807bffb96f92afef1b42b66a0a342f9eaf65dbe61715e53f9afbf05176f3c17b0a3ae57cf4826570fa9d0d7 WHIRLPOOL 26f70f3445889afaeefc1fdfa855d67e6d946d92b59797f49db1adfe12b74b07666fe5af44482c1c0982f29d1e1553bda2b3799fbeabbb17043ba0159a1c52d8
|
||||
EBUILD espeak-1.47.11-r1.ebuild 2303 SHA256 2babda55d72aa6784de0353c8d2c4933dc92fd40ddf72a592b51e84fd41cc538 SHA512 21f0f1e831040708bee1481c067b6480e2d06155129efceef0ab5deb4148289ea95dc5ea690d0f9428d865a03bf428aac8893ddc8f21964e868b23c633978173 WHIRLPOOL edfbea38644cb8e70e636de1139a023974c7ddf5cb3cd1253866f1f5e9bdce4f9e5a2a19f74107b342e4f3336fcfd22b4fdaa65171fda47c349f9d322aba429a
|
||||
EBUILD espeak-1.47.11.ebuild 2156 SHA256 01d536f21cb67567c1d55b47353827e15cda14bd4c942411663d82f2c7e6b699 SHA512 6fa42b6af42fa19dc4d1413e5361326979170c5228ccc8ad77915b2a876368ac4b8470fe6b8b2cf7bcf3c6b9b098cc393b79e4ae2599ee8329540d72d79bd155 WHIRLPOOL 946ae0db5e28a74e666d859e2329b6f79de676ca5e7c7d6f162294469f889aa0e3c263468a0820a5546a3b0d4340c20a729c897308fc94fe3be251a254916723
|
||||
MISC ChangeLog 15790 SHA256 90e9d825b9c9780e7fb6d2a12869db76b3d4a896c71a73f6b20a3bdb8d9c9817 SHA512 19240e806a55d0140393445184b0c867ad192fc33f92c44715d7c141f68e3842e43ed9d8131a94a1680af373a9b060c3dbaa540a043fe70f6294022e361a8c66 WHIRLPOOL 79fbce3cddc8a8de71e0a206120feaca804182febc989819cbf1c2be1b0c6b5db497d89efc068d3ea254e7edb37fd0a6ca592f25a6ac9af43b5ab9c6546200c1
|
||||
MISC ChangeLog 15971 SHA256 e38d1c48725ae23b8552753d8ca654f2471fae566ec549161cfb45664125d2e4 SHA512 49cb68d282e0b4d0d4b10e8b38d6cd7f2ff4580676a9e04567ba011c9605dbf190f6a63585e18991bbda22b158832fb30a8972543dd18f36a57464501ccd8523 WHIRLPOOL e132ce2c2d9b566b71574d1878fae692d1ea506a7c0bbe8c1abc140477c70db2b0fa8e157a959dbae1899e453992a9ae96a56fbbb8ae5999f3bc2a58abb2ea56
|
||||
MISC metadata.xml 229 SHA256 b128d301356b3f98f1d6093b4401c36143ff55fc62636612567b0995739b9e66 SHA512 bd12bd8878fa253afe1f030863335b920b00e7cd7f5f551442b9b7fd02fe6c606938b07351bd60ef8a858c3c07da59ea00000c34b8cb49321a499244e423077d WHIRLPOOL 4a865d3061aabfbd49a1a1b11abdab5b44411e86251f560bc7c0eca9982bd230a9226737f0c4afdb5e15426daad16a4c89a4c90a686f0c73122fe56492ee1b53
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.20 (GNU/Linux)
|
||||
|
||||
iEYEAREIAAYFAlJK+igACgkQblQW9DDEZTjBHQCgiOglk8lQSAzsPcxFTh5qVcpn
|
||||
LfoAn0jwhjtsrwWtGoaSLk0Qun1Md8Ge
|
||||
=39i4
|
||||
iEYEAREIAAYFAlJMCL4ACgkQblQW9DDEZTiVoACfd8kNTv0IGZo/prgpMju4/691
|
||||
JckAn21Iq6az+hG4n3PvRx4lRfKwvmN0
|
||||
=r/3b
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1,79 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.42.04.ebuild,v 1.9 2012/05/31 02:10:21 zmedico Exp $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit eutils multilib
|
||||
|
||||
MY_P="${P}-source"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
|
||||
DESCRIPTION="Speech synthesizer for English and other languages"
|
||||
HOMEPAGE="http://espeak.sourceforge.net/"
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
|
||||
IUSE="portaudio pulseaudio"
|
||||
RDEPEND="portaudio? ( >=media-libs/portaudio-19_pre20071207 )
|
||||
pulseaudio? ( media-sound/pulseaudio )"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
get_audio() {
|
||||
local MY_AUDIO
|
||||
|
||||
if use portaudio; then
|
||||
MY_AUDIO=portaudio
|
||||
elif use pulseaudio; then
|
||||
MY_AUDIO=pulseaudio
|
||||
else
|
||||
MY_AUDIO=none
|
||||
fi
|
||||
echo ${MY_AUDIO}
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if ! use portaudio && ! use pulseaudio; then
|
||||
ewarn
|
||||
ewarn Since portaudio and pulseaudio are not in your use flags,
|
||||
ewarn espeak will only be able to create wav files.
|
||||
ewarn If this is not what you want, press ctrl-c and put either
|
||||
ewarn portaudio or pulseaudio in your use flags.
|
||||
ebeep
|
||||
epause 10
|
||||
elif use portaudio && use pulseaudio; then
|
||||
die "You must choose either portaudio or pulseaudio, but not both."
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cd src
|
||||
# gentoo uses portaudio 19.
|
||||
if use portaudio; then
|
||||
mv -f portaudio19.h portaudio.h
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd src
|
||||
emake AUDIO="$(get_audio)" CXXFLAGS="${CXXFLAGS}" all || die "Compilation failed"
|
||||
|
||||
einfo "Fixing byte order of phoneme data files"
|
||||
cd "${S}/platforms/big_endian"
|
||||
make
|
||||
./espeak-phoneme-data "${S}/espeak-data"
|
||||
cp -f phondata phonindex phontab "${S}/espeak-data"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cd src
|
||||
make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" AUDIO="$(get_audio)" install || die "Installation failed"
|
||||
|
||||
cd ..
|
||||
insinto /usr/share/espeak-data
|
||||
doins -r dictsource
|
||||
dodoc ChangeLog ReadMe
|
||||
dohtml -r docs/*
|
||||
}
|
||||
@ -1,72 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.45.03.ebuild,v 1.2 2012/05/31 02:10:21 zmedico Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils multilib toolchain-funcs
|
||||
|
||||
MY_P="${P}-source"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
|
||||
DESCRIPTION="Speech synthesizer for English and other languages"
|
||||
HOMEPAGE="http://espeak.sourceforge.net/"
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="portaudio pulseaudio"
|
||||
REQUIRED_USE="portaudio? ( !pulseaudio )
|
||||
pulseaudio? ( !portaudio )"
|
||||
RDEPEND=" pulseaudio? ( media-sound/pulseaudio )
|
||||
portaudio? ( >=media-libs/portaudio-19_pre20071207 )"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
get_audio() {
|
||||
if use portaudio; then
|
||||
echo portaudio
|
||||
elif use pulseaudio; then
|
||||
echo pulseaudio
|
||||
else
|
||||
echo none
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cd src
|
||||
# gentoo uses portaudio 19.
|
||||
mv -f portaudio19.h portaudio.h
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd src
|
||||
emake PREFIX="${EPREFIX}/usr" AUDIO="$(get_audio)" \
|
||||
CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" all
|
||||
|
||||
einfo "Fixing byte order of phoneme data files"
|
||||
cd "${S}/platforms/big_endian"
|
||||
make
|
||||
./espeak-phoneme-data "${S}/espeak-data"
|
||||
cp -f phondata phonindex phontab "${S}/espeak-data"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cd src
|
||||
make DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="\$(PREFIX)/$(get_libdir)" AUDIO="$(get_audio)" install
|
||||
|
||||
cd ..
|
||||
insinto /usr/share/espeak-data
|
||||
doins -r dictsource
|
||||
dodoc ChangeLog.txt ReadMe
|
||||
dohtml -r docs/*
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if ! use portaudio && ! use pulseaudio; then
|
||||
ewarn "Since portaudio and pulseaudio are not in your use flags,"
|
||||
ewarn "espeak will only be able to create wav files."
|
||||
ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
|
||||
ewarn "with either portaudio or pulseaudio USE flag enabled."
|
||||
fi
|
||||
}
|
||||
@ -1,73 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.46.01.ebuild,v 1.4 2013/02/02 22:17:43 ago Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils multilib toolchain-funcs
|
||||
|
||||
MY_P="${P}-source"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
|
||||
DESCRIPTION="Speech synthesizer for English and other languages"
|
||||
HOMEPAGE="http://espeak.sourceforge.net/"
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="portaudio pulseaudio"
|
||||
REQUIRED_USE="portaudio? ( !pulseaudio )
|
||||
pulseaudio? ( !portaudio )"
|
||||
RDEPEND="media-sound/sox
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
portaudio? ( >=media-libs/portaudio-19_pre20071207 )"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
get_audio() {
|
||||
if use portaudio; then
|
||||
echo portaudio
|
||||
elif use pulseaudio; then
|
||||
echo pulseaudio
|
||||
else
|
||||
echo none
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cd src
|
||||
# gentoo uses portaudio 19.
|
||||
mv -f portaudio19.h portaudio.h
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd src
|
||||
emake PREFIX="${EPREFIX}/usr" AUDIO="$(get_audio)" \
|
||||
CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" all
|
||||
|
||||
einfo "Fixing byte order of phoneme data files"
|
||||
cd "${S}/platforms/big_endian"
|
||||
make
|
||||
./espeak-phoneme-data "${S}/espeak-data"
|
||||
cp -f phondata phonindex phontab "${S}/espeak-data"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cd src
|
||||
make DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="\$(PREFIX)/$(get_libdir)" AUDIO="$(get_audio)" install
|
||||
|
||||
cd ..
|
||||
insinto /usr/share/espeak-data
|
||||
doins -r dictsource
|
||||
dodoc ChangeLog.txt ReadMe
|
||||
dohtml -r docs/*
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if ! use portaudio && ! use pulseaudio; then
|
||||
ewarn "Since portaudio and pulseaudio are not in your use flags,"
|
||||
ewarn "espeak will only be able to create wav files."
|
||||
ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
|
||||
ewarn "with either portaudio or pulseaudio USE flag enabled."
|
||||
fi
|
||||
}
|
||||
@ -1,92 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.47.11.ebuild,v 1.5 2013/09/22 20:14:41 williamh Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils multilib toolchain-funcs
|
||||
|
||||
MY_P="${P}-source"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
|
||||
DESCRIPTION="Speech synthesizer for English and other languages"
|
||||
HOMEPAGE="http://espeak.sourceforge.net/"
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="portaudio pulseaudio"
|
||||
|
||||
RDEPEND="
|
||||
media-sound/sox
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
portaudio? ( >=media-libs/portaudio-19_pre20071207 )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip"
|
||||
|
||||
S=${WORKDIR}/${MY_P}/src
|
||||
|
||||
get_audio() {
|
||||
if use portaudio && use pulseaudio; then
|
||||
echo runtime
|
||||
elif use portaudio; then
|
||||
echo portaudio
|
||||
elif use pulseaudio; then
|
||||
echo pulseaudio
|
||||
else
|
||||
echo none
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# gentoo uses portaudio 19.
|
||||
mv -f portaudio19.h portaudio.h
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake \
|
||||
PREFIX="${EPREFIX}/usr" \
|
||||
CC="$(tc-getCC)" \
|
||||
CFLAGS="${CFLAGS}" \
|
||||
CXX="$(tc-getCXX)" \
|
||||
CXXFLAGS="${CXXFLAGS}" \
|
||||
AR="$(tc-getAR)" \
|
||||
AUDIO="$(get_audio)" \
|
||||
all
|
||||
|
||||
einfo "Fixing byte order of phoneme data files"
|
||||
cd "${S}/platforms/big_endian"
|
||||
emake
|
||||
./espeak-phoneme-data "${S}/espeak-data"
|
||||
cp -f phondata phonindex phontab "${S}/espeak-data"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake \
|
||||
PREFIX="${EPREFIX}/usr" \
|
||||
LIBDIR="\$(PREFIX)/$(get_libdir)" \
|
||||
DESTDIR="${D}" \
|
||||
AUDIO="$(get_audio)" \
|
||||
install
|
||||
|
||||
cd ..
|
||||
insinto /usr/share/espeak-data
|
||||
doins -r dictsource
|
||||
dodoc ChangeLog.txt ReadMe
|
||||
dohtml -r docs/*
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
local voicedir="${ROOT}/usr/share/${PN}-data/voices/en"
|
||||
if [ -d "${voicedir}" ]; then
|
||||
rm -rf "${voicedir}"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if ! use portaudio && ! use pulseaudio; then
|
||||
ewarn "Since portaudio and pulseaudio are not in your use flags,"
|
||||
ewarn "espeak will only be able to create wav files."
|
||||
ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
|
||||
ewarn "with either portaudio or pulseaudio USE flag enabled."
|
||||
fi
|
||||
}
|
||||
@ -1,7 +1,9 @@
|
||||
AUX xxdi.patch 3046 SHA256 b2b716d5291529c252daa8ab890521e1f56731818073dcab183d7f6f4d5816cf SHA512 9b3612115ca594b7a1b3a99008650409cb9a90369ff73cd8d602385e77030026a921c510534e44ed7a76fcca2347d016e36f08223b9a49c7ca17518124bdb8ac WHIRLPOOL 4dcfcf930eaec0468cd090a294cf6cf00e6a48a59ce2c84884bec9d4b1fc093d8db48df0090763432b8af2d19263aff92ecfedc5bacf173993156ac439ddaf6c
|
||||
DIST efitools-1.4.1.tar.gz 91444 SHA256 6946e7894118012ca12503a6e55a4f8f17310d0eb02d8f1ab8947d9012ad8b51 SHA512 0994fdd9f934575691f740631dfbcc67f15e56f873cba10657536389d61b5bb955b0de91261f0486bfa5381e27f42b5dd0b6ea55fe3643f8b0dae2f9b1916ef1 WHIRLPOOL 7eb973fd0239fa41d2ff82ccfda526725032c0da64d0cd5223a7d66abf42c951f4ba2d3613c024c3bceebf6e032af88527f6a35eff76f258f19e12431cbac0bd
|
||||
DIST efitools-1.4.2.tar.gz 97303 SHA256 df7b9d7570b2fb85ee060e14b1952233d28e277f5b2f839c225f093890e5d843 SHA512 19433b6ccc95a18649b05376c0090f4325345d1a9ccf2601e9b4818a7a888379ab1bb620022f393498e520073f06e10962f5322632219fc21da390e4e5cd4c9f WHIRLPOOL 43000942f99fdf888bf2d2447eb28ca5eba9440194f5de71fd4532ad61a3735b23a08e4fdef4f89a9fd06e30537e9f6305e5f320e1c27ab60a6c4cb91762d74d
|
||||
EBUILD efitools-1.4.1-r1.ebuild 708 SHA256 f5006ac96ec9089c07c1273b665f9b7b0016e8cde1efa329d7d8d583cd7bdc5b SHA512 59a31c61d656df893030642d5b4dd2578d66abe19beca4a19dcd0e59f317483d2a2313770f5e438d070ff8234c8d38d7993d346984dc2b398a6317c49c8c1d26 WHIRLPOOL db8875b87546e752439b32d7d3b1195a4ef0ba7583638ed2d816a6c99fe197a47b6c75c34e60fb76e267e1fefff75fdb62e581811c1dd979585b04aa2c18e17a
|
||||
EBUILD efitools-1.4.1-r2.ebuild 811 SHA256 16b6dd6c1fa0159630995f3a4eaf3466c38053b2c41aac831b0b0e91ec03525e SHA512 9159ce0945b895f57116142eb6cb66e353e3a4f4eebab5a414a1228dabcb116c0db02fd75d6454de6ba8c0094ee6cbc471c592540e24238a22ef9661b34711fe WHIRLPOOL 6baffa3d0f2547345f957dcae153b77959e08cd85863b438a630371e01860ac6d328c34775b3e0ddde029790e3f004fee87cd024ecd20fd7d1d85fbb16383a0a
|
||||
EBUILD efitools-1.4.1.ebuild 661 SHA256 6a565700ad7a761ae086e18ac3296c3c3fdfb0e8fdc4834cf89b0c55de178faf SHA512 7460cb377b575ea3c2efe244695fe711aae36beb4a11c504a87e05044cd6b0bbef2ab2c354715668c35e6cc5fb5391fab5b77a671553481b8a10024f4d540373 WHIRLPOOL 4d9a351860795439530fa40fca3e2303fb7cd1638ab11f9a6782e1dd5f2c4e2e66305e05b2a062709c900a12725f6ea68c7f518cda12476d47c0af9ad2518c1d
|
||||
MISC ChangeLog 925 SHA256 1ec6b271c0fcf44562e38d930e03e8b802dcf9f34a2d99e97e7c168db4ffdcf5 SHA512 e8ac79285a28e2154af06b8cc8a3a9cb03c8bf0c2cf3cd958eac8a6199778adeef500b9ab2211360342c2fd0e8425aad984f521bc39f36e1415e6b498a4c0382 WHIRLPOOL a07482cdb8538c4f42a992b066c8688b4b8529e18a7e0818f4fbe5399e163dabecd83d0139bd706149c5476d1514594952b6fde4129911bc9936c269bea01d15
|
||||
EBUILD efitools-1.4.2.ebuild 658 SHA256 dfe973cb20ef8cc4f1ad82eb6b6c5fcc75fec97c05e1aa56814993ffd3611f9d SHA512 7d3a7911d5e24ce1d46bb90b071186d364795eab3f4e7538ba02076db992a02d842e82a59f4d855d80c452cfa6d8da75688282119fcb9257802f704d656aec44 WHIRLPOOL 92f8b043f48fd8d3df7793367ca41b0069ea729337cd7a5f69a9b96d2be2f7e3117b7873212ee3655c1043de1fbb66008156601ecb9c9173703eeaae20194a2e
|
||||
MISC ChangeLog 1058 SHA256 3daeea8261bc32c779077be1f49f79c2b6100d0986f7f80d104fd51398b439e0 SHA512 acad5699a801fc3583d3faaafe5ecbb9b2887969b18296802ffae08f2172a0eace8c369c4ff8bee0989eaf4e390197fcae5bfc663fd00a9b053079f7f6b79a6b WHIRLPOOL 04d05d54bc1e23d42ae900b3a939dae47580746485f30bc8741f2bb3996d42f3727b679be539f65020901a9b07f72592ac10a994753a164d672df84cc7e95fde
|
||||
MISC metadata.xml 240 SHA256 218f6016b45c0a0d55b04630266085c44107606f2b79024c15a9797b4b828bd5 SHA512 659a6ebd2024aefd2989e9c412b7bb10271a5d6b12f291dcc8dbdfb3568e8eddb8dfa674cf6befa80eb8036e222e434276d36ba5b164733cfc934e4e7a3ae101 WHIRLPOOL 252a9a3addb2a1ecf3b3734a5e65c097d3c6d032f18b05d33458298fbeb36b7cb6147830c85d4d80764e05653bc7a4bb48ec070662d28b148799cad42ecd05d0
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/efitools/efitools-1.4.2.ebuild,v 1.1 2013/10/02 23:49:35 gregkh Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
|
||||
HOMEPAGE="git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"
|
||||
SRC_URI="http://blog.hansenpartnership.com/wp-uploads/2013/efitools-${PV}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-libs/openssl
|
||||
sys-apps/util-linux"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-apps/help2man
|
||||
sys-boot/gnu-efi
|
||||
app-crypt/sbsigntool
|
||||
virtual/pkgconfig"
|
||||
@ -1,20 +1,21 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST libsecret-0.12.tar.xz 476552 SHA256 323db75a5e73058d3eb95597d9f798fd715ec7d58f500be84628b8f9a0617c01 SHA512 920da07b8674816b9f139dc71e79721d1767025e799e99dea7458c3c3b54c81ae2f4aa55ad55194e0c151fa23d13eae12928c9bbfac1c67d9ae6eed3d8a1efa4 WHIRLPOOL 1bcc96a175519f2d24ec8c5f8ee61ae0ca851511c540d69230ab05a67d7192ac5827d407c06aa054820ee1ea714efee7ee15927b4fcc152fae73ef66bb768f24
|
||||
DIST libsecret-0.14.tar.xz 483620 SHA256 58a5b9370c093a7a2788869ed59bc56351797a775e100a9644e637851f9713b5 SHA512 63b8fd947d63f178f48a79aa195f4b6a9eb1e802134779436981ab8aa00b268a449709139704843656f8b4616cc13a2dbc79a4ba4460b09cf250cef3478fd172 WHIRLPOOL 301d88c4fcf35038456800748b349c303edf96323d96cf7b80324d85fe97ca3be22ce4b79ef07dc6d42a7fb6050dedf51d3d409f9e514eac7685d0139e407c63
|
||||
DIST libsecret-0.15.tar.xz 484532 SHA256 33e728b843efbe099483376ff5a3469260ee4b6ce035c7730909ac3793cb0fb8 SHA512 d89f3b52c5300306b92b222a56c976e5c42f761c2a8691b0dbac9f533853a54f6dd91f9f22f577e336c77e9771dd3cb098963dab086759ead2750f2a8fce5dca WHIRLPOOL 23eb06d6ed09023704b73cd9c1927bed09e38a58ec9694e43f8838879ce4f34ac67efb7a8f0b7770b26260ccb474c2f4e7c398f326b94dd08b63d7fe22e03ff1
|
||||
DIST libsecret-0.16.tar.xz 499888 SHA256 b859406c490a2011b35f5940235304315b343f2efd554800285f24b95e14f218 SHA512 2223861439733bf0e97d59236327aded8d17f89ce81aff17bd18c632960e7024c43be1480cd4591495401ac161dcb725d3d5fcd0b43120bfc6472c4a021ed770 WHIRLPOOL 32c7edafa67d0b26c9ec1d87d42ee4ff47abd134f34189a1b22d5c89b7386fa4403321c8595f587f6c02da36c5ce6e313e8ef7841527ddc1990efe8323194183
|
||||
EBUILD libsecret-0.12.ebuild 1852 SHA256 df7262c3b6e7c5af3829a83affa3fcc92779a46c0a98f5f2afdb695e01248358 SHA512 5cbb419d4bfebdb3ec04d2c9e9aa6d96b4308677df23429b38b0745ce90fc4ae05544f3b1306ba820b82031dae403d1895e491a45791e1cc5e10a806c840da4b WHIRLPOOL 1c4ee7a74aadbdfc35436b70c99dba3706e169aa0651758a76cbbf0e679bbf20a4bd96899e596d6ad48b12fc5f1e9ee6cd72406ea45ef51d14d5e6d4ebfbb6ca
|
||||
EBUILD libsecret-0.14.ebuild 1772 SHA256 5c01a30a85f9efb8799e75665f430921e34aa769e6f38c102e9774fc491e1ff5 SHA512 3e39f5bdafdd622f0d1c03b71c88c8db6f4680abf68030ffe6cbac7f6cabdb7313fa456de18a8f386259045f74bd51b9e444d600e4ac595b5551f1c2cbbd8038 WHIRLPOOL 729c196c6ece7a7e908ebffa6dc47e0503d9ab512a24cc07a4d4b9c37e06834cff6c08228fd0d093d5d1d19085f1217918f8dfa82c72c3cda885153a8a4b72b5
|
||||
EBUILD libsecret-0.15.ebuild 1772 SHA256 0bc4e0b5d41af5c2ddf55ca1b17ac6aebad4143fad1311ab63e0a7db70cb950a SHA512 26b46b5a759b564026e2f7821b505b7ead984cf330052debadbe4a62cf829ecc25b009ce0900f6bc0b09080033af51f2230b2797e3680e6bb215a04275bc5dec WHIRLPOOL 4ab9d2dc86a5ae649fc29d699d682273f733915cb7de761acf9969fd4909b8199b81906dbbcb8c47eb7143a3d3079840c5c0f5cce844886888fe909104a771bc
|
||||
EBUILD libsecret-0.15-r1.ebuild 1781 SHA256 95b860cd145bcf2ca21fb3766c102053af5f6734e0e06031c6c5e2d374de7ba1 SHA512 d1ea7409d1dcd4e23c9f4ffa12e792f4960c80f391836aef2051ce7e60e5871749364bd40739863340209e10c2e8bf4ebc64e25b9ae783e2f63cf0c9cdf520f8 WHIRLPOOL 9130e5f42587ac9a9029fa05e2a93cab82f14124d7be756cad417ed6783698432bd16260e5c9140484bf1c737df07a34a4900ae9256d9413f87dcbd0500b9a51
|
||||
EBUILD libsecret-0.15.ebuild 1838 SHA256 26bfe647eb67866c156f74357ef80e1cf027de2c599f1ef39e1527ee0115cd56 SHA512 9ed4023fd715d6bb721f0f42c06f8be2c61fcb9aee89cf38a38e0acfa6b6699552131bbee39fb2612cb9b23fc66c8d29224761c041d68110275846928fadab4b WHIRLPOOL 16019ae66dd299435dca10ee6cdb27c2e2c8d5f351d6aab57a01d7d80a988536e6c7e969b57cdb63f042d586a3b49abbf29c50f19071549b54bceb8d602cdab0
|
||||
EBUILD libsecret-0.16.ebuild 1772 SHA256 3a0449e8fae800cfd18e9d668e7589cbd94156e6610df164261e345a21acf59b SHA512 42f69c97f915a3ea7aa83e7aabd1aab0220361971851e29ad49037176a9a7e789eb4e6cbefb09ecf3cdaa200e6132ae417562738bc77c0b64b19a2fa4dc4e5fd WHIRLPOOL 4e385dd84fb824abdfbe6dd29d40422dd9349391102545a0f41f1aeb1f548f116b4d619fb3d402d60a26dd3d4f85a515211332882418f12ebd9b58c01730bcd1
|
||||
MISC ChangeLog 2989 SHA256 75094576b81a28607e81d553b3ddcd21467188e700b9d3700552a74df12350b7 SHA512 45ab77f7c94a0889d51f070d2b51457091c6b2a9c346ab9aa7150c30f96c4636b26a0f31304e302e8f85467df323ea25fd9aa3ed82694c3cbe6150cede3e1fdb WHIRLPOOL 4741343d65b80011249f2decf3fb800f7056d791967afc41aaceba98962831ffc6450266b28a013f6934ca1f4bf50f5d4d4ffd63962d9cf3e69a3caed2a1524f
|
||||
MISC ChangeLog 3405 SHA256 67c5181a93f356dd6f83cd7ee76dc3d9a68a90536fb8f505e2836f9507443f3e SHA512 93e4ef561a80aeb811335a146b56345b0570406b89a7a960a328270ac6f55ccfc8e04c2b39cc523630ed17d7d2e4bae92e398c0e0c3ceecadaf2fd84d8d35748 WHIRLPOOL fe1ed9abdbe0ecc0025bf7cde29d6d0f8d6e80ceac04b20f28886749f18a12448c45f6749b194b24c15a726a7400c2e7407d8e7c93de35399718e88bf51f79a4
|
||||
MISC metadata.xml 242 SHA256 11f4b4bb23bb0e880a44b0f3efb5b4b0eeebaccd23956c72cd0cd9d386739c48 SHA512 686291088cb59735ff7df03fc5f11e43110039e74b8b24a9a8a517ed0f490f5694b873177e1ee808c4576ca26027add8324c6ee4e57b6b44d680a2522ec40b5f WHIRLPOOL f7bdc3a5208e0173deca7b15b26b967b61c3cb33e01b8f16fb87e32870e6c4deae514ac6af3fc91c300f960f2113e663eea02a9c599935072aad91459caf5277
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.21 (GNU/Linux)
|
||||
|
||||
iEYEAREIAAYFAlIjsgIACgkQ1fmVwcYIWAYjoQCgjjSNaXvX4lmmqyfZKs+elD8J
|
||||
IOYAnAnfNvOXdTN1ZGmX8SjiOBXgsJSt
|
||||
=6e++
|
||||
iQEcBAEBCAAGBQJSTNW2AAoJEJ0WA1zPCt1he5MH/0L7X420M9ZbEGspgGw1wEjL
|
||||
x+AFvMFa0vEbRu74U+B2coKGpic/hYkADffQu4zEW0ksvKNym7/I/vpoipU6Ju1f
|
||||
hMsCwjJ8DWd/NhhKJWpkLou4tfINpvxsJrPSd/pt+pgZjyW4KOuhVw6uvIMGHCaz
|
||||
z3Mf0Dut70umsmu6BMNKADec+dih8lqeWyYJs2ZhOVCypxawFV1EEx7TWM6hXpgM
|
||||
KzyhXvDdnaZc/tJSYW1ECau3ByrE2GeSw3tqH3wk2/Fb7m1F/v/7CL970jpZuh7S
|
||||
Hui16zMYmZYK8mihWgV5keEGZ32cmu/jK7bab223aOPEm7pJEqIz8x8Jde/9onQ=
|
||||
=vVSQ
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.12.ebuild,v 1.9 2013/01/28 14:56:10 aballier Exp $
|
||||
|
||||
EAPI="5"
|
||||
VALA_MIN_API_VERSION=0.18
|
||||
VALA_USE_DEPEND=vapigen
|
||||
|
||||
inherit eutils gnome2 python vala virtualx
|
||||
|
||||
DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
|
||||
HOMEPAGE="https://live.gnome.org/Libsecret"
|
||||
|
||||
LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
|
||||
SLOT="0"
|
||||
IUSE="+crypt debug +introspection test vala"
|
||||
REQUIRED_USE="vala? ( introspection )"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/glib-2.31.0:2
|
||||
crypt? ( >=dev-libs/libgcrypt-1.2.2:= )
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.29 )"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
>=gnome-base/gnome-keyring-3"
|
||||
# Add ksecrets to RDEPEND when it's added to portage
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-libs/libxslt
|
||||
dev-util/gdbus-codegen
|
||||
dev-util/gtk-doc-am
|
||||
>=dev-util/intltool-0.35.0
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
test? (
|
||||
dev-python/mock
|
||||
introspection? (
|
||||
=dev-lang/python-2*
|
||||
>=dev-libs/gjs-1.32
|
||||
dev-python/pygobject:3 )
|
||||
)
|
||||
vala? ( $(vala_depend) )"
|
||||
|
||||
pkg_setup() {
|
||||
# python is only needed for tests
|
||||
if use test && use introspection; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
DOCS="AUTHORS ChangeLog NEWS README"
|
||||
G2CONF="${G2CONF}
|
||||
--enable-manpages
|
||||
--disable-strict
|
||||
--disable-coverage
|
||||
--disable-static
|
||||
$(use_enable crypt gcrypt)
|
||||
$(use_enable introspection)
|
||||
$(use_enable vala)"
|
||||
|
||||
# FIXME: disable failing test
|
||||
sed -e '/test_get_sync);/d' \
|
||||
-e '/test_get_async);/d' \
|
||||
-i libsecret/tests/test-service.c || die
|
||||
|
||||
use vala && vala_src_prepare
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
src_test() {
|
||||
Xemake check
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.14.ebuild,v 1.2 2013/03/30 23:16:06 eva Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.15-r1.ebuild,v 1.1 2013/10/03 02:25:29 tetromino Exp $
|
||||
|
||||
EAPI="5"
|
||||
PYTHON_COMPAT=( python2_{6,7} )
|
||||
@ -0,0 +1,29 @@
|
||||
From 21e984fa9d93a760cc03f5d9d13d023809227df2 Mon Sep 17 00:00:00 2001
|
||||
From: James Bottomley <JBottomley@Parallels.com>
|
||||
Date: Thu, 11 Apr 2013 21:12:17 -0700
|
||||
Subject: image.c: clear image variable
|
||||
|
||||
Not zeroing the image after talloc occasionally leads to a segfault because
|
||||
the programme thinks it has a signature when in reality it just has a junk
|
||||
pointer and segfaults.
|
||||
|
||||
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
|
||||
---
|
||||
src/image.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/image.c b/src/image.c
|
||||
index cc55791..10eba0e 100644
|
||||
--- a/src/image.c
|
||||
+++ b/src/image.c
|
||||
@@ -401,6 +401,7 @@ struct image *image_load(const char *filename)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+ memset(image, 0, sizeof(*image));
|
||||
rc = fileio_read_file(image, filename, &image->buf, &image->size);
|
||||
if (rc)
|
||||
goto err;
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
From e58a528ef57e53008222f238cce7c326a14572e2 Mon Sep 17 00:00:00 2001
|
||||
From: James Bottomley <JBottomley@Parallels.com>
|
||||
Date: Mon, 30 Sep 2013 19:25:37 -0700
|
||||
Subject: [PATCH 4/4] Fix for multi-sign
|
||||
|
||||
The new Tianocore multi-sign code fails now for images signed with
|
||||
sbsigntools. The reason is that we don't actually align the signature table,
|
||||
we just slap it straight after the binary data. Unfortunately, the new
|
||||
multi-signature code checks that our alignment offsets are correct and fails
|
||||
the signature for this reason. Fix by adding junk to the end of the image to
|
||||
align the signature section.
|
||||
|
||||
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
|
||||
---
|
||||
src/image.c | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/image.c b/src/image.c
|
||||
index 10eba0e..519e288 100644
|
||||
--- a/src/image.c
|
||||
+++ b/src/image.c
|
||||
@@ -385,7 +385,13 @@ static int image_find_regions(struct image *image)
|
||||
|
||||
/* record the size of non-signature data */
|
||||
r = &image->checksum_regions[image->n_checksum_regions - 1];
|
||||
- image->data_size = (r->data - (void *)image->buf) + r->size;
|
||||
+ /*
|
||||
+ * The new Tianocore multisign does a stricter check of the signatures
|
||||
+ * in particular, the signature table must start at an aligned offset
|
||||
+ * fix this by adding bytes to the end of the text section (which must
|
||||
+ * be included in the hash)
|
||||
+ */
|
||||
+ image->data_size = align_up((r->data - (void *)image->buf) + r->size, 8);
|
||||
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
1.8.4
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/sbsigntool/sbsigntool-0.6-r1.ebuild,v 1.1 2013/10/03 02:09:21 gregkh Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
|
||||
HOMEPAGE="https://launchpad.net/ubuntu/+source/sbsigntool"
|
||||
SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-libs/openssl
|
||||
sys-apps/util-linux"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-apps/help2man
|
||||
sys-boot/gnu-efi
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_prepare() {
|
||||
local iarch
|
||||
case ${ARCH} in
|
||||
ia64) iarch=ia64 ;;
|
||||
x86) iarch=ia32 ;;
|
||||
amd64) iarch=x86_64 ;;
|
||||
*) die "unsupported architecture: ${ARCH}" ;;
|
||||
esac
|
||||
sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure || die
|
||||
sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.in || die
|
||||
sed -i "/^AR /s:=.*:= $(tc-getAR):" lib/ccan/Makefile.in || die #481480
|
||||
epatch "${FILESDIR}"/0002-image.c-clear-image-variable.patch
|
||||
epatch "${FILESDIR}"/0003-Fix-for-multi-sign.patch
|
||||
}
|
||||
@ -1,7 +1,24 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX 50ess-gentoo.el 58 SHA256 7f9d9fdb96fefa7c278d7a24e7c090754dcf818f2296867d3d25f921b5c7d46a SHA512 e9023d176d39d3d3c35e004747007892e6f2e2b101b3c8e64fadc37d1fac8d264a786b7bad26c744730fec03580d7fb1170c8d2789e76e12b4eb47481b7f2808 WHIRLPOOL 7122ac4433fb2310d20fbb5269a473f535491e15c5be7109d2862c8a1be69837aac4fab0cf8e6a08e0db00b1f43ccaad6e9ae8a2b281b62a852d1b57adaebd29
|
||||
DIST ess-12.09.tgz 3332863 SHA256 3167a84c9958605e9c1de7dc2dce564e22e89b79c9d1ba7ff7f66013af56f2b8 SHA512 652bac7965dfc594071a8cb332692522696930bce1617938a88835962a246faa6bcd1eb7ab0a340fbce71c2d93a8953ecf49dec684080635c0135c1db097d35c WHIRLPOOL 14c63d4397e635da5b7c5244ddc814c23ba494f4cdaa79081b35eef9c04c71c6c875c009518e9bd4e37f945c4a2b4f62ed27c93eebcfa65e090e03c77d995391
|
||||
DIST ess-5.14.tgz 7272065 SHA256 982b625f5c3f0e11d2cd8903e15026b5ecac6775415e8eb3cd120d0b9950dcc6 SHA512 b4a726f4565e70ac5d960a96fc1cb4780b966bc2845233e0369e1a3462c3728c27cece27c2f89b8b74936dcbe63770e50c58c07e30ac8ed890c59e6301e6eada WHIRLPOOL 101bf76fba513c0f370c396878426c97cb518a0a37da63686c2825a7c6cb6aa2270a78711fa1b56b3951b0da42e268ebd5f8741d2fde832ce0198c4f2d6017e5
|
||||
DIST ess-13.09.tgz 3356969 SHA256 d0625f8ac38831a05d419435d3a6ccf852878c8aea018c3f4a9c9d6bd61e71d2 SHA512 96a91a41c9b390c27646e4b95d7a41e6b22d592c82bf775f2e1b70905c7bc684c3d6645496275d245c9f882030da1b3bd5cd3ba5711acbec3a07cdb2d065a5dd WHIRLPOOL 3560d95bcb43a65ca86787274fa96106611a98041cf63905a4066223247d8557405b7557da2c468d836d4570d4e791aa36e84e76585fc9668729926ef0759598
|
||||
EBUILD ess-12.09.ebuild 1176 SHA256 7bfc55ec81b277924e9e73b87136c75bb63e980770c944bba041be4a7fd6fdcb SHA512 1cd38d006db0fb7226c800c6d81f09aedce952a927a32a87ee687e341f5f56240bca1bc2a41416cb2565e9ed2e55ab8b0b6ea3110a41ab19b0983ecd19e82813 WHIRLPOOL 29653f984590f92a380774fa3f96ccd06ba2088608028d4959ed0941a0e0a9525d78b5864c101b83758a3fb69a3c7f4b609185fa7398e9dece9986ec52570b4b
|
||||
EBUILD ess-5.14.ebuild 1189 SHA256 081d03ac64e512a7d3dc3227276418788f3818725834666f019ee91fcf99f226 SHA512 d45aa207e9f9b5795e03cd481dde5318e2fc7cd3df0089d5de6f86244a3d85c2ad26557bf50402b5cf4c7bed2a03fa4b46a3de5fbdc35ae37a8eb11ae1939e57 WHIRLPOOL 4d9dccd37944bd011e83f5dc1b82abca5d27d97a0f9f0237719ca93b64c70cd81e7825c6b6435c8c6c17f2c2cdb5c7494ae7cb69b235413ada9417890ce1e178
|
||||
MISC ChangeLog 11584 SHA256 d5e42cb307daebdfa99f8edcb0fdeac6ad67034f0b8efc645cb96f8ec13fce2c SHA512 ad2352b2aa1f7faeef09e76458140d9d80f3ea36bb797609ee1b43fe26a61092af7bc6dba0d6a5aa2e91d718dd2ccd428ddb89808fd1ec26cbb9bc0e26bc3b01 WHIRLPOOL 36fb229afbb77b803429974df70ebe6f42da058e68ab68b4ccd87b8762d14db8f840e3feebb654e55d456b428a66d19390f548a6a7c5f3c64ca351255da33f5d
|
||||
EBUILD ess-13.09.ebuild 1167 SHA256 86b9b19dc029264e5852901799a97596addec4cce1cc1f9a3fbd995538d66fea SHA512 5460573d5331d7aa83f7847463305b854dfe6de8b2cca6591413332b987350721f6766bde31d1c77a2daf306b165fe902da766839e7f5a79ff26e0ca734acffb WHIRLPOOL 09e0a62f48d6b1de65a3bde6686320c03a1da7b34b67d423b7f7d34b702173ea4435777da0d2aa4183d4d00ac6b7665e04976b8d5dec544617cdcfc35fa56062
|
||||
MISC ChangeLog 11722 SHA256 b94fff39291d72ed3c6359afd2d78e702265cf0d5c6e84e5014975d05145127d SHA512 f76e96581ddd0b43aa87f28c012ec8f9e03a4ad03e59b54650f643b4b04a178a32c50ba2f22ade8e47933b54ab238be598e4862138b696015bf04741961b1c6d WHIRLPOOL e21b6036776e63dc4dae3ce7526a0d2ee8001823a9c61c2d92d299ea9ca626057d33dc4311ccb38097999f9efd2a627f8e85c0b29648b031a887df7a652fb5a6
|
||||
MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.21 (GNU/Linux)
|
||||
|
||||
iQGcBAEBCAAGBQJSTGKGAAoJEJQzkH1pP7W4vqsMAKAd/9cRYP0krQ0msHzfLs6x
|
||||
sDoWTokkj3NV8uhWkSfBRZX/pvNwiRy4vrN6Oec/q6raonE3+MB10OHul5PZIWdy
|
||||
3TWxf8drANGUYVwIBJQ48964bBZPmrzbfBHRqeEcVrluAlT2ux+GAIBbIe/jHmXx
|
||||
t3bjElkNgT89pfr09EDJScgeITgtyly0iL09N2LMEoL28OrfXk3tesjgAGXXQXgZ
|
||||
O9vn7wCsYAnCBKZEHnXHX2YDrohc7h7DvGTFVIXqrc96u+l2d0XLA28wOmvmec7E
|
||||
fRTIjKkmULoG4bKJP8dv6RK8aA1FXtXridQ9b55O2GyedpYWMDCk1/VuvZN9Is2S
|
||||
12KqHV/B+J/1ebYdJxzwuDDqERkMHYP7FptEs1sFN8wjP6OS87FgLeuagkynntoj
|
||||
WLXjvSD1AfffwtPoVMPKyA4lpd+4Wn2U7kc4EIuKdGRJ7wbnKgjGdcD52Dpd9MuR
|
||||
SuI/4Dys0yAIUq/6ln99M3BsmIXdx4QSjcUTNSislg==
|
||||
=UFOW
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,67 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.3.4.ebuild,v 1.1 2013/10/03 00:50:11 radhermit Exp $
|
||||
|
||||
EAPI="5"
|
||||
USE_RUBY="ruby19"
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
|
||||
RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
|
||||
RUBY_FAKEGEM_EXTRAINSTALL="config keys plugins templates"
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
|
||||
inherit ruby-fakegem eutils
|
||||
|
||||
DESCRIPTION="A tool for building and distributing virtual machines using VirtualBox"
|
||||
HOMEPAGE="http://vagrantup.com/"
|
||||
SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~x64-macos"
|
||||
IUSE="test"
|
||||
|
||||
# Missing ebuild for contest
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
net-misc/curl
|
||||
!x64-macos? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
|
||||
|
||||
ruby_add_rdepend "
|
||||
>=dev-ruby/childprocess-0.3.7
|
||||
>=dev-ruby/erubis-2.7.0
|
||||
dev-ruby/i18n:0.6
|
||||
>=dev-ruby/json-1.5.1
|
||||
>=dev-ruby/log4r-1.1.9
|
||||
>=dev-ruby/net-ssh-2.6.6
|
||||
>=dev-ruby/net-scp-1.1.0
|
||||
"
|
||||
|
||||
ruby_add_bdepend "
|
||||
dev-ruby/rake
|
||||
test? ( dev-ruby/mocha virtual/ruby-minitest )
|
||||
"
|
||||
|
||||
all_ruby_prepare() {
|
||||
# remove bundler support
|
||||
sed -i '/[Bb]undler/d' Rakefile || die
|
||||
rm Gemfile || die
|
||||
|
||||
# loosen dependencies
|
||||
sed -e '/childprocess\|erubis\|log4r\|net-scp\|net-ssh/s/~>/>=/' \
|
||||
-i ${PN}.gemspec || die
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-1.2.1-no-warning.patch
|
||||
epatch "${FILESDIR}"/${PN}-1.2.2-rvm.patch
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use x64-macos ; then
|
||||
ewarn
|
||||
ewarn "For Mac OS X prefixes, you must install the virtualbox"
|
||||
ewarn "package specifically for OS X which can be found at:"
|
||||
ewarn "https://www.virtualbox.org/wiki/Downloads"
|
||||
ewarn
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
x86/xsave: initialize extended register state when guests enable it
|
||||
|
||||
Till now, when setting previously unset bits in XCR0 we wouldn't touch
|
||||
the active register state, thus leaving in the newly enabled registers
|
||||
whatever a prior user of it left there, i.e. potentially leaking
|
||||
information between guests.
|
||||
|
||||
This is CVE-2013-1442 / XSA-62.
|
||||
|
||||
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
||||
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
||||
|
||||
--- a/xen/arch/x86/xstate.c
|
||||
+++ b/xen/arch/x86/xstate.c
|
||||
@@ -307,6 +307,7 @@ int validate_xstate(u64 xcr0, u64 xcr0_a
|
||||
int handle_xsetbv(u32 index, u64 new_bv)
|
||||
{
|
||||
struct vcpu *curr = current;
|
||||
+ u64 mask;
|
||||
|
||||
if ( index != XCR_XFEATURE_ENABLED_MASK )
|
||||
return -EOPNOTSUPP;
|
||||
@@ -320,9 +321,23 @@ int handle_xsetbv(u32 index, u64 new_bv)
|
||||
if ( !set_xcr0(new_bv) )
|
||||
return -EFAULT;
|
||||
|
||||
+ mask = new_bv & ~curr->arch.xcr0_accum;
|
||||
curr->arch.xcr0 = new_bv;
|
||||
curr->arch.xcr0_accum |= new_bv;
|
||||
|
||||
+ mask &= curr->fpu_dirtied ? ~XSTATE_FP_SSE : XSTATE_NONLAZY;
|
||||
+ if ( mask )
|
||||
+ {
|
||||
+ unsigned long cr0 = read_cr0();
|
||||
+
|
||||
+ clts();
|
||||
+ if ( curr->fpu_dirtied )
|
||||
+ asm ( "stmxcsr %0" : "=m" (curr->arch.xsave_area->fpu_sse.mxcsr) );
|
||||
+ xrstor(curr, mask);
|
||||
+ if ( cr0 & X86_CR0_TS )
|
||||
+ write_cr0(cr0);
|
||||
+ }
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -0,0 +1,171 @@
|
||||
x86: properly handle hvm_copy_from_guest_{phys,virt}() errors
|
||||
|
||||
Ignoring them generally implies using uninitialized data and, in all
|
||||
cases dealt with here, potentially leaking hypervisor stack contents to
|
||||
guests.
|
||||
|
||||
This is XSA-63.
|
||||
|
||||
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
||||
Reviewed-by: Tim Deegan <tim@xen.org>
|
||||
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
||||
|
||||
--- a/xen/arch/x86/hvm/hvm.c
|
||||
+++ b/xen/arch/x86/hvm/hvm.c
|
||||
@@ -2308,11 +2308,7 @@ void hvm_task_switch(
|
||||
|
||||
rc = hvm_copy_from_guest_virt(
|
||||
&tss, prev_tr.base, sizeof(tss), PFEC_page_present);
|
||||
- if ( rc == HVMCOPY_bad_gva_to_gfn )
|
||||
- goto out;
|
||||
- if ( rc == HVMCOPY_gfn_paged_out )
|
||||
- goto out;
|
||||
- if ( rc == HVMCOPY_gfn_shared )
|
||||
+ if ( rc != HVMCOPY_okay )
|
||||
goto out;
|
||||
|
||||
eflags = regs->eflags;
|
||||
@@ -2357,13 +2353,11 @@ void hvm_task_switch(
|
||||
|
||||
rc = hvm_copy_from_guest_virt(
|
||||
&tss, tr.base, sizeof(tss), PFEC_page_present);
|
||||
- if ( rc == HVMCOPY_bad_gva_to_gfn )
|
||||
- goto out;
|
||||
- if ( rc == HVMCOPY_gfn_paged_out )
|
||||
- goto out;
|
||||
- /* Note: this could be optimised, if the callee functions knew we want RO
|
||||
- * access */
|
||||
- if ( rc == HVMCOPY_gfn_shared )
|
||||
+ /*
|
||||
+ * Note: The HVMCOPY_gfn_shared case could be optimised, if the callee
|
||||
+ * functions knew we want RO access.
|
||||
+ */
|
||||
+ if ( rc != HVMCOPY_okay )
|
||||
goto out;
|
||||
|
||||
|
||||
--- a/xen/arch/x86/hvm/intercept.c
|
||||
+++ b/xen/arch/x86/hvm/intercept.c
|
||||
@@ -87,17 +87,28 @@ static int hvm_mmio_access(struct vcpu *
|
||||
{
|
||||
for ( i = 0; i < p->count; i++ )
|
||||
{
|
||||
- int ret;
|
||||
-
|
||||
- ret = hvm_copy_from_guest_phys(&data,
|
||||
- p->data + (sign * i * p->size),
|
||||
- p->size);
|
||||
- if ( (ret == HVMCOPY_gfn_paged_out) ||
|
||||
- (ret == HVMCOPY_gfn_shared) )
|
||||
+ switch ( hvm_copy_from_guest_phys(&data,
|
||||
+ p->data + sign * i * p->size,
|
||||
+ p->size) )
|
||||
{
|
||||
+ case HVMCOPY_okay:
|
||||
+ break;
|
||||
+ case HVMCOPY_gfn_paged_out:
|
||||
+ case HVMCOPY_gfn_shared:
|
||||
rc = X86EMUL_RETRY;
|
||||
break;
|
||||
+ case HVMCOPY_bad_gfn_to_mfn:
|
||||
+ data = ~0;
|
||||
+ break;
|
||||
+ case HVMCOPY_bad_gva_to_gfn:
|
||||
+ ASSERT(0);
|
||||
+ /* fall through */
|
||||
+ default:
|
||||
+ rc = X86EMUL_UNHANDLEABLE;
|
||||
+ break;
|
||||
}
|
||||
+ if ( rc != X86EMUL_OKAY )
|
||||
+ break;
|
||||
rc = write_handler(v, p->addr + (sign * i * p->size), p->size,
|
||||
data);
|
||||
if ( rc != X86EMUL_OKAY )
|
||||
@@ -165,8 +176,28 @@ static int process_portio_intercept(port
|
||||
for ( i = 0; i < p->count; i++ )
|
||||
{
|
||||
data = 0;
|
||||
- (void)hvm_copy_from_guest_phys(&data, p->data + sign*i*p->size,
|
||||
- p->size);
|
||||
+ switch ( hvm_copy_from_guest_phys(&data,
|
||||
+ p->data + sign * i * p->size,
|
||||
+ p->size) )
|
||||
+ {
|
||||
+ case HVMCOPY_okay:
|
||||
+ break;
|
||||
+ case HVMCOPY_gfn_paged_out:
|
||||
+ case HVMCOPY_gfn_shared:
|
||||
+ rc = X86EMUL_RETRY;
|
||||
+ break;
|
||||
+ case HVMCOPY_bad_gfn_to_mfn:
|
||||
+ data = ~0;
|
||||
+ break;
|
||||
+ case HVMCOPY_bad_gva_to_gfn:
|
||||
+ ASSERT(0);
|
||||
+ /* fall through */
|
||||
+ default:
|
||||
+ rc = X86EMUL_UNHANDLEABLE;
|
||||
+ break;
|
||||
+ }
|
||||
+ if ( rc != X86EMUL_OKAY )
|
||||
+ break;
|
||||
rc = action(IOREQ_WRITE, p->addr, p->size, &data);
|
||||
if ( rc != X86EMUL_OKAY )
|
||||
break;
|
||||
--- a/xen/arch/x86/hvm/io.c
|
||||
+++ b/xen/arch/x86/hvm/io.c
|
||||
@@ -340,14 +340,24 @@ static int dpci_ioport_write(uint32_t mp
|
||||
data = p->data;
|
||||
if ( p->data_is_ptr )
|
||||
{
|
||||
- int ret;
|
||||
-
|
||||
- ret = hvm_copy_from_guest_phys(&data,
|
||||
- p->data + (sign * i * p->size),
|
||||
- p->size);
|
||||
- if ( (ret == HVMCOPY_gfn_paged_out) &&
|
||||
- (ret == HVMCOPY_gfn_shared) )
|
||||
+ switch ( hvm_copy_from_guest_phys(&data,
|
||||
+ p->data + sign * i * p->size,
|
||||
+ p->size) )
|
||||
+ {
|
||||
+ case HVMCOPY_okay:
|
||||
+ break;
|
||||
+ case HVMCOPY_gfn_paged_out:
|
||||
+ case HVMCOPY_gfn_shared:
|
||||
return X86EMUL_RETRY;
|
||||
+ case HVMCOPY_bad_gfn_to_mfn:
|
||||
+ data = ~0;
|
||||
+ break;
|
||||
+ case HVMCOPY_bad_gva_to_gfn:
|
||||
+ ASSERT(0);
|
||||
+ /* fall through */
|
||||
+ default:
|
||||
+ return X86EMUL_UNHANDLEABLE;
|
||||
+ }
|
||||
}
|
||||
|
||||
switch ( p->size )
|
||||
--- a/xen/arch/x86/hvm/vmx/realmode.c
|
||||
+++ b/xen/arch/x86/hvm/vmx/realmode.c
|
||||
@@ -39,7 +39,9 @@ static void realmode_deliver_exception(
|
||||
|
||||
again:
|
||||
last_byte = (vector * 4) + 3;
|
||||
- if ( idtr->limit < last_byte )
|
||||
+ if ( idtr->limit < last_byte ||
|
||||
+ hvm_copy_from_guest_phys(&cs_eip, idtr->base + vector * 4, 4) !=
|
||||
+ HVMCOPY_okay )
|
||||
{
|
||||
/* Software interrupt? */
|
||||
if ( insn_len != 0 )
|
||||
@@ -64,8 +66,6 @@ static void realmode_deliver_exception(
|
||||
}
|
||||
}
|
||||
|
||||
- (void)hvm_copy_from_guest_phys(&cs_eip, idtr->base + vector * 4, 4);
|
||||
-
|
||||
frame[0] = regs->eip + insn_len;
|
||||
frame[1] = csr->sel;
|
||||
frame[2] = regs->eflags & ~X86_EFLAGS_RF;
|
||||
@ -0,0 +1,57 @@
|
||||
commit 95a0770282ea2a03f7bc48c6656d5fc79bae0599
|
||||
Author: Tim Deegan <tim@xen.org>
|
||||
Date: Thu Sep 12 14:16:28 2013 +0100
|
||||
|
||||
x86/mm/shadow: Fix initialization of PV shadow L4 tables.
|
||||
|
||||
Shadowed PV L4 tables must have the same Xen mappings as their
|
||||
unshadowed equivalent. This is done by copying the Xen entries
|
||||
verbatim from the idle pagetable, and then using guest_l4_slot()
|
||||
in the SHADOW_FOREACH_L4E() iterator to avoid touching those entries.
|
||||
|
||||
adc5afbf1c70ef55c260fb93e4b8ce5ccb918706 (x86: support up to 16Tb)
|
||||
changed the definition of ROOT_PAGETABLE_XEN_SLOTS to extend right to
|
||||
the top of the address space, which causes the shadow code to
|
||||
copy Xen mappings into guest-kernel-address slots too.
|
||||
|
||||
In the common case, all those slots are zero in the idle pagetable,
|
||||
and no harm is done. But if any slot above #271 is non-zero, Xen will
|
||||
crash when that slot is later cleared (it attempts to drop
|
||||
shadow-pagetable refcounts on its own L4 pagetables).
|
||||
|
||||
Fix by using the new ROOT_PAGETABLE_PV_XEN_SLOTS when appropriate.
|
||||
Monitor pagetables need the full Xen mappings, so they keep using the
|
||||
old name (with its new semantics).
|
||||
|
||||
This is XSA-64.
|
||||
|
||||
Signed-off-by: Tim Deegan <tim@xen.org>
|
||||
Reviewed-by: Jan Beulich <jbeulich@suse.com>
|
||||
|
||||
Xen 4.3.x and xen-unstable are vulnerable.
|
||||
|
||||
diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c
|
||||
index 4c4c2ba..3fed0b6 100644
|
||||
--- a/xen/arch/x86/mm/shadow/multi.c
|
||||
+++ b/xen/arch/x86/mm/shadow/multi.c
|
||||
@@ -1433,15 +1433,19 @@ void sh_install_xen_entries_in_l4(struct vcpu *v, mfn_t gl4mfn, mfn_t sl4mfn)
|
||||
{
|
||||
struct domain *d = v->domain;
|
||||
shadow_l4e_t *sl4e;
|
||||
+ unsigned int slots;
|
||||
|
||||
sl4e = sh_map_domain_page(sl4mfn);
|
||||
ASSERT(sl4e != NULL);
|
||||
ASSERT(sizeof (l4_pgentry_t) == sizeof (shadow_l4e_t));
|
||||
|
||||
/* Copy the common Xen mappings from the idle domain */
|
||||
+ slots = (shadow_mode_external(d)
|
||||
+ ? ROOT_PAGETABLE_XEN_SLOTS
|
||||
+ : ROOT_PAGETABLE_PV_XEN_SLOTS);
|
||||
memcpy(&sl4e[ROOT_PAGETABLE_FIRST_XEN_SLOT],
|
||||
&idle_pg_table[ROOT_PAGETABLE_FIRST_XEN_SLOT],
|
||||
- ROOT_PAGETABLE_XEN_SLOTS * sizeof(l4_pgentry_t));
|
||||
+ slots * sizeof(l4_pgentry_t));
|
||||
|
||||
/* Install the per-domain mappings for this domain */
|
||||
sl4e[shadow_l4_table_offset(PERDOMAIN_VIRT_START)] =
|
||||
@ -0,0 +1,23 @@
|
||||
x86: properly set up fbld emulation operand address
|
||||
|
||||
This is CVE-2013-4361 / XSA-66.
|
||||
|
||||
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
||||
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
|
||||
|
||||
--- a/xen/arch/x86/x86_emulate/x86_emulate.c
|
||||
+++ b/xen/arch/x86/x86_emulate/x86_emulate.c
|
||||
@@ -3156,11 +3156,11 @@ x86_emulate(
|
||||
break;
|
||||
case 4: /* fbld m80dec */
|
||||
ea.bytes = 10;
|
||||
- dst = ea;
|
||||
+ src = ea;
|
||||
if ( (rc = ops->read(src.mem.seg, src.mem.off,
|
||||
&src.val, src.bytes, ctxt)) != 0 )
|
||||
goto done;
|
||||
- emulate_fpu_insn_memdst("fbld", src.val);
|
||||
+ emulate_fpu_insn_memsrc("fbld", src.val);
|
||||
break;
|
||||
case 5: /* fild m64i */
|
||||
ea.bytes = 8;
|
||||
@ -0,0 +1,135 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.0-r1.ebuild,v 1.1 2013/10/02 17:22:28 idella4 Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
REPO="xen-unstable.hg"
|
||||
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
live_eclass="mercurial"
|
||||
else
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
|
||||
fi
|
||||
|
||||
inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
|
||||
|
||||
DESCRIPTION="The Xen virtual machine monitor"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="custom-cflags debug efi flask pae xsm"
|
||||
|
||||
DEPEND="${PYTHON_DEPS}
|
||||
efi? ( >=sys-devel/binutils-2.22[multitarget] )
|
||||
!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
|
||||
RDEPEND=""
|
||||
PDEPEND="~app-emulation/xen-tools-${PV}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="boot/xen-syms-${PV}"
|
||||
|
||||
REQUIRED_USE="flask? ( xsm )"
|
||||
|
||||
pkg_setup() {
|
||||
python-any-r1_pkg_setup
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]]; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use flask ; then
|
||||
export "XSM_ENABLE=y"
|
||||
export "FLASK_ENABLE=y"
|
||||
elif use xsm ; then
|
||||
export "XSM_ENABLE=y"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Drop .config and fix gcc-4.6
|
||||
epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch
|
||||
|
||||
if use efi; then
|
||||
epatch "${FILESDIR}"/${PN}-4.2-efi.patch
|
||||
export EFI_VENDOR="gentoo"
|
||||
export EFI_MOUNTPOINT="boot"
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
# try and remove all the default custom-cflags
|
||||
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} \; || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
# not strictly necessary to fix this
|
||||
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
|
||||
|
||||
#Security patches
|
||||
epatch "${FILESDIR}"/${PN}-CVE-2013-1442-XSA-62.patch \
|
||||
"${FILESDIR}"/${PN}-CVE-2013-4355-XSA-63.patch \
|
||||
"${FILESDIR}"/${PN}-CVE-2013-4356-XSA-64.patch \
|
||||
"${FILESDIR}"/${PN}-CVE-2013-4361-XSA-66.patch
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
use pae && myopt="${myopt} pae=y"
|
||||
|
||||
if use custom-cflags; then
|
||||
filter-flags -fPIE -fstack-protector
|
||||
replace-flags -O3 -O2
|
||||
else
|
||||
unset CFLAGS
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Send raw LDFLAGS so that --as-needed works
|
||||
emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
use pae && myopt="${myopt} pae=y"
|
||||
|
||||
# The 'make install' doesn't 'mkdir -p' the subdirs
|
||||
if use efi; then
|
||||
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
|
||||
fi
|
||||
|
||||
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the unoffical wiki page:"
|
||||
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
|
||||
elog " http://en.gentoo-wiki.com/wiki/Xen/"
|
||||
|
||||
use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
|
||||
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-monocle/lc-monocle-0.5.90-r2.ebuild,v 1.1 2013/10/02 09:49:30 maksbotan Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit leechcraft
|
||||
|
||||
DESCRIPTION="Monocle, the modular document viewer for LeechCraft."
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+djvu debug +fb2 +pdf +spectre"
|
||||
|
||||
DEPEND="~app-leechcraft/lc-core-${PV}
|
||||
pdf? ( app-text/poppler[qt4] )
|
||||
djvu? ( app-text/djvu )
|
||||
spectre? (
|
||||
app-text/libspectre
|
||||
|| (
|
||||
app-text/poppler[-lcms]
|
||||
<app-text/ghostscript-gpl-9.07
|
||||
)
|
||||
)"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs="
|
||||
$(cmake-utils_use_enable djvu MONOCLE_SEEN)
|
||||
$(cmake-utils_use_enable fb2 MONOCLE_FXB)
|
||||
$(cmake-utils_use_enable pdf MONOCLE_PDF)
|
||||
$(cmake-utils_use_enable spectre MONOCLE_POSTRUS)"
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-monocle/lc-monocle-0.5.99-r1.ebuild,v 1.1 2013/10/02 09:49:30 maksbotan Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit leechcraft
|
||||
|
||||
DESCRIPTION="Monocle, the modular document viewer for LeechCraft"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="debug +djvu doc +fb2 +pdf +spectre"
|
||||
|
||||
RDEPEND="~app-leechcraft/lc-core-${PV}
|
||||
pdf? ( app-text/poppler[qt4] )
|
||||
djvu? ( app-text/djvu )
|
||||
spectre? (
|
||||
app-text/libspectre
|
||||
|| (
|
||||
app-text/poppler[-lcms]
|
||||
<app-text/ghostscript-gpl-9.07
|
||||
)
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( app-doc/doxygen[dot] )"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_enable djvu MONOCLE_SEEN)
|
||||
$(cmake-utils_use_with doc DOCS)
|
||||
$(cmake-utils_use_enable fb2 MONOCLE_FXB)
|
||||
$(cmake-utils_use_enable pdf MONOCLE_PDF)
|
||||
$(cmake-utils_use_enable spectre MONOCLE_POSTRUS)
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
use doc && dohtml -r "${CMAKE_BUILD_DIR}"/out/html/*
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-monocle/lc-monocle-0.6.0-r1.ebuild,v 1.1 2013/10/02 09:49:30 maksbotan Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit leechcraft
|
||||
|
||||
DESCRIPTION="Monocle, the modular document viewer for LeechCraft"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="debug +djvu doc +fb2 +pdf +spectre"
|
||||
|
||||
RDEPEND="~app-leechcraft/lc-core-${PV}
|
||||
pdf? ( app-text/poppler[qt4] )
|
||||
djvu? ( app-text/djvu )
|
||||
spectre? (
|
||||
app-text/libspectre
|
||||
|| (
|
||||
app-text/poppler[-lcms]
|
||||
<app-text/ghostscript-gpl-9.07
|
||||
)
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( app-doc/doxygen[dot] )"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_enable djvu MONOCLE_SEEN)
|
||||
$(cmake-utils_use_with doc DOCS)
|
||||
$(cmake-utils_use_enable fb2 MONOCLE_FXB)
|
||||
$(cmake-utils_use_enable pdf MONOCLE_PDF)
|
||||
$(cmake-utils_use_enable spectre MONOCLE_POSTRUS)
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
use doc && dohtml -r "${CMAKE_BUILD_DIR}"/out/html/*
|
||||
}
|
||||
@ -1,20 +1,22 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX media-player-info-21-udev.patch 669 SHA256 2f374c71a194d0de637df78007153c245e80d304fd76006f856e87ded22a8563 SHA512 bfcc949406695e8518d3f8b24529b4bb45cfc298ba8129fff3296f7a6d2f6465b20c21bf62d90cdd67c21eb29bbaa1a61bc1f29ca79ad4e03fe6036e6f3d5846 WHIRLPOOL 3de39ea08444122ab05927cab4cf492f9465012ef17a157c73cfb78dfecbf4c2264058e79e736a43f087a3b45037444e688742f09a748b2594800c46f6ec838f
|
||||
DIST media-player-info-17.tar.gz 107176 SHA256 ceab4699e27b683dec4f985be5667b684e1502728243a1bb711590a58ee31e46 SHA512 7e9092b8f3f5a661f8e858647eea471851327fc0ef84ecbf45753f2a3fd564229754c866ed9e1eefba193739d38a2c6d04257c93b9525431d49034fbed6e38c5 WHIRLPOOL 00fa9c2b4cb6b990c60a77b2a3ef513cf8a3698104821dd9ad35f7872817cb171f793cae2ecb9f0bc680c32a6e609d4115de046a9b265a9ba1f87dce007a1067
|
||||
DIST media-player-info-21.tar.gz 103224 SHA256 eae5a41d27715c9280128ff770a491dae2e73e2ebeef41630b069ad0d4795127 SHA512 d281984cd746984a4b618478d9fdc3249ad4f84c38d4c6486cbf9f50d44d1ca089d8950989e34157139560b97b0093befb34a7dc465121af37dc3cbf26f04bb5 WHIRLPOOL 18b32b6dabafbdc3697af7285b373bd87bd7f3f087d7344170e99428374d57e25efbaafdc703d4b587dd2addc29701afbf352282fe2f10ffb7b8fbe5589edf5a
|
||||
EBUILD media-player-info-17.ebuild 715 SHA256 59e5f900a80fc7bd7afa6b63f820add50577c378b20ab00b3dcb563ef7c4969f SHA512 ff91adfe54674c6d807f342e3b0c59a8543b2f6a2895a650ed9145b89ee1c1d80bc5baa3095346296a0b03f56baacb42b3d9ae7ea245ea9be6d6a86b16351aea WHIRLPOOL 6709e221ad1d92b0dbd70f92c4951a6a868c0867450c990e57291b9c42adba4b56b2af3e7ca80af00176991321840f5cf5728c4141f120977a0477c9efe66748
|
||||
EBUILD media-player-info-21-r1.ebuild 1285 SHA256 63dcedde86ab7a51fb1d1756858ad5a15b992e28386b19621e0124ef7a616af6 SHA512 b14c98649d50c166ef92c009032aec190ae838f3a4bdb1d8af2919f89bb0e1fd88214e3b3d47958ff5074d3a0c5c62935284e7ecd8e9d8fd4897e7e1cc97f227 WHIRLPOOL b42d0840d01af79188b9d5900fd7d0349d68d5d551cc59fe1b05e6fbf9d0b8f92298db5b9cd7dca49de32dab1af70a4dd259b591e6221832d839ce738f983488
|
||||
EBUILD media-player-info-21.ebuild 1218 SHA256 12cc26b186b68836340a1ea1653b5e6fc994e63d8b83c0ff937065b3a790cd48 SHA512 d3f6b7e805c53c545f1340b083310b3fb685850ea149d5d0811dca46eb4afd297136000ab06ab54eeb90e8e18b43d49136567c76dc399b94f307daffd53f1f80 WHIRLPOOL cb00c91288bd08459cb4bb8497002a4dba3661d86038b430b224a8ae81c512ce70f59bf49e27b6b03ee606fd6eaf68e2c74409861152994ddfa5cf72db74f94e
|
||||
MISC ChangeLog 5035 SHA256 4660c75ac7a6c7660e6868aebb2cff5246069f1a28612582cc1696a57701ed01 SHA512 07b175f6636b8f9014aa5e670017369ccfcc209c0836fccb57d86d61bde761d7c8f984d2df00da70f50f9dfd9c8c6ad07808e55e07c8b21b4f56e1751080b534 WHIRLPOOL 6ebaf37f8935b0b22add836300b2d052211ac05753e0e7d90e61cdfeda3e10e9d79161cf881f2dc0c93cc216d5f620429ec4640ce876eeb5ca657c6978c9f41d
|
||||
MISC ChangeLog 5263 SHA256 f830db19904a755da30e0f2b5cf5249d00216d21d8b47057add1385b2252ece9 SHA512 d2e66619de5e725c6ed7ce6ddd7bfc4f2d6f877ad8aebeb2c1e21c95d0310848819d6ba9dfe45ab0c3bb92f72ba0d4920534891604f3199990f0d572e8e4ac47 WHIRLPOOL aaede29b03f363fec8036bddf7ff04f10b1def1fc575c0df7d45b1580cd71cf36a51d81fe6ff07262b8d5af45883396606fac50ea2d47f502dfe3e4834d86c18
|
||||
MISC metadata.xml 164 SHA256 66cdaff449660e99dfaee8d19b47413fc8ced6d5a1eccd3c842a48e9d9668d48 SHA512 87c2ce9c93ff1fdd7fb4768b89912acfceeeee0bbdb88d0cebdeb3e5f3b93e53bfbfbe2c1c3618629044a01af390d8fe9ec795472df58893df65503150dcf2e9 WHIRLPOOL d4c178d01829841a4f2e694280036c74f68c215c4ab64869f5a8ce2ee5005a30a204ab0e9189fd752563f392480c3c5e7fdd59cbecb40f7e51fe2ff8d1e4cd7a
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.20 (GNU/Linux)
|
||||
Version: GnuPG v2.0.21 (GNU/Linux)
|
||||
|
||||
iQEcBAEBCAAGBQJSB97BAAoJEEdUh39IaPFNhPAIAJkaG0Es4LUk4qaV9bmeeXT7
|
||||
djBQPzAlOtOpSMgJVJ1ja4X0s1Pp6Br6OQ04gAYwL3OZlFpXNquihOsHKZP5u8Bu
|
||||
IFO1zlP17Is02MUb9zLd2b3CL8ZpyG95BPPXD8iTLOjhLd6AKZMXJ6HKXfqkqNP1
|
||||
h1WUXu1khKM09ExRXxXzjG5Xe9qYoPBJHuWqOQdRQwV++moO8xxtZ0b62HgRK2AY
|
||||
nYUJNUQ9hPkLyDHNVEYzxDE+BiVbFljSW5r3vhfn4pN0AmyyRq1SOvMxQgf5rVIV
|
||||
EJ1ioa7M8RnFmWzgTj5j05lVD0UiD98n412M6MUzxEVnhjvJw/Kn4F2TxqplYD8=
|
||||
=zy0Q
|
||||
iQEcBAEBCAAGBQJSS8QTAAoJEEdUh39IaPFNEAUH/1kOi8j5JEkTZnFSkyjH7xMF
|
||||
hcHY//6i7K/It5U+3857DXCgkhuqm7PMc0aNI3+/LE9BIwWYzkIy/PUWubCPa+q2
|
||||
iE/Vhg/DlL2O+I09+x76NcrDIJ4c5ggbzCvzWF4ZJ0LPGkEJZif9gSE4+LOJ77ut
|
||||
icbnPJOgirD8r7to2qWkMpNcUzB5tDRLkQh0TF4SYbZnXT34uu9xmeiNorEanfBn
|
||||
iCBSoZKNFITOggbM+0Mk2Q5X+w/S1HDLrluux6DaNaTfevnBjZXPLfaSJIq+FzCS
|
||||
1Us8JZtLbcWE1ydEz8MCBHM8pE5VdkPDZ9tt6hfWwoX0gKlIQOkYu3itg+NCwZc=
|
||||
=hZzy
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,20 @@
|
||||
From 952a7e728356681f019f3a5076169daa24b946b9 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Pitt <martinpitt@gnome.org>
|
||||
Date: Mon, 30 Sep 2013 12:07:49 +0000
|
||||
Subject: Terminate udev rules with an empty line
|
||||
|
||||
Apparently newer udev versions now complain about the lack of it. Reported by
|
||||
Frederic Crozat.
|
||||
---
|
||||
diff --git a/tools/mpi2udev.py b/tools/mpi2udev.py
|
||||
index d33055b..33fdfa2 100755
|
||||
--- a/tools/mpi2udev.py
|
||||
+++ b/tools/mpi2udev.py
|
||||
@@ -126,4 +126,4 @@ for f in sys.argv[2:]:
|
||||
parse_mpi(f, hwdb)
|
||||
|
||||
# udev rules footer
|
||||
-os.write(sys.stdout.fileno(), b'\nLABEL="media_player_end"')
|
||||
+os.write(sys.stdout.fileno(), b'\nLABEL="media_player_end"\n')
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@ -0,0 +1,43 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/media-player-info/media-player-info-21-r1.ebuild,v 1.1 2013/10/02 07:00:16 ssuominen Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{3_2,3_3} )
|
||||
|
||||
inherit eutils python-any-r1
|
||||
|
||||
DESCRIPTION="A repository of data files describing media player capabilities"
|
||||
HOMEPAGE="http://cgit.freedesktop.org/media-player-info/"
|
||||
SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
# http://cgit.freedesktop.org/media-player-info/commit/?id=d83dd01a0a1df6198ee08954da1c033b88a1004b
|
||||
RDEPEND=">=virtual/udev-196[hwdb(+)]"
|
||||
DEPEND="${RDEPEND}
|
||||
${PYTHON_DEPS}
|
||||
virtual/pkgconfig"
|
||||
|
||||
DOCS="AUTHORS NEWS README"
|
||||
|
||||
# This ebuild does not install any binaries
|
||||
RESTRICT="binchecks strip"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-udev.patch
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Run for /lib/udev/hwdb.d/20-usb-media-players.hwdb
|
||||
udevadm hwdb --update --root="${ROOT%/}"
|
||||
# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
|
||||
if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
|
||||
return 0
|
||||
fi
|
||||
udevadm control --reload
|
||||
}
|
||||
@ -0,0 +1,86 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild,v 1.1 2013/10/02 11:01:40 jlec Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
PYTHON_COMPAT=(python{2_6,2_7,3_2,3_3} pypy2_0)
|
||||
PYTHON_REQ_USE="xml(+)"
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Collection of administration scripts for Gentoo"
|
||||
HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
|
||||
SRC_URI="mirror://gentoo/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
DEPEND="sys-apps/portage"
|
||||
RDEPEND="${DEPEND}
|
||||
!<=app-portage/gentoolkit-dev-0.2.7
|
||||
|| ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
|
||||
sys-apps/gawk
|
||||
sys-apps/grep
|
||||
virtual/python-argparse[${PYTHON_USEDEP}]"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PV}-revdep-rebuild-484340.patch
|
||||
"${FILESDIR}"/${PV}-revdep-rebuild-476740.patch
|
||||
)
|
||||
|
||||
python_prepare_all() {
|
||||
python_export_best
|
||||
echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
|
||||
VERSION="${PVR}" "${PYTHON}" setup.py set_version
|
||||
mv ./bin/revdep-rebuild{,.py} || die
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
|
||||
# Rename the python versions of revdep-rebuild, since we are not ready
|
||||
# to switch to the python version yet. Link /usr/bin/revdep-rebuild to
|
||||
# revdep-rebuild.sh. Leaving the python version available for potential
|
||||
# testing by a wider audience.
|
||||
dosym revdep-rebuild.sh /usr/bin/revdep-rebuild
|
||||
|
||||
# Create cache directory for revdep-rebuild
|
||||
keepdir /var/cache/revdep-rebuild
|
||||
use prefix || fowners root:0 /var/cache/revdep-rebuild
|
||||
fperms 0700 /var/cache/revdep-rebuild
|
||||
|
||||
# remove on Gentoo Prefix platforms where it's broken anyway
|
||||
if use prefix; then
|
||||
elog "The revdep-rebuild command is removed, the preserve-libs"
|
||||
elog "feature of portage will handle issues."
|
||||
rm "${ED}"/usr/bin/revdep-rebuild*
|
||||
rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
|
||||
rm -rf "${ED}"/etc/revdep-rebuild
|
||||
rm -rf "${ED}"/var
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Only show the elog information on a new install
|
||||
if [[ ! ${REPLACING_VERSIONS} ]]; then
|
||||
elog
|
||||
elog "For further information on gentoolkit, please read the gentoolkit"
|
||||
elog "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
|
||||
elog
|
||||
elog "Another alternative to equery is app-portage/portage-utils"
|
||||
elog
|
||||
elog "Additional tools that may be of interest:"
|
||||
elog
|
||||
elog " app-admin/eclean-kernel"
|
||||
elog " app-portage/diffmask"
|
||||
elog " app-portage/flaggie"
|
||||
elog " app-portage/install-mask"
|
||||
elog " app-portage/portpeek"
|
||||
elog " app-portage/smart-live-rebuild"
|
||||
fi
|
||||
}
|
||||
@ -1,81 +0,0 @@
|
||||
# ChangeLog for dev-games/neoengine
|
||||
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-games/neoengine/ChangeLog,v 1.20 2013/05/11 20:06:09 tupone Exp $
|
||||
|
||||
11 May 2013; Tupone Alfredo <tupone@gentoo.org> neoengine-0.8.2-r1.ebuild,
|
||||
+files/neoengine-0.8.2-automake113.patch:
|
||||
Fix build with automake-1.13. Bug #467634 by Ian Stakenvicius
|
||||
|
||||
28 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
|
||||
neoengine-0.8.2-r1.ebuild:
|
||||
Use virtual/jpeg.
|
||||
|
||||
22 Jan 2010; Brent Baude <ranger@gentoo.org> neoengine-0.8.2-r1.ebuild:
|
||||
stable ppc, bug 288940
|
||||
|
||||
21 Nov 2009; Markus Meier <maekke@gentoo.org> neoengine-0.8.2-r1.ebuild:
|
||||
x86 stable, bug #288940
|
||||
|
||||
10 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
|
||||
neoengine-0.8.2-r1.ebuild, +files/neoengine-0.8.2-gcc44.patch:
|
||||
Fix building with GCC 4.4+ wrt #274121.
|
||||
|
||||
*neoengine-0.8.2-r1 (02 Mar 2009)
|
||||
|
||||
02 Mar 2009; Alfredo Tupone <tupone@gentoo.org>
|
||||
+files/neoengine-0.8.2-nolibs.patch, +neoengine-0.8.2-r1.ebuild:
|
||||
Removing internal copies of libraries. Bug #247243 by flameeyes@gentoo.org
|
||||
|
||||
16 Jan 2009; Tupone Alfredo <tupone@gentoo.org>
|
||||
+files/neoengine-0.8.2-gcc43.patch, neoengine-0.8.2.ebuild:
|
||||
gcc-4.3 build fixed. Bug #250831 by flameeyes@gentoo.org
|
||||
|
||||
13 May 2008; Michael Sterrett <mr_bones_@gentoo.org>
|
||||
neoengine-0.8.2.ebuild:
|
||||
make app-doc/doxygen a dep instead of an rdep (bug #221651)
|
||||
|
||||
25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
|
||||
Removing dholm from metadata.xml as per #24623.
|
||||
|
||||
15 Apr 2006; <Tupone@gentoo.org> -files/0.7.0-execute.patch,
|
||||
-files/0.7.0-ppc.patch, +files/neoengine-0.8.2-gcc41.patch,
|
||||
neoengine-0.8.2.ebuild:
|
||||
Fix for gcc-4.1.
|
||||
Purge old patches
|
||||
|
||||
03 Mar 2006; <Tupone@gentoo.org> neoengine-0.8.2.ebuild:
|
||||
Forget to die
|
||||
|
||||
*neoengine-0.8.2 (03 Mar 2006)
|
||||
|
||||
03 Mar 2006; <Tupone@gentoo.org> +neoengine-0.8.2.ebuild:
|
||||
Version bump, and closing bug #118992 (compilation on gcc-3.4)
|
||||
|
||||
30 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
|
||||
neoengine-0.8.1.ebuild:
|
||||
Removed INSTALL.
|
||||
|
||||
13 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
|
||||
-neoengine-0.7.0.ebuild, -neoengine-0.8.0.ebuild, neoengine-0.8.1.ebuild:
|
||||
localize variables; tidy; clean older ebuilds
|
||||
|
||||
02 Jun 2004; Aron Griffis <agriffis@gentoo.org> neoengine-0.7.0.ebuild,
|
||||
neoengine-0.8.0.ebuild, neoengine-0.8.1.ebuild:
|
||||
Fix use invocation
|
||||
|
||||
*neoengine-0.8.1 (14 Apr 2004)
|
||||
|
||||
14 Apr 2004; David Holm <dholm@gentoo.org> neoengine-0.8.1.ebuild:
|
||||
Version bump.
|
||||
|
||||
*neoengine-0.8.0 (23 Mar 2004)
|
||||
|
||||
23 Mar 2004; David Holm <dholm@gentoo.org> neoengine-0.8.0.ebuild:
|
||||
Version bump.
|
||||
|
||||
*neoengine-0.7.0 (22 Mar 2004)
|
||||
|
||||
22 Mar 2004; David Holm <dholm@gentoo.org> metadata.xml,
|
||||
neoengine-0.7.0.ebuild, files/0.7.0-execute.patch, files/0.7.0-ppc.patch:
|
||||
Initial import.
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX neoengine-0.8.2-automake113.patch 409 SHA256 413940948f1a1764103c62c62901821616f5d1447040c696b973e6c776a7a4b3 SHA512 3686d23d4b49b9a4c40ca86ea99747f83edf95df7a47884a1e21c810fde1aaa262ef2b376f1570c5ba0b3824739485f687f0c8d63f21e747437fe4d1d3cc6cad WHIRLPOOL 17187f67667a90685c1351566ff864a082d1f3bb1d508dd7066f0e5400d8e9b3de808a9ce86bd5832b6afed27168060b983e293347a2961aa439e037df7abc4b
|
||||
AUX neoengine-0.8.2-gcc41.patch 568 SHA256 b672fc46dbde145de1d08161f07ef17520537644103a36752ace6ff1ff4a9d28 SHA512 564ea412de08d4413e19cb5ab6e6b7ddb247d285c0bc492b340c28a91516bea4189dc5fcc9359f64533d3d03712649f7ec2095cb493e764071f6d93bf4e4aac5 WHIRLPOOL 24a32a101c416c54a7d21e64600cac0bd26bf0f2d594a91b2da764a870ad9ea71ce3d97aad27c2468b46a5848b880023b3a2e1cfdedcffd9959b64852a4e4bf4
|
||||
AUX neoengine-0.8.2-gcc43.patch 5798 SHA256 c3f07cd7b9e6457d1dce2d4394755b8121f7d94ef10868cde5c8caba0aaf06ba SHA512 afe0234a122bf6fe5745ab789f43162565f8c48947a8965ed03c7a34389f0fb2acc7d8300df7fb87e714ee1efc77235b338449b4fe1a0501d652935f10a64195 WHIRLPOOL ccd1a3e601262b5c775b77e7a48a52d56505e4742c2880b4d5fef87f06f1eae739e16a74dfd6807680641a67b789b18b4e23bce0b9054e38287af6701cdffc77
|
||||
AUX neoengine-0.8.2-gcc44.patch 422 SHA256 af295058ea48fc2ca3ef874662a3d1df3734aa11e2de8494946a9819cb3174ea SHA512 ee22402082fcb42d866ac3f29090ca2dab1d69d06c62da7db84946b96ad50a83c8e70eb178c20ebdf66c9ecdc6d67635ab8e553cb32fcd8ff97d4b90c8f606a4 WHIRLPOOL 64b2bc97ab8e9e00cee3c0e5d2c614cb73b38b91d3bc634860cb001fe7855352e3c0645a5a883fdbd8d5adfde83d2465a83891e8747970ebb5b45d2f3a29eb0d
|
||||
AUX neoengine-0.8.2-nolibs.patch 3668 SHA256 a2934ef8198fcd5b5dbfab862107c3d97296a687829268d2fb1d7c2196342726 SHA512 291826db848334c1e6988b5a909913ba32e2d0ac9776f9904939cd535434f6ce56271066c1788641cf4af4ebe2dd74c7251c971042f5e353d8de2243fe9346ff WHIRLPOOL 4044b01ae5c3ad50cde1a78f4d5af1830a0599d7162355140593ca1af9705a0795c8591ee5a5dbfc21401ec6fef58cf818fd225d149c1b0cd783c6b779a2d265
|
||||
DIST neoengine-0.8.2.tar.bz2 1568596 SHA256 351d5efcf4e5b5aebad76a2696b1feaeb21678045b68cb553e0ee3377c3a1c26 SHA512 52ac3013f9cd7fc970cb24a1aa167803d95829d80b0d158047801cdb95a03deedde53db70681f3771b6cd6e735cafc12179c42e1d49fc39835f4956865889ea8 WHIRLPOOL c49a9198fe746c551452859c2698c68ffd045afe390409fc22e58d17f092b30ac5f2b7a95822d66c7488d78d2e3e91302385146f1988662186b75b4a264edde4
|
||||
EBUILD neoengine-0.8.2-r1.ebuild 1216 SHA256 caa264bb37f4112d1e407a8a6cc9a49993b3ad5fbbc552d3d82a8b03dc96aec6 SHA512 524b91b256b6fca5798fc447778d00213c96f977ed7142bd4ba3ea1167543437fd7f6261d52c9a9875fb5b97519f94702a41673c11eea93e95da7988e536cdd6 WHIRLPOOL 3b05085cfac82fb2208046c15c26e527f56bba1252819933469455df2ef46649bfaf4602843ccfc7cdf9bd84b5e82e9c26ce3df23268266c1a8033c2b50ec0ae
|
||||
MISC ChangeLog 2800 SHA256 b6b0e70d4ba3a27e4126a5cebd083ba1a5ab4895badf0a7e7a053024adf25c21 SHA512 a3b414059488e3894cf17ce5d855fd4ec9b007d5461fe145b427b84d8068152590bc6d687676af7bf0c0372b1c5705c1dc36fd0bdd42e1be4cf5650f7455ff45 WHIRLPOOL eb4aa2c58f5bda949187bbf81050c82d66dd822c8ba1612c22b6bf75e343963fbb05cc8c3fcbb4d42ed4b8e8e7659bf8a886786f49836d68b7a03d274ef45ece
|
||||
MISC metadata.xml 651 SHA256 4399d7ce8eeaf78bfad76fc7acf7822b829034bb6a2ae22095e1c92e62557000 SHA512 d81ece0195306624753ddfa1d3a186872d8e54990edd9f9ce4ac63de4bd06b6329b12de04a7c7773865264362a50a842cbafabe696b090ef1036420c2ef35183 WHIRLPOOL f60a29e5f386a822bf2390f2d075164071709e7b196cc88bbdeaa6b228c92af9b7b0a591f1c1e0d5d32ea8dcbbe6b9bea340505658fa2529fb610c2f8467fb2e
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iEYEAREIAAYFAlGOpLgACgkQIY77eQFFFC2JvwCgjWAUc8poBCMvavn/wbrUhpny
|
||||
1hoAoJi7oa6Cy5mbcfgZOwCAqtuL05r3
|
||||
=61aL
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,11 +0,0 @@
|
||||
--- configure.in.dynamic.old 2013-05-11 21:22:22.767118628 +0200
|
||||
+++ configure.in.dynamic 2013-05-11 21:22:33.104393474 +0200
|
||||
@@ -6,7 +6,7 @@
|
||||
AC_INIT([neoengine], [neoengine_version], [http://www.neoengine.org/], [mattias@realityrift.com])
|
||||
AC_CANONICAL_TARGET
|
||||
AM_INIT_AUTOMAKE([neoengine], [neoengine_version])
|
||||
-AM_CONFIG_HEADER(buildconfig.h)
|
||||
+AC_CONFIG_HEADER(buildconfig.h)
|
||||
AC_LANG(C++)
|
||||
|
||||
# Templates
|
||||
@ -1,20 +0,0 @@
|
||||
--- neoengine/logstream.h.old 2006-04-15 02:04:46.000000000 +0200
|
||||
+++ neoengine/logstream.h 2006-04-15 02:06:19.000000000 +0200
|
||||
@@ -259,6 +259,7 @@
|
||||
virtual void Write( const std::string &rstrMsg );
|
||||
};
|
||||
|
||||
+class NEOENGINE_API LogSource;
|
||||
|
||||
/**
|
||||
* \brief Stream buffer for the log source
|
||||
--- neoengine/font.h.old 2006-04-15 02:10:55.000000000 +0200
|
||||
+++ neoengine/font.h 2006-04-15 02:11:13.000000000 +0200
|
||||
@@ -85,6 +85,7 @@
|
||||
|
||||
|
||||
|
||||
+class NEOENGINE_API FontManager;
|
||||
|
||||
/**
|
||||
* \brief Font abstraction. Loads, prints and other methods.
|
||||
@ -1,155 +0,0 @@
|
||||
diff -Nurpa neoengine.orig/neoengine/core.cpp neoengine/neoengine/core.cpp
|
||||
--- neoengine.orig/neoengine/core.cpp 2008-12-16 09:43:18.000000000 +0300
|
||||
+++ neoengine/neoengine/core.cpp 2008-12-16 09:48:05.000000000 +0300
|
||||
@@ -64,6 +64,8 @@
|
||||
# include <sys/sysctl.h>
|
||||
#endif
|
||||
|
||||
+#include <cstdlib>
|
||||
+
|
||||
using namespace std;
|
||||
|
||||
|
||||
diff -Nurpa neoengine.orig/neoengine/hash.h neoengine/neoengine/hash.h
|
||||
--- neoengine.orig/neoengine/hash.h 2008-12-16 09:43:18.000000000 +0300
|
||||
+++ neoengine/neoengine/hash.h 2008-12-16 09:46:50.000000000 +0300
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "base.h"
|
||||
|
||||
#include <string>
|
||||
-
|
||||
+#include <cstring>
|
||||
|
||||
/**
|
||||
* \file hash.h
|
||||
diff -Nurpa neoengine.orig/neoengine/particle.cpp neoengine/neoengine/particle.cpp
|
||||
--- neoengine.orig/neoengine/particle.cpp 2008-12-16 09:43:17.000000000 +0300
|
||||
+++ neoengine/neoengine/particle.cpp 2008-12-16 09:50:37.000000000 +0300
|
||||
@@ -29,6 +29,8 @@
|
||||
#include "timer.h"
|
||||
#include "logstream.h"
|
||||
|
||||
+#include <cstdlib>
|
||||
+
|
||||
using namespace std;
|
||||
|
||||
|
||||
diff -Nurpa neoengine.orig/neoengine/shader.cpp neoengine/neoengine/shader.cpp
|
||||
--- neoengine.orig/neoengine/shader.cpp 2008-12-16 09:43:18.000000000 +0300
|
||||
+++ neoengine/neoengine/shader.cpp 2008-12-16 09:53:32.000000000 +0300
|
||||
@@ -32,6 +32,8 @@
|
||||
#include "logstream.h"
|
||||
#include "strutil.h"
|
||||
|
||||
+#include <cstdlib>
|
||||
+
|
||||
using namespace std;
|
||||
|
||||
|
||||
diff -Nurpa neoengine.orig/neoengine/strutil.cpp neoengine/neoengine/strutil.cpp
|
||||
--- neoengine.orig/neoengine/strutil.cpp 2008-12-16 09:43:18.000000000 +0300
|
||||
+++ neoengine/neoengine/strutil.cpp 2008-12-16 09:54:23.000000000 +0300
|
||||
@@ -25,6 +25,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
#include "strutil.h"
|
||||
+#include <cstring>
|
||||
|
||||
using namespace std;
|
||||
|
||||
diff -Nurpa neoengine.orig/neoengine/tcp.cpp neoengine/neoengine/tcp.cpp
|
||||
--- neoengine.orig/neoengine/tcp.cpp 2008-12-16 09:43:18.000000000 +0300
|
||||
+++ neoengine/neoengine/tcp.cpp 2008-12-16 09:56:21.000000000 +0300
|
||||
@@ -54,6 +54,9 @@
|
||||
# define SOCKET_ERROR -1
|
||||
#endif /* __APPLE__ */
|
||||
|
||||
+#include <cstring>
|
||||
+#include <cstdlib>
|
||||
+
|
||||
using namespace std;
|
||||
|
||||
|
||||
diff -Nurpa neoengine.orig/neoengine/udp.cpp neoengine/neoengine/udp.cpp
|
||||
--- neoengine.orig/neoengine/udp.cpp 2008-12-16 09:43:18.000000000 +0300
|
||||
+++ neoengine/neoengine/udp.cpp 2008-12-16 09:57:05.000000000 +0300
|
||||
@@ -57,6 +57,8 @@
|
||||
# define SOCKET_ERROR -1
|
||||
#endif /* __APPLE__ */
|
||||
|
||||
+#include <cstring>
|
||||
+
|
||||
using namespace std;
|
||||
|
||||
|
||||
diff -Nurpa neoengine.orig/neochunkio/texlayer.cpp neoengine/neochunkio/texlayer.cpp
|
||||
--- neoengine.orig/neochunkio/texlayer.cpp 2004-03-27 22:25:18.000000000 +0300
|
||||
+++ neoengine/neochunkio/texlayer.cpp 2008-12-17 01:27:41.000000000 +0300
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <vector>
|
||||
#include <sstream>
|
||||
#include <iomanip>
|
||||
+#include <cstdlib>
|
||||
|
||||
using namespace std;
|
||||
using namespace NeoEngine;
|
||||
diff -Nurpa neoengine.orig/neochunkio/vertexbuffer.cpp neoengine/neochunkio/vertexbuffer.cpp
|
||||
--- neoengine.orig/neochunkio/vertexbuffer.cpp 2004-03-15 10:35:50.000000000 +0300
|
||||
+++ neoengine/neochunkio/vertexbuffer.cpp 2008-12-17 01:28:12.000000000 +0300
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
-
|
||||
+#include <cstdlib>
|
||||
|
||||
using namespace std;
|
||||
using namespace NeoEngine;
|
||||
diff -Nurpa neoengine.orig/neodevopengl/extensions.h neoengine/neodevopengl/extensions.h
|
||||
--- neoengine.orig/neodevopengl/extensions.h 2004-06-12 20:47:42.000000000 +0400
|
||||
+++ neoengine/neodevopengl/extensions.h 2008-12-16 23:17:49.000000000 +0300
|
||||
@@ -486,8 +486,8 @@ extern fpglGetProgramivARB
|
||||
typedef GLuint (NEOGLAPIENTRY * fpglGenFragmentShadersATI)( GLuint );
|
||||
typedef void (NEOGLAPIENTRY * fpglBindFragmentShaderATI)( GLuint );
|
||||
typedef void (NEOGLAPIENTRY * fpglDeleteFragmentShaderATI)( GLuint );
|
||||
-typedef void (NEOGLAPIENTRY * fpglBeginFragmentShaderATI)( GLvoid );
|
||||
-typedef void (NEOGLAPIENTRY * fpglEndFragmentShaderATI)( GLvoid );
|
||||
+typedef void (NEOGLAPIENTRY * fpglBeginFragmentShaderATI)( void );
|
||||
+typedef void (NEOGLAPIENTRY * fpglEndFragmentShaderATI)( void );
|
||||
typedef void (NEOGLAPIENTRY * fpglPassTexCoordATI)( GLuint, GLuint, GLenum );
|
||||
typedef void (NEOGLAPIENTRY * fpglSampleMapATI)( GLuint, GLuint, GLenum );
|
||||
typedef void (NEOGLAPIENTRY * fpglColorFragmentOp1ATI)( GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint );
|
||||
diff -Nurpa neoengine.orig/neodevopengl/open.cpp neoengine/neodevopengl/open.cpp
|
||||
--- neoengine.orig/neodevopengl/open.cpp 2004-02-11 19:33:37.000000000 +0300
|
||||
+++ neoengine/neodevopengl/open.cpp 2008-12-16 23:09:49.000000000 +0300
|
||||
@@ -32,6 +32,8 @@
|
||||
|
||||
#include <neoengine/logstream.h>
|
||||
|
||||
+#include <cstdlib>
|
||||
+
|
||||
using namespace std;
|
||||
using namespace NeoEngine;
|
||||
|
||||
diff -Nurpa neoengine.orig/neodevopengl/shader-ati.cpp neoengine/neodevopengl/shader-ati.cpp
|
||||
--- neoengine.orig/neodevopengl/shader-ati.cpp 2004-06-29 20:59:10.000000000 +0400
|
||||
+++ neoengine/neodevopengl/shader-ati.cpp 2008-12-16 23:13:51.000000000 +0300
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <neoengine/scenenode.h>
|
||||
#include <neoengine/strutil.h>
|
||||
#include <neoengine/logstream.h>
|
||||
+#include <cstdlib>
|
||||
|
||||
using namespace std;
|
||||
using namespace NeoEngine;
|
||||
diff -Nurpa neoengine.orig/neodevopengl/vertexbuffer.cpp neoengine/neodevopengl/vertexbuffer.cpp
|
||||
--- neoengine.orig/neodevopengl/vertexbuffer.cpp 2004-06-12 08:02:02.000000000 +0400
|
||||
+++ neoengine/neodevopengl/vertexbuffer.cpp 2008-12-17 01:08:40.000000000 +0300
|
||||
@@ -25,6 +25,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
#include "vertexbuffer.h"
|
||||
+#include <cstring>
|
||||
|
||||
using namespace NeoEngine;
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -ur neoengine.orig/neodevopengl/statistics.cpp neoengine/neodevopengl/statistics.cpp
|
||||
--- neoengine.orig/neodevopengl/statistics.cpp 2003-12-21 13:49:12.000000000 +0200
|
||||
+++ neoengine/neodevopengl/statistics.cpp 2009-08-10 11:33:21.000000000 +0300
|
||||
@@ -24,6 +24,8 @@
|
||||
|
||||
***************************************************************************/
|
||||
|
||||
+#include <stdio.h>
|
||||
+
|
||||
#include "statistics.h"
|
||||
#include "device.h"
|
||||
|
||||
@ -1,84 +0,0 @@
|
||||
--- neofczip/Makefile.am.dynamic.old 2009-03-02 09:17:40.000000000 +0100
|
||||
+++ neofczip/Makefile.am.dynamic 2009-03-02 09:17:49.000000000 +0100
|
||||
@@ -1,11 +1,11 @@
|
||||
|
||||
lib_LTLIBRARIES = libneofczip.la
|
||||
|
||||
-libneofczip_la_SOURCES = neofczip.cpp adler32.c compress.c crc32.c deflate.c gzio.c infback.c inffast.c inflate.c inftrees.c minigzip.c trees.c uncompr.c zutil.c
|
||||
+libneofczip_la_SOURCES = neofczip.cpp
|
||||
|
||||
EXTRA_DIST = zlib.h neofczip.dsp Makefile.am.static Makefile.am.dynamic
|
||||
|
||||
-libneofczip_la_LIBADD = @NEOENGINE_EXTRA_LIBS@
|
||||
+libneofczip_la_LIBADD = @NEOENGINE_EXTRA_LIBS@ -lz
|
||||
|
||||
# set the include path found by configure
|
||||
INCLUDES = -I..
|
||||
--- neoicpng/Makefile.am.dynamic.old 2009-03-02 10:03:19.000000000 +0100
|
||||
+++ neoicpng/Makefile.am.dynamic 2009-03-02 10:03:27.000000000 +0100
|
||||
@@ -1,9 +1,7 @@
|
||||
|
||||
lib_LTLIBRARIES = libneoicpng.la
|
||||
|
||||
-libneoicpng_la_SOURCES = neoicpng.cpp png.c pngerror.c pngget.c pngmem.c pngpread.c pngread.c pngrio.c \
|
||||
- pngrtran.c pngrutil.c pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c deflate.c \
|
||||
- inflate.c trees.c zutil.c infblock.c inftrees.c infcodes.c infutil.c inffast.c adler32.c crc32.c
|
||||
+libneoicpng_la_SOURCES = neoicpng.cpp
|
||||
|
||||
EXTRA_DIST = pnggccrd.c pngvcrd.c deflate.h infblock.h infcodes.h inffast.h inffixed.h inftrees.h \
|
||||
infutil.h pngasmrd.h pngconf.h png.h trees.h zconf.h zlib.h zutil.h \
|
||||
@@ -11,7 +9,7 @@
|
||||
neoicpng-static.dsp neoicpng-static.vcproj neoicpng-static.dev \
|
||||
LICENSE Makefile.am.static Makefile.am.dynamic
|
||||
|
||||
-libneoicpng_la_LIBADD = @NEOENGINE_EXTRA_LIBS@
|
||||
+libneoicpng_la_LIBADD = @NEOENGINE_EXTRA_LIBS@ -lpng
|
||||
|
||||
# set the include path found by configure
|
||||
INCLUDES = -I..
|
||||
--- neofcbzip2/Makefile.am.dynamic.old 2009-03-02 10:20:40.000000000 +0100
|
||||
+++ neofcbzip2/Makefile.am.dynamic 2009-03-02 10:20:49.000000000 +0100
|
||||
@@ -1,13 +1,13 @@
|
||||
|
||||
lib_LTLIBRARIES = libneofcbzip2.la
|
||||
|
||||
-libneofcbzip2_la_SOURCES = neofcbzip2.cpp blocksort.c bzlib.c compress.c crctable.c decompress.c huffman.c randtable.c
|
||||
+libneofcbzip2_la_SOURCES = neofcbzip2.cpp
|
||||
|
||||
EXTRA_DIST = bzlib.h bzlib_private.h neofcbzip2.dsp neofcbzip2.vcproj neofcbzip2.dev \
|
||||
neofcbzip2-static.dsp neofcbzip2-static.vcproj neofcbzip2-static.dev \
|
||||
Makefile.am.static Makefile.am.dynamic
|
||||
|
||||
-libneofcbzip2_la_LIBADD = @NEOENGINE_EXTRA_LIBS@
|
||||
+libneofcbzip2_la_LIBADD = @NEOENGINE_EXTRA_LIBS@ -lbz2
|
||||
|
||||
# set the include path found by configure
|
||||
INCLUDES = -I..
|
||||
--- neoicjpeg/Makefile.am.dynamic.old 2004-03-22 11:04:21.000000000 +0100
|
||||
+++ neoicjpeg/Makefile.am.dynamic 2009-03-02 10:26:00.000000000 +0100
|
||||
@@ -1,15 +1,7 @@
|
||||
|
||||
lib_LTLIBRARIES = libneoicjpeg.la
|
||||
|
||||
-libneoicjpeg_la_SOURCES = neoicjpeg.cpp \
|
||||
- jcapimin.c jcmarker.c jdapimin.c jdinput.c jdtrans.c jidctred.c jquant1.c \
|
||||
- jcapistd.c jcmaster.c jdapistd.c jdmainct.c jerror.c jquant2.c \
|
||||
- jccoefct.c jcomapi.c jdatadst.c jdmarker.c jfdctflt.c jutils.c \
|
||||
- jccolor.c jcparam.c jdatasrc.c jdmaster.c jfdctfst.c \
|
||||
- jcdctmgr.c jcphuff.c jdcoefct.c jdmerge.c jfdctint.c jmemmgr.c \
|
||||
- jchuff.c jcprepct.c jdcolor.c jdphuff.c jidctflt.c \
|
||||
- jcinit.c jcsample.c jddctmgr.c jdpostct.c jidctfst.c jmemnobs.c \
|
||||
- jcmainct.c jctrans.c jdhuff.c jdsample.c jidctint.c
|
||||
+libneoicjpeg_la_SOURCES = neoicjpeg.cpp
|
||||
|
||||
EXTRA_DIST = README jchuff.h jdhuff.h jmemsys.h jpeglib.h \
|
||||
jconfig.h jerror.h jmorecfg.h jversion.h jdct.h \
|
||||
@@ -17,7 +9,7 @@
|
||||
neoicjpeg-static.dsp neoicjpeg-static.vcproj neoicjpeg-static.dev \
|
||||
Makefile.am.static Makefile.am.dynamic
|
||||
|
||||
-libneoicjpeg_la_LIBADD = @NEOENGINE_EXTRA_LIBS@
|
||||
+libneoicjpeg_la_LIBADD = @NEOENGINE_EXTRA_LIBS@ -ljpeg
|
||||
|
||||
# set the include path found by configure
|
||||
INCLUDES = -I..
|
||||
@ -1,14 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>games</herd>
|
||||
<longdescription>
|
||||
NeoEngine is built with platform and API independency as the main goal.
|
||||
This means that if you build your game using the NeoEngine abstractions
|
||||
for services such as rendering, audio, file/resource management and
|
||||
networking, your game will run on all NeoEngine supported platforms with
|
||||
no changes to your game code. NeoEngine is also designed with an "open"
|
||||
API in mind. This means you can easily change, remove or add components
|
||||
you wish.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
@ -1,58 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-games/neoengine/neoengine-0.8.2-r1.ebuild,v 1.6 2013/05/11 20:06:09 tupone Exp $
|
||||
|
||||
EAPI=2
|
||||
inherit autotools eutils
|
||||
|
||||
DESCRIPTION="An open source, platform independent, 3D game engine written in C++"
|
||||
HOMEPAGE="http://www.neoengine.org/"
|
||||
SRC_URI="mirror://sourceforge/neoengine/${P}.tar.bz2"
|
||||
|
||||
LICENSE="MPL-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="ppc x86"
|
||||
IUSE="doc"
|
||||
|
||||
RDEPEND="virtual/opengl
|
||||
media-libs/alsa-lib
|
||||
media-libs/libpng
|
||||
virtual/jpeg"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( app-doc/doxygen )"
|
||||
|
||||
S=${WORKDIR}/neoengine
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}/${P}"-gcc41.patch \
|
||||
"${FILESDIR}/${P}"-gcc43.patch \
|
||||
"${FILESDIR}"/${P}-nolibs.patch \
|
||||
"${FILESDIR}"/${P}-gcc44.patch \
|
||||
"${FILESDIR}"/${P}-automake113.patch
|
||||
|
||||
./setbuildtype.sh dynamic
|
||||
|
||||
eautoreconf
|
||||
eautomake neodevopengl/Makefile
|
||||
eautomake neodevalsa/Makefile
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-dependency-tracking
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die
|
||||
|
||||
if use doc; then
|
||||
emake doc || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
dodoc AUTHORS ChangeLog* NEWS README
|
||||
use doc && dohtml -r *-api
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashable/hashable-1.2.1.0.ebuild,v 1.1 2013/10/03 03:48:40 gienah Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
# ebuild generated by hackport 0.3.3.9999
|
||||
|
||||
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
|
||||
inherit haskell-cabal
|
||||
|
||||
DESCRIPTION="A class for types that can be converted to a hash value"
|
||||
HOMEPAGE="http://github.com/tibbe/hashable"
|
||||
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="+sse2 sse4_1"
|
||||
|
||||
RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
|
||||
>=dev-lang/ghc-6.10.4:=
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-haskell/cabal-1.8
|
||||
test? ( dev-haskell/hunit
|
||||
>=dev-haskell/quickcheck-2.4.0.1
|
||||
>=dev-haskell/random-1.0 <dev-haskell/random-1.1
|
||||
>=dev-haskell/test-framework-0.3.3
|
||||
dev-haskell/test-framework-hunit
|
||||
>=dev-haskell/test-framework-quickcheck2-0.2.9 )
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
haskell-cabal_src_configure \
|
||||
$(cabal_flag sse2 sse2) \
|
||||
$(cabal_flag sse4_1 sse41)
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashtables/hashtables-1.1.2.0.ebuild,v 1.1 2013/10/03 04:00:24 gienah Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
# ebuild generated by hackport 0.3.4.9999
|
||||
|
||||
CABAL_FEATURES="lib profile haddock hoogle hscolour"
|
||||
inherit haskell-cabal
|
||||
|
||||
DESCRIPTION="Mutable hash tables in the ST monad"
|
||||
HOMEPAGE="http://github.com/gregorycollins/hashtables"
|
||||
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="sse4_1"
|
||||
|
||||
RDEPEND="dev-haskell/primitive:=[profile?]
|
||||
>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
|
||||
>=dev-lang/ghc-6.10.4:=
|
||||
|| ( ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.2:=[profile?] )
|
||||
( >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-haskell/cabal-1.8
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
haskell-cabal_src_configure \
|
||||
--flag=-portable \
|
||||
$(cabal_flag sse4_1 sse41)
|
||||
--flag=-debug \
|
||||
--flag=-bounds-checking \
|
||||
--flag=unsafe-tricks
|
||||
}
|
||||
@ -0,0 +1,87 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lens/lens-3.9.2.ebuild,v 1.1 2013/10/03 02:33:51 gienah Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
# ebuild generated by hackport 0.3.4.9999
|
||||
|
||||
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
|
||||
inherit haskell-cabal
|
||||
|
||||
DESCRIPTION="Lenses, Folds and Traversals"
|
||||
HOMEPAGE="http://github.com/ekmett/lens/"
|
||||
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="benchmark-uniplate dump-splices +inlining lib-werror old-inline-pragmas safe +test-doctests +test-hunit +test-properties +trustworthy"
|
||||
|
||||
RDEPEND=">=dev-haskell/bifunctors-3:=[profile?] <dev-haskell/bifunctors-4:=[profile?]
|
||||
>=dev-haskell/comonad-3:=[profile?] <dev-haskell/comonad-4:=[profile?]
|
||||
>=dev-haskell/comonad-transformers-3:=[profile?] <dev-haskell/comonad-transformers-4:=[profile?]
|
||||
>=dev-haskell/comonads-fd-3:=[profile?] <dev-haskell/comonads-fd-4:=[profile?]
|
||||
>=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?]
|
||||
>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
|
||||
>=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?]
|
||||
>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
|
||||
>=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?]
|
||||
>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
|
||||
>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
|
||||
>=dev-haskell/profunctor-extras-3.3:=[profile?] <dev-haskell/profunctor-extras-4:=[profile?]
|
||||
>=dev-haskell/profunctors-3.2:=[profile?] <dev-haskell/profunctors-4:=[profile?]
|
||||
>=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?]
|
||||
>=dev-haskell/semigroupoids-3.0.2:=[profile?] <dev-haskell/semigroupoids-4:=[profile?]
|
||||
>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
|
||||
>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
|
||||
>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
|
||||
>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?]
|
||||
>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
|
||||
>=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
|
||||
>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
|
||||
>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
|
||||
>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
|
||||
>=dev-lang/ghc-7.0.1:=
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-haskell/cabal-1.10.0.0
|
||||
test? ( test-doctests? ( dev-haskell/deepseq
|
||||
>=dev-haskell/doctest-0.9.1
|
||||
dev-haskell/nats
|
||||
>=dev-haskell/simple-reflect-0.3.1
|
||||
test-hunit? ( >=dev-haskell/hunit-1.2
|
||||
>=dev-haskell/test-framework-0.6
|
||||
>=dev-haskell/test-framework-hunit-0.2
|
||||
>=dev-haskell/test-framework-th-0.2
|
||||
test-properties? ( >=dev-haskell/quickcheck-2.4
|
||||
>=dev-haskell/test-framework-quickcheck2-0.2 ) )
|
||||
!test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
|
||||
>=dev-haskell/test-framework-0.6
|
||||
>=dev-haskell/test-framework-quickcheck2-0.2
|
||||
>=dev-haskell/test-framework-th-0.2 ) ) )
|
||||
!test-doctests? ( test-hunit? ( >=dev-haskell/hunit-1.2
|
||||
>=dev-haskell/test-framework-0.6
|
||||
>=dev-haskell/test-framework-hunit-0.2
|
||||
>=dev-haskell/test-framework-th-0.2
|
||||
test-properties? ( >=dev-haskell/quickcheck-2.4
|
||||
>=dev-haskell/test-framework-quickcheck2-0.2 ) )
|
||||
!test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
|
||||
>=dev-haskell/test-framework-0.6
|
||||
>=dev-haskell/test-framework-quickcheck2-0.2
|
||||
>=dev-haskell/test-framework-th-0.2 ) ) ) )
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
haskell-cabal_src_configure \
|
||||
$(cabal_flag benchmark-uniplate benchmark-uniplate) \
|
||||
$(cabal_flag dump-splices dump-splices) \
|
||||
$(cabal_flag inlining inlining) \
|
||||
$(cabal_flag lib-werror lib-werror) \
|
||||
$(cabal_flag old-inline-pragmas old-inline-pragmas) \
|
||||
$(cabal_flag safe safe) \
|
||||
$(cabal_flag test-doctests test-doctests) \
|
||||
$(cabal_flag test-hunit test-hunit) \
|
||||
$(cabal_flag test-properties test-properties) \
|
||||
$(cabal_flag trustworthy trustworthy)
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
# ChangeLog for dev-java/felix-gogo-runtime
|
||||
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/felix-gogo-runtime/ChangeLog,v 1.1 2013/10/02 22:13:23 tomwij Exp $
|
||||
|
||||
*felix-gogo-runtime-0.10.0 (02 Oct 2013)
|
||||
|
||||
02 Oct 2013; Tom Wijsman <TomWij@gentoo.org>
|
||||
+felix-gogo-runtime-0.10.0.ebuild, +files/felix-gogo-runtime-0.10.0-build.xml,
|
||||
+files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch, +metadata.xml:
|
||||
New package for dev-java/felix-gogo-runtime, Felix Gogo Runtime. Indirect
|
||||
dependency needed for Struts 2.
|
||||
@ -0,0 +1,20 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX felix-gogo-runtime-0.10.0-build.xml 13681 SHA256 ff72529ef0858b7091f507a436490cd13d1fe9cac361f33dd263dbc098656279 SHA512 8faf5c3474adfb26aeb4f1cf1edb67c68ac8e8dddad2740cb3e9fe92ab72f374b97a4f4b18f4eac8aaffbbf4cf0e626baec82e417a95135fca2a0df7f0ac8ecd WHIRLPOOL 20bd5d2850e1b6a49dc6a678a8fb107887406230d78dd8c0a11a7ab07b269343d7ae85006faa804b5128be8ef00c0371241497d4ed4bc55db2f21a0af61a2e94
|
||||
AUX felix-gogo-runtime-0.10.0-event-properties-to-map.patch 1072 SHA256 ff75b0c8302b4b5d0b3324640d299d16dec5b542db1b6e5cfe7788e3186aaeee SHA512 b34bdb55d733cde8ccef446632fae9b6cc7022b72e8ff79b023fe713f2bc31a60f839af223bfc517e0cf4d290ee7b239c70cd009a17b9ed8c48b866e56534a66 WHIRLPOOL 3ff5be0befc655ace5449381fa7838086a110d2e5e0d6f1bf2725b1f9b38948d4130f9ab7684fcfe21046c6277009c5f42ae864e7ebc6f8cbc7c51edd919eb0e
|
||||
DIST org.apache.felix.gogo.runtime-0.10.0-project.tar.gz 69837 SHA256 474e62ffbb5b5f6d0d3aa22086ee2ae76122ceb8c2eeb19a042e20046dfdb6d4 SHA512 a71100796e400103cf9d46fcdb7bf45b5d1d180328db27900915c1771650297c9135589dc91e4c2194634b4312ea7c064b71496a7e11e9a3393bdc6eeb70e03d WHIRLPOOL 9667ce09ee913339c8a76fbe3f0da157707a2fef43214ef99fe13bb86e1633c4ef573bf81c629655c6451a88288924569501d13671f5a8d2058d941be98838b0
|
||||
EBUILD felix-gogo-runtime-0.10.0.ebuild 1174 SHA256 0b01c49469c8f64d735a6e58294b26facd65dedb3a3c456933b2c4fdd30fd1b8 SHA512 e94327a48c6ca43dc0ae98c06a4702ea9490430f96f2017d822fa0cdb3fb521c84e53b2c742dd25d90ab0bafb609bf824e3542cba561cbc0f965e1ccf43ca282 WHIRLPOOL 06c530aef5447cc187e565b34fb6228c10f09fcbc8be23cc3eb27e663bd58f2b28be8b1173ddc541e94c160d5992721593548f09b92dfd9151bdda8a33f40a0a
|
||||
MISC ChangeLog 588 SHA256 5fe5ed57736086e2a946044b743eaae620bf5191686269af93ed1fcbbe1955e5 SHA512 802271e6855d7583fcc98e81a86c0e4f007e0c23801838ab1cfcb160d9b7370b468d8ee524f0ddc613dc98311a0b17e512b92106b7effb74f0df9c44128fd667 WHIRLPOOL 60d0472877aab92c8c691352d6f3fe8ada1c00c7a5007932beaf3ec7f6972f6c10202beed09ce436ddf84ede0ee15878d49a37f1bb7de891472d6571da02f8f9
|
||||
MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.21 (GNU/Linux)
|
||||
|
||||
iQEcBAEBCAAGBQJSTJlBAAoJEJWyH81tNOV9yhAH/0q57ZkaS7Q91QHVLA3B+NFM
|
||||
L1SYNNPJQi4sWOdUTxFs02XgeySfqCX+HJojzVv5xW8TFrjHCkuwgnwWd7dryq1F
|
||||
GJHxOywBv9pTn9MINkRxKMXA64oS2l8ZRBmZWLFVNga/4xPASFmqQEyPqsmAYSnd
|
||||
wqrXzs2BCilvpSHFbUqsc36elSmfoj8klUSkr0JBNzofb0a3xJf5I4SKLvn2vWpy
|
||||
5rsyYcMqNggCQ3YhRhIHU2F6shMDxfDWCwC/h8JflNeQCmfRhDsRFTqCqriYuvF7
|
||||
vwLjxJXpYtOMEUUc/69F2GdM9uOy+deyRkhhYayct0M5RtAy/mtaLYPAhMWN3bc=
|
||||
=UvHh
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -0,0 +1,43 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild,v 1.1 2013/10/02 22:13:23 tomwij Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit java-pkg-2 java-ant-2 java-osgi
|
||||
|
||||
DESCRIPTION="Felix Gogo Runtime"
|
||||
HOMEPAGE="http://felix.apache.org/site/apache-felix-gogo.html"
|
||||
LICENSE="Apache-2.0"
|
||||
|
||||
MY_PN="org.apache.felix.gogo.runtime"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
SRC_URI="mirror://apache/felix/${MY_P}-project.tar.gz"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DEPEND=">=virtual/jdk-1.5
|
||||
dev-java/osgi-compendium:0
|
||||
dev-java/osgi-core-api:0"
|
||||
|
||||
RDEPEND=">=virtual/jre-1.5"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
java_prepare() {
|
||||
cp "${FILESDIR}"/${P}-build.xml build.xml || die
|
||||
|
||||
epatch "${FILESDIR}"/${P}-event-properties-to-map.patch
|
||||
}
|
||||
|
||||
JAVA_ANT_REWRITE_CLASSPATH="true"
|
||||
|
||||
src_compile() {
|
||||
EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only osgi-core-api osgi-core-api.jar):$(java-pkg_getjar --build-only osgi-compendium osgi-compendium.jar)"
|
||||
|
||||
java-pkg-2_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-osgi_newjar "${S}"/target/${MY_P}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
|
||||
}
|
||||
@ -0,0 +1,294 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
|
||||
<!-- ====================================================================== -->
|
||||
<!-- -->
|
||||
<!-- Any modifications will be overwritten. -->
|
||||
<!-- -->
|
||||
<!-- Generated by Maven Ant Plugin on 5/13/13 1:33 PM -->
|
||||
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
|
||||
<!-- -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<project name="org.apache.felix.gogo.runtime-from-maven" default="package" basedir=".">
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Build environment properties -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<property file="${user.home}/.m2/maven.properties"/>
|
||||
<property file="maven-build.properties"/>
|
||||
|
||||
<property name="maven.build.finalName" value="org.apache.felix.gogo.runtime-0.10.0"/>
|
||||
<property name="maven.build.dir" value="target"/>
|
||||
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
|
||||
<property name="maven.build.srcDir.0" value="src/main/java"/>
|
||||
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
|
||||
<property name="maven.build.resourceDir.1" value="."/>
|
||||
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
|
||||
<property name="maven.build.testDir.0" value="src/test/java"/>
|
||||
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
|
||||
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
|
||||
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
|
||||
|
||||
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
|
||||
<property name="maven.settings.offline" value="false"/>
|
||||
<property name="maven.settings.interactiveMode" value="true"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Defining classpaths -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<path id="build.classpath">
|
||||
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
|
||||
</path>
|
||||
<path id="build.test.classpath">
|
||||
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"/>
|
||||
</path>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Cleaning up target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="clean" description="Clean the output directory">
|
||||
<delete dir="${maven.build.dir}"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Compilation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="compile" depends="get-deps" description="Compile the code">
|
||||
<mkdir dir="${maven.build.outputDir}"/>
|
||||
<javac destdir="${maven.build.outputDir}"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
target="1.5"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
source="1.5">
|
||||
<src>
|
||||
<pathelement location="${maven.build.srcDir.0}"/>
|
||||
</src>
|
||||
<classpath refid="build.classpath"/>
|
||||
</javac>
|
||||
<mkdir dir="${maven.build.outputDir}/META-INF"/>
|
||||
<copy todir="${maven.build.outputDir}/META-INF">
|
||||
<fileset dir="${maven.build.resourceDir.1}">
|
||||
<include name="LICENSE*"/>
|
||||
<include name="NOTICE*"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Test-compilation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="compile-tests"
|
||||
depends="compile"
|
||||
description="Compile the test code"
|
||||
unless="maven.test.skip">
|
||||
<mkdir dir="${maven.build.testOutputDir}"/>
|
||||
<javac destdir="${maven.build.testOutputDir}"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
target="1.5"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
source="1.5">
|
||||
<src>
|
||||
<pathelement location="${maven.build.testDir.0}"/>
|
||||
</src>
|
||||
<classpath>
|
||||
<path refid="build.test.classpath"/>
|
||||
<pathelement location="${maven.build.outputDir}"/>
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Run all tests -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="test"
|
||||
depends="compile-tests, junit-missing"
|
||||
unless="junit.skipped"
|
||||
description="Run the test cases">
|
||||
<mkdir dir="${maven.test.reports}"/>
|
||||
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
|
||||
<sysproperty key="basedir" value="."/>
|
||||
<formatter type="xml"/>
|
||||
<formatter type="plain" usefile="false"/>
|
||||
<classpath>
|
||||
<path refid="build.test.classpath"/>
|
||||
<pathelement location="${maven.build.outputDir}"/>
|
||||
<pathelement location="${maven.build.testOutputDir}"/>
|
||||
</classpath>
|
||||
<batchtest todir="${maven.test.reports}" unless="test">
|
||||
<fileset dir="${maven.build.testDir.0}">
|
||||
<include name="**/Test*.java"/>
|
||||
<include name="**/*Test.java"/>
|
||||
<include name="**/*TestCase.java"/>
|
||||
<exclude name="**/*Abstract*Test.java"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
<batchtest todir="${maven.test.reports}" if="test">
|
||||
<fileset dir="${maven.build.testDir.0}">
|
||||
<include name="**/${test}.java"/>
|
||||
<exclude name="**/*Abstract*Test.java"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
</junit>
|
||||
</target>
|
||||
|
||||
<target name="test-junit-present">
|
||||
<available classname="junit.framework.Test" property="junit.present"/>
|
||||
</target>
|
||||
|
||||
<target name="test-junit-status"
|
||||
depends="test-junit-present">
|
||||
<condition property="junit.missing">
|
||||
<and>
|
||||
<isfalse value="${junit.present}"/>
|
||||
<isfalse value="${maven.test.skip}"/>
|
||||
</and>
|
||||
</condition>
|
||||
<condition property="junit.skipped">
|
||||
<or>
|
||||
<isfalse value="${junit.present}"/>
|
||||
<istrue value="${maven.test.skip}"/>
|
||||
</or>
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<target name="junit-missing"
|
||||
depends="test-junit-status"
|
||||
if="junit.missing">
|
||||
<echo>=================================== WARNING ===================================</echo>
|
||||
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
|
||||
<echo>===============================================================================</echo>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Javadoc target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="javadoc" description="Generates the Javadoc of the application">
|
||||
<javadoc sourcepath="${maven.build.srcDir.0}"
|
||||
packagenames="*"
|
||||
destdir="${maven.reporting.outputDirectory}/apidocs"
|
||||
access="protected"
|
||||
old="false"
|
||||
verbose="false"
|
||||
version="true"
|
||||
use="true"
|
||||
author="true"
|
||||
splitindex="false"
|
||||
nodeprecated="false"
|
||||
nodeprecatedlist="false"
|
||||
notree="false"
|
||||
noindex="false"
|
||||
nohelp="false"
|
||||
nonavbar="false"
|
||||
serialwarn="false"
|
||||
charset="ISO-8859-1"
|
||||
linksource="false"
|
||||
breakiterator="false"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Package target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="package" depends="compile,test" description="Package the application">
|
||||
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
|
||||
compress="true"
|
||||
index="false"
|
||||
basedir="${maven.build.outputDir}"
|
||||
excludes="**/package.html"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- A dummy target for the package named after the type it creates -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="jar" depends="package" description="Builds the jar for the application"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Download dependencies target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="test-offline">
|
||||
<condition property="maven.mode.offline">
|
||||
<equals arg1="${maven.settings.offline}" arg2="true"/>
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<target name="get-deps"
|
||||
depends="test-offline"
|
||||
description="Download all dependencies"
|
||||
unless="maven.mode.offline">
|
||||
<mkdir dir="${maven.repo.local}"/>
|
||||
<mkdir dir="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0"/>
|
||||
<get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
|
||||
dest="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
|
||||
dest="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0"/>
|
||||
<get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
|
||||
dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
|
||||
dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/junit/junit/4.5"/>
|
||||
<get src="http://repository.apache.org/snapshots/junit/junit/4.5/junit-4.5.jar"
|
||||
dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<get src="http://repo.maven.apache.org/maven2/junit/junit/4.5/junit-4.5.jar"
|
||||
dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
|
||||
<get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar"
|
||||
dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar"
|
||||
dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
|
||||
<get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
|
||||
dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
|
||||
dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
@ -0,0 +1,22 @@
|
||||
--- src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java 2013-05-13 13:40:57.071766332 +0200
|
||||
+++ src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java.2 2013-05-13 13:41:30.725096685 +0200
|
||||
@@ -18,7 +18,7 @@
|
||||
*/
|
||||
package org.apache.felix.gogo.runtime.activator;
|
||||
|
||||
-import java.util.Properties;
|
||||
+import java.util.HashMap;
|
||||
|
||||
import org.apache.felix.gogo.api.CommandSessionListener;
|
||||
import org.apache.felix.service.command.CommandSession;
|
||||
@@ -43,8 +43,8 @@
|
||||
public void beforeExecute(CommandSession session, CharSequence command) {
|
||||
EventAdmin admin = (EventAdmin) tracker.getService();
|
||||
if (admin != null) {
|
||||
- Properties props = new Properties();
|
||||
- props.setProperty("command", command.toString());
|
||||
+ HashMap<String, String> props = new HashMap<String, String>();
|
||||
+ props.put(new String("command"), command.toString());
|
||||
Event event = new Event("org/apache/felix/service/command/EXECUTING", props);
|
||||
admin.postEvent(event);
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>java</herd>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,14 @@
|
||||
# ChangeLog for dev-java/felix-shell
|
||||
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/felix-shell/ChangeLog,v 1.2 2013/10/02 22:24:19 tomwij Exp $
|
||||
|
||||
02 Oct 2013; Tom Wijsman <TomWij@gentoo.org> felix-shell-1.4.3.ebuild:
|
||||
Fixed trailing whitespace; maybe I need to make repoman bail out on warnings,
|
||||
missed it twice today.
|
||||
|
||||
*felix-shell-1.4.3 (02 Oct 2013)
|
||||
|
||||
02 Oct 2013; Tom Wijsman <TomWij@gentoo.org> +felix-shell-1.4.3.ebuild,
|
||||
+files/felix-shell-1.4.3-build.xml, +metadata.xml:
|
||||
New package for dev-java/felix-shell, Felix Shell. Direct dependency of Struts
|
||||
2.
|
||||
@ -0,0 +1,19 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX felix-shell-1.4.3-build.xml 13813 SHA256 484bb6cd4327b550708aa0e1589964ca651d380a611a054c7bd70cff4f894ccd SHA512 324f9a3d1de17756eeff2ed520e3e4639ed371785b3cf422387b75d4dd6790e893d6467308c44b5157a56577a6714c271c6168a9737d7326600f3944fcd4d6be WHIRLPOOL 247021b915ebcadceb8267194dfa10f6c7d40e0be2734c0f6a478fbcf6feec6716cd939ac465fda259b3f7510e7b67683e132e787e01b387ae7dc151328ddf41
|
||||
DIST org.apache.felix.shell-1.4.3-source-release.tar.gz 75190 SHA256 daea2ae1cd3e28dbbcf5da964ffa5b6cb37ccc102dc070b878203900e8bf292a SHA512 fe1b3927789a18626715e52a634fa069fdd1505f425a48d76ec6abbb181f511ff5a3af176c70f634241830b185d32cd7eb71a271d62a754366141cd959cb54a4 WHIRLPOOL 6836e3503a26b887997786f2214b32eca527b9b28b98fb9a54179be756fd15f1d41a531ae54bfada956a7a8e66444464b0cd6203b240fb7c283059ae2a90f422
|
||||
EBUILD felix-shell-1.4.3.ebuild 1299 SHA256 5ff8be6b959887587c31f7329188dfe814b87f62b4f2e0594c827252db11c864 SHA512 bb5a8a33a4dfb51d96ae967ebf8b2ac0871245991522bcd3066e4a91bbb4029072a1f60c17a33a5fd06bd9997499063c8bdb3b7ffe8548d1c020bf0a92b6826a WHIRLPOOL b4300cc43bc4525d1577a40777a82354e709c6bfb0053fa3e969fd463e0015d7a0f7f5e4a6881b9a3f865516a456c66ab64f776a39c5fa86798f415cb5abed25
|
||||
MISC ChangeLog 639 SHA256 c3eca594ac2381546aa392d4d6bde5c0a26e254bcff61d5978fd42a45611ad05 SHA512 d428c995fc464978693aa9fc02d9d8b788ffbf01e7de4d512e8432e125aa4bf61ee5bcc8f65e5b5f0b015ed1e2acae12991df3a2d3becce2be6aa4f80ea77019 WHIRLPOOL 3ce1d6b6f75180dbe717fecbab48e309e42026606a9d4e11a292d103857f8fb1c1fcf6e2b74ec80958017d5f4f02bdf8bd44dc25d514ca7877091d5727560bad
|
||||
MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.21 (GNU/Linux)
|
||||
|
||||
iQEcBAEBCAAGBQJSTJvQAAoJEJWyH81tNOV9LfcH/3mrP2dWxjgBaKJTjfV4cbFI
|
||||
/gpBZ5uPfp7DlNjswzV9nLNOApJesJleQ0XZ0+At+mZoZClE+piVGy7D00HKHmiT
|
||||
zBp9pxwgHUc+5UBxWr8w6lrHs7jLZKdxkh2ZGP2IPqkYmneR+6S6kCbxXpTPFGll
|
||||
JHr2T+1lpFKtFcmeyW222FfcM8PS1Drq+C/4KI85UipLGXjRY08UkN81QLUtxuwQ
|
||||
RwZD+clBSSN0aA8tjXGbJva4CeFfn+mY598vQAy1mmNZWY844ngLmykUWhKs+JoF
|
||||
qkl1HF1hze3f1LIz+soi3Um7DrNxMB0LBZ6rq0av7MDyhDS9EOtFDiALuJXmkF8=
|
||||
=PNW0
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -0,0 +1,45 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/felix-shell/felix-shell-1.4.3.ebuild,v 1.2 2013/10/02 22:24:19 tomwij Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit java-pkg-2 java-ant-2 java-osgi
|
||||
|
||||
DESCRIPTION="Felix Shell"
|
||||
HOMEPAGE="http://felix.apache.org/"
|
||||
LICENSE="Apache-2.0"
|
||||
|
||||
MY_PN="org.apache.felix.shell"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
SRC_URI="mirror://apache/felix/${MY_P}-source-release.tar.gz"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DEPEND=">=virtual/jdk-1.5
|
||||
dev-java/felix-gogo-runtime:0
|
||||
dev-java/felix-utils:0
|
||||
dev-java/osgi-compendium:0
|
||||
dev-java/osgi-core-api:0"
|
||||
|
||||
RDEPEND=">=virtual/jre-1.5"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
java_prepare() {
|
||||
cp "${FILESDIR}"/${P}-build.xml build.xml || die
|
||||
}
|
||||
|
||||
JAVA_ANT_REWRITE_CLASSPATH="true"
|
||||
|
||||
src_compile() {
|
||||
EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only osgi-core-api osgi-core-api.jar):$(java-pkg_getjar --build-only osgi-compendium osgi-compendium.jar):$(java-pkg_getjar --build-only felix-gogo-runtime felix-gogo-runtime.jar):$(java-pkg_getjar --build-only felix-utils felix-utils.jar)"
|
||||
|
||||
java-pkg-2_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
mv "${S}"/target/{${MY_P},${PN}}.jar || die
|
||||
|
||||
java-osgi_dojar "${S}"/target/${PN}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
|
||||
}
|
||||
@ -0,0 +1,299 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
|
||||
<!-- ====================================================================== -->
|
||||
<!-- -->
|
||||
<!-- Any modifications will be overwritten. -->
|
||||
<!-- -->
|
||||
<!-- Generated by Maven Ant Plugin on 5/13/13 2:41 PM -->
|
||||
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
|
||||
<!-- -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<project name="org.apache.felix.shell-from-maven" default="package" basedir=".">
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Build environment properties -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<property file="${user.home}/.m2/maven.properties"/>
|
||||
<property file="maven-build.properties"/>
|
||||
|
||||
<property name="maven.build.finalName" value="org.apache.felix.shell-1.4.3"/>
|
||||
<property name="maven.build.dir" value="target"/>
|
||||
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
|
||||
<property name="maven.build.srcDir.0" value="src/main/java"/>
|
||||
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
|
||||
<property name="maven.build.resourceDir.1" value="."/>
|
||||
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
|
||||
<property name="maven.build.testDir.0" value="src/test/java"/>
|
||||
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
|
||||
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
|
||||
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
|
||||
|
||||
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
|
||||
<property name="maven.settings.offline" value="false"/>
|
||||
<property name="maven.settings.interactiveMode" value="true"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Defining classpaths -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<path id="build.classpath">
|
||||
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
|
||||
</path>
|
||||
<path id="build.test.classpath">
|
||||
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"/>
|
||||
</path>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Cleaning up target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="clean" description="Clean the output directory">
|
||||
<delete dir="${maven.build.dir}"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Compilation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="compile" depends="get-deps" description="Compile the code">
|
||||
<mkdir dir="${maven.build.outputDir}"/>
|
||||
<javac destdir="${maven.build.outputDir}"
|
||||
encoding="UTF-8"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
target="1.3"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
source="1.3">
|
||||
<src>
|
||||
<pathelement location="${maven.build.srcDir.0}"/>
|
||||
</src>
|
||||
<classpath refid="build.classpath"/>
|
||||
</javac>
|
||||
<copy todir="${maven.build.outputDir}">
|
||||
<fileset dir="${maven.build.resourceDir.0}"/>
|
||||
</copy>
|
||||
<mkdir dir="${maven.build.outputDir}/META-INF"/>
|
||||
<copy todir="${maven.build.outputDir}/META-INF">
|
||||
<fileset dir="${maven.build.resourceDir.1}">
|
||||
<include name="changelog.txt"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Test-compilation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="compile-tests"
|
||||
depends="compile"
|
||||
description="Compile the test code"
|
||||
unless="maven.test.skip">
|
||||
<mkdir dir="${maven.build.testOutputDir}"/>
|
||||
<javac destdir="${maven.build.testOutputDir}"
|
||||
encoding="UTF-8"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
target="1.3"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
source="1.3">
|
||||
<src>
|
||||
<pathelement location="${maven.build.testDir.0}"/>
|
||||
</src>
|
||||
<classpath>
|
||||
<path refid="build.test.classpath"/>
|
||||
<pathelement location="${maven.build.outputDir}"/>
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Run all tests -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="test"
|
||||
depends="compile-tests, junit-missing"
|
||||
unless="junit.skipped"
|
||||
description="Run the test cases">
|
||||
<mkdir dir="${maven.test.reports}"/>
|
||||
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
|
||||
<sysproperty key="basedir" value="."/>
|
||||
<formatter type="xml"/>
|
||||
<formatter type="plain" usefile="false"/>
|
||||
<classpath>
|
||||
<path refid="build.test.classpath"/>
|
||||
<pathelement location="${maven.build.outputDir}"/>
|
||||
<pathelement location="${maven.build.testOutputDir}"/>
|
||||
</classpath>
|
||||
<batchtest todir="${maven.test.reports}" unless="test">
|
||||
<fileset dir="${maven.build.testDir.0}">
|
||||
<include name="**/Test*.java"/>
|
||||
<include name="**/*Test.java"/>
|
||||
<include name="**/*TestCase.java"/>
|
||||
<exclude name="**/*Abstract*Test.java"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
<batchtest todir="${maven.test.reports}" if="test">
|
||||
<fileset dir="${maven.build.testDir.0}">
|
||||
<include name="**/${test}.java"/>
|
||||
<exclude name="**/*Abstract*Test.java"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
</junit>
|
||||
</target>
|
||||
|
||||
<target name="test-junit-present">
|
||||
<available classname="junit.framework.Test" property="junit.present"/>
|
||||
</target>
|
||||
|
||||
<target name="test-junit-status"
|
||||
depends="test-junit-present">
|
||||
<condition property="junit.missing">
|
||||
<and>
|
||||
<isfalse value="${junit.present}"/>
|
||||
<isfalse value="${maven.test.skip}"/>
|
||||
</and>
|
||||
</condition>
|
||||
<condition property="junit.skipped">
|
||||
<or>
|
||||
<isfalse value="${junit.present}"/>
|
||||
<istrue value="${maven.test.skip}"/>
|
||||
</or>
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<target name="junit-missing"
|
||||
depends="test-junit-status"
|
||||
if="junit.missing">
|
||||
<echo>=================================== WARNING ===================================</echo>
|
||||
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
|
||||
<echo>===============================================================================</echo>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Javadoc target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="javadoc" description="Generates the Javadoc of the application">
|
||||
<javadoc sourcepath="${maven.build.srcDir.0}"
|
||||
packagenames="*"
|
||||
destdir="${maven.reporting.outputDirectory}/apidocs"
|
||||
access="protected"
|
||||
old="false"
|
||||
verbose="false"
|
||||
version="true"
|
||||
use="true"
|
||||
author="true"
|
||||
splitindex="false"
|
||||
nodeprecated="false"
|
||||
nodeprecatedlist="false"
|
||||
notree="false"
|
||||
noindex="false"
|
||||
nohelp="false"
|
||||
nonavbar="false"
|
||||
serialwarn="false"
|
||||
charset="ISO-8859-1"
|
||||
linksource="false"
|
||||
breakiterator="false"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Package target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="package" depends="compile,test" description="Package the application">
|
||||
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
|
||||
compress="true"
|
||||
index="false"
|
||||
basedir="${maven.build.outputDir}"
|
||||
excludes="**/package.html">
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- A dummy target for the package named after the type it creates -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="jar" depends="package" description="Builds the jar for the application"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Download dependencies target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="test-offline">
|
||||
<condition property="maven.mode.offline">
|
||||
<equals arg1="${maven.settings.offline}" arg2="true"/>
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<target name="get-deps"
|
||||
depends="test-offline"
|
||||
description="Download all dependencies"
|
||||
unless="maven.mode.offline">
|
||||
<mkdir dir="${maven.repo.local}"/>
|
||||
<mkdir dir="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0"/>
|
||||
<get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
|
||||
dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
|
||||
dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0"/>
|
||||
<get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
|
||||
dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
|
||||
dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/junit/junit/4.0"/>
|
||||
<get src="http://repository.apache.org/snapshots/junit/junit/4.0/junit-4.0.jar"
|
||||
dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<get src="http://repo.maven.apache.org/maven2/junit/junit/4.0/junit-4.0.jar"
|
||||
dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
|
||||
<get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar"
|
||||
dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar"
|
||||
dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
|
||||
<get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
|
||||
dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
|
||||
dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>java</herd>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,11 @@
|
||||
# ChangeLog for dev-java/felix-utils
|
||||
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/felix-utils/ChangeLog,v 1.1 2013/10/02 22:18:52 tomwij Exp $
|
||||
|
||||
*felix-utils-1.2.0 (02 Oct 2013)
|
||||
|
||||
02 Oct 2013; Tom Wijsman <TomWij@gentoo.org> +felix-utils-1.2.0.ebuild,
|
||||
+files/felix-utils-1.2.0-build.xml, +files/felix-utils-1.2.0-java-fixes.patch,
|
||||
+metadata.xml:
|
||||
New package for dev-java/felix-utils, Felix Utils. Indirect dependency needed
|
||||
for Struts 2.
|
||||
@ -0,0 +1,20 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX felix-utils-1.2.0-build.xml 13825 SHA256 c359ad0d87415327aabb5e94ad303c14e77870905659f3c7f1f4c73478d91387 SHA512 0494ca015f38daf3b96758adaba1de71ec82b7ba811507e8b7acf33ff887484481251d6868d98c0b70535f1a5874941d457bf43fb3f8139d698ce3f5ce4ed1da WHIRLPOOL e046d967685fe844b199acbd4f5b08f901e1eac3634f721de3beec146e58ca7aae00aafe110974ff6b61eba10f1e4ffe4d939fca29b4b89558cf13d4a72cc92d
|
||||
AUX felix-utils-1.2.0-java-fixes.patch 1673 SHA256 f01604e2312db384cfcfe3efaef37589c2343da88287e78557a936f19ebb3ae2 SHA512 7256b8b9979536d1bc587726f3f4f71d56ec0ed3ba9cbc1229eea2c4d2c0883636bfa4498a59a076b9a06cd21b9fbb2f1ef293425454d3cb3dcb62d9d103cd33 WHIRLPOOL 027ffd91b7d1a85b5ff067611ebfe9080083ca5d5bad42d1413cf82b63aa24af7ea5eb56bda86f2d7d9c5b774ef500d372c6a90e7e3016f13e88fd9dc6cc4f04
|
||||
DIST org.apache.felix.utils-1.2.0-source-release.tar.gz 36109 SHA256 281872667d5968875f5f5b12878145c7f184ffb89d3ddf8ad757070e0722105c SHA512 4b3a16abc92963c16c363791423483c14eb02792cc65d58a884777c6be25b05a226492280cf2f77183ad5b86cb5710076a118a58af34f6c717273bfdf93bc171 WHIRLPOOL a9422c4fda79d1ba32cfff923d911a4e91fab463c8de0b870f43daf683222f86963690834df1d37a67f3cba4849a1f85433f7239abd100abfa1c6ef3a1d6b91c
|
||||
EBUILD felix-utils-1.2.0.ebuild 1260 SHA256 cb200662b25c93fae29229ca566f77be6a18e4d7db404cda782f808bd9b03019 SHA512 ec6fdc041f3b4f8bc34e56eaf94d39e2e342f0ddcb7ac5a53fef3bc949a6ce1302723bd8a5a6ae9b3b04e8e92ac1581c095df39ddd15c098f9602d86de9ce008 WHIRLPOOL 4a7a36063a5b10e16c4e3bc755c0b46c78ee92d036ed6eb463c0a46dfbe5d24067e25e1c2bf4f91b985792e6b1786fdb0449e11070a643e062c144b6d9248e9b
|
||||
MISC ChangeLog 515 SHA256 9cf1d1857ef162c50c43fedf756d35e39721f1d2c1bd4a3063dbd976990cfd5f SHA512 6ee8455c92e76f2ec5d5582f4aa6f96037f5f263052e4ad70c78d508a1b336155843f5c0d412c7926048ffe2404223dbb9cc089ba20599c4d60d0116255b9f03 WHIRLPOOL 289bbee7dabf817fbdcd49b819685c65c270107ed89621c7dfbc80c90fd3d71335ef90c08a21aed54ce567aefa3606fb8f87da345f2d15352375a78330fb8bf6
|
||||
MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.21 (GNU/Linux)
|
||||
|
||||
iQEcBAEBCAAGBQJSTJqJAAoJEJWyH81tNOV9IdsH/0wdk8h9CG3MekSw6X0EedpT
|
||||
pQGx05cOnwDoweVPuIRPSGQMnsLUXnCSZ3GI9kax3WNd29tW33fC3ZoAOJra7CNO
|
||||
7+FnC+azyd3uh3rcIdEuYghK3oLW59lvTqjeTk3h49PtMe1avzv34e3eajv4Ek9A
|
||||
MQxAjej7OC+xT9O6au4YZZ5sNHTSzc4FN9ARH7ZWVHzlpigsO1esQybPHP+ogXv0
|
||||
tJt3cQ6vtY3y+6T2W5rPNWuwG4dzkn9gbTp789oW97UMT06qKwdpYGYTOSUS8VcT
|
||||
Ihs39N6eqsx9NcsGje9bQRawtavDAMCn76qFpSWOm0NPZIa7/fIuJWXo8HlQXHc=
|
||||
=HHdu
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -0,0 +1,46 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/felix-utils/felix-utils-1.2.0.ebuild,v 1.1 2013/10/02 22:18:52 tomwij Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit java-pkg-2 java-ant-2 java-osgi
|
||||
|
||||
DESCRIPTION="Felix Utils"
|
||||
HOMEPAGE="http://felix.apache.org/"
|
||||
LICENSE="Apache-2.0"
|
||||
|
||||
MY_PN="org.apache.felix.utils"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
SRC_URI="mirror://apache/felix/${MY_P}-source-release.tar.gz"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DEPEND=">=virtual/jdk-1.5
|
||||
dev-java/felix-gogo-runtime:0
|
||||
dev-java/osgi-compendium:0
|
||||
dev-java/osgi-core-api:0"
|
||||
|
||||
RDEPEND=">=virtual/jre-1.5"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
java_prepare() {
|
||||
cp "${FILESDIR}"/${P}-build.xml build.xml || die
|
||||
|
||||
epatch "${FILESDIR}"/${P}-java-fixes.patch
|
||||
}
|
||||
|
||||
JAVA_ANT_REWRITE_CLASSPATH="true"
|
||||
|
||||
src_compile() {
|
||||
EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only osgi-core-api osgi-core-api.jar):$(java-pkg_getjar --build-only osgi-compendium osgi-compendium.jar):$(java-pkg_getjar --build-only felix-gogo-runtime felix-gogo-runtime.jar)"
|
||||
|
||||
java-pkg-2_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
mv "${S}"/target/{${MY_P},${PN}}.jar || die
|
||||
|
||||
java-osgi_dojar "${S}"/target/${PN}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
|
||||
}
|
||||
@ -0,0 +1,299 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
|
||||
<!-- ====================================================================== -->
|
||||
<!-- -->
|
||||
<!-- Any modifications will be overwritten. -->
|
||||
<!-- -->
|
||||
<!-- Generated by Maven Ant Plugin on 5/13/13 2:09 PM -->
|
||||
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
|
||||
<!-- -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<project name="org.apache.felix.utils-from-maven" default="package" basedir=".">
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Build environment properties -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<property file="${user.home}/.m2/maven.properties"/>
|
||||
<property file="maven-build.properties"/>
|
||||
|
||||
<property name="maven.build.finalName" value="org.apache.felix.utils-1.2.0"/>
|
||||
<property name="maven.build.dir" value="target"/>
|
||||
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
|
||||
<property name="maven.build.srcDir.0" value="src/main/java"/>
|
||||
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
|
||||
<property name="maven.build.resourceDir.1" value="."/>
|
||||
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
|
||||
<property name="maven.build.testDir.0" value="src/test/java"/>
|
||||
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
|
||||
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
|
||||
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
|
||||
|
||||
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
|
||||
<property name="maven.settings.offline" value="false"/>
|
||||
<property name="maven.settings.interactiveMode" value="true"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Defining classpaths -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<path id="build.classpath">
|
||||
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"/>
|
||||
</path>
|
||||
<path id="build.test.classpath">
|
||||
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
|
||||
<pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"/>
|
||||
</path>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Cleaning up target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="clean" description="Clean the output directory">
|
||||
<delete dir="${maven.build.dir}"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Compilation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="compile" depends="get-deps" description="Compile the code">
|
||||
<mkdir dir="${maven.build.outputDir}"/>
|
||||
<javac destdir="${maven.build.outputDir}"
|
||||
encoding="UTF-8"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
target="jsr14"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
source="1.5">
|
||||
<src>
|
||||
<pathelement location="${maven.build.srcDir.0}"/>
|
||||
</src>
|
||||
<classpath refid="build.classpath"/>
|
||||
</javac>
|
||||
<mkdir dir="${maven.build.outputDir}/META-INF"/>
|
||||
<copy todir="${maven.build.outputDir}/META-INF">
|
||||
<fileset dir="${maven.build.resourceDir.1}">
|
||||
<include name="changelog.txt"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Test-compilation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="compile-tests"
|
||||
depends="compile"
|
||||
description="Compile the test code"
|
||||
unless="maven.test.skip">
|
||||
<mkdir dir="${maven.build.testOutputDir}"/>
|
||||
<javac destdir="${maven.build.testOutputDir}"
|
||||
encoding="UTF-8"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
target="jsr14"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
source="1.5">
|
||||
<src>
|
||||
<pathelement location="${maven.build.testDir.0}"/>
|
||||
</src>
|
||||
<classpath>
|
||||
<path refid="build.test.classpath"/>
|
||||
<pathelement location="${maven.build.outputDir}"/>
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${maven.build.testOutputDir}">
|
||||
<fileset dir="${maven.build.testResourceDir.0}"/>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Run all tests -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="test"
|
||||
depends="compile-tests, junit-missing"
|
||||
unless="junit.skipped"
|
||||
description="Run the test cases">
|
||||
<mkdir dir="${maven.test.reports}"/>
|
||||
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
|
||||
<sysproperty key="basedir" value="."/>
|
||||
<formatter type="xml"/>
|
||||
<formatter type="plain" usefile="false"/>
|
||||
<classpath>
|
||||
<path refid="build.test.classpath"/>
|
||||
<pathelement location="${maven.build.outputDir}"/>
|
||||
<pathelement location="${maven.build.testOutputDir}"/>
|
||||
</classpath>
|
||||
<batchtest todir="${maven.test.reports}" unless="test">
|
||||
<fileset dir="${maven.build.testDir.0}">
|
||||
<include name="**/Test*.java"/>
|
||||
<include name="**/*Test.java"/>
|
||||
<include name="**/*TestCase.java"/>
|
||||
<exclude name="**/*Abstract*Test.java"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
<batchtest todir="${maven.test.reports}" if="test">
|
||||
<fileset dir="${maven.build.testDir.0}">
|
||||
<include name="**/${test}.java"/>
|
||||
<exclude name="**/*Abstract*Test.java"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
</junit>
|
||||
</target>
|
||||
|
||||
<target name="test-junit-present">
|
||||
<available classname="junit.framework.Test" property="junit.present"/>
|
||||
</target>
|
||||
|
||||
<target name="test-junit-status"
|
||||
depends="test-junit-present">
|
||||
<condition property="junit.missing">
|
||||
<and>
|
||||
<isfalse value="${junit.present}"/>
|
||||
<isfalse value="${maven.test.skip}"/>
|
||||
</and>
|
||||
</condition>
|
||||
<condition property="junit.skipped">
|
||||
<or>
|
||||
<isfalse value="${junit.present}"/>
|
||||
<istrue value="${maven.test.skip}"/>
|
||||
</or>
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<target name="junit-missing"
|
||||
depends="test-junit-status"
|
||||
if="junit.missing">
|
||||
<echo>=================================== WARNING ===================================</echo>
|
||||
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
|
||||
<echo>===============================================================================</echo>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Javadoc target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="javadoc" description="Generates the Javadoc of the application">
|
||||
<javadoc sourcepath="${maven.build.srcDir.0}"
|
||||
packagenames="*"
|
||||
destdir="${maven.reporting.outputDirectory}/apidocs"
|
||||
access="protected"
|
||||
old="false"
|
||||
verbose="false"
|
||||
version="true"
|
||||
use="true"
|
||||
author="true"
|
||||
splitindex="false"
|
||||
nodeprecated="false"
|
||||
nodeprecatedlist="false"
|
||||
notree="false"
|
||||
noindex="false"
|
||||
nohelp="false"
|
||||
nonavbar="false"
|
||||
serialwarn="false"
|
||||
charset="ISO-8859-1"
|
||||
linksource="false"
|
||||
breakiterator="false"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Package target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="package" depends="compile,test" description="Package the application">
|
||||
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
|
||||
compress="true"
|
||||
index="false"
|
||||
basedir="${maven.build.outputDir}"
|
||||
excludes="**/package.html">
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- A dummy target for the package named after the type it creates -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="jar" depends="package" description="Builds the jar for the application"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Download dependencies target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="test-offline">
|
||||
<condition property="maven.mode.offline">
|
||||
<equals arg1="${maven.settings.offline}" arg2="true"/>
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<target name="get-deps"
|
||||
depends="test-offline"
|
||||
description="Download all dependencies"
|
||||
unless="maven.mode.offline">
|
||||
<mkdir dir="${maven.repo.local}"/>
|
||||
<mkdir dir="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0"/>
|
||||
<get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
|
||||
dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
|
||||
dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0"/>
|
||||
<get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"
|
||||
dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"
|
||||
dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/junit/junit/4.0"/>
|
||||
<get src="http://repository.apache.org/snapshots/junit/junit/4.0/junit-4.0.jar"
|
||||
dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<get src="http://repo.maven.apache.org/maven2/junit/junit/4.0/junit-4.0.jar"
|
||||
dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
|
||||
<get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar"
|
||||
dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar"
|
||||
dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
|
||||
<get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
|
||||
dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
<get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
|
||||
dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
|
||||
usetimestamp="false"
|
||||
ignoreerrors="true"/>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
@ -0,0 +1,47 @@
|
||||
--- a/src/main/java/org/apache/felix/utils/filter/FilterImpl.java 2012-06-12 08:56:50.000000000 +0200
|
||||
+++ b/src/main/java/org/apache/felix/utils/filter/FilterImpl.java 2013-05-13 14:25:58.601527069 +0200
|
||||
@@ -25,6 +25,7 @@
|
||||
import java.security.AccessController;
|
||||
import java.security.PrivilegedAction;
|
||||
import java.util.*;
|
||||
+import java.util.Map.Entry;
|
||||
|
||||
import org.apache.felix.utils.version.VersionTable;
|
||||
import org.osgi.framework.Filter;
|
||||
@@ -111,6 +111,19 @@
|
||||
converted = conv;
|
||||
}
|
||||
|
||||
+ @Override
|
||||
+ public boolean matches(Map<String, ?> map)
|
||||
+ {
|
||||
+ Map nonGenericMap = new HashMap();
|
||||
+
|
||||
+ for(Entry<String, ?> entry : map.entrySet())
|
||||
+ {
|
||||
+ nonGenericMap.put(entry.getKey(), entry.getValue());
|
||||
+ }
|
||||
+
|
||||
+ return match0(nonGenericMap);
|
||||
+ }
|
||||
+
|
||||
|
||||
/**
|
||||
* Filter using a service's properties.
|
||||
@@ -575,13 +587,13 @@
|
||||
switch (operation) {
|
||||
case APPROX :
|
||||
case EQUAL : {
|
||||
- return ((Version) value1).compareTo(converted) == 0;
|
||||
+ return ((Version) value1).compareTo((Version) converted) == 0;
|
||||
}
|
||||
case GREATER: {
|
||||
- return ((Version) value1).compareTo(converted) >= 0;
|
||||
+ return ((Version) value1).compareTo((Version) converted) >= 0;
|
||||
}
|
||||
case LESS: {
|
||||
- return ((Version) value1).compareTo(converted) <= 0;
|
||||
+ return ((Version) value1).compareTo((Version) converted) <= 0;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>java</herd>
|
||||
</pkgmetadata>
|
||||
@ -1,26 +1,22 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST OGNL_3_0_8.tar.gz 3564389 SHA256 e32d78c88985fc8f2c9ab5fb208d7dc22593dea32ed959b46b1d9101b99127d3 SHA512 79ca457077f344da16677e56f8e0ae809d2af85015e1c4bc17a3eef4dd25c01738fdbcac8a9397b83251b48164404df161d60e20d43868e1ff32e9bb388ef4b6 WHIRLPOOL a5e21dcccc4bfc424412abf94c48a3f45ba541a9e25bd0c7c4dc11869cac7051f586e5883011d03c75187fcd432195b526cfb53e3a300fbe2f84f5b4cd67e12a
|
||||
DIST ognl-2.6.9-dist.zip 2338429 SHA256 2fcb108c332b388c0ca282e8dfea9a079ab6af3caa08cfe3ccb307dffd57e290 SHA512 7883f4e2c3c4b1fab5966481c661cdb3fdd7489717333e985dc7a517fbf14f82e3c218f81e8ad94008f7fcd6e66d166bd03227ff5f1df6a203e1cbc2985bd44c WHIRLPOOL 821d93653b6217b69d575abcfaad9639d8f4e46699124b2ffc0d1ae8ba1fc763ec89b0bf6991b2a929b9e5d31e1b1fcbaf1fd1f6931952ed5f1c4df4d82c372c
|
||||
DIST osbuild.xml 5939 SHA256 b56534bfdceabe54f4c446d7ee3718dc373523aa368d83206723300fa6931726 SHA512 6b66b7b27073fd6b707b71fb2da7017602edd85de52e767ecb8d8931fdd96811b04d9ec0ac9ec1cb32daf03d43610f760471959cf7211b1921a92d5f5a070416 WHIRLPOOL d8b355472c773a4e180d8efa2c0ecbf55a1233432f8af6c21f9fc8e02012db9780f923af6c3383a343126f4753ce7a62316fdda6a393b5aceb822fe52b64f233
|
||||
EBUILD ognl-2.6.9-r1.ebuild 1148 SHA256 25d7f691c417afa3397f973c652399933960937470081852f9913f14bef7203b SHA512 d40276093b391c4e661a25a22b95b1b3da267e12967fd9b163d44abd06a912907909ecefc28c08da71f4774a79b7e5437ea348c694662069d68a49304576915d WHIRLPOOL 87586c1549dcd345a936ac583fce1124eff885873bb549064d1ff2e781a1bf8710d8ea42917e094982783f9eebe21862d63e635c582330706c72205277ddc317
|
||||
EBUILD ognl-2.6.9-r2.ebuild 943 SHA256 e8f52e291a56a513021a1a68751e2a11eac67fd0ad39b2ad933602f5c69b64d1 SHA512 c64ad6d2d14525fbc19bc9c47b298b58b67d4bfee87f47b3492f542223b24bad72c1ab15120dfda09cdc6950f9ad8e4d40f952f86ccdaaedc49fc8dd75e8a55f WHIRLPOOL 578e6b4a0f8c08cc9bda85502f8891e795e8c245cdc18db8deb23c14b64866260c013adcff70d874f3509ad5a737d7141a181c4c1abd06a2c6d6ab4c3e8f3d9c
|
||||
MISC ChangeLog 1675 SHA256 ffd34affde3384467fc6381b04106f857d51d258033bec5be626ebe21ddf2c1b SHA512 100e3ac64832150ed58d8afd00e0239508b4c4a879724413f9c0cdabfa124cf8595bd2561196282b727a5586bcfc647f38c66b6f3b58078332fe58e114168158 WHIRLPOOL 129ceed8694a2ad5e9720f2e8a4f7a75c8cd5b2bc80d133a4dcd1c2efb8a96dcb8cd39e66ce40c8bb0121e6f890efdba9818227401fc4c231f65f8e5169a467a
|
||||
EBUILD ognl-3.0.8.ebuild 1170 SHA256 4077b256fe431c950eec788d201e1cc3152a9df119bce98667acf088f823d8f7 SHA512 e5c5e030768a3880f4b367b7b7cd1ce0fde33c7dfe419db8b18c8039a15df1c74e36d8f2b2faccf9c0004d4e77954ec3e0090bc83ec55278b94324e1a73f6e50 WHIRLPOOL 8514186daa43e2a3d5a325b8de87f99991334bedd406799ab355ab4b89443571b330f6170bc31a349e7e885ca4712364f7a986ebb5b8a0e9e55f236327fe5b8a
|
||||
MISC ChangeLog 1891 SHA256 31f6f635e5df7c0511ecea7494cf558ea50bc6c1a89e1bcc7cafb94403b76c9f SHA512 605c34e2481ae931e98723f3b7feb25e4adedbac6d3bb6b862981994546cd000dda1500aaf5d1ccad6ffae5cf2542c1b0c58a31ecb1bd9571a9b6327b706be17 WHIRLPOOL cabc5ee894cd98be55b0d9cbb3527c58af7c59e087bfc5e44c2c6c5daaf94c69aadb1d5e5ac312ce8d92012995bdf0eaae8094579fb8df162b9e971e80caa612
|
||||
MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
Version: GnuPG v2.0.21 (GNU/Linux)
|
||||
|
||||
iQIcBAEBCAAGBQJQuxK4AAoJEDxpGckxwJCBL60P/1s0i5kQ/QCNBIpASy1f4sIc
|
||||
xYw4HLPTWVUn9OemP+QS4Ryxv4riArM0Uo4RZITY6hiA2Qc11xkPg9GJ0GgTy6yL
|
||||
77Ej1tnAhudezGgNUUTbIn0+SXzOYj23W0a23oXu4L+ookLkVMM9YEIowmeyR3XS
|
||||
Kms4f1Qxs+HuUng7kyV53gx39fRzqLnQyDu+AGI3QEYOX9iR0rTFIeSHgxHF4bwg
|
||||
Sfwiz7G0HLQ68ADptwHQSQyL6p8FxngXfj1WjEaktlWv7DvHw7PiDOsRjLp/4SbJ
|
||||
GVJ6PpT6PuxoTAnsFI1SdJUT9hNm8OIgko6qD+4G3KtJlQJI1EBpjC7pHkgy0A7r
|
||||
xmYe8AjC5MyyaxMKN76e1+sjfdqZUt3dZ3MXLnjRjyZzujdAVBx5hVBNJtlCA4aD
|
||||
SRfzzMO6p7n4De6gzXIL6N9RLR83nBeCE/60Dad+n2G82nnVVcwHwTJeAMA2+k/L
|
||||
dSY76WCUnug0b6v1WrY3L3RQFxjwFqoayvd6doA1DpAq3nS8M86yFgBcF7Vko02T
|
||||
6oW2R69nXSMvWfKDyuA7m66i5S9Q3SoO2hIfXRL7GY83VyebSFU3NAuJlJAzYsEG
|
||||
iCmTUCkB0rO+SHeCUygdDPJdrbChsDSO1NMUVv580A4zDi0qgLLywHfDQoTwluFp
|
||||
rhPj9ky8jd0yNWWPZ3A0
|
||||
=+mqh
|
||||
iQEcBAEBCAAGBQJSTGqyAAoJEJWyH81tNOV9jwcH/RJPpzt0EDACJkJ1f0Hsvjok
|
||||
sjZCvK056rsZuz+f+JUoPx+r2swdTk8x+tKqVpAafyXpdbFO1lWkFKy8H5OJ8O1s
|
||||
ZYpHW1lVJPlGkAtN8gdJPNTVbw0MY+KIJsKKSKMN95dXp7rhkCOwcnDnExDDlXG2
|
||||
ove9k9Bq8tiPs7sJXV1DklWCoOeDjqzfzeS4M7Zr412BQFqu57R+F+AWYG6tYwph
|
||||
wxTmqnfnbJqywofkkF0dKc1c1tCjQuEVwcWrRCnjzLRdQwH5mSQ1Ou/JX2ESYgCT
|
||||
Knn09zLD1lstmezAomrWNSBrai06iOY4PVQi6+zlp0d5POEQBuCKMp3j7a+W+n8=
|
||||
=7fwF
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,48 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ognl-3.0.8.ebuild,v 1.2 2013/10/02 18:54:44 tomwij Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
JAVA_PKG_IUSE="doc source"
|
||||
|
||||
inherit java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="Object-Graph Navigation Language"
|
||||
HOMEPAGE="http://www.ognl.org/"
|
||||
SRC_URI="https://github.com/jkuhnert/ognl/archive/OGNL_${PV//./_}.tar.gz
|
||||
https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml"
|
||||
|
||||
LICENSE="Apache-1.1"
|
||||
SLOT="3.0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
CDEPEND="dev-java/javassist:3"
|
||||
RDEPEND=">=virtual/jre-1.5
|
||||
${CDEPEND}"
|
||||
DEPEND=">=virtual/jdk-1.5
|
||||
app-arch/unzip
|
||||
${CDEPEND}"
|
||||
|
||||
S="${WORKDIR}/${PN}-OGNL_${PV//./_}"
|
||||
|
||||
java_prepare() {
|
||||
find -name '*.jar' -exec rm -v {} + || die
|
||||
|
||||
cp "${DISTDIR}/osbuild.xml" "${S}/" || die
|
||||
|
||||
sed "s/\(name=\"compile.version\" value=\"\)1.3\"/\1$(java-pkg_get-source)\"/" \
|
||||
-i osbuild.xml || die
|
||||
|
||||
cd lib/build
|
||||
java-pkg_jar-from javassist-3
|
||||
}
|
||||
|
||||
EANT_DOC_TARGET="javadocs"
|
||||
|
||||
src_install() {
|
||||
java-pkg_newjar build/ognl-2.7.2.jar ${PN}.jar
|
||||
|
||||
use doc && java-pkg_dohtml -r dist/docs/api
|
||||
use source && java-pkg_dosrc src/java/*
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
# ChangeLog for dev-java/struts-core
|
||||
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-core/ChangeLog,v 1.1 2013/10/02 22:43:39 tomwij Exp $
|
||||
|
||||
*struts-core-2.3.15.2 (02 Oct 2013)
|
||||
|
||||
02 Oct 2013; Tom Wijsman <TomWij@gentoo.org>
|
||||
+files/struts-2.3.15.2-build.xml-classpath.patch,
|
||||
+files/struts-2.3.15.2-build.xml-manifest.patch, +metadata.xml,
|
||||
+struts-core-2.3.15.2.ebuild:
|
||||
New package for dev-java/struts-core, the Core of Struts 2.
|
||||
@ -0,0 +1,21 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX struts-2.3.15.2-build.xml-classpath.patch 777 SHA256 a44bf8f76a3da7f095cbb41453d9ba3cfadeefd2ae68efa8042d3761a6bd041f SHA512 2be89275e95f39f487533413c1046bfbab3128306c96e7666093fc310d2b9664f31b081121511a8af191b8f2ed77f9e7c35c0f3c6aa1f61aa37719f0563b838c WHIRLPOOL 163232ca25dde4e293e20b1b2ea5be335de6c7eb95092682de5e591f9ad667de9349bac616d6d31a14682a9dbf53ebd09b9dc1a63d6bf8f47fedce76fdd6c838
|
||||
AUX struts-2.3.15.2-build.xml-manifest.patch 520 SHA256 15abd7708bdbb22f447397ee6cbf679f5e4f66c2ba1ff0a679ec74b330ec4a50 SHA512 da07b25dd53cdc616bc3e0cfa9faab48fef561fe3f3328cdb5ff67952913b9e6e489c913a0ab3bb0385daa3bd0fce15c1bb38b9eede88b1fdd0af953d1b5e29e WHIRLPOOL a5661fb99c4be0975cbf1720005faeb0d7c6ed89718a89c916cb4506a5de63a4c29100daa7e5edf86df3db017e568c2ce045651fb79e097021504daeca15eb37
|
||||
DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86
|
||||
DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897
|
||||
EBUILD struts-core-2.3.15.2.ebuild 1744 SHA256 5c037370cfa5a49cbe7ba575cfae3901f3bddc122673b5bebecdab97b24582b8 SHA512 38bb8084d3dde67c1ea674d44e6d4197a889da62bdf79f5763fda889a2250e2920712815b784b3744ac0462f9b362757ba97df90e33365eaeedcb0c928be9e5f WHIRLPOOL 4c46f17beaa9f7070d3183dddc0c2a21479a51d3b6f4f438e7ba6bf5c8493b4ae6dffa595252884724adb4d70a51d675ece4f1dfa2725fbe771224f8955e1998
|
||||
MISC ChangeLog 509 SHA256 07d988f713f1339f6c1fde77e2473c8aa78ab404d3246706bbace7ebd5047b95 SHA512 8216125fc966cd1e3a4ffc3e7b3f81e0c83b69cfa4bcee617d0bb65ee95305b2459d503717eed8cba0066a98bee5b2582299e77126b65fd9d765791932e92bb0 WHIRLPOOL 0c797b851f241a47260fd930708f1d4b0d0add339f46da224f1fef55b0fad7dec46abd16b08735997e453704defc2465ff13d8c040049cd8251be60b68721fc6
|
||||
MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.21 (GNU/Linux)
|
||||
|
||||
iQEcBAEBCAAGBQJSTKBYAAoJEJWyH81tNOV9U9MH/iufW4RQSpLUJ9hVBq7Mlqsq
|
||||
F6fxTmN2myF6chqj437AZ4Bi/4ApyDqV51EIwPzmz0QSpNC/o2bfnaYbRjTNUVwt
|
||||
xE0H3olhwV61b9P0MJl57M5qHs4wcW7B0/sqSh6Gqsn2jL/aYu9hAl+vBHNgS3FZ
|
||||
Jaj1Pl5+T1JJykvhuUUfMHkj3fQmE9mxbl229r/RrPSRe6DwENR+y/Spgw9aVjNM
|
||||
/snJTz/+GfFuiVRIzano0oIPMx336e22tIAterwhg1VxOZQmvngcoJcIKoIRzuDr
|
||||
a2tHVyKZsd8c/CcmEy7TV3aR+jBy7QQvrQdviiosh5iOCGSWvOC/Q3FGduMnl/Y=
|
||||
=dbrK
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -0,0 +1,20 @@
|
||||
--- a/maven-build.xml
|
||||
+++ b/maven-build.xml
|
||||
@@ -125,7 +125,7 @@
|
||||
|
||||
<target name="compile" depends="get-deps" description="Compile the code">
|
||||
<mkdir dir="${maven.build.outputDir}"/>
|
||||
- <javac destdir="${maven.build.outputDir}"
|
||||
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
optimize="false"
|
||||
@@ -153,7 +153,7 @@
|
||||
description="Compile the test code"
|
||||
unless="maven.test.skip">
|
||||
<mkdir dir="${maven.build.testOutputDir}"/>
|
||||
- <javac destdir="${maven.build.testOutputDir}"
|
||||
+ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
optimize="false"
|
||||
@ -0,0 +1,15 @@
|
||||
--- a/core/maven-build.xml
|
||||
+++ b/core/maven-build.xml
|
||||
@@ -271,12 +271,8 @@
|
||||
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
|
||||
compress="true"
|
||||
index="false"
|
||||
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/core/target/classes/META-INF/MANIFEST.MF"
|
||||
basedir="${maven.build.outputDir}"
|
||||
excludes="**/package.html">
|
||||
- <manifest>
|
||||
- <attribute name="Main-Class"/>
|
||||
- </manifest>
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>java</herd>
|
||||
</pkgmetadata>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue