root
7 years ago
parent
94df3a90ff
commit
ff353413eb
@ -1,2 +1 @@
|
||||
DIST drush-6.5.0.tar.gz 509643 SHA256 0e6bfb8a4bd75846dbca25f6d3e3130a706546f6a62edadce2eb00099750e2a7 SHA512 4afd348c025b9303386131687205af4219a77e6c822518b079a3f0475cbd7ed03647797d613300c7a281e2354f0d855435222fe1afe13447153cdbd6a4393add WHIRLPOOL 1f2a1a725e1c0f89cac90a1338e1541e587c7834560fd23d1a44341696be320e65cf93508d4841f02ca9b30ac62f3fed7de772e00f4eaeea64f287cf19682fcc
|
||||
DIST drush-6.7.0.tar.gz 511581 SHA256 f3ba2a6847f83b1b8a61207b1a514617612a75261e7b39ffc2606b6958f79e8c SHA512 203870190dd8987ad3da71f7625476c1f94bc75513447a740fd8c16268fb9705bcbc3b2bffc49a44045998e3fa49fd5ee9d4c0634a1fb39605ba8e10b7373fa5 WHIRLPOOL 87eb20be4b6bb8280dd1e91c422bdfc7a2181d6eabd37a212ce7b95ef863cd7c526531d98eca09d032f8e8cf3201d746dd615dfcb858dfadfaef41869dc22500
|
||||
|
||||
@ -1,64 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit bash-completion-r1 eutils
|
||||
|
||||
DESCRIPTION="Command line shell and scripting interface for Drupal"
|
||||
HOMEPAGE="https://github.com/drush-ops/${PN}"
|
||||
SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="dev-lang/php[cli,ctype,json,simplexml]
|
||||
dev-php/PEAR-Console_Table"
|
||||
|
||||
src_prepare() {
|
||||
# Fix the bash completion script, check the patch for Gentoo/upstream
|
||||
# bug numbers.
|
||||
epatch "${FILESDIR}/update-bash-completion-script-for-2.1.patch"
|
||||
|
||||
# dodoc compresses all of the documentation, so we fix the filenames
|
||||
# in a few places.
|
||||
|
||||
# First, the README location in bootstrap.inc.
|
||||
sed -i -e \
|
||||
"s!/share/doc/drush!/share/doc/${PF}!" \
|
||||
-e "s!README\.md!\0.bz2!g" \
|
||||
includes/bootstrap.inc || die
|
||||
|
||||
# Next, the list of documentation in docs.drush.inc. Note that
|
||||
# html files don't get compressed.
|
||||
sed -i \
|
||||
-e "s!\.bashrc'!.bashrc.bz2'!" \
|
||||
-e "s!\.inc'!.inc.bz2'!" \
|
||||
-e "s!\.ini'!.ini.bz2'!" \
|
||||
-e "s!\.md'!.md.bz2'!" \
|
||||
-e "s!\.php'!.php.bz2'!" \
|
||||
-e "s!\.script'!.script.bz2'!" \
|
||||
-e "s!\.txt'!.txt.bz2'!" \
|
||||
commands/core/docs.drush.inc || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Always install the examples; they're referenced within the source
|
||||
# code and too difficult to exorcise.
|
||||
dodoc -r README.md docs examples
|
||||
|
||||
insinto /usr/share/drush
|
||||
doins -r classes commands includes lib misc
|
||||
doins drush_logo-black.png drush.info drush.php
|
||||
|
||||
exeinto /usr/share/drush
|
||||
doexe drush
|
||||
dosym /usr/share/drush/drush /usr/bin/drush
|
||||
|
||||
keepdir /etc/drush
|
||||
newbashcomp drush.complete.sh drush
|
||||
}
|
||||
@ -1,3 +1,3 @@
|
||||
DIST perl-cleaner-2.20.tar.bz2 6704 SHA256 ecc3b160d01466a5c9a070e12f3e11719bedb45a92a2ea0227d745be6b77cf64 SHA512 29888b4ee19a186ddaa1209d893ac57bed683b551546f63aeb874f8cc1fcab4ea0b0401247968aed0fb3b9a7d7196a803d6713e85b44cb94bc6642a44fbc4cf1 WHIRLPOOL 2ea9ca19738e8dd3bed076051efbccd1cced25b768ee8e95843c885b9057e1c6960247dd8f867b8ef7ab11ffffaddbedbcc01f20023203f4d3cbe7f09fd01e51
|
||||
DIST perl-cleaner-2.21.tar.bz2 6288 SHA256 6ea83c08ff83d59c3691435dbeafbd52680c57f2d8603288410a4eb4ba343e96 SHA512 b13d32bd09009c96b9074c786e8cb5da359b4eb8343b7818b88151cc1bb870cb29775e462e9e9d9f4f55f4040847cb9f7b5d2311e06124aaea5deb9053ea95ee WHIRLPOOL 27e5c9db0c371676842c814e7e6962333c828b261b798a380f23092afa7cd7ec1eaa550cca7103dd5691883945e4be31d2fea96db3b11ee1996aeaf290ab8b9d
|
||||
DIST perl-cleaner-2.22.tar.bz2 6407 SHA256 fed20de199e178012380e436f06668705746ae16e84fbc15b23653cc07bf5bbb SHA512 a822ea4178e1f36aadcad8c21e1adefe547e2b7c0cfecd34fa53d2d0f7c154ce5bcbb6f8d5a78f633b42842e08ea50cf68c151d97a46529e378dfb6c8fcb7d78 WHIRLPOOL 4025842fcfba7723768b7d5f23f23d0d9970a397a3313fe30d3b04d10e89328257977cba60ad183b4941453bd4dcd727bf871d8206e537ba89dbfa10b3779cad
|
||||
DIST perl-cleaner-2.23.tar.bz2 6495 SHA256 b7d25021997bd9a98f5df930d16cbaec84d19674e7b0a6eb7727c11725e0f91b SHA512 e0879f75737746479cd1032acfed50f20aad183d834e1e0e9b847edeb14577b32ac8fd4b0f5ff54c03937f181d8f5702c3bd009587a5930d40eee59a13fe6624 WHIRLPOOL 5645da862594cb8b65828ab740f433cb279cb4cac84a3005f8adcced1586b54ff766cfd3bba48fe4eab8b978f4155e29de6701d62c5164bce77cea3f730bd01e
|
||||
|
||||
@ -1,2 +1 @@
|
||||
DIST unshield-0.6_p20120308.tar.xz 31924 SHA256 5f857a496ff54b9e1121b8ce2ceaba78133e91e254203e81340010ee05224da6 SHA512 7eec3c401af4c43f599e1b1abae3efdc6b91bd132a86b6658656bec4f00040eed2b0addede7b555953ecc7b1c976fa03013820a25a68a226cf1b973caffb25c4 WHIRLPOOL 12d307b8345b604d10c42b52c28e1eb4eb9745a7b542da188b2a24c4a993b45cfd98a01740f3f30362c9b2714ba61d5e4c6f66a26e599356b5cef5b76130fc34
|
||||
DIST unshield-1.4.tar.gz 37199 SHA256 8ae91961212193a7d3d7973c1c9464f3cd1967c179d6099feb1bb193912f8231 SHA512 b09c29fa8e5785f2ca90b40105304802d00d201dde42ef4f5e4b5504ca8edf10da426c7ed1daa8c0685980f085eb20437162812a2068a0c03c0dfd240edbf944 WHIRLPOOL 886c6272d8666192e67fd0978f3d038b9a023ffc8456689b0e6ce6d2c0913f21a1ad8e2baa3d57991605cf64d59a5991a4f8ef3f8856ecabbaccb664bbc3c91d
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
This is replaced by `AT_M4DIR=m4 eautoreconf` in the ebuild.
|
||||
|
||||
--- bootstrap
|
||||
+++ bootstrap
|
||||
@@ -26,17 +26,17 @@
|
||||
INCLUDES="-I m4"
|
||||
fi
|
||||
set -x
|
||||
-aclocal $INCLUDES
|
||||
-autoheader
|
||||
+# aclocal $INCLUDES
|
||||
+# autoheader
|
||||
|
||||
# Check For OSX
|
||||
# rhcp011235@gmail.com
|
||||
|
||||
-KERNEL_NAME=`uname -s`
|
||||
-if [ "$KERNEL_NAME" = "Darwin" ]; then
|
||||
- glibtoolize --copy --automake
|
||||
-else
|
||||
- libtoolize --copy --automake
|
||||
-fi
|
||||
-automake --copy --foreign --add-missing
|
||||
-autoconf
|
||||
+# KERNEL_NAME=`uname -s`
|
||||
+# if [ "$KERNEL_NAME" = "Darwin" ]; then
|
||||
+# glibtoolize --copy --automake
|
||||
+# else
|
||||
+# libtoolize --copy --automake
|
||||
+# fi
|
||||
+# automake --copy --foreign --add-missing
|
||||
+# autoconf
|
||||
@ -1,41 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
inherit autotools eutils
|
||||
|
||||
DESCRIPTION="InstallShield CAB file extractor"
|
||||
HOMEPAGE="https://github.com/twogood/unshield https://sourceforge.net/projects/synce/"
|
||||
SRC_URI="mirror://gentoo/${P}.tar.xz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~x86"
|
||||
IUSE="libressl static-libs"
|
||||
|
||||
RDEPEND="
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
sys-libs/zlib"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-bootstrap.patch
|
||||
./bootstrap
|
||||
sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467548
|
||||
AT_M4DIR=m4 eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable static-libs static) \
|
||||
--with-ssl
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
dodoc README
|
||||
|
||||
find "${D}" -name '*.la' -exec rm -f {} +
|
||||
}
|
||||
@ -1,39 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=4
|
||||
inherit autotools eutils
|
||||
|
||||
DESCRIPTION="InstallShield CAB file extractor"
|
||||
HOMEPAGE="https://github.com/twogood/unshield https://sourceforge.net/projects/synce/"
|
||||
SRC_URI="mirror://gentoo/${P}.tar.xz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~hppa ~ppc x86"
|
||||
IUSE="static-libs"
|
||||
|
||||
RDEPEND="dev-libs/openssl:0
|
||||
sys-libs/zlib"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-bootstrap.patch
|
||||
./bootstrap
|
||||
sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467548
|
||||
AT_M4DIR=m4 eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable static-libs static) \
|
||||
--with-ssl
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
dodoc README
|
||||
|
||||
find "${D}" -name '*.la' -exec rm -f {} +
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
From fc89ac11d25a5d052a63c01006c1fd767d9f5879 Mon Sep 17 00:00:00 2001
|
||||
From: Felix Janda <felix.janda@posteo.de>
|
||||
Date: Thu, 29 Dec 2016 13:43:06 -0500
|
||||
Subject: [PATCH] speller: fix build when tiny build is enabled
|
||||
|
||||
URL: https://bugs.gentoo.org/604000
|
||||
---
|
||||
src/text.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/text.c b/src/text.c
|
||||
index bd1737687e65..a8b34f2f6bba 100644
|
||||
--- a/src/text.c
|
||||
+++ b/src/text.c
|
||||
@@ -3079,9 +3079,11 @@ const char *do_alt_speller(char *tempfile_name)
|
||||
stat(tempfile_name, &spellfileinfo);
|
||||
if (spellfileinfo.st_mtime != timestamp) {
|
||||
set_modified();
|
||||
+#ifndef NANO_TINY
|
||||
/* Flush the undo stack, to avoid making a mess when the user
|
||||
* tries to undo things in spell-corrected lines. */
|
||||
discard_until(NULL, openfile);
|
||||
+#endif
|
||||
}
|
||||
#ifndef NANO_TINY
|
||||
/* Unblock SIGWINCHes again. */
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@ -1,2 +1 @@
|
||||
DIST Padre-0.98.tar.gz 1968814 SHA256 847aa43a0f30ec7cc99a812e38f447f7c49959e62ce39614f9fba1d2d5694f87 SHA512 4f810a0447bc03751dd50ada08acacb3ad617c03dd628f11272750da5e0f9fd39951838161046ad1b17185b87b9bb0f10780adaffa4bdcec0928c181587afdaf WHIRLPOOL 98ec79b1b24096523e1f7da5dad5ebf7f7631f77974994f8d59f53dbff6937efecca5942c22fc7393581f18b423c9aef91ebdbd35bd0fd3a7e8f59270d034379
|
||||
DIST Padre-1.00.tar.gz 1969274 SHA256 cb31404b048c12992eea142613bd560ce7a31199e3e09239fa1539f2fa02b96d SHA512 8a2630eb54944b85ec77eaf90595fe6bb482b88ae87622b9e54973fbc1cc5f7ccf83d7b2481a9a66886310db9678569d23b18de033f7759db71ac73fd3151856 WHIRLPOOL 512d1aeb9783a8c1b4dee2f3b60b77d7daf40eef1a33dc88b84e11403c70983633e1b4c54c40013d7b575e70221f5e95cfbd7db434544afa13b475215ee3377d
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
From a9fb73f6b0ba76370f60300edfaf03f50e8326e0 Mon Sep 17 00:00:00 2001
|
||||
From: Charlie Gonzalez <itcharlie@gmail.com>
|
||||
Date: Wed, 17 Feb 2016 00:36:08 -0500
|
||||
Subject: [PATCH] =?UTF-8?q?Applying=20Petr=20P=C3=ADsa=C5=99=20=20fix=20?=
|
||||
=?UTF-8?q?=20for=20DBD::SQLite=20error?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This fix corrects test failures for DBD::SQLite inside Padre.
|
||||
---
|
||||
lib/Padre/Locker.pm | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/Padre/Locker.pm b/lib/Padre/Locker.pm
|
||||
index 7eaf919..e0db4e8 100644
|
||||
--- a/lib/Padre/Locker.pm
|
||||
+++ b/lib/Padre/Locker.pm
|
||||
@@ -102,7 +102,7 @@ sub shutdown {
|
||||
sub db_increment {
|
||||
my $self = shift;
|
||||
unless ( $self->{db_depth}++ ) {
|
||||
- Padre::DB->begin;
|
||||
+
|
||||
|
||||
# Database operations we lock on are the most likely to
|
||||
# involve writes. So opportunistically prevent blocking
|
||||
@@ -111,6 +111,7 @@ sub db_increment {
|
||||
# corruption if (and only if) there is a power outage,
|
||||
# operating system crash, or catastrophic hardware failure.
|
||||
Padre::DB->pragma( synchronous => 0 );
|
||||
+ Padre::DB->begin;
|
||||
}
|
||||
return;
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST howm-1.3.9.2.tar.gz 462278 SHA256 baff5ce28580502a876600350b7eac5d5bf1cd32ba60c115cbb9edc2ac63d578 SHA512 34e867d35ac8a2092b29d24ec1673255fcce54369d3aa2e6497ea4c891d4ea7f038e80f6103ad1f6359d8390a5d9a57901019cd3d76cc24e439b44dba5cc27bf WHIRLPOOL eafd272caec4437f94b5594c9375f7d999db65b0f15535d291ce02ae1ce090ecbed09acef0de07b558e703b09791d8fb66dab79b73738b0bf56ee3b36979c050
|
||||
DIST howm-1.4.3.tar.gz 552747 SHA256 fb7336e0a52df3d5fe72e1bbf4ffb57f1139757f6af2964ee62cc94b4729dcab SHA512 da6eec498545dced3bad3c6968bb31a24b01b85220dd80c6e1ee312a0cf1a0b883dc77744f5052261e4bf0d536da057fbe05040fbb429b61a8580330750ce189 WHIRLPOOL e7ea2edd39a008b65e493de5728fd07ffd14b04e6b2e38eae6a68b6bdc670a11ac50fbe952890ef8563283de674230e3813125eb8e62d2afc0fd7bdfd72c8f3b
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit elisp
|
||||
|
||||
DESCRIPTION="Note-taking tool on Emacs"
|
||||
HOMEPAGE="http://howm.sourceforge.jp/"
|
||||
SRC_URI="http://howm.sourceforge.jp/a/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-1+ GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
|
||||
src_configure() {
|
||||
econf --with-docdir="${EPREFIX}/usr/share/doc/${PF}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -j1 </dev/null
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake -j1 \
|
||||
DESTDIR="${D}" \
|
||||
PREFIX="${EPREFIX}/usr" \
|
||||
LISPDIR="${EPREFIX}${SITELISP}/${PN}" \
|
||||
install </dev/null
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
|
||||
dodoc ChangeLog
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elisp-site-regen
|
||||
elog "site-gentoo.el does no longer define global keybindings for howm."
|
||||
elog "Add the following line to ~/.emacs for the previous behaviour:"
|
||||
elog " (require 'howm)"
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST tuareg-2.0.7.tar.gz 57999 SHA256 7ba8016cdd2195d37ccc1c0e300323f807b8bdc6d3ce9e622ae9a36355d3a9c9 SHA512 6cf290879dd9b7993a046dbebb9944a245fa82d1e7849b46f477b7217b46026ce5195e40e4d9b990e047a03680197827334e6d54d82610da6fc2e62386357d42 WHIRLPOOL 19b6c8fb7e7b6427499aa7aec0b22e0152ca35e93c042c2f3e4a760a76ba4c89c7951df25a128414a2f7df5aee7d76aea255c0b235065c9dcae4e62ed3c05c86
|
||||
DIST tuareg-2.0.8.tar.gz 57777 SHA256 13da95153d6d50ef697878c45d81302340f97a42ab14112c61b8c6b0e891512c SHA512 c9e268eb550fd36614e6632335b623a0916d64dd84a0259fd83c6f08e3138196d3871bc7664d6debe62732d4459130ef1e9271b24982138ff69d90442d031990 WHIRLPOOL 08e5f39111e8770ee1e4c8d0fe5104b20a3bcf89bb08a7acac0758d7933243cc55f6933e838c85aae2dadd1836301d3e9988fe38f7863fbe39410f879d17a67e
|
||||
DIST tuareg-mode-2.0.10.tar.gz 102576 SHA256 f83438208fa4f0e93e662620fb6c939e272041ba6b32cf28397618cd28ab5ae4 SHA512 53bdc3b2b78bcf7e6b075932b9319f9d08b02b4b3fd74fc9aa30b390b30e4069e19e09e0fbb03fb11877e6d89649b8e59c645cc8de196115c1bbdab308145743 WHIRLPOOL 1a48ec2ecc9ab7d4203860cbf1dc00d64b80082014d3053db686097ca1f7ef1d2cb311976b2b3a0bd58704ab5f8734b33ee781de3bf57ee2323ea54c2286318a
|
||||
|
||||
@ -0,0 +1,19 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit elisp
|
||||
|
||||
DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
|
||||
HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
|
||||
SRC_URI="https://github.com/ocaml/tuareg/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
|
||||
|
||||
S="${WORKDIR}/tuareg-${PV}"
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
DOCS="README.md"
|
||||
@ -1 +1,2 @@
|
||||
DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 SHA512 654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db WHIRLPOOL dcb3e5f7da89dd8e14d636d7ebd476e076e0043880bb9ea3fb1c03cb4bcd4e5c7d3c4719da26c3ce521e3a3db5ae671e86f198ac1bc3474e774d75504fef8b8d
|
||||
DIST qemu-2.7.1.tar.bz2 26868403 SHA256 68636788eb69bcb0b44ba220b32b50495d6bd5712a934c282217831c4822958f SHA512 16a83946e9064733254c82c961749bf9c56a0a2a8ee46145b4a78e1452ac0e2548d888963d18c80e28f65202890fd643b0011951b5b1c66ef16234767ed91898 WHIRLPOOL ae3d3c2b2a3700613733659847de6187755631cb09e8c3548ea30cd994357c9ff128646edce88dfe4dce53e6c1c0f37f8de3688ee7e22262033b40f3fc706efa
|
||||
|
||||
@ -1,38 +1,37 @@
|
||||
From: Prasad J Pandit <address@hidden>
|
||||
From 973e7170dddefb491a48df5cba33b2ae151013a0 Mon Sep 17 00:00:00 2001
|
||||
From: Prasad J Pandit <pjp@fedoraproject.org>
|
||||
Date: Mon, 19 Sep 2016 23:55:45 +0530
|
||||
Subject: [PATCH] virtio: add check for descriptor's mapped address
|
||||
|
||||
virtio back end uses set of buffers to facilitate I/O operations.
|
||||
If its size is too large, 'cpu_physical_memory_map' could return
|
||||
a null address. This would result in a null dereference
|
||||
while un-mapping descriptors. Add check to avoid it.
|
||||
a null address. This would result in a null dereference while
|
||||
un-mapping descriptors. Add check to avoid it.
|
||||
|
||||
Reported-by: Qinghao Tang <address@hidden>
|
||||
Signed-off-by: Prasad J Pandit <address@hidden>
|
||||
Reported-by: Qinghao Tang <luodalongde@gmail.com>
|
||||
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
||||
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
||||
---
|
||||
hw/virtio/virtio.c | 10 ++++++----
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
hw/virtio/virtio.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
|
||||
index 15ee3a7..0a4c5b6 100644
|
||||
index fcf3358d6c0d..bb656b1ccff0 100644
|
||||
--- a/hw/virtio/virtio.c
|
||||
+++ b/hw/virtio/virtio.c
|
||||
@@ -472,12 +472,14 @@ static void virtqueue_map_desc(unsigned int *p_num_sg, hwaddr *addr, struct iove
|
||||
@@ -495,6 +495,11 @@ static void virtqueue_map_desc(unsigned int *p_num_sg, hwaddr *addr, struct iove
|
||||
}
|
||||
|
||||
iov[num_sg].iov_base = cpu_physical_memory_map(pa, &len, is_write);
|
||||
- iov[num_sg].iov_len = len;
|
||||
- addr[num_sg] = pa;
|
||||
+ if (iov[num_sg].iov_base) {
|
||||
+ iov[num_sg].iov_len = len;
|
||||
+ addr[num_sg] = pa;
|
||||
|
||||
+ pa += len;
|
||||
+ num_sg++;
|
||||
+ if (!iov[num_sg].iov_base) {
|
||||
+ error_report("virtio: bogus descriptor or out of resources");
|
||||
+ exit(1);
|
||||
+ }
|
||||
sz -= len;
|
||||
- pa += len;
|
||||
- num_sg++;
|
||||
}
|
||||
*p_num_sg = num_sg;
|
||||
}
|
||||
+
|
||||
iov[num_sg].iov_len = len;
|
||||
addr[num_sg] = pa;
|
||||
|
||||
--
|
||||
2.5.5
|
||||
2.11.0
|
||||
|
||||
@ -0,0 +1,699 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="5"
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="ncurses,readline"
|
||||
|
||||
PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
|
||||
|
||||
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
|
||||
user udev fcaps readme.gentoo-r1 pax-utils l10n
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
EGIT_REPO_URI="git://git.qemu.org/qemu.git"
|
||||
inherit git-2
|
||||
SRC_URI=""
|
||||
else
|
||||
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
|
||||
HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2 BSD-2"
|
||||
SLOT="0"
|
||||
IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs \
|
||||
gnutls gtk gtk2 infiniband iscsi +jpeg \
|
||||
kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
|
||||
+png pulseaudio python \
|
||||
rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu
|
||||
static-user systemtap tci test +threads usb usbredir +uuid vde +vhost-net \
|
||||
virgl virtfs +vnc vte xattr xen xfs"
|
||||
|
||||
COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
|
||||
mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
|
||||
x86_64"
|
||||
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb"
|
||||
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx"
|
||||
|
||||
use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
|
||||
use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
|
||||
IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
|
||||
|
||||
# Allow no targets to be built so that people can get a tools-only build.
|
||||
# Block USE flag configurations known to not work.
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
||||
gtk2? ( gtk )
|
||||
qemu_softmmu_targets_arm? ( fdt )
|
||||
qemu_softmmu_targets_microblaze? ( fdt )
|
||||
qemu_softmmu_targets_ppc? ( fdt )
|
||||
qemu_softmmu_targets_ppc64? ( fdt )
|
||||
sdl2? ( sdl )
|
||||
static? ( static-softmmu static-user )
|
||||
static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 )
|
||||
virtfs? ( xattr )
|
||||
vte? ( gtk )"
|
||||
|
||||
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
|
||||
#
|
||||
# The attr lib isn't always linked in (although the USE flag is always
|
||||
# respected). This is because qemu supports using the C library's API
|
||||
# when available rather than always using the extranl library.
|
||||
#
|
||||
# Older versions of gnutls are supported, but it's simpler to just require
|
||||
# the latest versions. This is also why we require nettle.
|
||||
#
|
||||
# TODO: Split out tools deps into another var. e.g. bzip2 is only used by
|
||||
# system binaries and tools, not user binaries.
|
||||
COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
|
||||
sys-libs/zlib[static-libs(+)]
|
||||
bzip2? ( app-arch/bzip2[static-libs(+)] )
|
||||
xattr? ( sys-apps/attr[static-libs(+)] )"
|
||||
SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
|
||||
>=x11-libs/pixman-0.28.0[static-libs(+)]
|
||||
accessibility? ( app-accessibility/brltty[static-libs(+)] )
|
||||
aio? ( dev-libs/libaio[static-libs(+)] )
|
||||
alsa? ( >=media-libs/alsa-lib-1.0.13 )
|
||||
bluetooth? ( net-wireless/bluez )
|
||||
caps? ( sys-libs/libcap-ng[static-libs(+)] )
|
||||
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
|
||||
fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
|
||||
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
|
||||
gnutls? (
|
||||
dev-libs/nettle:=[static-libs(+)]
|
||||
>=net-libs/gnutls-3.0:=[static-libs(+)]
|
||||
)
|
||||
gtk? (
|
||||
gtk2? (
|
||||
x11-libs/gtk+:2
|
||||
vte? ( x11-libs/vte:0 )
|
||||
)
|
||||
!gtk2? (
|
||||
x11-libs/gtk+:3
|
||||
vte? ( x11-libs/vte:2.91 )
|
||||
)
|
||||
)
|
||||
infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] )
|
||||
iscsi? ( net-libs/libiscsi )
|
||||
jpeg? ( virtual/jpeg:0=[static-libs(+)] )
|
||||
lzo? ( dev-libs/lzo:2[static-libs(+)] )
|
||||
ncurses? ( sys-libs/ncurses:0=[static-libs(+)] )
|
||||
nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
|
||||
numa? ( sys-process/numactl[static-libs(+)] )
|
||||
opengl? (
|
||||
virtual/opengl
|
||||
media-libs/libepoxy[static-libs(+)]
|
||||
media-libs/mesa[static-libs(+)]
|
||||
media-libs/mesa[egl,gles2,gbm]
|
||||
)
|
||||
png? ( media-libs/libpng:0=[static-libs(+)] )
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
rbd? ( sys-cluster/ceph[static-libs(+)] )
|
||||
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
|
||||
sdl? (
|
||||
!sdl2? (
|
||||
media-libs/libsdl[X]
|
||||
>=media-libs/libsdl-1.2.11[static-libs(+)]
|
||||
)
|
||||
sdl2? (
|
||||
media-libs/libsdl2[X]
|
||||
media-libs/libsdl2[static-libs(+)]
|
||||
)
|
||||
)
|
||||
seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
|
||||
smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
|
||||
snappy? ( app-arch/snappy[static-libs(+)] )
|
||||
spice? (
|
||||
>=app-emulation/spice-protocol-0.12.3
|
||||
>=app-emulation/spice-0.12.0[static-libs(+)]
|
||||
)
|
||||
ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
|
||||
usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
|
||||
usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
|
||||
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
|
||||
vde? ( net-misc/vde[static-libs(+)] )
|
||||
virgl? ( media-libs/virglrenderer[static-libs(+)] )
|
||||
virtfs? ( sys-libs/libcap )
|
||||
xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
|
||||
USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
|
||||
X86_FIRMWARE_DEPEND="
|
||||
>=sys-firmware/ipxe-1.0.0_p20130624
|
||||
pin-upstream-blobs? (
|
||||
~sys-firmware/seabios-1.8.2
|
||||
~sys-firmware/sgabios-0.1_pre8
|
||||
~sys-firmware/vgabios-0.7a
|
||||
)
|
||||
!pin-upstream-blobs? (
|
||||
sys-firmware/seabios
|
||||
sys-firmware/sgabios
|
||||
sys-firmware/vgabios
|
||||
)"
|
||||
CDEPEND="
|
||||
!static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) )
|
||||
!static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
|
||||
qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
|
||||
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
systemtap? ( dev-util/systemtap )
|
||||
xen? ( app-emulation/xen-tools:= )"
|
||||
DEPEND="${CDEPEND}
|
||||
dev-lang/perl
|
||||
=dev-lang/python-2*
|
||||
sys-apps/texinfo
|
||||
virtual/pkgconfig
|
||||
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
|
||||
gtk? ( nls? ( sys-devel/gettext ) )
|
||||
static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) )
|
||||
static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) )
|
||||
test? (
|
||||
dev-libs/glib[utils]
|
||||
sys-devel/bc
|
||||
)"
|
||||
RDEPEND="${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-qemu )
|
||||
"
|
||||
|
||||
STRIP_MASK="/usr/share/qemu/palcode-clipper"
|
||||
|
||||
QA_PREBUILT="
|
||||
usr/share/qemu/openbios-ppc
|
||||
usr/share/qemu/openbios-sparc64
|
||||
usr/share/qemu/openbios-sparc32
|
||||
usr/share/qemu/palcode-clipper
|
||||
usr/share/qemu/s390-ccw.img
|
||||
usr/share/qemu/u-boot.e500
|
||||
"
|
||||
|
||||
QA_WX_LOAD="usr/bin/qemu-i386
|
||||
usr/bin/qemu-x86_64
|
||||
usr/bin/qemu-alpha
|
||||
usr/bin/qemu-arm
|
||||
usr/bin/qemu-cris
|
||||
usr/bin/qemu-m68k
|
||||
usr/bin/qemu-microblaze
|
||||
usr/bin/qemu-microblazeel
|
||||
usr/bin/qemu-mips
|
||||
usr/bin/qemu-mipsel
|
||||
usr/bin/qemu-or32
|
||||
usr/bin/qemu-ppc
|
||||
usr/bin/qemu-ppc64
|
||||
usr/bin/qemu-ppc64abi32
|
||||
usr/bin/qemu-sh4
|
||||
usr/bin/qemu-sh4eb
|
||||
usr/bin/qemu-sparc
|
||||
usr/bin/qemu-sparc64
|
||||
usr/bin/qemu-armeb
|
||||
usr/bin/qemu-sparc32plus
|
||||
usr/bin/qemu-s390x
|
||||
usr/bin/qemu-unicore32"
|
||||
|
||||
DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
|
||||
you have the kernel module loaded before running kvm. The easiest way to
|
||||
ensure that the kernel module is loaded is to load it on boot.\n
|
||||
For AMD CPUs the module is called 'kvm-amd'.\n
|
||||
For Intel CPUs the module is called 'kvm-intel'.\n
|
||||
Please review /etc/conf.d/modules for how to load these.\n\n
|
||||
Make sure your user is in the 'kvm' group\n
|
||||
Just run 'gpasswd -a <USER> kvm', then have <USER> re-login.\n\n
|
||||
For brand new installs, the default permissions on /dev/kvm might not let you
|
||||
access it. You can tell udev to reset ownership/perms:\n
|
||||
udevadm trigger -c add /dev/kvm"
|
||||
|
||||
qemu_support_kvm() {
|
||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
|
||||
use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
|
||||
use qemu_softmmu_targets_s390x; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
if use kernel_linux && kernel_is lt 2 6 25; then
|
||||
eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
|
||||
elif use kernel_linux; then
|
||||
if ! linux_config_exists; then
|
||||
eerror "Unable to check your kernel for KVM support"
|
||||
else
|
||||
CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
|
||||
ERROR_KVM="You must enable KVM in your kernel to continue"
|
||||
ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
|
||||
ERROR_KVM_AMD+=" your kernel configuration."
|
||||
ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
|
||||
ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
|
||||
ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
|
||||
ERROR_TUN+=" into your kernel or loaded as a module to use the"
|
||||
ERROR_TUN+=" virtual network device if using -net tap."
|
||||
ERROR_BRIDGE="You will also need support for 802.1d"
|
||||
ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
|
||||
use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
|
||||
ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
|
||||
ERROR_VHOST_NET+=" support"
|
||||
|
||||
if use amd64 || use x86 || use amd64-linux || use x86-linux; then
|
||||
CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
|
||||
fi
|
||||
|
||||
use python && CONFIG_CHECK+=" ~DEBUG_FS"
|
||||
ERROR_DEBUG_FS="debugFS support required for kvm_stat"
|
||||
|
||||
# Now do the actual checks setup above
|
||||
check_extra_config
|
||||
fi
|
||||
fi
|
||||
|
||||
if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
|
||||
eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
|
||||
eerror "instances are still pointing to it. Please update your"
|
||||
eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
|
||||
eerror "and the right system binary (e.g. qemu-system-x86_64)."
|
||||
die "update your virt configs to not use qemu-kvm"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup kvm 78
|
||||
}
|
||||
|
||||
# Sanity check to make sure target lists are kept up-to-date.
|
||||
check_targets() {
|
||||
local var=$1 mak=$2
|
||||
local detected sorted
|
||||
|
||||
pushd "${S}"/default-configs >/dev/null || die
|
||||
|
||||
# Force C locale until glibc is updated. #564936
|
||||
detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
|
||||
sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
|
||||
if [[ ${sorted} != "${detected}" ]] ; then
|
||||
eerror "The ebuild needs to be kept in sync."
|
||||
eerror "${var}: ${sorted}"
|
||||
eerror "$(printf '%-*s' ${#var} configure): ${detected}"
|
||||
die "sync ${var} to the list of targets"
|
||||
fi
|
||||
|
||||
popd >/dev/null
|
||||
}
|
||||
|
||||
handle_locales() {
|
||||
# Make sure locale list is kept up-to-date.
|
||||
local detected sorted
|
||||
detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
|
||||
sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
|
||||
if [[ ${sorted} != "${detected}" ]] ; then
|
||||
eerror "The ebuild needs to be kept in sync."
|
||||
eerror "PLOCALES: ${sorted}"
|
||||
eerror " po/*.po: ${detected}"
|
||||
die "sync PLOCALES"
|
||||
fi
|
||||
|
||||
# Deal with selective install of locales.
|
||||
if use nls ; then
|
||||
# Delete locales the user does not want. #577814
|
||||
rm_loc() { rm po/$1.po || die; }
|
||||
l10n_for_each_disabled_locale_do rm_loc
|
||||
else
|
||||
# Cheap hack to disable gettext .mo generation.
|
||||
rm -f po/*.po
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
check_targets IUSE_SOFTMMU_TARGETS softmmu
|
||||
check_targets IUSE_USER_TARGETS linux-user
|
||||
|
||||
# Alter target makefiles to accept CFLAGS set via flag-o
|
||||
sed -i -r \
|
||||
-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
|
||||
Makefile Makefile.target || die
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-2.5.0-cflags.patch
|
||||
epatch "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-6836.patch #591242
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7156.patch #593036
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7170.patch #593284
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7422.patch #593956
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7466.patch #594520
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7907.patch #596048
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7908.patch #596049
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7909.patch #596048
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7994-1.patch #596738
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-7994-2.patch #596738
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8576.patch #596752
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8577.patch #596776
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8578.patch #596774
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8668.patch #597110
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8669-1.patch #597108
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8669-2.patch #597108
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8909.patch #598044
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-9102.patch #598328
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-9103.patch #598328
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-9104.patch #598328
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-9105.patch #598328
|
||||
epatch "${FILESDIR}"/${PN}-2.7.0-CVE-2016-9106.patch #598772
|
||||
|
||||
# Fix ld and objcopy being called directly
|
||||
tc-export AR LD OBJCOPY
|
||||
|
||||
# Verbose builds
|
||||
MAKEOPTS+=" V=1"
|
||||
|
||||
epatch_user
|
||||
|
||||
# Run after we've applied all patches.
|
||||
handle_locales
|
||||
}
|
||||
|
||||
##
|
||||
# configures qemu based on the build directory and the build type
|
||||
# we are using.
|
||||
#
|
||||
qemu_src_configure() {
|
||||
debug-print-function ${FUNCNAME} "$@"
|
||||
|
||||
local buildtype=$1
|
||||
local builddir="${S}/${buildtype}-build"
|
||||
local static_flag="static-${buildtype}"
|
||||
|
||||
mkdir "${builddir}"
|
||||
|
||||
local conf_opts=(
|
||||
--prefix=/usr
|
||||
--sysconfdir=/etc
|
||||
--libdir=/usr/$(get_libdir)
|
||||
--docdir=/usr/share/doc/${PF}/html
|
||||
--disable-bsd-user
|
||||
--disable-guest-agent
|
||||
--disable-strip
|
||||
--disable-werror
|
||||
# We support gnutls/nettle for crypto operations. It is possible
|
||||
# to use gcrypt when gnutls/nettle are disabled (but not when they
|
||||
# are enabled), but it's not really worth the hassle. Disable it
|
||||
# all the time to avoid automatically detecting it. #568856
|
||||
--disable-gcrypt
|
||||
--python="${PYTHON}"
|
||||
--cc="$(tc-getCC)"
|
||||
--cxx="$(tc-getCXX)"
|
||||
--host-cc="$(tc-getBUILD_CC)"
|
||||
$(use_enable debug debug-info)
|
||||
$(use_enable debug debug-tcg)
|
||||
--enable-docs
|
||||
$(use_enable tci tcg-interpreter)
|
||||
$(use_enable xattr attr)
|
||||
)
|
||||
|
||||
# Disable options not used by user targets as the default configure
|
||||
# options will autoprobe and try to link in a bunch of unused junk.
|
||||
conf_softmmu() {
|
||||
if [[ ${buildtype} == "user" ]] ; then
|
||||
echo "--disable-${2:-$1}"
|
||||
else
|
||||
use_enable "$@"
|
||||
fi
|
||||
}
|
||||
conf_opts+=(
|
||||
$(conf_softmmu accessibility brlapi)
|
||||
$(conf_softmmu aio linux-aio)
|
||||
$(conf_softmmu bzip2)
|
||||
$(conf_softmmu bluetooth bluez)
|
||||
$(conf_softmmu caps cap-ng)
|
||||
$(conf_softmmu curl)
|
||||
$(conf_softmmu fdt)
|
||||
$(conf_softmmu glusterfs)
|
||||
$(conf_softmmu gnutls)
|
||||
$(conf_softmmu gnutls nettle)
|
||||
$(conf_softmmu gtk)
|
||||
$(conf_softmmu infiniband rdma)
|
||||
$(conf_softmmu iscsi libiscsi)
|
||||
$(conf_softmmu jpeg vnc-jpeg)
|
||||
$(conf_softmmu kernel_linux kvm)
|
||||
$(conf_softmmu lzo)
|
||||
$(conf_softmmu ncurses curses)
|
||||
$(conf_softmmu nfs libnfs)
|
||||
$(conf_softmmu numa)
|
||||
$(conf_softmmu opengl)
|
||||
$(conf_softmmu png vnc-png)
|
||||
$(conf_softmmu rbd)
|
||||
$(conf_softmmu sasl vnc-sasl)
|
||||
$(conf_softmmu sdl)
|
||||
$(conf_softmmu seccomp)
|
||||
$(conf_softmmu smartcard)
|
||||
$(conf_softmmu snappy)
|
||||
$(conf_softmmu spice)
|
||||
$(conf_softmmu ssh libssh2)
|
||||
$(conf_softmmu usb libusb)
|
||||
$(conf_softmmu usbredir usb-redir)
|
||||
$(conf_softmmu uuid)
|
||||
$(conf_softmmu vde)
|
||||
$(conf_softmmu vhost-net)
|
||||
$(conf_softmmu virgl virglrenderer)
|
||||
$(conf_softmmu virtfs)
|
||||
$(conf_softmmu vnc)
|
||||
$(conf_softmmu vte)
|
||||
$(conf_softmmu xen)
|
||||
$(conf_softmmu xen xen-pci-passthrough)
|
||||
$(conf_softmmu xfs xfsctl)
|
||||
)
|
||||
|
||||
case ${buildtype} in
|
||||
user)
|
||||
conf_opts+=(
|
||||
--enable-linux-user
|
||||
--disable-system
|
||||
--disable-blobs
|
||||
--disable-tools
|
||||
)
|
||||
;;
|
||||
softmmu)
|
||||
# audio options
|
||||
local audio_opts="oss"
|
||||
use alsa && audio_opts="alsa,${audio_opts}"
|
||||
use sdl && audio_opts="sdl,${audio_opts}"
|
||||
use pulseaudio && audio_opts="pa,${audio_opts}"
|
||||
|
||||
conf_opts+=(
|
||||
--disable-linux-user
|
||||
--enable-system
|
||||
--with-system-pixman
|
||||
--audio-drv-list="${audio_opts}"
|
||||
)
|
||||
use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
|
||||
use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
|
||||
;;
|
||||
tools)
|
||||
conf_opts+=(
|
||||
--disable-linux-user
|
||||
--disable-system
|
||||
--disable-blobs
|
||||
$(use_enable bzip2)
|
||||
)
|
||||
static_flag="static"
|
||||
;;
|
||||
esac
|
||||
|
||||
local targets="${buildtype}_targets"
|
||||
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
||||
|
||||
# Add support for SystemTAP
|
||||
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
|
||||
|
||||
# We always want to attempt to build with PIE support as it results
|
||||
# in a more secure binary. But it doesn't work with static or if
|
||||
# the current GCC doesn't have PIE support.
|
||||
if use ${static_flag}; then
|
||||
conf_opts+=( --static --disable-pie )
|
||||
else
|
||||
gcc-specs-pie && conf_opts+=( --enable-pie )
|
||||
fi
|
||||
|
||||
echo "../configure ${conf_opts[*]}"
|
||||
cd "${builddir}"
|
||||
../configure "${conf_opts[@]}" || die "configure failed"
|
||||
|
||||
# FreeBSD's kernel does not support QEMU assigning/grabbing
|
||||
# host USB devices yet
|
||||
use kernel_FreeBSD && \
|
||||
sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local target
|
||||
|
||||
python_setup
|
||||
|
||||
softmmu_targets= softmmu_bins=()
|
||||
user_targets= user_bins=()
|
||||
|
||||
for target in ${IUSE_SOFTMMU_TARGETS} ; do
|
||||
if use "qemu_softmmu_targets_${target}"; then
|
||||
softmmu_targets+=",${target}-softmmu"
|
||||
softmmu_bins+=( "qemu-system-${target}" )
|
||||
fi
|
||||
done
|
||||
|
||||
for target in ${IUSE_USER_TARGETS} ; do
|
||||
if use "qemu_user_targets_${target}"; then
|
||||
user_targets+=",${target}-linux-user"
|
||||
user_bins+=( "qemu-${target}" )
|
||||
fi
|
||||
done
|
||||
|
||||
softmmu_targets=${softmmu_targets#,}
|
||||
user_targets=${user_targets#,}
|
||||
|
||||
[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
|
||||
[[ -n ${user_targets} ]] && qemu_src_configure "user"
|
||||
[[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if [[ -n ${user_targets} ]]; then
|
||||
cd "${S}/user-build"
|
||||
default
|
||||
fi
|
||||
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
cd "${S}/softmmu-build"
|
||||
default
|
||||
fi
|
||||
|
||||
if [[ -z ${softmmu_targets}${user_targets} ]]; then
|
||||
cd "${S}/tools-build"
|
||||
default
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
cd "${S}/softmmu-build"
|
||||
pax-mark m */qemu-system-* #515550
|
||||
emake -j1 check
|
||||
emake -j1 check-report.html
|
||||
fi
|
||||
}
|
||||
|
||||
qemu_python_install() {
|
||||
python_domodule "${S}/scripts/qmp/qmp.py"
|
||||
|
||||
python_doscript "${S}/scripts/kvm/vmxcap"
|
||||
python_doscript "${S}/scripts/qmp/qmp-shell"
|
||||
python_doscript "${S}/scripts/qmp/qemu-ga-client"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if [[ -n ${user_targets} ]]; then
|
||||
cd "${S}/user-build"
|
||||
emake DESTDIR="${ED}" install
|
||||
|
||||
# Install binfmt handler init script for user targets
|
||||
newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
|
||||
fi
|
||||
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
cd "${S}/softmmu-build"
|
||||
emake DESTDIR="${ED}" install
|
||||
|
||||
# This might not exist if the test failed. #512010
|
||||
[[ -e check-report.html ]] && dohtml check-report.html
|
||||
|
||||
if use kernel_linux; then
|
||||
udev_dorules "${FILESDIR}"/65-kvm.rules
|
||||
fi
|
||||
|
||||
if use python; then
|
||||
python_foreach_impl qemu_python_install
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -z ${softmmu_targets}${user_targets} ]]; then
|
||||
cd "${S}/tools-build"
|
||||
emake DESTDIR="${ED}" install
|
||||
fi
|
||||
|
||||
# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
|
||||
pushd "${ED}"/usr/bin >/dev/null
|
||||
pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
|
||||
popd >/dev/null
|
||||
|
||||
# Install config file example for qemu-bridge-helper
|
||||
insinto "/etc/qemu"
|
||||
doins "${FILESDIR}/bridge.conf"
|
||||
|
||||
# Remove the docdir placed qmp-commands.txt
|
||||
mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/" || die
|
||||
|
||||
cd "${S}"
|
||||
dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
|
||||
newdoc pc-bios/README README.pc-bios
|
||||
dodoc docs/qmp-*.txt
|
||||
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
# Remove SeaBIOS since we're using the SeaBIOS packaged one
|
||||
rm "${ED}/usr/share/qemu/bios.bin"
|
||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
||||
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
|
||||
fi
|
||||
|
||||
# Remove vgabios since we're using the vgabios packaged one
|
||||
rm "${ED}/usr/share/qemu/vgabios.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
|
||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
||||
dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
|
||||
dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
|
||||
dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
|
||||
dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
|
||||
dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
|
||||
fi
|
||||
|
||||
# Remove sgabios since we're using the sgabios packaged one
|
||||
rm "${ED}/usr/share/qemu/sgabios.bin"
|
||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
||||
dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
|
||||
fi
|
||||
|
||||
# Remove iPXE since we're using the iPXE packaged one
|
||||
rm "${ED}"/usr/share/qemu/pxe-*.rom
|
||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
||||
dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
|
||||
dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
|
||||
dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
|
||||
dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
|
||||
dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
|
||||
dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
|
||||
fi
|
||||
fi
|
||||
|
||||
qemu_support_kvm && readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if qemu_support_kvm; then
|
||||
readme.gentoo_print_elog
|
||||
fi
|
||||
|
||||
if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
|
||||
udev_reload
|
||||
fi
|
||||
|
||||
fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
|
||||
}
|
||||
|
||||
pkg_info() {
|
||||
echo "Using:"
|
||||
echo " $(best_version app-emulation/spice-protocol)"
|
||||
echo " $(best_version sys-firmware/ipxe)"
|
||||
echo " $(best_version sys-firmware/seabios)"
|
||||
if has_version 'sys-firmware/seabios[binary]'; then
|
||||
echo " USE=binary"
|
||||
else
|
||||
echo " USE=''"
|
||||
fi
|
||||
echo " $(best_version sys-firmware/vgabios)"
|
||||
}
|
||||
@ -1,2 +1,2 @@
|
||||
DIST man-pages-ru_3.71-2209-1992-20140911.tar.bz2 1009646 SHA256 b6f599776a175c7fff8b8b37be8be0ab8ecd5df55c382b7a687dcf6bca8d478f SHA512 c6585323ef9cece674fe4144ff1e73e2d4d831e3f8766b5091f57b7e7c13d9c68c446323515f85f4c7fd956987e40d1d22a81c0cba21593133030e1f968fde12 WHIRLPOOL a41d141be4d6d9663829ccbced477bec11adad718cd95098c74e37e82b2317c38251dc399b7531454e48ce9d56604870c0a372f24eb8e6ab2b36a56dbf8b910f
|
||||
DIST man-pages-ru_3.81-2230-2080-20160117.tar.bz2 1119715 SHA256 225c2e4eeb1a9071ab995b446cecfec51b24b2034191133c2035ad8c540a921b SHA512 2d38d4aca0d247f6f23556e58f5538510e58596146d481e72b6d70c9282b8ec24f79da1c7525612f8b4e968cd7049f2ba51eb40804804ba6d9aeb39f4b4d12dc WHIRLPOOL 9fdef40b11119fff41dbe099c321fc7358d9df391e5a55a5d0ea1a8b2691fd5666755ed70e497501ef182ffa4b5e5c738386377f7feb29cc6f09001101ee88ed
|
||||
DIST man-pages-ru_4.05-2306-2240-20161008.tar.bz2 1371026 SHA256 160637a9ab0dc0ad154a88574f97d39ec653e83c45627e9d55e7b4c90f850a21 SHA512 724c4a076ecbfc7dd8c1d14e5db326866bef0d1f61da529225ee981d855bbdf276097bc077e5b78ab6dcac14a54bcadcc37a408091a48d48a9471bb2d9c51b9b WHIRLPOOL 063a4959bf6e57e12b4b1b65053d01777af767d76563163f0dd9afeccb248a2895679467a07219d6a0f355c79635bc3f0bc4473803783766e63c854cc656c063
|
||||
|
||||
@ -1,16 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>andreis.vinogradovs@gmail.com</email>
|
||||
<name>Andreis Vinogradovs</name>
|
||||
</maintainer>
|
||||
<maintainer type="person">
|
||||
<email>maksbotan@gentoo.org</email>
|
||||
<name>Maxim Koltsov</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,11 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>dev-zero@gentoo.org</email>
|
||||
<name>Tiziano Müller</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">chaos/scrub</remote-id>
|
||||
</upstream>
|
||||
<maintainer type="person">
|
||||
<email>dev-zero@gentoo.org</email>
|
||||
<name>Tiziano Müller</name>
|
||||
</maintainer>
|
||||
<longdescription>Scrub overwrites hard disks, files, and other devices with repeating patterns intended to make recovering data from these devices more difficult.
|
||||
</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="github">chaos/scrub</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,2 +1 @@
|
||||
DIST ytree-1.98.tar.gz 122610 SHA256 e7264e1c112bf62aba1f6ed0078308930cd8f01317a157ed1718b8dac09195c5 SHA512 b75f3b04af72270e2b4db6dc7448435fdf2d197d98bd2f4fdf6d3131091c8c3a697f8b0cabc1625502c616cee4e27ae6aa6fa2bfc082beeae1b6ecad9921dbef WHIRLPOOL 292da20c8c918eb468ccab6d0a5e09ecef8c44dad990326e2366eac81f11c039d1461308b053b54d751a7fb883dac9dda28d6abe6d12f2682c4b58dc58390665
|
||||
DIST ytree-1.99pl1.tar.gz 122996 SHA256 763e8c2af528174cd738ed8f2eca62579e3edef57ccbd242be7cf181ae15d251 SHA512 3d2ffae5cccf973bb06ec64917dc8f5b69e0ab95910144c5058b166479334fc563807a813ef608678463a032a8d2234f1006b820baa04aa95e77b06888af81fc WHIRLPOOL a1541789d9ec4230db6ffc8d60d32849ade4e4af36e9be7124b05d3575fd59306e5ebfe8778245a32d5f036076a8c0a2d8114de773fd198d4bb23d47ad173c27
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
DESCRIPTION="A curses-based file manager"
|
||||
HOMEPAGE="http://www.han.de/~werner/ytree.html"
|
||||
SRC_URI="http://www.han.de/~werner/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
sys-libs/ncurses:0=
|
||||
sys-libs/readline:0=
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${PN}-1.94-bindir.patch )
|
||||
|
||||
DOCS=( CHANGES README THANKS ytree.conf )
|
||||
|
||||
pkg_setup() {
|
||||
tc-export CC
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}usr" install
|
||||
einstalldocs
|
||||
}
|
||||
@ -0,0 +1,71 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="6"
|
||||
|
||||
PYTHON_COMPAT=(python{2_7,3_4,3_5} pypy)
|
||||
PYTHON_REQ_USE="xml(+),threads(+)"
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Collection of administration scripts for Gentoo"
|
||||
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
|
||||
SRC_URI="http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
|
||||
RDEPEND="${DEPEND}
|
||||
!<=app-portage/gentoolkit-dev-0.2.7
|
||||
sys-apps/gawk
|
||||
sys-apps/gentoo-functions"
|
||||
|
||||
python_prepare_all() {
|
||||
python_setup
|
||||
echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
|
||||
VERSION="${PVR}" "${PYTHON}" setup.py set_version
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
|
||||
# remove on Gentoo Prefix platforms where it's broken anyway
|
||||
if use prefix; then
|
||||
elog "The revdep-rebuild command is removed, the preserve-libs"
|
||||
elog "feature of portage will handle issues."
|
||||
rm "${ED}"/usr/bin/revdep-rebuild*
|
||||
rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
|
||||
rm -rf "${ED}"/etc/revdep-rebuild
|
||||
rm -rf "${ED}"/var
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Create cache directory for revdep-rebuild
|
||||
mkdir -p -m 0755 "${EROOT%/}"/var/cache
|
||||
mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
|
||||
|
||||
# Only show the elog information on a new install
|
||||
if [[ ! ${REPLACING_VERSIONS} ]]; then
|
||||
elog
|
||||
elog "For further information on gentoolkit, please read the gentoolkit"
|
||||
elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
|
||||
elog
|
||||
elog "Another alternative to equery is app-portage/portage-utils"
|
||||
elog
|
||||
elog "Additional tools that may be of interest:"
|
||||
elog
|
||||
elog " app-admin/eclean-kernel"
|
||||
elog " app-portage/diffmask"
|
||||
elog " app-portage/flaggie"
|
||||
elog " app-portage/install-mask"
|
||||
elog " app-portage/portpeek"
|
||||
elog " app-portage/smart-live-rebuild"
|
||||
fi
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST simgear-2016.3.1.tar.bz2 1199016 SHA256 ae46e1273673be41028ee912d1826e87185ab594053c493707f9dbdeea5159dd SHA512 5c0e260da8b09e815cd6607f3e977b5827f450e9fbe10bfaef019d7489506905fde56a5ab6748165431088bbae7fa61d4bccc27e4d7828c8bc6a05247b450716 WHIRLPOOL c349848d7e85166d7161272d722bebed7b387e6cd4c9db6cd405e3d042ee212b4448231eb92e0a86b8dc00c497af2c69455edd7d7d1cd4007d9ca09e91e575a7
|
||||
DIST simgear-2016.4.3.tar.bz2 1201326 SHA256 6933550215818c2043b84df01b6bf5f7adef218c8648b510b8202e394003d2bd SHA512 aaf56f195fed9957ba4bd8b17deb1985596ed793e131723a6f81f85a4d4f178a923c5f2df3d53dca88957fc46f887b086353b99500c3f56952a70ae34f734b5e WHIRLPOOL 190e642919fb3ac519f683743b090729be410f06b5f4129abe43e8c542aed68a34e186d612c3760552d658e52060cf33735e653014f8a5171d3c825904a148e0
|
||||
DIST simgear-2016.4.4.tar.bz2 1200320 SHA256 5514fd0006bbfcdbdc0e2dab7da41eae491ea03a6246cc6a009590032b2fc1dc SHA512 f7b9124e40dba347cd73304fc1b20a5b6d09eb476bc41949d5be615be968a6a66f64141b87819bfa357bd1fd376b2e1fc18334eb1d4df2d4f1e3f95ef4a1928d WHIRLPOOL 3fb4d580d84633a6a852f6a8ab5e708afde9616b636bb5b49d30b56ed232d9938606f602d473e51855605d2544b364691ae362ec974f56b34e32507a37752221
|
||||
DIST simgear-3.4.0.tar.bz2 1057455 SHA256 927d66fe72aacb9dacced4506430bd5fc7726bc8d3d07d6f1866bc4cb11a5894 SHA512 9ebf49ea2f024f0e52a4d18ba6f77361e7b9f51a0e7238661b4b2fd9db0176bdd948612d9b4aec3ae4d8210676e7533dfc0308b9c71bdeb22e99a68b90d81320 WHIRLPOOL bb48b6640409a96816ade77c22a91f88c452d339165dd0241354c26ff27572a14538ecfd91265c239def4621657be8766c081cffc237711a691d7ef54461b548
|
||||
|
||||
@ -0,0 +1,51 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils cmake-utils
|
||||
|
||||
DESCRIPTION="Development library for simulation games"
|
||||
HOMEPAGE="http://www.simgear.org/"
|
||||
SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
SLOT="0"
|
||||
IUSE="+dns debug subversion test"
|
||||
|
||||
COMMON_DEPEND="
|
||||
dev-libs/expat
|
||||
>=dev-games/openscenegraph-3.2.0
|
||||
media-libs/openal
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
virtual/opengl
|
||||
dns? ( net-libs/udns )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-libs/boost-1.44
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
subversion? ( dev-vcs/subversion )
|
||||
"
|
||||
|
||||
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DENABLE_DNS=$(usex dns)
|
||||
-DENABLE_PKGUTIL=ON
|
||||
-DENABLE_RTI=OFF
|
||||
-DENABLE_SOUND=ON
|
||||
-DENABLE_TESTS=$(usex test)
|
||||
-DSIMGEAR_HEADLESS=OFF
|
||||
-DSIMGEAR_SHARED=ON
|
||||
-DSYSTEM_EXPAT=ON
|
||||
-DSYSTEM_UDNS=ON
|
||||
-DUSE_AEONWAVE=OFF
|
||||
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST tiled-0.17.0.tar.gz 4852620 SHA256 f7fce2006a04c9e6e5d45a15fb31d342a4a66f7a01e1e6bc0753035cfbf42f31 SHA512 bf9b0cdd08c9091238a5e37f0670f2f3c389a46892c682a81f817e5daae0e6e3b13edf5d61a4105d9064e44585a4d6c7f7956b4c69b14488ee04af1834bf066c WHIRLPOOL 9e8b21098016cb20be66071e115f678bd10531a63b99c949e8a0e04ba6302834c414cc1ddf294f36b13bf1e43c22b9403a2aa13dc52ddbe84c24eb95d9b88ddb
|
||||
DIST tiled-0.17.1.tar.gz 4854247 SHA256 11297f97370df10dd32b24a0c5ce9988b3c1903a13f2be0ebb3c20f49c5e0fb4 SHA512 97f025d4d8a2018781a0cb3c318e85f56e4b71f3c3ee6950ac2a99dfac87303690ffb72c31d2a90a5b7f9ff0ac3909a112ea0e7858a915615829a301f65acd58 WHIRLPOOL f34ad8b8d622981c833fac5a88bee762eb7a94dfc4dec8f1884c9ee980b33b6969241cf585b1963a804a62002b8a1f60d88b8139297618755a0f0ee56365bc58
|
||||
DIST tiled-0.17.2.tar.gz 4854767 SHA256 a9c5d68ccc00d89df8611df6c1c37aa8796fffcff968f3993f6d78686678c4b9 SHA512 c5c9cfe50f32adf4c146e8d9a08393b173d59aafee3df747bfb7a0137fe9580dcbf07518d6972491393f9f24289d628c4352a7359acbd06d500cd3ad0200fa42 WHIRLPOOL db45e8b2f5f743126db19d546ad9a8c0bca7e71ec9e2f54f447fcb228ab13cfb3e6d0d2f52482650b29608c31f774669427e1c6b6e3656fee529825ab0c1d533
|
||||
DIST tiled-0.18.0.tar.gz 6403889 SHA256 f3ef157e9446d7b0ec50ab8399644d52e03065e7860354f632bbbb318fe35933 SHA512 dec480c2c2fb39180ebbc241b75f864ebebf52fcbc1cd8ae114fdca57f696096d5659ba572089f8f40339bc0c92fa6cdb36774773b808cc187d790542f6b16be WHIRLPOOL 3b31250bf69f69264f3688715290123c7ef76d0a5621d14621929a7b524e501576a26bac9988a292a8dd3cbe0a6231744728bceaf84272cad31c995cc5a9e156
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit fdo-mime gnome2-utils multilib python-single-r1 qmake-utils
|
||||
|
||||
DESCRIPTION="A general purpose tile map editor"
|
||||
HOMEPAGE="http://www.mapeditor.org/"
|
||||
SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD BSD-2 GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64"
|
||||
IUSE="examples python"
|
||||
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-qt/qtcore-5.6:5
|
||||
>=dev-qt/qtgui-5.6:5
|
||||
>=dev-qt/qtnetwork-5.6:5
|
||||
>=dev-qt/qtopengl-5.6:5
|
||||
>=dev-qt/qtwidgets-5.6:5
|
||||
sys-libs/zlib
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-qt/linguist-tools:5
|
||||
"
|
||||
|
||||
DOCS=( AUTHORS COPYING NEWS.md README.md )
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake INSTALL_ROOT="${D}" install
|
||||
|
||||
einstalldocs
|
||||
|
||||
if use examples ; then
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
dodoc -r examples
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_icon_cache_update
|
||||
fdo-mime_desktop_database_update
|
||||
fdo-mime_mime_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
fdo-mime_desktop_database_update
|
||||
fdo-mime_mime_database_update
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue