root
5 years ago
parent
12050819da
commit
b713168367
@ -1,23 +1,23 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA512
|
||||
|
||||
MANIFEST Manifest.files.gz 29616 BLAKE2B 642e9e4ca681c317c90d1f7562868d1572495675a133aabba622c5d6a6e47114e65eb38d95ae65755c31c564f1c4b93502acdad816b82f9590d4ef8159655df7 SHA512 2c9aecfb9850977b658c84f3762ecc3a3d47b9a943180bc04c6011267422790d1618a42d8da4d445cd2063b306a4ff5ecffe8a07c8fd9bb770628a007832446e
|
||||
TIMESTAMP 2019-09-20T06:38:56Z
|
||||
MANIFEST Manifest.files.gz 29674 BLAKE2B 97ddb9a79df98dedebf560a4328afece652565c57944446d1a823dbb95c489e312e43f3c7bb4de0ff29e337ef4df654a426afd36a3c4e08af490ff2c40c31ae7 SHA512 3b240a6b5d5dca83d006a383b14a16c567870feb86b2c41ad32cf597823e8ff1019fa2f662748b5edfba5249576a07a3d4f14993cbd3645b2cb2de5024a72234
|
||||
TIMESTAMP 2019-09-21T13:08:58Z
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2EdABfFIAAAAAALgAo
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2GIOpfFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
|
||||
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
|
||||
klDt2xAAsgG2POwNyrqbttCBbhlduGyP1M1S/szoHm+A9pCheacBpi43v6qUtPnC
|
||||
BtwxL5KAFnxbrqdv6aZlXr6GV5pYr3cLPkBYxUMIBByyoxDWEVDNwazYoTKXDHoD
|
||||
/GMhQIxr9m3oQAdtneEnOL0j90vpUBoeXWnXcfMkGP923SZ3ov1f07XF/2KdUkLA
|
||||
cDaz6QiU6K1VTVP2iy/sCBOip9JS/riZ2ajJLDaQ0WOFk9GeTfV5NK0XLYzXErkl
|
||||
gcSnU0zLpQcoetScZdeoYLzMiFG1R2PX5TIyWPbllRu963UHEZdBzKruleoy51RZ
|
||||
v1RxiMMMhB++k0DygUxRgELhoeb9UpQSEqkMBkEf3ry+AuIBz0ehUZESo/EFkorJ
|
||||
qy3JSWjwYoUIkOKgNCCQ1Er/8WavZ/qx2Bskv2+IFzSCtaaQEhInoUVDo6U7nhTL
|
||||
s/B7yVvhb8POhMGPtIZ1EzHnjA+o21GfetDj9DOY46s5RedEKILq1c7v2LRoU/5z
|
||||
d8aJS6sFQyBMIo0vLFhUbnKvTc/FmyzZV52dDpznLu824Mkco+SQKf02evOzMlcF
|
||||
9k19CAuuJC4sbYNwfmQ/gY0epvvMvcObBqtgfjnJCupOOgQ2dj0ldb8d1zKnGWI/
|
||||
WQnZ6sojXfJ1NeRW7Bt5+g8zze+WPr3GvF2kjc6brr9c+3/c+VQ=
|
||||
=aC+x
|
||||
klDjpA/+PtzKWIUOlyLQAwUEl6Ow4h7LhVtqWRdgbyD4236ryWbB+Jq7YV5a9MVL
|
||||
XbMdh5DS/cbNp3q0mRt4b9I5i7n3pw7NSmeYQAIt2WMzvV/+9zZ6SzWmu+3IMenA
|
||||
M27+IrYrTNbv6XO0rtnUi1xDn5LW1EwyHKzGcGtB6FhsoBR35E07MbKtwujlzegz
|
||||
Cv/2awrqSoHleF/zsrqP4RpE1azQtySV+RYwwlKfxddFnlfxI9A1c1KwA1QpnEG0
|
||||
Hq7jN/+ZZUqdF6DcSRM4CsU4gAIYAaKLOjSrNBU73+oaNMPRDBtT740Y+KiEzB+T
|
||||
eGEjrG8criAMLrU/KvIfVRC3HEyyaChHmMX7iHZDscxKpZOCQUyctXwviCD38Tof
|
||||
U3en6BVESAhuya6Asvs536Xz4dkW8yhr0o2uSjTeAb30tQpi7jsfRHuqClgQajwv
|
||||
uRNM179WuqOppqyksQ5ZjDyVYCLrZLH2Was6+U05OC27AMUI69J5VPQ8ZldtiG9t
|
||||
qTBVg4apDRXkAA7nx0WG/BrosbvUNS3SB/XQPeZodpsUNMNeSVhbY1fuX0n4rfer
|
||||
2WfVBHb8hAFpNYLJX79MtdfwtY1lBIJtiTGLlHxye/yjbjdSa5uuxNkWspAphSVq
|
||||
sgEQGZ8mYZ2vMIlFMmDJVn5Y5EFOZ0Oo9rR49+335Nmbhv1GjTo=
|
||||
=gzMQ
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,2 @@
|
||||
EBUILD mythtv-0.ebuild 200 BLAKE2B fd4521f5b3f9679ae8d66bf91f6d3e5f33bd70b0aaea2c2ec1b847b54219ceb6e417f03ec720566b397cd8316a75133352b22797c2d8602c10282b430f063b3a SHA512 178002b4ca332186c00fed04c23cc72c165c4763a76fb0c0622c63f30158bd58ad94e28532294802f8424a42dd01fb0f9fa771b5a858bb7147bf33e89a8599f5
|
||||
MISC metadata.xml 455 BLAKE2B 71fb9fc2bd9de635517e9914f659750a99c7531809a766741e635ebfd4cfd41399d8fa3b2ca6a16ddc6d44fbe617990960033c6aae8f6c64a412f86f6821a3f7 SHA512 26e6dc12b46f5e6bfc254b5031aa0e3dd2448047f1ec557d4164db2713430185e124870824e49909f5bcdaabec6ac798025b5623b2336d4780b1a7720d1ca5ab
|
||||
@ -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>
|
||||
@ -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,0 +1,2 @@
|
||||
EBUILD spectrum-0.ebuild 208 BLAKE2B d46694cacabfbb186b1015485107d87cace121ccc6f9ae06e53392b2e9b40329a621f7495318a3806874ae08e9341c2384c0e6f0b958da79e011335184445feb SHA512 62a3bdbb0126c543a5d4010abc0a44dcd66363d839dc371d5de96339116166fd284eb1e3ce8b74973eb9569632ef05aa7c329f37181e0580e8fcd9aee3f4f050
|
||||
MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
|
||||
@ -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>
|
||||
@ -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,0 +1,2 @@
|
||||
EBUILD mythtv-0.ebuild 317 BLAKE2B 97701bd0b66f802a85520ab43e418ac797419cd92904a5de86a7f38970d03a81808f4d6748fd7ff2e1db0900a5ca7832787bf6b8d4e44d688540efaddfca9c71 SHA512 4e394efa3f4fa4bb16716269a3b32662247b2bffde8a25e103e7c5615d976678346ff0cdd73238745b3e26a96502187cc8fce9f3b33f83f5a08471db4460a6d7
|
||||
MISC metadata.xml 371 BLAKE2B d947e1bb44b48f4cb0bcdc6670cfc2158ee817b23054232a95dd2065160eef05f9c58120a7f9e8e5601bd28b52f2d3c0e26200d4895b3d9f4fd49c5d419a4632 SHA512 02d0a41cc9695ca052d6d9cef8c513a7e6a93c5048240c85b7f26e2510dd06429fa1ead13fa3052758fb2d8cdbe6dc75dcac98095d6ac451ebce062648cafbca
|
||||
@ -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>
|
||||
@ -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,0 +1,2 @@
|
||||
EBUILD spectrum-0.ebuild 293 BLAKE2B ac8b23eb0ce03fc1672c5254eec8f99800bb77aae1bd60f6f64aca618414ec03fa2a87b2090f074551c54b818798d3b921101ed7c3f4aba17ebb7c2505d416ba SHA512 49fb990144d2963a4eb2de04b655008c2344f2709669cba3d4bd6d59beedf0e1ae1ae5b1b433e3d8ba71ea954c766b731a8cb8661674a4e9b3c535c0d0252c1e
|
||||
MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
|
||||
@ -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>
|
||||
@ -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.
@ -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
|
||||
}
|
||||
@ -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
|
||||
}
|
||||
@ -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,6 +1,8 @@
|
||||
AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
|
||||
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
|
||||
EBUILD puppetserver-6.4.0.ebuild 5370 BLAKE2B b3b8bbba45305b658c94fcc43c9e2d11b854e80f536e5e3c3afc7c4182f954b9491f47eb83529dbd00a894b793c9a0cf660ed7b52051b840b24e7fedec97a6b2 SHA512 31b6e681af9dd22d9388a447237289e3e48d79d2e7e1ba79d10e70084b99a9d7cf99fdd19b58a210f990ed1b202af2367a0e0911f8579a876ff284413f6051ce
|
||||
EBUILD puppetserver-6.5.0.ebuild 5370 BLAKE2B b3b8bbba45305b658c94fcc43c9e2d11b854e80f536e5e3c3afc7c4182f954b9491f47eb83529dbd00a894b793c9a0cf660ed7b52051b840b24e7fedec97a6b2 SHA512 31b6e681af9dd22d9388a447237289e3e48d79d2e7e1ba79d10e70084b99a9d7cf99fdd19b58a210f990ed1b202af2367a0e0911f8579a876ff284413f6051ce
|
||||
EBUILD puppetserver-6.6.0.ebuild 5372 BLAKE2B a4a00a13309207dc0cfc8f584bab29add3a2dd21c83cc1ca165e55631002fdb645c036665f55f580c27776dd4ac67dc993749a01d9938189442020660ab70598 SHA512 cc4934c876b59eb4eed05e4bbde2c6973623236c5fe243a4b6245aff2816477cbe9f168c89dfb9530ef5a2cd1f67410c8c532e5c8b6b29426ac2c6f18b189c19
|
||||
MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
|
||||
|
||||
@ -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;
|
||||
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
AUX deb2targz-any-data.patch 602 BLAKE2B ee85b284a594cc937e73ea66c24960fdbecf547742c1db010d90e10af72aa667c267fb13f858ca221d80c16af26c09fcaa9812567f0f5b7e9b015d5a44d3cb66 SHA512 0dfc301d17b171e52867e0837701596b60c697cc7a0520f0c003be8146d1d1470305186d443c1f7a4757938b06b2261cfb66f84f5a5776998681b9300bc20903
|
||||
DIST deb2targz 1947 BLAKE2B bfbe08a5671bda8da3a5d897f58aca863988a9ec7b7cf23ee81fb45e2bf85bd8b0909457bdc2cb545d42ccb5f56fda5559bd40547231c1c52441bf0b3560173b SHA512 9b6a533fbe232721304f3bc1d9ea952f78fb108ace3bd0a0eab206be8462bc547ff49ab9310f209079b9ed6f86413c8f0819a117b95c67b6082e37d416716b1c
|
||||
EBUILD deb2targz-1-r2.ebuild 646 BLAKE2B 4bbad5f015e86c02b923ae39fbbe51eb6c04c95b5977dae1de48faffcb698c611401cfebad4d06b13aec7ea8acb365254fa26267be0c60e6a103634d17797d0b SHA512 496a8acfabeff21f0f0e14dba5242d23f1cd1820c7b0bc2ebb2cce8ac5ab12582a9d1dfd75966f2ca915303064ff06962e4b48da89bc2b7ff4101fca0e2dee2b
|
||||
EBUILD deb2targz-1-r3.ebuild 621 BLAKE2B 9675e0d880bc2e2797682e2e1a822f8a56828a47c27790e22947665f64a8e9ab5fe4ff980926870811f359a0258314288aabbc6bfb6bce6fa84c71b0c118b87a SHA512 442565cb6432a71ba16b404d286e4219d90ed46593d2be85a8cb3be3949bf8fecf0282ddbda34f0f85a564e03e07755a52ddf7faf4547982e88383bfe5ba095a
|
||||
EBUILD deb2targz-1-r3.ebuild 620 BLAKE2B 1c133e08f12e80914d91deac2faf9e6944b50b992aef3bdcc781e9066d4f58b5add1a9e6607e4c41ca0058bdc399d8919ad779007124016397b123382e2de2a2 SHA512 d9e5da4e10599eca4159cd8c8804777b82bd95d4a343245281c203252431cd239ee716a58097046e049ffb1257e899f8b88a6d38b73a78a64996e0077986ce64
|
||||
MISC metadata.xml 213 BLAKE2B a6b42a8b7c6f0c5a0b853af172e748301d2f4b9f2aa0424e217029affb54c88b1061dd970241a942e59a2a5ec66521ab9b67818181c03bd1dd019965e39eab3d SHA512 bddb1ae151571d0cd8833b083fd24fb4f1372e8fef6e726833ac8837abff03fb86ef85c7d954837ac82ecb906f1be4418d32d1011a2bc4be7711f2ab69a43380
|
||||
|
||||
Binary file not shown.
@ -1,5 +1,3 @@
|
||||
DIST isoimagewriter-0.2.tar.xz 423900 BLAKE2B 36ce0b0bba3d955c4e10d003a3bded9ec55931b6496c5b1c91c83b6c8d3fa29e033a833d6c16a81f098a16f57cac0dae638719d389892d0336a28a6cdbd24151 SHA512 cec7d67e8255caaaccc14d07da3677a13b8081f599136516b0a31262e20eec884fa738dcc2d3aa1bfd49c00bb6c5bc6c3a62c767b13cdb06799cb53cf1e6ecc1
|
||||
DIST isoimagewriter-0.8.tar.xz 430368 BLAKE2B d540ca0ee874b633618480ff5cc30ceea5f0aef84e3e4b0236fc6474ce590661ca8728a3719cc733cc791d14cfdcaad609ffa32d79b99df141381aa3f35edec8 SHA512 1d5031695647be54e5de10f6243b68bf8d2dc29a7894c8ac69954df353d5baa740290b572c89cd37650718749117f5e3b25dd99b8b374d8ba0376288878f9199
|
||||
EBUILD isoimagewriter-0.2.ebuild 603 BLAKE2B 76462bfe8373be5885da3ab8a1c97122505fc909f259306ccc7abfea84d4333031adc5f89e0cd78a6f56eb5205e0580cc9fe3c42758632449791d80bc9222152 SHA512 11a294090f6429f6c37feb9e5ba61e977b38b5d1d220a0777f0531000ce47377b1f63bf7143cec6b92c5be4c623594bd00d2db52e2bb4e92f2fd55e63b273353
|
||||
EBUILD isoimagewriter-0.8.ebuild 603 BLAKE2B 76462bfe8373be5885da3ab8a1c97122505fc909f259306ccc7abfea84d4333031adc5f89e0cd78a6f56eb5205e0580cc9fe3c42758632449791d80bc9222152 SHA512 11a294090f6429f6c37feb9e5ba61e977b38b5d1d220a0777f0531000ce47377b1f63bf7143cec6b92c5be4c623594bd00d2db52e2bb4e92f2fd55e63b273353
|
||||
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
|
||||
|
||||
@ -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.
@ -1,5 +1,5 @@
|
||||
DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
|
||||
DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073
|
||||
EBUILD libb2-0.98.1-r1.ebuild 1733 BLAKE2B dc7520e6c9afc014e3f17872faf899caf60948e613d7bac5ced1d0fbf347eb952a004f3734740f45fb953a5d2f26830af6c52fff53d08776545d99d9e2e00bb6 SHA512 ca04cff95ca0ee050249643b04f7889c4a30ddd7a60c854c377c96b7ed52722af1d156f2305abde640abbeaf014d506470da116374f0d629f9430ec20e6257e6
|
||||
EBUILD libb2-0.98.1-r1.ebuild 1732 BLAKE2B 935c36d9cf85cb24511646e81c817627553897270d7d889f8ed00e5e7e19ba72630385aa18980094749d82507bbf1246c0fb56d9f4db6cf895deaa55d97526b2 SHA512 a470032f923e0ec8f2f6a8b8bc5a8f33e1df005c94bd302af221990d07daf36950d68e57ab05333c72393ebe0d1e8975327a338d6155035cd573143a3f487edb
|
||||
EBUILD libb2-0.98.ebuild 1015 BLAKE2B 8f6fc70a953aea90fa5dbecd894dd5b1335fe9bf737547f8c2c42ab46cc8b718f0bf1ad941b54820b36ce62829a3d2d4d0de1d6e8c34c90c839d4019781a0765 SHA512 7d1a55ff33988e20ab4588f17dc0a1d982c02ea785e1d9535ff740b923129c5491282191e77d6a8dddcb500bce22626face82b40354fcb4da207a2bdcbbdab2b
|
||||
MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
|
||||
|
||||
Binary file not shown.
@ -1,7 +1,5 @@
|
||||
AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
|
||||
DIST neovim-0.3.4.tar.gz 9231575 BLAKE2B 92e727264442794ae27642451c90381262f9882e26d9865a2ff6c1bc4060b070ab49cd11194c3a88dafecda5bc1909963b2cc8b382198dc7c117ba056b7a4ebe SHA512 fbf22ccffbb36c082bfe9a66b3d0180a78581102732a44ab7a5417aef517c88b69406491854613a1cf347ddab6fc6e277f959887556d2c0068cf181e4d88c36b
|
||||
DIST neovim-0.3.7.tar.gz 9231661 BLAKE2B 6eade77f8654bc95170f4c052c5700a6ad42aff920889bf4036e6ff931cdeeabb908aeedb44e68efca3500beb797cf2361e09d85456a2c17431e005a64bafff4 SHA512 1d770a4643a44da65f0a03c90e18e89f337b16ec3eca20dbffa21bcab10c836062ef82974437b64bd766f7b07317cd3dc8e3e72b9d5d0911b1d4f2c528cd20c2
|
||||
EBUILD neovim-0.3.4-r1.ebuild 2015 BLAKE2B 4e87d237bb7fcab7d05749b59ea83799a59c0cf57cf2fa5316703b3b93f973fa2e67482d9077a188d3494763f398b759e0d5405d0489fd81225520b31a20f55d SHA512 3a7c3e4ca89a13305d584f5bba7889d041666ede0f54e4f399e76f7f35ad11fa549a4c1e20e7cf8807342a97e6522285fc56f3249a768d0805a636790e910e0a
|
||||
EBUILD neovim-0.3.7.ebuild 2015 BLAKE2B 4e87d237bb7fcab7d05749b59ea83799a59c0cf57cf2fa5316703b3b93f973fa2e67482d9077a188d3494763f398b759e0d5405d0489fd81225520b31a20f55d SHA512 3a7c3e4ca89a13305d584f5bba7889d041666ede0f54e4f399e76f7f35ad11fa549a4c1e20e7cf8807342a97e6522285fc56f3249a768d0805a636790e910e0a
|
||||
DIST neovim-0.3.8.tar.gz 9233661 BLAKE2B 252a64d2ac5ca1f8e1695d3f0f694ac333d9d9179dc4c428a279534e455de4b8d2c0dc6e638f775bb28a940fc1254bad426f7cee1bffaa2dbf84deefe49d41dc SHA512 431d3df859b430570e3f927328b862945a15b1ac041108599670d32af6cccac9361a143fc6af27847529629a43a5e0a0afd98b1c826d4ee1e7570de3cf14f9c7
|
||||
EBUILD neovim-0.3.8.ebuild 1921 BLAKE2B 37b80b8a916af164511bcb3f7aac79428045f9e14ecafe2a8c36aae8d72ebc387874017b1a5cb8bc0f663dc20f2b57979eb11f6cd12cc67a6295c9a722d84207 SHA512 f6f55b612bdc1964995d8016f917279e936f76b929291011282a42eb34471a9fefe9b298d950447693984b3ba575cd3fe1ea4fdcc4e8cf5f5c00c028a44ab40d
|
||||
EBUILD neovim-9999.ebuild 1953 BLAKE2B 628bf1d0fd2883e930722178b9530a8b391bd23fe5dd69cafcf4027bf5ebea2ef4085d2ce2e09e27e97f4ab67f8c00baafddf4759a6754c132c3b75c61992fce SHA512 964119b4ac52f276a558fc9cb01edfc585cdf6aee0be64b62344f8382db501196e06f847e34b71b7de8ae0c3510dedcd9efc281b3d7a4e54054fe97a7a8d09ef
|
||||
MISC metadata.xml 638 BLAKE2B 04414f861c324475a2884bfb4d06aee0a81bc4d934702102826c0ee7a2ec4da1a6ee40fd8369031e0d1bb8c4102d7d9ec60cc375ca83e32f895cbd5556bf06e6 SHA512 9c037165687b9a6959cdbbf9583c1ac8974a58ed0ef34b9f6ba2fdb157be895823c1956ee1bc0a6dd8cbba405399847377ce860c2d2740160f7b2475d34323b9
|
||||
|
||||
@ -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
|
||||
}
|
||||
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
AUX 50bbdb-gentoo-3.1.2.el 63 BLAKE2B 4e066577f6bbc4ddcc7a5b102c1bc650fd957d82468ed9782a97520db6acb2fb600372c4fcff7c21dd020080a3d4a5f41aaea15e5751ed5f22e17b9d2e04996d SHA512 3cb67cba1e12630c40b7c78572e7af0418c56d821c327c7b963cb00401a13f47da622b3a8e7a67795158b1394e860bcdf5ac3e478f8df9c5e3a97963bbd65a2e
|
||||
AUX bbdb-3.1.2-no-init.patch 4709 BLAKE2B 3e38c67d8347a8c6202ecddfa68847f0c9feab1593d84e5564607b3d9da104af93b5bb0862e899386555dd1abe5f8b7894c71575fc6a750db2e4332c5ad9c204 SHA512 3f262323cb35636d0249aafa54ff2a2e462df803d19c356bf2b7ed6a68410fa6e6bc41298a1e7fbeef224c84cf4bf9f80ff1ae068c5226ac6bea3ec62d593355
|
||||
DIST bbdb-3.1.2.tar.gz 378935 BLAKE2B 3fc862d2d68632c997e3f250aa82cced743c3cc3861c74789bb12015ab99745270c79722dc0342334b90f4dd9071ef809ab670a342ac227c24a927870907c25c SHA512 8b32baadc4eb06b0abf533ccb1f540f4f407f27b8d2e847ae25e62d1405e1de5cfc6af16368eecd4086f281ee7a4016cf25568847b3cb798156c7e18e1912576
|
||||
EBUILD bbdb-3.1.2-r1.ebuild 1252 BLAKE2B aa0e52adf4f144345ce9ab63158c28e0700992fa6166ad0dbaa2c0c774abb0d3096b75a754fd19bb796ddda5f6de3a4c5bbd67f80c0284f293e2e747271d2eb1 SHA512 b1af482f2570358068a5f2548b405cae3860b5493af9d7e212b2fd4091a2a7a8e55a552eb618996ee8b351b9d971726ef481726ab264c2f23a76d54e12a08595
|
||||
EBUILD bbdb-3.1.2-r1.ebuild 1258 BLAKE2B b3c4286189a2753a9a2a139c7c7f7b2af204153c070efa1f385a3e70bc575f2b9f4a9e39c0fd925de5adbea5316c50130f728018caa9fbfa12ca618d5e00fbbe SHA512 fd151528c520ec621c0c4b57fd0f5392c53c02f40478fae682abf6c237ff48bfcbd5fff69994a5f85edb4d9fcc187f82b43eea4d52a4760e4fc40ae0b63cde02
|
||||
MISC metadata.xml 753 BLAKE2B 34f54aee0c3090fa9d9ee231f1f3ada71e889a4c4d7db76be9f0e351a4ae2333230c3338b014c2b267fd24610d788ede12749fe135f14d9760e76bd4e47d2827 SHA512 76dad950ad39c0f3442e2339dbf560154cc1b0685137c81e64224686ee31ff856dbd147aa04202250fa9595510c991d15609aec986dab26ad60bda3744902dda
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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"
|
||||
}
|
||||
@ -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=""
|
||||
|
||||
@ -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"
|
||||
}
|
||||
@ -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.
Binary file not shown.
@ -1,6 +1,6 @@
|
||||
DIST gnatcoll-bindings-2019-20190430-1928C-src.tar.gz 138935 BLAKE2B c72398b51bf383b163ac10000c4dd5441334a6f24d7ad075d8115f25c030b43bc1dace6a1121e1e69add1eead93a5389aff09ef013deb4682ccb1d31bb85313f SHA512 6db1d35a1cdf5188001084750f7aa32b193768f8c3dfb6d7db8a8314c745fc054b0a6d2234a6dd64c5acd4b1bafffa7ce7f1080bd51fbb8bc88edfcc855b7a48
|
||||
DIST gnatcoll-bindings-gpl-2018-src.tar.gz 100068 BLAKE2B 7e5fe106d421d853135ddaea04b7bf2b306e7d0f054379b4c66b58844ac73270d7c82de549e9440f4ecc672ed7e9df6e2b3c1fea55b67403aaa33b09c124bb9b SHA512 2d42e904ab7324d958b34b103ceb2cf7d9bf620f324578b8d3537c18bcc2b4ba73d553bbec773cde5d57979c3e68bc9eef69f97dd55a3b21e43d464881676295
|
||||
EBUILD gnatcoll-bindings-2018-r1.ebuild 2265 BLAKE2B 6a68652aa98e6cc69e4158542b72826ed4aa12164e0c5555d7d490d6ad4d10196e3527875be17f6bc02a7f485e3dc9eccd9cc25ae5cdb8fedee3f4888a2ce8b7 SHA512 b324c1a8f9eb2cacb141ea49d1f1901d26f584976f34c1e3d8334bb2fcbfcc7483151c866d40b2d9e5ca36f8565c212d22e519b85dbb14f8691e96245efc268e
|
||||
EBUILD gnatcoll-bindings-2019-r1.ebuild 2125 BLAKE2B f0fd30a7d59de0ae3309d5e3420053fd6859bb013e17f74461369b710d44d3d7fe7d0baacf94a5b76b7dc9cd89771d922af8ebed968e2fb2b17be05d73351c2c SHA512 59d2920b2d997930eaa1f59ea26422fb8c612f4788d2e930ce10f620faf8e1ffcd7523d2c2b35a67f2fd9c0b81f10b300cce90f60fb485d755da1e1884744658
|
||||
EBUILD gnatcoll-bindings-2019-r1.ebuild 2185 BLAKE2B 33530f9da5b9c2012f089b4e9eb69a23b2168e28a307f06283490b5480b7cd903d3dacc0480a246c164d7bd1515c4ccd34821cec0fe566c8a42a484e65bdb102 SHA512 43c18ab9e3452d51304b0b6cd8d55bc63da015fb1016884eccddc0d5247520dee34be518e0e79b8a278486930f91b8e242ac312f051d2bacb3a547e5afb1edd7
|
||||
EBUILD gnatcoll-bindings-2019.ebuild 2271 BLAKE2B ff53a14264e960bcb52a323f6b939b649e0c63b3f9c0481c33daea6223e3385f5f0cc9ede9755d65883b5e9182563944246f1edf5c9f73b9b5f089e4c94aab5b SHA512 c659dcee428f2acc6122b05d5deb050a68533c291e5ca6992d124e8af168d1854040f906af7df83b7598f80d7503204ab2d5ac1bcd41d6588bd305a0d63764bf
|
||||
MISC metadata.xml 1081 BLAKE2B a4c643dd943c019ebb42f81dc078391885d80fb3abf3afb52494d33802592eacbf43c33560855239c7e88e86f306444392b9a6336a8255d18762f095d8283838 SHA512 7e4006ffc2f972dc45efb174451c9450545c10b1b55c63bad0157940d5c64da2ac7a908f51c4a0244e2df3b09e448aac610b97dfdfa8e80a32d913de2f6c31af
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
AUX gnatcoll-db-2018-gentoo.patch 361 BLAKE2B c7b15cb7433a5bb0f9fee68df4594a390d8d77ccd027e583dd14037a7a1319e727c99fbf4dc81de97ff457f1e0f6b237d1436f6b336668aca956fc5c083cbab6 SHA512 4d90c530bfa6948282c61c6df92a32aa8e03fa794768568ce10dda9a43cd3b56970761a0bd30913ae51f0a2605f2bc0ecc2124561982c7951985c35a974264e7
|
||||
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
|
||||
EBUILD gnatcoll-db-2018-r1.ebuild 2819 BLAKE2B 8ea0088b103661b811009fe4bbaa8a9de77e07e04e82d0387edc708b527527bb35a6f539944edf38385d36509a0482bffdc72934a7f9e99dff7f6ed51a3b1ad3 SHA512 2b1f5c94d82d86a7737c68aedfda88674bb427911117036a7c1439cb297659de3167456b4cd8127413526d4107c6197f6220fc42b2ea8949799f3c0060355eeb
|
||||
MISC metadata.xml 1283 BLAKE2B edf8cff8d918007b78ad3d5011a1b4b6b0d3cb1023b892c941d499dd054c21e6e7e9ce0dc913b33e80f0052cd25d453114e622ffedd737f1a4e45bd9dd616364 SHA512 4c5746a6e201c8c5a1d4d17af1c73ed5f402eddf3af2b152e0229d847476b03dba2fb15c4439b0f032b5f0ed9ed425267db0e36617d9d220709c4ff279ea6e7c
|
||||
EBUILD gnatcoll-db-2019.ebuild 2881 BLAKE2B 91a316b84fbb4f9513319c969dc5f2bdb235ea7ff5858efc51a7e7adff6f44fde43d26b9f2c221730746b54c3db70c21d904b6f29161257292dbe48c7ef766bc SHA512 5336bcef504c3ecdfd2bbfe909383445920fe7630dc6a5866a7044d7dc66221c3760471c842a005f4b8ecde7924c53a79b645ca615fb1ef44d338cb8ddf3920b
|
||||
MISC metadata.xml 1334 BLAKE2B 19a30eae622d616152c1a35e30f6c732c4018963a903e3644738404a8a0b5205e5231c7aa9640ff64d0f7b0e1f8dc4ee092ba66f368e7a81e66937f8bf6c0f44 SHA512 3729735cf08a4bb8dd07d6837dd238911d882aabe9e5021a5d89b54fb3a65bf840a25f3e25b8bc24dc667cf9025661c8944538817b21f61dbfec69e5a055072a
|
||||
|
||||
@ -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
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
AUX gnatcoll-2017-gentoo.patch 7843 BLAKE2B 1a7a7cc1bb1ad94f65fced28888c37acc3cc3711b0c488413313357551f3109e818f25eeba5fe25448f8362256ed5e8bccb6c5b67fe8195492d0e3b1e271f78b SHA512 d2eef0a5d4fecba7f081b97fc7c78efdb6dad76b492b1711e5c5d47b88ae621ca6826497668c9363ee16e36aaeb0e4978cc978c8688d3b346c3dd08b96a8537c
|
||||
AUX gnatcoll-2017-r1-gentoo.patch 7206 BLAKE2B 87404d98273fad107a4bc0711161676342acc42bb1d54a85c6680b71ad12ee1b9ec6ced694e6bf74cf724b024775b485377965930aefea54a4860c4937605b96 SHA512 907aa86f7efc68e1176212725f3af19a6dcf9c58377a0478d63553f30a90e4ba19891b1ab746e8ee3d4fba3c470b968e3bb1a718f413db5c39fc80959abd9224
|
||||
DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363
|
||||
EBUILD gnatcoll-2017-r1.ebuild 2964 BLAKE2B 898a9507a58b92f43c02d06d1aee92ea7c64f9f7c601f0c49b67c5cbc03451262cb4a2f36fc455bce868ea99fc15a9353c72f6f51764f6fa723ba46231fc352a SHA512 3eff32dbb197e118b0691044e5743b2446a402d3d75e4465e34769b049c8ac1940c2881e3b75003926b818b1a48b5c20c17979e5ee3873e2870b6ec6f81ac102
|
||||
EBUILD gnatcoll-2017-r1.ebuild 3020 BLAKE2B d27ed8a5c62b9ecdcef26c76feface0a749c07b542b6724f5aead565b20f0284a75bd6f7eb935bf64cd301394fd976863eeb50b6eff82fb355b76d7572d9cf20 SHA512 146d1c57cd24dafbf72749f46e4b4970f7f28c60034026edfe4b4c96ef3099acc3b5e91bdf2764f7d3501fdbef3038ec470fa17b0817a23a09da061fd2fe1422
|
||||
EBUILD gnatcoll-2017.ebuild 3257 BLAKE2B 3fe04c24429c39e1904bd95ecc09ac7f45a357ee9305fdfb3689fe9201ebedc51b838188a15d1c3ed1b40cb31fed42dc12da08a0e2a1171bebeb0af1816281a5 SHA512 d029004d698dae4016008e2c29a2a106c68f7b1b5647d3a05108d49fa44b2e5c7d90d806b2218736cb6116c18c7be6ebb2ff6d7f2a92bca65c7860d3c516fc65
|
||||
MISC metadata.xml 1194 BLAKE2B b4b93464f8dffd89bb43ca27e18e015d7cb720041fd7d405d3c7e5af9f8a53316959ab6696d5d762a1afa887648f7028cb831305b63a1782cd1c62f2486447c1 SHA512 a6fb6bf6f82f5582f4cca95e5864202664483fba5c4b813c4f515f670cb5fd720437001fd497167235c29843da2fb967e429f9a410d5b7ec2acefbc01ac30bf3
|
||||
|
||||
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue