root
8 years ago
parent
7a0fc21de1
commit
5ea5b7bf3f
@ -0,0 +1,49 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
MY_PN=${PN/-bin/}
|
||||
MY_P=${MY_PN}-${PV}
|
||||
|
||||
DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
|
||||
HOMEPAGE="https://www.elastic.co/products/beats"
|
||||
SRC_URI="amd64? ( https://download.elastic.co/beats/${MY_PN}/${MY_P}-x86_64.tar.gz )
|
||||
x86? ( https://download.elastic.co/beats/${MY_PN}/${MY_P}-i686.tar.gz )"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
src_unpack() {
|
||||
if use amd64; then
|
||||
S="${WORKDIR}/${MY_P}-x86_64"
|
||||
elif use x86; then
|
||||
S="${WORKDIR}/${MY_P}-i686"
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
keepdir /etc/${MY_PN}
|
||||
keepdir /var/lib/${MY_PN}
|
||||
|
||||
fperms 0750 /var/lib/${MY_PN}
|
||||
|
||||
newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
|
||||
newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
|
||||
|
||||
insinto /etc/${MY_PN}
|
||||
newins ${MY_PN}.yml ${MY_PN}.yml.example
|
||||
|
||||
dobin ${MY_PN}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ! -e /etc/${MY_PN}/${MY_PN}.yml ]]; then
|
||||
elog "Before starting filebeat, you need to create a configuration file at:"
|
||||
elog "/etc/${MY_PN}/${MY_PN}.yml"
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,52 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
MY_PN="${PN/-bin}"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
|
||||
DESCRIPTION="Tool for managing events and logs"
|
||||
HOMEPAGE="https://www.elastic.co/products/logstash"
|
||||
SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
RESTRICT="strip"
|
||||
QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
src_install() {
|
||||
keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
|
||||
keepdir "/var/log/${MY_PN}"
|
||||
|
||||
insinto "/etc/${MY_PN}/conf.d"
|
||||
newins "${FILESDIR}/agent.conf.sample" agent.conf.sample
|
||||
|
||||
insinto "/opt/${MY_PN}"
|
||||
doins -r .
|
||||
fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
|
||||
|
||||
newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
|
||||
newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "Getting started with logstash:"
|
||||
einfo " https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
|
||||
einfo ""
|
||||
einfo "Packages that might be interesting:"
|
||||
einfo " app-misc/elasticsearch"
|
||||
einfo " dev-python/elasticsearch-curator"
|
||||
einfo " www-apps/kibana-bin"
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
AUX puppetdb.initd 1830 SHA256 e2a4cf3da368b79ec7420189bd67193ae636fe5bf099c93434d242c18981effa SHA512 e62e571277c28b53355d246b44cc19e492860b48e486d8260c0dd414799de7cc008dd15bea6f44805cce32f2d527d7c4b0ae83053ee4f2dd680d820e6bedcf80 WHIRLPOOL a505a4affdc005742baf000212d36eee5e0d9ac2db44bd36edbe1f824e3bd14ae71d3b51caedfcd8707422c8fd533b6fe72b92ed86e0060290da41ccc32ecc8c
|
||||
DIST puppetdb-3.2.3.tar.gz 25469315 SHA256 3b9d121e54da1511834d708437c9c9ca15db2818314f442511bbb2e576a7afaa SHA512 d15a497bce10e1af989e1deaba99794929916362e13393814d2c5545f80ee4fb0976758c3bd0ae41466bd0364ba5df417fa69afde8bf24e6573119cdbe814aa9 WHIRLPOOL 031c14df0df52320926030e32290fb8ab5115e800711d90b2c5acdc712fa7bbcefbc83afc380bbeff4f1b30654d724a8db01c9b5ace3f6bc0deeeb31127e4443
|
||||
EBUILD puppetdb-3.2.3.ebuild 2737 SHA256 2313f1f21b95eb87175c0a3969ef52a7f4698fa37668c7cb577e07b0e09d8d83 SHA512 56c5e87bf6b59bc7c99ed7b41a32b7f985b7961f48ab26eb59555149964adfd69fd44bec3a4beffb7b3a519428a8cc387a848c332f40d04ca480722020ed0011 WHIRLPOOL ea1c0180de206c323dcd6ed1eefb35b682632f81da1182706150ebcab8fb22731f178711fc05a60d7f6313a353da853365bc09605ae21e895f98e611eb09a654
|
||||
MISC ChangeLog 4801 SHA256 411dec83ecd8e1bf18bd77a96e0abed6519dc5939eb3ca654d451d0dc23965c9 SHA512 76d208ba97529890373ba72de4b7c4e3c2f156000b03aaabdeb726df1f0392934ee53a41afb349da8e2f145001fa824e052541b268413104af9e5408db2aad37 WHIRLPOOL 3f60c5a16f4741fca1adc7a72b90341c56b526acb7e890dacbcc532bf3162574167785dd8e3ce3d6cbf3adcafea8abc2c2a638de65d4365bc1f26c3de8fc1f80
|
||||
MISC ChangeLog 4935 SHA256 4fbada8eb00bb9c0c26dac7f03697851282ade30af222bbaffb11ec17b7c164b SHA512 1f8be40571808d4941704bb58abc349b374885a396d988ec484989a4e75fe8f2caba2c8df02040f4c0aeaa39ee1f93f2cb9847385f10d56197498cdef9fb83a8 WHIRLPOOL 74c27109c61c5d0f7f7986cf2a00145f9cdd8c7fd22032c118e6110b0f323d421f08676aee138d1931c440a32686da1453643f7b190c049c8993546fbca1fa76
|
||||
MISC ChangeLog-2015 1236 SHA256 3fea32c44cd920a4d0afd13b438efb32b9a64e483039d8f4379492a5f9d19b42 SHA512 57021ccb882ac0ee0b534edeed6cf510d3919616289edb066ae561b1db2ee81ebb95903abf45b57c45759a6755edee74c0968630a8296b919a7f393e25a8af01 WHIRLPOOL a4eb6aac2ccbc720cdb5aba6050445a4a33ab5bba4eeee30357fc96208a6a3a21df16f0c9bde06a000d9551d49dc2f9bcabccfe453e884356c0a320b2bd19b0a
|
||||
MISC metadata.xml 485 SHA256 f18e5c9519ed297b90056ab501981cbe9a4c4815d64f6ff85ebad1b5aa45dfe5 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2 WHIRLPOOL cd481863aa29249fe38cd2ed4dd4bb4093c4a52fc26f6900c491fbc500071878140185b72e84a35c978a8b12fad1548d8cf7c1c972bdbac838b95832b54f14be
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
AUX rdiff-backup-1.2.8-popen2.patch 775 SHA256 f03636261abc2e38865cf32e8deed655aeb9261938663a0456e6153906abaf74 SHA512 28fec1cfa705c9e3e2761a73139dedb29c79b5a6b4b8635fbf1cd9c4d7f9d14a407ba93e2cb441547a17ecfe77ed47a7ffef5b5a861e4226a59c856a664b0651 WHIRLPOOL 1d33de06f142a15e66fd39d705a0b734f94106d2067a6340f99b6ad7ea54bb49434c52ce46c1cc6ecd3184a599fe4443612d9d73b6823e684f15fa9725471b02
|
||||
AUX rdiff-backup-1.3.3-librsync-1.0.0.patch 498 SHA256 1211ad1019df0b30d4f4a3e364a67f5977d17424c605f00383c686dd1b22cd0a SHA512 2749fc3f5e187d8bc7874ddb7e185ebb17a0ad77e44e12d3f02a10de7ca5acea568321ce7262e45433732a0b532702e674564cc83d8987b0e339e28f7468395f WHIRLPOOL 0a2bf4003f0cfb5fc83b78d0d3c05cff6e28b8b4850a525550e0db39fa97edc71bc7ed9fb79e108912917a8e212ed3126e6ca60f8eb7f9299bad5db56d28fdc8
|
||||
DIST rdiff-backup-1.3.3.tar.gz 198412 SHA256 ee030ce638df0eb1047cf72578e0de15d9a3ee9ab24da2dc0023e2978be30c06 SHA512 e2731464a6ff146cdecac49d2d99275dc5e6b4a3ff5b8209fe6dc71fd80cdbf573d029531325a879e9a169c12b31568f75fdcb812f53df33896784c5bc550280 WHIRLPOOL 04f3257c8a1dd6b8c81ec1f7d3fb7d1e4bba9bb97020b0932d2a72d9279924147ec98c74e5f9952b5c14c50675ac03f7d7956875ce58c1e677571c9cfab57f89
|
||||
EBUILD rdiff-backup-1.3.3-r1.ebuild 731 SHA256 6cbd624eeb536f4c89ad6d53bd8bf1d3959f80d3b781b1c1606c9b46ff89ea5b SHA512 e2d1b2b37a707f0c709bd14b18a386948672a5154936e0d2afd62b3af84d6db899d92eddf6ea7bade97fab703b6f1dc43b00ca91a3fae47d2f0e3dafc3414688 WHIRLPOOL 53c27e6a49f155d02331ec618710d138ff931b56fdfdde1cb5bb4bec4f03ec6f0e02530160164a91caae048a216268a4b41ae7f27c5c375ab26c6fd33c5b6f9e
|
||||
MISC ChangeLog 3276 SHA256 a4b04a5c1dd849b11667a15fab5bf59d2bf5badb98fe48edda18edce3c38e799 SHA512 cb41c550abc1714846dd240719c81f6198d53a1df09e6a036e6919545bd309fcafdb7f4b64e6947996b3defcf3ba1d9c8c94c1107af3a2f8f4278358533419e2 WHIRLPOOL 91bd741a1bd2e0e2c7ad156f6f0980b479664a4082d97471c9808fad1b83ebe3572928bab5c6955d2b4133ca989326d99263c10eff6d1fb88559a16af9be657e
|
||||
EBUILD rdiff-backup-1.3.3-r1.ebuild 818 SHA256 9b4a4f99dd470e24af3c314ecd2dfa45ee5f6c5e175e963a66ac0acedfadc5ef SHA512 a07a56d62b38b69c2209a66dd4923b84f165e3480f0edb9d271946efa961bae0637d022f7500a34ee30d719147f04b3e18b4a73737c285222fffd6cf02ef3619 WHIRLPOOL 375ad41959ae48b091f79854fda6091548ec951e97a3883e3a2972e065392874280eab2e886443bea0c57a42ee3f6d6da479b650ead3dced88e2ce56f436fd6f
|
||||
EBUILD rdiff-backup-1.3.3-r2.ebuild 878 SHA256 d5f684f3e347a138390ef7a0dffc5e0190ec2c8c4e9e61d14a8d92ba6e3c4ff8 SHA512 2a8f3af4172abea7bf2589602b1565704f24255903040b57bb79845ad6dd89c4c23db25ac2ebeb9467afd68739161c8798e23a052df88e84e2a1760f5991fbce WHIRLPOOL e33becdc25897e285a1c8a39cc57ea4704c4f99f0da404d3e932101f0cca451e95c55a3ab2822a7311ed0707a6f0b3b11ddc2c34c3d9bded7b1449957fbf606e
|
||||
MISC ChangeLog 3564 SHA256 bdb0dc42faaaddb697958891517f6a60c3046e76aafc87cebc7555e531d5fc11 SHA512 4970cfe592494c2e075007dcef7043210a08ac8efd79fdc11c050e9ca335a88f02ea614285f850654671f97236d2e5c0c61ec9902c5eff6df735a2895841ace2 WHIRLPOOL f38cf56576694dd073066d633b69c8c64c568c3a00ed7018380e0db43b5f14eb2f96de586c3fe25741f338ceacf798c9c4cd36024b181f7381f4e45680f971ac
|
||||
MISC ChangeLog-2015 14577 SHA256 d4de71d323d7c94108af7e12c24c50b05d70a04b4ce3b52e0076c73bb82d144a SHA512 4758280334c0acbce2a2863905a7051ce3010e8d0bb99c39045e580aa22cc78f9fdb4f09569d266dfa078f3a2a82aa50f2b664c2142080ecc33d9d818432f749 WHIRLPOOL 4a3ad8b7fda7dacddb702e6aee4c2c85f42adb03359447bb635d9b6bd2618912bff35454a3f45aa496666d266b0c1a954720c5b2c00fa6bbdbcae6875f8a9e65
|
||||
MISC metadata.xml 228 SHA256 00c13c3524a9d15e6163cffce52c0e2879131e6bc700b6ca073233a12a1f3201 SHA512 1ee6f066d0760c3cff9f9d8e6ef5f7a17c4e6e241e3c9bb30e8b5c54b69e78d587625da3e71b9d6937652201c5d79bc8cb738b5e8dd60a59e35a6fe3c07cbe58 WHIRLPOOL 662e89045a4397aa275b10ae04635d481493198ff39ac4192dc1084be27e9d2846c45b6cb2a7c42d212b9a215dfb1d75f7a3db0d5e7de5fbcd1fa0c9ae90604b
|
||||
MISC metadata.xml 528 SHA256 df5f0b98cce36fcc75c0a4bc9f20f5267a7d09ea707c279974b46512fa339dbe SHA512 6ed247ca5297a4ebe7586a6e6e0437368d781c20c18774bdf55b96adb78e6ed5916b18810ba04025805def8dc07ca7dff0d1ea66b5c8f3ed099ae5084f025f35 WHIRLPOOL 57b7130a085f954cd6060fe0a8d22e38a34794a8af80679d3bcc2b997c96213ff1c1aae7cc91c0d9cfb8da718e7cfa7bb1dafa0327f27850acdadfed7863d9c1
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
diff -urNad rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py rdiff-backup-1.2.8/rdiff_backup/SetConnections.py
|
||||
--- rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py 2009-03-16 15:36:21.000000000 +0100
|
||||
+++ rdiff-backup-1.2.8/rdiff_backup/SetConnections.py 2009-10-03 19:27:54.935647306 +0200
|
||||
@@ -135,10 +135,10 @@
|
||||
if not remote_cmd: return Globals.local_connection
|
||||
|
||||
Log("Executing " + remote_cmd, 4)
|
||||
- if os.name == "nt":
|
||||
+ if map(int, sys.version.split()[0].split('.')[:2]) >= [2, 6]:
|
||||
import subprocess
|
||||
try:
|
||||
- process = subprocess.Popen(remote_cmd, shell=False, bufsize=0,
|
||||
+ process = subprocess.Popen(remote_cmd, shell=True, bufsize=0,
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE)
|
||||
(stdin, stdout) = (process.stdin, process.stdout)
|
||||
@ -0,0 +1,16 @@
|
||||
--- rdiff-backup-1.2.8/_librsyncmodule.c 2009-03-16 15:36:21.000000000 +0100
|
||||
+++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0 2015-03-02 00:54:24.000000000 +0100
|
||||
@@ -59,8 +59,13 @@
|
||||
if (sm == NULL) return NULL;
|
||||
sm->x_attr = NULL;
|
||||
|
||||
+#ifdef RS_DEFAULT_STRONG_LEN
|
||||
sm->sig_job = rs_sig_begin((size_t)blocklen,
|
||||
(size_t)RS_DEFAULT_STRONG_LEN);
|
||||
+#else
|
||||
+ sm->sig_job = rs_sig_begin((size_t)blocklen,
|
||||
+ (size_t)8, RS_MD4_SIG_MAGIC);
|
||||
+#endif
|
||||
return (PyObject*)sm;
|
||||
}
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit distutils-r1 versionator
|
||||
|
||||
UPSTREAM_PV=$(replace_all_version_separators '-')
|
||||
|
||||
DESCRIPTION="Local/remote mirroring+incremental backup"
|
||||
HOMEPAGE="https://github.com/sol1/rdiff-backup"
|
||||
SRC_URI="https://github.com/sol1/${PN}/archive/r${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
|
||||
IUSE="examples"
|
||||
|
||||
DEPEND="
|
||||
net-libs/librsync:0/2
|
||||
"
|
||||
RDEPEND="
|
||||
dev-python/pyxattr[${PYTHON_USEDEP}]
|
||||
dev-python/pylibacl[${PYTHON_USEDEP}]
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${P}-librsync-1.0.0.patch" )
|
||||
|
||||
python_install_all() {
|
||||
use examples && local EXAMPLES=( examples.html )
|
||||
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
DIST letsencrypt-0.4.0.tar.gz 634899 SHA256 d7df1faedd6f5c1ffc26fd855350fc3a107dd9fe5c1c2aa4c340024fe807a0f3 SHA512 f04c3fa49619e4e182ec8d10c6e05045d1e0e1a146bad75d9382cbfc6663ad0726c9beb496f0251e43d0dd45d78220c57dda0be8c2d946a515ab2c9f0359a549 WHIRLPOOL 64b531b31214fa6f7460ce3288dc573d281d350fe631447de8f0f18b74d38cb374438f678e7782c5bc72019766f4fe8668a6ff5f809560d09a713fa4eb58f9f8
|
||||
EBUILD letsencrypt-0.4.0.ebuild 1391 SHA256 f2c4738cc547c2e04426e811389c90191c90afce8b283e90e7d06cb4476e567d SHA512 68d67cb6fb5c5d137f6d1c9636718bb395605c1fdf6797145730030b6b5e6adf80e7191459b500aaa1e61ccebb54b1cbb82a7635e6550b0c87ea45a5094447e8 WHIRLPOOL fd2c23acdbf1d1348cafe4f8af8cdb2a994dd1058d1b133c3d83e7b1c384055e9e1edec6d5fa955bebfa44e0446a8489b35837aee48fa1cfebf49783743b3669
|
||||
EBUILD letsencrypt-9999.ebuild 1391 SHA256 f2c4738cc547c2e04426e811389c90191c90afce8b283e90e7d06cb4476e567d SHA512 68d67cb6fb5c5d137f6d1c9636718bb395605c1fdf6797145730030b6b5e6adf80e7191459b500aaa1e61ccebb54b1cbb82a7635e6550b0c87ea45a5094447e8 WHIRLPOOL fd2c23acdbf1d1348cafe4f8af8cdb2a994dd1058d1b133c3d83e7b1c384055e9e1edec6d5fa955bebfa44e0446a8489b35837aee48fa1cfebf49783743b3669
|
||||
MISC ChangeLog 3831 SHA256 7d826f3d59473926d24171232423bfdd880901fb16ba5f730517be0f4de1693d SHA512 9740e11ae365d3a89d0ab3a437f295e2ae054321009314905fc1c4e49a001f63d0bf4e93da73eaf4af528c682dcb48af6f3ce66a79e10e1e9340f636491d2812 WHIRLPOOL dc2cbbb5e77db1b0fd43fdeb4060599db9ea251a8394314ff20ead27047fff2ec0b98bd27bdebe0eaa6793d28e2cc7ed5664386d28fb059ff65dde24b47acc6b
|
||||
MISC ChangeLog 4115 SHA256 d2da4d3031d49593146b8e4c3f6b3b730a6fcb513ed5c7624ad982e836654684 SHA512 6243722fcacb8b6297a2e2d6d2cb54ad316c3f8a5d769c1126f34c02b34e2c48c6b7d9125fc079a58e50ba1a92d9e6fd6bf0d20e7b26eeaa6ad5966964bcac3d WHIRLPOOL a66ca0b5042d1748b97be951dcf9a061853989ee884a0c94063f185ff307ed0a337188e92dbff392e700da8902411297dbb66b1b0ba5e2340c1c7df60df4c0e3
|
||||
MISC metadata.xml 333 SHA256 2dac3dfae7f320489f799db9129fcb8b45298241d6798c188aef134ec2d356cd SHA512 6d1b31c4529880c94bbf4cf09160b30b53136328efa65656ee288a0f8e647d8a5f72e12c7296ee20b4e610c861f1166808a8b1c6624580a394172aab33d084f8 WHIRLPOOL 89111987fd60d03c12f57b17381e781f4597d448c09df2739b582fccec63b0c0bf17f088fadb38a8f76608e3b59776d5c7a7b77a252b97beb0a229e6f51968cb
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
EBUILD simp_le-9999.ebuild 977 SHA256 7609089efc43cf9069bb2bb0c8afa00400d024aaebec8d6e58792c12d8d2521a SHA512 23554d6f3ffa3dedf9e19657d0a89e97878c0d000f891db7e9dd5b2074a244081033c185973534411e3262a74b45bacd7fcfd20aec021160352d17b81bb6d361 WHIRLPOOL 9fc6e6553d52fe2825463a8ab229396fe221c963e0687fe24dd91eddd721b2054ccf6484f4227ccd7816e633be9b07e425aaf7c50aed82e3d8cdf4b48916c024
|
||||
MISC ChangeLog 289 SHA256 f539a87c017833cabf565c80239fee38cb82866933e457997a3bd48bcf916420 SHA512 11aee2cd1b13e9e91376480384a1d32497ee611eb87bfcbff2ef6e8cc789982a8eefb5adae4b0302c8356a804248c77f1b470fdd0744774f2390d2c6bdf6c44d WHIRLPOOL 3c8fe0b185edc53e9aca0abaa921f0b75f615d945a57acffe8a88e0a7d44272385e9f07980b79d02846cc38dabee2179848d3d6163bddf3b9f179486a8842229
|
||||
MISC ChangeLog 419 SHA256 3af2ac0c53cc30fb0ce881f1d8ef1f01fbfdeff774034a5503f3f5c8fa48295e SHA512 fe090b03e1d30277519b51bb96f0b2a3b71781a7aa3aba395e02e25c2029a35330ebaed53fe84b1300620f9b470de48e5a7bfca6f4b0cec96e80f2a73b4cbcc9 WHIRLPOOL fe739e5a692ae7bd1a823be5fd9ca6b2a90ed36a0b2148c774c705ed5adfd63dcc738bdecf5e749090e9b540d19b5e88ed66d71b40472103fd20d4207b43d8d3
|
||||
MISC metadata.xml 327 SHA256 feb3be44adbdaaf306243267699c5be99d7fed9ec7a093dfbfd8d3521bf566ac SHA512 8c0d3e8170bb2814b8452087e17efc50e0a7f4eca1720efd95eb9015f15e91360b9254dea582e2a96b823cbc6d4a891af2c38d0a891c63a4108e9f6bdd563635 WHIRLPOOL 7e3fbc0566c225a99b15da040b76199627cae040e773bfb8f747c7ba8c3052e0c736b0c6ae2f9be1a27ea7992dee6edcd2d1ec2c207d62ab7cd358d6085f65e8
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -3131,8 +3131,6 @@ fi
|
||||
if test "$gcov" = "yes" ; then
|
||||
CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
|
||||
LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
|
||||
-elif test "$debug" = "no" ; then
|
||||
- CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
|
||||
fi
|
||||
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
From d54a299b83a07642c85a22bfe19b69ca4def9ec4 Mon Sep 17 00:00:00 2001
|
||||
From: Leon Alrae <leon.alrae@imgtec.com>
|
||||
Date: Wed, 9 Sep 2015 12:44:25 +0100
|
||||
Subject: [PATCH] target-mips: correct MTC0 instruction on MIPS64
|
||||
|
||||
MTC0 on a 64-bit processor should move entire 64-bit GPR content to CP0
|
||||
register.
|
||||
|
||||
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
|
||||
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
|
||||
---
|
||||
target-mips/translate.c | 18 +++++++-----------
|
||||
1 files changed, 7 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/target-mips/translate.c b/target-mips/translate.c
|
||||
index 0883782..a59b670 100644
|
||||
--- a/target-mips/translate.c
|
||||
+++ b/target-mips/translate.c
|
||||
@@ -4765,12 +4765,6 @@ static inline void gen_mtc0_store32 (TCGv arg, target_ulong off)
|
||||
tcg_temp_free_i32(t0);
|
||||
}
|
||||
|
||||
-static inline void gen_mtc0_store64 (TCGv arg, target_ulong off)
|
||||
-{
|
||||
- tcg_gen_ext32s_tl(arg, arg);
|
||||
- tcg_gen_st_tl(arg, cpu_env, off);
|
||||
-}
|
||||
-
|
||||
static void gen_mfhc0(DisasContext *ctx, TCGv arg, int reg, int sel)
|
||||
{
|
||||
const char *rn = "invalid";
|
||||
@@ -5629,12 +5623,14 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
|
||||
break;
|
||||
case 5:
|
||||
CP0_CHECK(ctx->insn_flags & ASE_MT);
|
||||
- gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_VPESchedule));
|
||||
+ tcg_gen_st_tl(arg, cpu_env,
|
||||
+ offsetof(CPUMIPSState, CP0_VPESchedule));
|
||||
rn = "VPESchedule";
|
||||
break;
|
||||
case 6:
|
||||
CP0_CHECK(ctx->insn_flags & ASE_MT);
|
||||
- gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_VPEScheFBack));
|
||||
+ tcg_gen_st_tl(arg, cpu_env,
|
||||
+ offsetof(CPUMIPSState, CP0_VPEScheFBack));
|
||||
rn = "VPEScheFBack";
|
||||
break;
|
||||
case 7:
|
||||
@@ -5884,7 +5880,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
|
||||
case 14:
|
||||
switch (sel) {
|
||||
case 0:
|
||||
- gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_EPC));
|
||||
+ tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EPC));
|
||||
rn = "EPC";
|
||||
break;
|
||||
default:
|
||||
@@ -6057,7 +6053,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
|
||||
switch (sel) {
|
||||
case 0:
|
||||
/* EJTAG support */
|
||||
- gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_DEPC));
|
||||
+ tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_DEPC));
|
||||
rn = "DEPC";
|
||||
break;
|
||||
default:
|
||||
@@ -6160,7 +6156,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
|
||||
case 30:
|
||||
switch (sel) {
|
||||
case 0:
|
||||
- gen_mtc0_store64(arg, offsetof(CPUMIPSState, CP0_ErrorEPC));
|
||||
+ tcg_gen_st_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_ErrorEPC));
|
||||
rn = "ErrorEPC";
|
||||
break;
|
||||
default:
|
||||
--
|
||||
1.7.0.4
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
From cdfcad788394ff53e317043e07b8e34f4987c659 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Smith <alex.smith@imgtec.com>
|
||||
Date: Tue, 8 Sep 2015 11:34:11 +0100
|
||||
Subject: [PATCH 1/1] target-mips: Fix RDHWR on CP0.Count
|
||||
|
||||
For RDHWR on the CP0.Count register, env->CP0_Count was being returned.
|
||||
This value is a delta against the QEMU_CLOCK_VIRTUAL clock, not the
|
||||
correct current value of CP0.Count. Use cpu_mips_get_count() instead.
|
||||
|
||||
Signed-off-by: Alex Smith <alex.smith@imgtec.com>
|
||||
Cc: Aurelien Jarno <aurelien@aurel32.net>
|
||||
Cc: Leon Alrae <leon.alrae@imgtec.com>
|
||||
Reviewed-by: Leon Alrae <leon.alrae@imgtec.com>
|
||||
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
|
||||
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
|
||||
---
|
||||
target-mips/op_helper.c | 9 +++++++--
|
||||
1 files changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
|
||||
index 1aa9e3c..94de108 100644
|
||||
--- a/target-mips/op_helper.c
|
||||
+++ b/target-mips/op_helper.c
|
||||
@@ -2184,10 +2184,15 @@ target_ulong helper_rdhwr_synci_step(CPUMIPSState *env)
|
||||
target_ulong helper_rdhwr_cc(CPUMIPSState *env)
|
||||
{
|
||||
if ((env->hflags & MIPS_HFLAG_CP0) ||
|
||||
- (env->CP0_HWREna & (1 << 2)))
|
||||
+ (env->CP0_HWREna & (1 << 2))) {
|
||||
+#ifdef CONFIG_USER_ONLY
|
||||
return env->CP0_Count;
|
||||
- else
|
||||
+#else
|
||||
+ return (int32_t)cpu_mips_get_count(env);
|
||||
+#endif
|
||||
+ } else {
|
||||
helper_raise_exception(env, EXCP_RI);
|
||||
+ }
|
||||
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
1.7.0.4
|
||||
|
||||
@ -1,89 +0,0 @@
|
||||
Pending upstream inclusion
|
||||
|
||||
Link: https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg03573.html
|
||||
Patchwork: https://patchwork.ozlabs.org/patch/517392/
|
||||
X-Gentoo-Bug: 563162
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=563162
|
||||
|
||||
Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
|
||||
|
||||
diff --git a/target-mips/cpu.c b/target-mips/cpu.c
|
||||
index 4027d0f..144eea9 100644
|
||||
--- a/target-mips/cpu.c
|
||||
+++ b/target-mips/cpu.c
|
||||
@@ -58,7 +58,9 @@ static bool mips_cpu_has_work(CPUState *cs)
|
||||
check for interrupts that can be taken. */
|
||||
if ((cs->interrupt_request & CPU_INTERRUPT_HARD) &&
|
||||
cpu_mips_hw_interrupts_pending(env)) {
|
||||
- has_work = true;
|
||||
+ if (cpu_mips_hw_interrupts_enabled(env)) {
|
||||
+ has_work = true;
|
||||
+ }
|
||||
}
|
||||
|
||||
/* MIPS-MT has the ability to halt the CPU. */
|
||||
diff --git a/target-mips/cpu.h b/target-mips/cpu.h
|
||||
index c91883d..210370e 100644
|
||||
--- a/target-mips/cpu.h
|
||||
+++ b/target-mips/cpu.h
|
||||
@@ -639,23 +639,24 @@ static inline int cpu_mmu_index (CPUMIPSState *env)
|
||||
return env->hflags & MIPS_HFLAG_KSU;
|
||||
}
|
||||
|
||||
-static inline int cpu_mips_hw_interrupts_pending(CPUMIPSState *env)
|
||||
+static inline bool cpu_mips_hw_interrupts_enabled(CPUMIPSState *env)
|
||||
{
|
||||
- int32_t pending;
|
||||
- int32_t status;
|
||||
- int r;
|
||||
-
|
||||
- if (!(env->CP0_Status & (1 << CP0St_IE)) ||
|
||||
- (env->CP0_Status & (1 << CP0St_EXL)) ||
|
||||
- (env->CP0_Status & (1 << CP0St_ERL)) ||
|
||||
+ return (env->CP0_Status & (1 << CP0St_IE)) &&
|
||||
+ !(env->CP0_Status & (1 << CP0St_EXL)) &&
|
||||
+ !(env->CP0_Status & (1 << CP0St_ERL)) &&
|
||||
+ !(env->hflags & MIPS_HFLAG_DM) &&
|
||||
/* Note that the TCStatus IXMT field is initialized to zero,
|
||||
and only MT capable cores can set it to one. So we don't
|
||||
need to check for MT capabilities here. */
|
||||
- (env->active_tc.CP0_TCStatus & (1 << CP0TCSt_IXMT)) ||
|
||||
- (env->hflags & MIPS_HFLAG_DM)) {
|
||||
- /* Interrupts are disabled */
|
||||
- return 0;
|
||||
- }
|
||||
+ !(env->active_tc.CP0_TCStatus & (1 << CP0TCSt_IXMT));
|
||||
+}
|
||||
+
|
||||
+/* Check if there is pending and not masked out interrupt */
|
||||
+static inline bool cpu_mips_hw_interrupts_pending(CPUMIPSState *env)
|
||||
+{
|
||||
+ int32_t pending;
|
||||
+ int32_t status;
|
||||
+ bool r;
|
||||
|
||||
pending = env->CP0_Cause & CP0Ca_IP_mask;
|
||||
status = env->CP0_Status & CP0Ca_IP_mask;
|
||||
@@ -669,7 +670,7 @@ static inline int cpu_mips_hw_interrupts_pending(CPUMIPSState *env)
|
||||
/* A MIPS configured with compatibility or VInt (Vectored Interrupts)
|
||||
treats the pending lines as individual interrupt lines, the status
|
||||
lines are individual masks. */
|
||||
- r = pending & status;
|
||||
+ r = (pending & status) != 0;
|
||||
}
|
||||
return r;
|
||||
}
|
||||
diff --git a/target-mips/helper.c b/target-mips/helper.c
|
||||
index 01c4461..2d86323 100644
|
||||
--- a/target-mips/helper.c
|
||||
+++ b/target-mips/helper.c
|
||||
@@ -759,7 +759,8 @@ bool mips_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
|
||||
MIPSCPU *cpu = MIPS_CPU(cs);
|
||||
CPUMIPSState *env = &cpu->env;
|
||||
|
||||
- if (cpu_mips_hw_interrupts_pending(env)) {
|
||||
+ if (cpu_mips_hw_interrupts_enabled(env) &&
|
||||
+ cpu_mips_hw_interrupts_pending(env)) {
|
||||
/* Raise it */
|
||||
cs->exception_index = EXCP_EXT_INTERRUPT;
|
||||
env->error_code = 0;
|
||||
@ -1,29 +0,0 @@
|
||||
Pending upstream inclusion
|
||||
|
||||
Link: https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg03572.html
|
||||
Patchwork: https://patchwork.ozlabs.org/patch/517391/
|
||||
X-Gentoo-Bug: 563162
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=563162
|
||||
|
||||
Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
|
||||
diff --git a/target-mips/cpu.c b/target-mips/cpu.c
|
||||
index 144eea9..cbeca04 100644
|
||||
--- a/target-mips/cpu.c
|
||||
+++ b/target-mips/cpu.c
|
||||
@@ -53,12 +53,13 @@ static bool mips_cpu_has_work(CPUState *cs)
|
||||
CPUMIPSState *env = &cpu->env;
|
||||
bool has_work = false;
|
||||
|
||||
- /* It is implementation dependent if non-enabled interrupts
|
||||
- wake-up the CPU, however most of the implementations only
|
||||
+ /* Prior to MIPS Release 6 it is implementation dependent if non-enabled
|
||||
+ interrupts wake-up the CPU, however most of the implementations only
|
||||
check for interrupts that can be taken. */
|
||||
if ((cs->interrupt_request & CPU_INTERRUPT_HARD) &&
|
||||
cpu_mips_hw_interrupts_pending(env)) {
|
||||
- if (cpu_mips_hw_interrupts_enabled(env)) {
|
||||
+ if (cpu_mips_hw_interrupts_enabled(env) ||
|
||||
+ (env->insn_flags & ISA_MIPS32R6)) {
|
||||
has_work = true;
|
||||
}
|
||||
}
|
||||
@ -1,49 +0,0 @@
|
||||
From 837f21aacf5a714c23ddaadbbc5212f9b661e3f7 Mon Sep 17 00:00:00 2001
|
||||
From: Prasad J Pandit <pjp@fedoraproject.org>
|
||||
Date: Fri, 20 Nov 2015 11:50:31 +0530
|
||||
Subject: [PATCH] net: pcnet: add check to validate receive data
|
||||
size(CVE-2015-7504)
|
||||
|
||||
In loopback mode, pcnet_receive routine appends CRC code to the
|
||||
receive buffer. If the data size given is same as the buffer size,
|
||||
the appended CRC code overwrites 4 bytes after s->buffer. Added a
|
||||
check to avoid that.
|
||||
|
||||
Reported by: Qinghao Tang <luodalongde@gmail.com>
|
||||
Cc: qemu-stable@nongnu.org
|
||||
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
||||
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||||
---
|
||||
hw/net/pcnet.c | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
|
||||
index 0eb3cc4..309c40b 100644
|
||||
--- a/hw/net/pcnet.c
|
||||
+++ b/hw/net/pcnet.c
|
||||
@@ -1084,7 +1084,7 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
|
||||
uint32_t fcs = ~0;
|
||||
uint8_t *p = src;
|
||||
|
||||
- while (p != &src[size-4])
|
||||
+ while (p != &src[size])
|
||||
CRC(fcs, *p++);
|
||||
crc_err = (*(uint32_t *)p != htonl(fcs));
|
||||
}
|
||||
@@ -1233,8 +1233,10 @@ static void pcnet_transmit(PCNetState *s)
|
||||
bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT);
|
||||
|
||||
/* if multi-tmd packet outsizes s->buffer then skip it silently.
|
||||
- Note: this is not what real hw does */
|
||||
- if (s->xmit_pos + bcnt > sizeof(s->buffer)) {
|
||||
+ * Note: this is not what real hw does.
|
||||
+ * Last four bytes of s->buffer are used to store CRC FCS code.
|
||||
+ */
|
||||
+ if (s->xmit_pos + bcnt > sizeof(s->buffer) - 4) {
|
||||
s->xmit_pos = -1;
|
||||
goto txdone;
|
||||
}
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From 8b98a2f07175d46c3f7217639bd5e03f2ec56343 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Wang <jasowang@redhat.com>
|
||||
Date: Mon, 30 Nov 2015 15:00:06 +0800
|
||||
Subject: [PATCH] pcnet: fix rx buffer overflow(CVE-2015-7512)
|
||||
|
||||
Backends could provide a packet whose length is greater than buffer
|
||||
size. Check for this and truncate the packet to avoid rx buffer
|
||||
overflow in this case.
|
||||
|
||||
Cc: Prasad J Pandit <pjp@fedoraproject.org>
|
||||
Cc: qemu-stable@nongnu.org
|
||||
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||||
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||||
---
|
||||
hw/net/pcnet.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
|
||||
index 309c40b..1f4a3db 100644
|
||||
--- a/hw/net/pcnet.c
|
||||
+++ b/hw/net/pcnet.c
|
||||
@@ -1064,6 +1064,12 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
|
||||
int pktcount = 0;
|
||||
|
||||
if (!s->looptest) {
|
||||
+ if (size > 4092) {
|
||||
+#ifdef PCNET_DEBUG_RMD
|
||||
+ fprintf(stderr, "pcnet: truncates rx packet.\n");
|
||||
+#endif
|
||||
+ size = 4092;
|
||||
+ }
|
||||
memcpy(src, buf, size);
|
||||
/* no need to compute the CRC */
|
||||
src[size] = 0;
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
https://bugs.gentoo.org/568214
|
||||
|
||||
From 43b11a91dd861a946b231b89b7542856ade23d1b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
||||
Date: Fri, 26 Jun 2015 14:25:29 +0200
|
||||
Subject: [PATCH] msix: implement pba write (but read-only)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
qpci_msix_pending() writes on pba region, causing qemu to SEGV:
|
||||
|
||||
Program received signal SIGSEGV, Segmentation fault.
|
||||
[Switching to Thread 0x7ffff7fba8c0 (LWP 25882)]
|
||||
0x0000000000000000 in ?? ()
|
||||
(gdb) bt
|
||||
#0 0x0000000000000000 in ()
|
||||
#1 0x00005555556556c5 in memory_region_oldmmio_write_accessor (mr=0x5555579f3f80, addr=0, value=0x7fffffffbf68, size=4, shift=0, mask=4294967295, attrs=...) at /home/elmarco/src/qemu/memory.c:434
|
||||
#2 0x00005555556558e1 in access_with_adjusted_size (addr=0, value=0x7fffffffbf68, size=4, access_size_min=1, access_size_max=4, access=0x55555565563e <memory_region_oldmmio_write_accessor>, mr=0x5555579f3f80, attrs=...) at /home/elmarco/src/qemu/memory.c:506
|
||||
#3 0x00005555556581eb in memory_region_dispatch_write (mr=0x5555579f3f80, addr=0, data=0, size=4, attrs=...) at /home/elmarco/src/qemu/memory.c:1176
|
||||
#4 0x000055555560b6f9 in address_space_rw (as=0x555555eff4e0 <address_space_memory>, addr=3759147008, attrs=..., buf=0x7fffffffc1b0 "", len=4, is_write=true) at /home/elmarco/src/qemu/exec.c:2439
|
||||
#5 0x000055555560baa2 in cpu_physical_memory_rw (addr=3759147008, buf=0x7fffffffc1b0 "", len=4, is_write=1) at /home/elmarco/src/qemu/exec.c:2534
|
||||
#6 0x000055555564c005 in cpu_physical_memory_write (addr=3759147008, buf=0x7fffffffc1b0, len=4) at /home/elmarco/src/qemu/include/exec/cpu-common.h:80
|
||||
#7 0x000055555564cd9c in qtest_process_command (chr=0x55555642b890, words=0x5555578de4b0) at /home/elmarco/src/qemu/qtest.c:378
|
||||
#8 0x000055555564db77 in qtest_process_inbuf (chr=0x55555642b890, inbuf=0x55555641b340) at /home/elmarco/src/qemu/qtest.c:569
|
||||
#9 0x000055555564dc07 in qtest_read (opaque=0x55555642b890, buf=0x7fffffffc2e0 "writel 0xe0100800 0x0\n", size=22) at /home/elmarco/src/qemu/qtest.c:581
|
||||
#10 0x000055555574ce3e in qemu_chr_be_write (s=0x55555642b890, buf=0x7fffffffc2e0 "writel 0xe0100800 0x0\n", len=22) at qemu-char.c:306
|
||||
#11 0x0000555555751263 in tcp_chr_read (chan=0x55555642bcf0, cond=G_IO_IN, opaque=0x55555642b890) at qemu-char.c:2876
|
||||
#12 0x00007ffff64c9a8a in g_main_context_dispatch (context=0x55555641c400) at gmain.c:3122
|
||||
|
||||
(without this patch, this can be reproduced with the ivshmem qtest)
|
||||
|
||||
Implement an empty mmio write to avoid the crash.
|
||||
|
||||
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||||
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
hw/pci/msix.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/hw/pci/msix.c b/hw/pci/msix.c
|
||||
index 2fdada4..64c93d8 100644
|
||||
--- a/hw/pci/msix.c
|
||||
+++ b/hw/pci/msix.c
|
||||
@@ -200,8 +200,14 @@ static uint64_t msix_pba_mmio_read(void *opaque, hwaddr addr,
|
||||
return pci_get_long(dev->msix_pba + addr);
|
||||
}
|
||||
|
||||
+static void msix_pba_mmio_write(void *opaque, hwaddr addr,
|
||||
+ uint64_t val, unsigned size)
|
||||
+{
|
||||
+}
|
||||
+
|
||||
static const MemoryRegionOps msix_pba_mmio_ops = {
|
||||
.read = msix_pba_mmio_read,
|
||||
+ .write = msix_pba_mmio_write,
|
||||
.endianness = DEVICE_LITTLE_ENDIAN,
|
||||
.valid = {
|
||||
.min_access_size = 4,
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
https://bugs.gentoo.org/566792
|
||||
|
||||
From 00837731d254908a841d69298a4f9f077babaf24 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Weil <sw@weilnetz.de>
|
||||
Date: Fri, 20 Nov 2015 08:42:33 +0100
|
||||
Subject: [PATCH] eepro100: Prevent two endless loops
|
||||
|
||||
http://lists.nongnu.org/archive/html/qemu-devel/2015-11/msg04592.html
|
||||
shows an example how an endless loop in function action_command can
|
||||
be achieved.
|
||||
|
||||
During my code review, I noticed a 2nd case which can result in an
|
||||
endless loop.
|
||||
|
||||
Reported-by: Qinghao Tang <luodalongde@gmail.com>
|
||||
Signed-off-by: Stefan Weil <sw@weilnetz.de>
|
||||
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||||
---
|
||||
hw/net/eepro100.c | 16 ++++++++++++++++
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
|
||||
index 60333b7..685a478 100644
|
||||
--- a/hw/net/eepro100.c
|
||||
+++ b/hw/net/eepro100.c
|
||||
@@ -774,6 +774,11 @@ static void tx_command(EEPRO100State *s)
|
||||
#if 0
|
||||
uint16_t tx_buffer_el = lduw_le_pci_dma(&s->dev, tbd_address + 6);
|
||||
#endif
|
||||
+ if (tx_buffer_size == 0) {
|
||||
+ /* Prevent an endless loop. */
|
||||
+ logout("loop in %s:%u\n", __FILE__, __LINE__);
|
||||
+ break;
|
||||
+ }
|
||||
tbd_address += 8;
|
||||
TRACE(RXTX, logout
|
||||
("TBD (simplified mode): buffer address 0x%08x, size 0x%04x\n",
|
||||
@@ -855,6 +860,10 @@ static void set_multicast_list(EEPRO100State *s)
|
||||
|
||||
static void action_command(EEPRO100State *s)
|
||||
{
|
||||
+ /* The loop below won't stop if it gets special handcrafted data.
|
||||
+ Therefore we limit the number of iterations. */
|
||||
+ unsigned max_loop_count = 16;
|
||||
+
|
||||
for (;;) {
|
||||
bool bit_el;
|
||||
bool bit_s;
|
||||
@@ -870,6 +879,13 @@ static void action_command(EEPRO100State *s)
|
||||
#if 0
|
||||
bool bit_sf = ((s->tx.command & COMMAND_SF) != 0);
|
||||
#endif
|
||||
+
|
||||
+ if (max_loop_count-- == 0) {
|
||||
+ /* Prevent an endless loop. */
|
||||
+ logout("loop in %s:%u\n", __FILE__, __LINE__);
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
s->cu_offset = s->tx.link;
|
||||
TRACE(OTHER,
|
||||
logout("val=(cu start), status=0x%04x, command=0x%04x, link=0x%08x\n",
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
https://bugs.gentoo.org/567828
|
||||
|
||||
From 4c65fed8bdf96780735dbdb92a8bd0d6b6526cc3 Mon Sep 17 00:00:00 2001
|
||||
From: Prasad J Pandit <pjp@fedoraproject.org>
|
||||
Date: Thu, 3 Dec 2015 18:54:17 +0530
|
||||
Subject: [PATCH] ui: vnc: avoid floating point exception
|
||||
|
||||
While sending 'SetPixelFormat' messages to a VNC server,
|
||||
the client could set the 'red-max', 'green-max' and 'blue-max'
|
||||
values to be zero. This leads to a floating point exception in
|
||||
write_png_palette while doing frame buffer updates.
|
||||
|
||||
Reported-by: Lian Yihan <lianyihan@360.cn>
|
||||
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
||||
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
||||
---
|
||||
ui/vnc.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/ui/vnc.c b/ui/vnc.c
|
||||
index 7538405..cbe4d33 100644
|
||||
--- a/ui/vnc.c
|
||||
+++ b/ui/vnc.c
|
||||
@@ -2198,15 +2198,15 @@ static void set_pixel_format(VncState *vs,
|
||||
return;
|
||||
}
|
||||
|
||||
- vs->client_pf.rmax = red_max;
|
||||
+ vs->client_pf.rmax = red_max ? red_max : 0xFF;
|
||||
vs->client_pf.rbits = hweight_long(red_max);
|
||||
vs->client_pf.rshift = red_shift;
|
||||
vs->client_pf.rmask = red_max << red_shift;
|
||||
- vs->client_pf.gmax = green_max;
|
||||
+ vs->client_pf.gmax = green_max ? green_max : 0xFF;
|
||||
vs->client_pf.gbits = hweight_long(green_max);
|
||||
vs->client_pf.gshift = green_shift;
|
||||
vs->client_pf.gmask = green_max << green_shift;
|
||||
- vs->client_pf.bmax = blue_max;
|
||||
+ vs->client_pf.bmax = blue_max ? blue_max : 0xFF;
|
||||
vs->client_pf.bbits = hweight_long(blue_max);
|
||||
vs->client_pf.bshift = blue_shift;
|
||||
vs->client_pf.bmask = blue_max << blue_shift;
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@ -1,642 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="ncurses,readline"
|
||||
|
||||
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
|
||||
user udev fcaps readme.gentoo pax-utils
|
||||
|
||||
BACKPORTS=
|
||||
|
||||
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
|
||||
${BACKPORTS:+
|
||||
https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
|
||||
KEYWORDS="amd64 ~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 +caps +curl debug +fdt glusterfs \
|
||||
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 tls usb usbredir +uuid vde +vhost-net \
|
||||
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"
|
||||
|
||||
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.
|
||||
COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
|
||||
sys-libs/zlib[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(+)] )
|
||||
gtk? (
|
||||
gtk2? (
|
||||
x11-libs/gtk+:2
|
||||
vte? ( x11-libs/vte:0 )
|
||||
)
|
||||
!gtk2? (
|
||||
x11-libs/gtk+:3
|
||||
vte? ( x11-libs/vte:2.90 )
|
||||
)
|
||||
)
|
||||
infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
|
||||
iscsi? ( net-libs/libiscsi )
|
||||
jpeg? ( virtual/jpeg:=[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]
|
||||
)
|
||||
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? ( dev-libs/nss !app-emulation/libcacard )
|
||||
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(+)] )
|
||||
tls? ( net-libs/gnutls[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(+)] )
|
||||
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."
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
# Cheap hack to disable gettext .mo generation.
|
||||
use nls || rm -f po/*.po
|
||||
|
||||
epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
|
||||
epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-{7504,7512}.patch #567144
|
||||
epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-8345.patch #566792
|
||||
epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-8504.patch #567828
|
||||
epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-7549.patch #568214
|
||||
epatch "${FILESDIR}"/${PN}-2.4-mips-* #563162
|
||||
[[ -n ${BACKPORTS} ]] && \
|
||||
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
|
||||
epatch
|
||||
|
||||
# Fix ld and objcopy being called directly
|
||||
tc-export AR LD OBJCOPY
|
||||
|
||||
# Verbose builds
|
||||
MAKEOPTS+=" V=1"
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
##
|
||||
# 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
|
||||
--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 bluetooth bluez)
|
||||
$(conf_softmmu caps cap-ng)
|
||||
$(conf_softmmu curl)
|
||||
$(conf_softmmu fdt)
|
||||
$(conf_softmmu glusterfs)
|
||||
$(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 smartcard-nss)
|
||||
$(conf_softmmu snappy)
|
||||
$(conf_softmmu spice)
|
||||
$(conf_softmmu ssh libssh2)
|
||||
$(conf_softmmu tls vnc-tls)
|
||||
$(conf_softmmu usb libusb)
|
||||
$(conf_softmmu usbredir usb-redir)
|
||||
$(conf_softmmu uuid)
|
||||
$(conf_softmmu vde)
|
||||
$(conf_softmmu vhost-net)
|
||||
$(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
|
||||
)
|
||||
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/kvm_stat"
|
||||
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/qmp/"
|
||||
|
||||
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,651 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="ncurses,readline"
|
||||
|
||||
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
|
||||
user udev fcaps readme.gentoo pax-utils
|
||||
|
||||
BACKPORTS=
|
||||
|
||||
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
|
||||
${BACKPORTS:+
|
||||
https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
|
||||
KEYWORDS="~amd64 ~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 +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.
|
||||
COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
|
||||
sys-libs/zlib[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.90 )
|
||||
)
|
||||
)
|
||||
infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
|
||||
iscsi? ( net-libs/libiscsi )
|
||||
jpeg? ( virtual/jpeg:=[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]
|
||||
)
|
||||
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."
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
# Cheap hack to disable gettext .mo generation.
|
||||
use nls || rm -f po/*.po
|
||||
|
||||
epatch "${FILESDIR}"/qemu-2.5.0-cflags.patch
|
||||
[[ -n ${BACKPORTS} ]] && \
|
||||
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
|
||||
epatch
|
||||
|
||||
# Fix ld and objcopy being called directly
|
||||
tc-export AR LD OBJCOPY
|
||||
|
||||
# Verbose builds
|
||||
MAKEOPTS+=" V=1"
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
##
|
||||
# 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 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
|
||||
)
|
||||
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/kvm_stat"
|
||||
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)"
|
||||
}
|
||||
@ -0,0 +1,469 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE='ncurses,xml,threads'
|
||||
|
||||
inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator
|
||||
|
||||
MY_PV=${PV/_/-}
|
||||
MAJOR_V="$(get_version_component_range 1-2)"
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
inherit git-r3
|
||||
KEYWORDS=""
|
||||
REPO="xen.git"
|
||||
EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
else
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
UPSTREAM_VER=0
|
||||
SECURITY_VER=7
|
||||
# vars set to reflect https://dev.gentoo.org/~idella4/
|
||||
# first instance of UPS_VER (usptream ver)
|
||||
UPS_VER=0
|
||||
SEC_VER=5
|
||||
QEMU_VER=0
|
||||
# xen-tools's gentoo patches tarball
|
||||
GENTOO_VER=4
|
||||
# xen-tools's gentoo patches version which apply to this specific ebuild
|
||||
GENTOO_GPV=0
|
||||
# xen-tools ovmf's patches
|
||||
OVMF_VER=1
|
||||
|
||||
SEABIOS_VER=1.8.2
|
||||
OVMF_PV=20150629
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
|
||||
https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-upstream-patches-${UPS_VER}.tar.gz"
|
||||
[[ -n ${SECURITY_VER} ]] && \
|
||||
SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
|
||||
https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz
|
||||
https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
[[ -n ${OVMF_VER} ]] && \
|
||||
OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
|
||||
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
|
||||
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
|
||||
https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
|
||||
ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
|
||||
${OVMF_PATCHSET_URI} )
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${SECURITY_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}"
|
||||
|
||||
S="${WORKDIR}/xen-${MY_PV}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Xen tools including QEMU and xl"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
DOCS=( README docs/README.xen-bugtool )
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0/${MAJOR_V}"
|
||||
# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
|
||||
# >=dev-lang/ocaml-4 stable
|
||||
# Masked in profiles/eapi-5-files instead
|
||||
IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf qemu-traditional +pam python pygrub screen sdl static-libs system-qemu system-seabios"
|
||||
|
||||
REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
|
||||
${PYTHON_REQUIRED_USE}
|
||||
pygrub? ( python )
|
||||
ovmf? ( hvm )
|
||||
qemu? ( !system-qemu )"
|
||||
|
||||
COMMON_DEPEND="
|
||||
dev-libs/lzo:2
|
||||
dev-libs/glib:2
|
||||
dev-libs/yajl
|
||||
dev-libs/libaio
|
||||
dev-libs/libgcrypt:0
|
||||
sys-libs/zlib
|
||||
"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-python/lxml[${PYTHON_USEDEP}]
|
||||
x86? ( sys-devel/dev86
|
||||
sys-power/iasl )
|
||||
pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
|
||||
${PYTHON_DEPS}
|
||||
api? ( dev-libs/libxml2
|
||||
net-misc/curl )
|
||||
ovmf? ( $(python_gen_impl_dep sqlite) )
|
||||
!amd64? ( >=sys-apps/dtc-1.4.0 )
|
||||
amd64? ( sys-devel/bin86
|
||||
system-seabios? ( sys-firmware/seabios )
|
||||
sys-firmware/ipxe
|
||||
sys-devel/dev86
|
||||
sys-power/iasl )
|
||||
dev-lang/perl
|
||||
app-misc/pax-utils
|
||||
doc? (
|
||||
app-doc/doxygen
|
||||
dev-python/markdown[${PYTHON_USEDEP}]
|
||||
dev-tex/latex2html[png,gif]
|
||||
media-gfx/graphviz
|
||||
dev-tex/xcolor
|
||||
media-gfx/transfig
|
||||
dev-texlive/texlive-latexextra
|
||||
virtual/latex-base
|
||||
dev-tex/latexmk
|
||||
dev-texlive/texlive-latex
|
||||
dev-texlive/texlive-pictures
|
||||
dev-texlive/texlive-latexrecommended
|
||||
)
|
||||
hvm? ( x11-proto/xproto
|
||||
!net-libs/libiscsi )
|
||||
qemu? (
|
||||
x11-libs/pixman
|
||||
sdl? ( media-libs/libsdl[X] )
|
||||
)
|
||||
system-qemu? ( app-emulation/qemu[xen] )
|
||||
ocaml? ( dev-ml/findlib
|
||||
>=dev-lang/ocaml-4 )"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
sys-apps/iproute2[-minimal]
|
||||
net-misc/bridge-utils
|
||||
screen? (
|
||||
app-misc/screen
|
||||
app-admin/logrotate
|
||||
)"
|
||||
|
||||
# hvmloader is used to bootstrap a fully virtualized kernel
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="usr/lib/xen/boot/hvmloader
|
||||
usr/share/qemu-xen/qemu/s390-ccw.img"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
export "CONFIG_LOMOUNT=y"
|
||||
|
||||
#bug 522642, disable compile tools/tests
|
||||
export "CONFIG_TESTS=n"
|
||||
|
||||
if has_version dev-libs/libgcrypt:0; then
|
||||
export "CONFIG_GCRYPT=y"
|
||||
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"
|
||||
elif use arm; then
|
||||
export XEN_TARGET_ARCH="arm32"
|
||||
elif use arm64; then
|
||||
export XEN_TARGET_ARCH="arm64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
einfo "Try to apply Xen Upstream patch set"
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-upstream \
|
||||
"${WORKDIR}"/libexec.patch
|
||||
fi
|
||||
|
||||
# Security patchset
|
||||
if [[ -n ${SECURITY_VER} ]]; then
|
||||
einfo "Try to apply Xen Security patch set"
|
||||
source "${WORKDIR}"/patches-security/${PV}.conf
|
||||
# apply main xen patches
|
||||
# Two parallel systems, both work side by side
|
||||
# Over time they may concdense into one. This will suffice for now
|
||||
EPATCH_SUFFIX="patch"
|
||||
EPATCH_FORCE="yes"
|
||||
for i in ${XEN_SECURITY_MAIN}; do
|
||||
epatch "${WORKDIR}"/patches-security/xen/$i
|
||||
done
|
||||
|
||||
for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
|
||||
epatch $i
|
||||
done
|
||||
|
||||
# apply qemu-traditional patches
|
||||
pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
|
||||
for i in ${XEN_SECURITY_QEMUT}; do
|
||||
epatch "${WORKDIR}"/patches-security/qemut/$i
|
||||
done
|
||||
for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
|
||||
epatch $i
|
||||
done
|
||||
popd > /dev/null
|
||||
|
||||
# apply qemu-xen/upstream patches
|
||||
pushd "${S}"/tools/qemu-xen/ > /dev/null
|
||||
for i in ${XEN_SECURITY_QEMUU}; do
|
||||
epatch "${WORKDIR}"/patches-security/qemuu/$i
|
||||
done
|
||||
for i in "${WORKDIR}"/qemu-patches/qemuu/xsa*.patch; do
|
||||
epatch $i
|
||||
done
|
||||
popd > /dev/null
|
||||
fi
|
||||
|
||||
# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
|
||||
mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
|
||||
pushd tools/firmware/ > /dev/null
|
||||
ln -s seabios-dir-remote seabios-dir || die
|
||||
popd > /dev/null
|
||||
|
||||
# Gentoo's patchset
|
||||
if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
|
||||
einfo "Try to apply Gentoo specific patch set"
|
||||
source "${FILESDIR}"/gentoo-patches.conf
|
||||
_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
|
||||
for i in ${!_gpv}; do
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-gentoo/$i
|
||||
done
|
||||
fi
|
||||
|
||||
# Ovmf's patchset
|
||||
if [[ -n ${OVMF_VER} ]] && use ovmf; then
|
||||
einfo "Try to apply Ovmf patch set"
|
||||
pushd "${WORKDIR}"/ovmf-*/ > /dev/null
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-ovmf
|
||||
popd > /dev/null
|
||||
mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
|
||||
fi
|
||||
|
||||
mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
|
||||
|
||||
# Fix texi2html build error with new texi2html, qemu.doc.html
|
||||
sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
|
||||
|
||||
use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
|
||||
sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
|
||||
-i tools/firmware/Makefile || die
|
||||
|
||||
# Drop .config, fixes to gcc-4.6
|
||||
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 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"
|
||||
else
|
||||
unset CFLAGS
|
||||
unset LDFLAGS
|
||||
unset ASFLAGS
|
||||
unset CPPFLAGS
|
||||
fi
|
||||
|
||||
if ! use pygrub; then
|
||||
sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
|
||||
fi
|
||||
|
||||
if ! use python; then
|
||||
sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
|
||||
fi
|
||||
|
||||
if ! use hvm; then
|
||||
sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
|
||||
# Bug 351648
|
||||
elif ! use x86 && ! has x86 $(get_all_abis); then
|
||||
mkdir -p "${WORKDIR}"/extra-headers/gnu || die
|
||||
touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
|
||||
export CPATH="${WORKDIR}"/extra-headers
|
||||
fi
|
||||
|
||||
if use qemu; then
|
||||
if use sdl; then
|
||||
sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
|
||||
tools/Makefile || die
|
||||
else
|
||||
sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
|
||||
tools/qemu-xen-traditional/xen-setup || die
|
||||
sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
|
||||
tools/Makefile || die
|
||||
fi
|
||||
else
|
||||
# Don't bother with qemu, only needed for fully virtualised guests
|
||||
sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
|
||||
fi
|
||||
|
||||
# Reset bash completion dir; Bug 472438
|
||||
sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
|
||||
-i Config.mk || die
|
||||
sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
|
||||
|
||||
# xencommons, Bug #492332, sed lighter weight than patching
|
||||
sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
|
||||
-i tools/hotplug/Linux/init.d/xencommons.in || die
|
||||
|
||||
# respect multilib, usr/lib/libcacard.so.0.0.0
|
||||
sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
|
||||
-i tools/qemu-xen/configure || die
|
||||
|
||||
#bug 518136, don't build 32bit exactuable for nomultilib profile
|
||||
if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
|
||||
sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
|
||||
fi
|
||||
|
||||
# use /var instead of /var/lib, consistat with previous ebuild
|
||||
sed -i -e "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
|
||||
m4/paths.m4 configure tools/configure || die
|
||||
# use /run instead of /var/run
|
||||
sed -i -e "/XEN_RUN_DIR=/s/\$localstatedir//g" \
|
||||
m4/paths.m4 configure tools/configure || die
|
||||
|
||||
# uncomment lines in xl.conf
|
||||
sed -e 's:^#autoballoon=:autoballoon=:' \
|
||||
-e 's:^#lockfile=:lockfile=:' \
|
||||
-e 's:^#vif.default.script=:vif.default.script=:' \
|
||||
-i tools/examples/xl.conf || die
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf="--prefix=${PREFIX}/usr \
|
||||
--libdir=${PREFIX}/usr/$(get_libdir) \
|
||||
--libexecdir=${PREFIX}/usr/libexec \
|
||||
--disable-werror \
|
||||
--disable-xen \
|
||||
--enable-tools \
|
||||
--enable-docs \
|
||||
$(use_with system-qemu) \
|
||||
$(use_enable pam) \
|
||||
$(use_enable api xenapi) \
|
||||
$(use_enable ovmf) \
|
||||
$(use_enable ocaml ocamltools) \
|
||||
--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
|
||||
"
|
||||
|
||||
use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
|
||||
use qemu || myconf+=" --with-system-qemu"
|
||||
use amd64 && myconf+=" $(use_enable qemu-traditional)"
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export VARTEXFONTS="${T}/fonts"
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
if test-flag-CC -fno-strict-overflow; then
|
||||
append-flags -fno-strict-overflow
|
||||
fi
|
||||
|
||||
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
|
||||
|
||||
use doc && emake -C docs txt html
|
||||
emake -C docs man-pages
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Override auto-detection in the build system, bug #382573
|
||||
export INITD_DIR=/tmp/init.d
|
||||
export CONFIG_LEAF_DIR=../tmp/default
|
||||
|
||||
# Let the build system compile installed Python modules.
|
||||
local PYTHONDONTWRITEBYTECODE
|
||||
export PYTHONDONTWRITEBYTECODE
|
||||
|
||||
emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
|
||||
XEN_PYTHON_NATIVE_INSTALL=y install-tools
|
||||
|
||||
# Fix the remaining Python shebangs.
|
||||
python_fix_shebang "${D}"
|
||||
|
||||
# Remove RedHat-specific stuff
|
||||
rm -rf "${D}"tmp || die
|
||||
|
||||
if use doc; then
|
||||
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
|
||||
|
||||
dohtml -r docs/
|
||||
docinto pdf
|
||||
dodoc ${DOCS[@]}
|
||||
[ -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?/*
|
||||
|
||||
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
|
||||
newinitd "${FILESDIR}"/xencommons.initd xencommons
|
||||
newconfd "${FILESDIR}"/xencommons.confd xencommons
|
||||
newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
|
||||
newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
|
||||
|
||||
if use screen; then
|
||||
cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
|
||||
cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
|
||||
keepdir /var/log/xen-consoles
|
||||
fi
|
||||
|
||||
# For -static-libs wrt Bug 384355
|
||||
if ! use static-libs; then
|
||||
rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
|
||||
fi
|
||||
|
||||
# for xendomains
|
||||
keepdir /etc/xen/auto
|
||||
|
||||
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
|
||||
find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
|
||||
-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the offical wiki page:"
|
||||
elog "https://wiki.gentoo.org/wiki/Xen"
|
||||
elog "http://wiki.xen.org/wiki/Main_Page"
|
||||
elog ""
|
||||
elog "Recommended to utilise the xencommons script to config sytem At boot"
|
||||
elog "Add by use of rc-update on completion of the install"
|
||||
|
||||
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 system is required to build HVM support."
|
||||
fi
|
||||
|
||||
if use qemu; then
|
||||
elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
|
||||
elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
|
||||
elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
|
||||
elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils multilib qmake-utils
|
||||
|
||||
MY_P=qp${PV}
|
||||
|
||||
DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
|
||||
HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
|
||||
SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="Qu-Prolog GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE="debug doc examples pedro qt4 readline threads"
|
||||
|
||||
RDEPEND="
|
||||
!dev-util/mpatch
|
||||
!dev-util/rej
|
||||
qt4? ( dev-qt/qtgui:4 )
|
||||
pedro? ( net-misc/pedro )
|
||||
readline? ( app-misc/rlwrap )"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/perl"
|
||||
|
||||
S="${WORKDIR}"/${MY_P}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--libdir=/usr/$(get_libdir) \
|
||||
$(use_enable debug) \
|
||||
$(use_enable threads multiple-threads)
|
||||
|
||||
if use qt4; then
|
||||
cd "${S}"/src/xqp || die
|
||||
eqmake4 xqp.pro
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake OPTIMISATION="${CXXFLAGS}"
|
||||
|
||||
if use qt4; then
|
||||
cd "${S}"/src/xqp || die
|
||||
emake
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
sed \
|
||||
-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
|
||||
-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
|
||||
|
||||
dobin bin/{qc,qecat,qp,kq}
|
||||
|
||||
into /usr/$(get_libdir)/${PN}
|
||||
dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
|
||||
|
||||
use qt4 && dobin src/xqp/xqp
|
||||
|
||||
insinto /usr/$(get_libdir)/${PN}/bin
|
||||
doins bin/rl_commands
|
||||
doins bin/{qc1.qup,qecat,qg,qp}.qx
|
||||
|
||||
insinto /usr/$(get_libdir)/${PN}/library
|
||||
doins prolog/library/*.qo
|
||||
|
||||
insinto /usr/$(get_libdir)/${PN}/compiler
|
||||
doins prolog/compiler/*.qo
|
||||
|
||||
doman doc/man/man1/*.1
|
||||
|
||||
dodoc README
|
||||
|
||||
if use doc ; then
|
||||
docinto reference-manual
|
||||
dodoc doc/manual/*.html
|
||||
docinto user-guide
|
||||
dodoc doc/user/main.pdf
|
||||
fi
|
||||
|
||||
if use examples ; then
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins examples/*.ql
|
||||
docinto examples
|
||||
newdoc examples/README README.examples
|
||||
fi
|
||||
}
|
||||
@ -1,228 +0,0 @@
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprolog/ChoicePointStore.java 2p-deploy/src/alice/tuprolog/ChoicePointStore.java
|
||||
--- 2p-deploy.orig/src/alice/tuprolog/ChoicePointStore.java 2010-01-21 21:29:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprolog/ChoicePointStore.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -35,7 +35,6 @@
|
||||
|
||||
/**
|
||||
* Return the actual choice-point store
|
||||
- * @return
|
||||
*/
|
||||
public ChoicePointContext getPointer() {
|
||||
return pointer;
|
||||
@@ -44,7 +43,6 @@
|
||||
/**
|
||||
* Check if a choice point exists in the store.
|
||||
* As a side effect, removes choice points which have been already used and are now empty.
|
||||
- * @return
|
||||
*/
|
||||
protected boolean existChoicePoint() {
|
||||
if (pointer == null) return false;
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprolog/ClauseStore.java 2p-deploy/src/alice/tuprolog/ClauseStore.java
|
||||
--- 2p-deploy.orig/src/alice/tuprolog/ClauseStore.java 2010-11-04 11:55:42.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprolog/ClauseStore.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -62,8 +62,6 @@
|
||||
|
||||
/**
|
||||
* Verify if there is a term in compatibleGoals compatible with goal.
|
||||
- * @param goal
|
||||
- * @param compGoals
|
||||
* @return true if compatible or false otherwise.
|
||||
*/
|
||||
protected boolean existCompatibleClause() {
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprolog/EngineManager.java 2p-deploy/src/alice/tuprolog/EngineManager.java
|
||||
--- 2p-deploy.orig/src/alice/tuprolog/EngineManager.java 2010-01-21 21:29:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprolog/EngineManager.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -87,7 +87,7 @@
|
||||
/**
|
||||
* Solves a query
|
||||
*
|
||||
- * @param g the term representing the goal to be demonstrated
|
||||
+ * @param query the term representing the goal to be demonstrated
|
||||
* @return the result of the demonstration
|
||||
* @see SolveInfo
|
||||
**/
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprolog/PrimitiveManager.java 2p-deploy/src/alice/tuprolog/PrimitiveManager.java
|
||||
--- 2p-deploy.orig/src/alice/tuprolog/PrimitiveManager.java 2010-01-21 21:29:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprolog/PrimitiveManager.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -87,7 +87,7 @@
|
||||
* This involves identifying structs representing builtin
|
||||
* predicates and functors, and setting up related structures and links
|
||||
*
|
||||
- * @parm term the term to be identified
|
||||
+ * @param term the term to be identified
|
||||
* @return term with the identified built-in directive
|
||||
*/
|
||||
public Term identifyDirective(Term term) {
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprolog/lib/BasicLibrary.java 2p-deploy/src/alice/tuprolog/lib/BasicLibrary.java
|
||||
--- 2p-deploy.orig/src/alice/tuprolog/lib/BasicLibrary.java 2011-01-28 16:31:44.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprolog/lib/BasicLibrary.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -109,7 +109,7 @@
|
||||
/**
|
||||
* Loads a library constructed from a theory.
|
||||
*
|
||||
- * @param theory
|
||||
+ * @param th
|
||||
* theory text
|
||||
* @param libName
|
||||
* name of the library
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprolog/lib/IOLibrary.java 2p-deploy/src/alice/tuprolog/lib/IOLibrary.java
|
||||
--- 2p-deploy.orig/src/alice/tuprolog/lib/IOLibrary.java 2011-01-19 16:34:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprolog/lib/IOLibrary.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -372,7 +372,7 @@
|
||||
/**
|
||||
* Sets an arbitrary seed for the Random object.
|
||||
*
|
||||
- * @param seed Seed to use
|
||||
+ * @param t Seed to use
|
||||
* @return true if seed Term has a valid long value, false otherwise
|
||||
*/
|
||||
public boolean set_seed_1(Term t) throws PrologError {
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprolog/lib/JavaLibrary.java 2p-deploy/src/alice/tuprolog/lib/JavaLibrary.java
|
||||
--- 2p-deploy.orig/src/alice/tuprolog/lib/JavaLibrary.java 2010-01-21 21:29:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprolog/lib/JavaLibrary.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -1390,8 +1390,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- *
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2p-deploy/src/alice/tuprologx/ide/LibraryDialogFrame.java
|
||||
--- 2p-deploy.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2010-01-21 21:29:22.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprologx/ide/LibraryDialogFrame.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -317,7 +317,6 @@
|
||||
displayLibraryManagerStatus();
|
||||
}
|
||||
|
||||
- /** @see alice.tuprologx.ide.SwingFrame#onClose()*/
|
||||
public void closeLibraryDialog()
|
||||
{
|
||||
onClose();
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprologx/ide/ToolBar.java 2p-deploy/src/alice/tuprologx/ide/ToolBar.java
|
||||
--- 2p-deploy.orig/src/alice/tuprologx/ide/ToolBar.java 2010-01-21 21:29:22.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprologx/ide/ToolBar.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -232,8 +232,6 @@
|
||||
|
||||
/**
|
||||
* Set the tuProlog config frame
|
||||
- *
|
||||
- * @param libraryManager a libraryManager to associate to the libraryDialog
|
||||
*/
|
||||
public void setPrologConfig(PrologConfigFrame configFrame)
|
||||
{
|
||||
diff -ur 2p-deploy.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2p-deploy/src/alice/tuprologx/pj/lib/PJLibrary.java
|
||||
--- 2p-deploy.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2010-01-21 21:29:48.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/tuprologx/pj/lib/PJLibrary.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -1252,7 +1252,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
diff -ur 2p-deploy.orig/src/alice/util/ReadOnlyLinkedList.java 2p-deploy/src/alice/util/ReadOnlyLinkedList.java
|
||||
--- 2p-deploy.orig/src/alice/util/ReadOnlyLinkedList.java 2010-03-17 18:14:10.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/util/ReadOnlyLinkedList.java 2012-01-15 09:32:03.000000000 +1300
|
||||
@@ -12,10 +12,10 @@
|
||||
import java.util.ListIterator;
|
||||
|
||||
/**
|
||||
- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
|
||||
+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
|
||||
* and ensures that the given list is navigated only.
|
||||
*
|
||||
- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
|
||||
+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
|
||||
* support modifiers methods, and throws {@link UnsupportedOperationException}
|
||||
* if invoked.
|
||||
*
|
||||
diff -ur 2p-deploy.orig/src/alice/util/jedit/InputHandler.java 2p-deploy/src/alice/util/jedit/InputHandler.java
|
||||
--- 2p-deploy.orig/src/alice/util/jedit/InputHandler.java 2010-01-21 21:29:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/util/jedit/InputHandler.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -24,7 +24,7 @@
|
||||
*
|
||||
* @author Slava Pestov
|
||||
* @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
|
||||
- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
|
||||
+ * @see alice.util.jedit.DefaultInputHandler
|
||||
*/
|
||||
public abstract class InputHandler extends KeyAdapter
|
||||
{
|
||||
@@ -187,7 +187,7 @@
|
||||
/**
|
||||
* Grabs the next key typed event and invokes the specified
|
||||
* action with the key as a the action command.
|
||||
- * @param action The action
|
||||
+ * @param listener The action
|
||||
*/
|
||||
public void grabNextKeyStroke(ActionListener listener)
|
||||
{
|
||||
diff -ur 2p-deploy.orig/src/alice/util/jedit/JEditTextArea.java 2p-deploy/src/alice/util/jedit/JEditTextArea.java
|
||||
--- 2p-deploy.orig/src/alice/util/jedit/JEditTextArea.java 2010-01-21 21:29:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/util/jedit/JEditTextArea.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -1389,7 +1389,7 @@
|
||||
|
||||
/**
|
||||
* Sets if the selection should be rectangular.
|
||||
- * @param overwrite True if the selection should be rectangular,
|
||||
+ * @param rectSelect True if the selection should be rectangular,
|
||||
* false otherwise.
|
||||
*/
|
||||
public final void setSelectionRectangular(boolean rectSelect)
|
||||
diff -ur 2p-deploy.orig/src/alice/util/jedit/KeywordMap.java 2p-deploy/src/alice/util/jedit/KeywordMap.java
|
||||
--- 2p-deploy.orig/src/alice/util/jedit/KeywordMap.java 2010-01-21 21:29:22.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/util/jedit/KeywordMap.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -75,7 +75,7 @@
|
||||
/**
|
||||
* Adds a key-value mapping.
|
||||
* @param keyword The key
|
||||
- * @Param id The value
|
||||
+ * @param id The value
|
||||
*/
|
||||
public void add(String keyword, byte id)
|
||||
{
|
||||
diff -ur 2p-deploy.orig/src/alice/util/jedit/TextAreaPainter.java 2p-deploy/src/alice/util/jedit/TextAreaPainter.java
|
||||
--- 2p-deploy.orig/src/alice/util/jedit/TextAreaPainter.java 2010-01-21 21:29:24.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/util/jedit/TextAreaPainter.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -75,7 +75,7 @@
|
||||
/**
|
||||
* Returns the syntax styles used to paint colorized text. Entry <i>n</i>
|
||||
* will be used to paint tokens with id = <i>n</i>.
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final SyntaxStyle[] getStyles()
|
||||
{
|
||||
@@ -86,7 +86,7 @@
|
||||
* Sets the syntax styles used to paint colorized text. Entry <i>n</i>
|
||||
* will be used to paint tokens with id = <i>n</i>.
|
||||
* @param styles The syntax styles
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final void setStyles(SyntaxStyle[] styles)
|
||||
{
|
||||
@@ -356,7 +356,7 @@
|
||||
|
||||
/**
|
||||
* Repaints the text.
|
||||
- * @param g The graphics context
|
||||
+ * @param gfx The graphics context
|
||||
*/
|
||||
public void paint(Graphics gfx)
|
||||
{
|
||||
diff -ur 2p-deploy.orig/src/alice/util/jedit/TokenMarker.java 2p-deploy/src/alice/util/jedit/TokenMarker.java
|
||||
--- 2p-deploy.orig/src/alice/util/jedit/TokenMarker.java 2010-01-21 21:29:22.000000000 +1300
|
||||
+++ 2p-deploy/src/alice/util/jedit/TokenMarker.java 2012-01-15 09:20:48.000000000 +1300
|
||||
@@ -24,7 +24,7 @@
|
||||
* @author Slava Pestov
|
||||
* @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
|
||||
*
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public abstract class TokenMarker
|
||||
{
|
||||
@ -1,315 +0,0 @@
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.5.0/src/alice/tuprolog/ChoicePointStore.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/ChoicePointStore.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/ChoicePointStore.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -36,7 +36,6 @@
|
||||
|
||||
/**
|
||||
* Return the actual choice-point store
|
||||
- * @return
|
||||
*/
|
||||
public ChoicePointContext getPointer() {
|
||||
return pointer;
|
||||
@@ -45,7 +44,6 @@
|
||||
/**
|
||||
* Check if a choice point exists in the store.
|
||||
* As a side effect, removes choice points which have been already used and are now empty.
|
||||
- * @return
|
||||
*/
|
||||
protected boolean existChoicePoint() {
|
||||
if (pointer == null) return false;
|
||||
@@ -93,4 +91,4 @@
|
||||
return l;
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.5.0/src/alice/tuprolog/ClauseStore.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/ClauseStore.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/ClauseStore.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -62,8 +62,6 @@
|
||||
|
||||
/**
|
||||
* Verify if there is a term in compatibleGoals compatible with goal.
|
||||
- * @param goal
|
||||
- * @param compGoals
|
||||
* @return true if compatible or false otherwise.
|
||||
*/
|
||||
protected boolean existCompatibleClause() {
|
||||
@@ -160,4 +158,4 @@
|
||||
}
|
||||
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/EngineManager.java tuprolog-2.5.0/src/alice/tuprolog/EngineManager.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/EngineManager.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/EngineManager.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -96,7 +96,7 @@
|
||||
/**
|
||||
* Solves a query
|
||||
*
|
||||
- * @param g the term representing the goal to be demonstrated
|
||||
+ * @param query the term representing the goal to be demonstrated
|
||||
* @return the result of the demonstration
|
||||
* @see SolveInfo
|
||||
**/
|
||||
@@ -243,4 +243,4 @@
|
||||
}
|
||||
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.5.0/src/alice/tuprolog/event/SpyEvent.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/event/SpyEvent.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/event/SpyEvent.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -33,10 +33,6 @@
|
||||
* event description
|
||||
*/
|
||||
private String msg;
|
||||
- /**
|
||||
- * @uml.property name="env"
|
||||
- * @uml.associationEnd
|
||||
- */
|
||||
private Engine env;
|
||||
|
||||
public SpyEvent(Object source, String msg_) {
|
||||
@@ -63,4 +59,4 @@
|
||||
return msg + ((env == null) ? "" : env.toString());
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.5.0/src/alice/tuprolog/lib/BasicLibrary.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/lib/BasicLibrary.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/lib/BasicLibrary.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -114,7 +114,7 @@
|
||||
/**
|
||||
* Loads a library constructed from a theory.
|
||||
*
|
||||
- * @param theory
|
||||
+ * @param th
|
||||
* theory text
|
||||
* @param libName
|
||||
* name of the library
|
||||
@@ -1356,4 +1356,4 @@
|
||||
{ "\\", "expression_bitwise_not", "functor" } };
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.5.0/src/alice/tuprolog/lib/IOLibrary.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/lib/IOLibrary.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/lib/IOLibrary.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -375,7 +375,7 @@
|
||||
/**
|
||||
* Sets an arbitrary seed for the Random object.
|
||||
*
|
||||
- * @param seed Seed to use
|
||||
+ * @param t Seed to use
|
||||
* @return true if seed Term has a valid long value, false otherwise
|
||||
*/
|
||||
public boolean set_seed_1(Term t) throws PrologError {
|
||||
@@ -470,4 +470,4 @@
|
||||
}
|
||||
return true;
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.5.0/src/alice/tuprolog/lib/JavaLibrary.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/lib/JavaLibrary.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/lib/JavaLibrary.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -1393,8 +1393,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- *
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.5.0/src/alice/tuprolog/PrimitiveManager.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprolog/PrimitiveManager.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprolog/PrimitiveManager.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -89,7 +89,7 @@
|
||||
* This involves identifying structs representing builtin
|
||||
* predicates and functors, and setting up related structures and links
|
||||
*
|
||||
- * @parm term the term to be identified
|
||||
+ * @param term the term to be identified
|
||||
* @return term with the identified built-in directive
|
||||
*/
|
||||
public Term identifyDirective(Term term) {
|
||||
@@ -192,4 +192,4 @@
|
||||
return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
|
||||
}
|
||||
/**/
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.5.0/src/alice/tuprologx/ide/Console.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprologx/ide/Console.java 2012-08-03 02:38:20.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprologx/ide/Console.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -10,8 +10,5 @@
|
||||
public void getNextSolution();
|
||||
public void acceptSolution();
|
||||
public void stopEngine();
|
||||
- /**
|
||||
- * @uml.property name="goal"
|
||||
- */
|
||||
public String getGoal();
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.5.0/src/alice/tuprologx/ide/LibraryDialogFrame.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2012-08-03 02:38:20.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprologx/ide/LibraryDialogFrame.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -325,7 +325,6 @@
|
||||
displayLibraryManagerStatus();
|
||||
}
|
||||
|
||||
- /** @see alice.tuprologx.ide.SwingFrame#onClose()*/
|
||||
public void closeLibraryDialog()
|
||||
{
|
||||
onClose();
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.5.0/src/alice/tuprologx/ide/ToolBar.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprologx/ide/ToolBar.java 2012-08-03 02:38:20.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprologx/ide/ToolBar.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -242,8 +242,6 @@
|
||||
|
||||
/**
|
||||
* Set the tuProlog config frame
|
||||
- *
|
||||
- * @param libraryManager a libraryManager to associate to the libraryDialog
|
||||
*/
|
||||
public void setPrologConfig(PrologConfigFrame configFrame)
|
||||
{
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.5.0/src/alice/tuprologx/pj/lib/PJLibrary.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2012-08-03 02:38:20.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/tuprologx/pj/lib/PJLibrary.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -1252,7 +1252,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.5.0/src/alice/util/jedit/InputHandler.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/util/jedit/InputHandler.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/util/jedit/InputHandler.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -24,7 +24,7 @@
|
||||
*
|
||||
* @author Slava Pestov
|
||||
* @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
|
||||
- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
|
||||
+ * @see alice.util.jedit.DefaultInputHandler
|
||||
*/
|
||||
public abstract class InputHandler extends KeyAdapter
|
||||
{
|
||||
@@ -187,7 +187,7 @@
|
||||
/**
|
||||
* Grabs the next key typed event and invokes the specified
|
||||
* action with the key as a the action command.
|
||||
- * @param action The action
|
||||
+ * @param listener The action
|
||||
*/
|
||||
public void grabNextKeyStroke(ActionListener listener)
|
||||
{
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.5.0/src/alice/util/jedit/JEditTextArea.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/util/jedit/JEditTextArea.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/util/jedit/JEditTextArea.java 2012-08-03 03:48:07.000000000 +0200
|
||||
@@ -1401,7 +1401,7 @@
|
||||
|
||||
/**
|
||||
* Sets if the selection should be rectangular.
|
||||
- * @param overwrite True if the selection should be rectangular,
|
||||
+ * @param rectSelect True if the selection should be rectangular,
|
||||
* false otherwise.
|
||||
*/
|
||||
public final void setSelectionRectangular(boolean rectSelect)
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.5.0/src/alice/util/jedit/KeywordMap.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/util/jedit/KeywordMap.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/util/jedit/KeywordMap.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -75,7 +75,7 @@
|
||||
/**
|
||||
* Adds a key-value mapping.
|
||||
* @param keyword The key
|
||||
- * @Param id The value
|
||||
+ * @param id The value
|
||||
*/
|
||||
public void add(String keyword, byte id)
|
||||
{
|
||||
@@ -102,9 +102,6 @@
|
||||
}
|
||||
|
||||
// protected members
|
||||
- /**
|
||||
- * @uml.property name="mapLength"
|
||||
- */
|
||||
protected int mapLength;
|
||||
|
||||
protected int getStringMapKey(String s)
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.5.0/src/alice/util/jedit/TextAreaPainter.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/util/jedit/TextAreaPainter.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/util/jedit/TextAreaPainter.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -75,7 +75,7 @@
|
||||
|
||||
/**
|
||||
* Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final SyntaxStyle[] getStyles()
|
||||
{
|
||||
@@ -85,7 +85,7 @@
|
||||
/**
|
||||
* Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
|
||||
* @param styles The syntax styles
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final void setStyles(SyntaxStyle[] styles)
|
||||
{
|
||||
@@ -356,7 +356,7 @@
|
||||
|
||||
/**
|
||||
* Repaints the text.
|
||||
- * @param g The graphics context
|
||||
+ * @param gfx The graphics context
|
||||
*/
|
||||
public void paint(Graphics gfx)
|
||||
{
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.5.0/src/alice/util/jedit/TokenMarker.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/util/jedit/TokenMarker.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/util/jedit/TokenMarker.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
* @author Slava Pestov
|
||||
* @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
|
||||
*
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public abstract class TokenMarker
|
||||
{
|
||||
diff -ur tuprolog-2.5.0.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.5.0/src/alice/util/ReadOnlyLinkedList.java
|
||||
--- tuprolog-2.5.0.orig/src/alice/util/ReadOnlyLinkedList.java 2012-08-03 02:38:21.000000000 +0200
|
||||
+++ tuprolog-2.5.0/src/alice/util/ReadOnlyLinkedList.java 2012-08-03 03:45:45.000000000 +0200
|
||||
@@ -12,10 +12,10 @@
|
||||
import java.util.ListIterator;
|
||||
|
||||
/**
|
||||
- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
|
||||
+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
|
||||
* and ensures that the given list is navigated only.
|
||||
*
|
||||
- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
|
||||
+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
|
||||
* support modifiers methods, and throws {@link UnsupportedOperationException}
|
||||
* if invoked.
|
||||
*
|
||||
@ -1,454 +0,0 @@
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.6.0/src/alice/tuprolog/ChoicePointStore.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/ChoicePointStore.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/ChoicePointStore.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -36,7 +36,6 @@
|
||||
|
||||
/**
|
||||
* Return the actual choice-point store
|
||||
- * @return
|
||||
*/
|
||||
public ChoicePointContext getPointer() {
|
||||
return pointer;
|
||||
@@ -45,7 +44,6 @@
|
||||
/**
|
||||
* Check if a choice point exists in the store.
|
||||
* As a side effect, removes choice points which have been already used and are now empty.
|
||||
- * @return
|
||||
*/
|
||||
protected boolean existChoicePoint() {
|
||||
if (pointer == null) return false;
|
||||
@@ -93,4 +91,4 @@
|
||||
return l;
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.6.0/src/alice/tuprolog/ClauseStore.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/ClauseStore.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/ClauseStore.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -62,8 +62,6 @@
|
||||
|
||||
/**
|
||||
* Verify if there is a term in compatibleGoals compatible with goal.
|
||||
- * @param goal
|
||||
- * @param compGoals
|
||||
* @return true if compatible or false otherwise.
|
||||
*/
|
||||
protected boolean existCompatibleClause() {
|
||||
@@ -160,4 +158,4 @@
|
||||
}
|
||||
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/EngineManager.java tuprolog-2.6.0/src/alice/tuprolog/EngineManager.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/EngineManager.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/EngineManager.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -96,7 +96,7 @@
|
||||
/**
|
||||
* Solves a query
|
||||
*
|
||||
- * @param g the term representing the goal to be demonstrated
|
||||
+ * @param query the term representing the goal to be demonstrated
|
||||
* @return the result of the demonstration
|
||||
* @see SolveInfo
|
||||
**/
|
||||
@@ -243,4 +243,4 @@
|
||||
}
|
||||
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.6.0/src/alice/tuprolog/event/SpyEvent.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/event/SpyEvent.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/event/SpyEvent.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -33,10 +33,6 @@
|
||||
* event description
|
||||
*/
|
||||
private String msg;
|
||||
- /**
|
||||
- * @uml.property name="env"
|
||||
- * @uml.associationEnd
|
||||
- */
|
||||
private Engine env;
|
||||
|
||||
public SpyEvent(Object source, String msg_) {
|
||||
@@ -63,4 +59,4 @@
|
||||
return msg + ((env == null) ? "" : env.toString());
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.6.0/src/alice/tuprolog/lib/BasicLibrary.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/lib/BasicLibrary.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/lib/BasicLibrary.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -116,7 +116,7 @@
|
||||
/**
|
||||
* Loads a library constructed from a theory.
|
||||
*
|
||||
- * @param theory
|
||||
+ * @param th
|
||||
* theory text
|
||||
* @param libName
|
||||
* name of the library
|
||||
@@ -1358,4 +1358,4 @@
|
||||
{ "\\", "expression_bitwise_not", "functor" } };
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.6.0/src/alice/tuprolog/lib/IOLibrary.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/lib/IOLibrary.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/lib/IOLibrary.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -375,7 +375,7 @@
|
||||
/**
|
||||
* Sets an arbitrary seed for the Random object.
|
||||
*
|
||||
- * @param seed Seed to use
|
||||
+ * @param t Seed to use
|
||||
* @return true if seed Term has a valid long value, false otherwise
|
||||
*/
|
||||
public boolean set_seed_1(Term t) throws PrologError {
|
||||
@@ -470,4 +470,4 @@
|
||||
}
|
||||
return true;
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.6.0/src/alice/tuprolog/lib/JavaLibrary.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/lib/JavaLibrary.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/lib/JavaLibrary.java 2013-02-14 12:12:49.000000000 +0100
|
||||
@@ -265,7 +265,7 @@
|
||||
* @author Michele Mannino
|
||||
* Creates of a java object - not backtrackable case
|
||||
* @param className The name of the class
|
||||
- * @oaram path The list of the paths where the class may be contained
|
||||
+ * @param paths The list of the paths where the class may be contained
|
||||
* @param argl The list of the arguments used by the constructor
|
||||
* @param id The name of the prolog term
|
||||
* @throws JavaException
|
||||
@@ -1745,8 +1745,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- *
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
@@ -2099,4 +2097,4 @@
|
||||
this.eventFullClass = eventClass;
|
||||
listenerInterfaceName = n;
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.6.0/src/alice/tuprolog/LibraryManager.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/LibraryManager.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/LibraryManager.java 2013-02-14 12:05:56.000000000 +0100
|
||||
@@ -49,7 +49,7 @@
|
||||
* If a library with the same name is already present,
|
||||
* a warning event is notified and the request is ignored.
|
||||
*
|
||||
- * @param the name of the Java class containing the library to be loaded
|
||||
+ * @param className the name of the Java class containing the library to be loaded
|
||||
* @return the reference to the Library just loaded
|
||||
* @throws InvalidLibraryException if name is not a valid library
|
||||
*/
|
||||
@@ -81,8 +81,8 @@
|
||||
* If a library with the same name is already present,
|
||||
* a warning event is notified and the request is ignored.
|
||||
*
|
||||
- * @param the name of the Java class containing the library to be loaded
|
||||
- * @param the list of the paths where the library may be contained
|
||||
+ * @param className the name of the Java class containing the library to be loaded
|
||||
+ * @param paths the list of the paths where the library may be contained
|
||||
* @return the reference to the Library just loaded
|
||||
* @throws InvalidLibraryException if name is not a valid library
|
||||
*/
|
||||
@@ -305,4 +305,4 @@
|
||||
|
||||
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.6.0/src/alice/tuprolog/PrimitiveManager.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/PrimitiveManager.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/PrimitiveManager.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -89,7 +89,7 @@
|
||||
* This involves identifying structs representing builtin
|
||||
* predicates and functors, and setting up related structures and links
|
||||
*
|
||||
- * @parm term the term to be identified
|
||||
+ * @param term the term to be identified
|
||||
* @return term with the identified built-in directive
|
||||
*/
|
||||
public Term identifyDirective(Term term) {
|
||||
@@ -192,4 +192,4 @@
|
||||
return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
|
||||
}
|
||||
/**/
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/Struct.java tuprolog-2.6.0/src/alice/tuprolog/Struct.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprolog/Struct.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprolog/Struct.java 2013-02-14 12:06:46.000000000 +0100
|
||||
@@ -201,7 +201,7 @@
|
||||
}
|
||||
|
||||
/**
|
||||
- * @return
|
||||
+ * @return predicateIndicator
|
||||
*/
|
||||
String getPredicateIndicator() {
|
||||
return predicateIndicator;
|
||||
@@ -894,4 +894,4 @@
|
||||
}
|
||||
/**/
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.6.0/src/alice/tuprologx/ide/Console.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/Console.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprologx/ide/Console.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -10,8 +10,5 @@
|
||||
public void getNextSolution();
|
||||
public void acceptSolution();
|
||||
public void stopEngine();
|
||||
- /**
|
||||
- * @uml.property name="goal"
|
||||
- */
|
||||
public String getGoal();
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryDialogFrame.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryDialogFrame.java 2013-02-14 12:12:14.000000000 +0100
|
||||
@@ -370,7 +370,7 @@
|
||||
* Add a library from file chooser path.
|
||||
*
|
||||
* @param libraryClassname The name of the .class of the library to be added.
|
||||
- * @param path from file chooser.
|
||||
+ * @param file from file chooser.
|
||||
*/
|
||||
public void addLibrary(String libraryClassname, File file)
|
||||
{
|
||||
@@ -498,7 +498,6 @@
|
||||
displayLibraryManagerStatus();
|
||||
}
|
||||
|
||||
- /** @see alice.tuprologx.ide.SwingFrame#onClose()*/
|
||||
public void closeLibraryDialog()
|
||||
{
|
||||
onClose();
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryManager.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryManager.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryManager.java 2013-02-14 12:11:42.000000000 +0100
|
||||
@@ -131,7 +131,7 @@
|
||||
* Add a library to the manager.
|
||||
*
|
||||
* @param libraryClassname The name of the .class of the library to be added.
|
||||
- * @param path The path where is contained the library.
|
||||
+ * @param file The path where is contained the library.
|
||||
* @throws ClassNotFoundException if the library class cannot be found.
|
||||
* @throws InvalidLibraryException if the library is not a valid tuProlog library.
|
||||
*/
|
||||
@@ -235,7 +235,7 @@
|
||||
* Load a library from the Library Manager into the engine.
|
||||
*
|
||||
* @param library The library to be loaded into the engine.
|
||||
- * @param path The library path where is contained the library.
|
||||
+ * @param file The library path where is contained the library.
|
||||
* @throws InvalidLibraryException
|
||||
*/
|
||||
public void loadLibrary(String library, File file) throws InvalidLibraryException {
|
||||
@@ -290,4 +290,4 @@
|
||||
klass.getName().replace('.', '/') + ".class");
|
||||
}
|
||||
|
||||
-} // end LibraryManager class
|
||||
\ No newline at end of file
|
||||
+} // end LibraryManager class
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.6.0/src/alice/tuprologx/ide/ToolBar.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/ToolBar.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprologx/ide/ToolBar.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -242,8 +242,6 @@
|
||||
|
||||
/**
|
||||
* Set the tuProlog config frame
|
||||
- *
|
||||
- * @param libraryManager a libraryManager to associate to the libraryDialog
|
||||
*/
|
||||
public void setPrologConfig(PrologConfigFrame configFrame)
|
||||
{
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.6.0/src/alice/tuprologx/pj/lib/PJLibrary.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/tuprologx/pj/lib/PJLibrary.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -1252,7 +1252,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/DynamicURLClassLoader.java tuprolog-2.6.0/src/alice/util/DynamicURLClassLoader.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/DynamicURLClassLoader.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/DynamicURLClassLoader.java 2013-02-14 12:10:02.000000000 +0100
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
/**
|
||||
* Constructor that specifies the URLs array.
|
||||
- * @param URL[] urls - Used to load a directory a URL ends with "/" or "\"
|
||||
+ * @param urls - Used to load a directory a URL ends with "/" or "\"
|
||||
* otherwise it loads a class contained into a .jar
|
||||
*/
|
||||
|
||||
@@ -148,7 +148,7 @@
|
||||
|
||||
/**
|
||||
* Remove array URLs method.
|
||||
- * @param urls - URL to be removed.
|
||||
+ * @param url - URL to be removed.
|
||||
*/
|
||||
|
||||
public void removeURL(URL url) throws IllegalArgumentException
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/InspectionUtils.java tuprolog-2.6.0/src/alice/util/InspectionUtils.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/InspectionUtils.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/InspectionUtils.java 2013-02-14 12:09:22.000000000 +0100
|
||||
@@ -14,9 +14,9 @@
|
||||
/**
|
||||
* @author Michele Mannino
|
||||
*
|
||||
- * @param type: class to be inspected
|
||||
- * @param methodName: name of method
|
||||
- * @param parms: array of params
|
||||
+ * @param type class to be inspected
|
||||
+ * @param methodName name of method
|
||||
+ * @param parms array of params
|
||||
*/
|
||||
public static Method searchForMethod(Class<?> type, String methodName, Class<?>[] parms) {
|
||||
Method[] methods = type.getMethods();
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.6.0/src/alice/util/jedit/InputHandler.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/jedit/InputHandler.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/jedit/InputHandler.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -24,7 +24,7 @@
|
||||
*
|
||||
* @author Slava Pestov
|
||||
* @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
|
||||
- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
|
||||
+ * @see alice.util.jedit.DefaultInputHandler
|
||||
*/
|
||||
public abstract class InputHandler extends KeyAdapter
|
||||
{
|
||||
@@ -187,7 +187,7 @@
|
||||
/**
|
||||
* Grabs the next key typed event and invokes the specified
|
||||
* action with the key as a the action command.
|
||||
- * @param action The action
|
||||
+ * @param listener The action
|
||||
*/
|
||||
public void grabNextKeyStroke(ActionListener listener)
|
||||
{
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.6.0/src/alice/util/jedit/JEditTextArea.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/jedit/JEditTextArea.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/jedit/JEditTextArea.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -1401,7 +1401,7 @@
|
||||
|
||||
/**
|
||||
* Sets if the selection should be rectangular.
|
||||
- * @param overwrite True if the selection should be rectangular,
|
||||
+ * @param rectSelect True if the selection should be rectangular,
|
||||
* false otherwise.
|
||||
*/
|
||||
public final void setSelectionRectangular(boolean rectSelect)
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.6.0/src/alice/util/jedit/KeywordMap.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/jedit/KeywordMap.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/jedit/KeywordMap.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -75,7 +75,7 @@
|
||||
/**
|
||||
* Adds a key-value mapping.
|
||||
* @param keyword The key
|
||||
- * @Param id The value
|
||||
+ * @param id The value
|
||||
*/
|
||||
public void add(String keyword, byte id)
|
||||
{
|
||||
@@ -102,9 +102,6 @@
|
||||
}
|
||||
|
||||
// protected members
|
||||
- /**
|
||||
- * @uml.property name="mapLength"
|
||||
- */
|
||||
protected int mapLength;
|
||||
|
||||
protected int getStringMapKey(String s)
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.6.0/src/alice/util/jedit/TextAreaPainter.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/jedit/TextAreaPainter.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/jedit/TextAreaPainter.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -75,7 +75,7 @@
|
||||
|
||||
/**
|
||||
* Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final SyntaxStyle[] getStyles()
|
||||
{
|
||||
@@ -85,7 +85,7 @@
|
||||
/**
|
||||
* Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
|
||||
* @param styles The syntax styles
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final void setStyles(SyntaxStyle[] styles)
|
||||
{
|
||||
@@ -356,7 +356,7 @@
|
||||
|
||||
/**
|
||||
* Repaints the text.
|
||||
- * @param g The graphics context
|
||||
+ * @param gfx The graphics context
|
||||
*/
|
||||
public void paint(Graphics gfx)
|
||||
{
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.6.0/src/alice/util/jedit/TokenMarker.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/jedit/TokenMarker.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/jedit/TokenMarker.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -23,7 +23,7 @@
|
||||
* @author Slava Pestov
|
||||
* @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
|
||||
*
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public abstract class TokenMarker
|
||||
{
|
||||
diff -ur tuprolog-2.6.0.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.6.0/src/alice/util/ReadOnlyLinkedList.java
|
||||
--- tuprolog-2.6.0.orig/src/alice/util/ReadOnlyLinkedList.java 2013-02-14 12:01:32.000000000 +0100
|
||||
+++ tuprolog-2.6.0/src/alice/util/ReadOnlyLinkedList.java 2013-02-14 12:01:56.000000000 +0100
|
||||
@@ -12,10 +12,10 @@
|
||||
import java.util.ListIterator;
|
||||
|
||||
/**
|
||||
- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
|
||||
+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
|
||||
* and ensures that the given list is navigated only.
|
||||
*
|
||||
- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
|
||||
+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
|
||||
* support modifiers methods, and throws {@link UnsupportedOperationException}
|
||||
* if invoked.
|
||||
*
|
||||
@ -1,437 +0,0 @@
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.7.0/src/alice/tuprolog/ChoicePointStore.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/ChoicePointStore.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/ChoicePointStore.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -36,7 +36,6 @@
|
||||
|
||||
/**
|
||||
* Return the actual choice-point store
|
||||
- * @return
|
||||
*/
|
||||
public ChoicePointContext getPointer() {
|
||||
return pointer;
|
||||
@@ -45,7 +44,6 @@
|
||||
/**
|
||||
* Check if a choice point exists in the store.
|
||||
* As a side effect, removes choice points which have been already used and are now empty.
|
||||
- * @return
|
||||
*/
|
||||
protected boolean existChoicePoint() {
|
||||
if (pointer == null) return false;
|
||||
@@ -93,4 +91,4 @@
|
||||
return l;
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.7.0/src/alice/tuprolog/ClauseStore.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/ClauseStore.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/ClauseStore.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -62,8 +62,6 @@
|
||||
|
||||
/**
|
||||
* Verify if there is a term in compatibleGoals compatible with goal.
|
||||
- * @param goal
|
||||
- * @param compGoals
|
||||
* @return true if compatible or false otherwise.
|
||||
*/
|
||||
protected boolean existCompatibleClause() {
|
||||
@@ -160,4 +158,4 @@
|
||||
}
|
||||
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.7.0/src/alice/tuprolog/event/SpyEvent.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/event/SpyEvent.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/event/SpyEvent.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -33,10 +33,6 @@
|
||||
* event description
|
||||
*/
|
||||
private String msg;
|
||||
- /**
|
||||
- * @uml.property name="env"
|
||||
- * @uml.associationEnd
|
||||
- */
|
||||
private Engine env;
|
||||
|
||||
public SpyEvent(Object source, String msg_) {
|
||||
@@ -63,4 +59,4 @@
|
||||
return msg + ((env == null) ? "" : env.toString());
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.7.0/src/alice/tuprolog/lib/BasicLibrary.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/lib/BasicLibrary.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/lib/BasicLibrary.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -116,7 +116,7 @@
|
||||
/**
|
||||
* Loads a library constructed from a theory.
|
||||
*
|
||||
- * @param theory
|
||||
+ * @param th
|
||||
* theory text
|
||||
* @param libName
|
||||
* name of the library
|
||||
@@ -1358,4 +1358,4 @@
|
||||
{ "\\", "expression_bitwise_not", "functor" } };
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.7.0/src/alice/tuprolog/lib/IOLibrary.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/lib/IOLibrary.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/lib/IOLibrary.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -379,7 +379,7 @@
|
||||
/**
|
||||
* Sets an arbitrary seed for the Random object.
|
||||
*
|
||||
- * @param seed Seed to use
|
||||
+ * @param t Seed to use
|
||||
* @return true if seed Term has a valid long value, false otherwise
|
||||
*/
|
||||
public boolean set_seed_1(Term t) throws PrologError {
|
||||
@@ -474,4 +474,4 @@
|
||||
}
|
||||
return true;
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
Only in tuprolog-2.7.0/src/alice/tuprolog/lib: IOLibrary.java.orig
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.7.0/src/alice/tuprolog/lib/JavaLibrary.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/lib/JavaLibrary.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/lib/JavaLibrary.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -265,7 +265,7 @@
|
||||
* @author Michele Mannino
|
||||
* Creates of a java object - not backtrackable case
|
||||
* @param className The name of the class
|
||||
- * @oaram path The list of the paths where the class may be contained
|
||||
+ * @param paths The list of the paths where the class may be contained
|
||||
* @param argl The list of the arguments used by the constructor
|
||||
* @param id The name of the prolog term
|
||||
* @throws JavaException
|
||||
@@ -1745,8 +1745,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- *
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
@@ -2099,4 +2097,4 @@
|
||||
this.eventFullClass = eventClass;
|
||||
listenerInterfaceName = n;
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.7.0/src/alice/tuprolog/LibraryManager.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/LibraryManager.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/LibraryManager.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -49,7 +49,7 @@
|
||||
* If a library with the same name is already present,
|
||||
* a warning event is notified and the request is ignored.
|
||||
*
|
||||
- * @param the name of the Java class containing the library to be loaded
|
||||
+ * @param className the name of the Java class containing the library to be loaded
|
||||
* @return the reference to the Library just loaded
|
||||
* @throws InvalidLibraryException if name is not a valid library
|
||||
*/
|
||||
@@ -83,8 +83,8 @@
|
||||
* If a library with the same name is already present,
|
||||
* a warning event is notified and the request is ignored.
|
||||
*
|
||||
- * @param the name of the Java class containing the library to be loaded
|
||||
- * @param the list of the paths where the library may be contained
|
||||
+ * @param className the name of the Java class containing the library to be loaded
|
||||
+ * @param paths the list of the paths where the library may be contained
|
||||
* @return the reference to the Library just loaded
|
||||
* @throws InvalidLibraryException if name is not a valid library
|
||||
*/
|
||||
@@ -314,4 +314,4 @@
|
||||
|
||||
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
Only in tuprolog-2.7.0/src/alice/tuprolog: LibraryManager.java.orig
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.7.0/src/alice/tuprolog/PrimitiveManager.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/PrimitiveManager.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/PrimitiveManager.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -89,7 +89,7 @@
|
||||
* This involves identifying structs representing builtin
|
||||
* predicates and functors, and setting up related structures and links
|
||||
*
|
||||
- * @parm term the term to be identified
|
||||
+ * @param term the term to be identified
|
||||
* @return term with the identified built-in directive
|
||||
*/
|
||||
public Term identifyDirective(Term term) {
|
||||
@@ -192,4 +192,4 @@
|
||||
return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
|
||||
}
|
||||
/**/
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/Struct.java tuprolog-2.7.0/src/alice/tuprolog/Struct.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprolog/Struct.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprolog/Struct.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -201,7 +201,7 @@
|
||||
}
|
||||
|
||||
/**
|
||||
- * @return
|
||||
+ * @return predicateIndicator
|
||||
*/
|
||||
String getPredicateIndicator() {
|
||||
return predicateIndicator;
|
||||
@@ -894,4 +894,4 @@
|
||||
}
|
||||
/**/
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.7.0/src/alice/tuprologx/ide/Console.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/Console.java 2013-05-16 13:50:41.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprologx/ide/Console.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -10,8 +10,5 @@
|
||||
public void getNextSolution();
|
||||
public void acceptSolution();
|
||||
public void stopEngine();
|
||||
- /**
|
||||
- * @uml.property name="goal"
|
||||
- */
|
||||
public String getGoal();
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryDialogFrame.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2013-05-16 13:50:41.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryDialogFrame.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -370,7 +370,7 @@
|
||||
* Add a library from file chooser path.
|
||||
*
|
||||
* @param libraryClassname The name of the .class of the library to be added.
|
||||
- * @param path from file chooser.
|
||||
+ * @param file from file chooser.
|
||||
*/
|
||||
public void addLibrary(String libraryClassname, File file)
|
||||
{
|
||||
@@ -498,7 +498,6 @@
|
||||
displayLibraryManagerStatus();
|
||||
}
|
||||
|
||||
- /** @see alice.tuprologx.ide.SwingFrame#onClose()*/
|
||||
public void closeLibraryDialog()
|
||||
{
|
||||
onClose();
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryManager.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryManager.java 2013-05-16 13:50:41.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryManager.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -131,7 +131,7 @@
|
||||
* Add a library to the manager.
|
||||
*
|
||||
* @param libraryClassname The name of the .class of the library to be added.
|
||||
- * @param path The path where is contained the library.
|
||||
+ * @param file The path where is contained the library.
|
||||
* @throws ClassNotFoundException if the library class cannot be found.
|
||||
* @throws InvalidLibraryException if the library is not a valid tuProlog library.
|
||||
*/
|
||||
@@ -235,7 +235,7 @@
|
||||
* Load a library from the Library Manager into the engine.
|
||||
*
|
||||
* @param library The library to be loaded into the engine.
|
||||
- * @param path The library path where is contained the library.
|
||||
+ * @param file The library path where is contained the library.
|
||||
* @throws InvalidLibraryException
|
||||
*/
|
||||
public void loadLibrary(String library, File file) throws InvalidLibraryException {
|
||||
@@ -290,4 +290,4 @@
|
||||
klass.getName().replace('.', '/') + ".class");
|
||||
}
|
||||
|
||||
-} // end LibraryManager class
|
||||
\ No newline at end of file
|
||||
+} // end LibraryManager class
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.7.0/src/alice/tuprologx/ide/ToolBar.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/ToolBar.java 2013-05-16 13:50:41.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprologx/ide/ToolBar.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -242,8 +242,6 @@
|
||||
|
||||
/**
|
||||
* Set the tuProlog config frame
|
||||
- *
|
||||
- * @param libraryManager a libraryManager to associate to the libraryDialog
|
||||
*/
|
||||
public void setPrologConfig(PrologConfigFrame configFrame)
|
||||
{
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.7.0/src/alice/tuprologx/pj/lib/PJLibrary.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2013-05-16 13:50:41.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/tuprologx/pj/lib/PJLibrary.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -1252,7 +1252,6 @@
|
||||
|
||||
/**
|
||||
* Generates a fresh numeric identifier
|
||||
- * @return
|
||||
*/
|
||||
protected Struct generateFreshId() {
|
||||
return new Struct("$obj_" + id++);
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/DynamicURLClassLoader.java tuprolog-2.7.0/src/alice/util/DynamicURLClassLoader.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/DynamicURLClassLoader.java 2013-05-16 13:50:43.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/DynamicURLClassLoader.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
/**
|
||||
* Constructor that specifies the URLs array.
|
||||
- * @param URL[] urls - Used to load a directory a URL ends with "/" or "\"
|
||||
+ * @param urls - Used to load a directory a URL ends with "/" or "\"
|
||||
* otherwise it loads a class contained into a .jar
|
||||
*/
|
||||
|
||||
@@ -148,7 +148,7 @@
|
||||
|
||||
/**
|
||||
* Remove array URLs method.
|
||||
- * @param urls - URL to be removed.
|
||||
+ * @param url - URL to be removed.
|
||||
*/
|
||||
|
||||
public void removeURL(URL url) throws IllegalArgumentException
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/InspectionUtils.java tuprolog-2.7.0/src/alice/util/InspectionUtils.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/InspectionUtils.java 2013-05-16 13:50:43.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/InspectionUtils.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -14,9 +14,9 @@
|
||||
/**
|
||||
* @author Michele Mannino
|
||||
*
|
||||
- * @param type: class to be inspected
|
||||
- * @param methodName: name of method
|
||||
- * @param parms: array of params
|
||||
+ * @param type class to be inspected
|
||||
+ * @param methodName name of method
|
||||
+ * @param parms array of params
|
||||
*/
|
||||
public static Method searchForMethod(Class<?> type, String methodName, Class<?>[] parms) {
|
||||
Method[] methods = type.getMethods();
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.7.0/src/alice/util/jedit/InputHandler.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/jedit/InputHandler.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/jedit/InputHandler.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -24,7 +24,7 @@
|
||||
*
|
||||
* @author Slava Pestov
|
||||
* @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
|
||||
- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
|
||||
+ * @see alice.util.jedit.DefaultInputHandler
|
||||
*/
|
||||
public abstract class InputHandler extends KeyAdapter
|
||||
{
|
||||
@@ -187,7 +187,7 @@
|
||||
/**
|
||||
* Grabs the next key typed event and invokes the specified
|
||||
* action with the key as a the action command.
|
||||
- * @param action The action
|
||||
+ * @param listener The action
|
||||
*/
|
||||
public void grabNextKeyStroke(ActionListener listener)
|
||||
{
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.7.0/src/alice/util/jedit/JEditTextArea.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/jedit/JEditTextArea.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/jedit/JEditTextArea.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -1401,7 +1401,7 @@
|
||||
|
||||
/**
|
||||
* Sets if the selection should be rectangular.
|
||||
- * @param overwrite True if the selection should be rectangular,
|
||||
+ * @param rectSelect True if the selection should be rectangular,
|
||||
* false otherwise.
|
||||
*/
|
||||
public final void setSelectionRectangular(boolean rectSelect)
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.7.0/src/alice/util/jedit/KeywordMap.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/jedit/KeywordMap.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/jedit/KeywordMap.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -75,7 +75,7 @@
|
||||
/**
|
||||
* Adds a key-value mapping.
|
||||
* @param keyword The key
|
||||
- * @Param id The value
|
||||
+ * @param id The value
|
||||
*/
|
||||
public void add(String keyword, byte id)
|
||||
{
|
||||
@@ -102,9 +102,6 @@
|
||||
}
|
||||
|
||||
// protected members
|
||||
- /**
|
||||
- * @uml.property name="mapLength"
|
||||
- */
|
||||
protected int mapLength;
|
||||
|
||||
protected int getStringMapKey(String s)
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.7.0/src/alice/util/jedit/TextAreaPainter.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/jedit/TextAreaPainter.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/jedit/TextAreaPainter.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -75,7 +75,7 @@
|
||||
|
||||
/**
|
||||
* Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final SyntaxStyle[] getStyles()
|
||||
{
|
||||
@@ -85,7 +85,7 @@
|
||||
/**
|
||||
* Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
|
||||
* @param styles The syntax styles
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public final void setStyles(SyntaxStyle[] styles)
|
||||
{
|
||||
@@ -356,7 +356,7 @@
|
||||
|
||||
/**
|
||||
* Repaints the text.
|
||||
- * @param g The graphics context
|
||||
+ * @param gfx The graphics context
|
||||
*/
|
||||
public void paint(Graphics gfx)
|
||||
{
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.7.0/src/alice/util/jedit/TokenMarker.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/jedit/TokenMarker.java 2013-05-16 13:50:42.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/jedit/TokenMarker.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
* @author Slava Pestov
|
||||
* @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
|
||||
*
|
||||
- * @see org.gjt.sp.jedit.syntax.Token
|
||||
+ * @see alice.util.jedit.Token
|
||||
*/
|
||||
public abstract class TokenMarker
|
||||
{
|
||||
diff -ur tuprolog-2.7.0.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.7.0/src/alice/util/ReadOnlyLinkedList.java
|
||||
--- tuprolog-2.7.0.orig/src/alice/util/ReadOnlyLinkedList.java 2013-05-16 13:50:43.000000000 +0200
|
||||
+++ tuprolog-2.7.0/src/alice/util/ReadOnlyLinkedList.java 2013-05-16 13:56:42.000000000 +0200
|
||||
@@ -12,10 +12,10 @@
|
||||
import java.util.ListIterator;
|
||||
|
||||
/**
|
||||
- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
|
||||
+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
|
||||
* and ensures that the given list is navigated only.
|
||||
*
|
||||
- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
|
||||
+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
|
||||
* support modifiers methods, and throws {@link UnsupportedOperationException}
|
||||
* if invoked.
|
||||
*
|
||||
@ -1,55 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=2
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
|
||||
HOMEPAGE="http://www.alice.unibo.it/tuProlog/"
|
||||
SRC_URI="mirror://gentoo/${P}.zip"
|
||||
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc test"
|
||||
|
||||
RDEPEND=">=virtual/jdk-1.5
|
||||
>=dev-java/javassist-3"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip
|
||||
dev-java/ant-core
|
||||
test? ( dev-java/ant-junit )"
|
||||
|
||||
S="${WORKDIR}"/${P}
|
||||
|
||||
EANT_GENTOO_CLASSPATH="javassist-3"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-javadocs.patch
|
||||
|
||||
cp "${FILESDIR}"/build.xml "${S}" || die
|
||||
sed -i -e "s|test/unit|test|" "${S}"/build.xml \
|
||||
|| die "sed build.xml failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
eant jar $(use_doc)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${S}"/dist
|
||||
java-pkg_jar-from junit
|
||||
cd "${S}"
|
||||
ANT_TASKS="ant-junit" eant test || die "eant test failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar dist/${PN}.jar
|
||||
|
||||
if use doc ; then
|
||||
java-pkg_dohtml -r docs/* || die
|
||||
fi
|
||||
}
|
||||
@ -1,59 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=3
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
|
||||
HOMEPAGE="http://www.alice.unibo.it/tuProlog/"
|
||||
SRC_URI="mirror://gentoo/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc test"
|
||||
|
||||
RDEPEND=">=virtual/jdk-1.7
|
||||
>=dev-java/javassist-3"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
dev-java/ant-core
|
||||
test? (
|
||||
dev-java/ant-junit4
|
||||
dev-java/hamcrest-core
|
||||
)"
|
||||
|
||||
S="${WORKDIR}"/${P}
|
||||
|
||||
EANT_GENTOO_CLASSPATH="javassist-3"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-javadocs.patch
|
||||
|
||||
cp "${FILESDIR}"/build.xml "${S}" || die
|
||||
sed -i -e "s|test/unit|test|" "${S}"/build.xml \
|
||||
|| die "sed build.xml failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
eant jar $(use_doc)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${S}"/dist
|
||||
java-pkg_jar-from junit-4
|
||||
java-pkg_jar-from hamcrest-core
|
||||
cd "${S}"
|
||||
ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test \
|
||||
|| die "eant test failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar dist/${PN}.jar
|
||||
|
||||
if use doc ; then
|
||||
java-pkg_dohtml -r docs/* || die
|
||||
fi
|
||||
}
|
||||
@ -1,59 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=3
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
|
||||
HOMEPAGE="http://tuprolog.unibo.it/"
|
||||
SRC_URI="mirror://gentoo/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc test"
|
||||
|
||||
RDEPEND=">=virtual/jdk-1.7
|
||||
>=dev-java/javassist-3"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
dev-java/ant-core
|
||||
test? (
|
||||
dev-java/ant-junit4
|
||||
dev-java/hamcrest-core
|
||||
)"
|
||||
|
||||
S="${WORKDIR}"/${P}
|
||||
|
||||
EANT_GENTOO_CLASSPATH="javassist-3"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-javadocs.patch
|
||||
|
||||
cp "${FILESDIR}"/build.xml "${S}" || die
|
||||
sed -i -e "s|test/unit|test|" "${S}"/build.xml \
|
||||
|| die "sed build.xml failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
eant jar $(use_doc)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${S}"/dist
|
||||
java-pkg_jar-from junit-4
|
||||
java-pkg_jar-from hamcrest-core
|
||||
cd "${S}"
|
||||
ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test \
|
||||
|| die "eant test failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar dist/${PN}.jar
|
||||
|
||||
if use doc ; then
|
||||
java-pkg_dohtml -r docs/* || die
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
# ChangeLog for dev-ml/gsl-ocaml
|
||||
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
|
||||
# (auto-generated from git log)
|
||||
|
||||
*gsl-ocaml-1.19.1 (14 Feb 2016)
|
||||
|
||||
14 Feb 2016; David Seifert <soap@gentoo.org> +gsl-ocaml-1.19.1.ebuild,
|
||||
+metadata.xml:
|
||||
New package, successor of dev-ml/ocamlgsl
|
||||
|
||||
Gentoo-Bug: 574564
|
||||
|
||||
Package-Manager: portage-2.2.27
|
||||
|
||||
14 Feb 2016; David Seifert <soap@gentoo.org> gsl-ocaml-1.19.1.ebuild:
|
||||
Update sci-libs/gsl dependency
|
||||
|
||||
Package-Manager: portage-2.2.27
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
DIST gsl-ocaml-1.19.1.tar.gz 167549 SHA256 05891594ed3b4ea0c2f201531aeafce1280b937a18ba76d818760252c2b34b66 SHA512 be199d46479f07a16d2f667d7a29675171bc4ecc5a6e5948335bf98f72e6f12474d16455a22e6bfc73683f1d67de3a186d75f817f398f6621241b640c333e07d WHIRLPOOL 85f687b24dacde0d3c6f9f2c1920583e30e57f02e1f6d4dc797db3a846090d2c60d7509b3d70b2374aa31d6b4a9658acb578012f8671d024a24e90e3f5e748a2
|
||||
EBUILD gsl-ocaml-1.19.1.ebuild 637 SHA256 9f8b37adaf79d28f3c4576729647aa0f19467f8979862ce61fa5a389cb7a9aa8 SHA512 19b2e0ce177489c50afc47ccc669e84a786e3f0c24a64f8e40ef18e09ccd118d67928ffdb7d16aa397148972af6a706916775a2e4481d0cf0be88333579e15a5 WHIRLPOOL af98e3628f992301ec9385884412160c826448912d626550187328b692dc3e0cc1eab73a1d08d0cba3b57ee976db964c9b253d8c3964f2321d088ca9cbfd19d2
|
||||
MISC ChangeLog 502 SHA256 94f667cd7abbb6d78d8a05639a127587594855cbcf543cc536b925de470e3d15 SHA512 3be2cf2fb701120d19fbfc60403d222b52b84ace1a8b0748c70758c13679a87ab626542abd87f4b06c07d63c46d93bf79981638582d8925f8f55400ce3a69462 WHIRLPOOL eda179284b879787a47d5602ef8710b73f3871067aaa75d9ce379750b3936d439c0b96dbc2c2dbedcfcf7d8b5def9bd9e11478de6c9d4ffea04c9d08db9a7d4e
|
||||
MISC metadata.xml 420 SHA256 26eb82c26ac16ce07e5aa2a88bec15ad67af57b24dca1de7f0131538f3c69b7a SHA512 dbc30d4be81c7e7989572556251d3bae028bb8c27a965e1e24e38bdba65bbe47929f055d0551e2204967f68c65c32670c124f610a47fa751f5a4cec5ad876510 WHIRLPOOL 2085bfcc3951a4bd63352dc698fee2f16699b525363f7fda39abe647b670f602e96b7c4dfd7d3d1143989dbeab19a27001f2c3a0446cfc303ecce076bf167a60
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
AUX sexpl.patch 1068 SHA256 fff4f4c8dd5b12163d1394914f498081f26586a487bf88336aa7d57a000c93ff SHA512 9846df70d27d867ba42f48835873867cf7bc42634d698cdd9db4fb6a40da5f8cbcefec0901825c20e54d9c693e33ccbea906cb0a874b2410f97020f9ce9fc234 WHIRLPOOL f0591469df1fccf80190cd002f609189b2a88229c7d65c646f22398d7c765184aa88862236c7243ce07bc5ddcf99cb5b06d2fdbee88e07973d298c591cf3ff99
|
||||
DIST ocaml-ipaddr-2.6.1.tar.gz 64458 SHA256 7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0 SHA512 a22382b5118caf0a29322e52d40523cbf52edd21d477c2e4581a5f70441b71f948b75ff7d55a7cf6c32f0e68c430c3aff59a05d9514b29e858ff78f4c649c4c6 WHIRLPOOL 418a3bcbef9a1198962bd5d09381756520eaced7e86f8ba204810b786187cfb6e020019da331d85e11d510fa744802c66d52a450fb31a9ff8a418004ff1d4cbe
|
||||
DIST ocaml-ipaddr-2.7.0.tar.gz 65470 SHA256 3031abb4a5391af8b7e307db09807ef748fc718ee23855e2f933df47892d4c23 SHA512 36ce32945e05166165ba9d2d6d10a9fb1531a50ff4e9e1a87d1bf557e767fa2938af9cbaeea7da4eefd058d687f0b36696075fd4c9ed075f5207e3c9f5488c87 WHIRLPOOL 188acfc6e110253b62f92a21a08a1519650289141b9649bed2e80b7850f9cdaa8327859933501ff0b938c2896f42ba48fac57b0b4c6b3ea59b6f4368eac0bd28
|
||||
EBUILD ocaml-ipaddr-2.6.1.ebuild 572 SHA256 1d8265707c06e420872811096958b1f97c284662faeea092d59a3ef5ac6e2e3a SHA512 a4e637422b5528ac9f01c800ed9684d273fc39414e31df06a77652f4ef89db7463c707a981528c0b53294df873e2257e637f4362b57edae5d8e4f9ea1d00fac5 WHIRLPOOL fab65bd1d6264bc2d89a9e6eca677cf732e1df1f5926eaf0f5db815aa39472ab7f8e3d4b3448249ea0890b967451e2f69cfec7a324abb4e5fd22d7fe71b9624d
|
||||
EBUILD ocaml-ipaddr-2.7.0.ebuild 535 SHA256 7ccecd8e02db42e4e3fb038aa722fe5566c5ae1e4653136f29324c7634c4a6b7 SHA512 41d8408887a64213211a8d166e07c37229c2515983130e926253bf38dbb14daa5328f5c5c9c516fa572ed62bd0bdaedafde0338e4ca511e9134919f8d686dd5b WHIRLPOOL 9804153ecef79b9bb0a78367778d1cc7e376a389b70bfd0f641c7e87cc26462a208e233ef6e4624c5b39ed258f47843a4baa474d7b397253ba510483c30c1c5a
|
||||
MISC ChangeLog 3334 SHA256 6cb6994aa2c4cedd5429d06eec96bafa786e4678fea13d7d55fdb1467052f71c SHA512 95be879b510ef592df1617852b360011302b5176e2a98007103005383b4420672452703a5e33acc3db1f9c5939e98f166013e2bd575533f9616e36673ec5df6c WHIRLPOOL 3b79dd5418388cf7e9eb89eca72d965247a37d8bea1d7845f639b401492df0d114996bef31e54a1b21223b9b7580805b5171ece9c9143caecd67e3cb9092d810
|
||||
MISC ChangeLog-2015 607 SHA256 3300ebb4b97eb0307a8f11c5bc0606f613e713282551d02651a2a8b2b2cc4e20 SHA512 5160a70ee04f786118344d9a1250f4964f7a3a8d2be879bb4729f23d15d5416033e2407b4e0b3c0ee60857e925aabb4e22815a4ea27abc3392c8913b2ce907e9 WHIRLPOOL db5e19d64ef5b38de4d7ea6f49eaca1ce336d99022401fad277e671107badf999cac5ae939aefd1281dc8cda83c152f80780b88774c5208d533b30cf50fbda5c
|
||||
MISC metadata.xml 341 SHA256 4d0d0f17f5c0a63b896a15d6281d56c5c915cc27805eb8859b713f1de21b2cf3 SHA512 1a8f24a3a717ee7afd59e82ae1000116df14fbd47cd46fd9fdbf69d2a68dd0cf7e5e7109c1ae1f7a757ab17ece18f042bf64bb01da53acb2d8f990c3c2399eb5 WHIRLPOOL 6ad18e73af58daa349f448b877ba3b9072c07efe6120ffeaf51c6f57372b297a49d603780bc98b723b8e27dd0df88a49de3a49591920a800a8eecbfad8654c78
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
OASIS_BUILD_TESTS=1
|
||||
|
||||
inherit oasis
|
||||
|
||||
DESCRIPTION="OCaml library for manipulation of IP (and MAC) address representations"
|
||||
HOMEPAGE="https://github.com/mirage/ocaml-ipaddr"
|
||||
SRC_URI="https://github.com/mirage/ocaml-ipaddr/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="ISC"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="dev-ml/sexplib:=
|
||||
dev-ml/ppx_sexp_conv:=
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
DOCS=( CHANGES README.md )
|
||||
@ -1,6 +1,6 @@
|
||||
AUX ocamlgsl-0.6.0-ocaml311.patch 948 SHA256 e025e4bf6a0635001cbd73211417a1056ebf9361db540fb707813260e040b195 SHA512 555531de6d518119ef364de9b8c1b75fc28b8ee1eb881403cd3fc2bda135116228eb92e408666b799a7cb7508fa0022187f95051f888b2d1a961df7a13f10061 WHIRLPOOL 16335c6deedc484fbd9d2da9222e6136a780924e3182175c290276cd7433bc55b903a6eab3eee082c7f92f7c37cb2ffb3f2bc9d4e58cf3d749d0d5f976f0ec42
|
||||
DIST ocamlgsl-0.6.0.tar.gz 274345 SHA256 ddb9e432dc1a431cad332a8e7e6685d2facbde2fa15ecab9315741f7d11b588c SHA512 2e8f6d315e53d9bc6bba5b90340394074b9415bd578185cf81b60a448656a88f32aae37a3aa5e186b80cae2b4346bb35b4f88280e5b03d47325a9806b6a9c192 WHIRLPOOL 91c36a7332dde389b40bc95c8d714a0b4c43f22d3999471feaf46d455fe57e5b536eaee222c29610952c184f088783e885debd6b2d7a96904e96aea7088a25c2
|
||||
EBUILD ocamlgsl-0.6.0.ebuild 725 SHA256 9d43af6d90485bb4b700be315869326bdaae0036bb61218d6c4542e2a59cbad0 SHA512 3fe886c1f455cbe4d189445776f90dad6ec313bbc87d340686bc0a78023d4dcafd8aacc6cbb7848925268c57a47d7eca34ae080464a52c10d8ed89b83f11e773 WHIRLPOOL 2eceaec44513ac31fcd0a8b5158bcafbf4ed23ea2efa0f3b9831f270ddcb43c37a00e8aac56a95489707d3b4f00d8909e7457dcc41d49957702897de613b8b2b
|
||||
MISC ChangeLog 2859 SHA256 bfe5318b64c038f5dfbdc041d4dd7a36f63939cb4ba04465759ae1fe0b7adeb0 SHA512 0d98d1ffe5ea8d39b3481b15cc6a58363252239f8bd54cb6e951a8cff5fd53cee76b5fdc5c38944ab059847dc7a31c5f89591f3bde0ae933e4ee4e83ca7052d6 WHIRLPOOL a2d74e585190f1e5dc26fa2086752efc2034be4e7cb3c9529c328605a82f109bd7158102021310da7a86fdb5c7ec7db42eda1bb31a26df0abe2e7b0630e63c10
|
||||
MISC ChangeLog 2999 SHA256 8054e4b92c90e1af14fcc3e4778f671d69fbe07e700c7fc9b703606cb7cae7e3 SHA512 6b9a2c3747426f331062aec84592cf629f8eab64f7d00da87599427e9c30fe69d7a637626c3a3bae67f7c30f43f3d461b3b818f7da12ff70eaf87425fc02f3c6 WHIRLPOOL 5ff19bc591050eee8d56f3ba46d102e67b18b734f8a48c536799c775030054fd8f77a3b253ba65bc7a50ae280061cf2242e642382b374e144ec10da1cb8c6e7c
|
||||
MISC ChangeLog-2015 1270 SHA256 8ca399c0150237213b1c0c4f4e26bc4e5292afff98c34f4877200c4cc265c553 SHA512 14c25d625929b78849c9d7c0c8174b2faab311d5b7cfaa5831d6f53028b60af482591caca0306576bd31507375b250d6055f2a50f4e3730b65ad052a81165159 WHIRLPOOL 9314945103d185a4d36b643ec8220250b694fff9c1c44189509c8c4092d629dfb2558f7303f336f4ca4b949c89581b0ab2c09b739f266656c49de5295b0a15b9
|
||||
MISC metadata.xml 386 SHA256 29788de1de1db3fb5f04f5a8cc2604293d8f9da784e431c42d24dda27e88c4a1 SHA512 3d3bb14b132efd5a5fa8cbb42976896028956905ffff0c3d534d8c6816166eab35dd3e1a825d6462023b70c30ce7a031c6bd3719272becd41bbed5cd17a39f59 WHIRLPOOL bfcac8f32dc0e36d4c1e864ebad3fdb0592f349f16e568f88363ed3bdf7d0f0e4f9c49de9ccc5f68773e911195a19e316a5f2130bdfbfeddf2ec1e6216fbc95c
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
DIST postgresql-ocaml-2.0.5.tar.gz 79123 SHA256 e786c46edbd63aacd82e008098a2c801f445d59a29bd49713eae5cf5c157eaa8 SHA512 1d4b09b9135e1d6a98295bd51175ac44e6b51219703ad8ba5c0d429d81534989b43ed8922eff6511de4fc31b6dde1e6ca4f7bea91981e3d8c025d151258e41c7 WHIRLPOOL 04ae6fb1865fea75f286faf366ba4a976f260c502de1f898b48c8fb93b70ddedfdeeb9383e54efb2dd3b15e9b6d5302e1a5e0009188d8d83bbd69d4448774eef
|
||||
DIST postgresql-ocaml-3.2.2.tar.gz 85697 SHA256 51348110f06e7d17f68894fd91f91b3e1f935647355a94a79b8c16f923ce9e81 SHA512 c41c6feed76d8d49932399a080d2e2fa9227b742e0cab5efdf849315ae1b633369e035bee3fd1d94c6a61e533f23d3881e9de650d1b4ec01946660f39c245917 WHIRLPOOL c314346cf113c87ceec3ded469505952a7717f06bdc6099e5fab84d4b5911927b611036bf924c9fdadb35c545ad3fc8ab06d115fd24ad78e045580ba8e02a04f
|
||||
DIST postgresql-ocaml-4.0.1.tar.gz 85871 SHA256 07d8fdb5c161b30809876375c43ebf29e5b99a475ee6b019b6fee3a80c18a4cb SHA512 baecd1b3b98f790131972dbd2eba563b43dec6e13e37ab904ee38b2b1168b03533272532887a42a2536806951c9e543306c6eccfb441de517ee860383ea5df36 WHIRLPOOL 71562d46b8688b4319f6fae06aeaea866e397cf6ce9f533b096d8d9f0850b2746fdffca6f4f234cc23cfb433d8124f559f89971d32554a756e88234c5a311e6d
|
||||
EBUILD postgresql-ocaml-2.0.5.ebuild 671 SHA256 e24544b0d3acfc7722b9952a44144361d5b9b9df1836c0fff0b1561aca59cdb9 SHA512 536344d3a1b4f5b9ff66d36c2d0443eb4b3307df373302e8969c130cbad5f09d513684ec8796c50f8937acd06d2712506e2fed4ae10aec44ab0adfe8c824795e WHIRLPOOL f43297c93aa07413d622005d5657d08ff64d18906d8aed43a3e39f35daa33d7044f5537e398504d3fcd0c35e690b2f45f84c705e0467e7d0cd6e0109d98e5a08
|
||||
EBUILD postgresql-ocaml-3.2.2.ebuild 708 SHA256 1ad882d470272bbb707f57e9a63edcd1f0d33fe2a9847fb8483fb1ba25fd7b66 SHA512 470ea7fe5eeab9ad2791200bbe19353bb06226cdc51c4591b807913d768b48328019ac9ddb1c2b103896bcab8db53213750babc0ed5b3d4be21b3abb03b704fa WHIRLPOOL 3f33ded914f2648ceae95466b36ddfc386e2b4e279206c4fd898b1265ed315c1a17b7607ec3a0ff734fd7041e4c968395e45dc47d9e4ecb9f49cd826c157eb98
|
||||
EBUILD postgresql-ocaml-4.0.1.ebuild 708 SHA256 1ad882d470272bbb707f57e9a63edcd1f0d33fe2a9847fb8483fb1ba25fd7b66 SHA512 470ea7fe5eeab9ad2791200bbe19353bb06226cdc51c4591b807913d768b48328019ac9ddb1c2b103896bcab8db53213750babc0ed5b3d4be21b3abb03b704fa WHIRLPOOL 3f33ded914f2648ceae95466b36ddfc386e2b4e279206c4fd898b1265ed315c1a17b7607ec3a0ff734fd7041e4c968395e45dc47d9e4ecb9f49cd826c157eb98
|
||||
MISC ChangeLog 3879 SHA256 b3d89ce68b1d1e18f555c9900310649e0d0441e14f91e9912e9c2f916e9ebbb8 SHA512 f46d25076b26d1ac3927909a1f39a609713a05540c7a99265f3d06d06a061e199462f5b591a8079be92f685f0b9be0ae0dad55ecc8dbcf03e8ebcb3d50c5025a WHIRLPOOL e2c38f941002202190abd02c1f99368aeeac2f983b416b813119f4e0d38d0645f0ebb2eb53c69cbbd7ea340ee8b828e6067542b60b716abf6ee68a7bd471e0c7
|
||||
MISC ChangeLog-2015 7158 SHA256 1a3d4fb5e91fc737400f720b3eb3b9b94ccc0b343a7d3c8d9999796db9001bbf SHA512 e7edbe933f137d34956518c5a3fc5f74c9bd72d6807144ce24f586bf68acdb299f89c985af61bb4336650810505acf7cd8c61dec86a546205b4aadf7537eff87 WHIRLPOOL 4a3264181c41ba1c651ce64d4458a863539941e647c8bc70a63c8efe7c16d70add66d205b7e97688dfc998affb75155b0dd961a34ca51000ed384be406d40ae2
|
||||
MISC metadata.xml 413 SHA256 a2a8609c6cce1dbe130f0b003f7b5f3d4a920932538c1fba784597fce534f96b SHA512 8d6cc5c373d7b5bdc89f7c426d23ecca928b88400e5e7b1622861d5ad18b4ffc30ac11238c935615737a08be4fbdb337939b23635c76b56c8a999c8d6ce930a8 WHIRLPOOL feb3cda4691171361ae20ac1bc5cdb29347eb53240432e093c520bcf5a3fb89f117f7c3d5ecbb3daf55b58e824c2d863ce62926fb644335abbe2bcdc8ccd5fcb
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
OASIS_BUILD_DOCS=1
|
||||
|
||||
inherit oasis
|
||||
|
||||
DESCRIPTION="A package for ocaml that provides access to PostgreSQL databases"
|
||||
SRC_URI="https://github.com/mmottl/postgresql-ocaml/releases/download/v${PV}/${P}.tar.gz"
|
||||
HOMEPAGE="http://mmottl.github.io/postgresql-ocaml/"
|
||||
IUSE="examples"
|
||||
|
||||
RDEPEND="
|
||||
dev-db/postgresql:=[server]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-ml/findlib-1.5"
|
||||
|
||||
SLOT="0/${PV}"
|
||||
LICENSE="LGPL-2"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
|
||||
DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
|
||||
|
||||
src_install() {
|
||||
oasis_src_install
|
||||
if use examples ; then
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r examples
|
||||
fi
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=MARKSTOS
|
||||
MODULE_VERSION=2.20
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Populates HTML Forms with data"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm ~ppc x86 ~x86-fbsd"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-perl/HTML-Parser"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
SRC_TEST="do"
|
||||
@ -1,9 +1,9 @@
|
||||
DIST elasticsearch-1.7.1.tar.gz 28500556 SHA256 86a0c20eea6ef55b14345bff5adf896e6332437b19180c4582a346394abde019 SHA512 88786d277cb3228a5e477068fc5ff723e0b5aa47411cea5c55d15ae769f2fb123d274e29c592a9e0f655deedb9db62f296af5aff4e8b56539928025a3375daaa WHIRLPOOL 2218ec3603314a60b38e903b3f00681512306efe1892350ced71c060a24924391d66cb9273d6db5ebb781d60808a2f3ab4c77c57baa03714db143c3718602bf5
|
||||
DIST elasticsearch-1.7.3.tar.gz 28510917 SHA256 af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca SHA512 0cb6b2ebd77c3d1467f6a22f845bfbf9f4a7c9c9ddedae17aeb6bd2d2bc576171fc80e3a4963e7b890af574e9fd0b0faa152e7f2671a74254826e14fe2554c9f WHIRLPOOL c86de3076389a9b95cf4d424673edb3c3b1dae0b4470b18b15a5f2e9bde6669a61b8ffd5cc3f7fc3b52f99441915a84b0396a5673ebbc12fec0d83eb41a03c74
|
||||
DIST elasticsearch-curator-3.3.0.tar.gz 85260 SHA256 e55ec74df61b8afc05a27bb1791cf07131b54d0fccede6bd5ce8815f350c9a7b SHA512 030644137f2065d89ea44d19f71a5b54d2a216891f9f83984e131cd0c29d348a8a38dc292a076e13c2b87e6a25c30b6ed85780878f5bcaae1f4f0d57f4f6df24 WHIRLPOOL 80f2b6ad95e3f34b5adb6c55fc2ca7c8b31108bedc474735b5023d40c49930ab33993cb087c9d5928e67e907d2ed87a99b7fa4b5951ff91638bc4da7b725820b
|
||||
DIST elasticsearch-2.2.0.tar.gz 29419005 SHA256 ed70cc81e1f55cd5f0032beea2907227b6ad8e7457dcb75ddc97a2cc6e054d30 SHA512 b1c9d10ba6c778fe1a440c058b4968bae1cfb81cff9e00508e406ce02ec5eb889b6d7caf8fb69ef132a2e681b127fbe3b71c6298ee0c9f047aeaeec29cdc1cc6 WHIRLPOOL 1e57b2cca97d90756d592ca96ceb4e1fc026e1c9deaeceb3df3a59937a9cd8710222d6c74ece2883dd425aeb1bfde034413d2f04ea0f4a4c276c0d7de3671cee
|
||||
DIST elasticsearch-curator-3.4.0.tar.gz 96741 SHA256 86e542886d83ad4c499437e42f4ff69d6602314a75c0c156d1c8dd838ab5e605 SHA512 23cab700acb8afe7967d3e024a293a765ba1823015006c2856c3967ba33ec8a21d214fe7e0b2840e9fc3adb4cc15c889dba955c849036850ed67d689285f9871 WHIRLPOOL 01828a116a11d41666fb21c967375055114ff050650ab329f5aded441aa98743b0c62bcbb98f7f5a2335b844d44e1f3020d6f36e0f2f24acbf357f69b056062e
|
||||
EBUILD elasticsearch-curator-3.3.0.ebuild 2723 SHA256 9de5c81753a01acaf8d91028ed79a6105d88616ddd0b681f8f83ad66745c8ed7 SHA512 4e68c03e34b459de99760264bb66c19eaca14a76dbaac17268f8098a1e445027636ab334ec89cb92e06cfb11ef5f3129b21a42395b69080262ba9fc38123b22f WHIRLPOOL f0647ba350820917ddfad6746aab9d7b4fcd487c8439bc71e81da3cfeb970bc02c8f14f39534866707fca601324ffd6a5764891981a2f45c1ed141793b02693d
|
||||
EBUILD elasticsearch-curator-3.4.0.ebuild 2723 SHA256 554bf142f051cd40c4b6b84c24fddd4895f2ff3736f23a28831b551f5080d68c SHA512 07df2b3cdac644003dc510dee70e44ea439ddd88bd4452a53c315f0cfe06998220a76149ae1f5387082ab86196bf8c430119158470f70857037409d992f9a825 WHIRLPOOL 4b6107e65df5a235df4cdf2c557f8823867b32edc6706c4a0cbb7fe142e9fa6fd748a84cba8115b2a87f0aa683767a282416712de395643b3aa9b88ccf33388f
|
||||
MISC ChangeLog 3895 SHA256 dafc3fbad9d9b28d46caa40103013c2f7c2c6979685c067ae3c927931253a6b3 SHA512 c741eed8868d57d96e509b4d2381bb7ce349c844113bbfdc8235369327c3aa22fc5f172025cf5c57d4135b42723dfecae1d2fb5f54c2a3b21d00ccbe2c863ebd WHIRLPOOL 3355b7ca68cf064e7260dd5590ec39c8c5042c1893de4fb20259763101fb292645e9547b97f1c801a317d6d0da4ffbd86d1333f0cf3d37a5bdf107d496d88a0a
|
||||
DIST elasticsearch-curator-3.4.1.tar.gz 91420 SHA256 38d3c576c1a714d3e4defd78c43d898908ac563aa93018afd47702b5ae1e01c1 SHA512 63cee7e7778cf9cc5484a5e2a5a7cb379c8ba84f194d44758bf6e7a468492c27f41dbf5df42d964c060761e61166d3eba056c59b4d44e0df6a75052c5f9b42d8 WHIRLPOOL 2aa54a725b5cf1b5db0e3a8b069bd9d0f6d791f7750311676d25bcb7fba233316d38980c68e2ad2bfd7ae7ea82cc69ccbc7746e40f95e6ce19562ed577e32228
|
||||
EBUILD elasticsearch-curator-3.4.0.ebuild 2729 SHA256 a451d5ae21a3c4ebc273118c28f3314b89a8690f4bc30a29e00ef1ec8331174f SHA512 4823431808f4de74a37a26c20c8c92e4fa710983f5c8d4106ea59ccd3df755044e7cb341dee0bf3e4e611029f127ce6e76c0507ade54f3ddc1c7007d1ac1497e WHIRLPOOL 98245d3971d11c9bb286fce3fbdce841172379073f03bbad9f189feb348fb596b6d01bab5fee47b55311a4d6164a56fc4dd5235bc282957bda5b7ada1c64295a
|
||||
EBUILD elasticsearch-curator-3.4.1.ebuild 2817 SHA256 2df021bf84081f618880f9812c1a53dd8b7e0fa0033b82232b3190ceb14608f7 SHA512 c097f23db4e7ba38f3175447a3d1b31033fd3394a92b541ed0f2a04aa46d3ac9d262173ca95fc0b8919f474fcf21e7275bc71d202dc14da35dffcfea793a77fd WHIRLPOOL 74c72e4f663310ec9f634ee4c879328aeb27405a9b5da8df26ecbda1660195a8b63789855a54ae323d94ef09672a52309f36a00b72551f73406404c41f7ea5c3
|
||||
MISC ChangeLog 4466 SHA256 9dec297650de6139c183af4088f3e048a1a84287ee7d3744ab07adce3c508c42 SHA512 c8852c2f3f5095ff51897cc93fdeaa11e9a3a96b83bfd1493320e9d0479a20a30e3876d2aaf5cb868a09d3e2c192fc7dc97e32b7525c25b76f86fcde090505e5 WHIRLPOOL d54366e57d78c699cb154456a9b0e3d3d27ae519d2954dd26a83662db22e2c673441756d3e3c99b7b810a621172fe1d9a0b80b3fef960d0a54ac41a10dc3829b
|
||||
MISC ChangeLog-2015 911 SHA256 6f2af6e82f6f117247a783b711378598aa316f1bc5733d83248949a96f197d1d SHA512 bc50115d94906909c1325122edcf10ac3a4844676958522286fe7f80e230ef83bc5f349877c3fc2b5a55c6f24043b1a92b6b753c35a7b6aa0de8919993186576 WHIRLPOOL ad452ba3670c5fdcd739b0afdd2411c2303c42940649e047af4cb28cad95be6c9d50bf4e03fb05fdafda8cafb0b944a3fb81494a5dbcc05ff4fd1e889de46d5c
|
||||
MISC metadata.xml 597 SHA256 3e71f2165dfd7a955dc0eb2bc82c3c8c07844bd65e52f560efb1a88efa225553 SHA512 0f390f1db593d82e7578dfaa26270769a15491d222646a3598923839ac52f5796e118b810b1b25d4211d8832bdf79c073101abc6cf0180ee2219742da2ffe707 WHIRLPOOL 92707b6a2f1f2e7330c701cb27752af6d8b78fb163d45ac2040ba5af214b1cae62d0934cd335bfb7e84b4b87dabb2b543a74f973668fe68f1d718ce9388803e0
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
|
||||
DIST rosbridge_suite-0.7.14.tar.gz 368983 SHA256 710021193a87a0da760c9f7124a6abf566b73c4ebb42e0a5eac7738375f80f0b SHA512 5e7de568d32dff41870c11012b4f272c99d28d20bacd748121407f9574a4e4b94ee022aa81a859ac4cd3a1915b0a00cb6fece7f71b829cc2cc07cc6469457655 WHIRLPOOL 2484202e7fa03e1a996049aa60f7d031c38e03d36c384ffc58fb7c6f543ad945c6ed95702a1e994739d2f8c2e1a80d0ae1057732e92b948989f3aee221fa606c
|
||||
EBUILD rosapi-0.7.13.ebuild 673 SHA256 42c31749b35a8bc7a32d8af06ada5ca35e033e9fe70955cded50b252c58ac1fb SHA512 5f923dac6288977aad31a49764d5ab501212fae5ae4aadac627cc0d2fb8430c280799d4368fa37ca15b2fb3da98984754dedab543ad71346070e6cc971ef229e WHIRLPOOL a0dc7501b10ad31687dc88b73e14381d8c0a71bfccbe5f38d1238cfa6fe2e95187b2d06e3986dc2b90c9a1b38fdf1d72e07ec45ed7241d53209f08f268d321fa
|
||||
EBUILD rosapi-0.7.14.ebuild 673 SHA256 42c31749b35a8bc7a32d8af06ada5ca35e033e9fe70955cded50b252c58ac1fb SHA512 5f923dac6288977aad31a49764d5ab501212fae5ae4aadac627cc0d2fb8430c280799d4368fa37ca15b2fb3da98984754dedab543ad71346070e6cc971ef229e WHIRLPOOL a0dc7501b10ad31687dc88b73e14381d8c0a71bfccbe5f38d1238cfa6fe2e95187b2d06e3986dc2b90c9a1b38fdf1d72e07ec45ed7241d53209f08f268d321fa
|
||||
EBUILD rosapi-9999.ebuild 673 SHA256 42c31749b35a8bc7a32d8af06ada5ca35e033e9fe70955cded50b252c58ac1fb SHA512 5f923dac6288977aad31a49764d5ab501212fae5ae4aadac627cc0d2fb8430c280799d4368fa37ca15b2fb3da98984754dedab543ad71346070e6cc971ef229e WHIRLPOOL a0dc7501b10ad31687dc88b73e14381d8c0a71bfccbe5f38d1238cfa6fe2e95187b2d06e3986dc2b90c9a1b38fdf1d72e07ec45ed7241d53209f08f268d321fa
|
||||
MISC ChangeLog 1274 SHA256 5c5140b52d1799fe232f21591119110e81c4ffbfb133b1c9e9a18e707d71c5a1 SHA512 f157541a573bf23a75cabec479261cebf3dc149b932506ccb1012d73307627223d5ba064bca0f164dc4d1c6ef74c959bea0031d19c42da45aa718a7c6dccd58f WHIRLPOOL bd67a18a9470e551ba41556a1c7b1795c72dfaf41f901a0550b959799069a1be609014ddb0a49a9eb1bc4b0029bf77388c4c2143b46449f91f08a4f7b6c69c03
|
||||
MISC ChangeLog 1487 SHA256 2d3b3c24d834ce60884fbfce5d19f1367acfc921a17c823202edf9d483a157e6 SHA512 2be37b1774e81f627f810e12ebbf87aa810da19740fa63cd2296bc834347d50ce3a0c964fa2ed53c1bc016e9d04f6abe07c5314b156ef7e3f1d79863a058f930 WHIRLPOOL a0590e3bfddefdaf3025cd20adf01e5fe56418ab932441254a7987bd90c2bc8dd8352d8a27475ee6d20b5467d1d27344e9f1be48a7689ca25877233452c65e49
|
||||
MISC metadata.xml 343 SHA256 da4060e9f6d2adbce47c7059162464a4adbaee16247e0e5c45eb7654922db024 SHA512 45889c0aa111bcf8050244d51f15ceef5501a722f3feac93c3795a4b9217a41098f44f6b06f906ff333e2c98d03b0f44e4a41d1acdc70942fa9c54b05dde1365 WHIRLPOOL 8f8cbe12fc339aba697e4d28de452cdbc11d8cba29d29d9b99ab5ac81c89029cfac57b0de1d7f0948c8c52c4810e94093ac2070331a2051aef63e2ec109b0a86
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
CATKIN_HAS_MESSAGES=yes
|
||||
ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
|
||||
KEYWORDS="~amd64"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/rospy[${PYTHON_USEDEP}]
|
||||
dev-ros/rosnode[${PYTHON_USEDEP}]
|
||||
dev-ros/rosgraph[${PYTHON_USEDEP}]
|
||||
dev-ros/rosbridge_library[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,5 +1,7 @@
|
||||
DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
|
||||
DIST rosbridge_suite-0.7.14.tar.gz 368983 SHA256 710021193a87a0da760c9f7124a6abf566b73c4ebb42e0a5eac7738375f80f0b SHA512 5e7de568d32dff41870c11012b4f272c99d28d20bacd748121407f9574a4e4b94ee022aa81a859ac4cd3a1915b0a00cb6fece7f71b829cc2cc07cc6469457655 WHIRLPOOL 2484202e7fa03e1a996049aa60f7d031c38e03d36c384ffc58fb7c6f543ad945c6ed95702a1e994739d2f8c2e1a80d0ae1057732e92b948989f3aee221fa606c
|
||||
EBUILD rosbridge_library-0.7.13.ebuild 1458 SHA256 bced88c285ea519fed820b950204294beeaf596d57b9e8a2d4b447f0cbe20012 SHA512 b959fbb1db608c0bee2800ddeef77c731e680841b61a663b73f819bcb42be6611f3afc12bd51983a219cacc1df46b2cdf57d7a69531a27bc2bb05fc46718a55c WHIRLPOOL d748266d6f9f4e970d6fe3c506a83fa8be49b3c301f02bfbbc2f3e08054eedf365694910ff7e1de9926fc94520aca24b4ad3df88de0065fa2b526c302074d829
|
||||
EBUILD rosbridge_library-0.7.14.ebuild 1458 SHA256 bced88c285ea519fed820b950204294beeaf596d57b9e8a2d4b447f0cbe20012 SHA512 b959fbb1db608c0bee2800ddeef77c731e680841b61a663b73f819bcb42be6611f3afc12bd51983a219cacc1df46b2cdf57d7a69531a27bc2bb05fc46718a55c WHIRLPOOL d748266d6f9f4e970d6fe3c506a83fa8be49b3c301f02bfbbc2f3e08054eedf365694910ff7e1de9926fc94520aca24b4ad3df88de0065fa2b526c302074d829
|
||||
EBUILD rosbridge_library-9999.ebuild 1458 SHA256 bced88c285ea519fed820b950204294beeaf596d57b9e8a2d4b447f0cbe20012 SHA512 b959fbb1db608c0bee2800ddeef77c731e680841b61a663b73f819bcb42be6611f3afc12bd51983a219cacc1df46b2cdf57d7a69531a27bc2bb05fc46718a55c WHIRLPOOL d748266d6f9f4e970d6fe3c506a83fa8be49b3c301f02bfbbc2f3e08054eedf365694910ff7e1de9926fc94520aca24b4ad3df88de0065fa2b526c302074d829
|
||||
MISC ChangeLog 1558 SHA256 922dc07dd493bd65b282fb9dad0c97fee38b975e159c0fb2c515aafe91d6c22f SHA512 0af35f7a5ef8493993575fa00f508b6b83cd817d619532e4f436764110c051903ceb57ca1d3c6010a89debd057831d725438106ad407c15f0b97da795bdede27 WHIRLPOOL afedce1f7a05487836f46db03bcbe62acbd5d72d94131879e27651d57ddc36b353c37ff818637e849aec11c07ef825946b8b100d0ee1b19f1af1372754c7ebd4
|
||||
MISC ChangeLog 1795 SHA256 251a0694b9acbca5219c43e8daf2c9adb93f10bb74016825b6ad7e14468cff4b SHA512 5af543812806b3c180ab87eaf592614bd601cde9ca8422a1b903c235e7529cec1bdb47b511fe0a950848d953c5a013569b1768102e3f2d8f972c80ef647e6bd5 WHIRLPOOL 702e28fce40e0877f0936bf1e7244ee8e3460f5aa632f5cae45309cdec15a1ab172f8e7caf1c3313cad8b3d7bb91a688f2b2eae99ea35b74547c2edcce7e1397
|
||||
MISC metadata.xml 343 SHA256 da4060e9f6d2adbce47c7059162464a4adbaee16247e0e5c45eb7654922db024 SHA512 45889c0aa111bcf8050244d51f15ceef5501a722f3feac93c3795a4b9217a41098f44f6b06f906ff333e2c98d03b0f44e4a41d1acdc70942fa9c54b05dde1365 WHIRLPOOL 8f8cbe12fc339aba697e4d28de452cdbc11d8cba29d29d9b99ab5ac81c89029cfac57b0de1d7f0948c8c52c4810e94093ac2070331a2051aef63e2ec109b0a86
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
CATKIN_HAS_MESSAGES=yes
|
||||
ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
|
||||
KEYWORDS="~amd64"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Core rosbridge package repsonsible for interpreting JSON and performing the appropriate ROS action"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/rospy[${PYTHON_USEDEP}]
|
||||
dev-ros/rosservice[${PYTHON_USEDEP}]
|
||||
dev-ros/rostopic[${PYTHON_USEDEP}]
|
||||
dev-ros/rosgraph[${PYTHON_USEDEP}]
|
||||
dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-python/pymongo[${PYTHON_USEDEP}]
|
||||
dev-python/pillow[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
@ -1,7 +1,9 @@
|
||||
AUX backports-ssl.patch 420 SHA256 b82a282249ffaf019fa5ceeb0165233f6a5ba3668da8d90f0aff2988cea95784 SHA512 ed873ddfffb3702d2de62491d76cb829d02f215b09a3c8ce3564d1ccf1aced76939dca26eb22ccb21853ab8ab1a85d654a34bfd48533041c0dbc709c105b296d WHIRLPOOL 2ddfa4814cf86d29e235e82cc80eace0709740b333c36785c7fcae39f74cb0e80e82bc7ff61b54336230d4c56e70753cca64e53123dd928dd60cd9d875d436ad
|
||||
AUX tornado.patch 3361 SHA256 4125108b86b4ee80f5d27ba386673d365312013157db41f199ed3b4bacdd5b24 SHA512 6f8768716801dbfd00ef5698b91ea3d949c00895d18b3476d80a4fb09456b23412564d03b7a10eac6ee603dc4747aea8a96e6571164718eb0790f6475de9ee93 WHIRLPOOL 4ba127060c9be63dcd19ae42847336e884c99a2d59ac52ae916e0b94b1a27cc2490a4a652f405cd02986c8be9aaa6a55f310a52f373f3cdefeb32dbe0d2ae6d7
|
||||
DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
|
||||
DIST rosbridge_suite-0.7.14.tar.gz 368983 SHA256 710021193a87a0da760c9f7124a6abf566b73c4ebb42e0a5eac7738375f80f0b SHA512 5e7de568d32dff41870c11012b4f272c99d28d20bacd748121407f9574a4e4b94ee022aa81a859ac4cd3a1915b0a00cb6fece7f71b829cc2cc07cc6469457655 WHIRLPOOL 2484202e7fa03e1a996049aa60f7d031c38e03d36c384ffc58fb7c6f543ad945c6ed95702a1e994739d2f8c2e1a80d0ae1057732e92b948989f3aee221fa606c
|
||||
EBUILD rosbridge_server-0.7.13-r2.ebuild 771 SHA256 ae8e29d2299451a892532edd2d270e858320fb493cafff0e5e17f49bce57d608 SHA512 a84640d9ef80bbe78ae2e270d236c867b02c1c616d0712d5804a1c471bcc3e5cd5bfc8b4c6a900c0d0dd348eaf09d43a75a18205414e79135eb9aedb24385552 WHIRLPOOL 702519935a1721f70cc26e08f0cbc88bd2ea2df6f3a3dda63d1306d119f3e23c584f3fe197a60e5e9fed5b2a7e0639102796657bcece8a04504e092ee0f1dafe
|
||||
EBUILD rosbridge_server-0.7.14.ebuild 771 SHA256 ae8e29d2299451a892532edd2d270e858320fb493cafff0e5e17f49bce57d608 SHA512 a84640d9ef80bbe78ae2e270d236c867b02c1c616d0712d5804a1c471bcc3e5cd5bfc8b4c6a900c0d0dd348eaf09d43a75a18205414e79135eb9aedb24385552 WHIRLPOOL 702519935a1721f70cc26e08f0cbc88bd2ea2df6f3a3dda63d1306d119f3e23c584f3fe197a60e5e9fed5b2a7e0639102796657bcece8a04504e092ee0f1dafe
|
||||
EBUILD rosbridge_server-9999.ebuild 771 SHA256 ae8e29d2299451a892532edd2d270e858320fb493cafff0e5e17f49bce57d608 SHA512 a84640d9ef80bbe78ae2e270d236c867b02c1c616d0712d5804a1c471bcc3e5cd5bfc8b4c6a900c0d0dd348eaf09d43a75a18205414e79135eb9aedb24385552 WHIRLPOOL 702519935a1721f70cc26e08f0cbc88bd2ea2df6f3a3dda63d1306d119f3e23c584f3fe197a60e5e9fed5b2a7e0639102796657bcece8a04504e092ee0f1dafe
|
||||
MISC ChangeLog 1943 SHA256 8849f4ffeb582fc18930ef0e6d3ae09da13a8f7949d887ac75a62358c15c1452 SHA512 6cf0a9dcee036d74b863a34d415cfb585a4e76426ef058aee8d46496f3917ba5b9ae76d1b32373857ada49088a3751711afc6f3a97e2fc5e5827dbec68ff9f59 WHIRLPOOL b85d2c6795dbd7c1a40561d6a00753bcb94aeb63ad42039e3d290076e17104ab9acce5f9a3ea38350ed8d1fbc8dff679f633460e740c454941628440964743a2
|
||||
MISC ChangeLog 2178 SHA256 d5d6ab8ce67c6e997d0cbcf9408da72f33236d8d3905c0508c5384f0629d9314 SHA512 956d96f7ebf4fb3a48add869637135b1b18337a8625b3326e977fc320e74d16e685194309ba0ff38e2d8d24a2ea0ad30152895fb0be4da2dacf3fd5c9441a29b WHIRLPOOL 8c43eb6946f65c894750bc1170c9f004c846d37891a8cbffd4523f673240493ccb7058afba54140f4dd70d6b0bbb8aa3e12293070acb97d7aee4abe49bc03577
|
||||
MISC metadata.xml 343 SHA256 da4060e9f6d2adbce47c7059162464a4adbaee16247e0e5c45eb7654922db024 SHA512 45889c0aa111bcf8050244d51f15ceef5501a722f3feac93c3795a4b9217a41098f44f6b06f906ff333e2c98d03b0f44e4a41d1acdc70942fa9c54b05dde1365 WHIRLPOOL 8f8cbe12fc339aba697e4d28de452cdbc11d8cba29d29d9b99ab5ac81c89029cfac57b0de1d7f0948c8c52c4810e94093ac2070331a2051aef63e2ec109b0a86
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
|
||||
KEYWORDS="~amd64"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="A WebSocket interface to rosbridge"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/rospy[${PYTHON_USEDEP}]
|
||||
dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
dev-ros/rosauth[${PYTHON_USEDEP}]
|
||||
dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
|
||||
www-servers/tornado[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/backports-ssl.patch"
|
||||
"${FILESDIR}/tornado.patch"
|
||||
)
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue