Sync with portage [Sat Sep 21 16:43:55 MSK 2019].
This commit is contained in:
parent
862d316291
commit
03eacd16a5
1161 changed files with 9515 additions and 11532 deletions
Binary file not shown.
Binary file not shown.
12
acct-group/mythtv/metadata.xml
Normal file
12
acct-group/mythtv/metadata.xml
Normal file
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>thebitpit@earthlink.net</email>
|
||||
<name>Wilson Michaels</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
10
acct-group/mythtv/mythtv-0.ebuild
Normal file
10
acct-group/mythtv/mythtv-0.ebuild
Normal file
|
@ -0,0 +1,10 @@
|
|||
# Copyright 2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit acct-group
|
||||
|
||||
DESCRIPTION="Mythtv mythbackend server/deamon group"
|
||||
|
||||
ACCT_GROUP_ID=117
|
0
acct-group/spectrum/Manifest
Normal file
0
acct-group/spectrum/Manifest
Normal file
12
acct-group/spectrum/metadata.xml
Normal file
12
acct-group/spectrum/metadata.xml
Normal file
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>ck+gentoo@bl4ckb0x.de</email>
|
||||
<name>Conrad Kostecki</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
10
acct-group/spectrum/spectrum-0.ebuild
Normal file
10
acct-group/spectrum/spectrum-0.ebuild
Normal file
|
@ -0,0 +1,10 @@
|
|||
# Copyright 2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit acct-group
|
||||
|
||||
DESCRIPTION="A group for the Spectrum messaging transport"
|
||||
|
||||
ACCT_GROUP_ID="486"
|
Binary file not shown.
0
acct-user/mythtv/Manifest
Normal file
0
acct-user/mythtv/Manifest
Normal file
12
acct-user/mythtv/metadata.xml
Normal file
12
acct-user/mythtv/metadata.xml
Normal file
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>thebitpit@earthlink.net</email>
|
||||
<name>Wilson Michaels</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
14
acct-user/mythtv/mythtv-0.ebuild
Normal file
14
acct-user/mythtv/mythtv-0.ebuild
Normal file
|
@ -0,0 +1,14 @@
|
|||
# Copyright 2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit acct-user
|
||||
|
||||
DESCRIPTION="Mythtv mythbackend server/deamon user"
|
||||
ACCT_USER_ID=117
|
||||
ACCT_USER_GROUPS=( mythtv video audio tty )
|
||||
ACCT_USER_SHELL=/bin/bash
|
||||
ACCT_USER_HOME=/var/lib/mythtv
|
||||
|
||||
acct-user_add_deps
|
0
acct-user/spectrum/Manifest
Normal file
0
acct-user/spectrum/Manifest
Normal file
12
acct-user/spectrum/metadata.xml
Normal file
12
acct-user/spectrum/metadata.xml
Normal file
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>ck+gentoo@bl4ckb0x.de</email>
|
||||
<name>Conrad Kostecki</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
14
acct-user/spectrum/spectrum-0.ebuild
Normal file
14
acct-user/spectrum/spectrum-0.ebuild
Normal file
|
@ -0,0 +1,14 @@
|
|||
# Copyright 2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit acct-user
|
||||
|
||||
DESCRIPTION="A user for the Spectrum messaging transport"
|
||||
|
||||
ACCT_USER_GROUPS=( "spectrum" )
|
||||
ACCT_USER_HOME="/var/lib/spectrum2"
|
||||
ACCT_USER_ID="486"
|
||||
|
||||
acct-user_add_deps
|
Binary file not shown.
|
@ -4,3 +4,5 @@ DIST puppet-agent_6.7.2-1stretch_amd64.deb 19184682 BLAKE2B 6078c1b21f0e737881d9
|
|||
DIST puppet-agent_6.7.2-1stretch_i386.deb 19452604 BLAKE2B 1915e7b7085db6cb87980a98a7cb85881331719e2af98b07f8461514a0296b3cf5181eb88f78893055a0fa09fc2ffce0e81e866db27abcecf9d8f745e329311c SHA512 8d89735601c9764e207eef77f5d42e836ee9d7c0c0f2856e0f293919cce52e7a42fc28fca42bd0e0bed760063aae527007ef7ce25503ce05fcfd495a44243ee3
|
||||
DIST puppet-agent_6.8.0-1stretch_amd64.deb 19184708 BLAKE2B ac961857784eaaa55604285cf305dac437007628ea5baa3c3ae9a8a345fcb8cf2b20820bd80cc2c96afb77cb03c4d2779b17b1183c9bc9461b56860d2179f448 SHA512 707146f71b21df4b89244df7b786f481136cfe7b0cabf20aa0d4784aca547ba85c75d13309b77c853b9e034b8271f350b30bc5358010d90b7573e3fdb63c31b6
|
||||
DIST puppet-agent_6.8.0-1stretch_i386.deb 19478404 BLAKE2B 0b9d76bb3d745ca42e489e16a133d684aa0e485941d59c6773c447f5fc79be7a964f0a2ff9e4c334a47b7d2ffc0264bd49e4f7806cbc2e72e037da1c9e385d51 SHA512 f8bc962b32abbaf070b81245b7488b4fc131d5a9e3ec94ac97038f5e9c942c70a493e61e13190fe2837eb898518724bb5f360b37531003dab37606436d66219b
|
||||
DIST puppet-agent_6.9.0-1stretch_amd64.deb 19846122 BLAKE2B 7f9133d1f5cb85f45c96490c230ee0cfda707db390a3a39be218fcd730e2298099e6d70c4f44bb5c6af46736c2c8aa7906a16375088c0119045dc77b53343b91 SHA512 f96cb1a6108a21192493b7b9958243e537ab41ce3ab6a7dde4d12bcd5da25ec6a5b29632acb87c4e156256578e8348c6fdfe26043539292f98203cce69b04fff
|
||||
DIST puppet-agent_6.9.0-1stretch_i386.deb 20170516 BLAKE2B 391a61a847bc05f9f03885f2e2140ea42b4eeca247f3223f17a82d3ede2e1bbc88226f9794777f4b20e81943d94b11612f8d4ffd9f74c2f494bdc242fb05e1a1 SHA512 595dbe1591a8ee9d703a3efdf103a3095966b22cafd0fd63fb2a7b9274ea858b55d0b915ecc32e93c49bcbeba453654fc9126efe3855924fb5c5b6732e0af83d
|
||||
|
|
79
app-admin/puppet-agent/puppet-agent-6.9.0.ebuild
Normal file
79
app-admin/puppet-agent/puppet-agent-6.9.0.ebuild
Normal file
|
@ -0,0 +1,79 @@
|
|||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit eutils systemd unpacker user
|
||||
|
||||
DESCRIPTION="general puppet client utils along with hiera and facter"
|
||||
HOMEPAGE="https://puppetlabs.com/"
|
||||
SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
|
||||
SRC_URI="
|
||||
amd64? ( ${SRC_BASE}_amd64.deb )
|
||||
x86? ( ${SRC_BASE}_i386.deb )"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="puppetdb selinux"
|
||||
RESTRICT="strip"
|
||||
|
||||
CDEPEND="!app-admin/augeas
|
||||
!app-admin/puppet
|
||||
!dev-ruby/hiera
|
||||
!dev-ruby/facter
|
||||
!app-emulation/virt-what"
|
||||
|
||||
DEPEND="
|
||||
${CDEPEND}"
|
||||
RDEPEND="${CDEPEND}
|
||||
app-portage/eix
|
||||
sys-apps/dmidecode
|
||||
sys-libs/glibc
|
||||
sys-libs/readline:0/7
|
||||
sys-libs/ncurses:0[tinfo]
|
||||
selinux? (
|
||||
sys-libs/libselinux[ruby]
|
||||
sec-policy/selinux-puppet
|
||||
)
|
||||
puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
|
||||
|
||||
S=${WORKDIR}
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup puppet
|
||||
enewuser puppet -1 -1 /var/run/puppet puppet
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# conf.d
|
||||
doconfd etc/default/puppet
|
||||
doconfd etc/default/pxp-agent
|
||||
# logrotate.d
|
||||
insinto /etc/logrotate.d
|
||||
doins etc/logrotate.d/pxp-agent
|
||||
# puppet itself
|
||||
insinto /etc/puppetlabs
|
||||
doins -r etc/puppetlabs/*
|
||||
# logdir for systemd
|
||||
dodir var/log/puppetlabs/puppet/
|
||||
fperms 0750 var/log/puppetlabs/puppet/
|
||||
# the rest
|
||||
insinto /opt
|
||||
dodir opt/puppetlabs/puppet/cache
|
||||
doins -r opt/*
|
||||
fperms 0750 /opt/puppetlabs/puppet/cache
|
||||
# init
|
||||
newinitd "${FILESDIR}/puppet.initd" puppet
|
||||
systemd_dounit lib/systemd/system/puppet.service
|
||||
systemd_dounit lib/systemd/system/pxp-agent.service
|
||||
systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
|
||||
# symlinks
|
||||
chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
|
||||
chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
|
||||
dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
|
||||
dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
|
||||
dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
|
||||
dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
|
||||
dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
|
||||
dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
|
||||
}
|
|
@ -4,3 +4,4 @@ DIST puppet-5.5.16.tar.gz 3084466 BLAKE2B f3e2f12331b4794b90a81a4f80e626fcd3d525
|
|||
DIST puppet-6.6.0.tar.gz 2898687 BLAKE2B 67370b191985f75f783d795d7ef38df53fbf28efa8ab79ae309dba985f4ba296d2862fb366b68a46d03f526c3f27c51b1e1cefcccbaa96f6694dc888a7adcc2c SHA512 e7e7367565d12c208654bd353112542fb84b736f262dc86adb940e02a4e34d473e7bb5f084e0caa5fab01be4ef479ad2baa3e751d4d86ee447cf960f400413e5
|
||||
DIST puppet-6.7.2.tar.gz 2907345 BLAKE2B bbb0f789ae64b5039e5b1bd2ce985e89ba693d33352baee7a1d11df7f314663aa3606a73d42d6b20042f81ee405a72cd17b9cf8f3c3cb257869e982f84cfd552 SHA512 6ebcaff30bda27fc17870b991287d620d455db8cf9a41c59833efc2a7541d3622228a7278689eb0494d0f6328cd334764f21ffe8700a567696e05398a5c16b7d
|
||||
DIST puppet-6.8.0.tar.gz 2906582 BLAKE2B 2dd2f9eb203aa951e0ea9639efa20aac3edb063b4bd68dd0b05a07fc2a399c4b59b3b87a1cb573096c5042920080623b9afb9c4d863b6249664edcc291cd1787 SHA512 c8446529e706dab7fd156b5bbca638f1722b07a638f626df2002a4ad218ec5e448f533395a6eed613b31ebbacea56539e903c040998d4110c8a362f2ead7f43b
|
||||
DIST puppet-6.9.0.tar.gz 2911311 BLAKE2B 1d58d0e976430031732de4f63c3ec100088f1d93894cf52caff252befeabe1ea3cf51939063143bd7c9011bb56f2a6420ba38ae230edea19ac8f1f135ed6f56f SHA512 4d1bc1a398c1e75bf8e832d477a0fff4fa3613510f8d59d73594e6fc2f2bbbedf050b1e7729b71bb1428c230f42fcf7b98f7a7683fc3c52cb36a596e20e6540b
|
||||
|
|
138
app-admin/puppet/puppet-6.9.0.ebuild
Normal file
138
app-admin/puppet/puppet-6.9.0.ebuild
Normal file
|
@ -0,0 +1,138 @@
|
|||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
USE_RUBY="ruby23 ruby24 ruby25"
|
||||
|
||||
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC="doc:all"
|
||||
|
||||
RUBY_FAKEGEM_EXTRAINSTALL="locales"
|
||||
|
||||
inherit eutils user ruby-fakegem eapi7-ver
|
||||
|
||||
DESCRIPTION="A system automation and configuration management software."
|
||||
HOMEPAGE="https://puppet.com/"
|
||||
SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0 GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
|
||||
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
|
||||
RESTRICT="test"
|
||||
|
||||
ruby_add_rdepend "
|
||||
dev-ruby/hiera
|
||||
dev-ruby/json:=
|
||||
dev-ruby/semantic_puppet
|
||||
>=dev-ruby/facter-3.0.0
|
||||
augeas? ( dev-ruby/ruby-augeas )
|
||||
diff? ( dev-ruby/diff-lcs )
|
||||
doc? ( dev-ruby/rdoc )
|
||||
ldap? ( dev-ruby/ruby-ldap )
|
||||
shadow? ( dev-ruby/ruby-shadow )
|
||||
sqlite? ( dev-ruby/sqlite3 )
|
||||
virtual/ruby-ssl
|
||||
dev-ruby/hocon"
|
||||
|
||||
ruby_add_bdepend "
|
||||
doc? ( dev-ruby/yard )
|
||||
test? (
|
||||
dev-ruby/mocha
|
||||
dev-ruby/rack
|
||||
dev-ruby/rspec-its
|
||||
)"
|
||||
# this should go in the above lists, but isn't because of test deps not being keyworded
|
||||
# dev-ruby/rspec-collection_matchers
|
||||
|
||||
RDEPEND+=" ${RDEPEND}
|
||||
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
|
||||
selinux? (
|
||||
sys-libs/libselinux[ruby]
|
||||
sec-policy/selinux-puppet
|
||||
)
|
||||
vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
|
||||
>=app-portage/eix-0.18.0"
|
||||
PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup puppet
|
||||
enewuser puppet -1 -1 /var/lib/puppet puppet
|
||||
}
|
||||
|
||||
all_ruby_prepare() {
|
||||
# Avoid spec that require unpackaged json-schema.
|
||||
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
|
||||
|
||||
# can't be run within portage.
|
||||
epatch "${FILESDIR}/puppet-fix-tests-6.4.1.patch"
|
||||
|
||||
# fix systemd path
|
||||
epatch "${FILESDIR}/puppet-systemd.patch"
|
||||
|
||||
# Avoid specs that can only run in the puppet.git repository. This
|
||||
# should be narrowed down to the specific specs.
|
||||
rm spec/integration/parser/compiler_spec.rb || die
|
||||
|
||||
# Avoid failing spec that need further investigation.
|
||||
rm spec/unit/module_tool/metadata_spec.rb || die
|
||||
}
|
||||
|
||||
each_ruby_install() {
|
||||
each_fakegem_install
|
||||
# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
|
||||
}
|
||||
|
||||
all_ruby_install() {
|
||||
all_fakegem_install
|
||||
|
||||
# systemd stuffs
|
||||
insinto /usr/lib/systemd/system
|
||||
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
|
||||
|
||||
# tmpfiles stuff
|
||||
insinto /usr/lib/tmpfiles.d
|
||||
newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
|
||||
|
||||
# openrc init stuff
|
||||
newinitd "${FILESDIR}"/puppet.init-4.x puppet
|
||||
|
||||
keepdir /etc/puppetlabs/puppet/ssl
|
||||
|
||||
keepdir /var/lib/puppet/facts
|
||||
keepdir /var/lib/puppet/files
|
||||
fowners -R puppet:puppet /var/lib/puppet
|
||||
|
||||
fperms 0750 /var/lib/puppet
|
||||
|
||||
fperms 0750 /etc/puppetlabs
|
||||
fperms 0750 /etc/puppetlabs/puppet
|
||||
fperms 0750 /etc/puppetlabs/puppet/ssl
|
||||
fowners -R :puppet /etc/puppetlabs
|
||||
fowners -R :puppet /var/lib/puppet
|
||||
|
||||
if use ldap ; then
|
||||
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
|
||||
fi
|
||||
|
||||
# ext and examples files
|
||||
for f in $(find ext examples -type f) ; do
|
||||
docinto "$(dirname ${f})"; dodoc "${f}"
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog
|
||||
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
|
||||
elog "cause puppet to hang while installing packages."
|
||||
elog
|
||||
elog "Portage Puppet module with Gentoo-specific resources:"
|
||||
elog "http://forge.puppetlabs.com/gentoo/portage"
|
||||
elog
|
||||
elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
|
||||
elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
|
||||
elog "not already done so."
|
||||
elog
|
||||
}
|
|
@ -1,3 +1,4 @@
|
|||
DIST puppetdb-6.3.4.tar.gz 41716289 BLAKE2B c2f0c074229340234e8ce146d6d711f0311f4a4d6c091ef497a376a5cca02f7bc5a85fc63555f7408f16dc60784266ba126149fb27a9e0bf0592d7ee314e4b4a SHA512 9da3707f0ecf1b7664dbf44dbc6dda79adce6928298aa8e263bb134bfccaf2403245ed0176f8929583f5631ba3927f99d6d06233eca07720d0fd174da33e4990
|
||||
DIST puppetdb-6.4.0.tar.gz 41720668 BLAKE2B a4637750c553eed8ee5bdd46212a7455fe1d59015aa78fe01f6fa9ee2b4a98ec50a2a8b551f65d4bc6965b2a969f559c53f5a6324a8e48983a1d027948387ce7 SHA512 c49afce1661ed284280e89ed9dbc2406a657e5f2cdbc501acf50900d431b58a341f1541789ea4ffe9109e8d30faf47eb85573a589426c40ad50597a7d81b5552
|
||||
DIST puppetdb-6.5.0.tar.gz 41768030 BLAKE2B 2a52239dabb5c026f4d00ee2942e3128ce50f1de23aa5ff5d53f2020237b54867b48727e774ecc27f5f18bd1617b43fcf30fbd3b03a730ca60d5bab7296e3f9c SHA512 8aee40101a17e22ef5b9b7b965ffe8d8a9b8dfaa787721b3e6a5e7363b98e0c52dc0583216a058540618a6a980cf80f138fa6b358a9daac518abd50981910cf5
|
||||
DIST puppetdb-6.6.0.tar.gz 43366185 BLAKE2B 224c13ff2583a7c8124f03845eca4756be6446e7470565c44d3fe1fcb756d5564ae2ded69d0bef1dda939efe082756c0e44afd3c6b0fc4268a744946860b5a02 SHA512 5076f52af51b7a3b43a0deb9cf1f10d77da98a5e531983d3661cda522c8d46f70882457934be6f70e77587b930077c0a4d2eaf7ed41eff9c6bcf4bc5ecbf2205
|
||||
|
|
92
app-admin/puppetdb/puppetdb-6.6.0.ebuild
Normal file
92
app-admin/puppetdb/puppetdb-6.6.0.ebuild
Normal file
|
@ -0,0 +1,92 @@
|
|||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit multilib systemd user
|
||||
|
||||
DESCRIPTION="PuppetDB collects data generated by Puppet."
|
||||
HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
|
||||
SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
# will need the same keywords as puppet
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND+=">=virtual/jdk-1.8.0"
|
||||
DEPEND+=""
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup puppetdb
|
||||
enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
|
||||
sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
|
||||
sed -i 's/sysconfig/conf\.d/g' install.sh || die
|
||||
sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
|
||||
sed -i 's/var\/run/run/g' install.sh || die
|
||||
default
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
einfo "not compiling"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /opt/puppetlabs/server/data/puppetdb
|
||||
insinto /opt/puppetlabs/server/apps/puppetdb
|
||||
insopts -m0744
|
||||
doins ext/ezbake-functions.sh
|
||||
insopts -m0644
|
||||
doins ext/ezbake.manifest
|
||||
doins puppetdb.jar
|
||||
insinto /etc/puppetlabs/puppetdb
|
||||
doins ext/config/logback.xml
|
||||
doins ext/config/bootstrap.cfg
|
||||
doins ext/config/request-logging.xml
|
||||
insinto /etc/puppetlabs/puppetdb/conf.d
|
||||
doins ext/config/conf.d/jetty.ini
|
||||
doins ext/config/conf.d/repl.ini
|
||||
doins ext/config/conf.d/database.ini
|
||||
doins ext/config/conf.d/config.ini
|
||||
insopts -m0755
|
||||
insinto /opt/puppetlabs/server/apps/puppetdb/scripts
|
||||
doins install.sh
|
||||
insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
|
||||
doins ext/cli/foreground
|
||||
doins ext/cli/ssl-setup
|
||||
doins ext/cli/config-migration
|
||||
doins ext/cli/foreground
|
||||
doins ext/cli/anonymize
|
||||
doins ext/cli/reload
|
||||
doins ext/cli/start
|
||||
doins ext/cli/stop
|
||||
insinto /opt/puppetlabs/server/apps/puppetdb/bin
|
||||
doins ext/bin/puppetdb
|
||||
insopts -m0644
|
||||
dodir /opt/puppetlabs/server/bin
|
||||
dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
|
||||
dodir /opt/puppetlabs/bin
|
||||
dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
|
||||
dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
|
||||
# init type tasks
|
||||
newconfd ext/default puppetdb
|
||||
systemd_dounit ext/redhat/puppetdb.service
|
||||
systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
|
||||
newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
|
||||
# misc
|
||||
insinto /etc/logrotate.d
|
||||
newins ext/puppetdb.logrotate.conf puppetdb
|
||||
fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
|
||||
fperms -R 770 /opt/puppetlabs/server/data/puppetdb
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
|
||||
elog
|
||||
elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
|
||||
}
|
|
@ -1,2 +1,3 @@
|
|||
DIST puppetserver-6.4.0.tar.gz 75721867 BLAKE2B 299d73bab6f76464fc7b2e3b5a5b63e4b0d6f11752990d2926db247dc5d6aa475f5de571640ae38f22da75505153ce0f83e7a952bd0d037f4d3d12fd37c8f269 SHA512 cc9ac9a163b1ee7488b1afb95457cea4ae9da205d4cd91dd70c8cc995fad32829b5c4d9de8baa3ca325ac235bcaee2dca78ea9cd50bc9dfe11f2837f64587a11
|
||||
DIST puppetserver-6.5.0.tar.gz 76080713 BLAKE2B 0562128001a24eae6cec071a366e16ab3ce5b0babbe50330ecddd13ab3dbfd35d6cb23634770e4bd7904cd231752ce923d4af8dc42d783cc137f300efcb05fb2 SHA512 d871f3817c370ddd08e8d791deb1a30aa50ab0d801192ebfb5ef225d8dce21885175fe4e9911287437b687b2bcbf5a098d8b9511b24bd05fdf4854575a686cfe
|
||||
DIST puppetserver-6.6.0.tar.gz 59095750 BLAKE2B adbc08a68a1382106c43d27604c2cef52bd1d9875c5f555320d97d31dcf9d248c88baa2d6dfd37a855010fda76ad4d273a7bd5eca77bb216aabf6a120e41cee0 SHA512 2b43092752e246027a437398d6d23a4085caa2956a1453cec2e62f1001fca1c98bddca0a9d90c178ce9c89a06c26edcaee49416c1b8a4941e2bc4b6b5bb1fe0e
|
||||
|
|
135
app-admin/puppetserver/puppetserver-6.6.0.ebuild
Normal file
135
app-admin/puppetserver/puppetserver-6.6.0.ebuild
Normal file
|
@ -0,0 +1,135 @@
|
|||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit multilib systemd user
|
||||
|
||||
DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
|
||||
HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
|
||||
SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="puppetdb"
|
||||
# will need the same keywords as puppet
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND+="
|
||||
>=virtual/jdk-1.8.0
|
||||
app-admin/puppet-agent[puppetdb?]"
|
||||
DEPEND+=""
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup puppet
|
||||
enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
|
||||
sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
|
||||
sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
|
||||
sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
|
||||
sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
|
||||
sed -i 's/var\/run/run/g' install.sh || die
|
||||
default
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
einfo "not compiling"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver
|
||||
insopts -m0774
|
||||
doins ext/ezbake-functions.sh
|
||||
insopts -m0644
|
||||
doins ext/ezbake.manifest
|
||||
doins puppet-server-release.jar
|
||||
insinto /etc/puppetlabs/puppetserver
|
||||
doins ext/config/logback.xml
|
||||
doins ext/config/request-logging.xml
|
||||
insinto /etc/puppetlabs/puppetserver/services.d
|
||||
doins ext/system-config/services.d/bootstrap.cfg
|
||||
doins ext/config/services.d/ca.cfg
|
||||
insinto /etc/puppetlabs/puppetserver/conf.d
|
||||
doins ext/config/conf.d/puppetserver.conf
|
||||
doins ext/config/conf.d/auth.conf
|
||||
doins ext/config/conf.d/global.conf
|
||||
doins ext/config/conf.d/web-routes.conf
|
||||
doins ext/config/conf.d/metrics.conf
|
||||
doins ext/config/conf.d/webserver.conf
|
||||
insopts -m0755
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/scripts
|
||||
doins install.sh
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
|
||||
doins ext/cli/ca
|
||||
doins ext/cli/irb
|
||||
doins ext/cli/foreground
|
||||
doins ext/cli/gem
|
||||
doins ext/cli/ruby
|
||||
doins ext/cli/reload
|
||||
doins ext/cli/start
|
||||
doins ext/cli/stop
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/cli
|
||||
doins ext/cli_defaults/cli-defaults.sh
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/bin
|
||||
doins ext/bin/puppetserver
|
||||
insopts -m0644
|
||||
dodir /opt/puppetlabs/server/bin
|
||||
dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
|
||||
dodir /opt/puppetlabs/bin
|
||||
dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
|
||||
dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
|
||||
dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
|
||||
# other sys stuff
|
||||
dodir /etc/puppetlabs/code
|
||||
# needed for systemd
|
||||
dodir /var/log/puppetlabs/puppetserver
|
||||
dodir /etc/puppetlabs/puppet/ssl
|
||||
fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
|
||||
fperms -R 771 /etc/puppetlabs/puppet/ssl
|
||||
# systemd type things
|
||||
insinto /etc/systemd/system/puppetserver.service.d/
|
||||
systemd_dounit ext/redhat/puppetserver.service
|
||||
insinto /etc/default
|
||||
newins ext/default puppetserver
|
||||
# normal init type tasks
|
||||
dosym ../default/puppetserver /etc/conf.d/puppetserver
|
||||
newinitd "${FILESDIR}/puppetserver.init" puppetserver
|
||||
# misc
|
||||
insinto /etc/logrotate.d
|
||||
newins ext/puppetserver.logrotate.conf puppetserver
|
||||
# cleanup
|
||||
dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
|
||||
fowners -R puppet:puppet /opt/puppetlabs/server/data
|
||||
fperms -R 775 /opt/puppetlabs/server/data/puppetserver
|
||||
fperms -R 700 /var/log/puppetlabs/puppetserver
|
||||
insinto /opt/puppetlabs/server/data
|
||||
doins ext/build-scripts/jruby-gem-list.txt
|
||||
doins ext/build-scripts/mri-gem-list-no-dependencies.txt
|
||||
insopts -m 0644
|
||||
insinto /usr/lib/tmpfiles.d
|
||||
newins ext/puppetserver.tmpfiles.conf puppetserver.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "to install you may want to run the following:"
|
||||
elog
|
||||
elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
|
||||
elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
|
||||
elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
|
||||
elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
|
||||
elog "puppet config set --section master codedir /etc/puppetlabs/code"
|
||||
elog
|
||||
elog "# install puppetserver gems"
|
||||
elog "cd /opt/puppetlabs/server/apps/puppetserver"
|
||||
elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
|
||||
elog "while read LINE do"
|
||||
elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
|
||||
elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
|
||||
elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
|
||||
elog "while read LINE do"
|
||||
elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
|
||||
elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt"
|
||||
}
|
|
@ -1,33 +0,0 @@
|
|||
From 1b824dd6389e209eab752d5a698c6093f311e3e3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
||||
Date: Mon, 11 Dec 2017 15:46:06 +0100
|
||||
Subject: [PATCH] modules/json: Adaptions for json-c v0.13
|
||||
|
||||
---
|
||||
modules/json/json-parser.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c
|
||||
index 0368ed8f7..356df48b9 100644
|
||||
--- a/modules/json/json-parser.c
|
||||
+++ b/modules/json/json-parser.c
|
||||
@@ -20,6 +20,8 @@
|
||||
* COPYING for details.
|
||||
*/
|
||||
|
||||
+#define JSON_C_VER_013 (13 << 8)
|
||||
+
|
||||
#include "json-parser.h"
|
||||
#include "dot-notation.h"
|
||||
#include "scratch-buffers.h"
|
||||
@@ -28,7 +30,10 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include <json.h>
|
||||
+
|
||||
+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
|
||||
#include <json_object_private.h>
|
||||
+#endif
|
||||
|
||||
typedef struct _JSONParser
|
||||
{
|
|
@ -1,23 +0,0 @@
|
|||
From 41dd64e7b11d527f8f3cc6ae13067d0225191538 Mon Sep 17 00:00:00 2001
|
||||
From: kokan <peter.kokai@balabit.com>
|
||||
Date: Sat, 31 Mar 2018 15:36:08 +0200
|
||||
Subject: [PATCH] libsyslog-ng: missing dependency libsecret-storage
|
||||
|
||||
Signed-off-by: kokan <peter.kokai@balabit.com>
|
||||
---
|
||||
lib/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/Makefile.am b/lib/Makefile.am
|
||||
index af2f44ece2..4a0b11c92f 100644
|
||||
--- a/lib/Makefile.am
|
||||
+++ b/lib/Makefile.am
|
||||
@@ -47,7 +47,7 @@ lib_libsyslog_ng_la_LDFLAGS = -no-undefined -release ${LSNG_RELEASE} \
|
||||
|
||||
lib_test_subdirs = lib_filter lib_logproto lib_parser lib_rewrite lib_template lib_stats lib_control
|
||||
|
||||
-lib_libsyslog_ng_la_DEPENDENCIES = lib/eventlog/src/libevtlog.la
|
||||
+lib_libsyslog_ng_la_DEPENDENCIES = lib/eventlog/src/libevtlog.la lib/secret-storage/libsecret-storage.la
|
||||
|
||||
if IVYKIS_INTERNAL
|
||||
lib_libsyslog_ng_la_DEPENDENCIES += lib/ivykis/src/libivykis.la
|
|
@ -1,173 +0,0 @@
|
|||
From a4f7b9dc75c2b678466cc104d8ca111bd90fba11 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@balabit.com>
|
||||
Date: Wed, 7 Mar 2018 18:35:09 +0100
|
||||
Subject: [PATCH 1/3] tls: fix tls_context_load_key_and_cert()
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
key_file and cert_file are optional (the client cert is not mandatory).
|
||||
|
||||
Signed-off-by: László Várady <laszlo.varady@balabit.com>
|
||||
---
|
||||
lib/tlscontext.c | 9 +++++++++
|
||||
modules/afsocket/transport-mapper-inet.c | 6 +++---
|
||||
2 files changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/tlscontext.c b/lib/tlscontext.c
|
||||
index 510ac2738d..b202c397f3 100644
|
||||
--- a/lib/tlscontext.c
|
||||
+++ b/lib/tlscontext.c
|
||||
@@ -599,9 +599,18 @@ _are_key_and_cert_files_accessible(TLSContext *self)
|
||||
file_exists(self->cert_file);
|
||||
}
|
||||
|
||||
+static gboolean
|
||||
+_client_key_and_cert_files_are_not_specified(TLSContext *self)
|
||||
+{
|
||||
+ return self->mode == TM_CLIENT && (!self->key_file && !self->cert_file);
|
||||
+}
|
||||
+
|
||||
static TLSContextLoadResult
|
||||
tls_context_load_key_and_cert(TLSContext *self)
|
||||
{
|
||||
+ if (_client_key_and_cert_files_are_not_specified(self))
|
||||
+ return TLS_CONTEXT_OK;
|
||||
+
|
||||
if (!_are_key_and_cert_files_accessible(self))
|
||||
return TLS_CONTEXT_FILE_ACCES_ERROR;
|
||||
if (!SSL_CTX_use_PrivateKey_file(self->ssl_ctx, self->key_file, SSL_FILETYPE_PEM))
|
||||
diff --git a/modules/afsocket/transport-mapper-inet.c b/modules/afsocket/transport-mapper-inet.c
|
||||
index 80c0d21801..1afb34b33f 100644
|
||||
--- a/modules/afsocket/transport-mapper-inet.c
|
||||
+++ b/modules/afsocket/transport-mapper-inet.c
|
||||
@@ -176,17 +176,17 @@ transport_mapper_inet_async_init(TransportMapper *s, TransportMapperAsyncInitCB
|
||||
|
||||
TLSContextSetupResult tls_ctx_setup_res = tls_context_setup_context(self->tls_context);
|
||||
|
||||
+ const gchar *key = tls_context_get_key_file(self->tls_context);
|
||||
+
|
||||
if (tls_ctx_setup_res == TLS_CONTEXT_SETUP_OK)
|
||||
{
|
||||
- const gchar *key = tls_context_get_key_file(self->tls_context);
|
||||
- if (secret_storage_contains_key(key))
|
||||
+ if (key && secret_storage_contains_key(key))
|
||||
secret_storage_update_status(key, SECRET_STORAGE_SUCCESS);
|
||||
return func(func_args);
|
||||
}
|
||||
|
||||
if (tls_ctx_setup_res == TLS_CONTEXT_SETUP_BAD_PASSWORD)
|
||||
{
|
||||
- const gchar *key = tls_context_get_key_file(self->tls_context);
|
||||
msg_error("Error setting up TLS context",
|
||||
evt_tag_str("keyfile", key));
|
||||
call_finalize_init_args *args = g_new0(call_finalize_init_args, 1);
|
||||
|
||||
From 9e3eae23330442c9e58ae5ccc732457f2d0e694e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@balabit.com>
|
||||
Date: Wed, 7 Mar 2018 19:39:24 +0100
|
||||
Subject: [PATCH 2/3] tlscontext: fix error logging of cert_file
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
file_exists() has a side effect: it logs when the file can't be opened.
|
||||
|
||||
Since the && operator is evaluated lazily, the error messages of cert_file
|
||||
were not displayed when the first invocation of file_exists failed
|
||||
(on key_file).
|
||||
|
||||
Signed-off-by: László Várady <laszlo.varady@balabit.com>
|
||||
---
|
||||
lib/tlscontext.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/tlscontext.c b/lib/tlscontext.c
|
||||
index b202c397f3..5a503387c4 100644
|
||||
--- a/lib/tlscontext.c
|
||||
+++ b/lib/tlscontext.c
|
||||
@@ -595,8 +595,10 @@ tls_context_load_pkcs12(TLSContext *self)
|
||||
static gboolean
|
||||
_are_key_and_cert_files_accessible(TLSContext *self)
|
||||
{
|
||||
- return file_exists(self->key_file) &&
|
||||
- file_exists(self->cert_file);
|
||||
+ gboolean key_file_exists = file_exists(self->key_file);
|
||||
+ gboolean cert_file_exists = file_exists(self->cert_file);
|
||||
+
|
||||
+ return key_file_exists && cert_file_exists;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
||||
From 3eef78b6ac8016d3eb33b36bd98419d5b086767f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@balabit.com>
|
||||
Date: Wed, 7 Mar 2018 19:43:41 +0100
|
||||
Subject: [PATCH 3/3] tlscontext: rename file_exists() to is_file_accessible()
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: László Várady <laszlo.varady@balabit.com>
|
||||
---
|
||||
lib/tlscontext.c | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/lib/tlscontext.c b/lib/tlscontext.c
|
||||
index 5a503387c4..73015d2462 100644
|
||||
--- a/lib/tlscontext.c
|
||||
+++ b/lib/tlscontext.c
|
||||
@@ -322,7 +322,7 @@ tls_session_free(TLSSession *self)
|
||||
}
|
||||
|
||||
static gboolean
|
||||
-file_exists(const gchar *fname)
|
||||
+_is_file_accessible(const gchar *fname)
|
||||
{
|
||||
if (!fname)
|
||||
return FALSE;
|
||||
@@ -444,7 +444,7 @@ _is_dh_valid(DH *dh)
|
||||
static DH *
|
||||
_load_dh_from_file(const gchar *dhparam_file)
|
||||
{
|
||||
- if (!file_exists(dhparam_file))
|
||||
+ if (!_is_file_accessible(dhparam_file))
|
||||
return NULL;
|
||||
|
||||
BIO *bio = BIO_new_file(dhparam_file, "r");
|
||||
@@ -528,7 +528,7 @@ tls_context_setup_dh(TLSContext *self)
|
||||
static PKCS12 *
|
||||
_load_pkcs12_file(const gchar *pkcs12_file)
|
||||
{
|
||||
- if (!file_exists(pkcs12_file))
|
||||
+ if (!_is_file_accessible(pkcs12_file))
|
||||
return NULL;
|
||||
|
||||
FILE *p12_file = fopen(pkcs12_file, "rb");
|
||||
@@ -595,10 +595,10 @@ tls_context_load_pkcs12(TLSContext *self)
|
||||
static gboolean
|
||||
_are_key_and_cert_files_accessible(TLSContext *self)
|
||||
{
|
||||
- gboolean key_file_exists = file_exists(self->key_file);
|
||||
- gboolean cert_file_exists = file_exists(self->cert_file);
|
||||
+ gboolean key_file_accessible = _is_file_accessible(self->key_file);
|
||||
+ gboolean cert_file_accessible = _is_file_accessible(self->cert_file);
|
||||
|
||||
- return key_file_exists && cert_file_exists;
|
||||
+ return key_file_accessible && cert_file_accessible;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
@@ -650,10 +650,10 @@ tls_context_setup_context(TLSContext *self)
|
||||
goto error;
|
||||
}
|
||||
|
||||
- if (file_exists(self->ca_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->ca_dir))
|
||||
+ if (_is_file_accessible(self->ca_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->ca_dir))
|
||||
goto error;
|
||||
|
||||
- if (file_exists(self->crl_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->crl_dir))
|
||||
+ if (_is_file_accessible(self->crl_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->crl_dir))
|
||||
goto error;
|
||||
|
||||
if (self->crl_dir)
|
|
@ -0,0 +1,72 @@
|
|||
diff --git a/lib/logsource.c b/lib/logsource.c
|
||||
index 3f38b66e8b..83c61a8e93 100644
|
||||
--- a/lib/logsource.c
|
||||
+++ b/lib/logsource.c
|
||||
@@ -633,7 +633,20 @@ log_source_queue(LogPipe *s, LogMessage *msg, const LogPathOptions *path_options
|
||||
evt_tag_printf("msg", "%p", msg));
|
||||
|
||||
msg_set_context(NULL);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+_initialize_window(LogSource *self, gint init_window_size)
|
||||
+{
|
||||
+ self->window_initialized = TRUE;
|
||||
+ window_size_counter_set(&self->window_size, init_window_size);
|
||||
+ self->full_window_size = init_window_size;
|
||||
+}
|
||||
|
||||
+static gboolean
|
||||
+_is_window_initialized(LogSource *self)
|
||||
+{
|
||||
+ return self->window_initialized;
|
||||
}
|
||||
|
||||
void
|
||||
@@ -645,11 +658,9 @@ log_source_set_options(LogSource *self, LogSourceOptions *options,
|
||||
* configuration and we received a SIGHUP. This means that opened
|
||||
* connections will not have their window_size changed. */
|
||||
|
||||
- if ((gint)window_size_counter_get(&self->window_size, NULL) == -1)
|
||||
- {
|
||||
- window_size_counter_set(&self->window_size, options->init_window_size);
|
||||
- self->full_window_size = options->init_window_size;
|
||||
- }
|
||||
+ if (!_is_window_initialized(self))
|
||||
+ _initialize_window(self, options->init_window_size);
|
||||
+
|
||||
self->options = options;
|
||||
if (self->stats_id)
|
||||
g_free(self->stats_id);
|
||||
@@ -679,7 +690,7 @@ log_source_init_instance(LogSource *self, GlobalConfig *cfg)
|
||||
self->super.free_fn = log_source_free;
|
||||
self->super.init = log_source_init;
|
||||
self->super.deinit = log_source_deinit;
|
||||
- window_size_counter_set(&self->window_size, (gsize)-1);
|
||||
+ self->window_initialized = FALSE;
|
||||
self->ack_tracker = NULL;
|
||||
}
|
||||
|
||||
@@ -696,7 +707,9 @@ log_source_free(LogPipe *s)
|
||||
|
||||
ack_tracker_free(self->ack_tracker);
|
||||
self->ack_tracker = NULL;
|
||||
- _release_dynamic_window(self);
|
||||
+
|
||||
+ if (G_UNLIKELY(dynamic_window_is_enabled(&self->dynamic_window)))
|
||||
+ _release_dynamic_window(self);
|
||||
}
|
||||
|
||||
void
|
||||
diff --git a/lib/logsource.h b/lib/logsource.h
|
||||
index 370842efc2..75d4926046 100644
|
||||
--- a/lib/logsource.h
|
||||
+++ b/lib/logsource.h
|
||||
@@ -71,6 +71,7 @@ struct _LogSource
|
||||
gchar *stats_instance;
|
||||
WindowSizeCounter window_size;
|
||||
DynamicWindow dynamic_window;
|
||||
+ gboolean window_initialized;
|
||||
/* full_window_size = static + dynamic */
|
||||
gsize full_window_size;
|
||||
atomic_gssize window_size_to_be_reclaimed;
|
|
@ -51,6 +51,9 @@ DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunO
|
|||
contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
|
||||
"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
|
||||
|
||||
# bug #695176
|
||||
PATCHES=( "${FILESDIR}/patches/${PN}-3.23.1-fix-sigabrt.patch" )
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
Binary file not shown.
|
@ -9,7 +9,7 @@ SRC_URI="http://www.miketaylor.org.uk/tech/deb/${PN}"
|
|||
|
||||
LICENSE="public-domain"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
|
||||
|
||||
RDEPEND="dev-lang/perl"
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
|
|||
EGIT_BRANCH=dev
|
||||
else
|
||||
SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Extremely Fast Compression algorithm"
|
||||
|
|
Binary file not shown.
|
@ -1,2 +1 @@
|
|||
DIST isoimagewriter-0.2.tar.xz 423900 BLAKE2B 36ce0b0bba3d955c4e10d003a3bded9ec55931b6496c5b1c91c83b6c8d3fa29e033a833d6c16a81f098a16f57cac0dae638719d389892d0336a28a6cdbd24151 SHA512 cec7d67e8255caaaccc14d07da3677a13b8081f599136516b0a31262e20eec884fa738dcc2d3aa1bfd49c00bb6c5bc6c3a62c767b13cdb06799cb53cf1e6ecc1
|
||||
DIST isoimagewriter-0.8.tar.xz 430368 BLAKE2B d540ca0ee874b633618480ff5cc30ceea5f0aef84e3e4b0236fc6474ce590661ca8728a3719cc733cc791d14cfdcaad609ffa32d79b99df141381aa3f35edec8 SHA512 1d5031695647be54e5de10f6243b68bf8d2dc29a7894c8ac69954df353d5baa740290b572c89cd37650718749117f5e3b25dd99b8b374d8ba0376288878f9199
|
||||
|
|
|
@ -1,25 +0,0 @@
|
|||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit kde5
|
||||
|
||||
DESCRIPTION="Write hybrid ISO files onto a USB disk"
|
||||
HOMEPAGE="http://wiki.rosalab.com/en/index.php/Blog:ROSA_Planet/ROSA_Image_Writer"
|
||||
[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
$(add_frameworks_dep kauth)
|
||||
$(add_frameworks_dep kcoreaddons)
|
||||
$(add_frameworks_dep ki18n)
|
||||
$(add_qt_dep qtgui)
|
||||
$(add_qt_dep qtwidgets)
|
||||
app-crypt/gpgme[cxx,qt5]
|
||||
virtual/libudev:=
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
Binary file not shown.
|
@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
|
|||
|
||||
LICENSE="CC0-1.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="static-libs native-cflags openmp"
|
||||
|
||||
DEPEND="
|
||||
|
|
|
@ -14,7 +14,7 @@ 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"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
|
||||
IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
|
||||
|
||||
# Test suite requires network access
|
||||
|
|
Binary file not shown.
|
@ -1,2 +1 @@
|
|||
DIST neovim-0.3.4.tar.gz 9231575 BLAKE2B 92e727264442794ae27642451c90381262f9882e26d9865a2ff6c1bc4060b070ab49cd11194c3a88dafecda5bc1909963b2cc8b382198dc7c117ba056b7a4ebe SHA512 fbf22ccffbb36c082bfe9a66b3d0180a78581102732a44ab7a5417aef517c88b69406491854613a1cf347ddab6fc6e277f959887556d2c0068cf181e4d88c36b
|
||||
DIST neovim-0.3.7.tar.gz 9231661 BLAKE2B 6eade77f8654bc95170f4c052c5700a6ad42aff920889bf4036e6ff931cdeeabb908aeedb44e68efca3500beb797cf2361e09d85456a2c17431e005a64bafff4 SHA512 1d770a4643a44da65f0a03c90e18e89f337b16ec3eca20dbffa21bcab10c836062ef82974437b64bd766f7b07317cd3dc8e3e72b9d5d0911b1d4f2c528cd20c2
|
||||
DIST neovim-0.3.8.tar.gz 9233661 BLAKE2B 252a64d2ac5ca1f8e1695d3f0f694ac333d9d9179dc4c428a279534e455de4b8d2c0dc6e638f775bb28a940fc1254bad426f7cee1bffaa2dbf84deefe49d41dc SHA512 431d3df859b430570e3f927328b862945a15b1ac041108599670d32af6cccac9361a143fc6af27847529629a43a5e0a0afd98b1c826d4ee1e7570de3cf14f9c7
|
||||
|
|
|
@ -1,96 +0,0 @@
|
|||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils xdg-utils
|
||||
|
||||
DESCRIPTION="Vim-fork focused on extensibility and agility."
|
||||
HOMEPAGE="https://neovim.io"
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/neovim/neovim.git"
|
||||
else
|
||||
SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0 vim"
|
||||
SLOT="0"
|
||||
IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
|
||||
|
||||
CDEPEND="
|
||||
dev-libs/libuv:0=
|
||||
dev-libs/msgpack:0=
|
||||
luajit? ( dev-lang/luajit:2 )
|
||||
!luajit? (
|
||||
dev-lang/lua:=
|
||||
dev-lua/LuaBitOp
|
||||
)
|
||||
tui? (
|
||||
dev-libs/libtermkey
|
||||
>=dev-libs/unibilium-2.0.0:0=
|
||||
)
|
||||
dev-libs/libvterm
|
||||
dev-lua/lpeg[luajit=]
|
||||
dev-lua/mpack[luajit=]
|
||||
jemalloc? ( dev-libs/jemalloc )
|
||||
net-libs/libnsl"
|
||||
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
dev-util/gperf
|
||||
virtual/libintl
|
||||
virtual/libiconv
|
||||
app-eselect/eselect-vi"
|
||||
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
python? ( dev-python/neovim-python-client )
|
||||
ruby? ( dev-ruby/neovim-ruby-client )
|
||||
remote? ( dev-python/neovim-remote )
|
||||
clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
|
||||
|
||||
CMAKE_BUILD_TYPE=Release
|
||||
|
||||
src_prepare() {
|
||||
# use our system vim dir
|
||||
sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
|
||||
-i src/nvim/globals.h || die
|
||||
|
||||
# add eclass to bash filetypes
|
||||
sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
|
||||
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DFEAT_TUI=$(usex tui)
|
||||
-DENABLE_JEMALLOC=$(usex jemalloc)
|
||||
-DPREFER_LUA=$(usex luajit no yes)
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
# install a default configuration file
|
||||
insinto /etc/vim
|
||||
doins "${FILESDIR}"/sysinit.vim
|
||||
|
||||
# conditionally install a symlink for nvimpager
|
||||
if use nvimpager; then
|
||||
dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
}
|
|
@ -5,7 +5,7 @@ EAPI=7
|
|||
|
||||
inherit cmake-utils xdg-utils
|
||||
|
||||
DESCRIPTION="Vim-fork focused on extensibility and agility."
|
||||
DESCRIPTION="Vim-fork focused on extensibility and agility"
|
||||
HOMEPAGE="https://neovim.io"
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
|
@ -20,9 +20,21 @@ LICENSE="Apache-2.0 vim"
|
|||
SLOT="0"
|
||||
IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
|
||||
|
||||
CDEPEND="
|
||||
BDEPEND="
|
||||
dev-util/gperf
|
||||
virtual/libiconv
|
||||
virtual/libintl
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/libuv:0=
|
||||
<dev-libs/libvterm-0.1
|
||||
dev-libs/msgpack:0=
|
||||
dev-lua/lpeg[luajit=]
|
||||
dev-lua/mpack[luajit=]
|
||||
net-libs/libnsl
|
||||
jemalloc? ( dev-libs/jemalloc )
|
||||
luajit? ( dev-lang/luajit:2 )
|
||||
!luajit? (
|
||||
dev-lang/lua:=
|
||||
|
@ -32,36 +44,24 @@ CDEPEND="
|
|||
dev-libs/libtermkey
|
||||
>=dev-libs/unibilium-2.0.0:0=
|
||||
)
|
||||
dev-libs/libvterm
|
||||
dev-lua/lpeg[luajit=]
|
||||
dev-lua/mpack[luajit=]
|
||||
jemalloc? ( dev-libs/jemalloc )
|
||||
net-libs/libnsl"
|
||||
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
dev-util/gperf
|
||||
virtual/libintl
|
||||
virtual/libiconv
|
||||
app-eselect/eselect-vi"
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
${DEPEND}
|
||||
app-eselect/eselect-vi
|
||||
python? ( dev-python/neovim-python-client )
|
||||
ruby? ( dev-ruby/neovim-ruby-client )
|
||||
remote? ( dev-python/neovim-remote )
|
||||
clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
|
||||
clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
|
||||
"
|
||||
|
||||
CMAKE_BUILD_TYPE=Release
|
||||
|
||||
src_prepare() {
|
||||
# use our system vim dir
|
||||
sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
|
||||
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
|
||||
-i src/nvim/globals.h || die
|
||||
|
||||
# add eclass to bash filetypes
|
||||
sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
|
||||
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
Binary file not shown.
|
@ -11,7 +11,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
|
|||
|
||||
LICENSE="GPL-3+ GPL-1+ FDL-1.3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
|
||||
KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
|
||||
IUSE="tex vm"
|
||||
RESTRICT="test" #631700
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ SRC_URI="https://github.com/knu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
|||
|
||||
LICENSE="GPL-2+ GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
|
||||
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="wanderlust"
|
||||
|
||||
RDEPEND="wanderlust? ( app-emacs/wanderlust )"
|
||||
|
|
|
@ -12,7 +12,7 @@ SRC_URI="https://github.com/wanderlust/flim/archive/${GITHUB_SHA1}.tar.gz -> ${P
|
|||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
|
||||
KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
|
||||
|
||||
DEPEND=">=app-emacs/apel-10.8"
|
||||
RDEPEND="${DEPEND}
|
||||
|
|
|
@ -12,7 +12,7 @@ SRC_URI="https://github.com/wanderlust/semi/archive/${GITHUB_SHA1}.tar.gz -> ${P
|
|||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
IUSE="l10n_ja"
|
||||
|
||||
DEPEND=">=app-emacs/apel-10.8
|
||||
|
|
|
@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/vm/${PV%.*}.x/${MY_PV}/+download/${MY_P}.tgz"
|
|||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc ~ppc64 x86"
|
||||
KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86"
|
||||
IUSE="bbdb ssl"
|
||||
|
||||
DEPEND="bbdb? ( app-emacs/bbdb )"
|
||||
|
|
|
@ -12,7 +12,7 @@ SRC_URI="https://github.com/wanderlust/wanderlust/archive/${GITHUB_SHA1}.tar.gz
|
|||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
IUSE="bbdb ssl l10n_ja"
|
||||
|
||||
DEPEND=">=app-emacs/apel-10.8
|
||||
|
|
Binary file not shown.
|
@ -36,7 +36,7 @@ LICENSE="GPL-2 PUEL"
|
|||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
|
||||
RESTRICT="mirror"
|
||||
RESTRICT="bindist mirror"
|
||||
|
||||
if [[ "${PV}" != *beta* ]] ; then
|
||||
SRC_URI+="
|
||||
|
|
|
@ -36,7 +36,7 @@ LICENSE="GPL-2 PUEL"
|
|||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
|
||||
RESTRICT="mirror"
|
||||
RESTRICT="bindist mirror"
|
||||
|
||||
if [[ "${PV}" != *beta* ]] ; then
|
||||
SRC_URI+="
|
||||
|
|
|
@ -36,7 +36,7 @@ SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_am
|
|||
LICENSE="GPL-2 PUEL"
|
||||
SLOT="0"
|
||||
IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
|
||||
RESTRICT="mirror"
|
||||
RESTRICT="bindist mirror"
|
||||
|
||||
if [[ "${PV}" != *beta* ]] ; then
|
||||
SRC_URI+="
|
||||
|
|
Binary file not shown.
|
@ -15,7 +15,7 @@ SRC_URI="
|
|||
|
||||
LICENSE="BSD GPL-2+ man-pages"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
|
||||
KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
BDEPEND="app-text/po4a"
|
||||
|
||||
|
|
Binary file not shown.
|
@ -1,3 +1,2 @@
|
|||
DIST pushgateway-0.7.0.tar.gz 1867703 BLAKE2B 588be72ba8f7b8421e36e7cb33ecc27e8f94c242e03d7a97b2f1f54c167373162a9e9e7dba63897e583331370b96723169359ebd78839a0bd1306f850dc24cc1 SHA512 2057c028e2427a9d63ad2fc47a0f367a9b075c259186659c7d20038d79aaa4f5a014a4304d36eee2e78c08af69e27f7f65e6aed2453c4fa630203fd4bf944c41
|
||||
DIST pushgateway-0.8.0.tar.gz 1869626 BLAKE2B 43c288c481160807324f4d247a9d03b1696be934e97dc852f0ee6732d56715a2c78b451247f62f5cd0d93d9ceff64b54ccb20a91d78496a915271b9080d5832c SHA512 fdb8b3e1cd11b7faa329e1b625c7d2d98635624f32623ae99a7bb1cf2222ed682cb9c031afec191a5426d6fafade7bb92add7dc607898e4a839252aca5f1d71c
|
||||
DIST pushgateway-0.9.0.tar.gz 4722706 BLAKE2B 6d024819a4729cb4e728a0d1b654be94881e4a439c734655a33f5dc7c978d09205bf97e51668c2da68319df14bf802a142342483c679f4add3bf2d0992f8bef2 SHA512 0dd98f3e35e2d13e4e5e30ee398121b663ebfde240654c49f44bb0b765065f35ecefd9ddaad706f7b9a5365ea2ef1afdebe57441fa2c18c211a8670d795719b0
|
||||
DIST pushgateway-0.9.1.tar.gz 4743766 BLAKE2B d0c605d562b64782c6a90e82efcfbb3866e017a61f8165632e3ee87ca1ae677d2d59192262b0086e2dd4c4210236c40666f5aff3203a1fcc208cf300b82599f1 SHA512 a3f10ab2b3fcc5c9c14b761b6bd12b9e885e5b948c540b9bd6cc0c825ef7cb6e787fcc94b204bd15fd8b2690242b43a77e5b0b85e69ddf832d0dc3ee668c7fcf
|
||||
|
|
|
@ -1,52 +0,0 @@
|
|||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
inherit user golang-build golang-vcs-snapshot systemd
|
||||
|
||||
EGO_PN="github.com/prometheus/pushgateway"
|
||||
EGIT_COMMIT="v${PV/_rc/-rc.}"
|
||||
GIT_COMMIT="d5a56ba"
|
||||
ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
|
||||
HOMEPAGE="https://github.com/prometheus/pushgateway"
|
||||
SRC_URI="${ARCHIVE_URI}"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=dev-lang/go-1.11
|
||||
dev-util/promu"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup ${PN}
|
||||
enewuser ${PN} -1 -1 -1 ${PN}
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
pushd src/${EGO_PN} || die
|
||||
mkdir -p bin || die
|
||||
GO111MODULE=on GOPATH="${S}" promu build -v --prefix bin || die
|
||||
popd || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
pushd src/${EGO_PN} || die
|
||||
dobin bin/pushgateway
|
||||
dodoc {README,CHANGELOG,CONTRIBUTING}.md
|
||||
popd || die
|
||||
keepdir /var/lib/${PN} /var/log/${PN}
|
||||
fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
|
||||
newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/${PN}.logrotated" "${PN}"
|
||||
systemd_dounit "${FILESDIR}/${PN}-1.service"
|
||||
}
|
|
@ -13,7 +13,7 @@ KEYWORDS="~amd64"
|
|||
DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
|
||||
HOMEPAGE="https://github.com/prometheus/pushgateway"
|
||||
SRC_URI="${ARCHIVE_URI}"
|
||||
LICENSE="Apache-2.0"
|
||||
LICENSE="Apache-2.0 BSD BSD-2 MIT"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EAPI=7
|
||||
inherit user golang-build golang-vcs-snapshot systemd
|
||||
|
||||
EGO_PN="github.com/prometheus/pushgateway"
|
||||
EGIT_COMMIT="v${PV/_rc/-rc.}"
|
||||
GIT_COMMIT="d90bf32"
|
||||
GIT_COMMIT="b4410a3"
|
||||
ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
|
||||
HOMEPAGE="https://github.com/prometheus/pushgateway"
|
||||
SRC_URI="${ARCHIVE_URI}"
|
||||
LICENSE="Apache-2.0"
|
||||
LICENSE="Apache-2.0 BSD BSD-2 MIT"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
|
@ -1 +1,2 @@
|
|||
DIST redis_exporter-0.20.2.tar.gz 970030 BLAKE2B 55bee727f196fad642944a444220d9f71958d812f5f5f4d79a0c741cada25f29690ff4f185ec4028cf5216139e5351022a134fb1b0f2b5b45b384a831dbf1802 SHA512 eee4cc9de79ea256571c9650abae6b044fc78b7683abef544d5313dad5d46d3516c55e939c33f87849cc52ed2465797d20b606e386aa4fe187dd16d30354173e
|
||||
DIST redis_exporter-1.1.1.tar.gz 1415085 BLAKE2B 0a687d68864ae00e52c46839c15b24f3ec394e2865ee9ca6fe158f9405da8e7641c8b1e7328e80074aa919c4b28c9cf6bd296bf213de5ff6d1c9c5c62f8c1ce9 SHA512 13d5cbb20b4b52e0d8eb71437f81c2aae10599e1bd2f3e6cd0a907197078298e8d2d8b9d068c0872894a581c1feb0656875f88338acace9c61842033c2d20e35
|
||||
|
|
|
@ -12,7 +12,7 @@ KEYWORDS="~amd64"
|
|||
DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
|
||||
HOMEPAGE="https://github.com/oliver006/redis_exporter"
|
||||
SRC_URI="${ARCHIVE_URI}"
|
||||
LICENSE="MIT"
|
||||
LICENSE="MIT Apache-2.0 BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
|
|
75
app-metrics/redis_exporter/redis_exporter-1.1.1.ebuild
Normal file
75
app-metrics/redis_exporter/redis_exporter-1.1.1.ebuild
Normal file
|
@ -0,0 +1,75 @@
|
|||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit user golang-build golang-vcs-snapshot systemd
|
||||
|
||||
EGO_PN="github.com/oliver006/redis_exporter"
|
||||
EGIT_COMMIT="1687c56fd0b53a6b36e2140b6c246a5fabe634c2"
|
||||
ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
|
||||
HOMEPAGE="https://github.com/oliver006/redis_exporter"
|
||||
SRC_URI="${ARCHIVE_URI}"
|
||||
LICENSE="MIT Apache-2.0 BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
S=${WORKDIR}/${P}/src/${EGO_PN}
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup ${PN}
|
||||
enewuser ${PN} -1 -1 -1 ${PN}
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -e "s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
|
||||
-e "s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date -u)\"|" \
|
||||
-e "s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|" \
|
||||
-i main.go || die
|
||||
|
||||
sed -e 's:TestCommandStats(:_\0:' \
|
||||
-e 's:TestExportClientList(:_\0:' \
|
||||
-e 's:TestGetKeyInfo(:_\0:' \
|
||||
-e 's:TestGetKeysFromPatterns(:_\0:' \
|
||||
-e 's:TestHTTPEndpoints(:_\0:' \
|
||||
-e 's:TestHostVariations(:_\0:' \
|
||||
-e 's:TestIncludeSystemMemoryMetric(:_\0:' \
|
||||
-e 's:TestKeySizeList(:_\0:' \
|
||||
-e 's:TestKeysReset(:_\0:' \
|
||||
-e 's:TestKeyValuesAndSizes(:_\0:' \
|
||||
-e 's:TestLatencySpike(:_\0:' \
|
||||
-e 's:TestLuaScript(:_\0:' \
|
||||
-e 's:TestScanForKeys(:_\0:' \
|
||||
-e 's:TestSimultaneousRequests(:_\0:' \
|
||||
-e 's:TestSlowLog(:_\0:' \
|
||||
-i exporter_test.go || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export -n GOCACHE XDG_CACHE_HOME #684052
|
||||
export GO111MODULE=on GOFLAGS="-mod=vendor -v -x" GOBIN="${WORKDIR}/${P}/bin"
|
||||
go install -work ${EGO_BUILD_FLAGS} \
|
||||
-ldflags="-X main.BuildVersion=${PV} -X main.BuildCommitSha=${EGIT_COMMIT} -X main.BuildDate=$(date +%F-%T)" \
|
||||
"${EGO_PN}" || die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
go test -work "${EGO_PN}" || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin "${GOBIN}/redis_exporter"
|
||||
dodoc README.md
|
||||
local dir
|
||||
for dir in /var/{lib,log}/${PN}; do
|
||||
keepdir "${dir}"
|
||||
fowners ${PN}:${PN} "${dir}"
|
||||
done
|
||||
newinitd "${FILESDIR}"/${PN}.initd ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}.confd ${PN}
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/${PN}.logrotated" "${PN}"
|
||||
systemd_dounit "${FILESDIR}/${PN}.service"
|
||||
}
|
|
@ -1 +1,2 @@
|
|||
DIST uwsgi_exporter-0.7.0.tar.gz 3039893 BLAKE2B a6efdae7f9a19ad21a283b586b5667bd99456274ed419d1b64aaf4cdb4df1e1c4fb2a08edf6df2b15813d21311fe54c2f2394f0bf25ac11c49db8a924596da05 SHA512 380ef4515eaa81d4dee853682efa7a5e82af2ec00c096e7471028c9932d46e0a7406b75cb40f0f8efec15cd77b06c5477a07919d0b44720e3e194b5bb023b593
|
||||
DIST uwsgi_exporter-0.8.0.tar.gz 3040547 BLAKE2B 5b6769487b3a08752cdff9dccc727096bc6b9d49e12e8aa35d04bbd0c3534503c19a4dda882c7efd7409549f3cae750021fa7ce87d12b798a2998efcdfc9f1cf SHA512 a5a1439f554749c7db4857651a11cbbf0ad0a0a8da0ffd421e374fe08194ba289a6bb04a95e4169ba6a75d0358c7a96e5b9f3cc5813cc39004f81dce42edb3ed
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
@ -13,7 +13,7 @@ KEYWORDS="~amd64"
|
|||
DESCRIPTION="uWSGI metrics exporter for prometheus.io"
|
||||
HOMEPAGE="https://github.com/timonwong/uwsgi_exporter"
|
||||
SRC_URI="${ARCHIVE_URI}"
|
||||
LICENSE="Apache-2.0"
|
||||
LICENSE="Apache-2.0 BSD ISC MIT"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
|
|
54
app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0.ebuild
Normal file
54
app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0.ebuild
Normal file
|
@ -0,0 +1,54 @@
|
|||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit user golang-build golang-vcs-snapshot systemd
|
||||
|
||||
EGO_PN="github.com/timonwong/uwsgi_exporter"
|
||||
EGIT_COMMIT="v${PV/_rc/-rc.}"
|
||||
UWSGI_EXPORTER_COMMIT="ddbc18f"
|
||||
ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DESCRIPTION="uWSGI metrics exporter for prometheus.io"
|
||||
HOMEPAGE="https://github.com/timonwong/uwsgi_exporter"
|
||||
SRC_URI="${ARCHIVE_URI}"
|
||||
LICENSE="Apache-2.0 BSD ISC MIT"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="dev-util/promu"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup ${PN}
|
||||
enewuser ${PN} -1 -1 -1 ${PN}
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i -e "s/{{.Revision}}/${UWSGI_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
pushd src/${EGO_PN} || die
|
||||
mkdir -p bin || die
|
||||
GOPATH="${S}" promu build -v --prefix bin || die
|
||||
popd || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
pushd src/${EGO_PN} || die
|
||||
dobin bin/uwsgi_exporter
|
||||
dodoc README.md
|
||||
popd || die
|
||||
local dir
|
||||
for dir in /var/{lib,log}/${PN}; do
|
||||
keepdir "${dir}"
|
||||
fowners ${PN}:${PN} "${dir}"
|
||||
done
|
||||
newinitd "${FILESDIR}"/${PN}.initd ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}.confd ${PN}
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/${PN}.logrotated" "${PN}"
|
||||
systemd_dounit "${FILESDIR}/${PN}.service"
|
||||
}
|
Binary file not shown.
|
@ -16,7 +16,7 @@ LICENSE="GPL-2"
|
|||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
DEPEND="
|
||||
sys-apps/portage[${PYTHON_USEDEP}]"
|
||||
|
|
|
@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
|
|||
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
|
||||
else
|
||||
SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
RDEPEND="
|
||||
|
|
Binary file not shown.
|
@ -31,6 +31,11 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
|
|||
|
||||
S="${WORKDIR}"/${MYP}-src
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
ada_pkg_setup
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
build () {
|
||||
gprbuild -j$(makeopts_jobs) -m -p -v \
|
||||
|
|
|
@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8ae231e87a8f1d425052
|
|||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="gnat_2019 +shared static-libs static-pic"
|
||||
IUSE="+shared static-libs static-pic"
|
||||
|
||||
RDEPEND="
|
||||
dev-ada/libgpr[${ADA_USEDEP},shared?,static-libs?,static-pic?]
|
||||
|
|
|
@ -1 +1,2 @@
|
|||
DIST gnatcoll-db-2019-src.tar.gz 2405755 BLAKE2B 70db599e8fe90a1312c2078379c6cddf518159fd8eea8c958d1abf4f4ccc504c8296e0018b03fe7f145619b6f73d6ce38b7a43cfd73dd5e1df7eb1949aa81043 SHA512 89e941a786b1d9591f4cb9f5f7db02875bb37638be7efb88e31087900c8c10ac52680f1246f90cda6fbac1b9ab213bf364d88bf583ad262f17c0a647492019a3
|
||||
DIST gnatcoll-db-gpl-2018-src.tar.gz 2375712 BLAKE2B d5678bdc0993b67d93bdd4cb33ee3ecba15f7cdeead173caaaa08312103505d97099037215a3b0699296aadfa0ef68327f28e01c6229db1fefc5b7d7ebf93187 SHA512 02c967b5951ef0e17e58874e03c9a6252f9c4b28100c9530fb88212e91bc692545f3acc8623477942db220bd54d56b494150b088d05c40f6a24aad8cf6a8f8de
|
||||
|
|
119
dev-ada/gnatcoll-db/gnatcoll-db-2019.ebuild
Normal file
119
dev-ada/gnatcoll-db/gnatcoll-db-2019.ebuild
Normal file
|
@ -0,0 +1,119 @@
|
|||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ADA_COMPAT=( gnat_201{6,7,8,9} )
|
||||
inherit ada multilib multiprocessing autotools python-single-r1
|
||||
|
||||
commitId="fbc46346dc67dfa83ae5132ef72fdd64fbe7e199"
|
||||
DESCRIPTION="GNAT Component Collection"
|
||||
HOMEPAGE="http://libre.adacore.com"
|
||||
SRC_URI="https://github.com/AdaCore/${PN}/archive/${commitId}.tar.gz
|
||||
-> ${P}-src.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="db2ada gnatinspect postgres
|
||||
+shared sql sqlite static-libs static-pic xref"
|
||||
|
||||
RDEPEND="dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
|
||||
sqlite? ( dev-db/sqlite:3 )
|
||||
postgres? ( dev-db/postgresql:* )
|
||||
xref? (
|
||||
dev-ada/gnatcoll-bindings[${ADA_USEDEP},iconv,shared?,static-libs?,static-pic?]
|
||||
)
|
||||
${ADA_DEPS}
|
||||
${PYTHON_DEPS}"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-ada/gprbuild[${ADA_USEDEP}]"
|
||||
|
||||
REQUIRED_USE="gnatinspect? ( xref )
|
||||
xref? ( sqlite )
|
||||
sqlite? ( sql )
|
||||
db2ada? ( sql )
|
||||
${ADA_REQUIRED_USE}
|
||||
${PYTHON_REQUIRED_USE}"
|
||||
|
||||
S="${WORKDIR}"/${PN}-${commitId}
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
|
||||
|
||||
pkg_setup () {
|
||||
python-single-r1_pkg_setup
|
||||
ada_setup
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
build () {
|
||||
GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \
|
||||
gprbuild -p -m -v -j$(makeopts_jobs) -XGNATCOLL_SQLITE=external \
|
||||
-XGNATCOLL_VERSION=2018 \
|
||||
-XBUILD=PROD -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 -XGPR_BUILD=$2 \
|
||||
-P $1/$3.gpr \
|
||||
-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
|
||||
}
|
||||
local lib
|
||||
for kind in shared static-libs static-pic ; do
|
||||
if use $kind; then
|
||||
lib=${kind%-libs}
|
||||
lib=${lib/shared/relocatable}
|
||||
for dir in sql sqlite xref postgres ; do
|
||||
if use $dir; then
|
||||
build $dir $lib gnatcoll_${dir}
|
||||
fi
|
||||
done
|
||||
fi
|
||||
done
|
||||
if use shared; then
|
||||
lib=relocatable
|
||||
elif use static-libs; then
|
||||
lib=static
|
||||
else
|
||||
lib=static-pic
|
||||
fi
|
||||
if use gnatinspect; then
|
||||
build gnatinspect ${lib} gnatinspect
|
||||
fi
|
||||
if use db2ada; then
|
||||
build gnatcoll_db2ada ${lib} gnatcoll_db2ada
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
build () {
|
||||
GPR_PROJECT_PATH="${D}/usr/share/gpr" gprinstall -p -f \
|
||||
-XBUILD=PROD -XGNATCOLL_VERSION=2018 \
|
||||
--prefix="${D}"/usr -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 \
|
||||
-XGPR_BUILD=$2 --build-name=$2 --build-var=LIBRARY_TYPE \
|
||||
-P $1/$3.gpr
|
||||
}
|
||||
local lib
|
||||
for kind in shared static-libs static-pic ; do
|
||||
if use $kind; then
|
||||
lib=${kind%-libs}
|
||||
lib=${lib/shared/relocatable}
|
||||
for dir in sql sqlite xref postgres ; do
|
||||
if use $dir; then
|
||||
build $dir $lib gnatcoll_${dir}
|
||||
fi
|
||||
done
|
||||
fi
|
||||
done
|
||||
if use shared; then
|
||||
lib=relocatable
|
||||
elif use static-libs; then
|
||||
lib=static
|
||||
else
|
||||
lib=static-pic
|
||||
fi
|
||||
if use gnatinspect; then
|
||||
build gnatinspect ${lib} gnatinspect
|
||||
fi
|
||||
if use db2ada; then
|
||||
build gnatcoll_db2ada ${lib} gnatcoll_db2ada
|
||||
fi
|
||||
rm -rf "${D}"/usr/share/gpr/manifests
|
||||
einstalldocs
|
||||
}
|
|
@ -6,6 +6,7 @@
|
|||
</maintainer>
|
||||
<use>
|
||||
<flag name="gnatcoll_db2ada">Build gnatcoll_db2ada</flag>
|
||||
<flag name="db2ada">Build gnatcoll_db2ada</flag>
|
||||
<flag name="gnatinspect">Build gnatinspect</flag>
|
||||
<flag name="shared">Build shared library</flag>
|
||||
<flag name="sql">Build sql library</flag>
|
||||
|
|
|
@ -53,6 +53,11 @@ S="${WORKDIR}"/${MYP}-src
|
|||
|
||||
PATCHES=( "${FILESDIR}"/${P}-r1-gentoo.patch )
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
ada_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
mv configure.{in,ac} || die
|
||||
|
|
|
@ -31,6 +31,11 @@ S="${WORKDIR}"/${PN}-gps-src
|
|||
|
||||
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
ada_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
rm -r ada/testsuite/tests/acats_parse || die
|
||||
|
|
|
@ -31,6 +31,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
|||
|
||||
S="${WORKDIR}"/${MYP}
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
ada_pkg_setup
|
||||
}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-gentoo.patch
|
||||
"${FILESDIR}"/${PN}-2017-gentoo.patch
|
||||
|
|
|
@ -32,6 +32,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
|||
|
||||
S="${WORKDIR}"/${MYP}
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
ada_pkg_setup
|
||||
}
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
|
||||
|
||||
src_configure() {
|
||||
|
|
Binary file not shown.
|
@ -12,7 +12,7 @@ MY_PV="${PV/_rc/-rc.}"
|
|||
DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
|
||||
HOMEPAGE="https://github.com/etcd-io/etcd"
|
||||
SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
|
||||
LICENSE="Apache-2.0"
|
||||
LICENSE="Apache-2.0 BSD BSD-2 MIT"
|
||||
SLOT="0"
|
||||
IUSE="doc +server"
|
||||
DEPEND=">=dev-lang/go-1.12:="
|
||||
|
|
|
@ -12,7 +12,7 @@ MY_PV="${PV/_rc/-rc.}"
|
|||
DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
|
||||
HOMEPAGE="https://github.com/etcd-io/etcd"
|
||||
SRC_URI="${HOMEPAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
|
||||
LICENSE="Apache-2.0"
|
||||
LICENSE="Apache-2.0 BSD BSD-2 MIT"
|
||||
SLOT="0"
|
||||
IUSE="doc +server"
|
||||
DEPEND=">=dev-lang/go-1.12:="
|
||||
|
@ -25,11 +25,16 @@ src_prepare() {
|
|||
sed -e 's:\(for p in \)shellcheck :\1 :' \
|
||||
-e 's:^ gofmt \\$:\\:' \
|
||||
-e 's:^ govet \\$:\\:' \
|
||||
-e 's:^ govet_shadow \\$:\\:' \
|
||||
-i "${S}"/src/${EGO_PN}/test || die
|
||||
# missing ... in args forwarded to print-like function
|
||||
sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
|
||||
-i "${S}"/src/${EGO_PN}/raft/logger.go || die
|
||||
|
||||
sed -e 's:TestGetDefaultInterface(:_\0:' \
|
||||
-e 's:TestGetDefaultHost(:_\0:' \
|
||||
-i "${S}"/src/${EGO_PN}/pkg/netutil/routes_linux_test.go || die
|
||||
|
||||
# Avoid network-sandbox violations since go-1.13
|
||||
rm src/${EGO_PN}/go.mod || die
|
||||
}
|
||||
|
|
|
@ -3,6 +3,7 @@ DIST mariadb-10.1.41.tar.gz 63615288 BLAKE2B 91ebc6d24c80ad9651c42a2f4553ce3ec3b
|
|||
DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b SHA512 cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2
|
||||
DIST mariadb-10.2.26.tar.gz 73037655 BLAKE2B 54fd27959960736bffe0eeacc913b9aed0407d1be7a60d3035a1b84cbe8066aa1551c1c82a1b90b824debf85faaa9d11e3de29634a0108bc04bc17ca5c2a9d7c SHA512 1eaac1c1dda1017b64249d39d872729d3140d81653240c54f688f64440b1775e5f3a7c5a8486075fa1799411dfb0c2c09b7c1dbb46d95675572d90127048c124
|
||||
DIST mariadb-10.3.17.tar.gz 71894997 BLAKE2B 8e04302f67a99c28751f9970b7e8dfc5ada0583fdabc416e0469e23fa93d22dae8b79e762ef14ca65957e22ec310a290b15d33746f6f2e7287f922803e6a6826 SHA512 6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e
|
||||
DIST mariadb-10.3.18.tar.gz 71950543 BLAKE2B d157426781713f19470004d80c587019e12c875d0958e5077ca373d856a8f1214be01dbc2a50fd5a754eaa91e727179bea70ee2a3133a219209cb819108c8940 SHA512 817253d18f20c74f9ec8030678fd50a28b1726fd59153023a3a5e9b3f79e1f44d79feb24ae9ed72d8c1c04017110c932aba7be0610fb06245590c7f5610db242
|
||||
DIST mariadb-10.4.7.tar.gz 78155161 BLAKE2B b2c92093438b3574e494bda2180f4a2b5cbe10bac1c46acc45b5303fb4c2a1ca54f3ea88d138ab9cbb492460171dde86f3c21e5873d964b15c6c064e2e6eb47f SHA512 cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce
|
||||
DIST mariadb-5.5.65.tar.gz 45957577 BLAKE2B 9ed27349d008d2001ed4059370505064918ef3586f89157f5f28892bceabd3073b7070f4054c0a700f1504dde3a4077e274111d5b8cb3713bc5db0910b752628 SHA512 5dbaa2ba7a829a0d5ae6ab8394c31a58753cd93da2637cd83d1e055e78b0796d63214418ddc91a65cefdd791aad4f01b0743aa8c7c40ecbb404cb81fd0138443
|
||||
DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 8b5feb32085dc35b2f68dae985b2d266c4eaa0e956b490050a2df04bbff99bf8623b67e75af9326d84e3ad625c4d86b0d21d23c9a96df5a0c9cd5ed730958970 SHA512 fbd7af9284bbf09d55f128361e7cc52d94f24ac491aac800cd6d61f2e444aeca66a4d5e6ae94c2fb4044e00cec9b232bae9a76a229f87f19d90b7aecf70792ec
|
||||
|
|
981
dev-db/mariadb/mariadb-10.3.18.ebuild
Normal file
981
dev-db/mariadb/mariadb-10.3.18.ebuild
Normal file
|
@ -0,0 +1,981 @@
|
|||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
MY_EXTRAS_VER="20190305-2052Z"
|
||||
SUBSLOT="18"
|
||||
|
||||
JAVA_PKG_OPT_USE="jdbc"
|
||||
|
||||
# Keeping eutils in EAPI=6 for emktemp in pkg_config
|
||||
|
||||
inherit eutils systemd flag-o-matic prefix toolchain-funcs \
|
||||
java-pkg-opt-2 user cmake-utils
|
||||
|
||||
SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
|
||||
|
||||
# Gentoo patches to MySQL
|
||||
if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
|
||||
SRC_URI="${SRC_URI}
|
||||
mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
|
||||
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
|
||||
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
|
||||
https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
|
||||
https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
|
||||
fi
|
||||
|
||||
HOMEPAGE="https://mariadb.org/"
|
||||
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
|
||||
LICENSE="GPL-2 LGPL-2.1+"
|
||||
SLOT="0/${SUBSLOT:-0}"
|
||||
IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
|
||||
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
|
||||
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
|
||||
sst-rsync sst-mariabackup static systemd systemtap tcmalloc
|
||||
test tokudb xml yassl"
|
||||
|
||||
# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
|
||||
RESTRICT="!bindist? ( bindist ) libressl? ( test )"
|
||||
|
||||
REQUIRED_USE="jdbc? ( extraengine server !static )
|
||||
server? ( tokudb? ( jemalloc !tcmalloc ) )
|
||||
?? ( tcmalloc jemalloc )
|
||||
static? ( yassl !pam )"
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
|
||||
|
||||
# Shorten the path because the socket path length must be shorter than 107 chars
|
||||
# and we will run a mysql server during test phase
|
||||
S="${WORKDIR}/mysql"
|
||||
|
||||
if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git"
|
||||
EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
|
||||
EGIT_CLONE_TYPE=shallow
|
||||
MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
|
||||
else
|
||||
MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
|
||||
fi
|
||||
|
||||
PATCHES=(
|
||||
"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
|
||||
"${MY_PATCH_DIR}"/20018_all_mariadb-10.3.12-without-clientlibs-tools.patch
|
||||
"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
|
||||
"${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
|
||||
"${MY_PATCH_DIR}"/20035_all_mariadb-10.3-atomic-detection.patch
|
||||
)
|
||||
|
||||
# Be warned, *DEPEND are version-dependant
|
||||
# These are used for both runtime and compiletime
|
||||
COMMON_DEPEND="
|
||||
kernel_linux? (
|
||||
sys-process/procps:0=
|
||||
dev-libs/libaio:0=
|
||||
)
|
||||
>=sys-apps/sed-4
|
||||
>=sys-apps/texinfo-4.7-r1
|
||||
jemalloc? ( dev-libs/jemalloc:0= )
|
||||
tcmalloc? ( dev-util/google-perftools:0= )
|
||||
systemtap? ( >=dev-util/systemtap-1.3:0= )
|
||||
>=sys-libs/zlib-1.2.3:0=
|
||||
kerberos? ( virtual/krb5 )
|
||||
yassl? ( net-libs/gnutls:0= )
|
||||
!yassl? (
|
||||
!libressl? ( >=dev-libs/openssl-1.0.0:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
)
|
||||
sys-libs/ncurses:0=
|
||||
!bindist? (
|
||||
sys-libs/binutils-libs:0=
|
||||
>=sys-libs/readline-4.1:0=
|
||||
)
|
||||
server? (
|
||||
backup? ( app-arch/libarchive:0= )
|
||||
cracklib? ( sys-libs/cracklib:0= )
|
||||
extraengine? (
|
||||
odbc? ( dev-db/unixODBC:0= )
|
||||
xml? ( dev-libs/libxml2:2= )
|
||||
)
|
||||
innodb-lz4? ( app-arch/lz4 )
|
||||
innodb-lzo? ( dev-libs/lzo )
|
||||
innodb-snappy? ( app-arch/snappy )
|
||||
mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
|
||||
numa? ( sys-process/numactl )
|
||||
oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
|
||||
pam? ( virtual/pam:0= )
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
tokudb? ( app-arch/snappy )
|
||||
)
|
||||
>=dev-libs/libpcre-8.41-r1:3=
|
||||
"
|
||||
DEPEND="virtual/yacc
|
||||
static? ( sys-libs/ncurses[static-libs] )
|
||||
|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
|
||||
server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
|
||||
${COMMON_DEPEND}"
|
||||
RDEPEND="selinux? ( sec-policy/selinux-mysql )
|
||||
!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
|
||||
server? ( !prefix? ( dev-db/mysql-init-scripts ) )
|
||||
!<virtual/mysql-5.6-r11
|
||||
${COMMON_DEPEND}
|
||||
server? ( galera? (
|
||||
sys-apps/iproute2
|
||||
=sys-cluster/galera-25*
|
||||
sst-rsync? ( sys-process/lsof )
|
||||
sst-mariabackup? ( net-misc/socat[ssl] )
|
||||
) )
|
||||
perl? ( !dev-db/mytop
|
||||
virtual/perl-Getopt-Long
|
||||
dev-perl/TermReadKey
|
||||
virtual/perl-Term-ANSIColor
|
||||
virtual/perl-Time-HiRes )
|
||||
server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
|
||||
"
|
||||
# For other stuff to bring us in
|
||||
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
|
||||
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
|
||||
server? ( ~virtual/mysql-5.6[static=] )"
|
||||
|
||||
pkg_setup() {
|
||||
if [[ ${MERGE_TYPE} != binary ]] ; then
|
||||
local GCC_MAJOR_SET=$(gcc-major-version)
|
||||
local GCC_MINOR_SET=$(gcc-minor-version)
|
||||
if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
|
||||
${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
|
||||
eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
|
||||
eerror "Please use gcc-config to switch to gcc-4.7 or later version."
|
||||
die
|
||||
fi
|
||||
# Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
|
||||
# non x86{,_64} arches
|
||||
if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
|
||||
${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
|
||||
eerror "${PN} needs to be built with gcc-4.7 or later."
|
||||
eerror "Please use gcc-config to switch to gcc-4.7 or later version."
|
||||
die
|
||||
fi
|
||||
fi
|
||||
java-pkg-opt-2_pkg_setup
|
||||
if has test ${FEATURES} && \
|
||||
use server && ! has userpriv ${FEATURES} ; then
|
||||
eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
|
||||
fi
|
||||
|
||||
# This should come after all of the die statements
|
||||
enewgroup mysql 60 || die "problem adding 'mysql' group"
|
||||
enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
java-pkg-opt-2_pkg_preinst
|
||||
|
||||
# Here we need to see if the implementation switched client libraries
|
||||
# We check if this is a new instance of the package and a client library already exists
|
||||
local SHOW_ABI_MESSAGE libpath
|
||||
if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
|
||||
libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
|
||||
elog "Due to ABI changes when switching between different client libraries,"
|
||||
elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
|
||||
elog "Please run: revdep-rebuild --library ${libpath}"
|
||||
ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Make sure the vars are correctly initialized
|
||||
mysql_init_vars
|
||||
|
||||
# Create log directory securely if it does not exist
|
||||
[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
|
||||
|
||||
if use server ; then
|
||||
if use pam; then
|
||||
einfo
|
||||
elog "This install includes the PAM authentication plugin."
|
||||
elog "To activate and configure the PAM plugin, please read:"
|
||||
elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
|
||||
einfo
|
||||
fi
|
||||
|
||||
if [[ -z "${REPLACING_VERSIONS}" ]] ; then
|
||||
einfo
|
||||
elog "You might want to run:"
|
||||
elog "\"emerge --config =${CATEGORY}/${PF}\""
|
||||
elog "if this is a new install."
|
||||
elog
|
||||
elog "If you are switching server implentations, you should run the"
|
||||
elog "mysql_upgrade tool."
|
||||
einfo
|
||||
else
|
||||
einfo
|
||||
elog "If you are upgrading major versions, you should run the"
|
||||
elog "mysql_upgrade tool."
|
||||
einfo
|
||||
fi
|
||||
|
||||
if use galera ; then
|
||||
einfo
|
||||
elog "Be sure to edit the my.cnf file to activate your cluster settings."
|
||||
elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
|
||||
elog "The first time the cluster is activated, you should add"
|
||||
elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
|
||||
elog "This option should then be removed for subsequent starts."
|
||||
einfo
|
||||
fi
|
||||
fi
|
||||
|
||||
# Note about configuration change
|
||||
einfo
|
||||
elog "This version of mariadb reorganizes the configuration from a single my.cnf"
|
||||
elog "to several files in /etc/mysql/${PN}.d."
|
||||
elog "Please backup any changes you made to /etc/mysql/my.cnf"
|
||||
elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
|
||||
elog "You may have as many files as needed and they are read alphabetically."
|
||||
elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
|
||||
einfo
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
# Grab the patches
|
||||
[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
|
||||
|
||||
mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
_disable_plugin() {
|
||||
echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
|
||||
}
|
||||
_disable_engine() {
|
||||
echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
|
||||
}
|
||||
|
||||
if use jemalloc; then
|
||||
echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt"
|
||||
elif use tcmalloc; then
|
||||
echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
|
||||
fi
|
||||
|
||||
# Don't build bundled xz-utils for tokudb
|
||||
echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
|
||||
sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
|
||||
sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
|
||||
|
||||
local plugin
|
||||
local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
|
||||
locale_info qc_info server_audit sql_errlog auth_ed25519 )
|
||||
local test_plugins=( audit_null auth_examples daemon_example fulltext
|
||||
debug_key_management example_key_management versioning )
|
||||
if ! use server; then # These plugins are for the server
|
||||
for plugin in "${server_plugins[@]}" ; do
|
||||
_disable_plugin "${plugin}"
|
||||
done
|
||||
fi
|
||||
|
||||
if ! use test; then # These plugins are only used during testing
|
||||
for plugin in "${test_plugins[@]}" ; do
|
||||
_disable_plugin "${plugin}"
|
||||
done
|
||||
_disable_engine test_sql_discovery
|
||||
fi
|
||||
|
||||
_disable_engine example
|
||||
|
||||
if ! use oqgraph ; then # avoids extra library checks
|
||||
_disable_engine oqgraph
|
||||
fi
|
||||
|
||||
if use mroonga ; then
|
||||
# Remove the bundled groonga
|
||||
# There is no CMake flag, it simply checks for existance
|
||||
rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
|
||||
else
|
||||
_disable_engine mroonga
|
||||
fi
|
||||
|
||||
# Don't clash with dev-db/mysql-connector-c
|
||||
sed -i -e 's/ my_print_defaults.1//' \
|
||||
-e 's/ perror.1//' \
|
||||
"${S}"/man/CMakeLists.txt || die
|
||||
|
||||
cmake-utils_src_prepare
|
||||
java-pkg-opt-2_src_prepare
|
||||
}
|
||||
|
||||
src_configure(){
|
||||
# bug 508724 mariadb cannot use ld.gold
|
||||
tc-ld-disable-gold
|
||||
# Bug #114895, bug #110149
|
||||
filter-flags "-O" "-O[01]"
|
||||
|
||||
append-cxxflags -felide-constructors
|
||||
|
||||
# bug #283926, with GCC4.4, this is required to get correct behavior.
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
CMAKE_BUILD_TYPE="RelWithDebInfo"
|
||||
|
||||
# debug hack wrt #497532
|
||||
mycmakeargs=(
|
||||
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
|
||||
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
|
||||
-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
|
||||
-DSYSCONFDIR="${EPREFIX}/etc/mysql"
|
||||
-DINSTALL_BINDIR=bin
|
||||
-DINSTALL_DOCDIR=share/doc/${PF}
|
||||
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
|
||||
-DINSTALL_INCLUDEDIR=include/mysql
|
||||
-DINSTALL_INFODIR=share/info
|
||||
-DINSTALL_LIBDIR=$(get_libdir)
|
||||
-DINSTALL_MANDIR=share/man
|
||||
-DINSTALL_MYSQLSHAREDIR=share/mariadb
|
||||
-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
|
||||
-DINSTALL_SCRIPTDIR=share/mariadb/scripts
|
||||
-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
|
||||
-DINSTALL_SBINDIR=sbin
|
||||
-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
|
||||
-DWITH_COMMENT="Gentoo Linux ${PF}"
|
||||
-DWITH_UNIT_TESTS=$(usex test ON OFF)
|
||||
-DWITH_LIBEDIT=0
|
||||
-DWITH_ZLIB=system
|
||||
-DWITHOUT_LIBWRAP=1
|
||||
-DENABLED_LOCAL_INFILE=1
|
||||
-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
|
||||
-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
|
||||
-DWITH_DEFAULT_COMPILER_OPTIONS=0
|
||||
-DWITH_DEFAULT_FEATURE_SET=0
|
||||
-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
|
||||
# The build forces this to be defined when cross-compiling. We pass it
|
||||
# all the time for simplicity and to make sure it is actually correct.
|
||||
-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
|
||||
-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
|
||||
-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
|
||||
-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
|
||||
-DCONC_WITH_EXTERNAL_ZLIB=YES
|
||||
-DWITH_EXTERNAL_ZLIB=YES
|
||||
-DSUFFIX_INSTALL_DIR=""
|
||||
-DWITH_UNITTEST=OFF
|
||||
-DWITHOUT_CLIENTLIBS=YES
|
||||
-DCLIENT_PLUGIN_DIALOG=OFF
|
||||
-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
|
||||
-DCLIENT_PLUGIN_CLIENT_ED25519=OFF
|
||||
-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
|
||||
-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
|
||||
)
|
||||
if use test ; then
|
||||
mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
|
||||
else
|
||||
mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
|
||||
fi
|
||||
|
||||
if ! use yassl ; then
|
||||
mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
|
||||
else
|
||||
mycmakeargs+=( -DWITH_SSL=bundled )
|
||||
fi
|
||||
|
||||
# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
|
||||
mycmakeargs+=(
|
||||
-DWITH_READLINE=$(usex bindist 1 0)
|
||||
-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
|
||||
-DENABLE_DTRACE=$(usex systemtap)
|
||||
)
|
||||
|
||||
if use server ; then
|
||||
|
||||
# Federated{,X} must be treated special otherwise they will not be built as plugins
|
||||
if ! use extraengine ; then
|
||||
mycmakeargs+=(
|
||||
-DPLUGIN_FEDERATED=NO
|
||||
-DPLUGIN_FEDERATEDX=NO )
|
||||
fi
|
||||
|
||||
mycmakeargs+=(
|
||||
-DWITH_PCRE=system
|
||||
-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
|
||||
-DPLUGIN_SPHINX=$(usex sphinx YES NO)
|
||||
-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
|
||||
-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
|
||||
-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
|
||||
-DPLUGIN_CASSANDRA=NO
|
||||
-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
|
||||
-DPLUGIN_SPIDER=$(usex extraengine YES NO)
|
||||
-DPLUGIN_CONNECT=$(usex extraengine YES NO)
|
||||
-DCONNECT_WITH_MYSQL=1
|
||||
-DCONNECT_WITH_LIBXML2=$(usex xml)
|
||||
-DCONNECT_WITH_ODBC=$(usex odbc)
|
||||
-DCONNECT_WITH_JDBC=$(usex jdbc)
|
||||
# Build failure and autodep wrt bug 639144
|
||||
-DCONNECT_WITH_MONGO=OFF
|
||||
-DWITH_WSREP=$(usex galera)
|
||||
-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
|
||||
-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
|
||||
-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
|
||||
-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
|
||||
-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
|
||||
-DWITH_MARIABACKUP=$(usex backup ON OFF)
|
||||
-DWITH_LIBARCHIVE=$(usex backup ON OFF)
|
||||
-DINSTALL_SQLBENCHDIR=""
|
||||
-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
|
||||
# systemd is only linked to for server notification
|
||||
-DWITH_SYSTEMD=$(usex systemd yes no)
|
||||
-DWITH_NUMA=$(usex numa ON OFF)
|
||||
)
|
||||
|
||||
# Workaround for MDEV-14524
|
||||
use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
|
||||
|
||||
if use test ; then
|
||||
# This is needed for the new client lib which tests a real, open server
|
||||
mycmakeargs+=( -DSKIP_TESTS=ON )
|
||||
fi
|
||||
|
||||
if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
|
||||
ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
|
||||
ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
|
||||
ewarn "You MUST file bugs without these variables set."
|
||||
|
||||
mycmakeargs+=(
|
||||
-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
|
||||
-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
|
||||
)
|
||||
|
||||
elif ! use latin1 ; then
|
||||
mycmakeargs+=(
|
||||
-DDEFAULT_CHARSET=utf8
|
||||
-DDEFAULT_COLLATION=utf8_general_ci
|
||||
)
|
||||
else
|
||||
mycmakeargs+=(
|
||||
-DDEFAULT_CHARSET=latin1
|
||||
-DDEFAULT_COLLATION=latin1_swedish_ci
|
||||
)
|
||||
fi
|
||||
mycmakeargs+=(
|
||||
-DEXTRA_CHARSETS=all
|
||||
-DMYSQL_USER=mysql
|
||||
-DDISABLE_SHARED=$(usex static YES NO)
|
||||
-DWITH_DEBUG=$(usex debug)
|
||||
-DWITH_EMBEDDED_SERVER=OFF
|
||||
-DWITH_PROFILING=$(usex profiling)
|
||||
)
|
||||
|
||||
if use static; then
|
||||
mycmakeargs+=( -DWITH_PIC=1 )
|
||||
fi
|
||||
|
||||
if use jemalloc || use tcmalloc ; then
|
||||
mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
|
||||
fi
|
||||
|
||||
# Storage engines
|
||||
mycmakeargs+=(
|
||||
-DWITH_ARCHIVE_STORAGE_ENGINE=1
|
||||
-DWITH_BLACKHOLE_STORAGE_ENGINE=1
|
||||
-DWITH_CSV_STORAGE_ENGINE=1
|
||||
-DWITH_HEAP_STORAGE_ENGINE=1
|
||||
-DWITH_INNOBASE_STORAGE_ENGINE=1
|
||||
-DWITH_MYISAMMRG_STORAGE_ENGINE=1
|
||||
-DWITH_MYISAM_STORAGE_ENGINE=1
|
||||
-DWITH_PARTITION_STORAGE_ENGINE=1
|
||||
)
|
||||
|
||||
else
|
||||
mycmakeargs+=(
|
||||
-DWITHOUT_SERVER=1
|
||||
-DWITH_EMBEDDED_SERVER=OFF
|
||||
-DEXTRA_CHARSETS=none
|
||||
-DINSTALL_SQLBENCHDIR=
|
||||
-DWITH_SYSTEMD=no
|
||||
)
|
||||
fi
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake-utils_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
|
||||
if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
|
||||
rm "${ED}/usr/include/mysql/server/private/config.h" || die
|
||||
fi
|
||||
|
||||
# Make sure the vars are correctly initialized
|
||||
mysql_init_vars
|
||||
|
||||
# Convenience links
|
||||
einfo "Making Convenience links for mysqlcheck multi-call binary"
|
||||
dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
|
||||
dosym "mysqlcheck" "/usr/bin/mysqlrepair"
|
||||
dosym "mysqlcheck" "/usr/bin/mysqloptimize"
|
||||
|
||||
# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
|
||||
if [[ -d "${ED}/usr/data" ]] ; then
|
||||
rm -Rf "${ED}/usr/data" || die
|
||||
fi
|
||||
|
||||
# Unless they explicitly specific USE=test, then do not install the
|
||||
# testsuite. It DOES have a use to be installed, esp. when you want to do a
|
||||
# validation of your database configuration after tuning it.
|
||||
if ! use test ; then
|
||||
rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
|
||||
fi
|
||||
|
||||
# Configuration stuff
|
||||
einfo "Building default configuration ..."
|
||||
insinto "${MY_SYSCONFDIR#${EPREFIX}}"
|
||||
[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
|
||||
cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
|
||||
eprefixify "${TMPDIR}/my.cnf"
|
||||
doins "${TMPDIR}/my.cnf"
|
||||
insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
|
||||
cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
|
||||
eprefixify "${TMPDIR}/50-distro-client.cnf"
|
||||
doins "${TMPDIR}/50-distro-client.cnf"
|
||||
|
||||
if use server ; then
|
||||
mycnf_src="my.cnf.distro-server"
|
||||
sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
|
||||
"${FILESDIR}/${mycnf_src}" \
|
||||
> "${TMPDIR}/my.cnf.ok" || die
|
||||
if use prefix ; then
|
||||
sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
|
||||
"${TMPDIR}/my.cnf.ok" || die
|
||||
fi
|
||||
if use latin1 ; then
|
||||
sed -i \
|
||||
-e "/character-set/s|utf8|latin1|g" \
|
||||
"${TMPDIR}/my.cnf.ok" || die
|
||||
fi
|
||||
eprefixify "${TMPDIR}/my.cnf.ok"
|
||||
newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
|
||||
|
||||
einfo "Including support files and sample configurations"
|
||||
docinto "support-files"
|
||||
local script
|
||||
for script in \
|
||||
"${S}"/support-files/magic
|
||||
do
|
||||
[[ -f "$script" ]] && dodoc "${script}"
|
||||
done
|
||||
|
||||
docinto "scripts"
|
||||
for script in "${S}"/scripts/mysql* ; do
|
||||
[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
|
||||
done
|
||||
# Manually install supporting files that conflict with other packages
|
||||
# but are needed for galera and initial installation
|
||||
exeinto /usr/libexec/mariadb
|
||||
doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
|
||||
fi
|
||||
|
||||
# Remove mytop if perl is not selected
|
||||
if [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl ; then
|
||||
rm -f "${ED}/usr/bin/mytop" || die
|
||||
fi
|
||||
|
||||
# Fix a dangling symlink when galera is not built
|
||||
if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
|
||||
rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
|
||||
fi
|
||||
|
||||
# Remove broken SST scripts that are incompatible
|
||||
local scriptremove
|
||||
for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
|
||||
if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
|
||||
rm "${ED}/usr/bin/${scriptremove}" || die
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
# Official test instructions:
|
||||
# USE='extraengine perl server' \
|
||||
# FEATURES='test userpriv -usersandbox' \
|
||||
# ebuild mariadb-X.X.XX.ebuild \
|
||||
# digest clean package
|
||||
src_test() {
|
||||
|
||||
_disable_test() {
|
||||
local rawtestname reason
|
||||
rawtestname="${1}" ; shift
|
||||
reason="${@}"
|
||||
ewarn "test '${rawtestname}' disabled: '${reason}'"
|
||||
echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
|
||||
}
|
||||
|
||||
local TESTDIR="${BUILD_DIR}/mysql-test"
|
||||
local retstatus_unit
|
||||
local retstatus_tests
|
||||
|
||||
if ! use server ; then
|
||||
einfo "Skipping server tests due to minimal build."
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Bug #213475 - MySQL _will_ object strenously if your machine is named
|
||||
# localhost. Also causes weird failures.
|
||||
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
|
||||
|
||||
if [[ $UID -eq 0 ]]; then
|
||||
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
|
||||
fi
|
||||
has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
|
||||
|
||||
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
|
||||
|
||||
# Run CTest (test-units)
|
||||
cmake-utils_src_test
|
||||
retstatus_unit=$?
|
||||
|
||||
# Ensure that parallel runs don't die
|
||||
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
|
||||
# Enable parallel testing, auto will try to detect number of cores
|
||||
# You may set this by hand.
|
||||
# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
|
||||
export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
|
||||
|
||||
# create directories because mysqladmin might run out of order
|
||||
mkdir -p "${T}"/var-tests{,/log} || die
|
||||
|
||||
# Run mysql tests
|
||||
pushd "${TESTDIR}" > /dev/null || die
|
||||
|
||||
touch "${T}/disabled.def"
|
||||
# These are failing in MariaDB 10.0 for now and are believed to be
|
||||
# false positives:
|
||||
#
|
||||
# main.mysql_client_test, main.mysql_client_test_nonblock
|
||||
# main.mysql_client_test_comp:
|
||||
# segfaults at random under Portage only, suspect resource limits.
|
||||
|
||||
local t
|
||||
for t in plugins.cracklib_password_check plugins.two_password_validations ; do
|
||||
_disable_test "$t" "False positive due to varying policies"
|
||||
done
|
||||
|
||||
for t in main.mysql_client_test main.mysql_client_test_nonblock \
|
||||
main.mysql main.gis_notembedded \
|
||||
main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam ; do
|
||||
_disable_test "$t" "False positives in Gentoo"
|
||||
done
|
||||
|
||||
_disable_test main.plugin_auth "Needs client libraries built"
|
||||
_disable_test plugins.auth_ed25519 "Needs client libraries built"
|
||||
|
||||
_disable_test main.func_time "Dependent on time test was written"
|
||||
|
||||
# run mysql-test tests
|
||||
perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
|
||||
retstatus_tests=$?
|
||||
|
||||
popd > /dev/null || die
|
||||
|
||||
# Cleanup is important for these testcases.
|
||||
pkill -9 -f "${S}/ndb" 2>/dev/null
|
||||
pkill -9 -f "${S}/sql" 2>/dev/null
|
||||
|
||||
local failures=""
|
||||
[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
|
||||
[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
|
||||
|
||||
[[ -z "$failures" ]] || die "Test failures: $failures"
|
||||
einfo "Tests successfully completed"
|
||||
}
|
||||
|
||||
mysql_init_vars() {
|
||||
MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
|
||||
MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
|
||||
MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
|
||||
MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
|
||||
|
||||
if [[ -z "${MY_DATADIR}" ]] ; then
|
||||
MY_DATADIR=""
|
||||
if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
|
||||
MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
|
||||
| sed -ne '/datadir/s|^--datadir=||p' \
|
||||
| tail -n1`
|
||||
if [[ -z "${MY_DATADIR}" ]] ; then
|
||||
MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
|
||||
| sed -e 's/.*=\s*//' \
|
||||
| tail -n1`
|
||||
fi
|
||||
fi
|
||||
if [[ -z "${MY_DATADIR}" ]] ; then
|
||||
MY_DATADIR="${MY_LOCALSTATEDIR}"
|
||||
einfo "Using default MY_DATADIR"
|
||||
fi
|
||||
elog "MySQL MY_DATADIR is ${MY_DATADIR}"
|
||||
|
||||
if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
|
||||
if [[ -e "${MY_DATADIR}" ]] ; then
|
||||
# If you get this and you're wondering about it, see bug #207636
|
||||
elog "MySQL datadir found in ${MY_DATADIR}"
|
||||
elog "A new one will not be created."
|
||||
PREVIOUS_DATADIR="yes"
|
||||
else
|
||||
PREVIOUS_DATADIR="no"
|
||||
fi
|
||||
export PREVIOUS_DATADIR
|
||||
fi
|
||||
else
|
||||
if [[ ${EBUILD_PHASE} == "config" ]]; then
|
||||
local new_MY_DATADIR
|
||||
new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
|
||||
| sed -ne '/datadir/s|^--datadir=||p' \
|
||||
| tail -n1`
|
||||
|
||||
if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
|
||||
ewarn "MySQL MY_DATADIR has changed"
|
||||
ewarn "from ${MY_DATADIR}"
|
||||
ewarn "to ${new_MY_DATADIR}"
|
||||
MY_DATADIR="${new_MY_DATADIR}"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
export MY_SHAREDSTATEDIR MY_SYSCONFDIR
|
||||
export MY_LOCALSTATEDIR MY_LOGDIR
|
||||
export MY_DATADIR
|
||||
}
|
||||
|
||||
pkg_config() {
|
||||
_getoptval() {
|
||||
local mypd="${EROOT}"usr/libexec/mariadb/my_print_defaults
|
||||
local section="$1"
|
||||
local flag="--${2}="
|
||||
local extra_options="${3}"
|
||||
"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
|
||||
}
|
||||
local old_MY_DATADIR="${MY_DATADIR}"
|
||||
local old_HOME="${HOME}"
|
||||
# my_print_defaults needs to read stuff in $HOME/.my.cnf
|
||||
export HOME=${EPREFIX}/root
|
||||
|
||||
# Make sure the vars are correctly initialized
|
||||
mysql_init_vars
|
||||
|
||||
[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
|
||||
if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
|
||||
die "Minimal builds do NOT include the MySQL server"
|
||||
fi
|
||||
|
||||
if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
|
||||
local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
|
||||
MY_DATADIR_s="${MY_DATADIR_s%%/}"
|
||||
local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
|
||||
old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
|
||||
|
||||
if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
|
||||
if [[ -d "${MY_DATADIR_s}" ]]; then
|
||||
ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
|
||||
ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
|
||||
else
|
||||
elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
|
||||
mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
|
||||
|| die "Moving MY_DATADIR failed"
|
||||
fi
|
||||
else
|
||||
ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
|
||||
if [[ -d "${MY_DATADIR_s}" ]]; then
|
||||
ewarn "Attempting to use ${MY_DATADIR_s}"
|
||||
else
|
||||
eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
|
||||
die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
local pwd1="a"
|
||||
local pwd2="b"
|
||||
local maxtry=15
|
||||
|
||||
if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
|
||||
local tmp_mysqld_password_source=
|
||||
|
||||
for tmp_mysqld_password_source in mysql client; do
|
||||
einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
|
||||
MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
|
||||
if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
|
||||
if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
|
||||
ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
|
||||
MYSQL_ROOT_PASSWORD=
|
||||
continue
|
||||
fi
|
||||
|
||||
einfo "Found password in '${tmp_mysqld_password_source}' section!"
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
# Sometimes --show is required to display passwords in some implementations of my_print_defaults
|
||||
if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
|
||||
MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
|
||||
fi
|
||||
|
||||
unset tmp_mysqld_password_source
|
||||
fi
|
||||
MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)"
|
||||
# These are dir+prefix
|
||||
MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)"
|
||||
MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
|
||||
MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)"
|
||||
MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
|
||||
|
||||
if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
|
||||
einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
|
||||
install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
|
||||
fi
|
||||
if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
|
||||
einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
|
||||
install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
|
||||
fi
|
||||
if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
|
||||
einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
|
||||
install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
|
||||
fi
|
||||
|
||||
if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
|
||||
ewarn "You have already a MySQL database in place."
|
||||
ewarn "(${ROOT}/${MY_DATADIR}/*)"
|
||||
ewarn "Please rename or delete it if you wish to replace it."
|
||||
die "MySQL database already exists!"
|
||||
fi
|
||||
|
||||
# Bug #213475 - MySQL _will_ object strenously if your machine is named
|
||||
# localhost. Also causes weird failures.
|
||||
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
|
||||
|
||||
if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
|
||||
|
||||
einfo "Please provide a password for the mysql 'root' user now"
|
||||
einfo "or through the ${HOME}/.my.cnf file."
|
||||
ewarn "Avoid [\"'\\_%] characters in the password"
|
||||
read -rsp " >" pwd1 ; echo
|
||||
|
||||
einfo "Retype the password"
|
||||
read -rsp " >" pwd2 ; echo
|
||||
|
||||
if [[ "x$pwd1" != "x$pwd2" ]] ; then
|
||||
die "Passwords are not the same"
|
||||
fi
|
||||
MYSQL_ROOT_PASSWORD="${pwd1}"
|
||||
unset pwd1 pwd2
|
||||
fi
|
||||
|
||||
local options
|
||||
local sqltmp="$(emktemp)"
|
||||
|
||||
# Fix bug 446200. Don't reference host my.cnf, needs to come first,
|
||||
# see https://bugs.mysql.com/bug.php?id=31312
|
||||
use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
|
||||
|
||||
# Figure out which options we need to disable to do the setup
|
||||
local helpfile="${TMPDIR}/mysqld-help"
|
||||
"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
|
||||
for opt in grant-tables host-cache name-resolve networking slave-start \
|
||||
federated ssl log-bin relay-log slow-query-log external-locking \
|
||||
log-slave-updates \
|
||||
; do
|
||||
optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
|
||||
egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
|
||||
done
|
||||
|
||||
einfo "Creating the mysql database and setting proper permissions on it ..."
|
||||
|
||||
# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
|
||||
PID_DIR="${EROOT}/var/run/mysqld"
|
||||
if [[ ! -d "${PID_DIR}" ]]; then
|
||||
install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
|
||||
fi
|
||||
|
||||
if [[ ! -d "${MY_DATADIR}" ]]; then
|
||||
install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
|
||||
fi
|
||||
|
||||
pushd "${TMPDIR}" &>/dev/null || die
|
||||
|
||||
# Filling timezones, see
|
||||
# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
|
||||
"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
|
||||
|
||||
local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
|
||||
[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
|
||||
cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
|
||||
einfo "Command: ${cmd[*]}"
|
||||
su -s /bin/sh -c "${cmd[*]}" mysql \
|
||||
>"${TMPDIR}"/mysql_install_db.log 2>&1
|
||||
if [ $? -ne 0 ]; then
|
||||
grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
|
||||
die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
|
||||
fi
|
||||
popd &>/dev/null || die
|
||||
[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
|
||||
|| die "MySQL databases not installed"
|
||||
|
||||
use prefix || options="${options} --user=mysql"
|
||||
|
||||
local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
|
||||
local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
|
||||
local mysqld="${EROOT}/usr/sbin/mysqld \
|
||||
${options} \
|
||||
--log-warnings=0 \
|
||||
--basedir=${EROOT}/usr \
|
||||
--datadir=${ROOT}/${MY_DATADIR} \
|
||||
--max_allowed_packet=8M \
|
||||
--net_buffer_length=16K \
|
||||
--socket=${socket} \
|
||||
--pid-file=${pidfile} \
|
||||
--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
|
||||
#einfo "About to start mysqld: ${mysqld}"
|
||||
ebegin "Starting mysqld"
|
||||
einfo "Command ${mysqld}"
|
||||
${mysqld} &
|
||||
rc=$?
|
||||
while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
|
||||
maxtry=$((${maxtry}-1))
|
||||
echo -n "."
|
||||
sleep 1
|
||||
done
|
||||
eend $rc
|
||||
|
||||
if ! [[ -S "${socket}" ]]; then
|
||||
die "Completely failed to start up mysqld with: ${mysqld}"
|
||||
fi
|
||||
|
||||
ebegin "Setting root password"
|
||||
# Do this from memory, as we don't want clear text passwords in temp files
|
||||
local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
|
||||
"${EROOT}/usr/bin/mysql" \
|
||||
"--socket=${socket}" \
|
||||
-hlocalhost \
|
||||
-e "${sql}"
|
||||
eend $?
|
||||
|
||||
if [[ -n "${sqltmp}" ]] ; then
|
||||
ebegin "Loading \"zoneinfo\", this step may require a few seconds"
|
||||
"${EROOT}/usr/bin/mysql" \
|
||||
"--socket=${socket}" \
|
||||
-hlocalhost \
|
||||
-uroot \
|
||||
--password="${MYSQL_ROOT_PASSWORD}" \
|
||||
mysql < "${sqltmp}"
|
||||
rc=$?
|
||||
eend $?
|
||||
[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
|
||||
fi
|
||||
|
||||
# Stop the server and cleanup
|
||||
einfo "Stopping the server ..."
|
||||
kill $(< "${pidfile}" )
|
||||
rm -f "${sqltmp}"
|
||||
wait %1
|
||||
einfo "Done"
|
||||
}
|
|
@ -27,7 +27,7 @@ KEYWORDS="~amd64"
|
|||
DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
|
||||
|
||||
HOMEPAGE="https://github.com/rqlite/rqlite http://www.philipotoole.com/tag/rqlite/"
|
||||
LICENSE="MIT"
|
||||
LICENSE="MIT BSD MPL-2.0"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
EGIT_REPO_URI="https://${EGO_PN}.git"
|
||||
|
|
Binary file not shown.
|
@ -45,7 +45,7 @@ LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
|
|||
SLOT="1.8"
|
||||
IUSE="alsa commercial cups doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
|
||||
REQUIRED_USE="javafx? ( alsa fontconfig )"
|
||||
RESTRICT="fetch preserve-libs strip"
|
||||
RESTRICT="bindist fetch preserve-libs strip"
|
||||
QA_PREBUILT="*"
|
||||
|
||||
# NOTES:
|
||||
|
|
|
@ -23,7 +23,7 @@ LICENSE="Oracle-BCLA-JavaSE"
|
|||
SLOT="${PV%%.*}"
|
||||
IUSE="alsa commercial cups doc +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux source"
|
||||
REQUIRED_USE="javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )"
|
||||
RESTRICT="fetch preserve-libs strip"
|
||||
RESTRICT="bindist fetch preserve-libs strip"
|
||||
QA_PREBUILT="*"
|
||||
|
||||
# NOTES:
|
||||
|
|
|
@ -29,7 +29,7 @@ HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
|
|||
LICENSE="Oracle-BCLA-JavaSE"
|
||||
SLOT="1.8"
|
||||
IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux"
|
||||
RESTRICT="fetch preserve-libs strip"
|
||||
RESTRICT="bindist fetch preserve-libs strip"
|
||||
QA_PREBUILT="*"
|
||||
|
||||
# NOTES:
|
||||
|
|
|
@ -4,15 +4,13 @@ DIST apache-tomcat-5.5.34-src.tar.gz 3720299 BLAKE2B 9ec9171f7fb5aa43a3d7df0d3e0
|
|||
DIST apache-tomcat-6.0.44-src.tar.gz 3447711 BLAKE2B 7baf1fc24a7c9aba7e2ddac63fe0c0975178616bfad8cd625d2910d18ad9b00cd85c98ba4a1ada251119629b96ff464ac623857f6928e3b9465708cdf5bc7513 SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be
|
||||
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
|
||||
DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
|
||||
DIST apache-tomcat-7.0.94-src.tar.gz 4966331 BLAKE2B e806baa91ebe4672fb238d6fd461b2055ff90db822b7edb2ad4432334d45cf2c2286639bc12f83987972a47129493bef4ba6ec77e544a93e000282a2d24ae9e8 SHA512 5e8d2fab7145af5677170299bec0ae5ea5fd20b7a539738678a420581f9b53a95a6fbb1caffb54c7222d97edfe8ff34ce6dbb7ba62adb1a61f2bfa6b15c43139
|
||||
DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
|
||||
DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
|
||||
DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
|
||||
DIST apache-tomcat-8.5.42-src.tar.gz 5293083 BLAKE2B 4439b6a894aaa8d8db041ff25d3614271d895155d86250e25dfffc8355452d7c230bf81c22f4b75dcdb5cb528af489a8dcad6c93561a89a2aa8cea5173792331 SHA512 e06f3a0cacde6317a1f10f95a17cb7a460c81e3437a68f53da94aafdcbd528e29ed612bd0ffc5f2a3641417558348c4c0e66c1ae937bf709f9f74f79a339ad05
|
||||
DIST apache-tomcat-8.5.43-src.tar.gz 5283886 BLAKE2B 2d76e66eedf4de474d439289a9a491e5c490e2373bc91ae30113b8f3c624255339d24149b58fba640aaf3131ab3c9a449930049d26928627e1b7910f0cddd40f SHA512 f6a0439dbfd3f233bd1eb395d37466ba2cce32cd456d067fb2bb45099ac173dec7e42e7fbfab2cb50c0fce2e9dba1f1afe6c8d65877525cb13cb116489cf27a7
|
||||
DIST apache-tomcat-8.5.45-src.tar.gz 5324847 BLAKE2B 5ef3388b9324bb04772543c03686057b3035f5a5f40009d0aa1ec34fe18d04af87527bcc9ae0566f41faf64de8ce191f8ea4e2ed2869da569777621aad227d6c SHA512 1fe94b9d5ccf63d2c5fc3dd7a47dabade160ed2882848e0a41422b5a67215d53e8265535ee8e645157d56c4eba9093722982684be6668064648b0782fc48927a
|
||||
DIST apache-tomcat-9.0.21-src.tar.gz 5717051 BLAKE2B 004c5256e72c62e885a9d9040396d144d9fa73789a9699eb38210212f4ca6fa5f98c4b092f6fa2165166fd8cccc892eabcaee7a21570645ee057b0b61d3e1942 SHA512 6df978bbe9bb3a327d784d81a46affa4cfe5d370c2b847e102d25a792752ba487ebae329d1763ed7459cb3d49098c3d0cf6b01155536a04c17c4ffdf9e9a774f
|
||||
DIST apache-tomcat-9.0.22-src.tar.gz 5722896 BLAKE2B 1a006840e870ec01455285b324405e3d1ab7214daf9ea929be749a05149d6b84bcccf34787ba791a31be0d2bb295ede0dddff5053adef885080b31bc39e24ac1 SHA512 b3806caaef24821fb4b96fb1af86e0c04381d9e8943a9f94064e028e623f57b6f2ba056e62f1997bbca934fb929ee92ffecd0d0192dd08d59e2f7dde6848c5cf
|
||||
DIST apache-tomcat-8.5.46-src.tar.gz 5599021 BLAKE2B 3755f15612e63ac06cbfa097f1531dc36542ba559a6ef60230b133e45d14bb4c4c54d4dcc8b05b9996f54ac253fb1630f6a6e900ee00e4af0a9200f83455a952 SHA512 02e93cc6fb4226e81b03ae60f479e15b438b1c68c1a4104200db9cc473939b92d66eea12f0783727b06f643d11ebe3da2a81c80cbe486ed497a3280e8cdb2e62
|
||||
DIST apache-tomcat-9.0.24-src.tar.gz 5746934 BLAKE2B fe0ff76fd8b3caa2860c0798d66f0dfff1e907ca02d10913c768d8513b207ef11e8fe885cd7578348136b8d007e08ccc2044952198259ffcdb2d58acf9fbb8b6 SHA512 de11d0e992cce08edb83474bd4cab04857e3e2bf63ef334c8c9f3ad053edcc76691e831cc95b8c489b820773a6fa5d2755837b470d73471f9587bb7062d75a31
|
||||
DIST apache-tomcat-9.0.26-src.tar.gz 5750303 BLAKE2B 582acae0f24cab5fdd44c085b36e771508020d124f9329036b3bf0698da1fb2cda69d6f4254eeaca00ce3c34c3740fe69c077637107167fface60b9fa74c8869 SHA512 8f430439c66f5a43c7a35bc99edd11549100be28b17fb44e17ec432f72e1797cdebd641a7f19c1d918635e51c164ecd1c9d1399a63abfce05d9a8c37db381837
|
||||
DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
|
||||
DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
|
||||
|
|
|
@ -1,38 +0,0 @@
|
|||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
JAVA_PKG_IUSE="source"
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2
|
||||
|
||||
MY_A="apache-${P}-src"
|
||||
MY_P="${MY_A/-servlet-api/}"
|
||||
DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
|
||||
HOMEPAGE="https://tomcat.apache.org/"
|
||||
SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3.0"
|
||||
KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=virtual/jdk-1.6"
|
||||
RDEPEND=">=virtual/jre-1.6"
|
||||
|
||||
S="${WORKDIR}/${MY_P}/"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
|
||||
rm -fR */*/build.xml ||die
|
||||
java-pkg_clean
|
||||
|
||||
java-pkg-2_src_prepare
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar "${S}"/output/build/lib/*.jar
|
||||
use source && java-pkg_dosrc java/javax/servlet/
|
||||
}
|
|
@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
|
|||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3.0"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=virtual/jdk-1.6"
|
||||
|
|
|
@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
|
|||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3.1"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=virtual/jdk-1.7"
|
||||
|
|
|
@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
|
|||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3.1"
|
||||
KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=virtual/jdk-1.7"
|
|
@ -1,39 +0,0 @@
|
|||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
JAVA_PKG_IUSE="source"
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2
|
||||
|
||||
MY_A="apache-${PN}-${PV}-src"
|
||||
MY_P="${MY_A/-servlet-api/}"
|
||||
DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
|
||||
HOMEPAGE="https://tomcat.apache.org/"
|
||||
SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="4.0"
|
||||
KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=virtual/jdk-1.8"
|
||||
RDEPEND=">=virtual/jre-1.8"
|
||||
|
||||
S="${WORKDIR}/${MY_P}/"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
|
||||
rm -fR */*/build.xml
|
||||
einfo "Removing bundled jars and classes"
|
||||
find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
|
||||
|
||||
java-pkg-2_src_prepare
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar "${S}"/output/build/lib/*.jar
|
||||
use source && java-pkg_dosrc java/javax/servlet/
|
||||
}
|
|
@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
|
|||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="4.0"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=virtual/jdk-1.8"
|
||||
|
|
Binary file not shown.
|
@ -27,14 +27,14 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
|
|||
LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]}
|
||||
|
||||
RDEPEND="
|
||||
sys-devel/llvm:8
|
||||
!experimental? ( sys-devel/llvm:8[${LLVM_TARGET_USEDEPS// /,}] )
|
||||
sys-devel/clang:8
|
||||
sys-devel/llvm:9
|
||||
!experimental? ( sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}] )
|
||||
sys-devel/clang:9
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
LLVM_MAX_SLOT=8
|
||||
LLVM_MAX_SLOT=9
|
||||
|
||||
llvm_check_deps() {
|
||||
has_version "sys-devel/clang:${LLVM_SLOT}"
|
||||
|
|
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue