root
5 years ago
parent
b7f3498cfb
commit
89e88dbc01
@ -1,23 +1,23 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA512
|
||||
|
||||
MANIFEST Manifest.files.gz 28844 BLAKE2B 9b4f82a541c8d088e707755a019252006590a5a5411db5cd4eea278fe98eae193a61733cdbd44e63d0a4056ed07bc687957c017a5454d2105d3991b18c3a7a4f SHA512 aadca1cf8dae9c33b20bd4af82866d6608e1bc04a8b737d79a2c3c7e314eb27b48f7a9114302c0ecab0b3e3eefb2ca9b31973578eef8c0519ae22ad0200a6c4f
|
||||
TIMESTAMP 2018-12-14T05:38:33Z
|
||||
MANIFEST Manifest.files.gz 28837 BLAKE2B 75793e81f767ec59bb1af9ff30059e2de04dbf1227bec9e72cea2a024bb51117628e50eea67d4a8371b96553be3f967396b89cf11f3aaf53794854d39c1bf5a6 SHA512 ff78dc752818ddd003ac7660a3e5a7f0b81b7a429845253bc0c8b577f22316a937c615979e839469fd1a9c0c1a417d47ef2a4c8eb091e64835ac6e73db5a04ec
|
||||
TIMESTAMP 2018-12-15T19:08:37Z
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwTQdlfFIAAAAAALgAo
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwVUTVfFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
|
||||
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
|
||||
klC5AQ//WswPG2F0hVuC7pV/GHSfcFOdXUglbgqcn1MuFiYeK2e0mK3nwIZR75e2
|
||||
eP6I5+nmyY9io69SxJfjk+DmZ4vzG4PA8QYkCKxrpTEaD++S7rXrZ/DWUKxDJy5I
|
||||
UrA7j1fES/VJvdGMK60CZDIBkAupHNNiYaczoYj7wg0KgdrM6VPXFbap5Km7ICXm
|
||||
iLsUod0ybhCPaDpfY32gU1y8CXF+HjEz7Rlt6A6VUosKbGiTWcy1luU+uKw8DHSX
|
||||
k96V/XCU3BjtgMkaw7j1NsIl6VubtZ8KGvUB2qM2XLvsleshzo41fO+4b91pIZCj
|
||||
96WHwIY6ME+Nk0a5km6Itugk001DGQx5ZaJIQw0WrBeXikDo25KtqH+WLd+Qr8AO
|
||||
ArQt6DRr/50w+1d9uYMue3UZY7UQeVLPp/hMt0n6b6CdlNQmZIvL875Y3rNtdYgr
|
||||
rihqhpySRCjuG8OysB5vCrWQJTxWxg5pNbNXvV55CGskMQxmIJ0ofSrbL/7OZDkD
|
||||
MVZJ23U0hQtt8YSdNsaNwW03ompveWdC/hCFVFW1WYrHFlM5YwvwkFIgcXffumPX
|
||||
xvFF9mFodvssf6SXkNgvVEn3ielHVsYuCE0o22Fcg6JCTbT5xQHV/s8hZBK1I+aL
|
||||
XG7DfiEcdj3L3bpd35QdchWdUoAjEGnXGT1z2w7jynnJ2sU/Mu4=
|
||||
=uGfC
|
||||
klAT/hAAh9+L61ip5r/7Gns64+ieHCKSVKqq4kFjUh0LhRDcDgfUANjQ1fjzy2fI
|
||||
Dn9krYxh85VNntU4F3/uHsPeaFoB/+gr7zcU9O5NZVCZKmsy+k+doD7VIpAJgq6P
|
||||
9Fnok6ITnLah+lZLX/1dbcB+ubVUbbBHtCxQxXfXjW8Dq9xFbl7bICFo8QXJdVdC
|
||||
AMjt1eOjqUI74n0e1ALbs3HRIsjKQq1vatjAtsvKjLBudRpwyUR7L7TGQA1MXmcn
|
||||
bA4p8ZYKaNR8NA5RCk6Hl8EeFBFLfDUGWw13ug6s1uwrg7JwdoIcXIiIHMy+L7Zg
|
||||
hMK9hKSWMMJ2YoXuKFA/CGOHyqR9rWidP0TyOkIIOlar6GZkr8GP9X5ZiyuMgFLt
|
||||
fWkyW/CItFp14761bpaY07+xOxUWuw6wb0uRxxKGMHiOV3za1OYeOH8AlUgjWFPb
|
||||
1r9Rl1iACwkn5r7sxesRjz19/P9iJj1ItAAkEhdS1ep1i8l+g3Xv/LTIIGkkDIil
|
||||
zwwjs0iaPu0pO7q+QtbH8UurDhHSUNcPDDSNAgkvkqV6B1pMUzcY/zfco12xrw7t
|
||||
Xl9fuamXrB+f+f9LuZja7USKLDWruHy9NXnqPrY5HG3CQQ6PB49w+l2OwtNiraOX
|
||||
wToKy60ohEZTyvIY9+gNTZAOGvD+tr1ctvnvcrCAkNiqAm9KRDg=
|
||||
=9AMd
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,18 +1,20 @@
|
||||
DIST ansible-2.5.11.tar.gz 10114022 BLAKE2B 196c657c66b588ed709b8354d7f043c12701f08e263ede1224f59457b7d65c113d6a936150c0379378615e7a89a66db6a8cfc52304f2c3431a4cafbed9a3bdb5 SHA512 b0da66fb67bdd33b42b35239d392793cc19b98650990028ef89b83384285ab6185accbfe15edb030b9e9a62e59961a22e2002b6aeea34f1f063da857ad199358
|
||||
DIST ansible-2.5.13.tar.gz 10117549 BLAKE2B d5a53f411ff7cc8dfa3cbbcb6623b95d0a736b7359579aef1c81b391d75dc90c81396ffdd1906d1306d1d5ded7a745499fc82db086758b85ece027d9d243ad63 SHA512 f9968738b4aea6d6e84cca888827159c757b2248bf9fccbc2db0bcafccaba4700ebf87718fe98c912481cb0e8ed6b7a3b7be7a88ab7824092a2db838301fdec2
|
||||
DIST ansible-2.5.14.tar.gz 10119785 BLAKE2B 6e771aafc16053185ee6d275d6d41f64aa3f0d6dffbe721a66b548b97e84d78916e03827d592b961f9a4e0bb03fae09320731a4b8fdb814126cecdfb51f9f136 SHA512 9635b1c4bc9a93a24f4bb2894c9fed63803cecb01c5562559e3b808791d1007b26aa0aade4aa05fd4bae0f7d01216588d4e2e0bf4c5fb6cdf677d9b40e9e2de8
|
||||
DIST ansible-2.6.10.tar.gz 10716578 BLAKE2B cf769c65a25cebe799c9aedebacb3f07e9fa95dc8dfa57ec805861679ac5917432ec894ccd68bef7cb78dcf3b2bb2165c94274ebd932fd376b80ad17238e8922 SHA512 8eac8bab53042c25d12aef8ee3fd1b5361a339c176cd21daf8782150183fa5ab05ad65ec4636178c341771544742a487c5ce06f8e9b1492dcab3140788784b5c
|
||||
DIST ansible-2.6.11.tar.gz 10722546 BLAKE2B d98a82323409b894343c22c0b6226ef643bae34198627a6de426fdb65ef2a9892429edda20d522b8f501fe34c47b463f844abc7e6cf38009bd22398ca0c35f11 SHA512 5b795644d2bc02470b8a71be42720405614eac3e602a8906257c82ace36dc4c3727322b12ffadda6e2b752d963a40559cc35b1bc0a85596123896e7d1ac75b6b
|
||||
DIST ansible-2.6.7.tar.gz 10708387 BLAKE2B cfdd8940e3c23183fa8650d9c5a46b9af056dc9850b25b7969925ea66f2ec7d78945efaf982bc8c8752a285295461922b3e047b4edf75ecf3e3d4c893f0dafbc SHA512 23fde88f7e2151154cd77bb8a946c06c703b620456e0f1e9dc74f532b95d2868eb96e9c6f52fc48fc75ed5ad77d45d61be48fe4b7bd11ac8baa4745a026852bc
|
||||
DIST ansible-2.6.8.tar.gz 10714750 BLAKE2B 303e1be319d7fbe3ef6cccace6bcaafef8ddacc0ea2d749cabe71dbeae1bb8ca6bb770e45f226425625e6d045e31cff7f0ef08feafbebbd1db5751f11699a26e SHA512 a072ad1dac730dc9be50c902acd8ae6ba03cb82eecb505ed70e9cb33957fc0391c0461b89593331731e10dad970ee8f81843b1e1039788c320f593db1241ecf4
|
||||
DIST ansible-2.7.1.tar.gz 11738557 BLAKE2B 8d154d9f09eabd851fb182cea3a6a810385ed971429f4968b649ccd7e5cbbb5c6cd884a478b235f04f12134b471c99a4f77c32826661cc73cbb9e3a1159c377c SHA512 263ebc5fb172c7eda0cc703508ba06a5a6ab197923597a616bcdf28b8bc673ff6117c72cbff4546a1f3628656b0c4d7dd05c34c75e68b9a0d9c29ea9b5a4162f
|
||||
DIST ansible-2.7.2.tar.gz 11755722 BLAKE2B 8f1b733f2d4569bd6d1fd52b49b984104bccca28e5fc572abea56572b634a5acfd556562f6a2d2d32277282c8ca7f0c35f2e768d2935dc7d161b2389b37b62e2 SHA512 ee1dcacfdf6af8124b3b000acecb7dcfbf4f221eefbd3165c109e03c8ce7efee56ad643f143a1d159c1ac539536490a15547a9d0635b3c7daae2c9cbda7bc824
|
||||
DIST ansible-2.7.4.tar.gz 11769861 BLAKE2B 3aee95d19ab057e39d174b19f29acf8d2c1011c0f5408f0a78ddd172089794a40a11455cc693a6457f3fd6e30eeb986579bbcc57a384cef0d8aef1013f7f71ec SHA512 4b7cb202577e3c87ec89598ec9a81ebac4b60f62f670322c24b655f5f3a7fab4657c27cce6cfa4f1bb41e7d60f7f6cf80251d86fcb36b1312f6f3ad47be777c9
|
||||
DIST ansible-2.7.5.tar.gz 11781337 BLAKE2B cbb1ae02ee5733c03797db8acbb79980e24afe6e265aa609bbb22d8b43675c8ec995a4b10f3212e8dbf2fe49fdbccf1d2f8ee251bb4bd11ee5198a2ca2443147 SHA512 b3a8a2c10e42f4dcf0f3867901eaaf555e6b9bcbd808b91765a8825db3ec49d618d8893f244d52e49e944d0900a876bbb31b3a7b89d636e435e94cd4b281be18
|
||||
EBUILD ansible-2.5.11.ebuild 1621 BLAKE2B 7374dd46389da290959d922ea41086b94dc1c15ae17cffcbb211f1415acaeecc3d5be1f5c4c27ce5ee60454a49b453cca06587a64259e7091d9242d8f7e07cf8 SHA512 641a4babfab26eced6fabc54587d77b5e750c8b0af3e024a493f55444585167bb4e21aa9eae77ea5322d3c9071ea3097c3d79343bdc3854c372d9a944f7dbf18
|
||||
EBUILD ansible-2.5.13.ebuild 1623 BLAKE2B 28e5e0c4e05904fa61ccb810b8ab546a41824c52a6d1246d9f9ae6e3d60d6d6c99ef91fda9aa304d0dda7fc3afcaf78e38731a189ca5fd5ccd1cf3e7dd7a0dc6 SHA512 44fe0eb5c7b0fe17db4e42abdb0c1294769527cdd724929799d517e1b21ce4a75ccdfa1a8099aee75bbd579f3cb820b00ac41ecc6903c18f03ea3a3ac31956bd
|
||||
EBUILD ansible-2.5.14.ebuild 1623 BLAKE2B 28e5e0c4e05904fa61ccb810b8ab546a41824c52a6d1246d9f9ae6e3d60d6d6c99ef91fda9aa304d0dda7fc3afcaf78e38731a189ca5fd5ccd1cf3e7dd7a0dc6 SHA512 44fe0eb5c7b0fe17db4e42abdb0c1294769527cdd724929799d517e1b21ce4a75ccdfa1a8099aee75bbd579f3cb820b00ac41ecc6903c18f03ea3a3ac31956bd
|
||||
EBUILD ansible-2.6.10.ebuild 1623 BLAKE2B 28e5e0c4e05904fa61ccb810b8ab546a41824c52a6d1246d9f9ae6e3d60d6d6c99ef91fda9aa304d0dda7fc3afcaf78e38731a189ca5fd5ccd1cf3e7dd7a0dc6 SHA512 44fe0eb5c7b0fe17db4e42abdb0c1294769527cdd724929799d517e1b21ce4a75ccdfa1a8099aee75bbd579f3cb820b00ac41ecc6903c18f03ea3a3ac31956bd
|
||||
EBUILD ansible-2.6.11.ebuild 1623 BLAKE2B 28e5e0c4e05904fa61ccb810b8ab546a41824c52a6d1246d9f9ae6e3d60d6d6c99ef91fda9aa304d0dda7fc3afcaf78e38731a189ca5fd5ccd1cf3e7dd7a0dc6 SHA512 44fe0eb5c7b0fe17db4e42abdb0c1294769527cdd724929799d517e1b21ce4a75ccdfa1a8099aee75bbd579f3cb820b00ac41ecc6903c18f03ea3a3ac31956bd
|
||||
EBUILD ansible-2.6.7.ebuild 1621 BLAKE2B 7374dd46389da290959d922ea41086b94dc1c15ae17cffcbb211f1415acaeecc3d5be1f5c4c27ce5ee60454a49b453cca06587a64259e7091d9242d8f7e07cf8 SHA512 641a4babfab26eced6fabc54587d77b5e750c8b0af3e024a493f55444585167bb4e21aa9eae77ea5322d3c9071ea3097c3d79343bdc3854c372d9a944f7dbf18
|
||||
EBUILD ansible-2.6.8.ebuild 1623 BLAKE2B 28e5e0c4e05904fa61ccb810b8ab546a41824c52a6d1246d9f9ae6e3d60d6d6c99ef91fda9aa304d0dda7fc3afcaf78e38731a189ca5fd5ccd1cf3e7dd7a0dc6 SHA512 44fe0eb5c7b0fe17db4e42abdb0c1294769527cdd724929799d517e1b21ce4a75ccdfa1a8099aee75bbd579f3cb820b00ac41ecc6903c18f03ea3a3ac31956bd
|
||||
EBUILD ansible-2.7.1.ebuild 1626 BLAKE2B 84fe58d2c7daf64cd7a4fa3f22b2a09738c3c8aa88a6a6fe4dc0367189e1e6d8530054fb38f317adc95bc6a909a99939aa8d54ab77bcf8f7f4e748b9b08cb6db SHA512 75b8810271fcf75da109e5641d58b1869d9a2e5874c4c2744c25d970ae6d7787d856362672644aea6b38e7b133bab51f2d1c8412df32d614fb0558789da7b92b
|
||||
EBUILD ansible-2.7.2.ebuild 1628 BLAKE2B 75c493a396ecd1289471706473f927ef6142e680684934a71627dc7db9bd98ec574e05cd15b5fa70d931d4fabcc7007dfed980b9af639591e056f0db1ff39e79 SHA512 c44d7752ce67fdcc289081cef230afc7dc38bf187a9bbfe9ca1fd8c055c55b64fab153b9fb5f6faa34af57349db40d249308a65496e4f2aecd78d9bdf4848535
|
||||
EBUILD ansible-2.7.4.ebuild 1628 BLAKE2B 75c493a396ecd1289471706473f927ef6142e680684934a71627dc7db9bd98ec574e05cd15b5fa70d931d4fabcc7007dfed980b9af639591e056f0db1ff39e79 SHA512 c44d7752ce67fdcc289081cef230afc7dc38bf187a9bbfe9ca1fd8c055c55b64fab153b9fb5f6faa34af57349db40d249308a65496e4f2aecd78d9bdf4848535
|
||||
EBUILD ansible-2.7.5.ebuild 1628 BLAKE2B 75c493a396ecd1289471706473f927ef6142e680684934a71627dc7db9bd98ec574e05cd15b5fa70d931d4fabcc7007dfed980b9af639591e056f0db1ff39e79 SHA512 c44d7752ce67fdcc289081cef230afc7dc38bf187a9bbfe9ca1fd8c055c55b64fab153b9fb5f6faa34af57349db40d249308a65496e4f2aecd78d9bdf4848535
|
||||
EBUILD ansible-9999.ebuild 1639 BLAKE2B 363a22df345822cd047685b7cdf7114e5e1a1276bf90463799712ee90f751deea4c487f9c96a807558428d3e5993f4fded0017fb5d37b75ff6e550a6ccc32b2b SHA512 10d18db06a345555299b342eb01c7f3355f9f71d70f0ac6b3f2fc3837859161821c8c5771bec3d943647cb1c5ba8abae8c4febdccbbc4f2d747aa0f848682b46
|
||||
MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
|
||||
|
||||
@ -0,0 +1,66 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{5,6} )
|
||||
|
||||
inherit distutils-r1 eutils
|
||||
|
||||
DESCRIPTION="Model-driven deployment, config management, and command execution framework"
|
||||
HOMEPAGE="https://ansible.com/"
|
||||
SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~x64-macos"
|
||||
IUSE="doc test"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/paramiko[${PYTHON_USEDEP}]
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/cryptography[${PYTHON_USEDEP}]
|
||||
dev-python/httplib2[${PYTHON_USEDEP}]
|
||||
dev-python/six[${PYTHON_USEDEP}]
|
||||
dev-python/netaddr[${PYTHON_USEDEP}]
|
||||
net-misc/sshpass
|
||||
virtual/ssh
|
||||
"
|
||||
DEPEND="
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
|
||||
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
|
||||
test? (
|
||||
${RDEPEND}
|
||||
dev-python/nose[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
|
||||
dev-python/passlib[${PYTHON_USEDEP}]
|
||||
dev-python/coverage[${PYTHON_USEDEP}]
|
||||
dev-python/unittest2[${PYTHON_USEDEP}]
|
||||
dev-vcs/git
|
||||
)"
|
||||
|
||||
# not included in release tarball
|
||||
RESTRICT="test"
|
||||
|
||||
python_compile_all() {
|
||||
if use doc; then
|
||||
cd docs/docsite || die
|
||||
export CPUS=4
|
||||
emake -f Makefile.sphinx html
|
||||
fi
|
||||
}
|
||||
|
||||
python_test() {
|
||||
nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
|
||||
distutils-r1_python_install_all
|
||||
|
||||
doman docs/man/man1/*.1
|
||||
dodoc -r examples
|
||||
}
|
||||
@ -1,58 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit versionator
|
||||
|
||||
DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
|
||||
HOMEPAGE="https://www.elastic.co/products/beats"
|
||||
SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~x86"
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND=">=dev-lang/go-1.9.2"
|
||||
RDEPEND="!app-admin/filebeat-bin"
|
||||
|
||||
ELASTIC="${WORKDIR}/src/github.com/elastic"
|
||||
BEATS="${ELASTIC}/beats"
|
||||
S="${BEATS}"
|
||||
|
||||
src_unpack() {
|
||||
mkdir -p "${ELASTIC}" || die
|
||||
unpack ${P}.tar.gz
|
||||
mv beats-${PV} "${BEATS}" || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd ${BEATS}/filebeat || die
|
||||
GOPATH="${WORKDIR}" emake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
keepdir /var/{lib,log}/${PN}
|
||||
|
||||
fperms 0750 /var/{lib,log}/${PN}
|
||||
|
||||
newconfd "${FILESDIR}/${PN}.confd" ${PN}
|
||||
newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
|
||||
|
||||
docinto examples
|
||||
dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
|
||||
|
||||
dobin filebeat/filebeat
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -n "${REPLACING_VERSIONS}" ]]; then
|
||||
elog "Please read the migration guide at:"
|
||||
elog "https://www.elastic.co/guide/en/beats/libbeat/$(get_version_component_range 1-2)/upgrading.html"
|
||||
elog ""
|
||||
fi
|
||||
|
||||
elog "Example configurations:"
|
||||
elog "${EROOT%/}/usr/share/doc/${PF}/examples"
|
||||
}
|
||||
@ -0,0 +1,90 @@
|
||||
From c9a5b0bb49b91a463c0021dd5dbe9626e2d3bb11 Mon Sep 17 00:00:00 2001
|
||||
From: Filinto Duran <duranto@gmail.com>
|
||||
Date: Fri, 14 Dec 2018 10:20:57 -0600
|
||||
Subject: [PATCH] fixes #4728 problem that arise because of the zero value of
|
||||
unknown and the loging of kind_sorter this messes helm template when having
|
||||
unknown (ie NOTES) or other files and the sorter catches namespace
|
||||
|
||||
Signed-off-by: Filinto Duran <duranto@gmail.com>
|
||||
---
|
||||
pkg/tiller/kind_sorter.go | 13 ++++++++----
|
||||
pkg/tiller/kind_sorter_test.go | 36 ++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 45 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/pkg/tiller/kind_sorter.go b/pkg/tiller/kind_sorter.go
|
||||
index 8aff4e6c11..7df63c6ac4 100644
|
||||
--- a/pkg/tiller/kind_sorter.go
|
||||
+++ b/pkg/tiller/kind_sorter.go
|
||||
@@ -124,12 +124,13 @@ func (k *kindSorter) Less(i, j int) bool {
|
||||
b := k.manifests[j]
|
||||
first, aok := k.ordering[a.Head.Kind]
|
||||
second, bok := k.ordering[b.Head.Kind]
|
||||
- // if same kind (including unknown) sub sort alphanumeric
|
||||
- if first == second {
|
||||
- // if both are unknown and of different kind sort by kind alphabetically
|
||||
- if !aok && !bok && a.Head.Kind != b.Head.Kind {
|
||||
+ // if both are unknown
|
||||
+ if !aok && !bok {
|
||||
+ // and of different kind sort by kind alphabetically
|
||||
+ if a.Head.Kind != b.Head.Kind {
|
||||
return a.Head.Kind < b.Head.Kind
|
||||
}
|
||||
+ // and of same kind sort by name alphabetically
|
||||
return a.Name < b.Name
|
||||
}
|
||||
// unknown kind is last
|
||||
@@ -139,6 +140,10 @@ func (k *kindSorter) Less(i, j int) bool {
|
||||
if !bok {
|
||||
return true
|
||||
}
|
||||
+ // if same kind sort alphanumeric
|
||||
+ if first == second {
|
||||
+ return a.Name < b.Name
|
||||
+ }
|
||||
// sort different kinds
|
||||
return first < second
|
||||
}
|
||||
diff --git a/pkg/tiller/kind_sorter_test.go b/pkg/tiller/kind_sorter_test.go
|
||||
index 1c187e90d5..823d9674ee 100644
|
||||
--- a/pkg/tiller/kind_sorter_test.go
|
||||
+++ b/pkg/tiller/kind_sorter_test.go
|
||||
@@ -223,3 +223,39 @@ func TestKindSorterSubSort(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
+
|
||||
+func TestKindSorterUnknownsWithNamespace(t *testing.T) {
|
||||
+ // a.Kind=Namespace should win over b.Kind=Unknown even if the a.Name > b.Name
|
||||
+ manifests := []Manifest{
|
||||
+ {
|
||||
+ Name: "a",
|
||||
+ Head: &util.SimpleHead{Kind: "Namespace"},
|
||||
+ },
|
||||
+ {
|
||||
+ Name: "N",
|
||||
+ Head: &util.SimpleHead{Kind: "Unknown"},
|
||||
+ },
|
||||
+ }
|
||||
+ for _, test := range []struct {
|
||||
+ description string
|
||||
+ order SortOrder
|
||||
+ expected string
|
||||
+ }{
|
||||
+ // expectation is sorted by kind (unknown is last) and then sub sorted alphabetically within each group
|
||||
+ {"Namespace,Unknown", InstallOrder, "aN"},
|
||||
+ } {
|
||||
+ var buf bytes.Buffer
|
||||
+ t.Run(test.description, func(t *testing.T) {
|
||||
+
|
||||
+ defer buf.Reset()
|
||||
+ m := make([]Manifest, len(manifests))
|
||||
+ copy(m, manifests)
|
||||
+ for _, r := range sortByKind(m, test.order) {
|
||||
+ buf.WriteString(r.Name)
|
||||
+ }
|
||||
+ if got := buf.String(); got != test.expected {
|
||||
+ t.Errorf("Expected %q, got %q", test.expected, got)
|
||||
+ }
|
||||
+ })
|
||||
+ }
|
||||
+}
|
||||
@ -0,0 +1,152 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
EGO_PN="k8s.io/helm"
|
||||
|
||||
MY_PV=${PV/_rc/-rc.}
|
||||
|
||||
EGO_VENDOR=(
|
||||
"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
|
||||
"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
|
||||
"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
|
||||
"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
|
||||
"github.com/Azure/go-autorest bca49d5b51a50dc5bb17bbf6204c711c6dbded06"
|
||||
"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
|
||||
"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
|
||||
"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
|
||||
"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
|
||||
"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
|
||||
"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
|
||||
"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
|
||||
"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
|
||||
"github.com/docker/docker a9fbbdc8dd8794b20af358382ab780559bca589d"
|
||||
"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
|
||||
"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
|
||||
"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
|
||||
"github.com/evanphx/json-patch 36442dbdb585210f8d5a1b45e67aa323c197d5c4"
|
||||
"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
|
||||
"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
|
||||
"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
|
||||
"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
|
||||
"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
|
||||
"github.com/go-openapi/spec 1de3e0542de65ad8d75452a595886fdd0befb363"
|
||||
"github.com/go-openapi/swag f3f9494671f93fcff853e3c6e9e948b3eb71e590"
|
||||
"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
|
||||
"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
|
||||
"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
|
||||
"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
|
||||
"github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
|
||||
"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
|
||||
"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
|
||||
"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
|
||||
"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
|
||||
"github.com/gophercloud/gophercloud 781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d"
|
||||
"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
|
||||
"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
|
||||
"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
|
||||
"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
|
||||
"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
|
||||
"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
|
||||
"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
|
||||
"github.com/json-iterator/go f2b4162afba35581b6d4a50d3b8f34e33c144682"
|
||||
"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
|
||||
"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
|
||||
"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
|
||||
"github.com/Masterminds/sprig 15f9564e7e9cf0da02a48e0d25f12a7b83559aa6"
|
||||
"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
|
||||
"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
|
||||
"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
|
||||
"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
|
||||
"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
|
||||
"github.com/modern-go/reflect2 05fbef0ca5da472bbf96c9322b84a53edc03c9fd"
|
||||
"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
|
||||
"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
|
||||
"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
|
||||
"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
|
||||
"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
|
||||
"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
|
||||
"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
|
||||
"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
|
||||
"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
|
||||
"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
|
||||
"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
|
||||
"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
|
||||
"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
|
||||
"github.com/spf13/cobra fe5e611709b0c57fa4a89136deaa8e1d4004d053"
|
||||
"github.com/spf13/pflag 298182f68c66c05229eb03ac171abe6e309ee79a"
|
||||
"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
|
||||
"golang.org/x/crypto de0752318171da717af4ce24d0a2e8626afaeb11 github.com/golang/crypto"
|
||||
"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
|
||||
"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
|
||||
"golang.org/x/sys 95c6576299259db960f6c5b9b69ea52422860fce github.com/golang/sys"
|
||||
"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
|
||||
"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
|
||||
"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
|
||||
"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
|
||||
"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
|
||||
"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
|
||||
"gopkg.in/square/go-jose.v2 89060dee6a84df9a4dae49f676f0c755037834f1 github.com/square/go-jose"
|
||||
"gopkg.in/yaml.v2 670d4cfef0544295bc27a114dbac37980d83185a github.com/go-yaml/yaml"
|
||||
"k8s.io/api fd83cbc87e7632ccd8bbab63d2b673d4e0c631cc github.com/kubernetes/api"
|
||||
"k8s.io/apiextensions-apiserver 05e89e265cc594459a3d33a63e779d94e6614c63 github.com/kubernetes/apiextensions-apiserver"
|
||||
"k8s.io/apimachinery 6dd46049f39503a1fc8d65de4bd566829e95faff github.com/kubernetes/apimachinery"
|
||||
"k8s.io/apiserver e85ad7b666fef0476185731329f4cff1536efff8 github.com/kubernetes/apiserver"
|
||||
"k8s.io/client-go 1638f8970cefaa404ff3a62950f88b08292b2696 github.com/kubernetes/client-go"
|
||||
"k8s.io/cli-runtime 79bf4e0b64544d8c490247abae089bea572ddae6 github.com/kubernetes/cli-runtime"
|
||||
"k8s.io/kube-openapi 0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803 github.com/kubernetes/kube-openapi"
|
||||
"k8s.io/kubernetes 54a352dda957bce0f88e49b65a6ee8bba8c0ba74 github.com/kubernetes/kubernetes"
|
||||
"k8s.io/utils 66066c83e385e385ccc3c964b44fd7dcd413d0ed github.com/kubernetes/utils"
|
||||
"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
|
||||
)
|
||||
|
||||
inherit golang-build golang-vcs-snapshot bash-completion-r1
|
||||
|
||||
GIT_COMMIT="d325d2a9c179b33af1a024cdb5a4472b6288016a"
|
||||
|
||||
ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
|
||||
${EGO_VENDOR_URI}"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DESCRIPTION="Kubernetes Package Manager"
|
||||
HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
|
||||
SRC_URI="${ARCHIVE_URI}"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
pushd src/${EGO_PN} || die
|
||||
eapply "${FILESDIR}"/${P}-sorting.patch
|
||||
popd
|
||||
sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
|
||||
-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
|
||||
-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
|
||||
-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
|
||||
|
||||
rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
pushd src/${EGO_PN} || die
|
||||
GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
|
||||
GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
|
||||
go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
|
||||
popd || die
|
||||
bin/${PN} completion bash > ${PN}.bash || die
|
||||
bin/${PN} completion zsh > ${PN}.zsh || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
newbashcomp ${PN}.bash ${PN}
|
||||
insinto /usr/share/zsh/site-functions
|
||||
newins ${PN}.zsh _${PN}
|
||||
|
||||
dobin bin/${PN} bin/tiller
|
||||
dodoc src/${EGO_PN}/README.md
|
||||
}
|
||||
@ -1,8 +1,10 @@
|
||||
AUX ras-mc-ctl.openrc 295 BLAKE2B 8f6da9d6d4e392e4255ac70a57ece6e665771fc0f91c64506af6fd2157a5a4c159921ac341e66d18176434c523b6060c0cb2cabee6f7ca003e1896c0b6b6a266 SHA512 be635afaf5182907b4ae085d8c15b7aa6ae07e19a277423fe180a5e0524fa33747ceba8fe991cc263341b6c15443d3aff8f6c6c0311a87194687e25fa8387f32
|
||||
AUX ras-mc-ctl.openrc-r1 419 BLAKE2B 50239d64b95c1759a2fb88107b78875b9f6227c256c2a59628b33dfaf720c649e714afe24424f34e865d1fc46145daa8deda4e8612ef6c0d11ef1bf67b2c2e88 SHA512 f12c82432086bfdd0ee24a767b2c6dae9a50cb65038189bfdc2aff9447e5e734e1277d809ed3c7a55ac31034773983e1f46f466adabdd4e727b491c260c5c53e
|
||||
AUX rasdaemon.openrc 369 BLAKE2B 81768b9a6cdf4696d8598dc61675b86f617ae543cdfda8166f961d9ab470ba107165b72be32370f71f52b07503f3ea948cf9d7ad10c2899e2e9b79f1e06e96de SHA512 eb91a3c54033a136e5b35aa769b5c01a0810970e77efa3f9efbcda5cf088e5268fd7bd9fff953bc47b9233a41e5321094b4d2ef85500dc0175f5be6a64c03105
|
||||
AUX rasdaemon.openrc-r1 484 BLAKE2B dd64b1b6164f74e887ebff43116bd23311b86a7bbdf7830beb4ba27ad3e2db33e2107c7083c23f14e50e781a339e49be8a69ee902cfbc98713de034daa5a82a1 SHA512 e27c08bc118edd95468dd466aea52764df5b400ce9acf2043bd035d2fadbaa3b953794869c1fdaa23320e9529960e97c9e47dd31e8d8f3f48a324090f784907d
|
||||
DIST rasdaemon-0.6.1.tar.bz2 363201 BLAKE2B bdc7ec3c2e7e4b2fee02dddc55b5afd82df64717f45da15dbfd5fee87721b80ac425af5806ee7462cad29c6ab2953a2e649c4b1e455983d8821a1f633d76c85d SHA512 a221a7ea0e4555befbf8acb9d4ce22d5cc7861a0da458111a24905fa06be0e8f3b18d8de5334310a423657febc0532d2705236de89cb1788302bf487ede29f60
|
||||
DIST rasdaemon-0.6.2.tar.bz2 375140 BLAKE2B fd22185172777865120fbd13b7bfb5db9b9b0348fe8575ca6b5f16fd662c1e847729e239342b1c9ece70a4e79ad00352bb69d9f80cfbc8da2c961e68874dd03b SHA512 d8c1ee2cc801124837b3a0739f3016a206165306e300ce51e6aac2cef56bb65479f96cdb019ba3a5cffeba94e7b67ca22686d4ac94bfa8a8a1145db6ba51096b
|
||||
EBUILD rasdaemon-0.6.1-r1.ebuild 931 BLAKE2B fe6abb4a500f9890dbdcb06a457d7a33ab8b138fa22af2d4046ff133a9205a8f75c6e07273e4fb7eeadf3bf8a974e8fcea39e29c4b6d080a627d6619a4c2e5fa SHA512 02871f282b1b7a4f4601293974d7fbccc41ee7c90a590e6d349db20040bd1cbebb562c56acf8c0cbad37dd6e4e04ac0140f2d34e70f208b611b1cb73873a0f67
|
||||
EBUILD rasdaemon-0.6.2-r1.ebuild 1033 BLAKE2B f3a939268a9b34f730424f8d7af85c96e0240fb8ed3d6dd8b181bdc720b84622e41f2b2bb541a055dff70bda6f2e5c4952bf53bf68a328a7907b91ea47292892 SHA512 5837d47d13166bed48f89cbd10682550f4c3abd9e4c00d1757d432e9ece382c323e8cdc44b938770517f93a801b1eb2bf91ae93e034a9113f1d123e1f74bc338
|
||||
EBUILD rasdaemon-0.6.2-r2.ebuild 1131 BLAKE2B f03a234f6f9869f47c2326256f684ca6aacca40d59ce37873ecada548baa099fd31ea5f02b1f9ab5b9a2afaed271820d5d8d30c55fecc5eaecb5c822ff4af970 SHA512 cbabcd8ab873e17df665bf0580e5a32a3200ef70b1a32a89b81c2d887ddd08953fed910dac82e96adcbf74553ecd9465b30b275ee4f3c2b8298a6db5bdd78bbd
|
||||
EBUILD rasdaemon-0.6.2-r3.ebuild 1137 BLAKE2B a2402b26a92a0b9e6e6383c27d82e558bfe3f2737702ac3f0b2f57096f2eee6a6ca3ee9e8ab1fadab8366eca762a76d82ee02b783b39c35325b3a5af73f9f881 SHA512 490ed88bed969b3ab6a634bf3b04086b187a58deb39279911339f953f32da0618cb055b488b15996c011b4e681b338e640c162d2cf9a90c96fec47f409455e87
|
||||
MISC metadata.xml 871 BLAKE2B c9b484c2fd3019681f9c335fc046c7718c35bcafd9fa46f59328c68fb4404571818b861cb938bcb00fa08a164688a58735d7db27e73120597cd114a3a39acaba SHA512 1815bc3a92340071b40de8129441bbf55fee7edbec94f5337d6a9b42311cc3c1d898598d0756b60b56d804629700a2c0109362933acf5442a74097e752b24935
|
||||
|
||||
@ -0,0 +1,23 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
description="Loads Motherboard DIMM labels into EDAC driver"
|
||||
|
||||
depend() {
|
||||
keyword -stop
|
||||
need sysfs
|
||||
}
|
||||
|
||||
command="/usr/sbin/ras-mc-ctl"
|
||||
command_args="--register-labels"
|
||||
|
||||
start() {
|
||||
ebegin "Loading Motherboard DIMM labels into EDAC driver"
|
||||
"${command}" "${command_args}"
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
:
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
description="Starts Reliablity, Availability and Serviceability (RAS) service"
|
||||
|
||||
depend() {
|
||||
need localmount
|
||||
use logger
|
||||
}
|
||||
|
||||
command="/usr/sbin/rasdaemon"
|
||||
command_args="--foreground --record"
|
||||
command_background=true
|
||||
pidfile=/run/${RC_SVCNAME}.pid
|
||||
|
||||
|
||||
start_post() {
|
||||
"${command}" --enable >/dev/null 2>&1
|
||||
}
|
||||
|
||||
stop_post() {
|
||||
"${command}" --disable >/dev/null 2>&1
|
||||
}
|
||||
Binary file not shown.
@ -1,6 +1,8 @@
|
||||
AUX lbzip2-2.3-s_isreg.patch 500 BLAKE2B 7839d78d204c0b88ee68d728d1279dc2bc2e6222046cb28c60001c194513de7f3343dfb93d6db91bc4424fb639e2a1cbe428db1ff6753ec2c5b3c004a2b8f321 SHA512 3158763b364e8ba41b0fea03529c6e4a0c6f3d17e7d0ce796fc9a6f6bc7e70fa7db759dc205026818619e137fb6343cf21534014b64dbf07c1cdb3bc1059cc04
|
||||
AUX lbzip2-2.5-glibc-2.28.patch 2142 BLAKE2B 408be3d126974d745e596a5a2f7b61246ed76bd8765f5875ca114a7d4adacc38831093f01149249f6335dcf3463827b96df669b42c8b5ec27d6b658cbe7c9458 SHA512 38990970edf8fb9a18aa808c42e4208ff9fc2901cc9f24ef3c4dfdd963f29338aff3712186ebdab78d3d4a7dedd91cae636bb079e3ed8bb3fee561e23ecb4839
|
||||
DIST lbzip2-2.3.tar.gz 630226 BLAKE2B c08a7257eff859c0b7fb66ae638a57f837f1a2380c500c42ea65dc36e5650b30865d3c4c9820d6fed62bdbc4e3bdf7bae9e8bfe519897d9aac7f0c77cceacfb2 SHA512 4f694445cc90377bf8dac5046b952ff174db571f390c2d7b0aa001f73c76f3d3f048ff8e7297c2055ed1f7b210174496dc31d6628e1cbeff63146a36a442ad4c
|
||||
DIST lbzip2-2.5.tar.gz 651399 BLAKE2B a53fc34084ed16c0e78a9f084f68fc0bd1217245e9470ee023f0a4f5a1e2ae4e5866086f9fbc3ff7ec5654c595b4388d9eff495bc0228edbe0322bf9d1fd1f23 SHA512 76e96cfa75b3ed515b2f891349dffc1403daab2dd0a2a614fa0c811cec6ca25faa395da08ad68a9b6ba4069332c4571f70fb7424f06ef3d800c3082c08d7d3d7
|
||||
EBUILD lbzip2-2.3-r1.ebuild 806 BLAKE2B e396324e0fde98a11c66232506c5beac4a5fc24c43ff5ba9550e5408cdd53efffee000b6f03ab70ea7f50a7982a3c20e9ff92fde74dabb1513a3ddb7c35f67b0 SHA512 ce7cb5acd3357e7ad80c782c90c6decd8a9ff6041064988ceb454d559058c1f531c92a903324a2b0e64560119fae3f03f54c6c8fb9b00345382220b5c52338b7
|
||||
EBUILD lbzip2-2.5-r1.ebuild 841 BLAKE2B cb333de84433fe31e583c57b420a4ac59fe567a8f1298ab4c6818b64f748bacb58b45fcd620e712dbafb7a486950899e29539d9d1a4c646052d00f90137b0c83 SHA512 47bf271bf2fadf45d9db0f93c79101858811db1684d9d96978956a1d3c7b35dee3ce765fe6eb87a19ab081fac702446a3d09af0df5749ea271b89e65d240b904
|
||||
EBUILD lbzip2-2.5.ebuild 826 BLAKE2B c002af26958aa3d8e0cf2d2e6721e24afabd7080ff6680376828ad05c27e267307114ed096d876f74573cdeb35d35f913fd84c3b1154661c5c0a29e05c341877 SHA512 f63095d9320ab1ba66a8142b13592c5444e79315e1d765da3e47631df79e3b98ff6ab325725ab1dd00990c92190e05c9cc3d098b2b79340568435bd6033b03fa
|
||||
MISC metadata.xml 534 BLAKE2B e09b3c70d05c66c9edffa19cc3e52be55ecade605c97da4e2f4f6c930dd1ebb548ddb873d31c50c995c0493fd3329978db661796c43ae029a5db79ac0e1974f0 SHA512 86b03f188fb14168b7d2d6956fa2df4941d94c95ff00e6bfd27451fe76b9318dac477bdb13b6443ae0186837335d66cf3e52ddc4ccc2f2979e60fe287f5ac2b2
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
diff --git a/lib/fseterr.c b/lib/fseterr.c
|
||||
index 1e212e4..81f51ed 100644
|
||||
--- a/lib/fseterr.c
|
||||
+++ b/lib/fseterr.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/* Set the error indicator of a stream.
|
||||
- Copyright (C) 2007-2014 Free Software Foundation, Inc.
|
||||
+ Copyright (C) 2007-2018 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@@ -12,7 +12,7 @@
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
@@ -23,21 +23,26 @@
|
||||
|
||||
#include "stdio-impl.h"
|
||||
|
||||
+/* This file is not used on systems that have the __fseterr function,
|
||||
+ namely musl libc. */
|
||||
+
|
||||
void
|
||||
fseterr (FILE *fp)
|
||||
{
|
||||
/* Most systems provide FILE as a struct and the necessary bitmask in
|
||||
<stdio.h>, because they need it for implementing getc() and putc() as
|
||||
fast macros. */
|
||||
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
|
||||
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
|
||||
+ /* GNU libc, BeOS, Haiku, Linux libc5 */
|
||||
fp->_flags |= _IO_ERR_SEEN;
|
||||
-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
|
||||
+#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
|
||||
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
|
||||
fp_->_flags |= __SERR;
|
||||
#elif defined __EMX__ /* emx+gcc */
|
||||
fp->_flags |= _IOERR;
|
||||
#elif defined __minix /* Minix */
|
||||
fp->_flags |= _IOERR;
|
||||
-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
|
||||
+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
|
||||
fp_->_flag |= _IOERR;
|
||||
#elif defined __UCLIBC__ /* uClibc */
|
||||
fp->__modeflags |= __FLAG_ERROR;
|
||||
@ -0,0 +1,39 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DESCRIPTION="Parallel bzip2 utility"
|
||||
HOMEPAGE="https://github.com/kjn/lbzip2/"
|
||||
SRC_URI="http://archive.lbzip2.org/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
|
||||
IUSE="debug symlink"
|
||||
|
||||
RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
|
||||
DEPEND=""
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.3-s_isreg.patch
|
||||
# bug 669594
|
||||
"${FILESDIR}"/${PN}-2.5-glibc-2.28.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
--disable-silent-rules
|
||||
$(use_enable debug tracing)
|
||||
)
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
if use symlink; then
|
||||
dosym ${PN} /usr/bin/bzip2
|
||||
dosym lbunzip2 /usr/bin/bunzip2
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
@ -1,13 +1,8 @@
|
||||
AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
|
||||
DIST gnupg-1.4.21.tar.bz2 3689305 BLAKE2B 0c26c9c3aeae2bf2eafa858bc3bd15cc2702bce12a8a90938565322c34e2eeb8e5432932f5c9344a76aa4528b66051141536c062d9923a79d12a0767421bb017 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984
|
||||
DIST gnupg-2.2.10.tar.bz2 6659484 BLAKE2B d0270ca40bd70fe113fa4283c307d7d04370beec77ffba0abb7862defdab2d5a82b1508284961e30e7d0aab82bffdf09fe796741603e843a062073f179f0bfc2 SHA512 a4477828f268fa69125cf1822f8a721e67f8f4008bd9817b701989393bd93689aac8fee1f4d34d918911d53afabdcbb1c84d40e8a4489d7a29b5a769d330fddd
|
||||
DIST gnupg-2.2.11.tar.bz2 6652480 BLAKE2B 4118a9d4a9b42635850dad99d250f28bf1a15c046e17f6100c864a7ee2bfa4471b1deb0a1125805544b2ad29de36cb380cc2d309900374f01bb93db4dd977419 SHA512 8aa8beea877993b6eef155e1a503ffdde9963ff04a24e6a3dea7979efeeeeeab57e942a80ad46ef254d27a83e8cb2e3008da7749afa8e39eade190c0499f95d9
|
||||
DIST gnupg-2.2.8.tar.bz2 6632465 BLAKE2B e13bdfb2b17f87dd2122da5a489318bfcefec26c0fbb65dc6a36034314985bbd405cb22cfaf9bffa4c7928657cbc63d363f16b77d00bf86737b73c73ffbce4f2 SHA512 24271ec2663b941ed5e72e2179b48ac73d5cd838292aa9d4954952b11713f4b466f30e6af632b22c9e7c284350e300a07046d41d0ab73dcbd1639b303cd09007
|
||||
DIST gnupg-2.2.9.tar.bz2 6659547 BLAKE2B 3715fa0fcfbed24b0c985811c14e5a8c84caef0e66937ec7eb2ebefb4603a2c9a994d3c73224941254c685ca32cd83d7bb924fb7171ee569b346f2092ed7ae5d SHA512 96faf227bef78fee99ff20606f3ce74eddc407c3864b928f8676a80f50dfaf2dd291eaeeaa0d291a254275a87e4f8506df9ed31c1cfc7652999208c292a16922
|
||||
DIST gnupg-2.2.12.tar.bz2 6682303 BLAKE2B 8470ab8bf386d3524ce57ef1a1f6ac74d8cf2d7c35062b95c668b37586603c8e0817e410f4a0a807256e42896c11116897b7118b29e471184b2fa871ad4ba048 SHA512 30de9757bb60a5cb6bf0dc2c8da5f4742c54affec3fcd0bcbf66f28f2812149afec5db70dcb6ba592101de4bdc479d1ba0b47c53c8b8d4765ddff32fa51c26c8
|
||||
EBUILD gnupg-1.4.21.ebuild 3345 BLAKE2B 611a2e3c8d3a47337a17891ce9df00d0aca121f827169ea1aec9cb8c44b3f38858e1c8d39d08985f71790127bbbe64b16f0293b368d8dc627700fc1cc31983d7 SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257
|
||||
EBUILD gnupg-2.2.10-r2.ebuild 3663 BLAKE2B ebc41be08f922215079e5f6975972a75355d068099edcb885a0b04ce0cd72010502ced08cab2890b3f65b71820d9b45e76695a865079add2bab15090bffa03bc SHA512 7294ee0c840da055910a7f3430ad164a9f93d8ade7624ecbeb3ff88b9818e422eee6259d58b9d201601b834b654b3eeaa169dc3d8e16113af1e9b4a9a3f46092
|
||||
EBUILD gnupg-2.2.10.ebuild 3320 BLAKE2B 1309b03e28bd2d5af1f2caeedb145a0f3c0c87db1b78ee014d3938d1bafdf3d469885df8d3bd622f9cebc81ef706925d0a77e68a265bbaee93902cb0ea094f51 SHA512 26211aacc1393429fe7459b58e1aa735e4cc1c278d7fcc774547fd9ada7adeaf35d297c65ca51ca927f6d304ffe8c78d874762c8649fc01e9dd259b2b2f52cda
|
||||
EBUILD gnupg-2.2.11.ebuild 3663 BLAKE2B ebc41be08f922215079e5f6975972a75355d068099edcb885a0b04ce0cd72010502ced08cab2890b3f65b71820d9b45e76695a865079add2bab15090bffa03bc SHA512 7294ee0c840da055910a7f3430ad164a9f93d8ade7624ecbeb3ff88b9818e422eee6259d58b9d201601b834b654b3eeaa169dc3d8e16113af1e9b4a9a3f46092
|
||||
EBUILD gnupg-2.2.8.ebuild 3197 BLAKE2B 047ced194ad1467cdd5ade6f747b200aff373e5cbee4ae4ac17a113c4c1df5176abdb2658808c3bf00682dc08a42cca4c84c704016b682a8782521bf52783f4c SHA512 99bda452847ef64c1727b31d406034ad69da164355d18d36eefa7744f25cc2376abbf4dcc72b919884881b49cfdf27c8149c513c63c58467d4eb478d1db10fd7
|
||||
EBUILD gnupg-2.2.9.ebuild 3334 BLAKE2B b59f061776948cacfcf4b0e7e348a66e2d8ae8fbb1ec3b906afc98944b9e3a92f35db13b8befb42194cdb71f2eebbf8a2e04ee9ec511aa73a5934d7996f1932e SHA512 7a8db6bfb393b88a60331ebdc3892f3b8175824adcf02338972084a6f272231bba783ff7394d02696471d962dc4298595d110c9f5b6127b6d8bedc00f1784c0a
|
||||
EBUILD gnupg-2.2.12.ebuild 3663 BLAKE2B ebc41be08f922215079e5f6975972a75355d068099edcb885a0b04ce0cd72010502ced08cab2890b3f65b71820d9b45e76695a865079add2bab15090bffa03bc SHA512 7294ee0c840da055910a7f3430ad164a9f93d8ade7624ecbeb3ff88b9818e422eee6259d58b9d201601b834b654b3eeaa169dc3d8e16113af1e9b4a9a3f46092
|
||||
MISC metadata.xml 1313 BLAKE2B 2bf26407bdea8af215d09d28640b961ee98c86c297595736fbe477c8b9cfaf0f8970982ce22038dabf0d8529e39032a3fec9da0c17a5acca0cf3cb197f31f1c0 SHA512 0500f03936eba67706cea87c1f5b16db280b159fc31780b93e696e8ab20e3dece90f0bd80af5aa9582cab557cc337c65e8e101daa935ba6ca31b7f126328c0ac
|
||||
|
||||
@ -1,136 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit flag-o-matic systemd toolchain-funcs
|
||||
|
||||
MY_P="${P/_/-}"
|
||||
|
||||
DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
|
||||
HOMEPAGE="http://www.gnupg.org/"
|
||||
SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
|
||||
|
||||
# Existence of executables is checked during configuration.
|
||||
DEPEND="!app-crypt/dirmngr
|
||||
>=dev-libs/libassuan-2.5.0
|
||||
>=dev-libs/libgcrypt-1.7.3
|
||||
>=dev-libs/libgpg-error-1.28
|
||||
>=dev-libs/libksba-1.3.4
|
||||
>=dev-libs/npth-1.2
|
||||
>=net-misc/curl-7.10
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
ldap? ( net-nds/openldap )
|
||||
readline? ( sys-libs/readline:0= )
|
||||
smartcard? ( usb? ( virtual/libusb:0 ) )
|
||||
ssl? ( >=net-libs/gnutls-3.0:0= )
|
||||
sys-libs/zlib
|
||||
tofu? ( >=dev-db/sqlite-3.7 )
|
||||
virtual/mta"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
app-crypt/pinentry
|
||||
nls? ( virtual/libintl )
|
||||
selinux? ( sec-policy/selinux-gpg )"
|
||||
|
||||
BDEPEND="virtual/pkgconfig
|
||||
doc? ( sys-apps/texinfo )
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
DOCS=(
|
||||
ChangeLog NEWS README THANKS TODO VERSION
|
||||
doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local myconf=()
|
||||
|
||||
if use prefix && use usb; then
|
||||
# bug #649598
|
||||
append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
|
||||
fi
|
||||
|
||||
if use elibc_SunOS || use elibc_AIX; then
|
||||
myconf+=( --disable-symcryptrun )
|
||||
else
|
||||
myconf+=( --enable-symcryptrun )
|
||||
fi
|
||||
|
||||
#bug 663142
|
||||
if use user-socket; then
|
||||
myconf+=( --enable-run-gnupg-user-socket )
|
||||
fi
|
||||
|
||||
# glib fails and picks up clang's internal stdint.h causing weird errors
|
||||
[[ ${CC} == *clang ]] && \
|
||||
export gl_cv_absolute_stdint_h=/usr/include/stdint.h
|
||||
|
||||
econf \
|
||||
"${myconf[@]}" \
|
||||
$(use_enable bzip2) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable smartcard scdaemon) \
|
||||
$(use_enable ssl gnutls) \
|
||||
$(use_enable tofu) \
|
||||
$(use_enable usb ccid-driver) \
|
||||
$(use_enable wks-server wks-tools) \
|
||||
$(use_with ldap) \
|
||||
$(use_with readline) \
|
||||
--disable-ntbtls \
|
||||
--enable-all-tests \
|
||||
--enable-gpg \
|
||||
--enable-gpgsm \
|
||||
--enable-large-secmem \
|
||||
CC_FOR_BUILD="$(tc-getBUILD_CC)" \
|
||||
GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
|
||||
KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
|
||||
LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
|
||||
LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
|
||||
NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
|
||||
$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
|
||||
use doc && emake -C doc html
|
||||
}
|
||||
|
||||
src_test() {
|
||||
#Bug: 638574
|
||||
use tofu && export TESTFLAGS=--parallel
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
use tools &&
|
||||
dobin \
|
||||
tools/{convert-from-106,gpg-check-pattern} \
|
||||
tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
|
||||
tools/make-dns-cert
|
||||
|
||||
dosym gpg /usr/bin/gpg2
|
||||
dosym gpgv /usr/bin/gpgv2
|
||||
echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
|
||||
echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
|
||||
|
||||
dodir /etc/env.d
|
||||
echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
|
||||
|
||||
use doc && dodoc doc/gnupg.html/* doc/*.png
|
||||
|
||||
systemd_douserunit doc/examples/systemd-user/*.{service,socket}
|
||||
}
|
||||
@ -1,130 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit systemd toolchain-funcs
|
||||
|
||||
MY_P="${P/_/-}"
|
||||
|
||||
DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
|
||||
HOMEPAGE="http://www.gnupg.org/"
|
||||
SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
|
||||
|
||||
COMMON_DEPEND_LIBS="
|
||||
>=dev-libs/npth-1.2
|
||||
>=dev-libs/libassuan-2.5.0
|
||||
>=dev-libs/libgcrypt-1.7.3
|
||||
>=dev-libs/libgpg-error-1.28
|
||||
>=dev-libs/libksba-1.3.4
|
||||
>=net-misc/curl-7.10
|
||||
ssl? ( >=net-libs/gnutls-3.0:0= )
|
||||
sys-libs/zlib
|
||||
ldap? ( net-nds/openldap )
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
readline? ( sys-libs/readline:0= )
|
||||
smartcard? ( usb? ( virtual/libusb:0 ) )
|
||||
tofu? ( >=dev-db/sqlite-3.7 )
|
||||
virtual/mta
|
||||
"
|
||||
COMMON_DEPEND_BINS="app-crypt/pinentry
|
||||
!app-crypt/dirmngr"
|
||||
|
||||
# Existence of executables is checked during configuration.
|
||||
DEPEND="${COMMON_DEPEND_LIBS}
|
||||
${COMMON_DEPEND_BINS}
|
||||
nls? ( sys-devel/gettext )
|
||||
doc? ( sys-apps/texinfo )"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND_LIBS}
|
||||
${COMMON_DEPEND_BINS}
|
||||
selinux? ( sec-policy/selinux-gpg )
|
||||
nls? ( virtual/libintl )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
DOCS=(
|
||||
ChangeLog NEWS README THANKS TODO VERSION
|
||||
doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local myconf=()
|
||||
|
||||
if use smartcard; then
|
||||
myconf+=(
|
||||
--enable-scdaemon
|
||||
$(use_enable usb ccid-driver)
|
||||
)
|
||||
else
|
||||
myconf+=( --disable-scdaemon )
|
||||
fi
|
||||
|
||||
if use elibc_SunOS || use elibc_AIX; then
|
||||
myconf+=( --disable-symcryptrun )
|
||||
else
|
||||
myconf+=( --enable-symcryptrun )
|
||||
fi
|
||||
|
||||
# glib fails and picks up clang's internal stdint.h causing weird errors
|
||||
[[ ${CC} == *clang ]] && \
|
||||
export gl_cv_absolute_stdint_h=/usr/include/stdint.h
|
||||
|
||||
econf \
|
||||
"${myconf[@]}" \
|
||||
$(use_enable bzip2) \
|
||||
$(use_enable ssl gnutls) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable tofu) \
|
||||
$(use_enable wks-server wks-tools) \
|
||||
$(use_with ldap) \
|
||||
$(use_with readline) \
|
||||
--enable-gpg \
|
||||
--enable-gpgsm \
|
||||
--enable-large-secmem \
|
||||
--enable-all-tests \
|
||||
CC_FOR_BUILD="$(tc-getBUILD_CC)"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
|
||||
use doc && emake -C doc html
|
||||
}
|
||||
|
||||
src_test() {
|
||||
#Bug: 638574
|
||||
use tofu && export TESTFLAGS=--parallel
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
use tools &&
|
||||
dobin \
|
||||
tools/{convert-from-106,gpg-check-pattern} \
|
||||
tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
|
||||
tools/make-dns-cert
|
||||
|
||||
dosym gpg /usr/bin/gpg2
|
||||
dosym gpgv /usr/bin/gpgv2
|
||||
echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
|
||||
echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
|
||||
|
||||
dodir /etc/env.d
|
||||
echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
|
||||
|
||||
use doc && dodoc doc/gnupg.html/* doc/*.png
|
||||
|
||||
systemd_douserunit doc/examples/systemd-user/*.{service,socket}
|
||||
}
|
||||
@ -1,134 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit flag-o-matic systemd toolchain-funcs
|
||||
|
||||
MY_P="${P/_/-}"
|
||||
|
||||
DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
|
||||
HOMEPAGE="http://www.gnupg.org/"
|
||||
SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
|
||||
|
||||
COMMON_DEPEND_LIBS="
|
||||
>=dev-libs/npth-1.2
|
||||
>=dev-libs/libassuan-2.5.0
|
||||
>=dev-libs/libgcrypt-1.7.3
|
||||
>=dev-libs/libgpg-error-1.28
|
||||
>=dev-libs/libksba-1.3.4
|
||||
>=net-misc/curl-7.10
|
||||
ssl? ( >=net-libs/gnutls-3.0:0= )
|
||||
sys-libs/zlib
|
||||
ldap? ( net-nds/openldap )
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
readline? ( sys-libs/readline:0= )
|
||||
smartcard? ( usb? ( virtual/libusb:0 ) )
|
||||
tofu? ( >=dev-db/sqlite-3.7 )
|
||||
virtual/mta
|
||||
"
|
||||
COMMON_DEPEND_BINS="app-crypt/pinentry
|
||||
!app-crypt/dirmngr"
|
||||
|
||||
# Existence of executables is checked during configuration.
|
||||
DEPEND="${COMMON_DEPEND_LIBS}
|
||||
${COMMON_DEPEND_BINS}
|
||||
nls? ( sys-devel/gettext )
|
||||
doc? ( sys-apps/texinfo )"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND_LIBS}
|
||||
${COMMON_DEPEND_BINS}
|
||||
selinux? ( sec-policy/selinux-gpg )
|
||||
nls? ( virtual/libintl )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
DOCS=(
|
||||
ChangeLog NEWS README THANKS TODO VERSION
|
||||
doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local myconf=()
|
||||
|
||||
if use smartcard; then
|
||||
myconf+=(
|
||||
--enable-scdaemon
|
||||
$(use_enable usb ccid-driver)
|
||||
)
|
||||
if use prefix && use usb ; then
|
||||
# bug #649598
|
||||
append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
|
||||
fi
|
||||
else
|
||||
myconf+=( --disable-scdaemon )
|
||||
fi
|
||||
|
||||
if use elibc_SunOS || use elibc_AIX; then
|
||||
myconf+=( --disable-symcryptrun )
|
||||
else
|
||||
myconf+=( --enable-symcryptrun )
|
||||
fi
|
||||
|
||||
# glib fails and picks up clang's internal stdint.h causing weird errors
|
||||
[[ ${CC} == *clang ]] && \
|
||||
export gl_cv_absolute_stdint_h=/usr/include/stdint.h
|
||||
|
||||
econf \
|
||||
"${myconf[@]}" \
|
||||
$(use_enable bzip2) \
|
||||
$(use_enable ssl gnutls) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable tofu) \
|
||||
$(use_enable wks-server wks-tools) \
|
||||
$(use_with ldap) \
|
||||
$(use_with readline) \
|
||||
--enable-gpg \
|
||||
--enable-gpgsm \
|
||||
--enable-large-secmem \
|
||||
--enable-all-tests \
|
||||
CC_FOR_BUILD="$(tc-getBUILD_CC)"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
|
||||
use doc && emake -C doc html
|
||||
}
|
||||
|
||||
src_test() {
|
||||
#Bug: 638574
|
||||
use tofu && export TESTFLAGS=--parallel
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
use tools &&
|
||||
dobin \
|
||||
tools/{convert-from-106,gpg-check-pattern} \
|
||||
tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
|
||||
tools/make-dns-cert
|
||||
|
||||
dosym gpg /usr/bin/gpg2
|
||||
dosym gpgv /usr/bin/gpgv2
|
||||
echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
|
||||
echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
|
||||
|
||||
dodir /etc/env.d
|
||||
echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
|
||||
|
||||
use doc && dodoc doc/gnupg.html/* doc/*.png
|
||||
|
||||
systemd_douserunit doc/examples/systemd-user/*.{service,socket}
|
||||
}
|
||||
@ -0,0 +1,161 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd
|
||||
|
||||
MY_P="${P/mit-}"
|
||||
P_DIR=$(ver_cut 1-2)
|
||||
DESCRIPTION="MIT Kerberos V"
|
||||
HOMEPAGE="https://web.mit.edu/kerberos/www/"
|
||||
SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="cpu_flags_x86_aes doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
|
||||
|
||||
# Test suite require network access
|
||||
RESTRICT="test"
|
||||
|
||||
CDEPEND="
|
||||
!!app-crypt/heimdal
|
||||
>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
|
||||
|| (
|
||||
>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
|
||||
>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
|
||||
>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
|
||||
)
|
||||
keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
|
||||
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
|
||||
openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
|
||||
pkinit? (
|
||||
!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
|
||||
libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
|
||||
)
|
||||
xinetd? ( sys-apps/xinetd )
|
||||
"
|
||||
DEPEND="${CDEPEND}
|
||||
${PYTHON_DEPS}
|
||||
virtual/yacc
|
||||
cpu_flags_x86_aes? (
|
||||
amd64? ( dev-lang/yasm )
|
||||
x86? ( dev-lang/yasm )
|
||||
)
|
||||
doc? ( virtual/latex-base )
|
||||
test? (
|
||||
${PYTHON_DEPS}
|
||||
dev-lang/tcl:0
|
||||
dev-util/dejagnu
|
||||
dev-util/cmocka
|
||||
)"
|
||||
RDEPEND="${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-kerberos )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}/src
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/krb5-config
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
|
||||
eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
|
||||
eapply "${FILESDIR}/${PN}-libressl-version-check.patch"
|
||||
|
||||
# Make sure we always use the system copies.
|
||||
rm -rf util/{et,ss,verto}
|
||||
sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
|
||||
|
||||
eapply_user
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# QA
|
||||
append-flags -fno-strict-aliasing
|
||||
append-flags -fno-strict-overflow
|
||||
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
use keyutils || export ac_cv_header_keyutils_h=no
|
||||
ECONF_SOURCE=${S} \
|
||||
WARN_CFLAGS="set" \
|
||||
econf \
|
||||
$(use_with openldap ldap) \
|
||||
"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
|
||||
$(use_enable nls) \
|
||||
$(use_enable pkinit) \
|
||||
$(use_enable threads thread-support) \
|
||||
--without-hesiod \
|
||||
--enable-shared \
|
||||
--with-system-et \
|
||||
--with-system-ss \
|
||||
--enable-dns-for-realm \
|
||||
--enable-kdc-lookaside-cache \
|
||||
--with-system-verto \
|
||||
--disable-rpath
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake -j1
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
multilib_is_native_abi && emake -j1 check
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
|
||||
install
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
# default database dir
|
||||
keepdir /var/lib/krb5kdc
|
||||
|
||||
rmdir "${ED}"/var/lib/{run/krb5kdc,run}
|
||||
|
||||
cd ..
|
||||
dodoc README
|
||||
|
||||
if use doc; then
|
||||
dodoc -r doc/html
|
||||
docinto pdf
|
||||
dodoc doc/pdf/*.pdf
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
|
||||
newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
|
||||
newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
|
||||
newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
|
||||
newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
|
||||
newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
|
||||
|
||||
systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
|
||||
systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
|
||||
systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
|
||||
systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
|
||||
systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
|
||||
|
||||
insinto /etc
|
||||
newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
|
||||
insinto /var/lib/krb5kdc
|
||||
newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
|
||||
|
||||
if use openldap ; then
|
||||
insinto /etc/openldap/schema
|
||||
doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
|
||||
fi
|
||||
|
||||
if use xinetd ; then
|
||||
insinto /etc/xinetd.d
|
||||
newins "${FILESDIR}/kpropd.xinetd" kpropd
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,47 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
inherit golang-vcs-snapshot systemd user
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
EGO_PN="github.com/docker/distribution"
|
||||
EGIT_COMMIT="v${PV}"
|
||||
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||
DESCRIPTION="Docker Registry 2.0"
|
||||
HOMEPAGE="https://github.com/docker/distribution"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
SVCNAME=registry
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup ${SVCNAME}
|
||||
enewuser ${SVCNAME} -1 -1 /dev/null ${SVCNAME}
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
pushd src/${EGO_PN} || die
|
||||
eapply "${FILESDIR}"/${P}-notification-metrics.patch
|
||||
popd || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
GOPATH="${S}" \
|
||||
go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/..." || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
exeinto /usr/libexec/${PN}
|
||||
doexe bin/*
|
||||
insinto /etc/docker/registry
|
||||
newins src/${EGO_PN}/cmd/registry/config-example.yml config.yml.example
|
||||
newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
|
||||
newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
|
||||
systemd_dounit "${FILESDIR}/${SVCNAME}.service"
|
||||
keepdir /var/{lib,log}/${SVCNAME}
|
||||
fowners ${SVCNAME}:${SVCNAME} /var/{lib,log}/${SVCNAME}
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
|
||||
}
|
||||
@ -0,0 +1,398 @@
|
||||
From 7b2292ee20c5d49053cc5262dfbc99ce121b9b74 Mon Sep 17 00:00:00 2001
|
||||
From: tifayuki <tifayuki@gmail.com>
|
||||
Date: Tue, 13 Feb 2018 13:30:56 -0800
|
||||
Subject: [PATCH 1/4] Add notification metrics
|
||||
|
||||
It adds notification related prometheus metrics, including:
|
||||
- total count for events/success/failure/error
|
||||
- total count for notification per each status code
|
||||
- gauge of the pending notification queue
|
||||
|
||||
Signed-off-by: tifayuki <tifayuki@gmail.com>
|
||||
---
|
||||
metrics/prometheus.go | 3 +++
|
||||
notifications/metrics.go | 28 ++++++++++++++++++++++++++++
|
||||
2 files changed, 31 insertions(+)
|
||||
|
||||
diff --git a/metrics/prometheus.go b/metrics/prometheus.go
|
||||
index b5a532144..91b32b23d 100644
|
||||
--- a/metrics/prometheus.go
|
||||
+++ b/metrics/prometheus.go
|
||||
@@ -10,4 +10,7 @@ const (
|
||||
var (
|
||||
// StorageNamespace is the prometheus namespace of blob/cache related operations
|
||||
StorageNamespace = metrics.NewNamespace(NamespacePrefix, "storage", nil)
|
||||
+
|
||||
+ // NotificationsNamespace is the prometheus namespace of notification related metrics
|
||||
+ NotificationsNamespace = metrics.NewNamespace(NamespacePrefix, "notifications", nil)
|
||||
)
|
||||
diff --git a/notifications/metrics.go b/notifications/metrics.go
|
||||
index a20af1687..69960e9cb 100644
|
||||
--- a/notifications/metrics.go
|
||||
+++ b/notifications/metrics.go
|
||||
@@ -5,6 +5,18 @@ import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"sync"
|
||||
+
|
||||
+ prometheus "github.com/docker/distribution/metrics"
|
||||
+ "github.com/docker/go-metrics"
|
||||
+)
|
||||
+
|
||||
+var (
|
||||
+ // eventsCounter counts total events of incoming, success, failure, and errors
|
||||
+ eventsCounter = prometheus.NotificationsNamespace.NewLabeledCounter("events", "The number of total events", "type")
|
||||
+ // pendingGauge measures the pending queue size
|
||||
+ pendingGauge = prometheus.NotificationsNamespace.NewGauge("pending", "The gauge of pending events in queue", metrics.Total)
|
||||
+ // statusCounter counts the total notification call per each status code
|
||||
+ statusCounter = prometheus.NotificationsNamespace.NewLabeledCounter("status", "The number of status code", "code")
|
||||
)
|
||||
|
||||
// EndpointMetrics track various actions taken by the endpoint, typically by
|
||||
@@ -61,6 +73,9 @@ func (emsl *endpointMetricsHTTPStatusListener) success(status int, events ...Eve
|
||||
defer emsl.safeMetrics.Unlock()
|
||||
emsl.Statuses[fmt.Sprintf("%d %s", status, http.StatusText(status))] += len(events)
|
||||
emsl.Successes += len(events)
|
||||
+
|
||||
+ statusCounter.WithValues(fmt.Sprintf("%d %s", status, http.StatusText(status))).Inc(1)
|
||||
+ eventsCounter.WithValues("Successes").Inc(1)
|
||||
}
|
||||
|
||||
func (emsl *endpointMetricsHTTPStatusListener) failure(status int, events ...Event) {
|
||||
@@ -68,12 +83,17 @@ func (emsl *endpointMetricsHTTPStatusListener) failure(status int, events ...Eve
|
||||
defer emsl.safeMetrics.Unlock()
|
||||
emsl.Statuses[fmt.Sprintf("%d %s", status, http.StatusText(status))] += len(events)
|
||||
emsl.Failures += len(events)
|
||||
+
|
||||
+ statusCounter.WithValues(fmt.Sprintf("%d %s", status, http.StatusText(status))).Inc(1)
|
||||
+ eventsCounter.WithValues("Failures").Inc(1)
|
||||
}
|
||||
|
||||
func (emsl *endpointMetricsHTTPStatusListener) err(err error, events ...Event) {
|
||||
emsl.safeMetrics.Lock()
|
||||
defer emsl.safeMetrics.Unlock()
|
||||
emsl.Errors += len(events)
|
||||
+
|
||||
+ eventsCounter.WithValues("Errors").Inc(1)
|
||||
}
|
||||
|
||||
// endpointMetricsEventQueueListener maintains the incoming events counter and
|
||||
@@ -87,12 +107,17 @@ func (eqc *endpointMetricsEventQueueListener) ingress(events ...Event) {
|
||||
defer eqc.Unlock()
|
||||
eqc.Events += len(events)
|
||||
eqc.Pending += len(events)
|
||||
+
|
||||
+ eventsCounter.WithValues("Events").Inc()
|
||||
+ pendingGauge.Inc(1)
|
||||
}
|
||||
|
||||
func (eqc *endpointMetricsEventQueueListener) egress(events ...Event) {
|
||||
eqc.Lock()
|
||||
defer eqc.Unlock()
|
||||
eqc.Pending -= len(events)
|
||||
+
|
||||
+ pendingGauge.Dec(1)
|
||||
}
|
||||
|
||||
// endpoints is global registry of endpoints used to report metrics to expvar
|
||||
@@ -149,4 +174,7 @@ func init() {
|
||||
}))
|
||||
|
||||
registry.(*expvar.Map).Set("notifications", ¬ifications)
|
||||
+
|
||||
+ // register prometheus metrics
|
||||
+ metrics.Register(prometheus.NotificationsNamespace)
|
||||
}
|
||||
|
||||
From 4497e40eda1e0024f055c09ab480b7816a1147b1 Mon Sep 17 00:00:00 2001
|
||||
From: Honglin Feng <tifayuki@gmail.com>
|
||||
Date: Thu, 11 Oct 2018 21:39:02 +0800
|
||||
Subject: [PATCH 2/4] add label to the metrics
|
||||
|
||||
Signed-off-by: Honglin Feng <tifayuki@gmail.com>
|
||||
---
|
||||
notifications/endpoint.go | 2 +-
|
||||
notifications/http_test.go | 2 +-
|
||||
notifications/metrics.go | 26 ++++++++++++++------------
|
||||
notifications/sinks_test.go | 2 +-
|
||||
4 files changed, 17 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/notifications/endpoint.go b/notifications/endpoint.go
|
||||
index a8a52d0c9..854f1dd6c 100644
|
||||
--- a/notifications/endpoint.go
|
||||
+++ b/notifications/endpoint.go
|
||||
@@ -58,7 +58,7 @@ func NewEndpoint(name, url string, config EndpointConfig) *Endpoint {
|
||||
endpoint.url = url
|
||||
endpoint.EndpointConfig = config
|
||||
endpoint.defaults()
|
||||
- endpoint.metrics = newSafeMetrics()
|
||||
+ endpoint.metrics = newSafeMetrics(name)
|
||||
|
||||
// Configures the inmemory queue, retry, http pipeline.
|
||||
endpoint.Sink = newHTTPSink(
|
||||
diff --git a/notifications/http_test.go b/notifications/http_test.go
|
||||
index de47f789e..b7845cf95 100644
|
||||
--- a/notifications/http_test.go
|
||||
+++ b/notifications/http_test.go
|
||||
@@ -63,7 +63,7 @@ func TestHTTPSink(t *testing.T) {
|
||||
})
|
||||
server := httptest.NewTLSServer(serverHandler)
|
||||
|
||||
- metrics := newSafeMetrics()
|
||||
+ metrics := newSafeMetrics("")
|
||||
sink := newHTTPSink(server.URL, 0, nil, nil,
|
||||
&endpointMetricsHTTPStatusListener{safeMetrics: metrics})
|
||||
|
||||
diff --git a/notifications/metrics.go b/notifications/metrics.go
|
||||
index 69960e9cb..4464edd8f 100644
|
||||
--- a/notifications/metrics.go
|
||||
+++ b/notifications/metrics.go
|
||||
@@ -12,11 +12,11 @@ import (
|
||||
|
||||
var (
|
||||
// eventsCounter counts total events of incoming, success, failure, and errors
|
||||
- eventsCounter = prometheus.NotificationsNamespace.NewLabeledCounter("events", "The number of total events", "type")
|
||||
+ eventsCounter = prometheus.NotificationsNamespace.NewLabeledCounter("events", "The number of total events", "type", "to")
|
||||
// pendingGauge measures the pending queue size
|
||||
- pendingGauge = prometheus.NotificationsNamespace.NewGauge("pending", "The gauge of pending events in queue", metrics.Total)
|
||||
+ pendingGauge = prometheus.NotificationsNamespace.NewLabeledGauge("pending", "The gauge of pending events in queue", metrics.Total, "to")
|
||||
// statusCounter counts the total notification call per each status code
|
||||
- statusCounter = prometheus.NotificationsNamespace.NewLabeledCounter("status", "The number of status code", "code")
|
||||
+ statusCounter = prometheus.NotificationsNamespace.NewLabeledCounter("status", "The number of status code", "code", "to")
|
||||
)
|
||||
|
||||
// EndpointMetrics track various actions taken by the endpoint, typically by
|
||||
@@ -34,14 +34,16 @@ type EndpointMetrics struct {
|
||||
// safeMetrics guards the metrics implementation with a lock and provides a
|
||||
// safe update function.
|
||||
type safeMetrics struct {
|
||||
+ EndpointName string
|
||||
EndpointMetrics
|
||||
sync.Mutex // protects statuses map
|
||||
}
|
||||
|
||||
// newSafeMetrics returns safeMetrics with map allocated.
|
||||
-func newSafeMetrics() *safeMetrics {
|
||||
+func newSafeMetrics(name string) *safeMetrics {
|
||||
var sm safeMetrics
|
||||
sm.Statuses = make(map[string]int)
|
||||
+ sm.EndpointName = name
|
||||
return &sm
|
||||
}
|
||||
|
||||
@@ -74,8 +76,8 @@ func (emsl *endpointMetricsHTTPStatusListener) success(status int, events ...Eve
|
||||
emsl.Statuses[fmt.Sprintf("%d %s", status, http.StatusText(status))] += len(events)
|
||||
emsl.Successes += len(events)
|
||||
|
||||
- statusCounter.WithValues(fmt.Sprintf("%d %s", status, http.StatusText(status))).Inc(1)
|
||||
- eventsCounter.WithValues("Successes").Inc(1)
|
||||
+ statusCounter.WithValues(fmt.Sprintf("%d %s", status, http.StatusText(status)), emsl.EndpointName).Inc(1)
|
||||
+ eventsCounter.WithValues("Successes", emsl.EndpointName).Inc(1)
|
||||
}
|
||||
|
||||
func (emsl *endpointMetricsHTTPStatusListener) failure(status int, events ...Event) {
|
||||
@@ -84,8 +86,8 @@ func (emsl *endpointMetricsHTTPStatusListener) failure(status int, events ...Eve
|
||||
emsl.Statuses[fmt.Sprintf("%d %s", status, http.StatusText(status))] += len(events)
|
||||
emsl.Failures += len(events)
|
||||
|
||||
- statusCounter.WithValues(fmt.Sprintf("%d %s", status, http.StatusText(status))).Inc(1)
|
||||
- eventsCounter.WithValues("Failures").Inc(1)
|
||||
+ statusCounter.WithValues(fmt.Sprintf("%d %s", status, http.StatusText(status)), emsl.EndpointName).Inc(1)
|
||||
+ eventsCounter.WithValues("Failures", emsl.EndpointName).Inc(1)
|
||||
}
|
||||
|
||||
func (emsl *endpointMetricsHTTPStatusListener) err(err error, events ...Event) {
|
||||
@@ -93,7 +95,7 @@ func (emsl *endpointMetricsHTTPStatusListener) err(err error, events ...Event) {
|
||||
defer emsl.safeMetrics.Unlock()
|
||||
emsl.Errors += len(events)
|
||||
|
||||
- eventsCounter.WithValues("Errors").Inc(1)
|
||||
+ eventsCounter.WithValues("Errors", emsl.EndpointName).Inc(1)
|
||||
}
|
||||
|
||||
// endpointMetricsEventQueueListener maintains the incoming events counter and
|
||||
@@ -108,8 +110,8 @@ func (eqc *endpointMetricsEventQueueListener) ingress(events ...Event) {
|
||||
eqc.Events += len(events)
|
||||
eqc.Pending += len(events)
|
||||
|
||||
- eventsCounter.WithValues("Events").Inc()
|
||||
- pendingGauge.Inc(1)
|
||||
+ eventsCounter.WithValues("Events", eqc.EndpointName).Inc()
|
||||
+ pendingGauge.WithValues(eqc.EndpointName).Inc(1)
|
||||
}
|
||||
|
||||
func (eqc *endpointMetricsEventQueueListener) egress(events ...Event) {
|
||||
@@ -117,7 +119,7 @@ func (eqc *endpointMetricsEventQueueListener) egress(events ...Event) {
|
||||
defer eqc.Unlock()
|
||||
eqc.Pending -= len(events)
|
||||
|
||||
- pendingGauge.Dec(1)
|
||||
+ pendingGauge.WithValues(eqc.EndpointName).Dec(1)
|
||||
}
|
||||
|
||||
// endpoints is global registry of endpoints used to report metrics to expvar
|
||||
diff --git a/notifications/sinks_test.go b/notifications/sinks_test.go
|
||||
index 06f88b2c9..4a69486b5 100644
|
||||
--- a/notifications/sinks_test.go
|
||||
+++ b/notifications/sinks_test.go
|
||||
@@ -66,7 +66,7 @@ func TestBroadcaster(t *testing.T) {
|
||||
func TestEventQueue(t *testing.T) {
|
||||
const nevents = 1000
|
||||
var ts testSink
|
||||
- metrics := newSafeMetrics()
|
||||
+ metrics := newSafeMetrics("")
|
||||
eq := newEventQueue(
|
||||
// delayed sync simulates destination slower than channel comms
|
||||
&delayedSink{
|
||||
|
||||
From 73e4232b5171c2988b0daeea517aa07386e7945d Mon Sep 17 00:00:00 2001
|
||||
From: Honglin Feng <tifayuki@gmail.com>
|
||||
Date: Mon, 15 Oct 2018 19:50:38 +0800
|
||||
Subject: [PATCH 3/4] run go fmt
|
||||
|
||||
Signed-off-by: Honglin Feng <tifayuki@gmail.com>
|
||||
---
|
||||
registry/storage/driver/s3-aws/s3.go | 10 +++++-----
|
||||
registry/storage/linkedblobstore.go | 16 ++++++++--------
|
||||
registry/storage/linkedblobstore_test.go | 4 ++--
|
||||
3 files changed, 15 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/registry/storage/driver/s3-aws/s3.go b/registry/storage/driver/s3-aws/s3.go
|
||||
index 800435d01..9cd87dbab 100644
|
||||
--- a/registry/storage/driver/s3-aws/s3.go
|
||||
+++ b/registry/storage/driver/s3-aws/s3.go
|
||||
@@ -476,11 +476,11 @@ func New(params DriverParameters) (*Driver, error) {
|
||||
// }
|
||||
|
||||
d := &driver{
|
||||
- S3: s3obj,
|
||||
- Bucket: params.Bucket,
|
||||
- ChunkSize: params.ChunkSize,
|
||||
- Encrypt: params.Encrypt,
|
||||
- KeyID: params.KeyID,
|
||||
+ S3: s3obj,
|
||||
+ Bucket: params.Bucket,
|
||||
+ ChunkSize: params.ChunkSize,
|
||||
+ Encrypt: params.Encrypt,
|
||||
+ KeyID: params.KeyID,
|
||||
MultipartCopyChunkSize: params.MultipartCopyChunkSize,
|
||||
MultipartCopyMaxConcurrency: params.MultipartCopyMaxConcurrency,
|
||||
MultipartCopyThresholdSize: params.MultipartCopyThresholdSize,
|
||||
diff --git a/registry/storage/linkedblobstore.go b/registry/storage/linkedblobstore.go
|
||||
index de591c8a5..3fb1da26f 100644
|
||||
--- a/registry/storage/linkedblobstore.go
|
||||
+++ b/registry/storage/linkedblobstore.go
|
||||
@@ -312,14 +312,14 @@ func (lbs *linkedBlobStore) newBlobUpload(ctx context.Context, uuid, path string
|
||||
}
|
||||
|
||||
bw := &blobWriter{
|
||||
- ctx: ctx,
|
||||
- blobStore: lbs,
|
||||
- id: uuid,
|
||||
- startedAt: startedAt,
|
||||
- digester: digest.Canonical.Digester(),
|
||||
- fileWriter: fw,
|
||||
- driver: lbs.driver,
|
||||
- path: path,
|
||||
+ ctx: ctx,
|
||||
+ blobStore: lbs,
|
||||
+ id: uuid,
|
||||
+ startedAt: startedAt,
|
||||
+ digester: digest.Canonical.Digester(),
|
||||
+ fileWriter: fw,
|
||||
+ driver: lbs.driver,
|
||||
+ path: path,
|
||||
resumableDigestEnabled: lbs.resumableDigestEnabled,
|
||||
}
|
||||
|
||||
diff --git a/registry/storage/linkedblobstore_test.go b/registry/storage/linkedblobstore_test.go
|
||||
index e0ffd2796..85376f715 100644
|
||||
--- a/registry/storage/linkedblobstore_test.go
|
||||
+++ b/registry/storage/linkedblobstore_test.go
|
||||
@@ -162,8 +162,8 @@ type mockBlobDescriptorServiceFactory struct {
|
||||
func (f *mockBlobDescriptorServiceFactory) BlobAccessController(svc distribution.BlobDescriptorService) distribution.BlobDescriptorService {
|
||||
return &mockBlobDescriptorService{
|
||||
BlobDescriptorService: svc,
|
||||
- t: f.t,
|
||||
- stats: f.stats,
|
||||
+ t: f.t,
|
||||
+ stats: f.stats,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
From 5c66b577b027e3b314680f245be4213a002fcee0 Mon Sep 17 00:00:00 2001
|
||||
From: Honglin Feng <tifayuki@gmail.com>
|
||||
Date: Mon, 15 Oct 2018 20:18:36 +0800
|
||||
Subject: [PATCH 4/4] run go fmt and goimports
|
||||
|
||||
Signed-off-by: Honglin Feng <tifayuki@gmail.com>
|
||||
---
|
||||
registry/storage/driver/s3-aws/s3.go | 10 +++++-----
|
||||
registry/storage/linkedblobstore.go | 16 ++++++++--------
|
||||
registry/storage/linkedblobstore_test.go | 4 ++--
|
||||
3 files changed, 15 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/registry/storage/driver/s3-aws/s3.go b/registry/storage/driver/s3-aws/s3.go
|
||||
index 9cd87dbab..800435d01 100644
|
||||
--- a/registry/storage/driver/s3-aws/s3.go
|
||||
+++ b/registry/storage/driver/s3-aws/s3.go
|
||||
@@ -476,11 +476,11 @@ func New(params DriverParameters) (*Driver, error) {
|
||||
// }
|
||||
|
||||
d := &driver{
|
||||
- S3: s3obj,
|
||||
- Bucket: params.Bucket,
|
||||
- ChunkSize: params.ChunkSize,
|
||||
- Encrypt: params.Encrypt,
|
||||
- KeyID: params.KeyID,
|
||||
+ S3: s3obj,
|
||||
+ Bucket: params.Bucket,
|
||||
+ ChunkSize: params.ChunkSize,
|
||||
+ Encrypt: params.Encrypt,
|
||||
+ KeyID: params.KeyID,
|
||||
MultipartCopyChunkSize: params.MultipartCopyChunkSize,
|
||||
MultipartCopyMaxConcurrency: params.MultipartCopyMaxConcurrency,
|
||||
MultipartCopyThresholdSize: params.MultipartCopyThresholdSize,
|
||||
diff --git a/registry/storage/linkedblobstore.go b/registry/storage/linkedblobstore.go
|
||||
index 3fb1da26f..de591c8a5 100644
|
||||
--- a/registry/storage/linkedblobstore.go
|
||||
+++ b/registry/storage/linkedblobstore.go
|
||||
@@ -312,14 +312,14 @@ func (lbs *linkedBlobStore) newBlobUpload(ctx context.Context, uuid, path string
|
||||
}
|
||||
|
||||
bw := &blobWriter{
|
||||
- ctx: ctx,
|
||||
- blobStore: lbs,
|
||||
- id: uuid,
|
||||
- startedAt: startedAt,
|
||||
- digester: digest.Canonical.Digester(),
|
||||
- fileWriter: fw,
|
||||
- driver: lbs.driver,
|
||||
- path: path,
|
||||
+ ctx: ctx,
|
||||
+ blobStore: lbs,
|
||||
+ id: uuid,
|
||||
+ startedAt: startedAt,
|
||||
+ digester: digest.Canonical.Digester(),
|
||||
+ fileWriter: fw,
|
||||
+ driver: lbs.driver,
|
||||
+ path: path,
|
||||
resumableDigestEnabled: lbs.resumableDigestEnabled,
|
||||
}
|
||||
|
||||
diff --git a/registry/storage/linkedblobstore_test.go b/registry/storage/linkedblobstore_test.go
|
||||
index 85376f715..e0ffd2796 100644
|
||||
--- a/registry/storage/linkedblobstore_test.go
|
||||
+++ b/registry/storage/linkedblobstore_test.go
|
||||
@@ -162,8 +162,8 @@ type mockBlobDescriptorServiceFactory struct {
|
||||
func (f *mockBlobDescriptorServiceFactory) BlobAccessController(svc distribution.BlobDescriptorService) distribution.BlobDescriptorService {
|
||||
return &mockBlobDescriptorService{
|
||||
BlobDescriptorService: svc,
|
||||
- t: f.t,
|
||||
- stats: f.stats,
|
||||
+ t: f.t,
|
||||
+ stats: f.stats,
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,163 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE='xml,threads'
|
||||
|
||||
inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
|
||||
|
||||
XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
|
||||
LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
|
||||
GRUB_URL=mirror://gnu-alpha/grub
|
||||
|
||||
UPSTREAM_VER=
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
|
||||
https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
|
||||
SRC_URI="
|
||||
https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz
|
||||
$GRUB_URL/grub-0.97.tar.gz
|
||||
$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
|
||||
$LIBPCI_URL/pciutils-2.2.9.tar.bz2
|
||||
$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
|
||||
$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
|
||||
$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
|
||||
${UPSTREAM_PATCHSET_URI}"
|
||||
|
||||
S="${WORKDIR}/xen-${PV}"
|
||||
|
||||
DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
|
||||
HOMEPAGE="https://www.xenproject.org"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="custom-cflags"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
sys-devel/bin86
|
||||
sys-apps/texinfo
|
||||
x11-libs/pixman"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
>=app-emulation/xen-tools-${PV}"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
retar-externals() {
|
||||
# Purely to unclutter src_prepare
|
||||
local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
|
||||
|
||||
# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
|
||||
sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
|
||||
-i "${WORKDIR}"/zlib-1.2.3/configure
|
||||
sed -e 's:^AR=ar rc:AR=ar:' \
|
||||
-e s':$(AR) $@:$(AR) rc $@:' \
|
||||
-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
|
||||
einfo "zlib Makefile edited"
|
||||
|
||||
cd "${WORKDIR}"
|
||||
tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
|
||||
tar czp grub-0.97 -f grub-0.97.tar.gz
|
||||
tar czp lwip -f lwip-1.3.0.tar.gz
|
||||
tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
|
||||
tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
|
||||
mv $set "${S}"/stubdom/
|
||||
einfo "tarballs moved to source"
|
||||
}
|
||||
|
||||
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
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
# try and remove all the default custom-cflags
|
||||
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} \;
|
||||
fi
|
||||
|
||||
# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
|
||||
cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
|
||||
|
||||
# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
|
||||
epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
|
||||
|
||||
# fix jobserver in Makefile
|
||||
epatch "${FILESDIR}"/${PN}-4.8-jserver.patch
|
||||
|
||||
#Substitute for internal downloading. pciutils copied only due to the only .bz2
|
||||
cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
|
||||
retar-externals || die "re-tar procedure failed"
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf="--prefix=${PREFIX}/usr \
|
||||
--libdir=${PREFIX}/usr/$(get_libdir) \
|
||||
--libexecdir=${PREFIX}/usr/libexec \
|
||||
--disable-werror \
|
||||
--disable-xen"
|
||||
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use custom-cflags || unset CFLAGS
|
||||
if test-flag-CC -fno-strict-overflow; then
|
||||
append-flags -fno-strict-overflow
|
||||
fi
|
||||
|
||||
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
|
||||
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
|
||||
|
||||
if use x86; then
|
||||
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
|
||||
XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
|
||||
elif use amd64; then
|
||||
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
|
||||
XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
|
||||
if has_multilib_profile; then
|
||||
multilib_toolchain_setup x86
|
||||
emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
|
||||
XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use x86; then
|
||||
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
|
||||
fi
|
||||
if use amd64; then
|
||||
emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
|
||||
if has_multilib_profile; then
|
||||
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the offical wiki page:"
|
||||
elog "https://wiki.gentoo.org/wiki/Xen"
|
||||
elog "https://wiki.xen.org/wiki/Main_Page"
|
||||
}
|
||||
@ -0,0 +1,461 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE='ncurses,xml,threads'
|
||||
|
||||
inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
|
||||
|
||||
MY_PV=${PV/_/-}
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
inherit git-r3
|
||||
REPO="xen.git"
|
||||
EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
else
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
UPSTREAM_VER=
|
||||
SECURITY_VER=
|
||||
# xen-tools's gentoo patches tarball
|
||||
GENTOO_VER=14
|
||||
# xen-tools's gentoo patches version which apply to this specific ebuild
|
||||
GENTOO_GPV=0
|
||||
# xen-tools ovmf's patches
|
||||
OVMF_VER=3
|
||||
|
||||
SEABIOS_VER=1.10.0
|
||||
# OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05
|
||||
OVMF_PV=20170321
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
|
||||
https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
[[ -n ${SECURITY_VER} ]] && \
|
||||
SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
|
||||
https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${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="https://downloads.xenproject.org/release/xen/${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.xz
|
||||
${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="https://www.xenproject.org"
|
||||
DOCS=( README docs/README.xen-bugtool )
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
# 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 ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
|
||||
|
||||
REQUIRED_USE="
|
||||
${PYTHON_REQUIRED_USE}
|
||||
pygrub? ( python )
|
||||
ovmf? ( hvm )
|
||||
^^ ( qemu system-qemu )"
|
||||
|
||||
COMMON_DEPEND="
|
||||
sys-apps/pciutils
|
||||
dev-libs/lzo:2
|
||||
dev-libs/glib:2
|
||||
dev-libs/yajl
|
||||
dev-libs/libaio
|
||||
dev-libs/libgcrypt:0
|
||||
sys-libs/zlib
|
||||
${PYTHON_DEPS}
|
||||
"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=sys-kernel/linux-headers-4.11
|
||||
dev-python/lxml[${PYTHON_USEDEP}]
|
||||
x86? ( sys-devel/dev86
|
||||
sys-power/iasl )
|
||||
pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
|
||||
api? ( dev-libs/libxml2
|
||||
net-misc/curl )
|
||||
ovmf? (
|
||||
!arm? ( !arm64? ( dev-lang/nasm ) )
|
||||
$(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-text/ghostscript-gpl
|
||||
app-text/pandoc
|
||||
dev-python/markdown[${PYTHON_USEDEP}]
|
||||
dev-texlive/texlive-latexextra
|
||||
media-gfx/transfig
|
||||
)
|
||||
hvm? ( x11-base/xorg-proto )
|
||||
qemu? (
|
||||
app-arch/snappy:=
|
||||
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/libexec/xen/boot/hvmloader
|
||||
usr/share/qemu-xen/qemu/s390-ccw.img
|
||||
usr/share/qemu-xen/qemu/u-boot.e500
|
||||
"
|
||||
|
||||
QA_PREBUILT="
|
||||
usr/libexec/xen/bin/ivshmem-client
|
||||
usr/libexec/xen/bin/ivshmem-server
|
||||
usr/libexec/xen/bin/qemu-img
|
||||
usr/libexec/xen/bin/qemu-io
|
||||
usr/libexec/xen/bin/qemu-keymap
|
||||
usr/libexec/xen/bin/qemu-nbd
|
||||
usr/libexec/xen/bin/qemu-pr-helper
|
||||
usr/libexec/xen/bin/qemu-system-i386
|
||||
usr/libexec/xen/bin/virtfs-proxy-helper
|
||||
usr/libexec/xen/libexec/xen-bridge-helper
|
||||
usr/share/qemu-xen/qemu/s390-ccw.img
|
||||
usr/share/qemu-xen/qemu/s390-netboot.img
|
||||
usr/share/qemu-xen/qemu/u-boot.e500
|
||||
"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
pkg_setup() {
|
||||
python_setup
|
||||
export "CONFIG_LOMOUNT=y"
|
||||
|
||||
#bug 522642, disable compile tools/tests
|
||||
export "CONFIG_TESTS=n"
|
||||
|
||||
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() {
|
||||
local i
|
||||
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
einfo "Try to apply Xen Upstream patch set"
|
||||
eapply "${WORKDIR}"/patches-upstream
|
||||
fi
|
||||
|
||||
# Security patchset
|
||||
if [[ -n ${SECURITY_VER} ]]; then
|
||||
einfo "Try to apply Xen Security patch set"
|
||||
# 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"
|
||||
|
||||
source "${WORKDIR}"/patches-security/${PV}.conf || die
|
||||
|
||||
for i in ${XEN_SECURITY_MAIN}; do
|
||||
eapply "${WORKDIR}"/patches-security/xen/$i
|
||||
done
|
||||
|
||||
# apply qemu-xen/upstream patches
|
||||
pushd "${S}"/tools/qemu-xen/ > /dev/null
|
||||
for i in ${XEN_SECURITY_QEMUU}; do
|
||||
eapply "${WORKDIR}"/patches-security/qemuu/$i
|
||||
done
|
||||
popd > /dev/null
|
||||
|
||||
# apply qemu-traditional patches
|
||||
pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
|
||||
for i in ${XEN_SECURITY_QEMUT}; do
|
||||
eapply "${WORKDIR}"/patches-security/qemut/$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 || die
|
||||
_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
|
||||
for i in ${!_gpv}; do
|
||||
eapply "${WORKDIR}"/patches-gentoo/$i
|
||||
done
|
||||
fi
|
||||
|
||||
# Ovmf's patchset
|
||||
if use ovmf; then
|
||||
if [[ -n ${OVMF_VER} ]];then
|
||||
einfo "Try to apply Ovmf patch set"
|
||||
pushd "${WORKDIR}"/ovmf-*/ > /dev/null
|
||||
eapply "${WORKDIR}"/patches-ovmf
|
||||
popd > /dev/null
|
||||
fi
|
||||
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
|
||||
|
||||
# fix bashishm
|
||||
sed -e '/Usage/s/\$//g' \
|
||||
-i tools/hotplug/Linux/init.d/xendriverdomain.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
|
||||
|
||||
# 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
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf="--prefix=${PREFIX}/usr \
|
||||
--libdir=${PREFIX}/usr/$(get_libdir) \
|
||||
--libexecdir=${PREFIX}/usr/libexec \
|
||||
--localstatedir=${EPREFIX}/var \
|
||||
--disable-werror \
|
||||
--disable-xen \
|
||||
--enable-tools \
|
||||
--enable-docs \
|
||||
$(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 system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
|
||||
use amd64 && myconf+=" $(use_enable qemu-traditional)"
|
||||
tc-ld-disable-gold # Bug 669570
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
if test-flag-CC -fno-strict-overflow; then
|
||||
append-flags -fno-strict-overflow
|
||||
fi
|
||||
|
||||
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
|
||||
|
||||
if use doc; then
|
||||
emake -C docs build
|
||||
else
|
||||
emake -C docs man-pages
|
||||
fi
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
# Created at runtime
|
||||
rm -rv "${ED%/}/var/run" || die
|
||||
|
||||
# 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
|
||||
dodoc -r docs/{pdf,txt}
|
||||
else
|
||||
emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
|
||||
fi
|
||||
dodoc ${DOCS[@]}
|
||||
|
||||
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-r1 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
|
||||
newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
|
||||
|
||||
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 "https://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,171 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
|
||||
|
||||
MY_PV=${PV/_/-}
|
||||
MY_P=${PN}-${MY_PV}
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
|
||||
SRC_URI=""
|
||||
else
|
||||
KEYWORDS="~amd64 ~arm -x86"
|
||||
UPSTREAM_VER=
|
||||
SECURITY_VER=
|
||||
GENTOO_VER=
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
|
||||
https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
[[ -n ${SECURITY_VER} ]] && \
|
||||
SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${SECURITY_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="The Xen virtual machine monitor"
|
||||
HOMEPAGE="https://www.xenproject.org"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="custom-cflags debug efi flask"
|
||||
|
||||
DEPEND="${PYTHON_DEPS}
|
||||
efi? ( >=sys-devel/binutils-2.22[multitarget] )
|
||||
!efi? ( >=sys-devel/binutils-2.22 )"
|
||||
RDEPEND=""
|
||||
PDEPEND="~app-emulation/xen-tools-${PV}"
|
||||
|
||||
# no tests are available for the hypervisor
|
||||
# prevent the silliness of /usr/lib/debug/usr/lib/debug files
|
||||
# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
|
||||
RESTRICT="test splitdebug strip"
|
||||
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="boot/xen-syms-${PV}"
|
||||
|
||||
REQUIRED_USE="arm? ( debug )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
pkg_setup() {
|
||||
python-any-r1_pkg_setup
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]]; then
|
||||
if 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
|
||||
|
||||
if use flask ; then
|
||||
export "XSM_ENABLE=y"
|
||||
export "FLASK_ENABLE=y"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
|
||||
|
||||
# Security patchset
|
||||
if [[ -n ${SECURITY_VER} ]]; then
|
||||
einfo "Try to apply Xen Security patch set"
|
||||
# apply main xen patches
|
||||
# Two parallel systems, both work side by side
|
||||
# Over time they may concdense into one. This will suffice for now
|
||||
source "${WORKDIR}"/patches-security/${PV}.conf
|
||||
|
||||
local i
|
||||
for i in ${XEN_SECURITY_MAIN}; do
|
||||
eapply "${WORKDIR}"/patches-security/xen/$i
|
||||
done
|
||||
fi
|
||||
|
||||
# Gentoo's patchset
|
||||
[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
|
||||
|
||||
eapply "${FILESDIR}"/${PN}-4.6-efi.patch
|
||||
|
||||
# Drop .config
|
||||
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
|
||||
|
||||
if use efi; then
|
||||
export EFI_VENDOR="gentoo"
|
||||
export EFI_MOUNTPOINT="boot"
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
# try and remove all the default custom-cflags
|
||||
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} \; || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
|
||||
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
if use custom-cflags; then
|
||||
filter-flags -fPIE -fstack-protector
|
||||
replace-flags -O3 -O2
|
||||
else
|
||||
unset CFLAGS
|
||||
unset LDFLAGS
|
||||
unset ASFLAGS
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Send raw LDFLAGS so that --as-needed works
|
||||
emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
# The 'make install' doesn't 'mkdir -p' the subdirs
|
||||
if use efi; then
|
||||
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
|
||||
fi
|
||||
|
||||
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
|
||||
|
||||
# make install likes to throw in some extra EFI bits if it built
|
||||
use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide:"
|
||||
elog " https://wiki.gentoo.org/wiki/Xen"
|
||||
|
||||
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
|
||||
|
||||
elog "You can optionally block the installation of /boot/xen-syms by an entry"
|
||||
elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
|
||||
elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
|
||||
}
|
||||
Binary file not shown.
@ -1,7 +1,7 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EAPI=7
|
||||
|
||||
inherit systemd user
|
||||
|
||||
@ -0,0 +1,101 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit systemd user toolchain-funcs python-any-r1
|
||||
|
||||
DESCRIPTION="An Open Source MQTT v3 Broker"
|
||||
HOMEPAGE="https://mosquitto.org/"
|
||||
SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
|
||||
|
||||
LICENSE="EPL-1.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
|
||||
|
||||
REQUIRED_USE="test? ( bridge )"
|
||||
|
||||
RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
|
||||
srv? ( net-dns/c-ares )
|
||||
ssl? ( dev-libs/openssl:0= )"
|
||||
DEPEND="${RDEPEND}
|
||||
${PYTHON_DEPS}
|
||||
websockets? ( net-libs/libwebsockets )"
|
||||
|
||||
_emake() {
|
||||
LIBDIR=$(get_libdir)
|
||||
emake \
|
||||
CC="$(tc-getCC)" \
|
||||
LIB_SUFFIX="${LIBDIR:3}" \
|
||||
WITH_BRIDGE="$(usex bridge)" \
|
||||
WITH_PERSISTENCE="$(usex persistence)" \
|
||||
WITH_SRV="$(usex srv)" \
|
||||
WITH_TLS="$(usex ssl)" \
|
||||
WITH_WEBSOCKETS="$(usex websockets)" \
|
||||
WITH_WRAP="$(usex tcpd)" \
|
||||
"$@"
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup mosquitto
|
||||
enewuser mosquitto -1 -1 -1 mosquitto
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
if use persistence; then
|
||||
sed -i -e "/^#autosave_interval/s|^#||" \
|
||||
-e "s|^#persistence false$|persistence true|" \
|
||||
-e "/^#persistence_file/s|^#||" \
|
||||
-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
|
||||
mosquitto.conf || die
|
||||
fi
|
||||
|
||||
# Remove prestripping
|
||||
sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
|
||||
client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
|
||||
|
||||
python_setup
|
||||
rm test/{broker,lib}/ptest.py || die
|
||||
python_fix_shebang test
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
_emake
|
||||
}
|
||||
|
||||
src_test() {
|
||||
_emake test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
_emake DESTDIR="${D}" prefix=/usr install
|
||||
keepdir /var/lib/mosquitto
|
||||
fowners mosquitto:mosquitto /var/lib/mosquitto
|
||||
dodoc readme.md CONTRIBUTING.md ChangeLog.txt
|
||||
doinitd "${FILESDIR}"/mosquitto
|
||||
insinto /etc/mosquitto
|
||||
doins mosquitto.conf
|
||||
systemd_dounit "${FILESDIR}/mosquitto.service"
|
||||
|
||||
if use examples; then
|
||||
docompress -x "/usr/share/doc/${PF}/examples"
|
||||
docinto "/usr/share/doc/${PF}"
|
||||
doins -r examples
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -z "${REPLACING_VERSIONS}" ]]; then
|
||||
elog "The Python module has been moved out of mosquitto."
|
||||
elog "See https://mosquitto.org/documentation/python/"
|
||||
else
|
||||
elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
|
||||
elog ""
|
||||
elog " rc-update add mosquitto default"
|
||||
elog " or"
|
||||
elog " systemctl enable mosquitto"
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
@ -1,3 +1,5 @@
|
||||
DIST yelp-tools-3.18.0.tar.xz 210712 BLAKE2B 8b9af089bc2d337d5474525f369b5ff5773391dac4deba7610545625a8550cb2735f9295282cd490b176ba9648f3b91e3865fedba27c4c0b4155b2e99bf8db8e SHA512 75957b06bdade966a33a41ecc68dfa3eb3b3e3550dc8c6664ee694c4b043c8b45a2403dd23c9810347ed7234ceb5389a34133554de012a7e0afc5db891525fb8
|
||||
DIST yelp-tools-3.28.0.tar.xz 210496 BLAKE2B 2904b0ffe50f302d7f0938fecca74b37f6d070fe42fd681dd96b3a70b73244f65e204c34bb6f6ffb2b5bcd3400334b3d85a82807793b2bd30261c616382b8be6 SHA512 0b5adcb746ffb2b9c60303ef484dac01fbb59a06abf94bb8ec8a66bd573451939299688dec088a7421eab8f69ec2d7628475e81720640f0cb5b947a8d410ed62
|
||||
EBUILD yelp-tools-3.18.0.ebuild 665 BLAKE2B cca32e98a9cbcf49457795aa608955662f8a58ab7276b24aed66b5069f1f67de5c6ea5c244c4ec8dba26670b996e3d1554d210888fe339bc1f7b299b32aca978 SHA512 265e23a9f7286e866e85c431dbab8bed4f1c6477ac55029f1e55680cee77840be72260470d6bb81590174a16a0f5affc8c54fe8d072bd834ffb666f4d685f8c6
|
||||
EBUILD yelp-tools-3.28.0.ebuild 654 BLAKE2B d93a7ea632e15f4617cdd21a1a82d619c162158797c6da115eddfd497250aab0efadbcb87515216109861830bb7b6d11200baa3d757bba006dfebf2b4160ce26 SHA512 d0af1aecc928f9c6dbdef5e6866f6f5070a56e56a619cbba650d004eee88f3e6beb0ce2de357115102e90651f4acda467e547cdce99adacf11c53ee07b81ecbe
|
||||
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit gnome2
|
||||
|
||||
DESCRIPTION="Collection of tools for building and converting documentation"
|
||||
HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
|
||||
|
||||
LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/libxml2-2.6.12
|
||||
>=dev-libs/libxslt-1.1.8
|
||||
dev-util/itstool
|
||||
>=gnome-extra/yelp-xsl-3.17.3
|
||||
virtual/awk
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
Binary file not shown.
@ -0,0 +1,141 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools eutils flag-o-matic systemd toolchain-funcs user
|
||||
|
||||
DESCRIPTION="A persistent caching system, key-value and data structures database"
|
||||
HOMEPAGE="https://redis.io"
|
||||
SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
|
||||
IUSE="+jemalloc tcmalloc luajit test"
|
||||
SLOT="0"
|
||||
|
||||
# Redis does NOT build with Lua 5.2 or newer at this time.
|
||||
# This should link correctly with both unslotted & slotted Lua, without
|
||||
# changes.
|
||||
RDEPEND="
|
||||
luajit? ( dev-lang/luajit:2 )
|
||||
!luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) )
|
||||
tcmalloc? ( dev-util/google-perftools )
|
||||
jemalloc? ( >=dev-libs/jemalloc-3.2 )"
|
||||
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
>=sys-devel/autoconf-2.63
|
||||
test? ( dev-lang/tcl:0= )"
|
||||
|
||||
REQUIRED_USE="?? ( tcmalloc jemalloc )"
|
||||
|
||||
S="${WORKDIR}/${PN}-${PV/_/-}"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup redis 75
|
||||
enewuser redis 75 -1 /var/lib/redis redis
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
eapply \
|
||||
"${FILESDIR}"/${PN}-3.2.3-config.patch \
|
||||
"${FILESDIR}"/${PN}-4.0.1-shared.patch \
|
||||
"${FILESDIR}"/${PN}-4.0.1-sharedlua.patch \
|
||||
"${FILESDIR}"/${PN}-sentinel-4.0.6-config.patch
|
||||
eapply_user
|
||||
|
||||
# Copy lua modules into build dir
|
||||
cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
|
||||
cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
|
||||
# Append cflag for lua_cjson
|
||||
# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
|
||||
append-cflags "-DENABLE_CJSON_GLOBAL"
|
||||
|
||||
# now we will rewrite present Makefiles
|
||||
local makefiles="" MKF
|
||||
for MKF in $(find -name 'Makefile' | cut -b 3-); do
|
||||
mv "${MKF}" "${MKF}.in"
|
||||
sed -i -e 's:$(CC):@CC@:g' \
|
||||
-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
|
||||
-e 's: $(DEBUG)::g' \
|
||||
-e 's:$(OBJARCH)::g' \
|
||||
-e 's:ARCH:TARCH:g' \
|
||||
-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
|
||||
"${MKF}.in" \
|
||||
|| die "Sed failed for ${MKF}"
|
||||
makefiles+=" ${MKF}"
|
||||
done
|
||||
# autodetection of compiler and settings; generates the modified Makefiles
|
||||
cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
|
||||
|
||||
# Use the correct pkgconfig name for Lua
|
||||
has_version 'dev-lang/lua:5.1' \
|
||||
&& LUAPKGCONFIG=lua5.1 \
|
||||
|| LUAPKGCONFIG=lua
|
||||
sed -i \
|
||||
-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
|
||||
-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
|
||||
-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \
|
||||
configure.ac || die "Sed failed for configure.ac"
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_with luajit)
|
||||
|
||||
# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
|
||||
# also, don't define ANSI/c99 for lua twice
|
||||
sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC AR RANLIB
|
||||
|
||||
local myconf=""
|
||||
|
||||
if use tcmalloc; then
|
||||
myconf="${myconf} USE_TCMALLOC=yes"
|
||||
elif use jemalloc; then
|
||||
myconf="${myconf} JEMALLOC_SHARED=yes"
|
||||
else
|
||||
myconf="${myconf} MALLOC=yes"
|
||||
fi
|
||||
|
||||
emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /etc/
|
||||
doins redis.conf sentinel.conf
|
||||
use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
|
||||
fperms 0644 /etc/{redis,sentinel}.conf
|
||||
|
||||
newconfd "${FILESDIR}/redis.confd-r1" redis
|
||||
newinitd "${FILESDIR}/redis.initd-5" redis
|
||||
|
||||
systemd_newunit "${FILESDIR}/redis.service-2" redis.service
|
||||
systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
|
||||
|
||||
newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel
|
||||
newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel
|
||||
|
||||
insinto /etc/logrotate.d/
|
||||
newins "${FILESDIR}/${PN}.logrotate" ${PN}
|
||||
|
||||
dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
|
||||
|
||||
dobin src/redis-cli
|
||||
dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
|
||||
fperms 0750 /usr/sbin/redis-benchmark
|
||||
dosym redis-server /usr/sbin/redis-sentinel
|
||||
|
||||
if use prefix; then
|
||||
diropts -m0750
|
||||
else
|
||||
diropts -m0750 -o redis -g redis
|
||||
fi
|
||||
keepdir /var/{log,lib}/redis
|
||||
}
|
||||
Binary file not shown.
@ -1,6 +1,3 @@
|
||||
AUX mimepull-maven-build.xml 9697 BLAKE2B a297e74be1aa6bddf7c15b8601df79246a41d8490677bc555fee4db1a1ee81cfeb48ec5226f071c7869638fd8284309ee8857b4c9909a78fa922c5860bef01a5 SHA512 23ec5dfc06aa518632e9d69ddc6633010f0a41baa73f7a9e8695b8666927a2612b9ba3b31a74e9fae436dabb51657e39f2623acb41da14b3df71a93eb64dfa9e
|
||||
DIST mimepull-1.8.tar.bz2 48841 BLAKE2B ebc5ba45cff2d01c3d0960433f3334cd9c2e39bf9a627b41b3682ece4e376fc10ad53b00773cbb91fb66463e0f9d29790eb4f55dbd27c4b29b70a6fc24856c0d SHA512 60de5b888ccdf89ffdeba0a5ccd98e77f7497e57c6b3c71049446dab0293836f8f2b84a39354602e9073fb6fef880dbc11c80323413f8ed15f0a3af68086ae07
|
||||
DIST mimepull-1.9.6.jar 68382 BLAKE2B a59c4837dd82fa2a1e67e653870ead62c6db6ede03690eb483724d2a9bdb588e34145eff604b372a417cda12a1f4074741630e47b3acd81f438145c938d04578 SHA512 528eb77d6edbbfb1b1d8aebb617f9d20c84b9c18f7ab763163ea136c3898319519bbfa8a8e204bd0697a4eac9b964eaf3fb2ee214555efcb3da152ebf467ae64
|
||||
EBUILD mimepull-1.8.ebuild 953 BLAKE2B 1ffe4e9a41b81eae44414e20c84ea4c570c7f9786bdce7ffa33a81ad92e0a1e66da84f2477706603a0c849eb39504d62719ac5aa125c5d8d90229bcc7707c624 SHA512 ad20b2a6b8abc3d49028f575efe82b69218ba156411fbcbac7400934169d5d41dc54649fba4c35fdc575aa5032f8546da941f15dd0ce8f079e5f7d6998c8469f
|
||||
EBUILD mimepull-1.9.6-r1.ebuild 496 BLAKE2B 51f4d6ae0fc26652cc9adb3ecd26e0d72f019ab6d2660b30e368071c7a935a61434fbcaf96274836b05646f2fbd057d68814ed115857e6a601cb20768897d408 SHA512 97fe69a0ce8b215a306347a17655fd156754150a22593262927b0dee1740044239c433478fc6bb44bca14ddb9f2b60872b32cfce81acf65550e8d95faeeda357
|
||||
EBUILD mimepull-1.9.6-r2.ebuild 483 BLAKE2B 7b6e313d2c2a2c22f1614e5cc763f67df0cd11e97baeb8c3b2d6bc233d6d7589e15bcef64a4b2c7b49272c60c67ae54bd3fc5a6bba3b60ad9862437902902472 SHA512 b6032922753ed84bc7a0b5cb10e58925a7fb282a230acfa3d7958a5ed5a042f69375c61cd707c6ba84b63b0af553dfb6ac2acaf1902aac158a5643a6fbba888d
|
||||
MISC metadata.xml 573 BLAKE2B f056f34e757829704b8efe77f55e2da69d27a7dc086cde47135854469195578f1b9dd3b67638a0379bc30eff764c25269a93560e11e0e12f9d7440308d240f44 SHA512 5ba96c89a6e2e5c29367ec1b5e52ab3abbfa7bdb0d8e1dd2e305980d83de83b4c29d657e5ecb4a9c1eb3804fd8589b5de86e4f34f70b951b14b2ed453a8ef427
|
||||
|
||||
@ -1,231 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
|
||||
<!-- ====================================================================== -->
|
||||
<!-- -->
|
||||
<!-- Any modifications will be overwritten. -->
|
||||
<!-- -->
|
||||
<!-- Generated by Maven Ant Plugin on 5/31/12 11:02 AM -->
|
||||
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
|
||||
<!-- -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<project name="mimepull-from-maven" default="package" basedir=".">
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Build environment properties -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<property name="maven.build.finalName" value="mimepull"/>
|
||||
<property name="maven.build.dir" value="target"/>
|
||||
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
|
||||
<property name="maven.build.srcDir.0" value="src/main/java"/>
|
||||
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
|
||||
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
|
||||
<property name="maven.build.testDir.0" value="src/test/java"/>
|
||||
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
|
||||
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
|
||||
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
|
||||
|
||||
<property name="maven.settings.offline" value="false"/>
|
||||
<property name="maven.settings.interactiveMode" value="true"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Defining classpaths -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<path id="build.classpath"/>
|
||||
<path id="build.test.classpath">
|
||||
</path>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Cleaning up target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="clean" description="Clean the output directory">
|
||||
<delete dir="${maven.build.dir}"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Compilation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="compile" depends="get-deps" description="Compile the code">
|
||||
<mkdir dir="${maven.build.outputDir}"/>
|
||||
<javac destdir="${maven.build.outputDir}"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
target="1.5"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
source="1.5">
|
||||
<src>
|
||||
<pathelement location="${maven.build.srcDir.0}"/>
|
||||
</src>
|
||||
<classpath refid="build.classpath"/>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Test-compilation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="compile-tests"
|
||||
depends="compile"
|
||||
description="Compile the test code"
|
||||
unless="maven.test.skip">
|
||||
<mkdir dir="${maven.build.testOutputDir}"/>
|
||||
<javac destdir="${maven.build.testOutputDir}"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
target="1.5"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
source="1.5">
|
||||
<src>
|
||||
<pathelement location="${maven.build.testDir.0}"/>
|
||||
</src>
|
||||
<classpath>
|
||||
<path refid="build.test.classpath"/>
|
||||
<pathelement location="${maven.build.outputDir}"/>
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${maven.build.testOutputDir}">
|
||||
<fileset dir="${maven.build.testResourceDir.0}"/>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Run all tests -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="test"
|
||||
depends="compile-tests, junit-missing"
|
||||
unless="junit.skipped"
|
||||
description="Run the test cases">
|
||||
<mkdir dir="${maven.test.reports}"/>
|
||||
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
|
||||
<sysproperty key="basedir" value="."/>
|
||||
<formatter type="xml"/>
|
||||
<formatter type="plain" usefile="false"/>
|
||||
<classpath>
|
||||
<path refid="build.test.classpath"/>
|
||||
<pathelement location="${maven.build.outputDir}"/>
|
||||
<pathelement location="${maven.build.testOutputDir}"/>
|
||||
</classpath>
|
||||
<batchtest todir="${maven.test.reports}" unless="test">
|
||||
<fileset dir="${maven.build.testDir.0}">
|
||||
<include name="**/Test*.java"/>
|
||||
<include name="**/*Test.java"/>
|
||||
<include name="**/*TestCase.java"/>
|
||||
<exclude name="**/*Abstract*Test.java"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
<batchtest todir="${maven.test.reports}" if="test">
|
||||
<fileset dir="${maven.build.testDir.0}">
|
||||
<include name="**/${test}.java"/>
|
||||
<exclude name="**/*Abstract*Test.java"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
</junit>
|
||||
</target>
|
||||
|
||||
<target name="test-junit-present">
|
||||
<available classname="junit.framework.Test" property="junit.present"/>
|
||||
</target>
|
||||
|
||||
<target name="test-junit-status"
|
||||
depends="test-junit-present">
|
||||
<condition property="junit.missing">
|
||||
<and>
|
||||
<isfalse value="${junit.present}"/>
|
||||
<isfalse value="${maven.test.skip}"/>
|
||||
</and>
|
||||
</condition>
|
||||
<condition property="junit.skipped">
|
||||
<or>
|
||||
<isfalse value="${junit.present}"/>
|
||||
<istrue value="${maven.test.skip}"/>
|
||||
</or>
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<target name="junit-missing"
|
||||
depends="test-junit-status"
|
||||
if="junit.missing">
|
||||
<echo>=================================== WARNING ===================================</echo>
|
||||
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
|
||||
<echo>===============================================================================</echo>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Javadoc target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="javadoc" description="Generates the Javadoc of the application">
|
||||
<javadoc sourcepath="${maven.build.srcDir.0}"
|
||||
packagenames="*"
|
||||
destdir="${maven.reporting.outputDirectory}/apidocs"
|
||||
access="protected"
|
||||
old="false"
|
||||
verbose="false"
|
||||
version="true"
|
||||
use="true"
|
||||
author="true"
|
||||
splitindex="false"
|
||||
nodeprecated="false"
|
||||
nodeprecatedlist="false"
|
||||
notree="false"
|
||||
noindex="false"
|
||||
nohelp="false"
|
||||
nonavbar="false"
|
||||
serialwarn="false"
|
||||
charset="ISO-8859-1"
|
||||
linksource="false"
|
||||
breakiterator="false"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Package target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="package" depends="compile,test" description="Package the application">
|
||||
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
|
||||
compress="true"
|
||||
index="false"
|
||||
basedir="${maven.build.outputDir}"
|
||||
excludes="**/package.html"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- A dummy target for the package named after the type it creates -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="jar" depends="package" description="Builds the jar for the application"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Download dependencies target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="test-offline">
|
||||
<condition property="maven.mode.offline">
|
||||
<equals arg1="${maven.settings.offline}" arg2="true"/>
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<target name="get-deps"
|
||||
depends="test-offline"
|
||||
description="Download all dependencies"
|
||||
unless="maven.mode.offline">
|
||||
</target>
|
||||
|
||||
</project>
|
||||
@ -1,44 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=4
|
||||
|
||||
JAVA_PKG_IUSE="doc source test"
|
||||
|
||||
inherit java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="Pull API for parsing MIME messages"
|
||||
HOMEPAGE="http://java.net/projects/mimepull"
|
||||
# svn export https://svn.java.net/svn/mimepull~svn/tags/mimepull-1.8 mimepull-1.8
|
||||
# tar cjf mimepull-1.8.tar.bz2 mimepull-1.8
|
||||
SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
|
||||
|
||||
LICENSE="CDDL"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
>=virtual/jre-1.5"
|
||||
DEPEND="
|
||||
>=virtual/jdk-1.5
|
||||
test? ( dev-java/ant-junit:0 )"
|
||||
|
||||
java_prepare() {
|
||||
find -name '*.class' -exec rm -v {} + || die
|
||||
|
||||
cp "${FILESDIR}"/${PN}-maven-build.xml build.xml || die
|
||||
}
|
||||
|
||||
JAVA_ANT_REWRITE_CLASSPATH="yes"
|
||||
|
||||
src_test() {
|
||||
java-pkg-2_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar target/${PN}.jar
|
||||
|
||||
use doc && java-pkg_dojavadoc target/site/apidocs
|
||||
use source && java-pkg_dosrc src/main/java/*
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,144 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils multilib multilib-minimal portability toolchain-funcs versionator
|
||||
|
||||
DESCRIPTION="A powerful light-weight programming language designed for extending applications"
|
||||
HOMEPAGE="http://www.lua.org/"
|
||||
SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="5.1"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="+deprecated emacs readline static"
|
||||
|
||||
RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
|
||||
app-eselect/eselect-lua
|
||||
!dev-lang/lua:0"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/libtool"
|
||||
PDEPEND="emacs? ( app-emacs/lua-mode )"
|
||||
|
||||
SAN_SLOT="${SLOT//.}"
|
||||
|
||||
MULTILIB_WRAPPED_HEADERS=(
|
||||
/usr/include/lua${SLOT}/luaconf.h
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
local PATCH_PV=$(get_version_component_range 1-2)
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch
|
||||
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
|
||||
|
||||
# use glibtool on Darwin (versus Apple libtool)
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
|
||||
Makefile src/Makefile || die
|
||||
fi
|
||||
|
||||
#EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
|
||||
|
||||
# correct lua versioning
|
||||
sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile
|
||||
|
||||
sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
|
||||
|
||||
if ! use deprecated ; then
|
||||
# patches from 5.1.4 still apply
|
||||
epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
|
||||
epatch "${FILESDIR}"/${PN}-5.1.4-test.patch
|
||||
fi
|
||||
|
||||
if ! use readline ; then
|
||||
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
|
||||
fi
|
||||
|
||||
# Using dynamic linked lua is not recommended for performance
|
||||
# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
|
||||
# Mainly, this is of concern if your arch is poor with GPRs, like x86
|
||||
# Note that this only affects the interpreter binary (named lua), not the lua
|
||||
# compiler (built statically) nor the lua libraries (both shared and static
|
||||
# are installed)
|
||||
if use static ; then
|
||||
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
|
||||
fi
|
||||
|
||||
# A slotted Lua uses different directories for headers & names for
|
||||
# libraries, and pkgconfig should reflect that.
|
||||
sed -r -i \
|
||||
-e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
|
||||
-e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
|
||||
"${S}"/etc/lua.pc
|
||||
|
||||
# custom Makefiles
|
||||
multilib_copy_sources
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# We want packages to find our things...
|
||||
sed -i \
|
||||
-e 's:/usr/local:'${EPREFIX}'/usr:' \
|
||||
-e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
|
||||
etc/lua.pc src/luaconf.h || die
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
tc-export CC
|
||||
myflags=
|
||||
# what to link to liblua
|
||||
liblibs="-lm"
|
||||
liblibs="${liblibs} $(dlopen_lib)"
|
||||
|
||||
# what to link to the executables
|
||||
mylibs=
|
||||
if use readline; then
|
||||
mylibs="-lreadline"
|
||||
fi
|
||||
|
||||
cd src
|
||||
emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
|
||||
RPATH="${EPREFIX}/usr/$(get_libdir)/" \
|
||||
LUA_LIBS="${mylibs}" \
|
||||
LIB_LIBS="${liblibs}" \
|
||||
V=$(get_version_component_range 1-2) \
|
||||
gentoo_all
|
||||
|
||||
mv lua_test ../test/lua.static
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
|
||||
V=${SLOT} gentoo_install
|
||||
|
||||
insinto /usr/$(get_libdir)/pkgconfig
|
||||
newins etc/lua.pc lua${SLOT}.pc
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
dodoc HISTORY README
|
||||
dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
|
||||
|
||||
doicon etc/lua.ico
|
||||
|
||||
newman doc/lua.1 lua${SLOT}.1
|
||||
newman doc/luac.1 luac${SLOT}.1
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
local positive="bisect cf echo env factorial fib fibfor hello printf sieve
|
||||
sort trace-calls trace-globals"
|
||||
local negative="readonly"
|
||||
local test
|
||||
|
||||
cd "${BUILD_DIR}" || die
|
||||
for test in ${positive}; do
|
||||
test/lua.static test/${test}.lua || die "test $test failed"
|
||||
done
|
||||
|
||||
for test in ${negative}; do
|
||||
test/lua.static test/${test}.lua && die "test $test failed"
|
||||
done
|
||||
}
|
||||
@ -0,0 +1,143 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
|
||||
|
||||
DESCRIPTION="A powerful light-weight programming language designed for extending applications"
|
||||
HOMEPAGE="http://www.lua.org/"
|
||||
SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="5.2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="+deprecated emacs readline static"
|
||||
|
||||
RDEPEND="readline? ( sys-libs/readline:0= )
|
||||
app-eselect/eselect-lua
|
||||
!dev-lang/lua:0"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/libtool"
|
||||
PDEPEND="emacs? ( app-emacs/lua-mode )"
|
||||
|
||||
MULTILIB_WRAPPED_HEADERS=(
|
||||
/usr/include/lua${SLOT}/luaconf.h
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
local PATCH_PV=$(get_version_component_range 1-2)
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
|
||||
|
||||
# use glibtool on Darwin (versus Apple libtool)
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
|
||||
Makefile src/Makefile || die
|
||||
fi
|
||||
|
||||
[ -d "${FILESDIR}/${PV}" ] && \
|
||||
EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
|
||||
|
||||
# correct lua versioning
|
||||
sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
|
||||
|
||||
sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
|
||||
|
||||
if ! use readline ; then
|
||||
sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
|
||||
fi
|
||||
|
||||
# Using dynamic linked lua is not recommended for performance
|
||||
# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
|
||||
# Mainly, this is of concern if your arch is poor with GPRs, like x86
|
||||
# Note that this only affects the interpreter binary (named lua), not the lua
|
||||
# compiler (built statically) nor the lua libraries (both shared and static
|
||||
# are installed)
|
||||
if use static ; then
|
||||
sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
|
||||
fi
|
||||
|
||||
# upstream does not use libtool, but we do (see bug #336167)
|
||||
cp "${FILESDIR}/configure.in" "${S}"/ || die
|
||||
eautoreconf
|
||||
|
||||
# A slotted Lua uses different directories for headers & names for
|
||||
# libraries, and pkgconfig should reflect that.
|
||||
sed -r -i \
|
||||
-e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
|
||||
-e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
|
||||
"${S}"/etc/lua.pc
|
||||
|
||||
# custom Makefiles
|
||||
multilib_copy_sources
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
sed -i \
|
||||
-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
|
||||
-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
|
||||
src/luaconf.h \
|
||||
|| die "failed patching luaconf.h"
|
||||
|
||||
econf
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
tc-export CC
|
||||
|
||||
# what to link to liblua
|
||||
liblibs="-lm"
|
||||
liblibs="${liblibs} $(dlopen_lib)"
|
||||
|
||||
# what to link to the executables
|
||||
mylibs=
|
||||
use readline && mylibs="-lreadline"
|
||||
|
||||
cd src
|
||||
|
||||
local myCFLAGS=""
|
||||
use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
|
||||
|
||||
case "${CHOST}" in
|
||||
*-mingw*) : ;;
|
||||
*) myCFLAGS+=" -DLUA_USE_LINUX" ;;
|
||||
esac
|
||||
|
||||
emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
|
||||
SYSLDFLAGS="${LDFLAGS}" \
|
||||
RPATH="${EPREFIX}/usr/$(get_libdir)/" \
|
||||
LUA_LIBS="${mylibs}" \
|
||||
LIB_LIBS="${liblibs}" \
|
||||
V=$(get_version_component_range 1-2) \
|
||||
gentoo_all
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
|
||||
V=${SLOT} gentoo_install
|
||||
|
||||
# We want packages to find our things...
|
||||
cp "${FILESDIR}/lua.pc" "${WORKDIR}"
|
||||
sed -i \
|
||||
-e "s:^prefix= :prefix= ${EPREFIX}:" \
|
||||
-e "s:^V=.*:V= ${PATCH_PV}:" \
|
||||
-e "s:^R=.*:R= ${PV}:" \
|
||||
-e "s:/,lib,:/$(get_libdir):g" \
|
||||
"${WORKDIR}/lua.pc"
|
||||
|
||||
insinto "/usr/$(get_libdir)/pkgconfig"
|
||||
newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
dodoc README
|
||||
dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
|
||||
|
||||
newman doc/lua.1 lua${SLOT}.1
|
||||
newman doc/luac.1 luac${SLOT}.1
|
||||
}
|
||||
|
||||
# Makefile contains a dummy target that doesn't do tests
|
||||
# but causes issues with slotted lua (bug #510360)
|
||||
src_test() { :; }
|
||||
@ -0,0 +1,143 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
|
||||
|
||||
DESCRIPTION="A powerful light-weight programming language designed for extending applications"
|
||||
HOMEPAGE="http://www.lua.org/"
|
||||
SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="5.3"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="+deprecated emacs readline static"
|
||||
|
||||
RDEPEND="readline? ( sys-libs/readline:0= )
|
||||
app-eselect/eselect-lua
|
||||
!dev-lang/lua:0"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/libtool"
|
||||
PDEPEND="emacs? ( app-emacs/lua-mode )"
|
||||
|
||||
MULTILIB_WRAPPED_HEADERS=(
|
||||
/usr/include/lua${SLOT}/luaconf.h
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
local PATCH_PV=$(get_version_component_range 1-2)
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
|
||||
|
||||
# use glibtool on Darwin (versus Apple libtool)
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
|
||||
Makefile src/Makefile || die
|
||||
fi
|
||||
|
||||
[ -d "${FILESDIR}/${PV}" ] && \
|
||||
EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
|
||||
|
||||
# correct lua versioning
|
||||
sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
|
||||
|
||||
sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
|
||||
|
||||
if ! use readline ; then
|
||||
sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
|
||||
fi
|
||||
|
||||
# Using dynamic linked lua is not recommended for performance
|
||||
# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
|
||||
# Mainly, this is of concern if your arch is poor with GPRs, like x86
|
||||
# Note that this only affects the interpreter binary (named lua), not the lua
|
||||
# compiler (built statically) nor the lua libraries (both shared and static
|
||||
# are installed)
|
||||
if use static ; then
|
||||
sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
|
||||
fi
|
||||
|
||||
# upstream does not use libtool, but we do (see bug #336167)
|
||||
cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
|
||||
eautoreconf
|
||||
|
||||
# A slotted Lua uses different directories for headers & names for
|
||||
# libraries, and pkgconfig should reflect that.
|
||||
sed -r -i \
|
||||
-e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
|
||||
-e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
|
||||
"${S}"/etc/lua.pc
|
||||
|
||||
# custom Makefiles
|
||||
multilib_copy_sources
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
sed -i \
|
||||
-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
|
||||
-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
|
||||
src/luaconf.h \
|
||||
|| die "failed patching luaconf.h"
|
||||
|
||||
econf
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
tc-export CC
|
||||
|
||||
# what to link to liblua
|
||||
liblibs="-lm"
|
||||
liblibs="${liblibs} $(dlopen_lib)"
|
||||
|
||||
# what to link to the executables
|
||||
mylibs=
|
||||
use readline && mylibs="-lreadline"
|
||||
|
||||
cd src
|
||||
|
||||
local myCFLAGS=""
|
||||
use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
|
||||
|
||||
case "${CHOST}" in
|
||||
*-mingw*) : ;;
|
||||
*) myCFLAGS+=" -DLUA_USE_LINUX" ;;
|
||||
esac
|
||||
|
||||
emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
|
||||
SYSLDFLAGS="${LDFLAGS}" \
|
||||
RPATH="${EPREFIX}/usr/$(get_libdir)/" \
|
||||
LUA_LIBS="${mylibs}" \
|
||||
LIB_LIBS="${liblibs}" \
|
||||
V=$(get_version_component_range 1-2) \
|
||||
gentoo_all
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
|
||||
V=${SLOT} gentoo_install
|
||||
|
||||
# We want packages to find our things...
|
||||
cp "${FILESDIR}/lua.pc" "${WORKDIR}"
|
||||
sed -i \
|
||||
-e "s:^prefix= :prefix= ${EPREFIX}:" \
|
||||
-e "s:^V=.*:V= ${PATCH_PV}:" \
|
||||
-e "s:^R=.*:R= ${PV}:" \
|
||||
-e "s:/,lib,:/$(get_libdir):g" \
|
||||
"${WORKDIR}/lua.pc"
|
||||
|
||||
insinto "/usr/$(get_libdir)/pkgconfig"
|
||||
newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
dodoc README
|
||||
dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
|
||||
|
||||
newman doc/lua.1 lua${SLOT}.1
|
||||
newman doc/luac.1 luac${SLOT}.1
|
||||
}
|
||||
|
||||
# Makefile contains a dummy target that doesn't do tests
|
||||
# but causes issues with slotted lua (bug #510360)
|
||||
src_test() { :; }
|
||||
@ -1,20 +1,14 @@
|
||||
DIST swi-prolog-7.4.2-gentoo-patchset-3.tar.gz 3256 BLAKE2B d7997d7307db738f0948a89f5e1cee195be4424737e50df915a293c7cb1b3bc1ce09ebd372e8c5f24c95df7335676f12cdc04749de25396eac71471704cfc579 SHA512 bc1b408e311d10ab59fa221bf5ef3d3cb1003a3edcdd13fd000cbc647117458e1f130e960cc37968481ccc2047529ca128159fac8e0ee75114022ed439905cce
|
||||
DIST swi-prolog-7.6.4-gentoo-patchset-1.tar.gz 572 BLAKE2B 11ea1f22a997ea495a388627396ac571230de65b0ed2718c1127de04f563660fab0e6f8fd14b537de11a20c9651897f0b4f9d5a0d848c9d5f1f62e0c6e2b6705 SHA512 ce9f66af8764a89af42366d3e5c9d52d597f715022894cd4a2f283bb50be4070b3dbe3258ecf4bcf8808a6230ee023fce1edd9a8ad4342ceeb35d1b17770e4a2
|
||||
DIST swi-prolog-7.7.20-gentoo-patchset-0.tar.gz 321 BLAKE2B d90e37016ba6d155af363ce679d0d5b6a1ce8986eb1437cf45ae15c9a8c036a488a0761fdbe2f734f784f4c35a6aa46825d43620778c5190a55894e5cc78014f SHA512 38c8335f8e574ba6860abfe87283bbb36583a1a0e9feb147a6d536477fad1ec5703063db521fc6747dac17642c756238d1c782297457c4554a9797eea9f5379e
|
||||
DIST swi-prolog-7.7.21-gentoo-patchset-0.tar.gz 658 BLAKE2B 3ba62644fc50019e062de8be85bb112d620292b2b73704cd61ddd13d9614056a022aae8df9dac68a38ffff4d526ead3100f3e3aa1a0ef691a759dc9781d8b0a7 SHA512 bc7617e32026a8b72f30a14e933abaa59bee4e27703ed2d59f831f70344545e8c9c151fab74fe07f30d47b45e77cb2e6c419457f2adee6157a24c40f5f52b9df
|
||||
DIST swi-prolog-7.7.22-gentoo-patchset-0.tar.gz 316 BLAKE2B 662df3286e52e6fd9e9e929b837e6b2c22dbf017e8c64e7a28b5a679710c028e535c32563a29791d68cb21b93189f02151e1421cf172f19d9e0acd378ed0e56b SHA512 e011bdbecac8ec175e9c30a5276e2707c086b2ceabeca432ea62c3c69ced31da799c5341d719b04ca9840c52636e31c545471cab69909b888684c0dd356bf474
|
||||
DIST swipl-7.4.2.tar.gz 16496738 BLAKE2B a8f45c4277e48c0aa38f8b278b466dcb9e0a776325a9ed9e08c252660671d3ee0ee441978394682276b3fb9b0eca73ad10e02aba4671630bef0a1e8f813dd3c5 SHA512 5b526d4f079e7a36184f871bb7341330bcadaeee2a69af981fbcad71ae76c77331b1f157174ac2b31d96e069dc530afa86c024de6709edd9dc8baee3b4ebffb3
|
||||
DIST swipl-7.6.3.tar.gz 16772590 BLAKE2B 644be801e290ec9d949a9b7462256a35e11cf9afd62d0b62c315e3620a3943809f58698a23f279454e00299f7b7f7b91e8d9694a139e8c424cb2f83a4efc7a52 SHA512 d84af1a565935af9934c6b75192bb2dd87388ee8fe793ade35d5549a95ec5eb83da6b10508766e795f88393fededea4ec7a3a0c2f0f685d96ab615e171d7d1f4
|
||||
DIST swipl-7.6.4.tar.gz 16777875 BLAKE2B 94409966362e649f4748b94b4ec25415bb827c7742aa39453d8e37db4ce992a65ad2d054ded4e651f2a9abe3a9438285bc9c9c895437c087ae6cf88f4afae9ca SHA512 f0ed16e4f1436115651c38a0bb37008d0dadad5a19b0f09894fcfc51dd3d429f86488e89cce00788c3c36cc2f0cd2957f92df47d5441133a6f8ea9d91ca5470f
|
||||
DIST swipl-7.7.19.tar.gz 17031626 BLAKE2B 0981ba2cb943d0dd16c7f91f4231fcf12c21dad26d738c7c7d3f7971bda92d209410181863dc1cf07f4eb528f5d3a5b98a4fd63873e1ee2cbbce440451cc9a69 SHA512 1c19f9a4ef3bc7a77bb7033a2a5862e821573d71e49aa9ae4d26a4c5eb60d2bdce53060f0851faa93e4f7a3ffdd15f89f0898f01005f15debdbb1e62004b99ad
|
||||
DIST swipl-7.7.20.tar.gz 16592015 BLAKE2B e8cbf8b282c3aa48ea59ac0c33548776567aea0cfc41d90fc029c78450e334f7b49ad5e422eeba49631b2750c06ef60bb14cad3ae812b52befeaefb602149852 SHA512 1a9bc27e43a03601a2f66ff38babc054c78ab7f49f287c9c97794fcc78e438de9b27dbc151d41db6e61b8f8a4a2584b1c0c6e010b286f3b3dbcd487a3ab7a3a1
|
||||
DIST swipl-7.7.21.tar.gz 16661560 BLAKE2B d29d45156e7a237582c62b37f7c8a1cad57095b48d0e0085c52b79de6f98aac22abc3d562696864803284c45c962173fd22c18cd659c3924c5120423bca0034d SHA512 8be2c58b5951653686a37552c2514f7bd98e01ed485338659bb87a5762b054f33a24cf769d453f190423da10325ec3420baca8172346b11f05a4b11a70630cc7
|
||||
DIST swipl-7.7.22.tar.gz 10408402 BLAKE2B e804190a07ad000f054f05bda6c895cae7aa588d6e31a86f17bf2ae4934d747939023035ac8a1b758e5d8e82a39f4a493d19fa41ee323a91333903b7ccb1b78b SHA512 bce8fa4bda39c8841533b4b8d98520b04df3272d8fe49924a49d5c6b7c66ab2defe5d121b1c7fb83506842645258ab6925a1c18740322f468c08e19374f67bfb
|
||||
DIST swipl-7.7.23.tar.gz 10422411 BLAKE2B 88a28d290070524d9f552e9d816f70723ac3ceb20dd8ae14e2f894188de024c89157ab68cb692b3a56839580047ebea92f4b6c3c39694b0b0077fd5c4616b30d SHA512 38430827c7f1fd151b448b0c71cd53a59681dfd04b97b8f71c3fcb6d4f86d261f46c3e76d4ebb52e987b665a7505ab5ee1d8528613f9b6bf319d177deb09d28f
|
||||
EBUILD swi-prolog-7.4.2.ebuild 3398 BLAKE2B 368ef93ceb17042a28699f9aa469e6b5c39aa29154b810e43fd050ab3bc1079f83680cfac8f4108c7c297a51e9bdd28357a0b6241c08faef3ea5f81ab1605558 SHA512 76d094f62e442ac86d32eaf467179fdcf4d4edf6034f711104e91f8a01b7e343208ef0b6e492ed18c8c0605b96a48f1adef8f3903f861c716e882cb9695b0dd2
|
||||
EBUILD swi-prolog-7.6.3.ebuild 3395 BLAKE2B 6445c399d7a7518bcd4ce05b9ea0bf50c7d0297d5a24d9ef84a48c36600077cea8c8b77b010d28e25dfe0766e12d1f560f42e5597a602f6bdfc7351ea6e0fa62 SHA512 830766267d3e4b60897dfcdab5263cee600ccfa2cd80f970ef3b4c3695cc3ddf9989ae85527f45cdf124898210f108a98a32a613de2543a8db813d42482b0687
|
||||
EBUILD swi-prolog-7.6.4.ebuild 3456 BLAKE2B 55d9eb2b52f47dc7fd5df9f2743775e7aabd4f070d93e31f51b038f278604909f1f48dbb4cbd12ba96614f8619923712c465d424eb224874ba158f1670d615d5 SHA512 cf64a47e39b21557915fcd6e88ac5bb01fc56bb26afebf81dedaa087ac12a3c5952383a55594dbe22de8885c6a3afd47858963a4c0c68f705be20045a518d12d
|
||||
EBUILD swi-prolog-7.7.19.ebuild 3474 BLAKE2B 10150dce5d4c4890778593b2b5f45c29d9f9fa0fdaf31f3b375b582ec1779c0b73d8410d3111b4993b4a6a57737dda1cc0fb0ba2e5c256bb9ff3323c99918777 SHA512 bdd4cd2d21446fbb108f4dd4b9313a44da9c82d93e479ece9b3ac7a3b0da7df897e3f0266a589571eaee08304c63baf8c07ee902a25d7158925b9ece6a1c7181
|
||||
EBUILD swi-prolog-7.7.20.ebuild 2429 BLAKE2B c28e0b56c363b3dcc75bf19d25f687175b6fd6196d851deeb55302fbfddcd8ef68225b5c83738ee9fc03eb9bcf5203502af41f8eba14f0e490d29460f36720bf SHA512 2fdb2480324a381dfb4b2267ba4352fd36aa50c96e6423f852b0627fa1b8e74844be3849f30349416d91c7e412a067db341e6bf1c718e687192548825e1a32ba
|
||||
EBUILD swi-prolog-7.7.21.ebuild 2488 BLAKE2B 1f195a8e10416089ec8d761fd183b0b7631b63c60bc2cb391d0b0ebb92a55c561db407ee6448ac641b0c02011180f0593b6966b51f0aa3371c96e09ec6629b01 SHA512 4f11ed60ede7c6dbccfb0668372384dffb63416554a60d338596f644634ad42a4010274da61c17e1e5d6283a4e295964757ab0d3c7789f2fca70f5d8f3a1750a
|
||||
EBUILD swi-prolog-7.7.22.ebuild 2488 BLAKE2B 1f195a8e10416089ec8d761fd183b0b7631b63c60bc2cb391d0b0ebb92a55c561db407ee6448ac641b0c02011180f0593b6966b51f0aa3371c96e09ec6629b01 SHA512 4f11ed60ede7c6dbccfb0668372384dffb63416554a60d338596f644634ad42a4010274da61c17e1e5d6283a4e295964757ab0d3c7789f2fca70f5d8f3a1750a
|
||||
EBUILD swi-prolog-7.7.23.ebuild 2427 BLAKE2B aa119c6fa3572b4ebc5f200630c88a51593ba1b5a155320a0424fbb87940f635db445287f3cd637932c6e6fb6aaecf9486004de90d74495637cc683782489b4d SHA512 9f9e1dd93753c624d4278bf3f260c45bbcf16e202380a45d838a36f272ccdcc3dc50a24efa1f6ca8da1024eb8aca0db7b65e45f097a868733893f1392821f0af
|
||||
MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3
|
||||
|
||||
@ -1,150 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils flag-o-matic java-pkg-opt-2 multilib
|
||||
|
||||
PATCHSET_VER="0"
|
||||
|
||||
DESCRIPTION="free, small, and standard compliant Prolog compiler"
|
||||
HOMEPAGE="http://www.swi-prolog.org/"
|
||||
SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X yaml"
|
||||
|
||||
RDEPEND="sys-libs/ncurses:=
|
||||
archive? ( app-arch/libarchive )
|
||||
berkdb? ( >=sys-libs/db-4:= )
|
||||
zlib? ( sys-libs/zlib )
|
||||
odbc? ( dev-db/unixODBC )
|
||||
pcre? ( dev-libs/libpcre )
|
||||
readline? ( sys-libs/readline:= )
|
||||
libedit? ( dev-libs/libedit )
|
||||
gmp? ( dev-libs/gmp:0 )
|
||||
ssl? (
|
||||
!libressl? ( dev-libs/openssl:0 )
|
||||
libressl? ( dev-libs/libressl )
|
||||
)
|
||||
java? ( >=virtual/jdk-1.7:= )
|
||||
uuid? ( dev-libs/ossp-uuid )
|
||||
X? (
|
||||
virtual/jpeg:0
|
||||
x11-libs/libX11
|
||||
x11-libs/libXft
|
||||
x11-libs/libXpm
|
||||
x11-libs/libXt
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM )
|
||||
yaml? ( dev-libs/libyaml )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
X? ( x11-base/xorg-proto )
|
||||
java? ( test? ( =dev-java/junit-3.8* ) )"
|
||||
|
||||
S="${WORKDIR}/swipl-${PV}"
|
||||
|
||||
src_prepare() {
|
||||
EPATCH_FORCE=yes
|
||||
EPATCH_SUFFIX=patch
|
||||
if [[ -d "${WORKDIR}"/${PV} ]] ; then
|
||||
epatch "${WORKDIR}"/${PV}
|
||||
fi
|
||||
|
||||
if ! use uuid; then
|
||||
mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
|
||||
fi
|
||||
|
||||
# OSX/Intel ld doesn't like an archive without table of contents
|
||||
sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
append-flags -fno-strict-aliasing
|
||||
use ppc && append-flags -mno-altivec
|
||||
use hardened && append-flags -fno-unit-at-a-time
|
||||
use debug && append-flags -DO_DEBUG
|
||||
|
||||
# ARCH is used in the configure script to figure out host and target
|
||||
# specific stuff
|
||||
export ARCH=${CHOST}
|
||||
|
||||
export CC_FOR_BUILD=$(tc-getBUILD_CC)
|
||||
|
||||
cd "${S}"/src || die
|
||||
econf \
|
||||
--libdir="${EPREFIX}"/usr/$(get_libdir) \
|
||||
$(use_enable gmp) \
|
||||
$(use_enable static-libs static) \
|
||||
--enable-shared \
|
||||
--enable-custom-flags COFLAGS="${CFLAGS} -DOF=_Z_OF"
|
||||
|
||||
if ! use minimal ; then
|
||||
local jpltestconf
|
||||
if use java && use test ; then
|
||||
jpltestconf="--with-junit=$(java-config --classpath junit)"
|
||||
fi
|
||||
|
||||
cd "${S}/packages" || die
|
||||
econf \
|
||||
--libdir="${EPREFIX}"/usr/$(get_libdir) \
|
||||
$(use_with archive) \
|
||||
$(use_with berkdb bdb ) \
|
||||
$(use_with java jpl) \
|
||||
${jpltestconf} \
|
||||
$(use_with libedit) \
|
||||
$(use_with pcre) \
|
||||
$(use_with odbc) \
|
||||
$(use_with readline) \
|
||||
$(use_with ssl) \
|
||||
$(use_with X xpce) \
|
||||
$(use_with yaml) \
|
||||
$(use_with zlib) \
|
||||
COFLAGS='"${CFLAGS}"'
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd "${S}"/src || die
|
||||
emake
|
||||
|
||||
if ! use minimal ; then
|
||||
cd "${S}/packages" || die
|
||||
emake
|
||||
./report-failed || die "Cannot report failed packages"
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${S}/src" || die
|
||||
emake check
|
||||
|
||||
if ! use minimal ; then
|
||||
unset DISPLAY
|
||||
cd "${S}/packages" || die
|
||||
emake \
|
||||
USE_PUBLIC_NETWORK_TESTS=false \
|
||||
USE_ODBC_TESTS=false \
|
||||
check
|
||||
./report-failed || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake -C src DESTDIR="${D}" install
|
||||
|
||||
if ! use minimal ; then
|
||||
emake -C packages DESTDIR="${D}" install
|
||||
if use doc ; then
|
||||
emake -C packages DESTDIR="${D}" html-install
|
||||
fi
|
||||
./packages/report-failed || die "Cannot report failed packages"
|
||||
fi
|
||||
|
||||
dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
|
||||
}
|
||||
@ -1,97 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils eutils flag-o-matic multilib
|
||||
|
||||
PATCHSET_VER="0"
|
||||
|
||||
DESCRIPTION="versatile implementation of the Prolog programming language"
|
||||
HOMEPAGE="http://www.swi-prolog.org/"
|
||||
SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
|
||||
mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml"
|
||||
|
||||
RDEPEND="sys-libs/ncurses:=
|
||||
sys-libs/zlib
|
||||
archive? ( app-arch/libarchive )
|
||||
berkdb? ( >=sys-libs/db-4:= )
|
||||
odbc? ( dev-db/unixODBC )
|
||||
pcre? ( dev-libs/libpcre )
|
||||
readline? ( sys-libs/readline:= )
|
||||
libedit? ( dev-libs/libedit )
|
||||
gmp? ( dev-libs/gmp:0 )
|
||||
ssl? (
|
||||
!libressl? ( dev-libs/openssl:0 )
|
||||
libressl? ( dev-libs/libressl )
|
||||
)
|
||||
java? ( >=virtual/jdk-1.7:= )
|
||||
uuid? ( dev-libs/ossp-uuid )
|
||||
qt5? (
|
||||
dev-qt/qtwidgets:5
|
||||
dev-qt/qtgui:5
|
||||
)
|
||||
X? (
|
||||
virtual/jpeg:0
|
||||
x11-libs/libX11
|
||||
x11-libs/libXft
|
||||
x11-libs/libXpm
|
||||
x11-libs/libXt
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM )
|
||||
yaml? ( dev-libs/libyaml )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
X? ( x11-base/xorg-proto )
|
||||
java? ( test? ( =dev-java/junit-3.8* ) )"
|
||||
|
||||
S="${WORKDIR}/swipl-${PV}"
|
||||
BUILD_DIR="${S}/build"
|
||||
CMAKE_USE_DIR="${S}"
|
||||
|
||||
src_prepare() {
|
||||
EPATCH_FORCE=yes
|
||||
EPATCH_SUFFIX=patch
|
||||
if [[ -d "${WORKDIR}"/${PV} ]] ; then
|
||||
epatch "${WORKDIR}"/${PV}
|
||||
fi
|
||||
|
||||
sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die
|
||||
|
||||
eapply_user
|
||||
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
append-flags -fno-strict-aliasing
|
||||
use debug && append-flags -DO_DEBUG
|
||||
|
||||
mycmakeargs=(
|
||||
-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
|
||||
-DUSE_GMP=$(usex gmp)
|
||||
-DINSTALL_DOCUMENTATION=$(usex doc)
|
||||
-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
|
||||
-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
|
||||
-DSWIPL_PACKAGES_ODBC=$(usex odbc)
|
||||
-DSWIPL_PACKAGES_BDB=$(usex berkdb)
|
||||
-DSWIPL_PACKAGES_PCRE=$(usex pcre)
|
||||
-DSWIPL_PACKAGES_YAML=$(usex yaml)
|
||||
-DSWIPL_PACKAGES_SSL=$(usex ssl)
|
||||
-DSWIPL_PACKAGES_JAVA=$(usex java)
|
||||
-DSWIPL_PACKAGES_QT=$(usex qt5)
|
||||
-DSWIPL_PACKAGES_X=$(usex X)
|
||||
-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cmake-utils_src_test -V
|
||||
}
|
||||
Binary file not shown.
@ -1,6 +1,9 @@
|
||||
AUX libverto-Wflags.patch 800 BLAKE2B c933153042d1d66dd41e4cd307a6e1c6ac96c77d147e0574b35e75dfab5e42278e73177648e49524ce22b3da3829b92a69cb79d8349eeb883780da086de41c04 SHA512 c8e05cfdf7537624b844731e3bf595765641745ce18d88ac4e1cceb80f6ae6bb1a97480bdac50f7d222b334e7226a495c5bbe33d6d537dc8d79ca825fd90fb52
|
||||
AUX libverto-libev-c89.patch 392 BLAKE2B 265d2d37db847cfbd495d26ea7ce93e7fa244960c99f4758a7b6a6c7d315b84788def5a0254a80f0ece1b2ca08b188da8e215d2bdaa672796aa98740c1051ab1 SHA512 a9e1cf3206f350ecb7acd1b77417d2cea387396ac7dd68e30fd3b0ad097a677bee4d6735e8fb9abe95ed2758206e226bb85e002a5a9974865b87f8b01d59b619
|
||||
AUX libverto-load.patch 2058 BLAKE2B b0a5fc276fe34cca97b6622f74ce22b56faf4f0a88cf5fbd0d47360a660e0a29927d17dbfe47afbd0c72404843f3847466f199e0d865de4f3856f3fb133878c8 SHA512 caa4d4d3be591e9e025f7a75e1cb20190469888c35563b332244a7c6a0191147888a19415ca3fe33171336e4b7361c3dc75d62e1c60380892452c13c0e1b8490
|
||||
AUX libverto-verify-cflags.patch 736 BLAKE2B 67b4d65955a8bfa51dac8c0bb2a116ee21ab777ab58da2098132118bfad24701b0bc1dd47233ebd247836be9812e9572732fd666a08ea70fd0cd4992845492af SHA512 83cd538542af376f3875e00cd5732d779b4b0aab920d0d63ead89ffe47c513ee4e55651c8c9e18adb95118b67ba964a7e401b3691992a5c012202962fb3b7abe
|
||||
DIST libverto-0.2.5.tar.gz 349722 BLAKE2B fd46b1fd1500d4732baa2d461e4b490386ff54efa8a23f06f40048e1624b4698cfedcfda79cc0a21c9a77050baafe8572835f1c0d174873772afe46b199a6294 SHA512 d57a7f86e714d3fbed391984de3356d8a2769f846985769c1be7d881647c1be95a5fc6a82bba1660ef3241aa1a40150b5e005af6f35dc32473facfdea49c556e
|
||||
DIST libverto-0.2.6.tar.gz 352690 BLAKE2B b1610fd7c64fff31d46640ef10fd895f9ce2f0d1d4fd4ac205f2ec5f519f695c8ec82da8b9539c28c0d087bfd3664101192010ee59a9632f09b3ed92e52c1054 SHA512 aa8d047501d28741f2f8185fc4a0ef6dc4b99dbe69b583c40cd4c0afc97db4dd0a928d9ec23861fff61651e9ac82e52da9473b8e62ccc11a91e5e5c6b41dfd3b
|
||||
EBUILD libverto-0.2.5-r1.ebuild 1499 BLAKE2B a97d265fcde7e10561922e65cd82e996a1db10b9610343bf98eca138220770ea3d171a98ea9fa0c198f4748219f96e3faaf73171c8cd73e41178cb234bf48bb1 SHA512 b0857b0ad06148bf06d019cdb333bdb00844fa183dbe80a317b945330ed3fdf77dcc46bbad247a5bf7055e2abb0d7560450b9f707e6ff6d56013242f700df34e
|
||||
EBUILD libverto-0.2.5.ebuild 1370 BLAKE2B 90b0ceacf5ad29c383436ef3bf297edf9ea185bf0912727ad9f5509dd40c0f7f8b5e46c36c2d9667924617211f6e0064946283a591b0ce085abad17e6bd8e8ed SHA512 322710aac677120e167565e02ed2b6685cf88338ca9d28767c0181fba68de44f78f20dc15571f62ff98ec81775c210931b3ed543cd427ffaaf3a4aa8576c5fe3
|
||||
EBUILD libverto-0.2.6.ebuild 1509 BLAKE2B fc4a2ae5eb631f867e0cad789fe6052abc4096f776a3774eb622dbc43f33a1d3dc944df16113cf50878fb06237e430462518b3ea8420110f061f34e1f0b89af2 SHA512 0e33abd39d5fe51f523b3a2739a2b0be8126eafe3d8aa048a343d10545bc53b53c6adab93f9012616c4199c3f3e2ff7f55b4996716656eb514edd65caf776544
|
||||
DIST libverto-0.3.0.tar.gz 380822 BLAKE2B 7dd31e62a4f4d8ce5cdb77ba96b9e4c957b117ade67f2fb8d38c98e05334fd952386f5690bbe49eba60c545c02ef99dcf63dee3fb17910589013b2868ee24139 SHA512 af4fec9cd20058c1db404443004c2b6c98bcacd0742369bb91f46dde6a35358e44f659bdfef30ab113e112ac1afb3156b098f5b5e2f4a58d1f4cd949abf0f57f
|
||||
EBUILD libverto-0.2.5-r1.ebuild 1513 BLAKE2B 751d2c63ba2794894bfdeea87513e514d5092c556f61454d65ac65ecaae830470563aa1d67ccb53ddef9efff58bf2677929e4d20c9edbf26a13b51f8929d4d44 SHA512 7bc75b511a82cb5fcd41be4515ababeaaf23b8cce57b924ede667c9291aac100592842c1dee55ec7d6ab7ccca8cd0c9c90c3b5924aa788bae9802650fddd7f2c
|
||||
EBUILD libverto-0.3.0.ebuild 1737 BLAKE2B 7630b8cabb87827838e7366e0b3fdc047eebb91a380e17b1ddda7b71fcb280fcc0bd8ad5559ac150a16e73154c270540762179ff6c9b5fd09bc95181d932f9df SHA512 f13a3ea85ee2fa92ac49315c4fcc70c19340706505062b027c06d90f7c32ecd30d53dc2cf6fbee12913d7a55f72238f05807cda68fb17b71444f4c8f071956e7
|
||||
MISC metadata.xml 1080 BLAKE2B cb37ba132016891f547bbf860b3353348b3312d770e220b6cd6cadabbdaea8c272c0b66a391f7a74de7ca0927be2d0f4939b7238b5966d553b5a5b834df93bd6 SHA512 88399edcdaa1d9055b6990605fe3bd1a753eac2ffa3b10ccea88a7385323b9de9f123a0032d19493f27603968fa8d07d29aa09f4f0f21ab5998f0ba2af2e4c00
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
From f3935464e3a823539394dcb4669a6e7a889a95ef Mon Sep 17 00:00:00 2001
|
||||
From: Robbie Harwood <rharwood@redhat.com>
|
||||
Date: Wed, 31 Jan 2018 18:21:04 +0100
|
||||
Subject: [PATCH] Turn off -Wcast-function-type
|
||||
|
||||
The glib event library forces all callbacks to the same type, even
|
||||
when they have different arities. Turn off the gcc warning for this
|
||||
gross behavior.
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4084965..dcab593 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -9,7 +9,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
|
||||
|
||||
AC_PROG_CC_C99
|
||||
|
||||
-for flag in -Wall -Wextra; do
|
||||
+for flag in -Wall -Wextra -Wno-cast-function-type; do
|
||||
OLD_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $flag"
|
||||
AC_TRY_COMPILE(, [return 0;], [], [CFLAGS=$OLD_CFLAGS])
|
||||
@ -0,0 +1,15 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 09ee123..b7b5908 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -7,8 +7,8 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
|
||||
[AC_USE_SYSTEM_EXTENSIONS],
|
||||
[AC_GNU_SOURCE])
|
||||
|
||||
-AC_PROG_CC_C89
|
||||
-for flag in -std=c89 -Wall -Wextra; do
|
||||
+AC_PROG_CC_C99
|
||||
+for flag in -Wall -Wextra; do
|
||||
AC_TRY_COMPILE([], [return 0;], [CFLAGS="$CFLAGS $flag"],)
|
||||
done
|
||||
|
||||
@ -0,0 +1,78 @@
|
||||
From 7989b3c6bdfdeb8770d17d8717b4a0cd48e79386 Mon Sep 17 00:00:00 2001
|
||||
From: Robbie Harwood <rharwood@redhat.com>
|
||||
Date: Wed, 24 Oct 2018 16:57:11 -0400
|
||||
Subject: [PATCH] Fix rare leak of DSO in module_load
|
||||
|
||||
---
|
||||
src/module.c | 31 +++++++++++++++----------------
|
||||
1 file changed, 15 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/src/module.c b/src/module.c
|
||||
index 1f1b7c9..0b59034 100644
|
||||
--- a/src/module.c
|
||||
+++ b/src/module.c
|
||||
@@ -182,7 +182,7 @@ module_load(const char *filename, const char *symbname,
|
||||
intdll = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
|
||||
#endif /* WIN32 */
|
||||
if (!intdll)
|
||||
- return dllerror();
|
||||
+ goto fail;
|
||||
|
||||
/* Get the module symbol */
|
||||
#ifdef WIN32
|
||||
@@ -190,16 +190,12 @@ module_load(const char *filename, const char *symbname,
|
||||
#else /* WIN32 */
|
||||
intsym = dlsym(intdll, symbname);
|
||||
#endif /* WIN32 */
|
||||
- if (!intsym) {
|
||||
- module_close(intdll);
|
||||
- return dllerror();
|
||||
- }
|
||||
+ if (!intsym)
|
||||
+ goto fail;
|
||||
|
||||
/* Figure out whether or not to load this module */
|
||||
- if (!shouldload(intsym, misc, &interr)) {
|
||||
- module_close(intdll);
|
||||
- return interr;
|
||||
- }
|
||||
+ if (!shouldload(intsym, misc, &interr))
|
||||
+ goto fail;
|
||||
|
||||
/* Re-open the module */
|
||||
module_close(intdll);
|
||||
@@ -208,9 +204,8 @@ module_load(const char *filename, const char *symbname,
|
||||
#else /* WIN32 */
|
||||
intdll = dlopen(filename, RTLD_NOW | RTLD_LOCAL);
|
||||
#endif /* WIN32 */
|
||||
- if (!intdll) {
|
||||
- return dllerror();
|
||||
- }
|
||||
+ if (!intdll)
|
||||
+ goto fail;
|
||||
|
||||
/* Get the symbol again */
|
||||
#ifdef WIN32
|
||||
@@ -218,14 +213,18 @@ module_load(const char *filename, const char *symbname,
|
||||
#else /* WIN32 */
|
||||
intsym = dlsym(intdll, symbname);
|
||||
#endif /* WIN32 */
|
||||
- if (!intsym) {
|
||||
- module_close(intdll);
|
||||
- return dllerror();
|
||||
- }
|
||||
+ if (!intsym)
|
||||
+ goto fail;
|
||||
|
||||
if (dll)
|
||||
*dll = intdll;
|
||||
if (symb)
|
||||
*symb = intsym;
|
||||
return NULL;
|
||||
+
|
||||
+fail:
|
||||
+ if (!interr)
|
||||
+ interr = dllerror();
|
||||
+ module_close(intdll);
|
||||
+ return interr;
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
From 5bbe8b009d6daa809f679fd1d25c270abba468b4 Mon Sep 17 00:00:00 2001
|
||||
From: Robbie Harwood <rharwood@redhat.com>
|
||||
Date: Wed, 31 Jan 2018 17:52:39 +0100
|
||||
Subject: [PATCH] Verify flags prior to adding them to CFLAGS, not after
|
||||
|
||||
---
|
||||
configure.ac | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b7b5908..4084965 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -8,8 +8,11 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
|
||||
[AC_GNU_SOURCE])
|
||||
|
||||
AC_PROG_CC_C99
|
||||
+
|
||||
for flag in -Wall -Wextra; do
|
||||
- AC_TRY_COMPILE([], [return 0;], [CFLAGS="$CFLAGS $flag"],)
|
||||
+ OLD_CFLAGS=$CFLAGS
|
||||
+ CFLAGS="$CFLAGS $flag"
|
||||
+ AC_TRY_COMPILE(, [return 0;], [], [CFLAGS=$OLD_CFLAGS])
|
||||
done
|
||||
|
||||
AC_CANONICAL_SYSTEM
|
||||
@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
DESCRIPTION="Main event loop abstraction library"
|
||||
HOMEPAGE="https://fedorahosted.org/libverto/"
|
||||
SRC_URI="https://fedorahosted.org/releases/l/i/libverto/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
|
||||
IUSE="glib +libev libevent tevent +threads static-libs"
|
||||
|
||||
# file collisions
|
||||
DEPEND="!=app-crypt/mit-krb5-1.10.1-r0
|
||||
!=app-crypt/mit-krb5-1.10.1-r1
|
||||
!=app-crypt/mit-krb5-1.10.1-r2
|
||||
glib? ( >=dev-libs/glib-2.29 )
|
||||
libev? ( >=dev-libs/libev-4.11 )
|
||||
libevent? ( >=dev-libs/libevent-2.0 )
|
||||
tevent? ( sys-libs/tevent )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
REQUIRED_USE="|| ( glib libev libevent tevent ) "
|
||||
|
||||
src_prepare() {
|
||||
# known problem uptream with tevent write test. tevent does not fire a
|
||||
# callback on error, but we explicitly test for this behaviour. Do not run
|
||||
# tevent tests for now.
|
||||
sed -i -e 's/def HAVE_TEVENT/ 0/' tests/test.h || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_with glib) \
|
||||
$(use_with libev) \
|
||||
$(use_with libevent) \
|
||||
$(use_with tevent) \
|
||||
$(use_with threads pthread) \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS INSTALL README
|
||||
|
||||
use static-libs || find "${D}" -name '*.la' -delete
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
DIST camlzip-1.06.tar.gz 26499 BLAKE2B a7a1dbe157c0dcb9847bcd6324bbb7cbaf39342d0fdbaed51d2c004ae7b03f8d655fb15da50dae6190b976675e405e28fa2d4fa35a2f4372c50519564d58f981 SHA512 5ef0172927106589620678897f12f054533503a5cf13df71bf4deda43f223d0cd6acce118977e87bce53afe289f367b851f192a8e693274c2bd13549121019dd
|
||||
DIST camlzip-1.07.tar.gz 26652 BLAKE2B f373ac0427faa9b6a846e9db8f3e48c00ec6885b8a11cc09fae96b5a7656908f172fda73dbea8ddd1b3dbfd98bcfa3e2e67ce9faf2942d1e260fc0a804813a05 SHA512 b92e9db002b9b398fd132c6ecd8098fac4cc7ddb3f770cc412990dcdf4bd62ba358c762d31fb0b5cd6b32f20d3bf4b3410ca6e86c511a438b92ece940f9831bd
|
||||
EBUILD camlzip-1.06.ebuild 688 BLAKE2B c1464425312b8825f76843ff05e913bd4fb85223ea7312c2b0dc7c0b6178f58c6df1b31474a1f69af286fafe586d6d234950612f1bf48214edae968089c40a9d SHA512 cd8ec9aadf5e74096c48c49b7316518a9af3a41dae9abbe92c9441dc5b83ba7b335808827722a7f795e5e42d44eaadafe9bd579ee4d15c2803651957ab56bb1b
|
||||
EBUILD camlzip-1.07.ebuild 823 BLAKE2B a569ebdb617046069ec484fa353c7fbbf550443667f96f4962480fdfe41e6ca33cca0859e0bceaddfc215d80096f0ac0fb68627317079630d8c50abcbc19eedf SHA512 36f894cac34b563204dc06b1df10d98332366ecbd66821f2513ed057fdc54650abe664f777b073e04730963b8cfe1514fc1aba3a45bc4c9ebdc6aedca947c703
|
||||
EBUILD camlzip-1.07.ebuild 819 BLAKE2B 195ca14d6fe1007d99f08148c321feef15b8c8b61e3a4511e9a397fa144eb4127f92883f76adf80e2ff49513f2cdd0589ec0590edde42bfea366e25901f48480 SHA512 0b376b59b8a42572a1afd2eec1b5a13bcbf1c0c540fc585806a35527a302f3bf201c373145071ff38d45a3c9f0d51f9204b2d8e1bf7c0f7f54e6e72cc0bcf13e
|
||||
MISC metadata.xml 331 BLAKE2B ed79189ab7c0f0410de2ee3d342f0cfed3b37aaa91be8a69ecea9742c00a12f4180f7babf3be9fd3ab4be4c5b83702cacb5302ee98f39ad23d78d67121fdbb1c SHA512 f282b3605f8d97e4789545f6a8fe443dd25fa1af5f8d11f56dea6ffc513eb8ce3d858fc3335ed501f2d26dd7d38da41f1e3e3e21f90dd111de81107c56276310
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
DIST menhir-20170712.tar.gz 855262 BLAKE2B 259a165f30f18720ff2fb3457a8ee51dc63202860a9ad097ad6e49e2666480019b7011a11764f2c3780cf12a246c313058a35f07d100c891e07ba3ed7cb20cca SHA512 7850fa031a2bd69e9cf17db6d8f82f716ab5f9e60b34d1a53591a3ff46750fb01880f3282a7194465441abc4c2ba60f543646097f5f0eef6fe78b36266a3dbdc
|
||||
DIST menhir-20171013.tar.gz 854000 BLAKE2B d50ce48d32d3bfd588520d6e5a8af4ea628089010fb286df6f87ee3f773273427f9ac6956b4b4bc1c27592aaea1f29447f0223b6b29d9cd0533c47d10eecb318 SHA512 ba6359c471aee62c996bd6495612f444e7ac226f7aad9991a76e4daa2df00cdec2387c488c6a29246ca48079bd8199b94de09a44f1fb05465cbeddff0b39df54
|
||||
EBUILD menhir-20170712.ebuild 894 BLAKE2B e62e9439edd990293f8ab860de8603a3acfcebaeb8d1822362722eca9fbe2cdd6d515ce744c40a03c7ea97f903c29f8a8c874ec004fc2b7e30cd32a529ac255f SHA512 aa34340bdb35e4e928513c2bed7c5d6f146385d8b5b6bc5a5a1e82ec9d2bf9fb4cf2c4d172f92ba547ddfc2a7b042d0138490e856228dc35c4dd0b8254e8f3c1
|
||||
EBUILD menhir-20171013.ebuild 894 BLAKE2B e62e9439edd990293f8ab860de8603a3acfcebaeb8d1822362722eca9fbe2cdd6d515ce744c40a03c7ea97f903c29f8a8c874ec004fc2b7e30cd32a529ac255f SHA512 aa34340bdb35e4e928513c2bed7c5d6f146385d8b5b6bc5a5a1e82ec9d2bf9fb4cf2c4d172f92ba547ddfc2a7b042d0138490e856228dc35c4dd0b8254e8f3c1
|
||||
EBUILD menhir-20171013.ebuild 890 BLAKE2B 3de73ccdf507992b5bf71d813d85d669ad4c849fda53a05e3d797abaae8b84f3d298d0f7c7fac9faef70d16fc9d15573a653af1ba7bcf7c6483fb19b79557d29 SHA512 6a8c92fb546d5812910ea8ad9a2bb1de9ba1ed022b382c0b24932da132d35d4f18a2094e91c541171b7678831324cb4b34bd376e8bbfe8c3507b1f392affce5b
|
||||
MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
AUX ocamlweb-1.37-strip.patch 718 BLAKE2B b393c62c0ae1e276f0feebb0b9fb6d339af5bf57c9fb73864df2a42d51cabe695474b90bd567686af80ecbddad2981508ce8fb98d65a239bde8e7ecc89934edc SHA512 b4741ac5c7c4b3bbb1c1dae7449bb4b57cbf2b8c269b8ae668e5d14bc98ae973a83502c6bb560e06b9bd0536b4ec914713e159e286b41806071bcd160145b712
|
||||
DIST ocamlweb-1.39.tar.gz 141866 BLAKE2B 14ab9c595133d34d9711da2232fdf6a89a7b134ec2537e70d6ee6ecbfdb19a8bfb6a1a7aed6207cbb1bbe1f5e7b651d33fed35d8f26129d69e29dc5995d5c342 SHA512 f4e2d330222378b632ace70efb7062c93002a85db6dc9a821706a76a1e1c00da4d4e82e618f162584003b821bc72d2d11508ae22474db61cc4367ed528d21d50
|
||||
EBUILD ocamlweb-1.39.ebuild 692 BLAKE2B e61610908a8ce79e055ad8f6d6242123e68a3f8a5da2a5108b1ee8c8eac39ad329424c5b320eb96387b68b7c2733e44dce0f97df630ef2bcb3cca616ff0b97c4 SHA512 9b6eb11deba402b4d5af2202ac91e43504a5a75de2571ddb5cad5ddb181393ed6e8feec9351b1626547ab8cea40370e53ab8bfc5de45dbb50ac0928f482553e1
|
||||
EBUILD ocamlweb-1.39.ebuild 688 BLAKE2B a82857df10d25a85aee68283e34ee1b40ea384be0e7ddfe6f282446c036d58ec1be121f7b214cf30b31ff3ff3ad6867ea1a2e10d1f040c01622b286ffb13f401 SHA512 940218df8b6ddc100eba127ad7892115bd9cfafcdfad2bf493769c2ed9e582b09a5bb26fdfc329e4e669ef1664cbd72b041d8b7b1dc2bb79f3f515639c61b756
|
||||
MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue