Sync with portage [Wed Dec 5 13:20:15 MSK 2012].

mhiretskiy
root 12 years ago
parent 9b017bc436
commit 9f1ed58d32

@ -1,18 +1,10 @@
DIST festival-1.96-beta.tar.gz 731682 SHA256 4fa48d3525957762c83f289fba361063b8855f57ff50b7db22754d844aeadbee SHA512 3ab2d0f41d66f1ed20e549f3c4a4fd7e2a9a33ad7fc6cfb6b246ff8feabc0d46e4b6eaa2c4e876b02f220080a0f04a634b3288b2b87603abf64c05015fe5bf68 WHIRLPOOL 354223c334b5b31b172fc37e30e3d3bc05836cfc4d0887931984eb2f834195393357b69832cefc0804e3f29d7c29530c32879274022c893d953a73cfdfe5adbc
DIST festival-2.1-release.tar.gz 787313 SHA256 06f3dcbad9d26e27443fc66947a0faf0c6679482220df4b5f42a261adf758080 SHA512 1f9f28af7106c98e313d3c4d4bb26a7f927c1214fa5a0e2b4972fc85e1011e328331b73852abb57f26fa5062263d1dbccaf65e3be59c6ec762ccf340fc93797a WHIRLPOOL 0e90a9b3e673ea7ca63a4fdb7f60868db3a74347281267aad20a94548f385b8c1a66472145f0b7c7e4c02a30a695ca012e25443ffdb9ecbafd4cd3bac2f72568
DIST festlex_CMU.tar.gz 1925748 SHA256 c19430919bca45d5368cd4c82af6153fbcc96a487ebd30b78b5f3c08718b7c07 SHA512 c293344020fd3337193303cd5dfb7e2b0a1012770a484d8bccaae921b0c61b75699204bec45fee0db754506d6f1558fd616866cc94e76afcbb85a4dcbcf9542b WHIRLPOOL 040094e7dcbfb280a18b5862927855cdde62a49f8eac8d63045c1f92f720cc0041f2991ebacb05d457cd77c4c471e935a808a6e185df28e7f87d0e1d08f21905
DIST festlex_OALD.tar.gz 1472516 SHA256 61afc02c4b9dee6322412958ea8be477ee451c3cdab789b88c4907e3e377ccd5 SHA512 0221c3d78140c6cb4e74f98edbdf0dbe5987a8efa3e7205844a5c01c31a98aaced3b20e4a42b09aaa4a3c93c9225d9f24d96df3fb5d963092e955d4cb4674aac WHIRLPOOL 12f96f04d0b7257a032e9e720136bb79e1377fa63f83cd5f3b35dbed5687da838dc4c11de183df89794a389d139c83ea1ea4df3ab6e7c87018c408ed9dbdf290
DIST festlex_POSLEX.tar.gz 242914 SHA256 5ef8cc5d35e9f2141b5a0a4774df82dc9731fe7e9800eb09ecf264f2f8503e7b SHA512 5c3857a195f5f5ebc4c366f37685437af41eb7e86a1a13b41b08cab91e536114ae4ddfa8b124acb40ec32c13b53d0dbf2c857d4c756b0720c9a363866ecb8c47 WHIRLPOOL 8c5b1ed51b89377bb56cfdb12cc0affb9646cdf57b8c908deb547c3bb08c66881c59bef5f04ed1973b6f00c8ce45e0f85b9339afddb2bc460599f5ca11b8f05e
DIST festvox_cmu_us_awb_arctic_hts.tar.gz 878090 SHA256 56b930028a14efdaa01b8b34add087bcde75b774b97b205d2f478413203d9a4d SHA512 78e923fb6b8f21361b19fb2f38b3c71f06bde14233c88ea10abad593e384641f0a6a8952a90badbffd5671a8be58eaca7b1cda1c3bfe313157316e09d5804891 WHIRLPOOL a97724c564ba47e5f1784d0ccce44b653728646dcac41b2db0c1eaac8f23887ba604d01c9c03e0793c6941e9fadde3bd1c3b2d41c4c1ccd2a70eae37be0c3556
DIST festvox_cmu_us_awb_cg.tar.gz 4452760 SHA256 f6010538b3e2f32152cc75741a62b8c7eecfaa3e51153c9db735723002807264 SHA512 b77174d2e9ab914ee3c4d6e0d83e29b64034bb45d3fe021acf3a6da13304acc819c4ac5b1046a6f022312e90aa23c73b585aaf11f927e80aee4533584b60356b WHIRLPOOL fe2aa698dfa917f8e72c49bb1399c3c430d65da2b3b072d53cb6810e6cde49b19de8c5b44e0ee23647a93ded1fc6a39c80eab059c25e3eb28805a7d9977f3539
DIST festvox_cmu_us_bdl_arctic_hts.tar.gz 1060641 SHA256 caa679c728c8804f4a1dae6ab08e7b31f10b292e572598fb6432d0e18f40bd2b SHA512 c8ca253a15365b2f269c28cb82412581d63eef5ac21480c17871f6513bbddab7c4245a47b353c5e611272cebd5a5a050dd9d2fe72034f076d431bba1eaba9997 WHIRLPOOL eb0f5bea4cc85ceb53695baf1052d9642839079fd4e5b1d16dc9ddc877373d6f7bb08636183860f0b501afaca0bbb1e4d930c7f058ae667f149bc5ae8b04b75b
DIST festvox_cmu_us_jmk_arctic_hts.tar.gz 909045 SHA256 e4f623d1114922c8844ec266d46d558e1521e0ab3bc6e958cdf8f69c28bcc038 SHA512 66e2ea23af2c1efb19a0a039481c439c1b179fa5ad4205f5b4855682927cf772d36238cfe5c2fb681553a79635e4b902fce2ea521b4754efe3e13167a56ca634 WHIRLPOOL 8e396b1f9a9bafe7d6fdbc539741c34c33300ab4a5a1b03e3105d9494f070c0f77d8892fbe1da0c3d91d8ac78ff3800c22310a9bf7a606e52e51a0203c32d7c1
DIST festvox_cmu_us_rms_cg.tar.gz 5222226 SHA256 5f0ffc3181df76b63f3c13db3cdc6e67e02639a3982c6b6fa55bbbd2fe1cbc30 SHA512 a251fa27f6cabecb29cf4199cb040cb2ce512a6a447840d31b0d2055d26e6a86f4730bbe3e0f1612e413858f41fdbdd184f04575f9f64658d3f34171612ee172 WHIRLPOOL c9a5f712952c2c88d901e49cf33f03328d44fd6befaca16bcf5041a82beeb092bd6fd47751b7da9da6393c752a3b4b9ae52119a99a6ad1aca6b335cc78a8c2ae
DIST festvox_cmu_us_slt_arctic_hts.tar.gz 955706 SHA256 adcc187fc7db39e17c119811936be57f0b788908f06c3d9b330856ad8357b128 SHA512 58908094c7e538118471ebd80d86d91f681d0958587f0c5ee6c3a00e1ad5f41519e7bb2a96353f9a68946aba343e11c2949fe2b1efafc53f0d8a6b20d7e3e1f8 WHIRLPOOL 2e87cedb571b4ece257e8c27ab9570fe183691ebc17ddb8fc4323201bd4fc2a449f30a5879a3ce8cc8f8673283c3162761235bf253c96a089d86796b898607a0
DIST festvox_kallpc16k.tar.gz 4104056 SHA256 9eb6336f35c202c8069d37e489fb009a7e9fd8539cd47644329db1e92c6aba83 SHA512 ad8d45e04cb704f31a01de8f4d1b3adb4530563728e8b331b0a730c762bd0c0590e5d49f893404a0199f51fb6afce4b786107ae1fdbc4d1b61c3139ce805267c WHIRLPOOL c0242c9abb733c30cbba75178de8aa825a0be17bc24a2851eff64147a080c2cbd0d374de1e6e4a8bce562f727474d1e80d26535efe12e8ed640d7eb7bce75832
DIST festvox_kedlpc16k.tar.gz 4221528 SHA256 6b8f11424bda5c81ae8a58f7838e2a9d12fdb39cdfff6ed89f611305391b1a36 SHA512 9fc3665bb03484ba20bd1ad80f2acba6c3fa23cef8e23b2d3e3723415aa0ed57c5c184e5393783b3636af735188eff9f106d0993f46c89a2571b9fe8c48c86be WHIRLPOOL 3e252c3f283238d79a615a7f27a1d1781ad795ef4e5615466a079d1034aefea209d286d02839600624ad01c994f0be65b0e436606a5d57546df592935781d25b
DIST festvox_rablpc16k.tar.gz 5369001 SHA256 54835837ca734e62c0210c0f9dd27380d2ad89819ae91ec6e8cfab4e515b7bdc SHA512 11539bfb822eec9c4803c8526364d3cf6ad735a0edfd018471e95df1447e0cd3e19fdee44faaf0f0fbceed281a06b21a971f0c2a3a3ff6c46ea8272202f53f11 WHIRLPOOL 08266d82182ebc939965f52ef591043de664ed8380105e42eb39b4a96f50bda5d8958d9b7850e963fe1e8324fd6a5d05a5d1d7ab41f4c88940e61fe783dbf557
DIST festvox_us1.tar.gz 11040 SHA256 23b332513867d6e9c340dc888a7ce67843e5a3c03db328cd36975985057c8b8e SHA512 7ac318f700c8fade65da80f33b86b124cd8f71bb687aa7a7c355dc1087a3bd01a3b28fdef3a2eff6458836bbf8e90dd7802b58177f4c73eba3a737e6646a1f9d WHIRLPOOL d26dd836725ba14f2d21f8f8cbb19fab1df0dfd282fe6b14f3a768660c32f32c2472ef5dc066f952392c6fa53077c4d81c67f3794242288fef65180a61cbc69e
DIST festvox_us2.tar.gz 11037 SHA256 d27ad26213144d956815e804c06e5473191ac12afb44f6a1029b3842e3a3007c SHA512 73fcc610cc2eab225deebf6648895c2be3d4a604f88b171c75991136dac65a0d65f36d3e588188e96e7c70a341cdb3756c82573e6150a587099da54c8ce511a6 WHIRLPOOL 3bc8ee82f275a617335502bf90552aabdcb067fe948dc479276f773499dedb116964327a46e977229991fab282afb0b88d99c6cc7c00bdf5a9eeb28e596c845e
DIST festvox_us3.tar.gz 11220 SHA256 af9ca4d1832e1971aa6e52f6a3ff8f729bf970c7bee1de7e8ac0611ca01871b8 SHA512 e9e62e977fe462db0d2d7c5bbe6e871dddeec4bd7d240ecd1e5e5fddddecf177d21263fdb4ebb42a0aac36dea72c64f5cf42d38d838457c26821be46b7202aa7 WHIRLPOOL 503e16c239262526d4542e303149aa842559b1aba44d19fae0f8524d0a9dfe8fe4c676f571944afc92437a18c683b7d5b426df1c269b3e030778e4900cb0be40
DIST speech_tools-2.1-release.tar.gz 1681999 SHA256 ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 WHIRLPOOL 6df6ca5168462599fadf209827e367c963af5ca6be05277618c9d09aac34a3b151665b860a14fa4742482cc77246e372671ac94b23bdca63bbbb7b8c7b234644

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.1.1-r1.ebuild,v 1.1 2012/12/03 20:49:27 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.1.1-r1.ebuild,v 1.2 2012/12/05 04:16:54 mr_bones_ Exp $
EAPI="4"
@ -351,4 +351,4 @@ pkg_postinst() {
elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
fi
}
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.2.0.ebuild,v 1.1 2012/12/03 20:57:02 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.2.0.ebuild,v 1.2 2012/12/05 04:16:54 mr_bones_ Exp $
EAPI="4"
@ -353,4 +353,4 @@ pkg_postinst() {
elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
fi
}
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r1.ebuild,v 1.6 2012/11/30 15:28:51 billie Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r1.ebuild,v 1.7 2012/12/04 20:58:53 billie Exp $
EAPI=4
@ -26,7 +26,7 @@ DEPEND_COMMON="
>=dev-lua/toluapp-1.0.93
>=dev-lang/lua-5.1.4-r8
media-libs/imlib2 )
nvidia? ( x11-drivers/nvidia-drivers[tools] )
nvidia? ( media-video/nvidia-settings )
truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
x11-libs/libX11
x11-libs/libXdamage

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0.ebuild,v 1.9 2012/11/30 15:28:51 billie Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0.ebuild,v 1.10 2012/12/04 20:58:53 billie Exp $
EAPI=4
@ -26,7 +26,7 @@ DEPEND_COMMON="
>=dev-lua/toluapp-1.0.93
>=dev-lang/lua-5.1.4-r8
media-libs/imlib2 )
nvidia? ( x11-drivers/nvidia-drivers[tools] )
nvidia? ( media-video/nvidia-settings )
truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
x11-libs/libX11
x11-libs/libXdamage

@ -23,7 +23,7 @@
<flag name='moc'>enable monitoring of music played by <pkg>media-sound/moc</pkg></flag>
<flag name='mpd'>enable monitoring of music controlled by <pkg>media-sound/mpd</pkg></flag>
<flag name='nano-syntax'>enable syntax highlighting for <pkg>app-editors/nano</pkg></flag>
<flag name='nvidia'>enable reading of nvidia card temperature sensors via <pkg>x11-drivers/nvidia-drivers</pkg></flag>
<flag name='nvidia'>enable reading of nvidia card temperature sensors via <pkg>media-video/nvidia-settings</pkg></flag>
<flag name='portmon'>enable support for tcp (ip4) port monitoring</flag>
<flag name='thinkpad'>enable support for IBM/Lenovo notebooks</flag>
<flag name='weather-metar'>enable support for metar weather service</flag>

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/durep/durep-0.9-r4.ebuild,v 1.2 2012/12/01 21:30:09 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/durep/durep-0.9-r4.ebuild,v 1.3 2012/12/04 10:43:58 blueness Exp $
EAPI=4
inherit eutils
@ -11,7 +11,7 @@ SRC_URI="http://www.hibernaculum.net/download/${P}.tar.gz"
LICENSE="Artistic"
SLOT="0"
KEYWORDS="amd64 ~ppc ~x86"
KEYWORDS="amd64 ppc ~x86"
IUSE=""
DEPEND="dev-lang/perl"

@ -0,0 +1,20 @@
--- localepurge.orig 2012-12-04 23:15:29.422756767 +0100
+++ localepurge 2012-12-04 23:16:13.313756491 +0100
@@ -198,7 +198,7 @@
if [ "$SHOWFREEDSPACE" = "enabled" ]; then
if test $SPACETMP -gt 0 ; then
- LOCALETOTAL=$SPACETMP
+ LOCALETOTAL=$(($LOCALETOTAL + $SPACETMP))
einfo "localepurge: Disk space freed in $LOCALEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
fi
SPACETMP=0
@@ -230,7 +230,7 @@
if [ "$SHOWFREEDSPACE" = "enabled" ]; then
if test $SPACETMP -gt 0 ; then
- MANTOTAL=$SPACETMP
+ MANTOTAL=$(($MANTOTAL + $SPACETMP))
einfo "localepurge: Disk space freed in $MANPAGEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
fi
SPACETMP=0

@ -0,0 +1,18 @@
--- localepurge.orig 2012-12-04 23:08:17.754765708 +0100
+++ localepurge 2012-12-04 23:09:02.397765264 +0100
@@ -165,7 +165,14 @@
${ACTION} `find ${REMOVEPATH} -type f -o -type l`
if [ "$SHOWFREEDSPACE" = "enabled" ]; then
- SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
+ # if symlink, REMOVEPATH could be removed
+ # check from parentdir then
+ if [ -d ${REMOVEPATH} ]; then
+ SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
+ else
+ SPACEAFTER=$(df -P ${REMOVEPATH%/*} | awk '{if ( NR==2 ) { print $3 }}')
+ fi
+
SPACESUM=$(($SPACEBEFORE - $SPACEAFTER))
if test $SPACESUM -gt 0 ; then

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/localepurge-0.5.4.ebuild,v 1.1 2012/12/03 19:27:04 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/localepurge-0.5.4-r1.ebuild,v 1.1 2012/12/04 22:36:49 hwoarang Exp $
EAPI=4
@ -23,6 +23,10 @@ S=${WORKDIR}/${PN}
src_prepare() {
epatch "${FILESDIR}"/${P}-prefix.patch
# 164544
epatch "${FILESDIR}"/${P}-directorysum.patch
# 445910
epatch "${FILESDIR}"/${P}-parentdir.patch
eprefixify ${PN}
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/libpar2/libpar2-0.2.1.ebuild,v 1.4 2012/11/29 20:33:50 ranger Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/libpar2/libpar2-0.2.1.ebuild,v 1.5 2012/12/04 11:24:38 ago Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV:0:3}/${PV}/+download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ~x86"
KEYWORDS="amd64 ppc x86"
IUSE="static-libs"
RDEPEND="dev-libs/libsigc++:2"

@ -4,7 +4,7 @@
<herd>python</herd>
<herd>proxy-maintainers</herd>
<maintainer>
<email>johneed@hotmail.com</email>
<email>idella4@gentoo.org</email>
<name>Ian Delaney</name>
</maintainer>
</pkgmetadata>

@ -10,9 +10,8 @@
and high-quality generated output.
</longdescription>
<maintainer>
<email>johneed@hotmail.com</email>
<email>idella4@gentoo.org</email>
<name>Ian Delaney</name>
<description>Proxy maintainer, assign bugs</description>
</maintainer>
<maintainer>
<email>titanofold@gentoo.org</email>

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.34 2012/11/21 22:22:35 cardoe Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.35 2012/12/04 10:20:45 slyfox Exp $
EAPI="4"
@ -68,7 +68,7 @@ LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
seccomp? ( >=sys-libs/libseccomp-1.0.0[static-libs(+)] )
spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
tls? ( net-libs/gnutls[static-libs(+)] )
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
vde? ( net-misc/vde[static-libs(+)] )
@ -88,7 +88,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
python? ( =dev-lang/python-2*[ncurses] )
sdl? ( media-libs/libsdl[X] )
smartcard? ( dev-libs/nss )
spice? ( >=app-emulation/spice-protocol-0.8.1 )
spice? ( >=app-emulation/spice-protocol-0.12.2 )
systemtap? ( dev-util/systemtap )
usbredir? ( >=sys-apps/usbredir-0.3.4 )
virtfs? ( sys-libs/libcap )

@ -8,7 +8,6 @@
required when using <pkg>app-emulation/libvirt</pkg> with
PolicyKit authentication
</flag>
<flag name='sasl'>
Depend on the proper libraries needed to connect to SASL-enabled
libvirtd instances (e.g. Kerberos-protected instances).
@ -16,5 +15,8 @@
<flag name='spice'>
Support connecting to SPICE-enabled virtual machines.
</flag>
<flag name='vnc'>
Support connecting to VNC-enabled virtual machines.
</flag>
</use>
</pkgmetadata>

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.9.4.ebuild,v 1.2 2012/10/15 10:06:03 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.9.4.ebuild,v 1.3 2012/12/04 23:16:49 cardoe Exp $
EAPI=4
@ -34,20 +34,26 @@ DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
HOMEPAGE="http://virt-manager.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="gnome-keyring policykit sasl spice"
IUSE="gnome-keyring policykit sasl +spice +vnc"
RDEPEND=">=dev-python/pygtk-1.99.12
>=app-emulation/libvirt-0.7.0[python,sasl?]
>=dev-libs/libxml2-2.6.23[python]
${VIRTINSTDEP}
>=gnome-base/librsvg-2
>=x11-libs/vte-0.12.2:0[python]
>=net-libs/gtk-vnc-0.3.8[python,sasl?]
>=dev-python/dbus-python-0.61
>=dev-python/gconf-python-1.99.11
dev-python/urlgrabber
gnome-keyring? ( dev-python/gnome-keyring-python )
policykit? ( sys-auth/polkit )
spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] )"
spice? (
>=net-misc/spice-gtk-0.6[python,sasl?]
|| (
<=net-misc/spice-gtk-0.14[python,sasl?,-gtk3]
>=net-misc/spice-gtk-0.14-r1[python,sasl?]
)
)
vnc? ( >=net-libs/gtk-vnc-0.3.8[python,sasl?] )"
# tui? ( >=dev-python/new_syrup-0.1.2 )"
DEPEND="${RDEPEND}
app-text/rarian

@ -0,0 +1,107 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.4-r1.ebuild,v 1.1 2012/12/04 23:10:18 cardoe Exp $
EAPI=5
inherit eutils gnome2 toolchain-funcs
DESCRIPTION="Graphical console client for connecting to virtual machines"
HOMEPAGE="http://virt-manager.org/"
SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gtk3 nsplugin sasl +spice +vnc"
RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
>=dev-libs/libxml2-2.6
gtk3? ( x11-libs/gtk+:3 )
!gtk3? ( >=x11-libs/gtk+-2.18:2 )
nsplugin? (
>=dev-libs/nspr-4
>=x11-libs/gtk+-2.18:2
)
spice? ( >=net-misc/spice-gtk-0.12.101[sasl?,gtk3=] )
vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3=] )"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.35.0
virtual/pkgconfig
nsplugin? ( =net-misc/npapi-sdk-0.27 )
spice? ( >=app-emulation/spice-protocol-0.10.1 )"
REQUIRED_USE="|| ( spice vnc )"
GTK2_BUILDDIR="${WORKDIR}/${P}_nsplugin"
GTK3_BUILDDIR="${WORKDIR}/${P}_gtk"
pkg_setup() {
G2CONF="$(use_with vnc gtk-vnc) $(use_with spice spice-gtk)"
GTK2_G2CONF="${G2CONF} $(use_enable nsplugin plugin)"
GTK2_G2CONF="${G2CONF} --with-gtk=2.0"
GTK3_G2CONF="${G2CONF} --with-gtk=3.0"
}
src_prepare() {
mkdir ${GTK2_BUILDDIR} || die
mkdir ${GTK3_BUILDDIR} || die
epatch "${FILESDIR}"/${PN}-0.5.x-npapi-sdk.patch
}
src_configure() {
if use nsplugin; then
export MOZILLA_PLUGIN_CFLAGS="$($(tc-getPKG_CONFIG) --cflags npapi-sdk nspr)"
export MOZILLA_PLUGIN_LIBS="$($(tc-getPKG_CONFIG) --libs npapi-sdk nspr)"
fi
export ECONF_SOURCE="${S}"
cd ${GTK2_BUILDDIR}
echo "Running configure in ${GTK2_BUILDDIR}"
G2CONF="${GTK2_G2CONF}" gnome2_src_configure
if use gtk3; then
cd ${GTK3_BUILDDIR}
echo "Running configure in ${GTK3_BUILDDIR}"
G2CONF="${GTK3_G2CONF}" gnome2_src_configure
fi
}
src_compile() {
cd ${GTK2_BUILDDIR}
echo "Running make in ${GTK2_BUILDDIR}"
default
if use gtk3; then
cd ${GTK3_BUILDDIR}
echo "Running make in ${GTK3_BUILDDIR}"
default
fi
}
src_test() {
cd ${GTK2_BUILDDIR}
echo "Running make check in ${GTK2_BUILDDIR}"
default
if use gtk3; then
cd ${GTK3_BUILDDIR}
echo "Running make check in ${GTK3_BUILDDIR}"
default
fi
}
src_install() {
cd ${GTK2_BUILDDIR}
echo "Running make install in ${GTK2_BUILDDIR}"
default
if use gtk3; then
cd ${GTK3_BUILDDIR}
echo "Running make install in ${GTK3_BUILDDIR}"
default
fi
}

@ -1,7 +1,7 @@
# create second tree of USB devices according to
# http://www.virtualbox.org/ticket/7759#comment:5
SUBSYSTEM=="usb_device", ACTION!="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor"
SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor"
SUBSYSTEM=="usb_device", ACTION!="remove", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
SUBSYSTEM=="usb_device", ACTION=="remove", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh --remove $major $minor"
SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh --remove $major $minor"

@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild,v 1.1 2012/10/24 04:41:40 patrick Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild,v 1.2 2012/12/04 09:40:13 polynomial-c Exp $
EAPI=2
inherit eutils unpacker fdo-mime gnome2 pax-utils
inherit eutils unpacker fdo-mime gnome2 pax-utils udev
MY_PV=${PV/beta/BETA}
MY_PV=${MY_PV/rc/RC}
@ -307,11 +307,14 @@ src_install() {
echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
doenvd "${T}/90virtualbox"
insinto /lib/udev/rules.d
local udevdir="$(udev_get_udevdir)"
insinto ${udevdir}/rules.d
doins "${FILESDIR}"/10-virtualbox.rules
# move udev scripts into /lib/udev (bug #372491)
mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
sed "s@%UDEVDIR%@${udevdir}@" \
-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
# move udev scripts into ${udevdir} (bug #372491)
mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
}
pkg_postinst() {

@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild,v 1.1 2012/11/10 21:08:38 polynomial-c Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild,v 1.2 2012/12/04 09:40:13 polynomial-c Exp $
EAPI=2
inherit eutils unpacker fdo-mime gnome2 pax-utils
inherit eutils unpacker fdo-mime gnome2 pax-utils udev
MY_PV=${PV/beta/BETA}
MY_PV=${MY_PV/rc/RC}
@ -307,11 +307,14 @@ src_install() {
echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
doenvd "${T}/90virtualbox"
insinto /lib/udev/rules.d
local udevdir="$(udev_get_udevdir)"
insinto ${udevdir}/rules.d
doins "${FILESDIR}"/10-virtualbox.rules
# move udev scripts into /lib/udev (bug #372491)
mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
sed "s@%UDEVDIR%@${udevdir}@" \
-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
# move udev scripts into ${udevdir} (bug #372491)
mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
}
pkg_postinst() {

@ -5,4 +5,5 @@ DIST ocaml-3.11 11661 SHA256 b919112964cf64bcae841301754402184ceee177ab6681e75bf
DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e
DIST xen-4.1.1.tar.gz 10355625 SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b SHA512 0ec84db28af5b1206392b44e2c135859b3393d9c0eb1109f6a983492ba70622a145a08efce54f2943495feb06291d3fd5df9cc8ffea51e6e42aa69450edc87f2 WHIRLPOOL 58d83e71ac0a942830311d7eb5ebc5a7b34b118001f6f607ea7e5d7a959bafd72c9b8b6d010144fdef7417a238382602d948007be90f9ebf583b4d18897344c0
DIST xen-4.1.2.tar.gz 10365786 SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d SHA512 8f50f238b0b474ec5556279cbd51d704b4365033f2541a5d0376f287b26b7e8f0193172041109d97bb76d35ace3adf71e12f89f5766ff79a8ea861e7282f00d7 WHIRLPOOL 93a4bdd05125ef722464ef682798191c8b3db7228cbc0a27bcbe7932a7776491f90e727e1fcc4a9e7ec3eada7f56c567c07ad61cdda2f514109f702800fe5566
DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0
DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276

@ -0,0 +1,149 @@
diff -ur newlib-1.16.0.orig/newlib/libc/stdlib/wcstoull.c newlib-1.16.0/newlib/libc/stdlib/wcstoull.c
--- newlib/libc/stdlib/wcstoull.c 2007-07-07 04:03:28.000000000 +0800
+++ newlib/libc/stdlib/wcstoull.c 2012-12-02 14:19:40.905136553 +0800
@@ -124,7 +124,7 @@
#include <errno.h>
#include <stdlib.h>
#include <reent.h>
-
+#include <wchar.h>
#ifndef _REENT_ONLY
unsigned long long
diff -ur newlib-1.16.0.orig/newlib/doc/makedoc.c
newlib-1.16.0/newlib/doc/makedoc.c
--- newlib/doc/makedoc.c 2007-01-03 01:59:59.000000000 +0900
+++ newlib/doc/makedoc.c 2012-12-02 16:53:42.700289294 +0800
@@ -39,7 +39,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
-
+#include <string.h>
#define DEF_SIZE 5000
#define STACK 50
diff -ur newlib-1.16.0.orig/newlib/libc/reent/lseek64r.c newlib-1.16.0/newlib/libc/reent/lseek64r.c
--- newlib/libc/reent/lseek64r.c 2003-06-04 03:48:07.000000000 +0800
+++ newlib/libc/reent/lseek64r.c 2012-12-02 18:29:45.435760985 +0800
@@ -1,8 +1,8 @@
/* Reentrant versions of lseek system call. */
-#include <reent.h>
+#include "../include/reent.h"
#include <unistd.h>
-#include <_syslist.h>
+#include "../include/_syslist.h"
/* Some targets provides their own versions of this functions. Those
targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */
diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/fseeko64.c newlib-1.16.0/newlib/libc/stdio64/fseeko64.c
--- newlib/libc/stdio64/fseeko64.c 2007-07-14 04:37:53.000000000 +0800
+++ newlib/libc/stdio64/fseeko64.c 2012-12-02 18:26:29.955778906 +0800
@@ -119,7 +119,7 @@
ptr->_errno = EOVERFLOW;
return EOF;
}
- return (_off64_t) _fseeko_r (ptr, fp, offset, whence);
+ return (_off64_t) _fseeko64_r (ptr, fp, offset, whence);
}
/* Make sure stdio is set up. */
diff -ur newlib-1.16.0.orig/newlib/libc/reent/fstat64r.c newlib-1.16.0/newlib/libc/reent/fstat64r.c
--- newlib/libc/reent/fstat64r.c 2012-12-03 13:17:26.569703981 +0800
+++ newlib/libc/reent/fstat64r.c 2003-06-04 03:48:07.000000000 +0800
@@ -1,10 +1,10 @@
/* Reentrant versions of fstat system call. This implementation just
calls the fstat system call. */
-#include <reent.h>
+#include "../include/reent.h">
#include <unistd.h>
#include <sys/stat.h>
-#include <_syslist.h>
+#include "../include/_syslist.h"
#ifdef __LARGE64_FILES
diff -ur newlib-1.16.0.orig/libgloss/i386/cygmon-gmon.c newlib-1.16.0/libgloss/i386/cygmon-gmon.c
--- libgloss/i386/cygmon-gmon.c 2002-10-26 03:18:46.000000000 +0800
+++ libgloss/i386/cygmon-gmon.c 2012-12-03 14:38:41.454257066 +0800
@@ -68,6 +68,9 @@
#include "cygmon-gmon.h"
+#include <unistd.h>
+#include <stdlib.h>
+#include <strings.h>
/*
* froms is actually a bunch of unsigned shorts indexing tos
*/
@@ -78,6 +78,8 @@
static char *s_lowpc = 0;
static char *s_highpc = 0;
static unsigned long s_textsize = 0;
+extern void profil_write(int, char*, int);
+extern int moncontrol (int);
static int ssiz;
static char *sbuf;
diff -ur newlib-1.16.0.orig/newlib/libc/include/_syslist.h
newlib-1.16.0/newlib/libc/include/_syslist.h
--- newlib/libc/include/_syslist.h 2005-08-23 05:13:35.000000000 +0800
+++ newlib/libc/include/_syslist.h 2012-12-03 17:20:03.092369483 +0800
@@ -2,6 +2,7 @@
and only provide C names, so that we end up in violation of ANSI */
#ifndef __SYSLIST_H
#define __SYSLIST_H
+#include <sys/types.h>
#ifdef MISSING_SYSCALL_NAMES
#define _close close
#diff -ur newlib-1.16.0.orig/newlib/libc/Makefile.in newlib-1.16.0/newlib/libc/Makefile.in
#--- newlib/libc/Makefile.in 2007-05-25 01:33:30.000000000 +0800
#+++ newlib/libc/Makefile.in 2012-12-03 21:52:05.621873084 +0800
diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/ftello64.c newlib-1.16.0/newlib/libc/stdio64/ftello64.c
--- newlib/libc/stdio64/ftello64.c 2007-07-14 04:37:53.000000000 +0800
+++ newlib/libc/stdio64/ftello64.c 2012-12-04 18:34:46.491509484 +0800
@@ -93,7 +93,7 @@
/* Only do 64-bit tell on large file. */
if (!(fp->_flags & __SL64))
- return (_off64_t) _ftello_r (ptr, fp);
+ return (_off64_t) _ftello64_r (ptr, fp);
/* Ensure stdio is set up. */
diff -ur newlib-1.16.0.orig/newlib/libc/reent/open64r.c newlib-1.16.0/newlib/libc/reent/open64r.c
--- newlib/libc/reent/open64r.c 2002-08-27 02:56:06.000000000 +0800
+++ newlib/libc/reent/open64r.c 2012-12-04 20:06:10.044006769 +0800
@@ -1,8 +1,8 @@
/* Reentrant versions of open system call. */
-#include <reent.h>
+#include "../include/reent.h">
#include <unistd.h>
-#include <fcntl.h>
+#include <sys/_default_fcntl.h>
#include <_syslist.h>
#ifdef __LARGE64_FILES
diff -ur newlib-1.16.0.orig/newlib/libc/reent/signalr.c newlib-1.16.0/newlib/libc/reent/signalr.c
--- newlib/libc/reent/signalr.c 2012-12-05 07:33:25.623393126 +0800
+++ newlib/libc/reent/signalr.c 2012-12-05 07:34:03.943389613 +0800
@@ -1,10 +1,10 @@
/* Reentrant versions of syscalls need to support signal/raise.
These implementations just call the usual system calls. */
-#include <reent.h>
+#include "../include/reent.h"
#include <signal.h>
#include <unistd.h>
-#include <_syslist.h>
+#include "../include/_syslist.h"
/* Some targets provides their own versions of these functions. Those
targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */

@ -0,0 +1,37 @@
# Fix gcc-4.6
diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk
--- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800
+++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800
@@ -6,7 +6,7 @@
# Define some default flags.
# NB. '-Wcast-qual' is nasty, so I omitted it.
-DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile
--- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800
+++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800
@@ -73,7 +73,7 @@
-include $(XEN_TARGET_ARCH)/Makefile
-CFLAGS += -Werror -Wmissing-prototypes
+CFLAGS += -Wmissing-prototypes
CFLAGS += -I. $(CFLAGS_xeninclude)
# Needed for posix_fadvise64() in xc_linux.c
# Drop .config
diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk
--- Config.mk 2012-09-17 18:23:12.000000000 +0800
+++ Config.mk 2012-12-05 14:01:10.641260261 +0800
@@ -7,7 +7,6 @@
# fallback for older make
realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))")))
--include $(XEN_ROOT)/.config
# A debug build of Xen and tools?
debug ?= n

@ -0,0 +1,112 @@
# Patch Makefile to patch insource newlib,
# Prevent internal downloading of external packages
diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
--- stubdom/Makefile 2012-09-17 18:21:17.000000000 +0800
+++ stubdom/Makefile 2012-12-05 14:01:10.694260256 +0800
@@ -8,30 +8,30 @@
include $(XEN_ROOT)/Config.mk
#ZLIB_URL?=http://www.zlib.net
-ZLIB_URL=$(XEN_EXTFILES_URL)
+ZLIB_URL=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
ZLIB_VERSION=1.2.3
#LIBPCI_URL?=http://www.kernel.org/pub/software/utils/pciutils
-LIBPCI_URL?=$(XEN_EXTFILES_URL)
+LIBPCI_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
LIBPCI_VERSION=2.2.9
#NEWLIB_URL?=ftp://sources.redhat.com/pub/newlib
-NEWLIB_URL?=$(XEN_EXTFILES_URL)
+NEWLIB_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
NEWLIB_VERSION=1.16.0
#LWIP_URL?=http://download.savannah.gnu.org/releases/lwip
-LWIP_URL?=$(XEN_EXTFILES_URL)
+LWIP_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
LWIP_VERSION=1.3.0
#GRUB_URL?=http://alpha.gnu.org/gnu/grub
-GRUB_URL?=$(XEN_EXTFILES_URL)
+GRUB_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
GRUB_VERSION=0.97
-#OCAML_URL?=$(XEN_EXTFILES_URL)
+#OCAML_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
OCAML_URL?=http://caml.inria.fr/pub/distrib/ocaml-3.11
OCAML_VERSION=3.11.0
-WGET=wget -c
+WGET=cp -t .
GNU_TARGET_ARCH:=$(XEN_TARGET_ARCH)
ifeq ($(XEN_TARGET_ARCH),x86_32)
@@ -95,12 +95,13 @@
##############
newlib-$(NEWLIB_VERSION).tar.gz:
- $(WGET) $(NEWLIB_URL)/$@
+# $(WGET) $(NEWLIB_URL)/$@
newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz
tar xzf $<
patch -d $@ -p0 < newlib.patch
patch -d $@ -p0 < newlib-chk.patch
+ patch -d $@ -p0 < newlib-implicits.patch
patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
find $@ -type f | xargs perl -i.bak \
-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
@@ -112,7 +113,7 @@
$(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION)
mkdir -p newlib-$(XEN_TARGET_ARCH)
( cd newlib-$(XEN_TARGET_ARCH) && \
- CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
+ CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) LDFLAGS= RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
$(CROSS_MAKE) && \
$(CROSS_MAKE) install )
@@ -121,7 +122,7 @@
############
zlib-$(ZLIB_VERSION).tar.gz:
- $(WGET) $(ZLIB_URL)/$@
+# $(WGET) $(ZLIB_URL)/$@
zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz
tar xzf $<
@@ -141,7 +142,7 @@
##############
pciutils-$(LIBPCI_VERSION).tar.bz2:
- $(WGET) $(LIBPCI_URL)/$@
+# $(WGET) $(LIBPCI_URL)/$@
pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2
tar xjf $<
@@ -169,7 +170,7 @@
######
lwip-$(LWIP_VERSION).tar.gz:
- $(WGET) $(LWIP_URL)/$@
+# $(WGET) $(LWIP_URL)/$@
lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz
tar xzf $<
@@ -325,7 +326,7 @@
######
grub-$(GRUB_VERSION).tar.gz:
- $(WGET) $(GRUB_URL)/$@
+#$(WGET) $(GRUB_URL)/$@
grub-upstream: grub-$(GRUB_VERSION).tar.gz
tar xzf $<
@@ -392,7 +393,7 @@
$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz"
-install-grub: pv-grub
+install-grub:
$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz"

@ -0,0 +1,12 @@
diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
--- stubdom/Makefile 2012-12-05 08:01:01.480241322 +0800
+++ stubdom/Makefile 2012-12-05 08:01:37.432238026 +0800
@@ -101,6 +101,7 @@
tar xzf $<
patch -d $@ -p0 < newlib.patch
patch -d $@ -p0 < newlib-chk.patch
+ patch -d $@ -p0 < newlib-implicits.patch
patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
find $@ -type f | xargs perl -i.bak \
-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild,v 1.5 2012/04/24 09:49:47 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild,v 1.7 2012/12/04 19:24:18 scarabeus Exp $
EAPI="2"
@ -17,7 +17,7 @@ SRC_URI="
$LIBPCI_URL/pciutils-2.2.9.tar.bz2
$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
$OCAML_URL/ocaml-3.11
$OCAML_URL/ocaml-3.11
"
S="${WORKDIR}/xen-${PV}"
@ -75,14 +75,14 @@ src_prepare() {
ls -ld stubdom/zlib-1.2.3.tar.gz
ls -ld stubdom/Makefile || die "stubdom/Makefile could not be adjusted"
sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \
sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \
-e 's:^\t$(WGET) $(NEWLIB_URL):#\t$(WGET) $(NEWLIB_URL):' \
-e 's:^\t$(WGET) $(ZLIB_URL):#\t$(WGET) $(ZLIB_URL):' \
-e 's:^\t$(WGET) $(LIBPCI_URL):#\t$(WGET) $(LIBPCI_URL):' \
-e 's:^\t$(WGET) $(OCAML_URL):#\t$(WGET) $(OCAML_URL):' \
-e 's:^\t$(WGET) $(GRUB_URL):#$(WGET) $(GRUB_URL):' \
-i stubdom/Makefile || die "stubdom/Makefile could not be adjusted"
einfo "1st Makefile adjusted"
einfo "1st Makefile adjusted"
}
src_compile() {

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild,v 1.3 2012/04/24 09:49:47 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild,v 1.4 2012/12/04 16:31:20 idella4 Exp $
EAPI="2"
@ -17,7 +17,7 @@ SRC_URI="
$LIBPCI_URL/pciutils-2.2.9.tar.bz2
$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
$OCAML_URL/ocaml-3.11
$OCAML_URL/ocaml-3.11
"
S="${WORKDIR}/xen-${PV}"
@ -73,7 +73,7 @@ src_prepare() {
einfo "files copied to stubdom"
sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \
sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \
-e 's:^\t$(WGET) $(NEWLIB_URL):#\t$(WGET) $(NEWLIB_URL):' \
-e 's:^\t$(WGET) $(ZLIB_URL):#\t$(WGET) $(ZLIB_URL):' \
-e 's:^\t$(WGET) $(LIBPCI_URL):#\t$(WGET) $(LIBPCI_URL):' \

@ -0,0 +1,110 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.0.ebuild,v 1.1 2012/12/04 16:31:20 idella4 Exp $
EAPI="4"
inherit flag-o-matic eutils multilib toolchain-funcs
XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
GRUB_URL=mirror://gnu-alpha/grub
SRC_URI="
http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
$GRUB_URL/grub-0.97.tar.gz
$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
$LIBPCI_URL/pciutils-2.2.9.tar.bz2
$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz"
S="${WORKDIR}/xen-${PV}"
DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
HOMEPAGE="http://xen.org/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="custom-cflags"
DEPEND="sys-devel/gettext
sys-devel/gcc"
RDEPEND="=app-emulation/xen-${PV}"
src_prepare() {
# 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 {} \;
fi
#Substitute for internal downloading
cp $DISTDIR/zlib-1.2.3.tar.gz \
$DISTDIR/pciutils-2.2.9.tar.bz2 \
$DISTDIR/lwip-1.3.0.tar.gz \
$DISTDIR/newlib-1.16.0.tar.gz \
$DISTDIR/grub-0.97.tar.gz \
./stubdom/ || die "files not coped to stubdom"
# Note: tip to patch grub gentoo style, for review soon. This is around 1/3.
# cp "${WORKDIR}"/patch/{00[3-6]_all_grub*,010_all_grub*,01[3-9]_all_grub*,0[6-7]0_all_grub*} \
# "${WORKDIR}"/patch/{110_all_grub*,300_all_grub*} \
# stubdom/grub.patches/ || die
einfo "files copied to stubdom"
# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
epatch "${FILESDIR}"/${P/-pvgrub/}-externals.patch
# Drop .config and Fix gcc-4.6
epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
}
src_compile() {
use custom-cflags || unset CFLAGS
if test-flag-CC -fno-strict-overflow; then
append-flags -fno-strict-overflow
fi
emake CC="$(tc-getCC)" LD="$(tc-getLD)" -C tools/include
# TODO; fix those -j1
if use x86; then
emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \
XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
elif use amd64; then
emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \
XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
if use multilib; then
multilib_toolchain_setup x86
emake -j1 XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
fi
fi
}
src_install() {
if use x86; then
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
fi
if use amd64; then
emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
if use multilib; then
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
fi
fi
}
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/"
}

@ -1,4 +1,7 @@
DIST ipxe-git-v1.0.0.tar.gz 1996881 SHA256 d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723 SHA512 6921fb857ca615899a5912d5590ca36b6f46daf828b85edc75461c08a189d9fed71ee74a82e42724da7a1355e45070d28a0a61694b3a4872c3554390e4bb4147 WHIRLPOOL 160e24eea479c9d67a8a5c7c5182864904ee594167f061adc40a3e74974197b6befe2ecdb76af1c101ff1a5697b060dae71dd3f9f969c8e18054526584d57031
DIST xen-3.4.2.tar.gz 11187726 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b SHA512 a957390e91fb371155e61900f65b5d686a45b636b1c9bad1a1d942697a338d819898b605d5c3ed2ebe4b846cadfb982e711f822ad7c9c7bd2eaa2e3cfb88a55b WHIRLPOOL b073a999951da0bab3d0e8e5327d4040882335cbcb6cf78d18eb550462c73d39bb6bf8e59856ccb230601c376b0937a542073aadececf92189d8d3de9970ed22
DIST ipxe.tar.gz 2867999 SHA256 632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c SHA512 c5cb1cdff40d2d71fd3e692a9d0efadf2aa17290daf5195391a1c81ddd9dfc913a8e44d5be2b12be85b2a5565ea31631c99c7053564f2fb2225c80ea0bb0e4a4 WHIRLPOOL 58b7459aaf7323968e2f4d1cdcb563a04a0ee40d7d0e8fc600495baf6914127fbbbcddfb66199cd9f462eb59565b3d1ae90a05b3c771b8f13c2d2dcb6070eebc
DIST seabios-0-20121121.tar.bz2 2199282 SHA256 f7f67181c6c0b4cea3a9db48e2569fdcbbc81b732a2f672079c42fb44153ee62 SHA512 4f886088ebaa911590b8cb19db5c5dbc8f1384d2d5a7c4bf04df083e177513b3123b1839dad744171670eded8b69ce092a774288aec1804d00aa32b1b6778599 WHIRLPOOL f2e62682d7213ee5eaecbc2590637ef36d9c86f746840c0ee758c0c153139f485032ea2cd098c87bb8a2b5f17f91375b8fb65599e3b71b45b1645df85a88887f
DIST xen-4.1.1.tar.gz 10355625 SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b SHA512 0ec84db28af5b1206392b44e2c135859b3393d9c0eb1109f6a983492ba70622a145a08efce54f2943495feb06291d3fd5df9cc8ffea51e6e42aa69450edc87f2 WHIRLPOOL 58d83e71ac0a942830311d7eb5ebc5a7b34b118001f6f607ea7e5d7a959bafd72c9b8b6d010144fdef7417a238382602d948007be90f9ebf583b4d18897344c0
DIST xen-4.1.2.tar.gz 10365786 SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d SHA512 8f50f238b0b474ec5556279cbd51d704b4365033f2541a5d0376f287b26b7e8f0193172041109d97bb76d35ace3adf71e12f89f5766ff79a8ea861e7282f00d7 WHIRLPOOL 93a4bdd05125ef722464ef682798191c8b3db7228cbc0a27bcbe7932a7776491f90e727e1fcc4a9e7ec3eada7f56c567c07ad61cdda2f514109f702800fe5566
DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0
DIST xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch 26848 SHA256 8654c4b587b350baaaea12cde3ef1737dc80088fba281556bf4c714fa4d8111f SHA512 1b2678f1cc0b4a9bf24b6b096ed40132a757594c1c5c877468d4cb0c2fba2193cc6bf5fb55d9a0f6cc81f1bf95913758c67898d8c4398210609a6e4412583df9 WHIRLPOOL 24d544c1c1d435879be8879a69eb096c451299a0d4e07c1407d6eaaa8910c2088f2ca0c618f8c6f02fbffbf745f06c9dd4faa5cc666a069e205a28024ddf77b4

@ -0,0 +1,28 @@
diff -ur xen-4.2.0.orig/tools/firmware/etherboot/Makefile xen-4.2.0/tools/firmware/etherboot/Makefile
--- tools/firmware/etherboot/Makefile 2012-09-17 18:21:18.000000000 +0800
+++ tools/firmware/etherboot/Makefile 2012-11-21 14:12:54.389536642 +0800
@@ -28,13 +28,6 @@
$(MAKE) -C $D/src bin/$(*F).rom
$T:
- if ! wget -O _$T $(IPXE_TARBALL_URL); then \
- $(GIT) clone $(IPXE_GIT_URL) $D.git; \
- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
- $(IPXE_GIT_TAG) | gzip >../_$T); \
- rm -rf $D.git; \
- fi
- mv _$T $T
$D/src/arch/i386/Makefile: $T Config
rm -rf $D
diff -ur xen-4.2.0.orig/tools/firmware/Makefile xen-4.2.0/tools/firmware/Makefile
--- tools/firmware/Makefile 2012-09-17 18:21:18.000000000 +0800
+++ tools/firmware/Makefile 2012-11-21 16:14:21.974868539 +0800
@@ -18,7 +18,6 @@
cp ovmf-makefile ovmf/Makefile;
seabios-dir:
- GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir
cp seabios-config seabios-dir/.config;
.PHONY: all

@ -0,0 +1,20 @@
diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile
--- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800
+++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800
@@ -14,13 +14,13 @@
.PHONY: blowfish.h
blowfish.h:
rm -f blowfish.bin
- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all
+ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all
(echo "static unsigned int blowfish32_code[] = {"; \
od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\
echo "};") >$@
rm -f blowfish.bin
ifeq ($(XEN_COMPILE_ARCH),x86_64)
- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all
+ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all
(echo "static unsigned int blowfish64_code[] = {"; \
od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\
echo "};") >>$@

@ -0,0 +1,37 @@
diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile xen-4.2.0/tools/qemu-xen-traditional/Makefile
--- tools/qemu-xen-traditional/Makefile 2012-09-07 00:05:30.000000000 +0800
+++ tools/qemu-xen-traditional/Makefile 2012-11-22 06:12:29.433599695 +0800
@@ -243,7 +243,7 @@
install: all $(if $(BUILD_DOCS),install-doc)
mkdir -p "$(DESTDIR)$(bindir)"
ifneq ($(TOOLS),)
- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
+ $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)"
endif
ifneq ($(BLOBS),)
mkdir -p "$(DESTDIR)$(datadir)"
diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile.target xen-4.2.0/tools/qemu-xen-traditional/Makefile.target
--- tools/qemu-xen-traditional/Makefile.target 2012-09-07 00:05:30.000000000 +0800
+++ tools/qemu-xen-traditional/Makefile.target 2012-11-22 06:26:45.302521231 +0800
@@ -755,7 +755,7 @@
install: all install-hook
ifneq ($(PROGS),)
- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
+ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
endif
# Include automatically generated dependency files
diff -ur xen-4.2.0.orig/tools/qemu-xen/Makefile.target xen-4.2.0/tools/qemu-xen/Makefile.target
--- tools/qemu-xen/Makefile.target 2012-09-11 02:10:52.000000000 +0800
+++ tools/qemu-xen/Makefile.target 2012-11-22 07:13:38.894263291 +0800
@@ -437,9 +437,6 @@
install: all
ifneq ($(PROGS),)
$(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
-ifneq ($(STRIP),)
- $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS))
-endif
endif
ifdef CONFIG_TRACE_SYSTEMTAP
ifdef CONFIG_TRACE_SYSTEMTAP

@ -1,21 +0,0 @@
diff -urN xen-3.3.1/tools/ioemu-qemu-xen/xen-setup xen-3.3.1-fix/tools/ioemu-qemu-xen/xen-setup
--- xen-3.3.1/tools/ioemu-qemu-xen/xen-setup 2009-01-05 04:36:22.000000000 -0700
+++ xen-3.3.1-fix/tools/ioemu-qemu-xen/xen-setup 2009-04-25 17:55:03.000000000 -0600
@@ -3,6 +3,8 @@
# git-clean -x -d && ./xen-setup && make prefix=/usr CMDLINE_CFLAGS='-O0 -g' -j4 && make install DESTDIR=`pwd`/dist/ prefix=/usr && rsync -a --stats --delete . thule:shadow/qemu-iwj.git/ && rsync -a --stats dist/. root@thule:/
+target=i386-dm
+
rm -f $target/Makefile
rm -f $target/config.mak
rm -f config-host.mak
@@ -11,8 +13,6 @@
./configure --disable-gfx-check --disable-gcc-check --disable-curses --disable-slirp "$@" --prefix=/usr
-target=i386-dm
-
if [ "x$XEN_ROOT" != x ]; then
echo "XEN_ROOT=$XEN_ROOT" >>config-host.mak
fi

@ -1,16 +0,0 @@
--- tools/blktap/lib/blktaplib.h.orig 2011-09-21 19:29:30.240868534 +0800
+++ tools/blktap/lib/blktaplib.h 2011-09-21 19:34:21.184868372 +0800
@@ -195,8 +195,13 @@
pid_t pid;
} msg_pid_t;
+#ifndef READ
#define READ 0
+#endif
+
+#ifndef WRITE
#define WRITE 1
+#endif
/*Control Messages between manager and tapdev*/
#define CTLMSG_PARAMS 1

@ -1,28 +0,0 @@
--- ./tools/blktap/drivers/blktapctrl.c 2011-09-20 00:27:01.846896986 +0800
+++ ./tools/blktap/drivers/blktapctrl.c 2011-09-20 00:29:09.910897067 +0800
@@ -40,6 +40,7 @@
#include <err.h>
#include <errno.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/wait.h>
#include <signal.h>
#include <fcntl.h>
--- ./tools/blktap/drivers/block-qcow2.c 2011-09-22 04:15:49.339854677 +0800
+++ ./tools/blktap/drivers/block-qcow2.c 2009-11-10 23:12:55.000000000 +0800
@@ -26,6 +26,7 @@
#include "aes.h"
#include <assert.h>
#include <stdint.h>
+#include <sys/stat.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
--- ./tools/ioemu-qemu-xen/block-qcow2.c 2011-09-19 23:43:40.005898352 +0800
+++ ./tools/ioemu-qemu-xen/block-qcow2.c 2011-09-19 23:26:53.979898723 +0800
@@ -26,6 +26,7 @@
#include <zlib.h>
#include "aes.h"
#include <assert.h>
+#include <sys/stat.h>

@ -1,31 +0,0 @@
--- ./tools/fs-back/Makefile 2011-09-26 23:14:30.454759297 +0800
+++ ./tools/fs-back/Makefile 2011-09-27 16:37:57.445748680 +0800
@@ -23,7 +23,7 @@
all: $(IBIN)
fs-backend: $(OBJS) fs-backend.c
- $(CC) $(CFLAGS) -o fs-backend $(OBJS) $(LIBS) fs-backend.c
+ $(CC) $(CFLAGS) $(LDFLAGS) -o fs-backend $(OBJS) $(LIBS) fs-backend.c
install: all
$(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR)
--- ./tools/libfsimage/common/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ ./tools/libfsimage/common/Makefile 2011-09-27 16:41:16.516748626 +0800
@@ -6,7 +6,7 @@
LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
-LDFLAGS = $(LDFLAGS-y)
+#LDFLAGS = $(LDFLAGS-y)
LIB_SRCS-y = fsimage.c fsimage_plugin.c fsimage_grub.c
--- ./tools/misc/lomount/Makefile 2011-09-27 14:23:26.596752233 +0800
+++ ./tools/misc/lomount/Makefile 2011-09-27 16:37:57.445748680 +0800
@@ -23,5 +23,5 @@
$(RM) *.a *.so *.o *.rpm $(BIN)
%: %.c $(HDRS) Makefile
- $(CC) $(CFLAGS) -o $@ $<
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<

@ -1,257 +0,0 @@
Only in xen-3.4.2/: cflags.sh
diff -ur xen-3.4.2.orig//config/StdGNU.mk xen-3.4.2//config/StdGNU.mk
--- xen-3.4.2.orig//config/StdGNU.mk 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//config/StdGNU.mk 2011-09-26 02:18:14.630771549 +0800
@@ -48,7 +48,7 @@
SHLIB_CFLAGS = -shared
ifneq ($(debug),y)
-CFLAGS += -O2 -fomit-frame-pointer
+CFLAGS += -fomit-frame-pointer
else
# Less than -O1 produces bad code and large stack frames
CFLAGS += -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls
diff -ur xen-3.4.2.orig//config/SunOS.mk xen-3.4.2//config/SunOS.mk
--- xen-3.4.2.orig//config/SunOS.mk 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//config/SunOS.mk 2011-09-26 02:18:14.640771549 +0800
@@ -45,7 +45,7 @@
SHLIB_CFLAGS = -R $(SunOS_LIBDIR) -shared
ifneq ($(debug),y)
-CFLAGS += -O2 -fno-omit-frame-pointer
+CFLAGS += -fno-omit-frame-pointer
else
# Less than -O1 produces bad code and large stack frames
CFLAGS += -O1 -fno-omit-frame-pointer
diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk
--- xen-3.4.2.orig//Config.mk 2011-09-26 02:17:29.221771569 +0800
+++ xen-3.4.2//Config.mk 2011-09-26 02:18:14.686771549 +0800
@@ -14,7 +14,7 @@
# Tools to run on system hosting the build
HOSTCC = gcc
-HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCFLAGS = -Wall -Wstrict-prototypes -fomit-frame-pointer
HOSTCFLAGS += -fno-strict-aliasing
DISTDIR ?= $(XEN_ROOT)/dist
diff -ur xen-3.4.2.orig//extras/mini-os/arch/ia64/arch.mk xen-3.4.2//extras/mini-os/arch/ia64/arch.mk
--- xen-3.4.2.orig//extras/mini-os/arch/ia64/arch.mk 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//extras/mini-os/arch/ia64/arch.mk 2011-09-26 02:18:14.689771549 +0800
@@ -1,8 +1,8 @@
ARCH_CFLAGS := -mfixed-range=f2-f5,f12-f15,f32-f127 -mconstant-gp
-ARCH_CFLAGS += -O2
+#ARCH_CFLAGS += -O2
ARCH_ASFLAGS := -x assembler-with-cpp
-ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127 -fomit-frame-pointer
+ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127
ARCH_ASFLAGS += -fno-builtin -fno-common -fno-strict-aliasing -mconstant-gp
ARCH_LDFLAGS = -warn-common
diff -ur xen-3.4.2.orig//stubdom/grub.patches/00cvs xen-3.4.2//stubdom/grub.patches/00cvs
--- xen-3.4.2.orig//stubdom/grub.patches/00cvs 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//stubdom/grub.patches/00cvs 2011-09-26 02:18:14.549771549 +0800
@@ -223,8 +223,8 @@
+++ grub/configure.ac 2008-04-10 23:26:50.000000000 +0100
@@ -86,13 +86,13 @@ if test "x$ac_cv_prog_gcc" = xyes; then
fi
- STAGE1_CFLAGS="-O2"
- GRUB_CFLAGS="-O2"
+ STAGE1_CFLAGS=""
+ GRUB_CFLAGSS=""
- AC_CACHE_CHECK([whether optimization for size works], size_flag, [
+ AC_CACHE_CHECK([whether optimization for size works], grub_cv_cc_Os, [
saved_CFLAGS=$CFLAGS
@@ -237,7 +237,7 @@
+ if test "x$grub_cv_cc_Os" = xyes; then
STAGE2_CFLAGS="-Os"
else
- STAGE2_CFLAGS="-O2 -fno-strength-reduce -fno-unroll-loops"
+ STAGE2_CFLAGS=" -fno-strength-reduce -fno-unroll-loops"
@@ -100,16 +100,16 @@ if test "x$ac_cv_prog_gcc" = xyes; then
# OpenBSD has a GCC extension for protecting applications from
# stack smashing attacks, but GRUB doesn't want this feature.
diff -ur xen-3.4.2.orig//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure
--- xen-3.4.2.orig//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure 2011-09-26 02:24:37.261771380 +0800
@@ -1849,7 +1849,7 @@
GCC=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
+CFLAGS=""
echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
if test "${ac_cv_prog_cc_g+set}" = set; then
@@ -1898,15 +1898,15 @@
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
- CFLAGS="-g -O2"
+ CFLAGS=""
else
- CFLAGS="-g"
+ CFLAGS=""
fi
else
if test "$GCC" = yes; then
- CFLAGS="-O2"
+# CFLAGS="-O2"
else
- CFLAGS=
+ CFLAGS=""
fi
fi
echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
Only in xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver: configure~
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2011-09-26 02:17:29.223771569 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-26 02:22:14.583771444 +0800
@@ -464,7 +464,7 @@
# default flags for all hosts
-CFLAGS="$CFLAGS -O2 -g -fno-strict-aliasing"
+CFLAGS="$CFLAGS -g -fno-strict-aliasing"
CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
LDFLAGS="$LDFLAGS -g"
if test "$werror" = "yes" ; then
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/cris/Makefile xen-3.4.2//tools/ioemu-qemu-xen/tests/cris/Makefile
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/cris/Makefile 2009-11-05 19:44:56.000000000 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/cris/Makefile 2011-09-26 02:18:14.264771549 +0800
@@ -12,7 +12,7 @@
OBJCOPY = $(CROSS)objcopy
# we rely on GCC inline:ing the stuff we tell it to in many places here.
-CFLAGS = -Winline -Wall -g -O2 -static
+CFLAGS = -Winline -Wall -g -static
NOSTDFLAGS = -nostartfiles -nostdlib
ASFLAGS += -g -Wa,-I,$(SRC_PATH)/tests/cris/
LDLIBS =
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/hello-mips.c xen-3.4.2//tools/ioemu-qemu-xen/tests/hello-mips.c
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/hello-mips.c 2009-11-05 19:44:56.000000000 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/hello-mips.c 2011-09-26 02:18:14.669771549 +0800
@@ -6,7 +6,7 @@
* http://www.linux.com/howtos/Assembly-HOWTO/mips.shtml
*
* mipsel-linux-gcc -nostdlib -mno-abicalls -fno-PIC -mabi=32 \
-* -O2 -static -o hello-mips hello-mips.c
+* -static -o hello-mips hello-mips.c
*
*/
#define __NR_SYSCALL_BASE 4000
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/Makefile xen-3.4.2//tools/ioemu-qemu-xen/tests/Makefile
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/Makefile 2009-11-05 19:44:56.000000000 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/Makefile 2011-09-26 02:18:14.262771549 +0800
@@ -2,7 +2,7 @@
-include ../config-host.mak
VPATH=$(SRC_PATH)/tests
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
+CFLAGS=-Wall -g -fno-strict-aliasing
#CFLAGS+=-msse2
LDFLAGS=
@@ -52,7 +52,7 @@
.PHONY: test-mmap
test-mmap: test-mmap.c
- $(CC) $(CFLAGS) -Wall -static -O2 $(LDFLAGS) -o $@ $<
+ $(CC) $(CFLAGS) -Wall -static $(LDFLAGS) -o $@ $<
-./test-mmap
-$(QEMU) ./test-mmap
-$(QEMU) -p 8192 ./test-mmap 8192
@@ -88,17 +88,17 @@
arm-linux-ld -o $@ $<
hello-arm.o: hello-arm.c
- arm-linux-gcc -Wall -g -O2 -c -o $@ $<
+ arm-linux-gcc -Wall -g -c -o $@ $<
test-arm-iwmmxt: test-arm-iwmmxt.s
cpp < $< | arm-linux-gnu-gcc -Wall -static -march=iwmmxt -mabi=aapcs -x assembler - -o $@
# MIPS test
hello-mips: hello-mips.c
- mips-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $<
+ mips-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -o $@ $<
hello-mipsel: hello-mips.c
- mipsel-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $<
+ mipsel-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -o $@ $<
# testsuite for the CRIS port.
test-cris:
diff -ur xen-3.4.2.orig//tools/libaio/src/Makefile xen-3.4.2//tools/libaio/src/Makefile
--- xen-3.4.2.orig//tools/libaio/src/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/libaio/src/Makefile 2011-09-26 02:18:14.288771549 +0800
@@ -6,7 +6,7 @@
libdir=$(prefix)/lib
ARCH := $(shell uname -m | sed -e s/i.86/i386/)
-CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
+CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -fPIC
SO_CFLAGS=-shared $(CFLAGS)
L_CFLAGS=$(CFLAGS)
LINK_FLAGS=
diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist
--- xen-3.4.2.orig//tools/libxen/Makefile.dist 2011-09-26 02:17:29.223771569 +0800
+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-26 02:18:14.553771549 +0800
@@ -22,7 +22,7 @@
CFLAGS = -Iinclude \
$(shell xml2-config --cflags) \
$(shell curl-config --cflags) \
- -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC
+ -W -Wall -Wmissing-prototypes -std=c99 -fPIC
LDFLAGS = $(shell xml2-config --libs) \
$(shell curl-config --libs)
diff -ur xen-3.4.2.orig//tools/vnet/vnet-module/Makefile-2.4 xen-3.4.2//tools/vnet/vnet-module/Makefile-2.4
--- xen-3.4.2.orig//tools/vnet/vnet-module/Makefile-2.4 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/vnet/vnet-module/Makefile-2.4 2011-09-26 02:18:14.659771549 +0800
@@ -62,7 +62,7 @@
CFLAGS += -Wno-unused-parameter
CFLAGS += -g
-CFLAGS += -O2
+#CFLAGS += -O2
CFLAGS += -fno-strict-aliasing
CFLAGS += -fno-common
#CFLAGS += -fomit-frame-pointer
diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk
--- xen-3.4.2.orig//extras/mini-os/minios.mk 2011-09-26 02:29:41.869771248 +0800
+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-26 02:33:55.708771108 +0800
@@ -23,7 +23,7 @@
DEF_CFLAGS += -DGNT_DEBUG
DEF_CFLAGS += -DGNTMAP_DEBUG
else
-DEF_CFLAGS += -O3
+#DEF_CFLAGS += -O3
endif
# Make the headers define our internal stuff
diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile
--- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2011-09-26 02:29:41.872771248 +0800
+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-26 02:37:59.835771029 +0800
@@ -26,7 +26,7 @@
$(call cc-option-add,CFLAGS,CC,-fgnu89-inline)
CFLAGS += -fno-strict-aliasing
-CFLAGS += -O3
+#CFLAGS += -O3
#CFLAGS += -g
MAJOR := 3.0
diff -ur xen-3.4.2.orig//tools/vnet/vnetd/Makefile xen-3.4.2//tools/vnet/vnetd/Makefile
--- xen-3.4.2.orig//tools/vnet/vnetd/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/vnet/vnetd/Makefile 2011-09-26 02:37:59.834771029 +0800
@@ -44,7 +44,7 @@
CPPFLAGS += -D __ARCH_I386_ATOMIC__
#----------------------------------------------------------------------------
-CFLAGS += -O3
+#CFLAGS += -O3
CFLAGS += $(INCLUDES) $(LIBS)
LDFLAGS += $(LIBS)

@ -1,429 +0,0 @@
diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk
--- xen-3.4.2.orig//Config.mk 2009-11-10 23:16:03.000000000 +0800
+++ xen-3.4.2//Config.mk 2011-09-25 02:34:11.605793042 +0800
@@ -14,7 +14,7 @@
# Tools to run on system hosting the build
HOSTCC = gcc
-HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
HOSTCFLAGS += -fno-strict-aliasing
DISTDIR ?= $(XEN_ROOT)/dist
diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk
--- xen-3.4.2.orig//extras/mini-os/minios.mk 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-25 02:34:11.855793042 +0800
@@ -6,7 +6,7 @@
# Define some default flags.
# NB. '-Wcast-qual' is nasty, so I omitted it.
-DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
diff -ur xen-3.4.2.orig//tools/blktap/drivers/Makefile xen-3.4.2//tools/blktap/drivers/Makefile
--- xen-3.4.2.orig//tools/blktap/drivers/Makefile 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//tools/blktap/drivers/Makefile 2011-09-25 02:34:11.750793042 +0800
@@ -5,7 +5,7 @@
QCOW_UTIL = img2qcow qcow2raw qcow-create
LIBAIO_DIR = ../../libaio/src
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -Wno-unused
CFLAGS += -I../lib
CFLAGS += $(CFLAGS_libxenctrl)
diff -ur xen-3.4.2.orig//tools/blktap/lib/Makefile xen-3.4.2//tools/blktap/lib/Makefile
--- xen-3.4.2.orig//tools/blktap/lib/Makefile 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//tools/blktap/lib/Makefile 2011-09-25 02:34:11.748793042 +0800
@@ -13,7 +13,7 @@
SRCS :=
SRCS += xenbus.c blkif.c xs_api.c
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -Wno-unused
CFLAGS += -fPIC
# get asprintf():
diff -ur xen-3.4.2.orig//tools/console/Makefile xen-3.4.2//tools/console/Makefile
--- xen-3.4.2.orig//tools/console/Makefile 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//tools/console/Makefile 2011-09-25 02:34:11.704793042 +0800
@@ -2,7 +2,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += $(CFLAGS_libxenctrl)
CFLAGS += $(CFLAGS_libxenstore)
diff -ur xen-3.4.2.orig//tools/debugger/xenitp/Makefile xen-3.4.2//tools/debugger/xenitp/Makefile
--- xen-3.4.2.orig//tools/debugger/xenitp/Makefile 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//tools/debugger/xenitp/Makefile 2011-09-25 02:34:11.744793042 +0800
@@ -1,7 +1,7 @@
XEN_ROOT=../../..
include $(XEN_ROOT)/tools/Rules.mk
-#CFLAGS += -Werror -g -O0
+#CFLAGS += -g -O0
CFLAGS += $(CFLAGS_libxenctrl)
diff -ur xen-3.4.2.orig//tools/firmware/Rules.mk xen-3.4.2//tools/firmware/Rules.mk
--- xen-3.4.2.orig//tools/firmware/Rules.mk 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//tools/firmware/Rules.mk 2011-09-25 02:34:11.565793045 +0800
@@ -10,7 +10,7 @@
CFLAGS += -DNDEBUG
endif
-CFLAGS += -Werror
+CFLAGS +=
# Disable PIE/SSP if GCC supports them. They can break us.
$(call cc-option-add,CFLAGS,CC,-nopie)
diff -ur xen-3.4.2.orig//tools/flask/libflask/Makefile xen-3.4.2//tools/flask/libflask/Makefile
--- xen-3.4.2.orig//tools/flask/libflask/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/flask/libflask/Makefile 2011-09-25 02:34:11.657793042 +0800
@@ -9,7 +9,7 @@
SRCS :=
SRCS += flask_op.c
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -fno-strict-aliasing
CFLAGS += $(INCLUDES) -I./include -I$(XEN_LIBXC) -I$(XEN_INCLUDE)
diff -ur xen-3.4.2.orig//tools/flask/loadpolicy/Makefile xen-3.4.2//tools/flask/loadpolicy/Makefile
--- xen-3.4.2.orig//tools/flask/loadpolicy/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/flask/loadpolicy/Makefile 2011-09-25 02:34:11.660793042 +0800
@@ -6,7 +6,7 @@
LIBFLASK_ROOT = $(XEN_ROOT)/tools/flask/libflask
PROFILE=#-pg
-BASECFLAGS=-Wall -g -Werror
+BASECFLAGS=-Wall -g
BASECFLAGS+= $(PROFILE)
#BASECFLAGS+= -I$(XEN_ROOT)/tools
BASECFLAGS+= $(CFLAGS_libxenctrl)
diff -ur xen-3.4.2.orig//tools/fs-back/Makefile xen-3.4.2//tools/fs-back/Makefile
--- xen-3.4.2.orig//tools/fs-back/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/fs-back/Makefile 2011-09-25 02:34:11.637793042 +0800
@@ -5,7 +5,7 @@
IBIN = fs-backend
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -Wno-unused
CFLAGS += -fno-strict-aliasing
CFLAGS += $(CFLAGS_libxenctrl)
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2009-11-05 19:44:56.000000000 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-25 02:34:11.888793042 +0800
@@ -468,7 +468,7 @@
CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
LDFLAGS="$LDFLAGS -g"
if test "$werror" = "yes" ; then
-CFLAGS="$CFLAGS -Werror"
+CFLAGS="$CFLAGS"
fi
if test "$solaris" = "no" ; then
@@ -1150,7 +1150,7 @@
echo "sparse enabled $sparse"
echo "profiler $profiler"
echo "static build $static"
-echo "-Werror enabled $werror"
+
if test "$darwin" = "yes" ; then
echo "Cocoa support $cocoa"
fi
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:33:23.946793064 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:34:11.584793042 +0800
@@ -26,7 +26,7 @@
TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
-#CFLAGS+=-Werror
+#CFLAGS+=
LIBS=
# user emulator name
ifndef TARGET_ARCH2
diff -ur xen-3.4.2.orig//tools/libaio/harness/Makefile xen-3.4.2//tools/libaio/harness/Makefile
--- xen-3.4.2.orig//tools/libaio/harness/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/libaio/harness/Makefile 2011-09-25 02:34:11.674793042 +0800
@@ -4,7 +4,7 @@
HARNESS_SRCS:=main.c
# io_queue.c
-CFLAGS=-Wall -Werror -g -O -laio
+CFLAGS=-Wall -g -O -laio
#-lpthread -lrt
all: $(PROGS)
diff -ur xen-3.4.2.orig//tools/libfsimage/Rules.mk xen-3.4.2//tools/libfsimage/Rules.mk
--- xen-3.4.2.orig//tools/libfsimage/Rules.mk 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/libfsimage/Rules.mk 2011-09-25 02:34:11.566793044 +0800
@@ -1,6 +1,6 @@
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror
+CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/
LDFLAGS += -L../common/
PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
diff -ur xen-3.4.2.orig//tools/libxc/Makefile xen-3.4.2//tools/libxc/Makefile
--- xen-3.4.2.orig//tools/libxc/Makefile 2011-09-25 02:33:23.987793064 +0800
+++ xen-3.4.2//tools/libxc/Makefile 2011-09-25 02:34:11.687793042 +0800
@@ -52,7 +52,7 @@
-include $(XEN_TARGET_ARCH)/Makefile
-CFLAGS += -Werror -Wmissing-prototypes
+CFLAGS += -Wmissing-prototypes
CFLAGS += $(INCLUDES) -I. -I../xenstore -I../include
# Needed for posix_fadvise64() in xc_linux.c
diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist
--- xen-3.4.2.orig//tools/libxen/Makefile.dist 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-25 02:34:11.593793042 +0800
@@ -22,7 +22,7 @@
CFLAGS = -Iinclude \
$(shell xml2-config --cflags) \
$(shell curl-config --cflags) \
- -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC
+ -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC
LDFLAGS = $(shell xml2-config --libs) \
$(shell curl-config --libs)
diff -ur xen-3.4.2.orig//tools/misc/lomount/Makefile xen-3.4.2//tools/misc/lomount/Makefile
--- xen-3.4.2.orig//tools/misc/lomount/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/misc/lomount/Makefile 2011-09-25 02:34:11.666793042 +0800
@@ -1,7 +1,7 @@
XEN_ROOT=../../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
HDRS = $(wildcard *.h)
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
diff -ur xen-3.4.2.orig//tools/misc/Makefile xen-3.4.2//tools/misc/Makefile
--- xen-3.4.2.orig//tools/misc/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/misc/Makefile 2011-09-25 02:34:11.669793042 +0800
@@ -1,7 +1,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
INCLUDES += -I $(XEN_XC)
INCLUDES += -I $(XEN_LIBXC)
diff -ur xen-3.4.2.orig//tools/pygrub/setup.py xen-3.4.2//tools/pygrub/setup.py
--- xen-3.4.2.orig//tools/pygrub/setup.py 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/pygrub/setup.py 2011-09-25 02:34:11.901793042 +0800
@@ -3,7 +3,7 @@
import os
import sys
-extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
+extra_compile_args = [ "-fno-strict-aliasing" ]
XEN_ROOT = "../.."
diff -ur xen-3.4.2.orig//tools/python/setup.py xen-3.4.2//tools/python/setup.py
--- xen-3.4.2.orig//tools/python/setup.py 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/python/setup.py 2011-09-25 02:34:11.897793042 +0800
@@ -4,7 +4,7 @@
XEN_ROOT = "../.."
-extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
+extra_compile_args = [ "-fno-strict-aliasing" ]
include_dirs = [ XEN_ROOT + "/tools/libxc",
XEN_ROOT + "/tools/xenstore",
diff -ur xen-3.4.2.orig//tools/security/Makefile xen-3.4.2//tools/security/Makefile
--- xen-3.4.2.orig//tools/security/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/security/Makefile 2011-09-25 02:34:11.701793042 +0800
@@ -1,7 +1,7 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -fno-strict-aliasing
CFLAGS += -I. $(CFLAGS_libxenctrl)
diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile
--- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-25 02:34:11.694793042 +0800
@@ -25,7 +25,7 @@
PIC_OBJS := $(LIB_SRCS:.c=.opic)
$(call cc-option-add,CFLAGS,CC,-fgnu89-inline)
-CFLAGS += -Werror -fno-strict-aliasing
+CFLAGS += -fno-strict-aliasing
CFLAGS += -O3
#CFLAGS += -g
diff -ur xen-3.4.2.orig//tools/vtpm/Rules.mk xen-3.4.2//tools/vtpm/Rules.mk
--- xen-3.4.2.orig//tools/vtpm/Rules.mk 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/vtpm/Rules.mk 2011-09-25 02:34:11.563793044 +0800
@@ -9,7 +9,7 @@
TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
# General compiler flags
-CFLAGS = -Werror -g3 -I.
+CFLAGS = -g3 -I.
# Generic project files
HDRS = $(wildcard *.h)
diff -ur xen-3.4.2.orig//tools/vtpm_manager/Rules.mk xen-3.4.2//tools/vtpm_manager/Rules.mk
--- xen-3.4.2.orig//tools/vtpm_manager/Rules.mk 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/vtpm_manager/Rules.mk 2011-09-25 02:34:11.562793042 +0800
@@ -9,7 +9,7 @@
TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
# General compiler flags
-CFLAGS = -Werror -g3 -I.
+CFLAGS = -g3 -I.
# Generic project files
HDRS = $(wildcard *.h)
diff -ur xen-3.4.2.orig//tools/xcutils/Makefile xen-3.4.2//tools/xcutils/Makefile
--- xen-3.4.2.orig//tools/xcutils/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xcutils/Makefile 2011-09-25 02:34:11.636793042 +0800
@@ -11,7 +11,7 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
PROGRAMS = xc_restore xc_save readnotes lsevtchn
diff -ur xen-3.4.2.orig//tools/xenmon/Makefile xen-3.4.2//tools/xenmon/Makefile
--- xen-3.4.2.orig//tools/xenmon/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xenmon/Makefile 2011-09-25 02:34:11.641793042 +0800
@@ -13,7 +13,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -I $(XEN_XC)
CFLAGS += $(CFLAGS_libxenctrl)
LDFLAGS += $(LDFLAGS_libxenctrl)
diff -ur xen-3.4.2.orig//tools/xenpmd/Makefile xen-3.4.2//tools/xenpmd/Makefile
--- xen-3.4.2.orig//tools/xenpmd/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xenpmd/Makefile 2011-09-25 02:34:11.656793042 +0800
@@ -1,7 +1,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += $(CFLAGS_libxenstore)
LDFLAGS += $(LDFLAGS_libxenstore)
diff -ur xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile xen-3.4.2//tools/xenstat/libxenstat/Makefile
--- xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xenstat/libxenstat/Makefile 2011-09-25 02:34:11.681793042 +0800
@@ -34,7 +34,7 @@
OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o
SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
-WARN_FLAGS=-Wall -Werror
+WARN_FLAGS=-Wall
CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) -I$(XEN_INCLUDE)
LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/
diff -ur xen-3.4.2.orig//tools/xenstat/xentop/Makefile xen-3.4.2//tools/xenstat/xentop/Makefile
--- xen-3.4.2.orig//tools/xenstat/xentop/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xenstat/xentop/Makefile 2011-09-25 02:34:11.684793042 +0800
@@ -18,7 +18,7 @@
all install xentop:
else
-CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
+CFLAGS += -DGCC_PRINTF -Wall -I$(XEN_LIBXENSTAT)
LDFLAGS += -L$(XEN_LIBXENSTAT)
LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS)
CFLAGS += -DHOST_$(XEN_OS)
diff -ur xen-3.4.2.orig//tools/xenstore/Makefile xen-3.4.2//tools/xenstore/Makefile
--- xen-3.4.2.orig//tools/xenstore/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xenstore/Makefile 2011-09-25 02:34:11.640793042 +0800
@@ -4,7 +4,7 @@
MAJOR = 3.0
MINOR = 0
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -I.
CFLAGS += $(CFLAGS_libxenctrl)
diff -ur xen-3.4.2.orig//tools/xenstore/xenstored_core.c xen-3.4.2//tools/xenstore/xenstored_core.c
--- xen-3.4.2.orig//tools/xenstore/xenstored_core.c 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xenstore/xenstored_core.c 2011-09-25 02:34:11.845793042 +0800
@@ -865,7 +865,7 @@
{
unsigned int offset, datalen;
struct node *node;
- char *vec[1] = { NULL }; /* gcc4 + -W + -Werror fucks code. */
+ char *vec[1] = { NULL }; /* gcc4 + -W + fucks code. */
char *name;
/* Extra "strings" can be created by binary data. */
diff -ur xen-3.4.2.orig//tools/xentrace/Makefile xen-3.4.2//tools/xentrace/Makefile
--- xen-3.4.2.orig//tools/xentrace/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xentrace/Makefile 2011-09-25 02:34:11.745793042 +0800
@@ -1,7 +1,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += $(CFLAGS_libxenctrl)
LDFLAGS += $(LDFLAGS_libxenctrl)
Only in xen-3.4.2/: Werror.sh
diff -ur xen-3.4.2.orig//xen/arch/ia64/Rules.mk xen-3.4.2//xen/arch/ia64/Rules.mk
--- xen-3.4.2.orig//xen/arch/ia64/Rules.mk 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//xen/arch/ia64/Rules.mk 2011-09-25 02:34:11.570793042 +0800
@@ -68,7 +68,7 @@
CFLAGS += -DCONFIG_XEN_IA64_TLBFLUSH_CLOCK
endif
ifeq ($(no_warns),y)
-CFLAGS += -Wa,--fatal-warnings -Werror -Wno-uninitialized
+CFLAGS += -Wa,--fatal-warnings -Wno-uninitialized
endif
ifneq ($(vhpt_disable),y)
CFLAGS += -DVHPT_ENABLED=1
diff -ur xen-3.4.2.orig//xen/arch/x86/boot/build32.mk xen-3.4.2//xen/arch/x86/boot/build32.mk
--- xen-3.4.2.orig//xen/arch/x86/boot/build32.mk 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//xen/arch/x86/boot/build32.mk 2011-09-25 02:34:11.914793042 +0800
@@ -8,7 +8,7 @@
$(call cc-option-add,CFLAGS,CC,-fno-stack-protector)
$(call cc-option-add,CFLAGS,CC,-fno-stack-protector-all)
-CFLAGS += -Werror -fno-builtin -msoft-float
+CFLAGS += -fno-builtin -msoft-float
# NB. awk invocation is a portable alternative to 'head -n -1'
%.S: %.bin
diff -ur xen-3.4.2.orig//xen/arch/x86/Rules.mk xen-3.4.2//xen/arch/x86/Rules.mk
--- xen-3.4.2.orig//xen/arch/x86/Rules.mk 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//xen/arch/x86/Rules.mk 2011-09-25 02:34:11.572793042 +0800
@@ -17,7 +17,7 @@
endif
CFLAGS += -fno-builtin -fno-common
-CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
CFLAGS += -I$(BASEDIR)/include
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default

@ -1,731 +0,0 @@
# HG changeset patch
# User Keir Fraser <keir@xen.org>
# Date 1311171934 -3600
# Node ID 1976adbf2b807e505fdf0356c29ec0c0499ed533
# Parent 411b38f8f90bc042a9e6839b6840dd57cbee4a8c
hvmloader: Switch to absolute addressing for calling hypercall stubs.
This is clearer and less fragile than trying to make relative calls
work. In particular, the old approach failed if _start was not
== HVMLOADER_PHYSICAL_ADDRESS. This was the case for some modern
toolchains which reorder functions.
Signed-off-by: Keir Fraser <keir@xen.org>
xen-unstable changeset: 23730:dd5eecf739d1
xen-unstable date: Wed Jul 20 15:02:16 2011 +0100
hvmloader: Remove hard tabs from source files.
Signed-off-by: Keir Fraser <keir@xen.org>
xen-unstable changeset: 23729:4f1109af9c63
xen-unstable date: Wed Jul 20 14:52:16 2011 +0100
diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/hypercall.h
--- a/tools/firmware/hvmloader/hypercall.h Wed Jul 20 15:24:09 2011 +0100
+++ b/tools/firmware/hvmloader/hypercall.h Wed Jul 20 15:25:34 2011 +0100
@@ -35,147 +35,148 @@
#include <xen/xen.h>
#include "config.h"
-/*
- * NB. Hypercall address needs to be relative to a linkage symbol for
- * some version of ld to relocate the relative calls properly.
- */
-#define hypercall_pa "_start - " STR(HVMLOADER_PHYSICAL_ADDRESS) \
- " + " STR(HYPERCALL_PHYSICAL_ADDRESS)
+#define hcall_addr(name) \
+ ((unsigned long)HYPERCALL_PHYSICAL_ADDRESS + __HYPERVISOR_##name * 32)
-#define _hypercall0(type, name) \
-({ \
- long __res; \
- asm volatile ( \
- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
- : "=a" (__res) \
- : \
- : "memory" ); \
- (type)__res; \
+#define _hypercall0(type, name) \
+({ \
+ long __res; \
+ asm volatile ( \
+ "call *%%eax" \
+ : "=a" (__res) \
+ : "0" (hcall_addr(name)) \
+ : "memory" ); \
+ (type)__res; \
})
-#define _hypercall1(type, name, a1) \
-({ \
- long __res, __ign1; \
- asm volatile ( \
- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
- : "=a" (__res), "=b" (__ign1) \
- : "1" ((long)(a1)) \
- : "memory" ); \
- (type)__res; \
+#define _hypercall1(type, name, a1) \
+({ \
+ long __res, __ign1; \
+ asm volatile ( \
+ "call *%%eax" \
+ : "=a" (__res), "=b" (__ign1) \
+ : "0" (hcall_addr(name)), \
+ "1" ((long)(a1)) \
+ : "memory" ); \
+ (type)__res; \
})
-#define _hypercall2(type, name, a1, a2) \
-({ \
- long __res, __ign1, __ign2; \
- asm volatile ( \
- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
- : "=a" (__res), "=b" (__ign1), "=c" (__ign2) \
- : "1" ((long)(a1)), "2" ((long)(a2)) \
- : "memory" ); \
- (type)__res; \
+#define _hypercall2(type, name, a1, a2) \
+({ \
+ long __res, __ign1, __ign2; \
+ asm volatile ( \
+ "call *%%eax" \
+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2) \
+ : "0" (hcall_addr(name)), \
+ "1" ((long)(a1)), "2" ((long)(a2)) \
+ : "memory" ); \
+ (type)__res; \
})
-#define _hypercall3(type, name, a1, a2, a3) \
-({ \
- long __res, __ign1, __ign2, __ign3; \
- asm volatile ( \
- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
- "=d" (__ign3) \
- : "1" ((long)(a1)), "2" ((long)(a2)), \
- "3" ((long)(a3)) \
- : "memory" ); \
- (type)__res; \
+#define _hypercall3(type, name, a1, a2, a3) \
+({ \
+ long __res, __ign1, __ign2, __ign3; \
+ asm volatile ( \
+ "call *%%eax" \
+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
+ "=d" (__ign3) \
+ : "0" (hcall_addr(name)), \
+ "1" ((long)(a1)), "2" ((long)(a2)), \
+ "3" ((long)(a3)) \
+ : "memory" ); \
+ (type)__res; \
})
-#define _hypercall4(type, name, a1, a2, a3, a4) \
-({ \
- long __res, __ign1, __ign2, __ign3, __ign4; \
- asm volatile ( \
- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
- "=d" (__ign3), "=S" (__ign4) \
- : "1" ((long)(a1)), "2" ((long)(a2)), \
- "3" ((long)(a3)), "4" ((long)(a4)) \
- : "memory" ); \
- (type)__res; \
+#define _hypercall4(type, name, a1, a2, a3, a4) \
+({ \
+ long __res, __ign1, __ign2, __ign3, __ign4; \
+ asm volatile ( \
+ "call *%%eax" \
+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
+ "=d" (__ign3), "=S" (__ign4) \
+ : "0" (hcall_addr(name)), \
+ "1" ((long)(a1)), "2" ((long)(a2)), \
+ "3" ((long)(a3)), "4" ((long)(a4)) \
+ : "memory" ); \
+ (type)__res; \
})
-#define _hypercall5(type, name, a1, a2, a3, a4, a5) \
-({ \
- long __res, __ign1, __ign2, __ign3, __ign4, __ign5; \
- asm volatile ( \
- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
- "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) \
- : "1" ((long)(a1)), "2" ((long)(a2)), \
- "3" ((long)(a3)), "4" ((long)(a4)), \
- "5" ((long)(a5)) \
- : "memory" ); \
- (type)__res; \
+#define _hypercall5(type, name, a1, a2, a3, a4, a5) \
+({ \
+ long __res, __ign1, __ign2, __ign3, __ign4, __ign5; \
+ asm volatile ( \
+ "call *%%eax" \
+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
+ "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) \
+ : "0" (hcall_addr(name)), \
+ "1" ((long)(a1)), "2" ((long)(a2)), \
+ "3" ((long)(a3)), "4" ((long)(a4)), \
+ "5" ((long)(a5)) \
+ : "memory" ); \
+ (type)__res; \
})
static inline int
hypercall_sched_op(
- int cmd, void *arg)
+ int cmd, void *arg)
{
- return _hypercall2(int, sched_op, cmd, arg);
+ return _hypercall2(int, sched_op, cmd, arg);
}
static inline int
hypercall_memory_op(
- unsigned int cmd, void *arg)
+ unsigned int cmd, void *arg)
{
- return _hypercall2(int, memory_op, cmd, arg);
+ return _hypercall2(int, memory_op, cmd, arg);
}
static inline int
hypercall_multicall(
- void *call_list, int nr_calls)
+ void *call_list, int nr_calls)
{
- return _hypercall2(int, multicall, call_list, nr_calls);
+ return _hypercall2(int, multicall, call_list, nr_calls);
}
static inline int
hypercall_event_channel_op(
- int cmd, void *arg)
+ int cmd, void *arg)
{
- return _hypercall2(int, event_channel_op, cmd, arg);
+ return _hypercall2(int, event_channel_op, cmd, arg);
}
static inline int
hypercall_xen_version(
- int cmd, void *arg)
+ int cmd, void *arg)
{
- return _hypercall2(int, xen_version, cmd, arg);
+ return _hypercall2(int, xen_version, cmd, arg);
}
static inline int
hypercall_console_io(
- int cmd, int count, char *str)
+ int cmd, int count, char *str)
{
- return _hypercall3(int, console_io, cmd, count, str);
+ return _hypercall3(int, console_io, cmd, count, str);
}
static inline int
hypercall_vm_assist(
- unsigned int cmd, unsigned int type)
+ unsigned int cmd, unsigned int type)
{
- return _hypercall2(int, vm_assist, cmd, type);
+ return _hypercall2(int, vm_assist, cmd, type);
}
static inline int
hypercall_vcpu_op(
- int cmd, int vcpuid, void *extra_args)
+ int cmd, int vcpuid, void *extra_args)
{
- return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args);
+ return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args);
}
static inline int
hypercall_hvm_op(
- int cmd, void *arg)
+ int cmd, void *arg)
{
- return _hypercall2(int, hvm_op, cmd, arg);
+ return _hypercall2(int, hvm_op, cmd, arg);
}
#endif /* __HVMLOADER_HYPERCALL_H__ */
diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/pci_regs.h
--- a/tools/firmware/hvmloader/pci_regs.h Wed Jul 20 15:24:09 2011 +0100
+++ b/tools/firmware/hvmloader/pci_regs.h Wed Jul 20 15:25:34 2011 +0100
@@ -1,69 +1,69 @@
/*
- * pci_regs.h
+ * pci_regs.h
*
- * PCI standard defines
- * Copyright 1994, Drew Eckhardt
- * Copyright 1997--1999 Martin Mares <mj@ucw.cz>
+ * PCI standard defines
+ * Copyright 1994, Drew Eckhardt
+ * Copyright 1997--1999 Martin Mares <mj@ucw.cz>
*
- * For more information, please consult the following manuals (look at
- * http://www.pcisig.com/ for how to get them):
+ * For more information, please consult the following manuals (look at
+ * http://www.pcisig.com/ for how to get them):
*
- * PCI BIOS Specification
- * PCI Local Bus Specification
- * PCI to PCI Bridge Specification
- * PCI System Design Guide
+ * PCI BIOS Specification
+ * PCI Local Bus Specification
+ * PCI to PCI Bridge Specification
+ * PCI System Design Guide
*/
#ifndef __HVMLOADER_PCI_REGS_H__
#define __HVMLOADER_PCI_REGS_H__
-#define PCI_VENDOR_ID 0x00 /* 16 bits */
-#define PCI_DEVICE_ID 0x02 /* 16 bits */
-#define PCI_COMMAND 0x04 /* 16 bits */
-#define PCI_COMMAND_IO 0x1 /* Enable response in I/O space */
-#define PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space */
-#define PCI_COMMAND_MASTER 0x4 /* Enable bus mastering */
-#define PCI_COMMAND_SPECIAL 0x8 /* Enable response to special cycles */
-#define PCI_COMMAND_INVALIDATE 0x10 /* Use memory write and invalidate */
-#define PCI_COMMAND_VGA_PALETTE 0x20 /* Enable palette snooping */
-#define PCI_COMMAND_PARITY 0x40 /* Enable parity checking */
-#define PCI_COMMAND_WAIT 0x80 /* Enable address/data stepping */
-#define PCI_COMMAND_SERR 0x100 /* Enable SERR */
-#define PCI_COMMAND_FAST_BACK 0x200 /* Enable back-to-back writes */
+#define PCI_VENDOR_ID 0x00 /* 16 bits */
+#define PCI_DEVICE_ID 0x02 /* 16 bits */
+#define PCI_COMMAND 0x04 /* 16 bits */
+#define PCI_COMMAND_IO 0x1 /* Enable response in I/O space */
+#define PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space */
+#define PCI_COMMAND_MASTER 0x4 /* Enable bus mastering */
+#define PCI_COMMAND_SPECIAL 0x8 /* Enable response to special cycles */
+#define PCI_COMMAND_INVALIDATE 0x10 /* Use memory write and invalidate */
+#define PCI_COMMAND_VGA_PALETTE 0x20 /* Enable palette snooping */
+#define PCI_COMMAND_PARITY 0x40 /* Enable parity checking */
+#define PCI_COMMAND_WAIT 0x80 /* Enable address/data stepping */
+#define PCI_COMMAND_SERR 0x100 /* Enable SERR */
+#define PCI_COMMAND_FAST_BACK 0x200 /* Enable back-to-back writes */
#define PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */
-#define PCI_STATUS 0x06 /* 16 bits */
-#define PCI_STATUS_CAP_LIST 0x10 /* Support Capability List */
-#define PCI_STATUS_66MHZ 0x20 /* Support 66 Mhz PCI 2.1 bus */
-#define PCI_STATUS_UDF 0x40 /* Support User Definable Features [obsolete] */
-#define PCI_STATUS_FAST_BACK 0x80 /* Accept fast-back to back */
-#define PCI_STATUS_PARITY 0x100 /* Detected parity error */
-#define PCI_STATUS_DEVSEL_MASK 0x600 /* DEVSEL timing */
-#define PCI_STATUS_DEVSEL_FAST 0x000
-#define PCI_STATUS_DEVSEL_MEDIUM 0x200
-#define PCI_STATUS_DEVSEL_SLOW 0x400
-#define PCI_STATUS_SIG_TARGET_ABORT 0x800 /* Set on target abort */
-#define PCI_STATUS_REC_TARGET_ABORT 0x1000 /* Master ack of " */
-#define PCI_STATUS_REC_MASTER_ABORT 0x2000 /* Set on master abort */
-#define PCI_STATUS_SIG_SYSTEM_ERROR 0x4000 /* Set when we drive SERR */
-#define PCI_STATUS_DETECTED_PARITY 0x8000 /* Set on parity error */
+#define PCI_STATUS 0x06 /* 16 bits */
+#define PCI_STATUS_CAP_LIST 0x10 /* Support Capability List */
+#define PCI_STATUS_66MHZ 0x20 /* Support 66 Mhz PCI 2.1 bus */
+#define PCI_STATUS_UDF 0x40 /* Support User Definable Features [obsolete] */
+#define PCI_STATUS_FAST_BACK 0x80 /* Accept fast-back to back */
+#define PCI_STATUS_PARITY 0x100 /* Detected parity error */
+#define PCI_STATUS_DEVSEL_MASK 0x600 /* DEVSEL timing */
+#define PCI_STATUS_DEVSEL_FAST 0x000
+#define PCI_STATUS_DEVSEL_MEDIUM 0x200
+#define PCI_STATUS_DEVSEL_SLOW 0x400
+#define PCI_STATUS_SIG_TARGET_ABORT 0x800 /* Set on target abort */
+#define PCI_STATUS_REC_TARGET_ABORT 0x1000 /* Master ack of " */
+#define PCI_STATUS_REC_MASTER_ABORT 0x2000 /* Set on master abort */
+#define PCI_STATUS_SIG_SYSTEM_ERROR 0x4000 /* Set when we drive SERR */
+#define PCI_STATUS_DETECTED_PARITY 0x8000 /* Set on parity error */
-#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */
-#define PCI_REVISION_ID 0x08 /* Revision ID */
-#define PCI_CLASS_PROG 0x09 /* Reg. Level Programming Interface */
-#define PCI_CLASS_DEVICE 0x0a /* Device class */
+#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */
+#define PCI_REVISION_ID 0x08 /* Revision ID */
+#define PCI_CLASS_PROG 0x09 /* Reg. Level Programming Interface */
+#define PCI_CLASS_DEVICE 0x0a /* Device class */
-#define PCI_CACHE_LINE_SIZE 0x0c /* 8 bits */
-#define PCI_LATENCY_TIMER 0x0d /* 8 bits */
-#define PCI_HEADER_TYPE 0x0e /* 8 bits */
-#define PCI_HEADER_TYPE_NORMAL 0
-#define PCI_HEADER_TYPE_BRIDGE 1
-#define PCI_HEADER_TYPE_CARDBUS 2
+#define PCI_CACHE_LINE_SIZE 0x0c /* 8 bits */
+#define PCI_LATENCY_TIMER 0x0d /* 8 bits */
+#define PCI_HEADER_TYPE 0x0e /* 8 bits */
+#define PCI_HEADER_TYPE_NORMAL 0
+#define PCI_HEADER_TYPE_BRIDGE 1
+#define PCI_HEADER_TYPE_CARDBUS 2
-#define PCI_BIST 0x0f /* 8 bits */
-#define PCI_BIST_CODE_MASK 0x0f /* Return result */
-#define PCI_BIST_START 0x40 /* 1 to start BIST, 2 secs or less */
-#define PCI_BIST_CAPABLE 0x80 /* 1 if BIST capable */
+#define PCI_BIST 0x0f /* 8 bits */
+#define PCI_BIST_CODE_MASK 0x0f /* Return result */
+#define PCI_BIST_START 0x40 /* 1 to start BIST, 2 secs or less */
+#define PCI_BIST_CAPABLE 0x80 /* 1 if BIST capable */
/*
* Base addresses specify locations in memory or I/O space.
@@ -71,38 +71,38 @@
* 0xffffffff to the register, and reading it back. Only
* 1 bits are decoded.
*/
-#define PCI_BASE_ADDRESS_0 0x10 /* 32 bits */
-#define PCI_BASE_ADDRESS_1 0x14 /* 32 bits [htype 0,1 only] */
-#define PCI_BASE_ADDRESS_2 0x18 /* 32 bits [htype 0 only] */
-#define PCI_BASE_ADDRESS_3 0x1c /* 32 bits */
-#define PCI_BASE_ADDRESS_4 0x20 /* 32 bits */
-#define PCI_BASE_ADDRESS_5 0x24 /* 32 bits */
-#define PCI_BASE_ADDRESS_SPACE 0x01 /* 0 = memory, 1 = I/O */
-#define PCI_BASE_ADDRESS_SPACE_IO 0x01
-#define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00
-#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06
-#define PCI_BASE_ADDRESS_MEM_TYPE_32 0x00 /* 32 bit address */
-#define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 /* Below 1M [obsolete] */
-#define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */
-#define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */
-#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL)
-#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL)
+#define PCI_BASE_ADDRESS_0 0x10 /* 32 bits */
+#define PCI_BASE_ADDRESS_1 0x14 /* 32 bits [htype 0,1 only] */
+#define PCI_BASE_ADDRESS_2 0x18 /* 32 bits [htype 0 only] */
+#define PCI_BASE_ADDRESS_3 0x1c /* 32 bits */
+#define PCI_BASE_ADDRESS_4 0x20 /* 32 bits */
+#define PCI_BASE_ADDRESS_5 0x24 /* 32 bits */
+#define PCI_BASE_ADDRESS_SPACE 0x01 /* 0 = memory, 1 = I/O */
+#define PCI_BASE_ADDRESS_SPACE_IO 0x01
+#define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00
+#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06
+#define PCI_BASE_ADDRESS_MEM_TYPE_32 0x00 /* 32 bit address */
+#define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 /* Below 1M [obsolete] */
+#define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */
+#define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */
+#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL)
+#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL)
/* bit 1 is reserved if address_space = 1 */
/* Header type 0 (normal devices) */
-#define PCI_CARDBUS_CIS 0x28
-#define PCI_SUBSYSTEM_VENDOR_ID 0x2c
-#define PCI_SUBSYSTEM_ID 0x2e
-#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */
-#define PCI_ROM_ADDRESS_ENABLE 0x01
-#define PCI_ROM_ADDRESS_MASK (~0x7ffUL)
+#define PCI_CARDBUS_CIS 0x28
+#define PCI_SUBSYSTEM_VENDOR_ID 0x2c
+#define PCI_SUBSYSTEM_ID 0x2e
+#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */
+#define PCI_ROM_ADDRESS_ENABLE 0x01
+#define PCI_ROM_ADDRESS_MASK (~0x7ffUL)
-#define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */
+#define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */
/* 0x35-0x3b are reserved */
-#define PCI_INTERRUPT_LINE 0x3c /* 8 bits */
-#define PCI_INTERRUPT_PIN 0x3d /* 8 bits */
-#define PCI_MIN_GNT 0x3e /* 8 bits */
-#define PCI_MAX_LAT 0x3f /* 8 bits */
+#define PCI_INTERRUPT_LINE 0x3c /* 8 bits */
+#define PCI_INTERRUPT_PIN 0x3d /* 8 bits */
+#define PCI_MIN_GNT 0x3e /* 8 bits */
+#define PCI_MAX_LAT 0x3f /* 8 bits */
#endif /* __HVMLOADER_PCI_REGS_H__ */
diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/smbios_types.h
--- a/tools/firmware/hvmloader/smbios_types.h Wed Jul 20 15:24:09 2011 +0100
+++ b/tools/firmware/hvmloader/smbios_types.h Wed Jul 20 15:25:34 2011 +0100
@@ -32,157 +32,157 @@
between 0xf0000 and 0xfffff.
*/
struct smbios_entry_point {
- char anchor_string[4];
- uint8_t checksum;
- uint8_t length;
- uint8_t smbios_major_version;
- uint8_t smbios_minor_version;
- uint16_t max_structure_size;
- uint8_t entry_point_revision;
- uint8_t formatted_area[5];
- char intermediate_anchor_string[5];
- uint8_t intermediate_checksum;
- uint16_t structure_table_length;
- uint32_t structure_table_address;
- uint16_t number_of_structures;
- uint8_t smbios_bcd_revision;
+ char anchor_string[4];
+ uint8_t checksum;
+ uint8_t length;
+ uint8_t smbios_major_version;
+ uint8_t smbios_minor_version;
+ uint16_t max_structure_size;
+ uint8_t entry_point_revision;
+ uint8_t formatted_area[5];
+ char intermediate_anchor_string[5];
+ uint8_t intermediate_checksum;
+ uint16_t structure_table_length;
+ uint32_t structure_table_address;
+ uint16_t number_of_structures;
+ uint8_t smbios_bcd_revision;
} __attribute__ ((packed));
/* This goes at the beginning of every SMBIOS structure. */
struct smbios_structure_header {
- uint8_t type;
- uint8_t length;
- uint16_t handle;
+ uint8_t type;
+ uint8_t length;
+ uint16_t handle;
} __attribute__ ((packed));
/* SMBIOS type 0 - BIOS Information */
struct smbios_type_0 {
- struct smbios_structure_header header;
- uint8_t vendor_str;
- uint8_t version_str;
- uint16_t starting_address_segment;
- uint8_t release_date_str;
- uint8_t rom_size;
- uint8_t characteristics[8];
- uint8_t characteristics_extension_bytes[2];
- uint8_t major_release;
- uint8_t minor_release;
- uint8_t embedded_controller_major;
- uint8_t embedded_controller_minor;
+ struct smbios_structure_header header;
+ uint8_t vendor_str;
+ uint8_t version_str;
+ uint16_t starting_address_segment;
+ uint8_t release_date_str;
+ uint8_t rom_size;
+ uint8_t characteristics[8];
+ uint8_t characteristics_extension_bytes[2];
+ uint8_t major_release;
+ uint8_t minor_release;
+ uint8_t embedded_controller_major;
+ uint8_t embedded_controller_minor;
} __attribute__ ((packed));
/* SMBIOS type 1 - System Information */
struct smbios_type_1 {
- struct smbios_structure_header header;
- uint8_t manufacturer_str;
- uint8_t product_name_str;
- uint8_t version_str;
- uint8_t serial_number_str;
- uint8_t uuid[16];
- uint8_t wake_up_type;
- uint8_t sku_str;
- uint8_t family_str;
+ struct smbios_structure_header header;
+ uint8_t manufacturer_str;
+ uint8_t product_name_str;
+ uint8_t version_str;
+ uint8_t serial_number_str;
+ uint8_t uuid[16];
+ uint8_t wake_up_type;
+ uint8_t sku_str;
+ uint8_t family_str;
} __attribute__ ((packed));
/* SMBIOS type 3 - System Enclosure */
struct smbios_type_3 {
- struct smbios_structure_header header;
- uint8_t manufacturer_str;
- uint8_t type;
- uint8_t version_str;
- uint8_t serial_number_str;
- uint8_t asset_tag_str;
- uint8_t boot_up_state;
- uint8_t power_supply_state;
- uint8_t thermal_state;
- uint8_t security_status;
+ struct smbios_structure_header header;
+ uint8_t manufacturer_str;
+ uint8_t type;
+ uint8_t version_str;
+ uint8_t serial_number_str;
+ uint8_t asset_tag_str;
+ uint8_t boot_up_state;
+ uint8_t power_supply_state;
+ uint8_t thermal_state;
+ uint8_t security_status;
} __attribute__ ((packed));
/* SMBIOS type 4 - Processor Information */
struct smbios_type_4 {
- struct smbios_structure_header header;
- uint8_t socket_designation_str;
- uint8_t processor_type;
- uint8_t processor_family;
- uint8_t manufacturer_str;
- uint32_t cpuid[2];
- uint8_t version_str;
- uint8_t voltage;
- uint16_t external_clock;
- uint16_t max_speed;
- uint16_t current_speed;
- uint8_t status;
- uint8_t upgrade;
+ struct smbios_structure_header header;
+ uint8_t socket_designation_str;
+ uint8_t processor_type;
+ uint8_t processor_family;
+ uint8_t manufacturer_str;
+ uint32_t cpuid[2];
+ uint8_t version_str;
+ uint8_t voltage;
+ uint16_t external_clock;
+ uint16_t max_speed;
+ uint16_t current_speed;
+ uint8_t status;
+ uint8_t upgrade;
} __attribute__ ((packed));
/* SMBIOS type 11 - OEM Strings */
struct smbios_type_11 {
- struct smbios_structure_header header;
- uint8_t count;
+ struct smbios_structure_header header;
+ uint8_t count;
} __attribute__ ((packed));
/* SMBIOS type 16 - Physical Memory Array
* Associated with one type 17 (Memory Device).
*/
struct smbios_type_16 {
- struct smbios_structure_header header;
- uint8_t location;
- uint8_t use;
- uint8_t error_correction;
- uint32_t maximum_capacity;
- uint16_t memory_error_information_handle;
- uint16_t number_of_memory_devices;
+ struct smbios_structure_header header;
+ uint8_t location;
+ uint8_t use;
+ uint8_t error_correction;
+ uint32_t maximum_capacity;
+ uint16_t memory_error_information_handle;
+ uint16_t number_of_memory_devices;
} __attribute__ ((packed));
/* SMBIOS type 17 - Memory Device
* Associated with one type 19
*/
struct smbios_type_17 {
- struct smbios_structure_header header;
- uint16_t physical_memory_array_handle;
- uint16_t memory_error_information_handle;
- uint16_t total_width;
- uint16_t data_width;
- uint16_t size;
- uint8_t form_factor;
- uint8_t device_set;
- uint8_t device_locator_str;
- uint8_t bank_locator_str;
- uint8_t memory_type;
- uint16_t type_detail;
+ struct smbios_structure_header header;
+ uint16_t physical_memory_array_handle;
+ uint16_t memory_error_information_handle;
+ uint16_t total_width;
+ uint16_t data_width;
+ uint16_t size;
+ uint8_t form_factor;
+ uint8_t device_set;
+ uint8_t device_locator_str;
+ uint8_t bank_locator_str;
+ uint8_t memory_type;
+ uint16_t type_detail;
} __attribute__ ((packed));
/* SMBIOS type 19 - Memory Array Mapped Address */
struct smbios_type_19 {
- struct smbios_structure_header header;
- uint32_t starting_address;
- uint32_t ending_address;
- uint16_t memory_array_handle;
- uint8_t partition_width;
+ struct smbios_structure_header header;
+ uint32_t starting_address;
+ uint32_t ending_address;
+ uint16_t memory_array_handle;
+ uint8_t partition_width;
} __attribute__ ((packed));
/* SMBIOS type 20 - Memory Device Mapped Address */
struct smbios_type_20 {
- struct smbios_structure_header header;
- uint32_t starting_address;
- uint32_t ending_address;
- uint16_t memory_device_handle;
- uint16_t memory_array_mapped_address_handle;
- uint8_t partition_row_position;
- uint8_t interleave_position;
- uint8_t interleaved_data_depth;
+ struct smbios_structure_header header;
+ uint32_t starting_address;
+ uint32_t ending_address;
+ uint16_t memory_device_handle;
+ uint16_t memory_array_mapped_address_handle;
+ uint8_t partition_row_position;
+ uint8_t interleave_position;
+ uint8_t interleaved_data_depth;
} __attribute__ ((packed));
/* SMBIOS type 32 - System Boot Information */
struct smbios_type_32 {
- struct smbios_structure_header header;
- uint8_t reserved[6];
- uint8_t boot_status;
+ struct smbios_structure_header header;
+ uint8_t reserved[6];
+ uint8_t boot_status;
} __attribute__ ((packed));
/* SMBIOS type 127 -- End-of-table */
struct smbios_type_127 {
- struct smbios_structure_header header;
+ struct smbios_structure_header header;
} __attribute__ ((packed));
#endif /* SMBIOS_TYPES_H */
diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/util.c
--- a/tools/firmware/hvmloader/util.c Wed Jul 20 15:24:09 2011 +0100
+++ b/tools/firmware/hvmloader/util.c Wed Jul 20 15:25:34 2011 +0100
@@ -125,11 +125,11 @@
int strncmp(const char *s1, const char *s2, uint32_t n)
{
- uint32_t ctr;
- for (ctr = 0; ctr < n; ctr++)
- if (s1[ctr] != s2[ctr])
- return (int)(s1[ctr] - s2[ctr]);
- return 0;
+ uint32_t ctr;
+ for (ctr = 0; ctr < n; ctr++)
+ if (s1[ctr] != s2[ctr])
+ return (int)(s1[ctr] - s2[ctr]);
+ return 0;
}
void *memcpy(void *dest, const void *src, unsigned n)

@ -3,16 +3,13 @@
<pkgmetadata>
<herd>xen</herd>
<maintainer>
<email>johneed@hotmail.com</email>
<email>idella4@gentoo.org</email>
<name>Ian 'idella4' Delaney</name>
<description>Proxy maintainer</description>
</maintainer>
<use>
<flag name='acm'>Enable the ACM/sHype XSM module from IBM for xen-3</flag>
<flag name='api'>Build the C libxenapi bindings</flag>
<flag name='flask'>Enable the Flask XSM module from NSA</flag>
<flag name='hvm'>Enable support for hardware based virtualization (VT-x,AMD-v)</flag>
<flag name='ioemu'>Enable IOEMU support</flag>
<flag name='qemu'>Enable IOEMU support via the use of qemu-dm</flag>
<flag name='pygrub'>Install the pygrub boot loader</flag>
<flag name='screen'>Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag>

@ -1,241 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild,v 1.5 2012/12/02 22:48:42 ssuominen Exp $
EAPI="3"
inherit base flag-o-matic eutils multilib python
# TPMEMUFILE=tpm_emulator-0.4.tar.gz
DESCRIPTION="Xend daemon and tools"
HOMEPAGE="http://xen.org/"
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
# vtpm? ( mirror://berlios/tpm-emulator/${TPMEMUFILE} )"
S="${WORKDIR}/xen-${PV}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="doc debug screen custom-cflags pygrub hvm api acm flask"
CDEPEND="dev-lang/python[ncurses,threads]
sys-libs/zlib
hvm? ( media-libs/libsdl )
acm? ( dev-libs/libxml2 )
api? ( dev-libs/libxml2 net-misc/curl )"
# vtpm? ( dev-libs/gmp dev-libs/openssl )
DEPEND="${CDEPEND}
sys-devel/gettext
sys-devel/gcc
dev-lang/perl
dev-lang/python[ssl]
app-misc/pax-utils
doc? (
app-doc/doxygen
dev-tex/latex2html[png,gif]
dev-texlive/texlive-latexextra
media-gfx/transfig
media-gfx/graphviz
)
hvm? (
x11-proto/xproto
sys-devel/dev86
)"
RDEPEND="${CDEPEND}
sys-apps/iproute2
net-misc/bridge-utils
dev-python/pyxml
screen? (
app-misc/screen
app-admin/logrotate
)
|| ( virtual/udev sys-apps/hotplug )"
PATCHES=(
"${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
"${FILESDIR}/${PN}-3.3.0-nostrip.patch"
"${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch"
"${FILESDIR}/${P}-as-needed.patch"
"${FILESDIR}/${P}-fix-definitions.patch"
"${FILESDIR}/${P}-fix-include.patch"
"${FILESDIR}/${P}-werror-idiocy-v2.patch"
)
# hvmloader is used to bootstrap a fully virtualized kernel
# Approved by QA team in bug #144032
QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32
usr/share/xen/qemu/openbios-sparc64"
pkg_setup() {
export "CONFIG_LOMOUNT=y"
if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
eerror "an amd64 multilib profile is required. Remove the hvm use flag"
eerror "to build xen-tools on your current profile."
die "USE=hvm is unsupported on this system."
fi
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
# use vtpm && export "VTPM_TOOLS=y"
use api && export "LIBXENAPI_BINDINGS=y"
use acm && export "ACM_SECURITY=y"
use flask && export "FLASK_ENABLE=y"
}
src_prepare() {
base_src_prepare
# use vtpm && cp "${DISTDIR}"/${TPMEMUFILE} tools/vtpm
# 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 {} \;
fi
# Disable hvm support on systems that don't support x86_32 binaries.
if ! use hvm; then
chmod 644 tools/check/check_x11_devel
sed -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk
sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile
fi
if ! use pygrub; then
sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile
fi
sed -e '/texi2html/ s/-number/&-sections/' \
-i tools/ioemu-qemu-xen/Makefile || die #409333
}
src_compile() {
export VARTEXFONTS="${T}/fonts"
local myopt
use debug && myopt="${myopt} debug=y"
use custom-cflags || unset CFLAGS
if test-flag-CC -fno-strict-overflow; then
append-flags -fno-strict-overflow
fi
emake -C tools ${myopt} || die "compile failed"
if use doc; then
sh ./docs/check_pkgs || die "package check failed"
emake docs || die "compiling docs failed"
emake dev-docs || die "make dev-docs failed"
fi
emake -C docs man-pages || die "make man-pages failed"
}
src_install() {
make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools \
|| die "install failed"
# Remove RedHat-specific stuff
rm -rf "${D}"/etc/sysconfig
dodoc README docs/README.xen-bugtool docs/ChangeLog
if use doc; then
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \
|| die "install docs failed"
dohtml -r docs/api/
docinto pdf
dodoc docs/api/tools/python/latex/refman.pdf
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
fi
rm -rf "${D}"/usr/share/doc/xen/
doman docs/man?/*
newinitd "${FILESDIR}"/xend.initd-r1 xend \
|| die "Couldn't install xen.initd"
newconfd "${FILESDIR}"/xendomains.confd xendomains \
|| die "Couldn't install xendomains.confd"
newinitd "${FILESDIR}"/xendomains.initd-r1 xendomains \
|| die "Couldn't install xendomains.initd"
if use screen; then
cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains
cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/
keepdir /var/log/xen-consoles
fi
# xend expects these to exist
keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
# for xendomains
keepdir /etc/xen/auto
}
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/"
if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then
echo
ewarn "xend may not work when python is built with stack smashing protection (ssp)."
ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
ewarn "This probablem may be resolved as of Xen 3.0.4, if not post in the bug."
fi
if ! has_version "dev-lang/python[ncurses]"; then
echo
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
fi
if has_version "sys-apps/iproute2[minimal]"; then
echo
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
ewarn "will not work until you rebuild iproute2 without USE=minimal."
fi
if ! use hvm; then
echo
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
elog "support enable the hvm use flag."
elog "An x86 or amd64 multilib system is required to build HVM support."
echo
elog "The ioemu use flag has been removed and replaced with hvm."
fi
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
echo
elog "xensv is broken upstream (Gentoo bug #142011)."
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
fi
python_mod_optimize $(use pygrub && echo grub) xen
}
pkg_postrm() {
python_mod_cleanup $(use pygrub && echo grub) xen
}

@ -1,253 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild,v 1.6 2012/12/02 22:48:42 ssuominen Exp $
EAPI="3"
inherit base flag-o-matic eutils multilib python toolchain-funcs
# TPMEMUFILE=tpm_emulator-0.4.tar.gz
DESCRIPTION="Xend daemon and tools"
HOMEPAGE="http://xen.org/"
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
# vtpm? ( mirror://berlios/tpm-emulator/${TPMEMUFILE} )"
S="${WORKDIR}/xen-${PV}"
QA_PRESTRIPPED="/usr/share/xen/qemu/openbios-ppc \
/usr/share/xen/qemu/openbios-sparc64 \
/usr/share/xen/qemu/openbios-sparc32"
QA_WX_LOAD="${QA_PRESTRIPPED}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc debug screen custom-cflags pygrub hvm api acm flask"
CDEPEND="dev-lang/python[ncurses,threads]
sys-libs/zlib
hvm? ( media-libs/libsdl )
acm? ( dev-libs/libxml2 )
api? ( dev-libs/libxml2 net-misc/curl )"
# vtpm? ( dev-libs/gmp dev-libs/openssl )
DEPEND="${CDEPEND}
sys-devel/gettext
sys-devel/gcc
dev-lang/perl
dev-lang/python[ssl]
app-misc/pax-utils
doc? (
app-doc/doxygen
dev-tex/latex2html[png,gif]
media-gfx/transfig
media-gfx/graphviz
virtual/latex-base
dev-tex/latexmk
dev-texlive/texlive-latex
dev-texlive/texlive-pictures
dev-texlive/texlive-latexextra
dev-texlive/texlive-latexrecommended
)
hvm? (
x11-proto/xproto
sys-devel/dev86
)"
RDEPEND="${CDEPEND}
sys-apps/iproute2
net-misc/bridge-utils
dev-python/pyxml
screen? (
app-misc/screen
app-admin/logrotate
)
|| ( virtual/udev sys-apps/hotplug )"
PATCHES=(
"${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
"${FILESDIR}/${PN}-3.3.0-nostrip.patch"
"${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch"
"${FILESDIR}/${P}-as-needed.patch"
"${FILESDIR}/${P}-fix-definitions.patch"
"${FILESDIR}/${P}-fix-include.patch"
"${FILESDIR}/${P}-werror-idiocy-v2.patch"
"${FILESDIR}/${P}-ldflags-respect.patch"
)
# hvmloader is used to bootstrap a fully virtualized kernel
# Approved by QA team in bug #144032
QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32
usr/share/xen/qemu/openbios-sparc64"
pkg_setup() {
if [ -x /.config/ ]; then
die "the system has a dir /.config; this needs to be removed to allow the package to emerge"
fi
export "CONFIG_LOMOUNT=y"
if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
eerror "an amd64 multilib profile is required. Remove the hvm use flag"
eerror "to build xen-tools on your current profile."
die "USE=hvm is unsupported on this system."
fi
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
# use vtpm && export "VTPM_TOOLS=y"
use api && export "LIBXENAPI_BINDINGS=y"
use acm && export "ACM_SECURITY=y"
use flask && export "FLASK_ENABLE=y"
}
src_prepare() {
base_src_prepare
# use vtpm && cp "${DISTDIR}"/${TPMEMUFILE} tools/vtpm
# if the user *really* wants to use their own custom-cflags, let them
# Try and remove all the default custom-cflags
if use custom-cflags; then
epatch "${FILESDIR}/${P}-remove-default-cflags.patch"
fi
# Disable hvm support on systems that don't support x86_32 binaries.
if ! use hvm; then
chmod 644 tools/check/check_x11_devel
sed -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk
sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile
fi
if ! use pygrub; then
sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile
fi
sed -e '/texi2html/ s/-number/&-sections/' \
-i tools/ioemu-qemu-xen/Makefile || die #409333
}
src_compile() {
export VARTEXFONTS="${T}/fonts"
local myopt
use debug && myopt="${myopt} debug=y"
use custom-cflags || unset CFLAGS
if test-flag-CC -fno-strict-overflow; then
append-flags -fno-strict-overflow
fi
emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt} || die "compile failed"
if use doc; then
sh ./docs/check_pkgs || die "package check failed"
emake docs || die "compiling docs failed"
emake dev-docs || die "make dev-docs failed"
fi
emake -C docs man-pages || die "make man-pages failed"
}
src_install() {
make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools \
|| die "install failed"
# Remove RedHat-specific stuff
rm -rf "${D}"/etc/sysconfig
# Remove unneeded static-libs
rm "${D}"/usr/lib64/libxenctrl.a "${D}"/usr/lib64/libxenguest.a \
"${D}"/usr/lib64/libflask.a "${D}"/usr/lib64/libxenstore.a \
"${D}"/usr/lib64/libblktap.a "${D}"/usr/lib64/libxenapi.a
dodoc README docs/README.xen-bugtool docs/ChangeLog
if use doc; then
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \
|| die "install docs failed"
dohtml -r docs/api/
docinto pdf
dodoc docs/api/tools/python/latex/refman.pdf
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
fi
rm -rf "${D}"/usr/share/doc/xen/
doman docs/man?/*
newinitd "${FILESDIR}"/xend.initd-r1 xend \
|| die "Couldn't install xen.initd"
newconfd "${FILESDIR}"/xendomains.confd xendomains \
|| die "Couldn't install xendomains.confd"
newinitd "${FILESDIR}"/xendomains.initd-r1 xendomains \
|| die "Couldn't install xendomains.initd"
if use screen; then
cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains
cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/
keepdir /var/log/xen-consoles
fi
# xend expects these to exist
keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
# for xendomains
keepdir /etc/xen/auto
}
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/"
if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then
echo
ewarn "xend may not work when python is built with stack smashing protection (ssp)."
ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
ewarn "This probablem may be resolved as of Xen 3.0.4, if not post in the bug."
fi
if ! has_version "dev-lang/python[ncurses]"; then
echo
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
fi
if has_version "sys-apps/iproute2[minimal]"; then
echo
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
ewarn "will not work until you rebuild iproute2 without USE=minimal."
fi
if ! use hvm; then
echo
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
elog "support enable the hvm use flag."
elog "An x86 or amd64 multilib system is required to build HVM support."
echo
elog "The ioemu use flag has been removed and replaced with hvm."
fi
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
echo
elog "xensv is broken upstream (Gentoo bug #142011)."
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
fi
python_mod_optimize $(use pygrub && echo grub) xen
}
pkg_postrm() {
python_mod_cleanup $(use pygrub && echo grub) xen
}

@ -1,9 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild,v 1.5 2012/12/02 22:48:42 ssuominen Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild,v 1.8 2012/12/04 19:24:12 scarabeus Exp $
EAPI="3"
PATCH23104="http://dev.gentoo.org/~idella4/${P}-upstream-23104-1976adbf2b80.patch"
if [[ $PV == *9999 ]]; then
KEYWORDS=""
REPO="xen-unstable.hg"
@ -11,10 +13,11 @@ if [[ $PV == *9999 ]]; then
S="${WORKDIR}/${REPO}"
live_eclass="mercurial"
else
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
$XEN_EXTFILES_URL/ipxe-git-v1.0.0.tar.gz"
$XEN_EXTFILES_URL/ipxe-git-v1.0.0.tar.gz
$PATCH23104"
S="${WORKDIR}/xen-${PV}"
fi
@ -66,7 +69,7 @@ RDEPEND="${CDEPEND}
app-misc/screen
app-admin/logrotate
)
|| ( virtual/udev sys-apps/hotplug )"
|| ( sys-fs/udev sys-apps/hotplug )"
# hvmloader is used to bootstrap a fully virtualized kernel
# Approved by QA team in bug #144032
@ -185,7 +188,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-4.1.1-libxl-tap.patch"
# Patch from bug #382329 for hvmloader
epatch "${FILESDIR}/${PN}-4.1.1-upstream-23104-1976adbf2b80.patch"
epatch "${DISTDIR}/${PN}-4.1.1-upstream-23104-1976adbf2b80.patch"
# Prevent the downloading of ipxe
sed -e 's:^\tif ! wget -O _$T:#\tif ! wget -O _$T:' \

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild,v 1.2 2012/12/02 22:48:42 ssuominen Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild,v 1.3 2012/12/04 12:00:12 idella4 Exp $
EAPI="4"
PYTHON_DEPEND="2"
@ -78,7 +78,7 @@ RDEPEND="${CDEPEND}
app-misc/screen
app-admin/logrotate
)
|| ( virtual/udev sys-apps/hotplug )
|| ( sys-fs/udev sys-apps/hotplug )
selinux? ( sec-policy/selinux-xen )"
# hvmloader is used to bootstrap a fully virtualized kernel

@ -1,8 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild,v 1.7 2012/12/02 22:48:42 ssuominen Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild,v 1.1 2012/12/04 12:00:12 idella4 Exp $
EAPI="3"
EAPI="4"
PYTHON_DEPEND="2"
PYTHON_USE_WITH="xml threads"
IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz"
XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2"
if [[ $PV == *9999 ]]; then
KEYWORDS=""
@ -11,25 +16,32 @@ if [[ $PV == *9999 ]]; then
S="${WORKDIR}/${REPO}"
live_eclass="mercurial"
else
KEYWORDS="~amd64 x86"
XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
$XEN_EXTFILES_URL/ipxe-git-v1.0.0.tar.gz"
KEYWORDS="~amd64 ~x86"
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
$IPXE_TARBALL_URL
$XEN_SEABIOS_URL"
S="${WORKDIR}/xen-${PV}"
fi
inherit flag-o-matic eutils multilib python toolchain-funcs ${live_eclass}
DESCRIPTION="Xend daemon and tools"
HOMEPAGE="http://xen.org/"
DOCS=( README docs/README.xen-bugtool )
LICENSE="GPL-2"
SLOT="0"
IUSE="api custom-cflags debug doc flask hvm qemu pygrub screen xend"
IUSE="api custom-cflags debug doc flask hvm qemu pygrub screen static-libs xend"
REQUIRED_USE="hvm? ( qemu )"
CDEPEND="dev-lang/python
CDEPEND="<dev-libs/yajl-2
dev-python/lxml
dev-python/pypam
dev-python/pyxml
sys-libs/zlib
sys-devel/bin86
sys-devel/dev86
dev-ml/findlib
hvm? ( media-libs/libsdl
sys-power/iasl )
api? ( dev-libs/libxml2 net-misc/curl )"
@ -41,7 +53,7 @@ DEPEND="${CDEPEND}
dev-ml/findlib
doc? (
app-doc/doxygen
dev-tex/latex2html
dev-tex/latex2html[png,gif]
media-gfx/transfig
media-gfx/graphviz
dev-tex/xcolor
@ -55,28 +67,34 @@ DEPEND="${CDEPEND}
hvm? (
x11-proto/xproto
sys-devel/dev86
)"
) pygrub? ( dev-lang/python[ncurses] )
"
RDEPEND="${CDEPEND}
sys-apps/iproute2
net-misc/bridge-utils
dev-python/pyxml
>=dev-lang/ocaml-3.12.0
screen? (
app-misc/screen
app-admin/logrotate
)
|| ( virtual/udev sys-apps/hotplug )"
|| ( sys-fs/udev sys-apps/hotplug )"
# hvmloader is used to bootstrap a fully virtualized kernel
# Approved by QA team in bug #144032
QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32
usr/share/xen/qemu/openbios-sparc64"
RESTRICT="test"
pkg_setup() {
python_set_active_version 2
python_pkg_setup
export "CONFIG_LOMOUNT=y"
if has_version dev-libs/libgcrypt; then
export "CONFIG_GCRYPT=y"
fi
if use qemu; then
export "CONFIG_IOEMU=y"
else
@ -102,99 +120,85 @@ pkg_setup() {
fi
fi
if use doc && ! has_version "dev-tex/latex2html[png,gif]"; then
# die early instead of later
eerror "USE=doc requires latex2html with image support. Please add"
eerror "'png' and/or 'gif' to your use flags and re-emerge latex2html"
die "latex2html missing both png and gif flags"
fi
if use pygrub && ! has_version "dev-lang/python[ncurses]"; then
eerror "USE=pygrub requires python to be built with ncurses support. Please add"
eerror "'ncurses' to your use flags and re-emerge python"
die "python is missing ncurses flags"
fi
if ! has_version "dev-lang/python[threads]"; then
eerror "Python is required to be built with threading support. Please add"
eerror "'threads' to your use flags and re-emerge python"
die "python is missing threads flags"
fi
use api && export "LIBXENAPI_BINDINGS=y"
use flask && export "FLASK_ENABLE=y"
if use hvm && ! use qemu; then
elog "With qemu disabled, it is not possible to use HVM machines " \
"or PVM machines with a framebuffer attached in the kernel config" \
"The addition of use flag qemu is required when use flag hvm ise selected"
fi
}
src_prepare() {
cp "$DISTDIR/ipxe-git-v1.0.0.tar.gz" tools/firmware/etherboot/ipxe.tar.gz
sed -e 's/-Wall//' -i Config.mk || die "Couldn't sanitize CFLAGS"
# Drop .config
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
# Xend
if ! use xend; then
sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
-i tools/misc/Makefile || die "Disabling xend failed"
-i tools/misc/Makefile || die "Disabling xend failed" || die
sed -e 's:^XEND_INITD:#XEND_INITD:' \
-i tools/examples/Makefile || "Disabling xend failed"
-i tools/examples/Makefile || "Disabling xend failed" || die
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 {} \;
# 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
if ! use pygrub; then
sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
fi
# Disable hvm support on systems that don't support x86_32 binaries.
if ! use hvm; then
chmod 644 tools/check/check_x11_devel
sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk
sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile
sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
fi
if ! use pygrub; then
sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile
fi
# Don't bother with qemu, only needed for fully virtualised guests
if ! use qemu; then
sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk
sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" \
-i Makefile
sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
fi
# Fix build for gcc-4.6
sed -e "s:-Werror::g" -i tools/xenstat/xentop/Makefile
find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) -exec sed \
-e "s:-Werror::g" \
-i {} \; || die "Failed to remove -Werror"
# Fix texi2html build error with new texi2html
sed -r -e "s:(texi2html.*) -number:\1:" -i tools/qemu-xen-traditional/Makefile
# Fix network broadcast on bridged networks
epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
# Do not strip binaries
epatch "${FILESDIR}/${PN}-3.3.0-nostrip.patch"
# Prevent the downloading of ipxe, seabios
epatch "${FILESDIR}"/${P/-tools/}-anti-download.patch
cp $DISTDIR/ipxe.tar.gz tools/firmware/etherboot/ || die
mv ../seabios-dir-remote tools/firmware/ || die
pushd tools/firmware/ > /dev/null
ln -s seabios-dir-remote seabios-dir || die
popd > /dev/null
# Patch to libxl bug #380343
epatch "${FILESDIR}/${PN}-4.1.1-libxl-tap.patch"
# Fix bridge by idella4, bug #362575
epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
# Patch from bug #382329 for hvmloader
epatch "${FILESDIR}/${PN}-4.1.1-upstream-23104-1976adbf2b80.patch"
# Don't build ipxe with pie on hardened, Bug #360805
if gcc-specs-pie; then
epatch "${FILESDIR}/ipxe-nopie.patch"
fi
# Prevent the downloading of ipxe
sed -e 's:^\tif ! wget -O _$T:#\tif ! wget -O _$T:' \
-e 's:^\tfi:#\tfi:' -i \
-e 's:^\tmv _$T $T:#\tmv _$T $T:' \
-i tools/firmware/etherboot/Makefile || die
# Prevent double stripping of files at install
epatch "${FILESDIR}"/${P/-tools/}-nostrip.patch
sed -e '/texi2html/ s/-number/&-sections/' \
-i tools/ioemu-qemu-xen/Makefile || die #409333
# fix jobserver in Makefile
epatch "${FILESDIR}"/${P/-tools/}-jserver.patch
}
src_compile() {
@ -208,15 +212,16 @@ src_compile() {
fi
unset LDFLAGS
emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt} || die "compile failed"
unset CFLAGS
emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt}
if use doc; then
sh ./docs/check_pkgs || die "package check failed"
emake docs || die "compiling docs failed"
emake dev-docs || die "make dev-docs failed"
emake docs
emake dev-docs
fi
emake -C docs man-pages || die "make man-pages failed"
emake -C docs man-pages
}
src_install() {
@ -224,11 +229,10 @@ src_install() {
export INITD_DIR=/etc/init.d
export CONFIG_LEAF_DIR=default
make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools \
|| die "install failed"
emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools
# Remove RedHat-specific stuff
rm -r "${D}"/etc/init.d/xen* "${D}"/etc/default || die
rm -rf "${ED}"/etc/init.d/xen* "${ED}"/etc/default || die
# uncomment lines in xl.conf
sed -e 's:^#autoballoon=1:autoballoon=1:' \
@ -236,48 +240,55 @@ src_install() {
-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
-i tools/examples/xl.conf || die
dodoc README docs/README.xen-bugtool docs/ChangeLog
if use doc; then
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \
|| die "install docs failed"
emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-docs
dohtml -r docs/api/
docinto pdf
dodoc docs/api/tools/python/latex/refman.pdf
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
dodoc ${DOCS[@]}
[ -d "${ED}"/usr/share/doc/xen ] && mv "${ED}"/usr/share/doc/xen/* "${ED}"/usr/share/doc/${PF}/html
fi
rm -rf "${D}"/usr/share/doc/xen/
rm -rf "${ED}"/usr/share/doc/xen/
doman docs/man?/*
if use xend; then
newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
fi
newconfd "${FILESDIR}"/xendomains.confd xendomains \
|| die "Couldn't install xendomains.confd"
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains \
|| die "Couldn't install xendomains.initd"
newinitd "${FILESDIR}"/xenstored.initd xenstored \
|| die "Couldn't install xenstored.initd"
newconfd "${FILESDIR}"/xenstored.confd xenstored \
|| die "Couldn't install xenstored.confd"
newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled \
|| die "Couldn't install xenconsoled.initd"
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled \
|| die "Couldn't install xenconsoled.confd"
newconfd "${FILESDIR}"/xendomains.confd xendomains
newconfd "${FILESDIR}"/xenstored.confd xenstored
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
newinitd "${FILESDIR}"/xenstored.initd xenstored
newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
if use screen; then
cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains
cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/
cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
keepdir /var/log/xen-consoles
fi
# For -static-libs wrt Bug 384355
if ! use static-libs; then
rm -f ${ED}usr/$(get_libdir)/*.a ${ED}usr/$(get_libdir)/ocaml/*/*.a
fi
#python_convert_shebangs -r 2 "${ED}"
# xend expects these to exist
keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
# for xendomains
keepdir /etc/xen/auto
# Temp QA workaround
mkdir -p "${ED}"$(get_libdir)
mv "${ED}"etc/udev "${ED}"$(get_libdir)
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
rm -f $(find "${ED}" -name openbios-sparc32) \
$(find "${ED}" -name openbios-sparc64) \
$(find "${ED}" -name openbios-ppc) \
$(find "${ED}" -name palcode-clipper) || die
}
pkg_postinst() {
@ -312,16 +323,17 @@ pkg_postinst() {
echo
elog "The qemu use flag has been removed and replaced with hvm."
fi
if use xend; then
echo
elog "xend capability has been enabled and installed"
fi
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
echo
elog "xensv is broken upstream (Gentoo bug #142011)."
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
fi
python_mod_optimize $(use pygrub && echo grub) xen
}

@ -1,2 +1,3 @@
DIST xen-4.1.1.tar.gz 10355625 SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b SHA512 0ec84db28af5b1206392b44e2c135859b3393d9c0eb1109f6a983492ba70622a145a08efce54f2943495feb06291d3fd5df9cc8ffea51e6e42aa69450edc87f2 WHIRLPOOL 58d83e71ac0a942830311d7eb5ebc5a7b34b118001f6f607ea7e5d7a959bafd72c9b8b6d010144fdef7417a238382602d948007be90f9ebf583b4d18897344c0
DIST xen-4.1.2.tar.gz 10365786 SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d SHA512 8f50f238b0b474ec5556279cbd51d704b4365033f2541a5d0376f287b26b7e8f0193172041109d97bb76d35ace3adf71e12f89f5766ff79a8ea861e7282f00d7 WHIRLPOOL 93a4bdd05125ef722464ef682798191c8b3db7228cbc0a27bcbe7932a7776491f90e727e1fcc4a9e7ec3eada7f56c567c07ad61cdda2f514109f702800fe5566
DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0

@ -1,21 +0,0 @@
diff -Nru a/tools/ioemu-qemu-xen/xen-setup b/tools/ioemu-qemu-xen/xen-setup
--- a/tools/ioemu-qemu-xen/xen-setup 2008-08-22 17:56:41.000000000 +0800
+++ b/tools/ioemu-qemu-xen/xen-setup 2009-02-20 10:55:37.000000000 +0800
@@ -3,6 +3,8 @@
# git-clean -x -d && ./xen-setup && make prefix=/usr CMDLINE_CFLAGS='-O0 -g' -j4 && make install DESTDIR=`pwd`/dist/ prefix=/usr && rsync -a --stats --delete . thule:shadow/qemu-iwj.git/ && rsync -a --stats dist/. root@thule:/
+target=i386-dm
+
rm -f $target/Makefile
rm -f $target/config.mak
rm -f config-host.mak
@@ -11,8 +13,6 @@
./configure --disable-gfx-check --disable-gcc-check --disable-curses --disable-slirp "$@" --prefix=/usr
-target=i386-dm
-
if [ "x$XEN_ROOT" != x ]; then
echo "XEN_ROOT=$XEN_ROOT" >>config-host.mak
fi

@ -1,87 +0,0 @@
--- tools/libxc/xc_dom_bzimageloader.c 2009-11-10 23:12:56.000000000 +0800
+++ tools/libxc/xc_dom_bzimageloader.c 2011-10-09 20:10:08.972815311 +0800
@@ -308,19 +308,19 @@
extern struct xc_dom_loader elf_loader;
-static unsigned int payload_offset(struct setup_header *hdr)
+static int check_magic(struct xc_dom_image *dom, const void *magic, size_t len)
{
- unsigned int off;
+ if (len > dom->kernel_size)
+ return 0;
+
+ return (memcmp(dom->kernel_blob, magic, len) == 0);
+ }
- off = (hdr->setup_sects + 1) * 512;
- off += hdr->payload_offset;
- return off;
-}
-
-static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom)
+static int check_bzimage_kernel(struct xc_dom_image *dom, int verbose)
{
struct setup_header *hdr;
- int ret;
+ uint64_t payload_offset, payload_length;
+ /* int ret; */
if ( dom->kernel_blob == NULL )
{
@@ -352,20 +352,47 @@
return -EINVAL;
}
- dom->kernel_blob = dom->kernel_blob + payload_offset(hdr);
- dom->kernel_size = hdr->payload_length;
+ /* upcast to 64 bits to avoid overflow */
+ /* setup_sects is u8 and so cannot overflow */
+ payload_offset = (hdr->setup_sects + 1) * 512;
+ payload_offset += hdr->payload_offset;
+ payload_length = hdr->payload_length;
- if ( memcmp(dom->kernel_blob, "\037\213", 2) == 0 )
- {
+/* if ( memcmp(dom->kernel_blob, "\037\213", 2) == 0 )
+ {
ret = xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size);
- if ( ret == -1 )
+ if ( ret == -1 ) */
+ if ( payload_offset >= dom->kernel_size )
+ {
+ xc_dom_panic(XC_INVALID_KERNEL, "%s: payload offset overflow",
+ __FUNCTION__);
+ return -EINVAL;
+ }
+ if ( (payload_offset + payload_length) > dom->kernel_size )
+ {
+ xc_dom_panic(XC_INVALID_KERNEL, "%s: payload length overflow",
+ __FUNCTION__);
+ }
+
+ dom->kernel_blob = dom->kernel_blob + payload_offset;
+ dom->kernel_size = payload_length;
+
+ if ( check_magic(dom, "\037\213", 2) )
+ {
+ if ( xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size) == -1 )
{
- xc_dom_panic(XC_INVALID_KERNEL,
- "%s: unable to gzip decompress kernel\n",
- __FUNCTION__);
+ if ( verbose )
+ xc_dom_panic(XC_INVALID_KERNEL, "%s: unable to decompress kernel\$n",
+ __FUNCTION__);
return -EINVAL;
}
}
+ else
+ {
+ xc_dom_panic(XC_INVALID_KERNEL, "%s: unknown compression format\n",
+ __FUNCTION__);
+ return -EINVAL;
+ }
else if ( memcmp(dom->kernel_blob, "\102\132\150", 3) == 0 )
{
ret = xc_try_bzip2_decode(dom, &dom->kernel_blob, &dom->kernel_size);

@ -1,19 +0,0 @@
diff -r 784caad93325 xen/common/keyhandler.c
--- a/xen/common/keyhandler.c Tue Nov 10 15:03:52 2009 +0000
+++ b/xen/common/keyhandler.c Tue Jan 05 10:47:49 2010 +0000
@@ -106,6 +106,7 @@
unsigned int cpu;
/* We want to get everything out that we possibly can. */
+ watchdog_disable();
console_start_sync();
printk("'%c' pressed -> dumping registers\n", key);
@@ -125,6 +126,7 @@
printk("\n");
console_end_sync();
+ watchdog_enable();
}
static void dump_dom0_registers(unsigned char key)

@ -1,101 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Xen Security Advisory CVE-2011-2901 / XSA-4
revision no.2
Xen <= 3.3 DoS due to incorrect virtual address validation
ISSUE DESCRIPTION
=================
The x86_64 __addr_ok() macro intends to ensure that the checked
address is either in the positive half of the 48-bit virtual address
space, or above the Xen-reserved area. However, the current shift
count is off-by-one, allowing full access to the "negative half" too,
via certain hypercalls which ignore virtual-address bits [63:48].
Vulnerable hypercalls exist only in very old versions of the
hypervisor.
VULNERABLE SYSTEMS
==================
All systems running a Xen 3.3 or earlier hypervisor with 64-bit PV
guests with untrusted administrators are vulnerable.
IMPACT
======
A malicious guest administrator on a vulnerable system is able to
crash the host.
There are no known further exploits but these have not been ruled out.
RESOLUTION
==========
The attached patch resolves the issue.
Alternatively, users may choose to upgrade to a more recent hypervisor
PATCHES
=======
The following patch resolves this issue.
Filename: fix-__addr_ok-limit.patch
SHA1: f18bde8d276110451c608a16f577865aa1226b4f
SHA256: 2da5aac72e1ac4849c34d38374ae456795905fd9512eef94b48fc31383c21636
This patch should apply cleanly, and fix the problem, for all affected
versions of Xen.
It is harmless when applied to later hypervisors and will be included
in the Xen unstable branch in due course.
VERSION HISTORY
===============
Analysis following version 1 of this advisory (sent out to the
predisclosure list during the embargo period) indicates that the
actual DoS vulnerability only exists in very old hypervisors, Xen 3.3
and earlier, contrary to previous reports.
This advisory is no longer embargoed.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iQEcBAEBAgAGBQJOYLq2AAoJEIP+FMlX6CvZLegH/26/oJBkd/WM/yYhXkzlbnIP
MxF6Fgy96Omu8poQTanD7g1vEcM0TOLY+Kk3GGsfj4aDdEJ5Nq4ZOW8ooI0VnVcD
7VXQqFsXPxre+eZ6g+G0AsmzdsG45C3qujUTRfGKqzYwXqjWjt9nNsdIy1Mrz8/4
zG1uLDkN0LXnBG2Te4q8ZckYwMq8gFXHHnH35RfQ5Besu6pvJmtK3rFXETdlP12A
JjBh7t5jsCfzvYWFQehVp8mJupuftiOBPClmVh4vrvN9gYd5rzEgB4Q9Ioiqz2qT
2bE1zegR8NeOKBOi9xriTU8F530OdFzeWAbo7D5gyEbYdc60eNwbadcgNGLbzMg=
=09T8
-----END PGP SIGNATURE-----
Subject: XSA-4: xen: correct limit checking in x86_64 version of __addr_ok
The x86_64 __addr_ok() macro intends to ensure that the checked
address is either in the positive half of the 48-bit virtual address
space, or above the Xen-reserved area. However, the current shift
count is off-by-one, allowing full access to the "negative half"
too. Guests may exploit this to gain access to off-limits ranges.
This issue has been assigned CVE-2011-2901.
Signed-off-by: Laszlo Ersek <lersek@...hat.com>
Signed-off-by: Ian Campbell <ian.campbell@...rix.com>
diff --git a/xen/include/asm-x86/x86_64/uaccess.h
b/xen/include/asm-x86/x86_64/uaccess.h
--- a/xen/include/asm-x86/x86_64/uaccess.h
+++ b/xen/include/asm-x86/x86_64/uaccess.h
@@ -34,7 +34,7 @@
* non-canonical address (and thus fault) before ever reaching VIRT_START.
*/
#define __addr_ok(addr) \
- (((unsigned long)(addr) < (1UL<<48)) || \
+ (((unsigned long)(addr) < (1UL<<47)) || \
((unsigned long)(addr) >= HYPERVISOR_VIRT_END))
#define access_ok(addr, size) \

@ -1,71 +0,0 @@
# HG changeset patch
# User Tim Deegan <Tim.Deegan@citrix.com>
# Date 1313145221 -3600
# Node ID 84e3706df07a1963e23cd3875d8603917657d462
# Parent cb22fa57ff252893b6adb1481e09b1287eacd990
Passthrough: disable bus-mastering on any card that causes an IOMMU fault.
This stops the card from raising back-to-back faults and live-locking
the CPU that handles them.
Signed-off-by: Tim Deegan <tim@xen.org>
Acked-by: Wei Wang2 <wei.wang2@amd.com>
Acked-by: Allen M Kay <allen.m.kay@intel.com>
--- a/xen/drivers/passthrough/vtd/iommu.c.orig Mon Jul 25 16:48:39 2011 +0100
+++ b/xen/drivers/passthrough/vtd/iommu.c Fri Aug 12 11:33:41 2011 +0100
@@ -733,7 +733,7 @@
while (1)
{
u8 fault_reason;
- u16 source_id;
+ u16 source_id, cword;
u32 data;
u64 guest_addr;
int type;
@@ -766,6 +766,14 @@
iommu_page_fault_do_one(iommu, type, fault_reason,
source_id, guest_addr);
+ /* Tell the device to stop DMAing; we can't rely on the guest to
+ * control it for us. */
+ cword = pci_conf_read16(PCI_BUS(source_id), PCI_SLOT(source_id),
+ PCI_FUNC(source_id), PCI_COMMAND);
+ pci_conf_write16(PCI_BUS(source_id), PCI_SLOT(source_id),
+ PCI_FUNC(source_id), PCI_COMMAND,
+ cword & ~PCI_COMMAND_MASTER);
+
fault_index++;
if ( fault_index > cap_num_fault_regs(iommu->cap) )
fault_index = 0;
--- a/xen/drivers/passthrough/amd/iommu_init.c.orig Mon Jul 25 16:48:39 2011 +0100
+++ b/xen/drivers/passthrough/amd/iommu_init.c Fri Aug 12 11:33:41 2011 +0100
@@ -415,7 +415,7 @@
static void parse_event_log_entry(u32 entry[])
{
- u16 domain_id, device_id;
+ u16 domain_id, device_id, bdf, cword;
u32 code;
u64 *addr;
char * event_str[] = {"ILLEGAL_DEV_TABLE_ENTRY",
@@ -449,6 +449,18 @@
printk(XENLOG_ERR "AMD-Vi: "
"%s: domain = %d, device id = 0x%04x, fault address = 0x%"PRIx64"\n",
event_str[code-1], domain_id, device_id, *addr);
+
+ /* Tell the device to stop DMAing; we can't rely on the guest to
+ * control it for us. */
+ for ( bdf = 0; bdf < ivrs_bdf_entries; bdf++ )
+ if ( get_dma_requestor_id(bdf) == device_id )
+ {
+ cword = pci_conf_read16(PCI_BUS(bdf), PCI_SLOT(bdf),
+ PCI_FUNC(bdf), PCI_COMMAND);
+ pci_conf_write16(PCI_BUS(bdf), PCI_SLOT(bdf),
+ PCI_FUNC(bdf), PCI_COMMAND,
+ cword & ~PCI_COMMAND_MASTER);
+ }
}
}

@ -1,429 +0,0 @@
diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk
--- xen-3.4.2.orig//Config.mk 2009-11-10 23:16:03.000000000 +0800
+++ xen-3.4.2//Config.mk 2011-09-25 02:34:11.605793042 +0800
@@ -14,7 +14,7 @@
# Tools to run on system hosting the build
HOSTCC = gcc
-HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
HOSTCFLAGS += -fno-strict-aliasing
DISTDIR ?= $(XEN_ROOT)/dist
diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk
--- xen-3.4.2.orig//extras/mini-os/minios.mk 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-25 02:34:11.855793042 +0800
@@ -6,7 +6,7 @@
# Define some default flags.
# NB. '-Wcast-qual' is nasty, so I omitted it.
-DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
diff -ur xen-3.4.2.orig//tools/blktap/drivers/Makefile xen-3.4.2//tools/blktap/drivers/Makefile
--- xen-3.4.2.orig//tools/blktap/drivers/Makefile 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//tools/blktap/drivers/Makefile 2011-09-25 02:34:11.750793042 +0800
@@ -5,7 +5,7 @@
QCOW_UTIL = img2qcow qcow2raw qcow-create
LIBAIO_DIR = ../../libaio/src
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -Wno-unused
CFLAGS += -I../lib
CFLAGS += $(CFLAGS_libxenctrl)
diff -ur xen-3.4.2.orig//tools/blktap/lib/Makefile xen-3.4.2//tools/blktap/lib/Makefile
--- xen-3.4.2.orig//tools/blktap/lib/Makefile 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//tools/blktap/lib/Makefile 2011-09-25 02:34:11.748793042 +0800
@@ -13,7 +13,7 @@
SRCS :=
SRCS += xenbus.c blkif.c xs_api.c
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -Wno-unused
CFLAGS += -fPIC
# get asprintf():
diff -ur xen-3.4.2.orig//tools/console/Makefile xen-3.4.2//tools/console/Makefile
--- xen-3.4.2.orig//tools/console/Makefile 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//tools/console/Makefile 2011-09-25 02:34:11.704793042 +0800
@@ -2,7 +2,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += $(CFLAGS_libxenctrl)
CFLAGS += $(CFLAGS_libxenstore)
diff -ur xen-3.4.2.orig//tools/debugger/xenitp/Makefile xen-3.4.2//tools/debugger/xenitp/Makefile
--- xen-3.4.2.orig//tools/debugger/xenitp/Makefile 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//tools/debugger/xenitp/Makefile 2011-09-25 02:34:11.744793042 +0800
@@ -1,7 +1,7 @@
XEN_ROOT=../../..
include $(XEN_ROOT)/tools/Rules.mk
-#CFLAGS += -Werror -g -O0
+#CFLAGS += -g -O0
CFLAGS += $(CFLAGS_libxenctrl)
diff -ur xen-3.4.2.orig//tools/firmware/Rules.mk xen-3.4.2//tools/firmware/Rules.mk
--- xen-3.4.2.orig//tools/firmware/Rules.mk 2009-11-10 23:12:55.000000000 +0800
+++ xen-3.4.2//tools/firmware/Rules.mk 2011-09-25 02:34:11.565793045 +0800
@@ -10,7 +10,7 @@
CFLAGS += -DNDEBUG
endif
-CFLAGS += -Werror
+CFLAGS +=
# Disable PIE/SSP if GCC supports them. They can break us.
$(call cc-option-add,CFLAGS,CC,-nopie)
diff -ur xen-3.4.2.orig//tools/flask/libflask/Makefile xen-3.4.2//tools/flask/libflask/Makefile
--- xen-3.4.2.orig//tools/flask/libflask/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/flask/libflask/Makefile 2011-09-25 02:34:11.657793042 +0800
@@ -9,7 +9,7 @@
SRCS :=
SRCS += flask_op.c
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -fno-strict-aliasing
CFLAGS += $(INCLUDES) -I./include -I$(XEN_LIBXC) -I$(XEN_INCLUDE)
diff -ur xen-3.4.2.orig//tools/flask/loadpolicy/Makefile xen-3.4.2//tools/flask/loadpolicy/Makefile
--- xen-3.4.2.orig//tools/flask/loadpolicy/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/flask/loadpolicy/Makefile 2011-09-25 02:34:11.660793042 +0800
@@ -6,7 +6,7 @@
LIBFLASK_ROOT = $(XEN_ROOT)/tools/flask/libflask
PROFILE=#-pg
-BASECFLAGS=-Wall -g -Werror
+BASECFLAGS=-Wall -g
BASECFLAGS+= $(PROFILE)
#BASECFLAGS+= -I$(XEN_ROOT)/tools
BASECFLAGS+= $(CFLAGS_libxenctrl)
diff -ur xen-3.4.2.orig//tools/fs-back/Makefile xen-3.4.2//tools/fs-back/Makefile
--- xen-3.4.2.orig//tools/fs-back/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/fs-back/Makefile 2011-09-25 02:34:11.637793042 +0800
@@ -5,7 +5,7 @@
IBIN = fs-backend
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -Wno-unused
CFLAGS += -fno-strict-aliasing
CFLAGS += $(CFLAGS_libxenctrl)
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2009-11-05 19:44:56.000000000 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-25 02:34:11.888793042 +0800
@@ -468,7 +468,7 @@
CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
LDFLAGS="$LDFLAGS -g"
if test "$werror" = "yes" ; then
-CFLAGS="$CFLAGS -Werror"
+CFLAGS="$CFLAGS"
fi
if test "$solaris" = "no" ; then
@@ -1150,7 +1150,7 @@
echo "sparse enabled $sparse"
echo "profiler $profiler"
echo "static build $static"
-echo "-Werror enabled $werror"
+
if test "$darwin" = "yes" ; then
echo "Cocoa support $cocoa"
fi
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:33:23.946793064 +0800
+++ xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:34:11.584793042 +0800
@@ -26,7 +26,7 @@
TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
-#CFLAGS+=-Werror
+#CFLAGS+=
LIBS=
# user emulator name
ifndef TARGET_ARCH2
diff -ur xen-3.4.2.orig//tools/libaio/harness/Makefile xen-3.4.2//tools/libaio/harness/Makefile
--- xen-3.4.2.orig//tools/libaio/harness/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/libaio/harness/Makefile 2011-09-25 02:34:11.674793042 +0800
@@ -4,7 +4,7 @@
HARNESS_SRCS:=main.c
# io_queue.c
-CFLAGS=-Wall -Werror -g -O -laio
+CFLAGS=-Wall -g -O -laio
#-lpthread -lrt
all: $(PROGS)
diff -ur xen-3.4.2.orig//tools/libfsimage/Rules.mk xen-3.4.2//tools/libfsimage/Rules.mk
--- xen-3.4.2.orig//tools/libfsimage/Rules.mk 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/libfsimage/Rules.mk 2011-09-25 02:34:11.566793044 +0800
@@ -1,6 +1,6 @@
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror
+CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/
LDFLAGS += -L../common/
PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
diff -ur xen-3.4.2.orig//tools/libxc/Makefile xen-3.4.2//tools/libxc/Makefile
--- xen-3.4.2.orig//tools/libxc/Makefile 2011-09-25 02:33:23.987793064 +0800
+++ xen-3.4.2//tools/libxc/Makefile 2011-09-25 02:34:11.687793042 +0800
@@ -52,7 +52,7 @@
-include $(XEN_TARGET_ARCH)/Makefile
-CFLAGS += -Werror -Wmissing-prototypes
+CFLAGS += -Wmissing-prototypes
CFLAGS += $(INCLUDES) -I. -I../xenstore -I../include
# Needed for posix_fadvise64() in xc_linux.c
diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist
--- xen-3.4.2.orig//tools/libxen/Makefile.dist 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-25 02:34:11.593793042 +0800
@@ -22,7 +22,7 @@
CFLAGS = -Iinclude \
$(shell xml2-config --cflags) \
$(shell curl-config --cflags) \
- -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC
+ -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC
LDFLAGS = $(shell xml2-config --libs) \
$(shell curl-config --libs)
diff -ur xen-3.4.2.orig//tools/misc/lomount/Makefile xen-3.4.2//tools/misc/lomount/Makefile
--- xen-3.4.2.orig//tools/misc/lomount/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/misc/lomount/Makefile 2011-09-25 02:34:11.666793042 +0800
@@ -1,7 +1,7 @@
XEN_ROOT=../../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
HDRS = $(wildcard *.h)
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
diff -ur xen-3.4.2.orig//tools/misc/Makefile xen-3.4.2//tools/misc/Makefile
--- xen-3.4.2.orig//tools/misc/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/misc/Makefile 2011-09-25 02:34:11.669793042 +0800
@@ -1,7 +1,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
INCLUDES += -I $(XEN_XC)
INCLUDES += -I $(XEN_LIBXC)
diff -ur xen-3.4.2.orig//tools/pygrub/setup.py xen-3.4.2//tools/pygrub/setup.py
--- xen-3.4.2.orig//tools/pygrub/setup.py 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/pygrub/setup.py 2011-09-25 02:34:11.901793042 +0800
@@ -3,7 +3,7 @@
import os
import sys
-extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
+extra_compile_args = [ "-fno-strict-aliasing" ]
XEN_ROOT = "../.."
diff -ur xen-3.4.2.orig//tools/python/setup.py xen-3.4.2//tools/python/setup.py
--- xen-3.4.2.orig//tools/python/setup.py 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/python/setup.py 2011-09-25 02:34:11.897793042 +0800
@@ -4,7 +4,7 @@
XEN_ROOT = "../.."
-extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
+extra_compile_args = [ "-fno-strict-aliasing" ]
include_dirs = [ XEN_ROOT + "/tools/libxc",
XEN_ROOT + "/tools/xenstore",
diff -ur xen-3.4.2.orig//tools/security/Makefile xen-3.4.2//tools/security/Makefile
--- xen-3.4.2.orig//tools/security/Makefile 2009-11-10 23:12:56.000000000 +0800
+++ xen-3.4.2//tools/security/Makefile 2011-09-25 02:34:11.701793042 +0800
@@ -1,7 +1,7 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -fno-strict-aliasing
CFLAGS += -I. $(CFLAGS_libxenctrl)
diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile
--- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-25 02:34:11.694793042 +0800
@@ -25,7 +25,7 @@
PIC_OBJS := $(LIB_SRCS:.c=.opic)
$(call cc-option-add,CFLAGS,CC,-fgnu89-inline)
-CFLAGS += -Werror -fno-strict-aliasing
+CFLAGS += -fno-strict-aliasing
CFLAGS += -O3
#CFLAGS += -g
diff -ur xen-3.4.2.orig//tools/vtpm/Rules.mk xen-3.4.2//tools/vtpm/Rules.mk
--- xen-3.4.2.orig//tools/vtpm/Rules.mk 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/vtpm/Rules.mk 2011-09-25 02:34:11.563793044 +0800
@@ -9,7 +9,7 @@
TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
# General compiler flags
-CFLAGS = -Werror -g3 -I.
+CFLAGS = -g3 -I.
# Generic project files
HDRS = $(wildcard *.h)
diff -ur xen-3.4.2.orig//tools/vtpm_manager/Rules.mk xen-3.4.2//tools/vtpm_manager/Rules.mk
--- xen-3.4.2.orig//tools/vtpm_manager/Rules.mk 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/vtpm_manager/Rules.mk 2011-09-25 02:34:11.562793042 +0800
@@ -9,7 +9,7 @@
TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
# General compiler flags
-CFLAGS = -Werror -g3 -I.
+CFLAGS = -g3 -I.
# Generic project files
HDRS = $(wildcard *.h)
diff -ur xen-3.4.2.orig//tools/xcutils/Makefile xen-3.4.2//tools/xcutils/Makefile
--- xen-3.4.2.orig//tools/xcutils/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xcutils/Makefile 2011-09-25 02:34:11.636793042 +0800
@@ -11,7 +11,7 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
PROGRAMS = xc_restore xc_save readnotes lsevtchn
diff -ur xen-3.4.2.orig//tools/xenmon/Makefile xen-3.4.2//tools/xenmon/Makefile
--- xen-3.4.2.orig//tools/xenmon/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xenmon/Makefile 2011-09-25 02:34:11.641793042 +0800
@@ -13,7 +13,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -I $(XEN_XC)
CFLAGS += $(CFLAGS_libxenctrl)
LDFLAGS += $(LDFLAGS_libxenctrl)
diff -ur xen-3.4.2.orig//tools/xenpmd/Makefile xen-3.4.2//tools/xenpmd/Makefile
--- xen-3.4.2.orig//tools/xenpmd/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xenpmd/Makefile 2011-09-25 02:34:11.656793042 +0800
@@ -1,7 +1,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += $(CFLAGS_libxenstore)
LDFLAGS += $(LDFLAGS_libxenstore)
diff -ur xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile xen-3.4.2//tools/xenstat/libxenstat/Makefile
--- xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xenstat/libxenstat/Makefile 2011-09-25 02:34:11.681793042 +0800
@@ -34,7 +34,7 @@
OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o
SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
-WARN_FLAGS=-Wall -Werror
+WARN_FLAGS=-Wall
CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) -I$(XEN_INCLUDE)
LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/
diff -ur xen-3.4.2.orig//tools/xenstat/xentop/Makefile xen-3.4.2//tools/xenstat/xentop/Makefile
--- xen-3.4.2.orig//tools/xenstat/xentop/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xenstat/xentop/Makefile 2011-09-25 02:34:11.684793042 +0800
@@ -18,7 +18,7 @@
all install xentop:
else
-CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
+CFLAGS += -DGCC_PRINTF -Wall -I$(XEN_LIBXENSTAT)
LDFLAGS += -L$(XEN_LIBXENSTAT)
LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS)
CFLAGS += -DHOST_$(XEN_OS)
diff -ur xen-3.4.2.orig//tools/xenstore/Makefile xen-3.4.2//tools/xenstore/Makefile
--- xen-3.4.2.orig//tools/xenstore/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xenstore/Makefile 2011-09-25 02:34:11.640793042 +0800
@@ -4,7 +4,7 @@
MAJOR = 3.0
MINOR = 0
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -I.
CFLAGS += $(CFLAGS_libxenctrl)
diff -ur xen-3.4.2.orig//tools/xenstore/xenstored_core.c xen-3.4.2//tools/xenstore/xenstored_core.c
--- xen-3.4.2.orig//tools/xenstore/xenstored_core.c 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xenstore/xenstored_core.c 2011-09-25 02:34:11.845793042 +0800
@@ -865,7 +865,7 @@
{
unsigned int offset, datalen;
struct node *node;
- char *vec[1] = { NULL }; /* gcc4 + -W + -Werror fucks code. */
+ char *vec[1] = { NULL }; /* gcc4 + -W + fucks code. */
char *name;
/* Extra "strings" can be created by binary data. */
diff -ur xen-3.4.2.orig//tools/xentrace/Makefile xen-3.4.2//tools/xentrace/Makefile
--- xen-3.4.2.orig//tools/xentrace/Makefile 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//tools/xentrace/Makefile 2011-09-25 02:34:11.745793042 +0800
@@ -1,7 +1,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += $(CFLAGS_libxenctrl)
LDFLAGS += $(LDFLAGS_libxenctrl)
Only in xen-3.4.2/: Werror.sh
diff -ur xen-3.4.2.orig//xen/arch/ia64/Rules.mk xen-3.4.2//xen/arch/ia64/Rules.mk
--- xen-3.4.2.orig//xen/arch/ia64/Rules.mk 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//xen/arch/ia64/Rules.mk 2011-09-25 02:34:11.570793042 +0800
@@ -68,7 +68,7 @@
CFLAGS += -DCONFIG_XEN_IA64_TLBFLUSH_CLOCK
endif
ifeq ($(no_warns),y)
-CFLAGS += -Wa,--fatal-warnings -Werror -Wno-uninitialized
+CFLAGS += -Wa,--fatal-warnings -Wno-uninitialized
endif
ifneq ($(vhpt_disable),y)
CFLAGS += -DVHPT_ENABLED=1
diff -ur xen-3.4.2.orig//xen/arch/x86/boot/build32.mk xen-3.4.2//xen/arch/x86/boot/build32.mk
--- xen-3.4.2.orig//xen/arch/x86/boot/build32.mk 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//xen/arch/x86/boot/build32.mk 2011-09-25 02:34:11.914793042 +0800
@@ -8,7 +8,7 @@
$(call cc-option-add,CFLAGS,CC,-fno-stack-protector)
$(call cc-option-add,CFLAGS,CC,-fno-stack-protector-all)
-CFLAGS += -Werror -fno-builtin -msoft-float
+CFLAGS += -fno-builtin -msoft-float
# NB. awk invocation is a portable alternative to 'head -n -1'
%.S: %.bin
diff -ur xen-3.4.2.orig//xen/arch/x86/Rules.mk xen-3.4.2//xen/arch/x86/Rules.mk
--- xen-3.4.2.orig//xen/arch/x86/Rules.mk 2009-11-10 23:12:57.000000000 +0800
+++ xen-3.4.2//xen/arch/x86/Rules.mk 2011-09-25 02:34:11.572793042 +0800
@@ -17,7 +17,7 @@
endif
CFLAGS += -fno-builtin -fno-common
-CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
CFLAGS += -I$(BASEDIR)/include
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default

@ -3,9 +3,8 @@
<pkgmetadata>
<herd>xen</herd>
<maintainer>
<email>johneed@hotmail.com</email>
<name>Ian 'idella4' Delaney</name>
<description>Proxy maintainer</description>
<email>idella4@gentoo.org</email>
<name>Ian Delaney</name>
</maintainer>
<use>
<flag name='flask'>Enable the Flask XSM module from NSA</flag>

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.1.1-r2.ebuild,v 1.8 2012/06/01 00:12:36 zmedico Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.1.1-r2.ebuild,v 1.10 2012/12/04 19:24:19 scarabeus Exp $
EAPI="4"

@ -0,0 +1,120 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.0.ebuild,v 1.1 2012/12/04 12:35:44 idella4 Exp $
EAPI="4"
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 toolchain-funcs ${live_eclass}
DESCRIPTION="The Xen virtual machine monitor"
HOMEPAGE="http://xen.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="custom-cflags debug flask pae xsm"
RDEPEND="|| ( sys-boot/grub
sys-boot/grub-static )"
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() {
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
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
# 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
# remove -Werror for gcc-4.6's sake
find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
xargs sed -i 's/ *-Werror */ /'
# not strictly necessary to fix this
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
}
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"
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${ED}" -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/"
if use pae; then
echo
ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
fi
}

@ -1,2 +1 @@
DIST radeontool-1.5.tar.gz 20869 SHA256 598190677279001fd8d2724ac28aae11820d3c01f850bc167ec0030c21577361 SHA512 985771cbaff3d6451563ac388b6b303410b7e1088c9a7404de63964c465f3708f9fede40fde7dfeaeb3779dff86a9007fcf982cced23cdc2f6bdd555494f78aa WHIRLPOOL 92cc22fd8575d6bc5c2feffa0900eeea7dec48ab031dbe1f22a31953666d17e6b19d39210b807085e72a178f0e1c76e109b7f353efbb12e5c404b5efb9a37bc4
DIST radeontool-1.6.3.tar.bz2 367487 SHA256 f73d1ec1a962822e681c2eefa77d9843a02ee0c63196ba0c1181cc1da016a76c SHA512 937ddf3e2b7dc35b9bc872d770b184303ac9e8199c0de6c17d187acfc5c398abc0cec2071c1af5ad16b0df2976418e06db8b1f90775fe59a8a80bdb3f8e2dca6 WHIRLPOOL 59a2542dbe865fa6e834eff2fbab9a05ef768849d575c260add0fc7b374cb084638f471a6df7d7be3c16c4d9223ee775b2eb47e286bf58c8d3ecf1b91e833ab8

@ -1,12 +0,0 @@
diff -urp radeontool-1.5/radeontool.c radeontool-1.5-mmap/radeontool.c
--- radeontool-1.5/radeontool.c 2004-02-11 04:50:27.000000000 +0100
+++ radeontool-1.5-mmap/radeontool.c 2005-01-20 13:12:50.000000000 +0100
@@ -107,7 +107,7 @@ static unsigned char * map_devince_memor
mem_fd,
base
);
- if ((long)device_mem < 0) {
+ if (device_mem == MAP_FAILED) {
if(debug)
fprintf(stderr,"mmap returned %d\n",(int)device_mem);
fatal("mmap error \n");

@ -1,33 +0,0 @@
--- radeontool.c.orig 2007-03-15 11:25:23.000000000 +0000
+++ radeontool.c 2007-03-15 11:27:30.000000000 +0000
@@ -21,7 +21,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/mman.h>
-#include <asm/page.h>
#include "radeon_reg.h"
@@ -87,6 +86,7 @@
{
int mem_fd;
unsigned char *device_mem;
+ long page_size = sysconf(_SC_PAGESIZE);
/* open /dev/mem */
if ((mem_fd = open("/dev/mem", O_RDWR) ) < 0) {
@@ -94,11 +94,11 @@
}
/* mmap graphics memory */
- if ((device_mem = malloc(length + (PAGE_SIZE-1))) == NULL) {
+ if ((device_mem = malloc(length + (page_size-1))) == NULL) {
fatal("allocation error \n");
}
- if ((unsigned long)device_mem % PAGE_SIZE)
- device_mem += PAGE_SIZE - ((unsigned long)device_mem % PAGE_SIZE);
+ if ((unsigned long)device_mem % page_size)
+ device_mem += page_size - ((unsigned long)device_mem % page_size);
device_mem = (unsigned char *)mmap(
(caddr_t)device_mem,
length,

@ -1,11 +0,0 @@
--- radeontool-1.5/radeontool.c 2005-07-26 20:59:16.000000000 +0200
+++ radeontool-1.5-ati-vga/radeontool.c 2005-07-26 20:59:48.000000000 +0200
@@ -293,7 +293,7 @@
if(fgets(line,sizeof(line),fp) == NULL) { /* if end of file */
fatal("Radeon hardware not found in lspci output.\n");
}
- if(strstr(line,"Radeon") || strstr(line,"ATI Tech")) { /* if line contains a "radeon" string */
+ if(strstr(line,"Radeon") || strstr(line,"VGA compatible controller: ATI Tech")) { /* if line contains a "radeon" string */
if(skip-- < 1) {
break;
}

@ -1,42 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-laptop/radeontool/radeontool-1.5-r3.ebuild,v 1.6 2009/10/16 18:53:02 bangert Exp $
inherit eutils toolchain-funcs
DESCRIPTION="Control the backlight and external video output of ATI Radeon Mobility graphics cards"
HOMEPAGE="http://fdd.com/software/radeon/"
SRC_URI="http://fdd.com/software/radeon/${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE=""
DEPEND="sys-apps/sed"
RDEPEND="sys-apps/pciutils"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}/${P}"-mmap.patch
epatch "${FILESDIR}/${P}"-vga-ati.patch
epatch "${FILESDIR}/${P}"-pagesize.patch
sed -i \
-e "s:-Wall -O2:${CFLAGS} ${LDFLAGS}:" \
-e "s:gcc:$(tc-getCC):" \
"${S}"/Makefile
}
src_compile() {
emake || die "emake failed"
}
src_install() {
dosbin radeontool
dodoc CHANGES
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/reptyr/reptyr-0.4.ebuild,v 1.2 2012/11/25 09:39:23 pinkbyte Exp $
# $Header: /var/cvsroot/gentoo-x86/app-misc/reptyr/reptyr-0.4.ebuild,v 1.3 2012/12/04 11:30:29 ago Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="https://github.com/nelhage/${PN}/tarball/${P} -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
IUSE=""
src_compile() {

@ -2,9 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>johneed@hotmail.com</email>
<email>idella4@gentoo.org</email>
<name>Ian Delaney</name>
<description>Proxy maintainer, assign bugs</description>
</maintainer>
<maintainer>
<email>titanofold@gentoo.org</email>

@ -8,10 +8,13 @@ DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 SHA256 64f8d
DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941 SHA512 a8c39d205051a8f8abaecb7a6fdc0c2c37baf5eee2a082af8819555f442dab525649b86cae569048357eb1e6e651deff4b62183de417e15b403e1ac09c40ba7b WHIRLPOOL fd9b6bbd214113334d3d5e542bbc9b70d5a9505281454e7f4447c6c73af733e10b007a2d4225acb39db0fc17401c2ae36b6628c59d31f09bec485f4cfc009eb5
DIST libreoffice-binfilter-3.5.7.2.tar.xz 6061416 SHA256 ba07bc9b488d0c5f0c207ac7ab04e1d86b47018bf3fa77ef7562e28937485374 SHA512 3824d3ec845a2f0fdd4dcff3db8c7981f46f3b5ef541fc43d7ad0843f6093dcfda92ddbb406b4c314ea980335d74c2ee76c4f491ae38506689486481fc1d6196 WHIRLPOOL 9a637f35233c5a297f3209ca6d4c9bb2654fca5f8f171f689048de79fd3537bd8071c252c6943b284a71876d0deace76e35e28fb27d89d39e333dd3993a357ef
DIST libreoffice-binfilter-3.6.3.2.tar.xz 5979916 SHA256 65c27499468866ae06851f2686f904e991b0ae93abca3972e6a0202f624893b0 SHA512 4ae53b9aa61db7b741de47640c6d545e21b16021ffab2396c2593806c41909a0b8669cd37d13de03dd6e6858afee3f4835ec5846f7241561666f6e3608c6f5a5 WHIRLPOOL f3f905932b816f5ce849e97311f8fe50577e9487f06424fda281ec7b808740e8b01c8df5c6e127c6f2ac66c8c01b1adb370e21e92d52e679d8d118feb22c50dc
DIST libreoffice-binfilter-3.6.4.3.tar.xz 5979564 SHA256 309c6e59693a60622a4fc02e5408a81dd3f422b0721340767f7ff8271c32c788 SHA512 83ca29b8ce813b9a87e20afdac160f51b67b7849ecc4dfc6868c7a4eb2146757d4f65f2e568d12f7ab9ee2eefcf7bd076860dd8466564683511e73d694d8f3b7 WHIRLPOOL 4d1f916448a4707142a821a1821054c489ab52d0e1f85fa8fe2d2ac4c99fd21ead35be21c1bc09206d834e11e9cecd6a5c3e98f46e2aa9e48b896d989053df27
DIST libreoffice-branding-gentoo-0.5.tar.xz 150616 SHA256 91beaf63fca297914cb4390b760ffef52b03450ecb52affab0f124a2dbd63a63 SHA512 a915973e1566414fd8fdae67ccaf426a9543cfa4f2549b39e7da0146c975d568d2e222835a259f4bbe6d36979b956cf65a7d28c7a5b3a7b8858e8f731acf33d9 WHIRLPOOL c2beb6b4220a99820eade85784638b883ea3b9293f6714bcce65dcb91fd617a1712a19327377d5fa1c33ac7b402749e8a29daa72f9ea9672d24607ce27cb82fc
DIST libreoffice-branding-gentoo-0.6.tar.xz 49756 SHA256 d5c2d12031a807d18e981a6df7e945e1787b96c7ee65fa3d9bb9eac17cf8ade9 SHA512 1126d92b6b8722fc8b7865ed42c98876922ce26c71ebff61faf03e07b338d5278ff41ba29ff296d281cbdee6a9a0965ccf8e2101fc0f4846eaddcf511ac74eed WHIRLPOOL 40f18619246ca0b6f91ff248d65e4a36639c6faee719a842fb57c6bd8fc871686156e1c991776877d5df0811088ca8f3f4390b60f10565deefa2739c99242c91
DIST libreoffice-branding-gentoo-0.7.tar.xz 72556 SHA256 57912157fe8874f9d628dd971cb68941ad605f2d8beba05327e7ce7a721080be SHA512 fdfd8190c1155e95a8874f07d6893d94e28dd7482b195e22f704f4b1621ef76ee99e5ae1fcdb41c392d2e37e05da32830c42d47b4e62e14a9526d67ffd2d279f WHIRLPOOL 6c1886dfc31b918180b78797a41c0dff042ef4ddab50f284d9f9ee7aca7733dc73795dcad35262cf6c5608a5f99cf8d85a3a0d23316e15bb6650bdc437a4226b
DIST libreoffice-core-3.5.7.2.tar.xz 105115768 SHA256 de03ffe76e3b7c636755f8e08730f606cab62e95df6a17e6b2804e5233cc8fb1 SHA512 cfb5990117c210a4a85d4f127dba09037e7cc184ef80d4545be962ea67a245c6c07550a6c3f59866919c98145227669bc5ba3fcc2034a45cd2dc87bfecee5ba6 WHIRLPOOL ccece4e1ed5854fcf226b31504141120b4c38eb2bd8e8fccee02f82ef6d65e5c197033dcd94a6815b331c8c5b1ce9200713faef0ae98386007cae27c2e64df89
DIST libreoffice-core-3.6.3.2.tar.xz 107194308 SHA256 260d4cac0ea18a88af201ec8b2e39dfb950b9c06d378876118cff0f7f0ed6d78 SHA512 f91322a2dc548b6e898619457650c6df13e622f1cac823020eac722d50c434b3729e3727441264d5d7382dc9586f779c0aadb0f4a2e4fc79b2f9321535df9657 WHIRLPOOL d42aff70aba5194c0ef3be07a9d34af8f6b0a01b49269bc2f6a499e6793390e1d01c20deb55f54498c9072c6db925f4f76de21b349a78a66c5e0313b0e15f569
DIST libreoffice-core-3.6.4.3.tar.xz 107228036 SHA256 8f72530cf153707ce29a8db578c64609678375f86930b640c472c7bb9ef699cc SHA512 ff80fd960ea07911969e99993fb530d37a194e3381bd398aad0bd64c7849132d5a5ff7b81a93eaab0e772f5ef4f776dc88d4ef7375dee546e5a537a7e4a9865b WHIRLPOOL 1a15e5012a20b3d701d20e89dffac560cf28667c2678cd21fc1a617c02b5e0b16ef55464b6fd6590974043b5b8c9be184050d15f920de394004868925ced67ec
DIST libreoffice-help-3.5.7.2.tar.xz 1905872 SHA256 b8a645053eaf05195beaa9118f4ae59512d6dc7e76fbfaacd2c70dbce7965857 SHA512 000718aebad278bd1209130b873b16089c791db3ffabe95333dc4ba9d519f05d25950006417337d23d9ff7f983a4859d921b7e618598a4f0f4f9e13dbe8bc84b WHIRLPOOL 1eefaf8f4947659d39a3fbc4aa9e6d1e14b0b839ddf5a3e8589f125f127425bffc5cada82674a28f23598765ccf40d19008f311470c97871c1b42bef2315072a
DIST libreoffice-help-3.6.3.2.tar.xz 1864084 SHA256 954edba6f6109037a001af97ecd3d755a17fb3d68e5cba688313bbbdf8a500d2 SHA512 d9747a34d36fc5eb806c9cd294fef927b802185301f7f1a98b50ebae8411d3f9b2abe4b8d16514e14d3e8fe748e53a111c783120944161d24ca662da0b05de51 WHIRLPOOL 14ed04624657a095b8cbaa2cd07fa9f96faac1a3d2af45081b12beeb66948efa3868f9729095b57c3a55cc19cdc4bb4dc492df4e57dacacd70fc41d9230bda91
DIST libreoffice-help-3.6.4.3.tar.xz 1863976 SHA256 ed4395f9264a27411050b0be4a953f67f754a9b7f913aad576ceef236db6686f SHA512 123009eef4d1ed342a4c23acf5ec52002cbe5f8083d1fc5d485e86f67f461765ebb34ff1edfcc0ff6d321de7f8a2bc40d87f757c66b3c2ac22785549f4098f27 WHIRLPOOL b275bded52e998e5a12111260123c7b3456d2dc7fba4e6b13ffda787b1712df4af4838ab426760f7abdb9824aced163a470255d83afb7daf46a83845bff900b8

@ -0,0 +1,580 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.4.3.ebuild,v 1.1 2012/12/04 17:34:45 scarabeus Exp $
EAPI=4
KDE_REQUIRED="optional"
QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
PYTHON_DEPEND="2"
PYTHON_USE_WITH="threads,xml"
# experimental ; release ; old
# Usually the tarballs are moved a lot so this should make
# everyone happy.
DEV_URI="
http://dev-builds.libreoffice.org/pre-releases/src
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
http://download.documentfoundation.org/libreoffice/old/${PV}/
"
EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.6.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite."
HOMEPAGE="http://www.libreoffice.org"
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
# Core MUST be first!
# Help is used for the image generator
MODULES="core binfilter help"
# Only release has the tarballs
if [[ ${PV} != *9999* ]]; then
for i in ${DEV_URI}; do
for mod in ${MODULES}; do
if [[ ${mod} == binfilter ]]; then
SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.xz )"
else
SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
fi
done
unset mod
done
unset i
fi
unset DEV_URI
# Really required addons
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
SRC_URI+=" ${ADDONS_SRC}"
unset ADDONS_URI
unset EXT_URI
unset ADDONS_SRC
IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome gstreamer +gtk
jemalloc kde mysql odk opengl postgres test +vba +webdav"
LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
# hunart: only on ooo extensions -> fubared download path somewhere on sf
# numbertext, typo, validator, watch-window: ^^
# oooblogger: no homepage or anything
# Extensions that need extra work:
# report-builder: missing java packages
for lo_xt in ${LO_EXTS}; do
IUSE+=" libreoffice_extensions_${lo_xt}"
done
unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
app-arch/zip
app-arch/unzip
>=app-text/hunspell-1.3.2-r3
app-text/mythes
>=app-text/libexttextcat-3.2
app-text/libwpd:0.9[tools]
app-text/libwpg:0.2
>=app-text/libwps-0.2.2
>=dev-cpp/clucene-2.3.3.4-r2
>=dev-cpp/libcmis-0.2:0.2
dev-db/unixODBC
dev-libs/expat
>=dev-libs/glib-2.28
>=dev-libs/hyphen-2.7.1
>=dev-libs/icu-4.8.1.1
>=dev-libs/nspr-4.8.8
>=dev-libs/nss-3.12.9
>=dev-lang/perl-5.0
>=dev-libs/openssl-1.0.0d
>=dev-libs/redland-1.0.14[ssl]
gnome-base/librsvg
media-gfx/graphite2
>=media-libs/fontconfig-2.8.0
media-libs/freetype:2
media-libs/lcms:2
>=media-libs/libpng-1.4
>=media-libs/libcdr-0.0.5
media-libs/libvisio
>=net-misc/curl-7.21.4
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
>=x11-libs/cairo-1.10.0[X]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
cups? ( net-print/cups )
dbus? ( >=dev-libs/dbus-glib-0.92 )
eds? ( gnome-extra/evolution-data-server )
gnome? ( gnome-base/gconf:2 )
gtk? (
x11-libs/gdk-pixbuf[X]
>=x11-libs/gtk+-2.24:2
)
gstreamer? (
>=media-libs/gstreamer-0.10:0.10
>=media-libs/gst-plugins-base-0.10:0.10
)
jemalloc? ( dev-libs/jemalloc )
libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
libreoffice_extensions_wiki-publisher? (
dev-java/commons-codec:0
dev-java/commons-httpclient:3
dev-java/commons-lang:2.1
dev-java/commons-logging:0
dev-java/tomcat-servlet-api:3.0
)
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
opengl? (
virtual/glu
virtual/opengl
)
postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
webdav? ( net-libs/neon )
"
RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
!<app-office/openoffice-bin-3.4.0-r1
!app-office/openoffice
media-fonts/libertine-ttf
media-fonts/liberation-fonts
media-fonts/urw-fonts
java? ( >=virtual/jre-1.6 )
"
PDEPEND="
=app-office/libreoffice-l10n-3.6*
"
# FIXME: cppunit should be moved to test conditional
# after everything upstream is under gbuild
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.46
>=dev-libs/libxml2-2.7.8
dev-libs/libxslt
dev-perl/Archive-Zip
dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
dev-util/mdds
virtual/pkgconfig
net-misc/npapi-sdk
>=sys-apps/findutils-4.4.2
sys-devel/bison
sys-apps/coreutils
sys-devel/flex
sys-devel/gettext
>=sys-devel/make-3.82
sys-libs/zlib
x11-libs/libXt
x11-libs/libXtst
x11-proto/randrproto
x11-proto/xextproto
x11-proto/xineramaproto
x11-proto/xproto
java? (
>=virtual/jdk-1.6
>=dev-java/ant-core-1.7
)
odk? ( app-doc/doxygen )
test? ( dev-util/cppunit )
"
PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-3.6-system-pyuno.patch"
"${FILESDIR}/${PN}-3.6-separate-checks.patch"
)
REQUIRED_USE="
gnome? ( gtk )
eds? ( gnome )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
libreoffice_extensions_wiki-publisher? ( java )
"
S="${WORKDIR}/${PN}-core-${PV}"
CHECKREQS_MEMORY="512M"
CHECKREQS_DISK_BUILD="6G"
pkg_pretend() {
local pgslot
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
if [[ $(gcc-major-version) -lt 4 ]] || \
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 5 ]] ) \
; then
eerror "Compilation with gcc older than 4.5 is not supported"
die "Too old gcc found."
fi
fi
# ensure pg version
if use postgres; then
pgslot=$(postgresql-config show)
if [[ ${pgslot//.} < 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
die "PostgreSQL slot is not set to 9.0 or higher."
fi
fi
}
pkg_setup() {
java-pkg-opt-2_pkg_setup
kde4-base_pkg_setup
python_set_active_version 2
python_pkg_setup
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
}
src_unpack() {
local mod dest tmplfile tmplname mypv
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
if use branding; then
unpack "${BRANDING}"
fi
if [[ ${PV} != *9999* ]]; then
for mod in ${MODULES}; do
if [[ ${mod} == binfilter ]] && ! use binfilter; then
continue
fi
unpack "${PN}-${mod}-${PV}.tar.xz"
if [[ ${mod} != core ]]; then
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
fi
done
else
for mod in ${MODULES}; do
if [[ ${mod} == binfilter ]] && ! use binfilter; then
continue
fi
mypv=${PV/.9999}
[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
EGIT_PROJECT="${PN}/${mod}"
EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
EGIT_NOUNPACK="true"
git-2_src_unpack
if [[ ${mod} != core ]]; then
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
fi
done
unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
fi
}
src_prepare() {
# optimization flags
export ARCH_FLAGS="${CXXFLAGS}"
export LINKFLAGSOPTIMIZE="${LDFLAGS}"
export GMAKE_OPTIONS="${MAKEOPTS}"
# patchset
if [[ -n ${PATCHSET} ]]; then
EPATCH_FORCE="yes" \
EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
EPATCH_SUFFIX="patch" \
epatch
fi
base_src_prepare
# please no debug in binfilter, it blows up things insanely
if use binfilter && ! use binfilterdebug ; then
for name in $(find "${S}/binfilter" -name makefile.mk) ; do
sed -i -e '1i\CFLAGS+= -g0' $name || die
done
fi
AT_M4DIR="m4"
eautoreconf
# hack in the autogen.sh
touch autogen.lastrun
# system pyuno mess
sed \
-e "s:%eprefix%:${EPREFIX}:g" \
-e "s:%libdir%:$(get_libdir):g" \
-i pyuno/source/module/uno.py \
-i scripting/source/pyprov/officehelper.py || die
}
src_configure() {
local java_opts
local internal_libs
local lo_ext
local ext_opts
local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
# Workaround the boost header include issue for older gccs
if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; then
append-cppflags -DBOOST_NO_0X_HDR_TYPEINDEX
append-cppflags -DBOOST_NO_CXX11_HDR_TYPEINDEX
fi
# recheck that there is some value in jobs
[[ -z ${jbs} ]] && jbs="1"
# sane: just sane.h header that is used for scan in writer, not
# linked or anything else, worthless to depend on
# vigra: just uses templates from there
# it is serious pain in the ass for packaging
# should be replaced by boost::gil if someone interested
internal_libs+="
--without-system-sane
--without-system-vigra
"
# libreoffice extensions handling
for lo_xt in ${LO_EXTS}; do
ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
done
if use java; then
# hsqldb: system one is too new
# saxon: system one does not work properly
java_opts="
--without-junit
--without-system-hsqldb
--without-system-saxon
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
--with-java-target-version=$(java-pkg_get-target)
--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
"
use libreoffice_extensions_scripting-beanshell && \
java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
use libreoffice_extensions_scripting-javascript && \
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
if use libreoffice_extensions_wiki-publisher; then
java_opts+="
--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
"
fi
fi
if use branding; then
# hack...
mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
fi
# system headers/libs/...: enforce using system packages
# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
# --enable-cairo: ensure that cairo is always required
# --enable-*-link: link to the library rather than just dlopen on runtime
# --enable-release-build: build the libreoffice as release
# --disable-fetch-external: prevent dowloading during compile phase
# --disable-gnome-vfs: old gnome virtual fs support
# --disable-kdeab: kde3 adressbook
# --disable-kde: kde3 support
# --disable-ldap: ldap requires internal mozilla stuff, same like mozab
# --disable-mozilla: disable mozilla build that is used for adresbook, not
# affecting the nsplugin that is always ON
# --disable-pch: precompiled headers cause build crashes
# --disable-rpath: relative runtime path is not desired
# --disable-systray: quickstarter does not actually work at all so do not
# promote it
# --disable-zenity: disable build icon
# --enable-extension-integration: enable any extension integration support
# --with-{max-jobs,num-cpus}: ensuring parallel building
# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
# --without-stlport: disable deprecated extensions framework
# --disable-ext-report-builder: too much java packages pulled in
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
--with-system-headers \
--with-system-libs \
--with-system-jars \
--with-system-dicts \
--enable-graphite \
--enable-cairo-canvas \
--enable-largefile \
--enable-mergelibs \
--enable-python=system \
--enable-librsvg=system \
--enable-randr \
--enable-randr-link \
--enable-release-build \
--enable-unix-qstart-libpng \
--enable-xmlsec \
--disable-ccache \
--disable-crashdump \
--disable-dependency-tracking \
--disable-epm \
--disable-fetch-external \
--disable-gnome-vfs \
--disable-ext-report-builder \
--disable-kdeab \
--disable-kde \
--disable-ldap \
--disable-mozilla \
--disable-nsplugin \
--disable-online-update \
--disable-pch \
--disable-rpath \
--disable-systray \
--disable-zenity \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
--enable-extension-integration \
--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
--with-external-tar="${DISTDIR}" \
--with-lang="" \
--with-max-jobs=${jbs} \
--with-num-cpus=${jbs} \
--with-unix-wrapper=libreoffice \
--with-vendor="Gentoo Foundation" \
--with-x \
--without-afms \
--without-fonts \
--without-myspell-dicts \
--without-stlport \
--without-system-mozilla \
--without-help \
--with-helppack-integration \
--without-sun-templates \
--disable-gtk3 \
$(use_enable binfilter) \
$(use_enable cups) \
$(use_enable dbus) \
$(use_enable eds evolution2) \
$(use_enable gnome gconf) \
$(use_enable gnome gio) \
$(use_enable gnome lockdown) \
$(use_enable gstreamer) \
$(use_enable gtk) \
$(use_enable kde kde4) \
$(use_enable mysql ext-mysql-connector) \
$(use_enable odk) \
$(use_enable opengl) \
$(use_enable postgres postgresql-sdbc) \
$(use_enable test linkoo) \
$(use_enable vba) \
$(use_enable webdav neon) \
$(use_with java) \
$(use_with mysql system-mysql-cppconn) \
$(use_with odk doxygen) \
${internal_libs} \
${java_opts} \
${ext_opts}
}
src_compile() {
# hack for offlinehelp, this needs fixing upstream at some point
# it is broken because we send --without-help
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
(
source "${S}/config_host.mk" 2&> /dev/null
local path="${SOLARVER}/${INPATH}/res/img"
mkdir -p "${path}" || die
echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-dir=icon-themes/galaxy/res/helpimg \
> "${path}/helpimg.ilst"
[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
)
# this is not a proper make script
make build || die
}
src_test() {
make unitcheck || die
make slowcheck || die
}
src_install() {
# This is not Makefile so no buildserver
make DESTDIR="${D}" distro-pack-install -o build -o check || die
# Fix bash completion placement
newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
rm -rf "${ED}"/etc/
if use branding; then
insinto /usr/$(get_libdir)/${PN}/program
newins "${WORKDIR}/branding-sofficerc" sofficerc
fi
# Hack for offlinehelp, this needs fixing upstream at some point.
# It is broken because we send --without-help
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
# Remove desktop files for support to old installs that can't parse mime
rm -rf "${ED}"/usr/share/mimelnk/
}
pkg_preinst() {
# Cache updates - all handled by kde eclass for all environments
kde4-base_pkg_preinst
}
pkg_postinst() {
kde4-base_pkg_postinst
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
use java || \
ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
}
pkg_postrm() {
kde4-base_pkg_postrm
}

@ -0,0 +1,583 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.1 2012/12/04 17:34:45 scarabeus Exp $
EAPI=4
KDE_REQUIRED="optional"
QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
PYTHON_DEPEND="3:3.3"
PYTHON_USE_WITH="threads,xml"
# experimental ; release ; old
# Usually the tarballs are moved a lot so this should make
# everyone happy.
DEV_URI="
http://dev-builds.libreoffice.org/pre-releases/src
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
http://download.documentfoundation.org/libreoffice/old/${PV}/
"
EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.7.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite."
HOMEPAGE="http://www.libreoffice.org"
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
# Core MUST be first!
# Help is used for the image generator
MODULES="core help"
# Only release has the tarballs
if [[ ${PV} != *9999* ]]; then
for i in ${DEV_URI}; do
for mod in ${MODULES}; do
SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
done
unset mod
done
unset i
fi
unset DEV_URI
# Really required addons
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
SRC_URI+=" ${ADDONS_SRC}"
unset ADDONS_URI
unset EXT_URI
unset ADDONS_SRC
IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
gtk3 jemalloc kde mysql nsplugin odk opengl pdfimport postgres
telepathy test +vba +webdav"
LO_EXTS="nlpsolver presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
# hunart: only on ooo extensions -> fubared download path somewhere on sf
# numbertext, typo, validator, watch-window: ^^
# oooblogger: no homepage or anything
# Extensions that need extra work:
# report-builder: missing java packages
for lo_xt in ${LO_EXTS}; do
IUSE+=" libreoffice_extensions_${lo_xt}"
done
unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
app-arch/zip
app-arch/unzip
>=app-text/hunspell-1.3.2-r3
app-text/mythes
>=app-text/libexttextcat-3.2
app-text/liblangtag
app-text/libmspub
app-text/libwpd:0.9[tools]
app-text/libwpg:0.2
>=app-text/libwps-0.2.2
>=dev-cpp/clucene-2.3.3.4-r2
dev-cpp/libcmis:0.3
dev-db/unixODBC
dev-libs/expat
>=dev-libs/hyphen-2.7.1
>=dev-libs/icu-4.8.1.1
>=dev-libs/liborcus-0.3
>=dev-libs/nspr-4.8.8
>=dev-libs/nss-3.12.9
>=dev-lang/perl-5.0
>=dev-libs/openssl-1.0.0d
>=dev-libs/redland-1.0.14[ssl]
media-gfx/graphite2
>=media-libs/fontconfig-2.8.0
media-libs/freetype:2
media-libs/lcms:2
>=media-libs/libpng-1.4
>=media-libs/libcdr-0.0.5
media-libs/libvisio
>=net-misc/curl-7.21.4
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg
>=x11-libs/cairo-1.10.0[X]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
bluetooth? ( net-wireless/bluez )
cups? ( net-print/cups )
dbus? ( >=dev-libs/dbus-glib-0.92 )
eds? ( gnome-extra/evolution-data-server )
gnome? ( gnome-base/gconf:2 )
gtk? (
x11-libs/gdk-pixbuf[X]
>=x11-libs/gtk+-2.24:2
)
gtk3? ( >=x11-libs/gtk+-3.2:3 )
gstreamer? (
>=media-libs/gstreamer-0.10:0.10
>=media-libs/gst-plugins-base-0.10:0.10
)
jemalloc? ( dev-libs/jemalloc )
libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
libreoffice_extensions_wiki-publisher? (
dev-java/commons-codec:0
dev-java/commons-httpclient:3
dev-java/commons-lang:2.1
dev-java/commons-logging:0
dev-java/tomcat-servlet-api:3.0
)
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
nsplugin? ( net-misc/npapi-sdk )
opengl? (
virtual/glu
virtual/opengl
)
pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
telepathy? (
dev-libs/glib:2
>=net-libs/telepathy-glib-0.18.0
)
webdav? ( net-libs/neon )
"
RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
!<app-office/openoffice-bin-3.4.0-r1
!app-office/openoffice
media-fonts/libertine-ttf
media-fonts/liberation-fonts
media-fonts/urw-fonts
java? ( >=virtual/jre-1.6 )
"
PDEPEND="
=app-office/libreoffice-l10n-3.6*
"
# FIXME: cppunit should be moved to test conditional
# after everything upstream is under gbuild
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.46
>=dev-libs/libxml2-2.7.8
dev-libs/libxslt
dev-perl/Archive-Zip
dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
dev-util/mdds
virtual/pkgconfig
net-misc/npapi-sdk
>=sys-apps/findutils-4.4.2
sys-devel/bison
sys-apps/coreutils
sys-devel/flex
sys-devel/gettext
>=sys-devel/make-3.82
sys-devel/ucpp
sys-libs/zlib
x11-libs/libXt
x11-libs/libXtst
x11-proto/randrproto
x11-proto/xextproto
x11-proto/xineramaproto
x11-proto/xproto
java? (
>=virtual/jdk-1.6
>=dev-java/ant-core-1.7
)
odk? ( app-doc/doxygen )
test? ( dev-util/cppunit )
"
PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
"${FILESDIR}/${PN}-3.7-separate-checks.patch"
)
REQUIRED_USE="
bluetooth? ( dbus )
gnome? ( gtk )
eds? ( gnome )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
libreoffice_extensions_wiki-publisher? ( java )
nsplugin? ( gtk )
"
S="${WORKDIR}/${PN}-core-${PV}"
CHECKREQS_MEMORY="512M"
CHECKREQS_DISK_BUILD="6G"
pkg_pretend() {
local pgslot
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
if [[ $(gcc-major-version) -lt 4 ]] || \
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
; then
eerror "Compilation with gcc older than 4.6 is not supported"
die "Too old gcc found."
fi
fi
# ensure pg version
if use postgres; then
pgslot=$(postgresql-config show)
if [[ ${pgslot//.} < 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
die "PostgreSQL slot is not set to 9.0 or higher."
fi
fi
}
pkg_setup() {
java-pkg-opt-2_pkg_setup
kde4-base_pkg_setup
python_set_active_version 3
python_pkg_setup
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
}
src_unpack() {
local mod mod2 dest tmplfile tmplname mypv
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
if use branding; then
unpack "${BRANDING}"
fi
if [[ ${PV} != *9999* ]]; then
for mod in ${MODULES}; do
unpack "${PN}-${mod}-${PV}.tar.xz"
if [[ ${mod} != core ]]; then
mod2=${mod}
# mapping does not match on help
[[ ${mod} == help ]] && mod2="helpcontent2"
mkdir -p "${S}/${mod2}/" || die
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
fi
done
else
for mod in ${MODULES}; do
mypv=${PV/.9999}
[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
EGIT_PROJECT="${PN}/${mod}"
EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
EGIT_NOUNPACK="true"
git-2_src_unpack
if [[ ${mod} != core ]]; then
mod2=${mod}
# mapping does not match on help
[[ ${mod} == help ]] && mod2="helpcontent2"
mkdir -p "${S}/${mod2}/" || die
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
fi
done
unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
fi
}
src_prepare() {
# optimization flags
export ARCH_FLAGS="${CXXFLAGS}"
export LINKFLAGSOPTIMIZE="${LDFLAGS}"
export GMAKE_OPTIONS="${MAKEOPTS}"
# patchset
if [[ -n ${PATCHSET} ]]; then
EPATCH_FORCE="yes" \
EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
EPATCH_SUFFIX="patch" \
epatch
fi
base_src_prepare
AT_M4DIR="m4"
eautoreconf
# hack in the autogen.sh
touch autogen.lastrun
# system pyuno mess
sed \
-e "s:%eprefix%:${EPREFIX}:g" \
-e "s:%libdir%:$(get_libdir):g" \
-i pyuno/source/module/uno.py \
-i scripting/source/pyprov/officehelper.py || die
}
src_configure() {
local java_opts
local internal_libs
local lo_ext
local ext_opts
local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
# recheck that there is some value in jobs
[[ -z ${jbs} ]] && jbs="1"
# sane: just sane.h header that is used for scan in writer, not
# linked or anything else, worthless to depend on
# vigra: just uses templates from there
# it is serious pain in the ass for packaging
# should be replaced by boost::gil if someone interested
internal_libs+="
--without-system-sane
--without-system-vigra
"
# libreoffice extensions handling
for lo_xt in ${LO_EXTS}; do
if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
else
ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
fi
done
if use java; then
# hsqldb: system one is too new
java_opts="
--without-junit
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
--with-java-target-version=$(java-pkg_get-target)
--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
"
use libreoffice_extensions_scripting-beanshell && \
java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
use libreoffice_extensions_scripting-javascript && \
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
if use libreoffice_extensions_wiki-publisher; then
java_opts+="
--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
"
fi
fi
if use branding; then
# hack...
mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
fi
# system headers/libs/...: enforce using system packages
# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
# --enable-cairo: ensure that cairo is always required
# --enable-graphite: disabling causes build breakages
# --enable-*-link: link to the library rather than just dlopen on runtime
# --enable-release-build: build the libreoffice as release
# --disable-fetch-external: prevent dowloading during compile phase
# --disable-gnome-vfs: old gnome virtual fs support
# --disable-gstreamer: support for 1.0 api, we use gstreamer-0.10 for now
# --disable-kdeab: kde3 adressbook
# --disable-kde: kde3 support
# --disable-mozilla: mozilla internal is for contact integration, never
# worked on linux
# --disable-pch: precompiled headers cause build crashes
# --disable-rpath: relative runtime path is not desired
# --disable-systray: quickstarter does not actually work at all so do not
# promote it
# --disable-zenity: disable build icon
# --enable-extension-integration: enable any extension integration support
# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
# --without-stlport: disable deprecated extensions framework
# --disable-ext-report-builder: too much java packages pulled in
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
--with-system-headers \
--with-system-libs \
--with-system-jars \
--with-system-dicts \
--enable-cairo-canvas \
--enable-graphite \
--enable-largefile \
--enable-mergelibs \
--enable-python=system \
--enable-randr \
--enable-randr-link \
--enable-release-build \
--enable-unix-qstart-libpng \
--disable-ccache \
--disable-crashdump \
--disable-dependency-tracking \
--disable-epm \
--disable-fetch-external \
--disable-gnome-vfs \
--disable-gstreamer \
--disable-ext-report-builder \
--disable-kdeab \
--disable-kde \
--disable-mozilla \
--disable-online-update \
--disable-pch \
--disable-rpath \
--disable-systray \
--disable-zenity \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
--enable-extension-integration \
--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
--with-external-tar="${DISTDIR}" \
--with-lang="" \
--with-parallelism=${jbs} \
--with-system-ucpp \
--with-unix-wrapper=libreoffice \
--with-vendor="Gentoo Foundation" \
--with-x \
--without-afms \
--without-fonts \
--without-myspell-dicts \
--without-stlport \
--without-system-mozilla \
--without-help \
--with-helppack-integration \
--without-sun-templates \
$(use_enable bluetooth sdremote-bluetooth) \
$(use_enable cups) \
$(use_enable debug) \
$(use_enable dbus) \
$(use_enable eds evolution2) \
$(use_enable gnome gconf) \
$(use_enable gnome gio) \
$(use_enable gnome lockdown) \
$(use_enable gstreamer gstreamer-0-10) \
$(use_enable gtk) \
$(use_enable gtk3) \
$(use_enable kde kde4) \
$(use_enable mysql ext-mysql-connector) \
$(use_enable nsplugin) \
$(use_enable odk) \
$(use_enable opengl) \
$(use_enable pdfimport) \
$(use_enable postgres postgresql-sdbc) \
$(use_enable telepathy) \
$(use_enable test linkoo) \
$(use_enable vba) \
$(use_enable webdav neon) \
$(use_with java) \
$(use_with mysql system-mysql-cppconn) \
$(use_with odk doxygen) \
${internal_libs} \
${java_opts} \
${ext_opts}
}
src_compile() {
# hack for offlinehelp, this needs fixing upstream at some point
# it is broken because we send --without-help
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
(
grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
source "${T}/config_host.mk" 2&> /dev/null
local path="${SOLARVER}/${INPATH}/res/img"
mkdir -p "${path}" || die
echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-dir=icon-themes/galaxy/res/helpimg \
> "${path}/helpimg.ilst"
[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
)
# this is not a proper make script
make build || die
}
src_test() {
make unitcheck || die
make slowcheck || die
}
src_install() {
# This is not Makefile so no buildserver
make DESTDIR="${D}" distro-pack-install -o build -o check || die
# Fix bash completion placement
newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
rm -rf "${ED}"/etc/
if use branding; then
insinto /usr/$(get_libdir)/${PN}/program
newins "${WORKDIR}/branding-sofficerc" sofficerc
fi
# symlink the nsplugin to proper location
use nsplugin && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
# Hack for offlinehelp, this needs fixing upstream at some point.
# It is broken because we send --without-help
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
# Remove desktop files for support to old installs that can't parse mime
rm -rf "${ED}"/usr/share/mimelnk/
}
pkg_preinst() {
# Cache updates - all handled by kde eclass for all environments
kde4-base_pkg_preinst
}
pkg_postinst() {
kde4-base_pkg_postinst
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
use java || \
ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
}
pkg_postrm() {
kde4-base_pkg_postrm
}

@ -1,3 +1,4 @@
DIST eix-0.23.10.tar.xz 438336 SHA256 6525b65de08dc3c5946f008b57c8027e5725d2bbc0bf5b980afda65ea207b356 SHA512 ab84fdbf1ec671c02c5d5ef9e4d70f9d76035fe7e537a4afa78231321a1f3721561eec9b32d96153b045ea59917a214dbad79933b930c46b9ac1843acbe3c4fd WHIRLPOOL 13e009d6c2114e8d8e0dbb1151f96a7cd0fab40e1a59ce46cb03fbd68602129fd151917f2abe2d860082b8e9cb852136bca6c04709be8546251df9414c030f0d
DIST eix-0.25.5.tar.xz 487608 SHA256 bc0ff803063e7a20ad6cd24763808f5a2b95600bf2b6525fff402e4e430606c6 SHA512 3a7898c5f320bfd52e606eb732701301c96bd63fb143c4a195343efdf4abb354fd6b20cdfa6d0a72fcb39b60bfe6f7a4fe7135c908b5464952f01f965820a7a0 WHIRLPOOL dd9d5a996506b2575754969117fce09539ecba41e925f17c330aa5ff22dd6e12d1908104000d9ce109151d8caf214c9eec46b85292456d7526ecbc4d98b91db4
DIST eix-0.27.4.tar.xz 513880 SHA256 3264c877d617fc9f6d63d2f8562e0029369c0d9f6b3f9dff095eb21e639273f8 SHA512 c93792ef08d2e6804252c94f82b7e6e046072137c22679cf547f82c9151a3e19cea8071d09b003f2c755ff37bc665ccb3703d0dc92bf1b4c6c916541ede00335 WHIRLPOOL d51ddbdebb2017e47c2618369179698bb1b997bc4f7f2057c183cf40dac3ec2b1e806328a3900928887697a9de94f0c7d2be6b5f85439c66da9245dd8931c04f
DIST eix-0.27.5.tar.xz 520536 SHA256 b7e8d809efa4af99c5013c005ecf88eabb9a3d3a32ad6bb12066e5dc82c01ebc SHA512 c62a1fa5107d108267e281ee693d7ed89d3e0d90705ecbdc305a095867d318b35611cdb2a1ba93ce0a64319c314f04304b6ce25bd5b0dcb4fa8c11c1ba8dc978 WHIRLPOOL acfe28eebbf6cfa747b244ffa9e0689cf1c53b7cc439955ba5f3a26eae2bb1b4df3a9cc6a9594d333c6d76ca34c109cb3828111b7fe01149f9543a1201e742f8

@ -0,0 +1,69 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.27.5.ebuild,v 1.1 2012/12/04 21:46:28 axs Exp $
EAPI=5
PLOCALES="de ru"
inherit bash-completion-r1 eutils multilib l10n
DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
HOMEPAGE="http://eix.berlios.de"
SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="clang debug +dep doc nls optimization security strong-optimization sqlite tools zsh-completion"
RDEPEND="app-shells/push
sqlite? ( >=dev-db/sqlite-3 )
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
app-arch/xz-utils
clang? ( sys-devel/clang )
nls? ( sys-devel/gettext )"
pkg_setup() {
if [[ ${REPLACING_VERSIONS//./} -lt 0253 ]]; then
local eixcache="${EROOT}"/var/cache/${PN}
[[ -f ${eixcache} ]] && rm -f "${eixcache}"
fi
}
src_prepare() {
epatch_user
# consider inheriting autotools.eclass and adding eautoreconf here
}
src_configure() {
econf $(use_with sqlite) $(use_with doc extra-doc) \
$(use_with zsh-completion) \
$(use_enable nls) $(use_enable tools separate-tools) \
$(use_enable security) $(use_enable optimization) \
$(use_enable strong-optimization) $(use_enable debug debugging) \
$(use_with prefix always-accept-keywords) \
$(use_with dep dep-default) \
$(use_with clang nongnu-cxx clang++) \
--with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
--with-portage-rootpath="${ROOTPATH}" \
--with-eprefix-default="${EPREFIX}" \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
}
src_install() {
default
dobashcomp bash/eix
keepdir "/var/cache/${PN}"
fowners portage:portage "/var/cache/${PN}"
fperms 775 "/var/cache/${PN}"
}
pkg_postinst() {
# fowners in src_install doesn't work for owner/group portage:
# merging changes this owner/group back to root.
use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
local obs="${EROOT}var/cache/eix.previous"
! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
}

@ -2,9 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>johneed@hotmail.com</email>
<email>idella4@gentoo.org</email>
<name>Ian Delaney</name>
<description>Proxy maintainer, assign bugs</description>
</maintainer>
<maintainer>
<email>titanofold@gentoo.org</email>

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-vim/align/align-42.ebuild,v 1.2 2012/12/03 16:57:45 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/align/align-42.ebuild,v 1.4 2012/12/04 11:22:18 ago Exp $
EAPI=4
@ -9,7 +9,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: commands and maps to help produce aligned text"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=294"
LICENSE="vim"
KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ~sparc x86"
IUSE=""
RDEPEND="app-vim/cecutil"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-vim/automatictexplugin/automatictexplugin-12.1.ebuild,v 1.2 2012/12/03 16:58:12 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/automatictexplugin/automatictexplugin-12.1.ebuild,v 1.3 2012/12/04 11:22:30 ago Exp $
EAPI="4"
VIM_PLUGIN_VIM_VERSION="7.3"
@ -12,7 +12,7 @@ DESCRIPTION="vim plugin: a comprehensive plugin for editing LaTeX files"
HOMEPAGE="http://atp-vim.sourceforge.net/"
SRC_URI="mirror://sourceforge/atp-vim/releases/${MY_P}.tar.gz"
LICENSE="GPL-3"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE=""
S="${WORKDIR}"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-vim/dbext/dbext-16.0.ebuild,v 1.2 2012/12/03 16:59:08 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/dbext/dbext-16.0.ebuild,v 1.3 2012/12/04 11:22:43 ago Exp $
EAPI=4
@ -9,7 +9,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: easy access to databases"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=356"
LICENSE="GPL-2"
KEYWORDS="amd64 ~mips ~ppc ~x86"
KEYWORDS="amd64 ~mips ~ppc x86"
IUSE=""
VIM_PLUGIN_HELPFILES="${PN}.txt"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild,v 1.2 2012/12/03 16:59:20 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild,v 1.4 2012/12/04 11:22:55 ago Exp $
EAPI=4
@ -11,7 +11,7 @@ DESCRIPTION="vim plugin: easily switch between buffers"
HOMEPAGE="https://github.com/fholgado/minibufexpl.vim"
SRC_URI="https://github.com/fholgado/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
LICENSE="as-is"
KEYWORDS="amd64 ~mips ~ppc ~x86"
KEYWORDS="amd64 ~mips ppc x86"
IUSE=""
VIM_PLUGIN_HELPFILES="${PN}.txt"

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-vim/perl-support/perl-support-4.14.ebuild,v 1.1 2011/11/01 19:44:58 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/perl-support/perl-support-4.14.ebuild,v 1.2 2012/12/04 08:33:02 radhermit Exp $
EAPI=4
@ -10,7 +10,7 @@ MY_PN="${PN}.vim"
DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=556"
SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
LICENSE="as-is"
LICENSE="GPL-2 GPL-2+"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-vim/perl-support/perl-support-4.8.ebuild,v 1.6 2011/05/29 16:09:01 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/perl-support/perl-support-4.8.ebuild,v 1.7 2012/12/04 08:33:02 radhermit Exp $
EAPI=3
@ -9,7 +9,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=556"
SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=13075 -> ${P}.zip"
LICENSE="as-is"
LICENSE="GPL-2 GPL-2+"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-vim/perl-support/perl-support-5.1.ebuild,v 1.1 2012/08/05 23:56:04 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/perl-support/perl-support-5.1.ebuild,v 1.2 2012/12/04 08:33:02 radhermit Exp $
EAPI=4
@ -8,7 +8,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=556"
LICENSE="as-is"
LICENSE="GPL-2 GPL-2+"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-vim/supertab/supertab-2.0.ebuild,v 1.2 2012/12/03 16:59:33 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/supertab/supertab-2.0.ebuild,v 1.4 2012/12/04 11:23:20 ago Exp $
EAPI="4"
@ -9,7 +9,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: enhanced Tab key functionality"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1643"
LICENSE="BSD"
KEYWORDS="amd64 ~mips ~ppc ~x86"
KEYWORDS="amd64 ~mips ppc x86"
IUSE=""
VIM_PLUGIN_HELPFILES="supertab"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-vim/vimpress/vimpress-3.2.0.ebuild,v 1.2 2012/12/03 16:59:46 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/vimpress/vimpress-3.2.0.ebuild,v 1.3 2012/12/04 11:23:31 ago Exp $
EAPI=4
@ -9,7 +9,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: manage wordpress blogs from vim"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3510"
LICENSE="vim"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )

@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild,v 1.6 2012/03/03 16:06:25 ranger Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild,v 1.7 2012/12/04 08:34:31 radhermit Exp $
inherit vim-plugin
DESCRIPTION="vim plugin: Wikipedia syntax highlighting"
HOMEPAGE="http://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim"
LICENSE="as-is"
LICENSE="CCPL-Attribution-ShareAlike-3.0"
KEYWORDS="amd64 ~hppa ~mips ppc ppc64 x86"
IUSE=""

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-vim/zencoding-vim/zencoding-vim-0.74.ebuild,v 1.2 2012/12/03 16:59:57 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/zencoding-vim/zencoding-vim-0.74.ebuild,v 1.3 2012/12/04 11:23:42 ago Exp $
EAPI=4
@ -9,7 +9,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: HTML and CSS hi-speed coding"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2981 http://mattn.github.com/zencoding-vim/"
LICENSE="BSD"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE=""
VIM_PLUGIN_HELPFILES="zencoding.txt"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-vim/zoomwin/zoomwin-24.ebuild,v 1.2 2012/12/03 17:00:12 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/zoomwin/zoomwin-24.ebuild,v 1.4 2012/12/04 11:23:56 ago Exp $
EAPI=4
@ -9,7 +9,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: brief-style window zooming"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=508"
LICENSE="vim"
KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ~sparc x86"
IUSE=""
VIM_PLUGIN_HELPFILES="zoomwin"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.11.ebuild,v 1.1 2012/10/30 22:04:07 eva Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.11.ebuild,v 1.2 2012/12/04 10:12:45 tetromino Exp $
EAPI="5"
GNOME2_LA_PUNT="yes"
@ -18,7 +18,7 @@ IUSE="test"
RDEPEND="
>=media-libs/gstreamer-0.10.36:0.10
>=media-libs/gst-plugins-base-0.10.36:0.10
>=dev-cpp/glibmm-2.28.0:2
>=dev-cpp/glibmm-2.33.4:2
>=dev-cpp/libxmlpp-2.14:2.6
>=dev-libs/libsigc++-2:2
"

@ -1,3 +1,2 @@
DIST tbb40_297oss_src.tgz 2097295 SHA256 2d1d10564e536c0ecf50d2db984f9fd9c615909bab13531936f0ca2c0e7cc2c2 SHA512 d41365eb13fdaab78fbdbc20d7d39681e3b6effc3e162c887dc2298307c1b7ad510133c1df50a458d6fd30f8b90f6af7be990180fd25695c2428d096097b9af5 WHIRLPOOL 05b471a23ea2f8c1f4f04bfe48abcf3156b06e5a2b405ae10f6767f10cc80268875802c1c4a140eaafdb17c44c102d6aff69c8296e650c6dbc42ea3487576e30
DIST tbb41_20120718oss_src.tgz 2223581 SHA256 fb5c2082b6871eedc6c77ac7cec7d46f5ce7498b848f91808d954d93469115cb SHA512 3e7b2367db84c4c46dd2f7ecb1ac35068bd8ef8adf768ec11a5b37306c9e100e02d685c877521fbcc4928d612e7b2663574ba439f938011e6a0477de750d417a WHIRLPOOL 9b323f881d72940ae17ab42e6e8051dc2ecf704bce8d3da5ec4cb111bf432323232a1dacc62e4381977ac773bb14502f01261c8fcaff9aad465c296df6ab5595
DIST tbb41_20121003oss_src.tgz 2250789 SHA256 5383727b9582a54cf4c4adbf22186b70e8eba276fcd3be81d746a937c5b47afc SHA512 fada6e32a09be2a151746caf3a15729c9ec6043b17e2f0aeb1bd903542310cdc6fe9ad85017ff5b2cfb16ae955c81c8b39ad8cf97f871bfcbd19d4948ef1d821 WHIRLPOOL 6c2a094e1dc6efed7189903bf8a6bbb8688ab1b15134c9f3c09fd5ed6a72315140505f5df410c89b65cd160a896222d71e01b3bfcbcd933281fb18a69eaf33f1

@ -1,120 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20120718.ebuild,v 1.1 2012/09/13 22:37:22 bicatali Exp $
EAPI=4
inherit eutils flag-o-matic multilib versionator toolchain-funcs
# those 2 below change pretty much every release
# url number
MYU="77/188"
# release update
MYR=""
PV1="$(get_version_component_range 1)"
PV2="$(get_version_component_range 2)"
PV3="$(get_version_component_range 3)"
MYP="${PN}${PV1}${PV2}_${PV3}oss"
DESCRIPTION="High level abstract threading library"
HOMEPAGE="http://www.threadingbuildingblocks.org/"
SRC_URI="http://www.threadingbuildingblocks.org/uploads/${MYU}/${PV1}.${PV2}${MYR}/${MYP}_src.tgz"
LICENSE="GPL-2-with-exceptions"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug doc examples"
# FIXME
# https://bugs.gentoo.org/show_bug.cgi?id=412675#c10
# sep 12: still many tests are failing
# restricting test for stabilization
RESTRICT="test"
DEPEND=""
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MYP}"
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-4.1.20120718-ldflags.patch \
"${FILESDIR}"/${PN}-4.0.297-underlinking.patch
# use fully qualified compilers. do not force pentium4 for x86 users
sed -i \
-e "s/-O2/${CXXFLAGS}/g" \
-e "/CPLUS/s/g++/$(tc-getCXX)/g" \
-e "/CONLY/s/gcc/$(tc-getCC)/g" \
-e "s/shell gcc/shell $(tc-getCC)/g" \
-e '/CPLUS_FLAGS +=/s/-march=pentium4//' \
-e 's/-m64//g' \
-e 's/-m32//g' \
build/*.inc || die
# - Strip the $(shell ... >$(NUL) 2>$(NUL)) wrapping, leaving just the
# actual command.
# - Force generation of version_string.tmp immediately after the directory
# is created. This avoids a race when the user builds tbb and tbbmalloc
# concurrently. The choice of Makefile.tbb (instead of
# Makefile.tbbmalloc) is arbitrary.
#sed -i \
# -e 's/^\t\$(shell \(.*\) >\$(NUL) 2>\$(NUL))\s*/\t\1/' \
# -e 's!^\t@echo Created \$(work_dir)_\(debug\|release\).*$!&\n\t$(MAKE) -C "$(work_dir)_\1" -r -f $(tbb_root)/build/Makefile.tbb cfg=\1 tbb_root=$(tbb_root) version_string.tmp!' \
# src/Makefile || die
find include -name \*.html -delete
cat <<-EOF > ${PN}.pc
prefix=${EPREFIX}/usr
libdir=\${prefix}/$(get_libdir)
includedir=\${prefix}/include
Name: ${PN}
Description: ${DESCRIPTION}
Version: ${PV}
URL: ${HOMEPAGE}
Libs: -L\${libdir} -ltbb -ltbbmalloc
Cflags: -I\${includedir}
EOF
}
src_compile() {
# wrt #418453#c3
append-ldflags $(no-as-needed)
if [[ $(tc-getCXX) == *g++ ]]; then
myconf="compiler=gcc"
elif [[ $(tc-getCXX) == *ic*c ]]; then
myconf="compiler=icc"
fi
local ccconf="${myconf}"
if use debug || use examples; then
ccconf="${ccconf} tbb_debug tbbmalloc_debug"
fi
emake -C src ${ccconf} tbb_release tbbmalloc_release
}
src_test() {
local ccconf="${myconf}"
if use debug || use examples; then
${ccconf}="${myconf} test_debug tbbmalloc_test_debug"
fi
emake -j1 -C src ${ccconf} test_release
}
src_install(){
local l
for l in $(find build -name lib\*.so.\*); do
dolib.so ${l}
local bl=$(basename ${l})
dosym ${bl} /usr/$(get_libdir)/${bl%.*}
done
insinto /usr
doins -r include
insinto /usr/$(get_libdir)/pkgconfig
doins ${PN}.pc
dodoc README CHANGES doc/Release_Notes.txt
use doc && dohtml -r doc/html/*
if use examples ; then
insinto /usr/share/doc/${PF}/examples/build
doins build/*.inc
insinto /usr/share/doc/${PF}/examples
doins -r examples
fi
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/libzdb-2.10.5.ebuild,v 1.2 2012/10/24 09:58:22 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/libzdb-2.10.5.ebuild,v 1.3 2012/12/04 11:09:58 ago Exp $
EAPI="4"
@ -12,7 +12,7 @@ SRC_URI="http://www.tildeslash.com/${PN}/dist/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="debug doc mysql postgres +sqlite +sqliteunlock ssl static-libs"
REQUIRED_USE=" || ( postgres mysql sqlite )"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-2.3.6.ebuild,v 1.3 2012/11/03 12:32:17 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-2.3.6.ebuild,v 1.4 2012/12/04 11:16:08 ago Exp $
EAPI=4
inherit flag-o-matic eutils autotools-utils
@ -13,7 +13,7 @@ SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz"
LICENSE="ZLIB"
SLOT="2.3"
KEYWORDS="amd64 ~x86" #not big endian safe #82779
KEYWORDS="amd64 x86" #not big endian safe #82779
IUSE="doc ipv6 mikmod opengl sound sqlite sse2 static-libs vorbis X"
REQUIRED_USE="opengl? ( X )"

@ -1,3 +1,4 @@
DIST niecza-20.zip 1878083 SHA256 2ca2542c563130c5d4b45d5bd251601472695457568fc63cab6b6cbe3969c0e7 SHA512 2d587029a1037fca3901c0c1caadd6f6e5d9951d6804c54ef0262b69a7429c13458bd4e6eeb83a823ecb02afe93a3e9d0364065f1ca37412c674533a290363a6 WHIRLPOOL 580a62dbfdec49546c19b567b477727f3ff41a355b5d8cf50afa0418feda7768012049bf86737e97eb489b7871432835169b007a7ec7f65d3ed1ef487a7d0c09
DIST niecza-21.zip 1895049 SHA256 4d91aa902e876f8477879356e7a5d3c4c2f5dba07a3bd87c39bf95d5b0fce438 SHA512 3ade8b851271ce6b422b3b1c64f44640e436f179a6cbbcda97b76ceeb60b73541799323a48e55fc30f09c0fe303aad7d9fa3090be3ca6a5a66e682ae6eb591b2 WHIRLPOOL afa42432602cad86720c838cc6b37d9423accbc8499acad5cc7cc446cb47a83fa445ce82cc392116b2d3c37424c7c4aa3443f8dd5a04c5a5fd70537943b5f520
DIST niecza-22.zip 1909281 SHA256 b4220bf2d12505ea576405e84b2402a9532af3e6e953d5f3f0b576f21114e6b0 SHA512 decfa04d7614f3d335e8991a0938821fe0ca26f2892a2d6d9d498ab8c84c11f2b6b620101633c7b27faf65e100775baefa23cb5c0072a34037803caa5dc4d800 WHIRLPOOL 67275813b182434853290d4abe2546c26691b67747b6be681fd9276310b720d36a86ab2a4f1ade23c5b3f551ca0e399c64242896e6bd7f332659f3821b1df302
DIST niecza-24.zip 1577897 SHA256 182055b5c2c187e1bebb4dd3fe34c62ea39cdb67188b9548df6aa78864141af6 SHA512 f4fa5cf6aa98a102d193bbbcf14ab0079831a2344684fb9190bebd1ec25e93c0078a816a7ddb9bb17c3a017f2b34a1dcf32e9016cf26d7b1721ad94baeefafe7 WHIRLPOOL 635b415945ffd25f3b84af205f5edd428adb6776a8981954bd810400f364fb164d2f54bd076e0f379ef9f4d0a0b8b2d0350db47654084f639bf9f0fca2ee05f8

@ -0,0 +1,34 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/niecza-bin/niecza-bin-24.ebuild,v 1.1 2012/12/05 07:08:47 patrick Exp $
EAPI=4
inherit eutils multilib
DESCRIPTION="A Perl 6 compiler targetting the CLR with an experimental focus on optimizations."
HOMEPAGE="https://github.com/sorear/niecza"
MY_PN="niecza"
MY_P="${MY_PN}-${PV}"
SRC_URI="https://github.com/downloads/sorear/${MY_PN}/${MY_P}.zip"
LICENSE="Artistic-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-lang/mono"
DEPEND="${RDEPEND}"
S=${WORKDIR}
src_configure() { :; }
src_compile() { :; }
src_install() {
mkdir ${D}/opt/niecza-bin -p
cp -r ${WORKDIR}/* ${D}/opt/niecza-bin || die "Failed to copy"
einfo "The binary is installed to /opt/niecza-bin/run/Niecza.exe"
}

@ -1,3 +1,4 @@
DIST niecza-19.zip 728618 SHA256 b320a72e77531515bafb2c1e1588572f39f24e9c38305eb4cbe60569e87845e9 SHA512 3be02a89f9698724fd4a5d8aad0dd2946a5cb4ace9bf519d0ddb52d159596beeeb162884a8b98b4fcdf8b322149ae222b3dd11caeb369218d73afe3194ab186c WHIRLPOOL 5e627ce9d885ed059bda2a898518bce551d82ca7801f5239b010316d5ce2aaf7c70ca063c73b204f06b72825158650a30653092ba86156e25021ad4bc67569b5
DIST niecza-21.zip 737733 SHA256 b4d01a79137134d25e22c8085212571cdadcd7ea519bede42f161acd1d1dfdba SHA512 34c29fb8d427c5dc98ead5acd1e49becf5b67a4c34478b431975d975047c9601a5a7192d400088ff36cd907543bc0e32457000cfd565078d8c4c48c810d23c53 WHIRLPOOL 1b319fa101b93778b25e1d60a44462f026def9a0f3d0f7572c24abb6075e90da179c310f61e6d6c52a37bc13e201a79a11a99e65dae8b225e063cd75acde7251
DIST niecza-22.zip 740724 SHA256 4c3be30c7df4d02318ad2da95180e69f07a36d6157aa6b9d08173bc785e30a20 SHA512 0e583fd9b20e872f2bb07066f5a770b2d53b44dedeac7e7e92cb482ed9b5ffa898221a1a856f8692be1e2aa5488a4685c3933d4d6c37003227fb88e5e913a329 WHIRLPOOL 477a396aba393b6397d093fa4aac42ef817c61101fdc328d8ce1f4db2c4d2ab4f36f4081d4c19d9e8682fb1889fecc1e337d14e4e17e66fdd9a6358d4a14309b
DIST niecza-22-src.zip 740724 SHA256 4c3be30c7df4d02318ad2da95180e69f07a36d6157aa6b9d08173bc785e30a20 SHA512 0e583fd9b20e872f2bb07066f5a770b2d53b44dedeac7e7e92cb482ed9b5ffa898221a1a856f8692be1e2aa5488a4685c3933d4d6c37003227fb88e5e913a329 WHIRLPOOL 477a396aba393b6397d093fa4aac42ef817c61101fdc328d8ce1f4db2c4d2ab4f36f4081d4c19d9e8682fb1889fecc1e337d14e4e17e66fdd9a6358d4a14309b
DIST niecza-24-src.zip 760567 SHA256 db296e7a15ec546f30478de5fa047b93a6f3e85edfcef4154d25ff87fc82837e SHA512 438791f61a417f846c525ec13199e61c83f95fc7f503e2f0f0fe805f168121f2d09f1a5507e92019ffba842b51ef7a2a33746903f097981be63c5631d6cf0582 WHIRLPOOL 3c08ff3a513f5145461007c9d7eff83460396d6c47f771002f85ee4dd51117eb1201e0e2d9e51e1872ff085cc92d7991b1e1a1d120fa3dcef63458cba1080fac

@ -0,0 +1,13 @@
--- Makefile 2012-06-25 22:30:16.000000000 +0800
+++ Makefile.new 2012-08-22 10:55:22.879717085 +0800
@@ -41,10 +41,6 @@
$(RUN_CLR) run/Kernel.dll -gen-app Niecza boot/obj
.fetch-stamp: FETCH_URL
- -rm -rf boot/
- mkdir boot
- $(WGET_O) boot/niecza.zip $$(cat FETCH_URL)
- cd boot && unzip niecza.zip
NIECZA_KEEP_IL=1 $(RUN_CLR) boot/run/Niecza.exe --obj-dir=run -C $(libunits)
$(CP) boot/run/Kernel.dll boot/obj/
touch .fetch-stamp

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/niecza/niecza-22.ebuild,v 1.1 2012/10/05 05:47:31 patrick Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/niecza/niecza-22.ebuild,v 1.2 2012/12/05 07:08:09 patrick Exp $
EAPI=4
@ -10,7 +10,7 @@ GITHUB_CRAP="sorear-niecza-8d7386f"
DESCRIPTION="A Perl 6 compiler targetting the CLR with an experimental focus on optimizations."
HOMEPAGE="https://github.com/sorear/niecza"
SRC_URI="https://github.com/sorear/niecza/zipball/v${PV} -> niecza-${PV}.zip"
SRC_URI="https://github.com/sorear/niecza/zipball/v${PV} -> niecza-${PV}-src.zip"
LICENSE="Artistic-2"
SLOT="0"

@ -0,0 +1,58 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/niecza/niecza-24.ebuild,v 1.1 2012/12/05 07:08:09 patrick Exp $
EAPI=4
inherit eutils multilib
GITHUB_CRAP="sorear-niecza-287cfa1"
DESCRIPTION="A Perl 6 compiler targetting the CLR with an experimental focus on optimizations."
HOMEPAGE="https://github.com/sorear/niecza"
SRC_URI="https://github.com/sorear/niecza/zipball/v${PV} -> niecza-${PV}-src.zip"
LICENSE="Artistic-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-lang/mono"
DEPEND="${RDEPEND}
|| ( dev-lang/niecza-bin dev-lang/niecza )"
S=${WORKDIR}/${GITHUB_CRAP}
src_prepare() {
epatch "${FILESDIR}"/fix-bootstrap-${PV}.patch || die "Failed to fix"
cd "${S}"
# bootstrap only works from git dirs? sigh :)
sed -i -e 's:@git describe --tags:echo "v${PV}":' Makefile
# silly workaround for stuff trying to write everywhere: copy the installed niecza here (sigh)
# since we have different installation paths for the bin version we need to check here
mkdir boot -p
if has_version dev-lang/niecza; then
cp -r /opt/niecza/* boot/
else
cp -r /opt/niecza-bin/* boot/
fi
mkdir -p boot/obj
}
src_configure() { :; }
src_compile() {
export XDG_DATA_HOME="${S}"
emake -j1 || die
}
src_test() {
emake -j1 test || die
}
src_install() {
mkdir -p "${D}"/opt/niecza
for i in docs lib obj run README.pod; do
cp -r "${S}"/$i "${D}"/opt/niecza/ || die "Failed to install"
done
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.16-r1.ebuild,v 1.4 2012/11/14 19:06:54 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.16-r1.ebuild,v 1.5 2012/12/04 15:37:34 ago Exp $
EAPI=4
inherit autotools flag-o-matic
@ -11,7 +11,7 @@ SRC_URI="http://code.entropywave.com/download/orc/${P}.tar.gz"
LICENSE="BSD BSD-2"
SLOT="0"
KEYWORDS="amd64 arm hppa ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="amd64 arm hppa x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs examples"
RDEPEND=""

@ -0,0 +1,12 @@
diff -Naur tk8.4.11.orig/unix/configure.in tk8.4.11/unix/configure.in
--- tk8.4.11.orig/unix/configure.in 2005-06-30 01:43:10.000000000 +0900
+++ tk8.4.11/unix/configure.in 2005-07-02 23:22:16.000000000 +0900
@@ -393,7 +393,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
+TK_LIBRARY='$(libdir)/tk$(VERSION)'
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
TK_PKG_DIR='tk$(VERSION)$(TK_DBGX)'

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.13.ebuild,v 1.1 2012/11/29 15:23:01 jlec Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.13.ebuild,v 1.2 2012/12/05 07:42:09 jlec Exp $
EAPI=4
@ -37,7 +37,7 @@ src_prepare() {
epatch \
"${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
"${FILESDIR}"/${PN}-8.4.11-multilib.patch
"${FILESDIR}"/${P}-multilib.patch
epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
eprefixify unix/Makefile.in
@ -56,6 +56,7 @@ src_prepare() {
-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-e 's:xft freetype2:xft freetype2 fontconfig:' \
-i unix/configure.in || die
rm -f unix/configure || die
cd "${S}"/unix
eautoreconf

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.10.4-r2.ebuild,v 1.7 2012/10/29 22:28:31 tetromino Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.10.4-r2.ebuild,v 1.8 2012/12/04 10:36:53 ago Exp $
EAPI="4"
GCONF_DEBUG="no"
@ -14,7 +14,7 @@ HOMEPAGE="http://live.gnome.org/Vala"
LICENSE="LGPL-2.1"
SLOT="0.10"
KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86"
KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86"
IUSE="test +vapigen"
RDEPEND=">=dev-libs/glib-2.14:2

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.12.1-r1.ebuild,v 1.7 2012/10/29 22:28:31 tetromino Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.12.1-r1.ebuild,v 1.8 2012/12/04 10:36:53 ago Exp $
EAPI="4"
GCONF_DEBUG="no"
@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Vala"
LICENSE="LGPL-2.1"
SLOT="0.12"
KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~x86-linux"
KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-linux"
IUSE="test +vapigen"
RDEPEND=">=dev-libs/glib-2.16:2

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.14.2-r2.ebuild,v 1.6 2012/10/29 22:28:31 tetromino Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.14.2-r2.ebuild,v 1.7 2012/12/04 10:36:53 ago Exp $
EAPI="4"
GCONF_DEBUG="no"
@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Vala"
LICENSE="LGPL-2.1"
SLOT="0.14"
KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="test +vapigen"
RDEPEND=">=dev-libs/glib-2.16:2

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.16.1-r2.ebuild,v 1.6 2012/10/29 22:28:31 tetromino Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.16.1-r2.ebuild,v 1.7 2012/12/04 10:36:53 ago Exp $
EAPI="4"
GCONF_DEBUG="no"
@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Vala"
LICENSE="LGPL-2.1"
SLOT="0.16"
KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
IUSE="test +vapigen"
RDEPEND=">=dev-libs/glib-2.16:2

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.18.0.ebuild,v 1.7 2012/10/30 17:27:35 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.18.0.ebuild,v 1.8 2012/12/04 10:36:53 ago Exp $
EAPI="4"
GCONF_DEBUG="no"
@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Vala"
LICENSE="LGPL-2.1"
SLOT="0.18"
KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
IUSE="test +vapigen"
RDEPEND=">=dev-libs/glib-2.18:2

@ -0,0 +1 @@
DIST bitset-2.8.1.tar.gz 348038 SHA256 3281b2a20cb195d2514805265ac4c6565b11b15c6cdefd61135bffed10aedabe SHA512 08d58f92b5e18db508f68ba65910156eec1db05e81661055f1b04cb1c7851434330ed3815539f3f408bd135fce7ef023468edeed5a48e0898137304918894add WHIRLPOOL 8c7207411673debad87c1ef8bab8db4f144d65d095f0d8390d3ab82948584581e6de19bb9c1435e5cc928ffb3ff2f8c7e52057eda640ea8f0c6091b27a605862

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save