Sync with portage [Sun Mar 11 16:09:36 MSK 2018].

master
root 7 years ago
parent 45ff7653c5
commit 4b240ed6db

@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
MANIFEST Manifest.files.gz 28805 BLAKE2B 31901b4b0f8e92dc21cb92f28f4c3f275c167d5582905467839c04666fc8a5b9eee010047ab3a1773e3e0bbadd9112dd89602486fa33fc51b027bca61a808c0a SHA512 796eb87fb5b811940bd25dcf74c0bf2b0047e59e6f65b42a241c920575dc529e1f1c25b5266c41a52e53e2d65f56272624f61bbc6ee57ddcdc8ba008c0d97ac3
TIMESTAMP 2018-03-09T06:08:32Z
MANIFEST Manifest.files.gz 28825 BLAKE2B 0b252ffdfc7fc7172010d6c3c8544153919b92c9bcdcdc3f088eff2f636257130c7908b7c276003dfd73031c99a294bafc34a0dd5bbd2b5907d1f861f43f5b5e SHA512 56fdadb932b2e031d37a19e0269b2c09c44424614b3ceeaa48b65186758922e60aecc4273227182a3f977ef56dfcb9990d2c577f3dbb5128bb6d4d6e8e8db8e0
TIMESTAMP 2018-03-11T12:38:34Z
-----BEGIN PGP SIGNATURE-----
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlqiJOBfFIAAAAAALgAo
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlqlI0pfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
klC3EA/+MLYevpvAgL70lj98u6y9RboVtHaehtdZVj6MT4KZiW81VWZ6Egtyx8IN
b4MHPXD/67WxTOR8IZpVuoiaKm38jS2/vnZ8NUR/9bcJ0VQmWvLnxbqNUK6PwWo5
H1uEnf0B972745ri9iA7A8AaOnlcyX1v5n2pI29ArG7MCIwJF8QDhKI4UScrhQrA
hZitQNFBmclqTmTUWN1RHKZ46azy/cx1xe+OYcz9LDXDLbeODYN1iMzWSoMW7vFx
skorh+q3QJvBm+gwiZt9OODOaLmakdDgWwOPcYoklbGcKkYiTgQq+Gg2DOaVqRfK
DuAlX6o1vht+x7dp5uISIMZFly00VZ1pMkNHoVQCo7/r4HNWoYNyVeY6BQ4Nqgdf
5qtYvV4hSGw/6fDPr+/mZI8eHvAeH8hPW0/Mcynu1w7Txd0TiYkJAA91ODrHgndp
8xp7FN3pGXEg1QYw1/VQAgWtOJkRBDUYxO7GdKRuiJn9/CA1EhOiJui5kSQGJdrK
f9z7+gGRB3FmOUnZlmfEDzwM0e+AVwDh0na5PVH4vdTBr00V5/LVdyYGGt8QvQvb
jMjPblN+wQJr9WH5kBq1a0txKAAo10RF5x9uuEACjUIbyJLdW6GlP9tC33ym6PUU
W4+PUhpECPr+jMXeliJZCl8Wa3Ifs9up4PB1zHfm5SYxsEPvl7w=
=GHc3
klACpw//SWcg02JqQQfOCSBMOmYFxZRLjm9JF1rfheTeddu1uJPdaE5wU7XHfKzB
SYZ5g3hp2riqzYFChZn7A+3CZ1jEVnZR5PM/i2EZfnRrlz51HsDtRV06EwWgRqYM
4MBlSmv0poVI/it5Ip3qfmN6LHmqJrwXD0GK1BXFhdJhucWS3H5N4KZHj+a0luNj
sxO5bEWt66OI6CN4yYIG/NhpDk589wsPHLTRSpX/Wsn39H8WK3rEFvXyA7Q4+Zlk
OiZCRVNt26acwxrNsMyUWtl7KPYT9RMcGDIq7njMcCwBwcxYTCX/QrjwWjuaJKDx
cp3uihX4reB27Qr9LwvyMGTi8pKSmm/dwPZ0AdmunuAHL6cY8NFxJHBLKABXfP91
pkLUpQmkNCmfvsNccIM1Q0hNlQSZIUyfZCfAiY1/CtCO/VCWQYP0EuRu6h+kIzU9
uZ0081OoJTx2v5UuASeSQkmwsTIASLqwamSKCNIAT+7QJKyt6vhwKm3NXnOVBkUV
CV3gDPflb3kE49euHvvc1Nbh4HWvcaHOrgSaHGROU0Csmg+cMVRYIbzc+Ti/UbcR
NuH+WbSUJKONxku7W2bX7IqI7MyRPpAQ+CrIJKF7ziXvQZnC0aE/E9O0+6Y3B+bZ
GefsrZMmfLJewDQbnpU3Z7y9PBdkbshOZpRdOzYlrV7aUsl+II0=
=j6Mq
-----END PGP SIGNATURE-----

Binary file not shown.

Binary file not shown.

@ -1,3 +0,0 @@
DIST AutoScaling-1.0.49.1.zip 12387808 BLAKE2B 7f43b3544b05f1adc196c28b7c2fc5c26ea84cb3d3bd7cf098d8413b98aac5d2908177ee5567aad6dbea96d1abbf60794c4450423de768c280a33cb4efdbbd1e SHA512 aefc4dfc970757062ca972c5d532485c9e28ceb771b6fa0a4fb2fe25460bd67e3023bcefde57f9852340b6015e7ab2771c49beb0826e1394710ea7eea94948ed
EBUILD aws-as-tools-1.0.49.1.ebuild 1669 BLAKE2B 008f80572c8302b3fdce9385f7edd2c80c6bd8c7336a06eb13046f508dd4b0bb8bb01c9f882360c284e0b5036105dd86544a395b48d178d844969d1e21f68659 SHA512 5cf1ea6b4e08754b89b87e2ba1c672e61f4e1c9791abfaf3ecbee9e41ef4889164880aa957e48dc931e5a0dc3970cf96d08b1e322440f7be79efefaa9fc2f512
MISC metadata.xml 379 BLAKE2B d22bbbcde5c8f4712e3c66652f3fcd0ee0042c8a60e9dc07e736820170f74ca32ffea2f1b3ef6524fe0c01302acfa6bac61aa52a58d9b0df31a8b27e382adfeb SHA512 bdff2b298c7db59ad37e2bc71a778e91ffe8cdad327fbe4c8824ff83ea79709e23f87c1bea605ccd8491ac87bc0920295570089303613f76ffd897fd91fc939e

@ -1,63 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="The API tools serve as the client interface to the Auto Scaling web service"
HOMEPAGE="http://aws.amazon.com/developertools/2535"
# SRC_URI="http://ec2-downloads.s3.amazonaws.com/AutoScaling-2011-01-01.zip"
SRC_URI="mirror://sabayon/app-admin/AutoScaling-1.0.49.1.zip"
LICENSE="Amazon"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RESTRICT="mirror"
DEPEND="app-arch/unzip"
RDEPEND="virtual/jre"
S="${WORKDIR}/AutoScaling-${PV}"
src_prepare() {
default
find . -name '*.cmd' -delete || die
rm bin/{as-cmd,service}-2009-05-15 || die
}
src_install() {
insinto /opt/${PN}/lib
doins -r lib/.
exeinto /opt/${PN}/bin
doexe bin/*
cat > "${T}"/99${PN} <<- EOF || die
AWS_AUTO_SCALING_HOME=/opt/${PN}
PATH=/opt/${PN}/bin
ROOTPATH=/opt/${PN}/bin
EOF
doenvd "${T}"/99${PN}
dodoc "THIRDPARTYLICENSE.TXT"
}
pkg_postinst() {
ewarn "Remember to run: env-update && source /etc/profile if you plan"
ewarn "to use these tools in a shell before logging out (or restarting"
ewarn "your login manager)"
elog
elog "You need to put the following in your ~/.bashrc replacing the"
elog "values with the full path to your AWS credentials file."
elog
elog " export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
elog
elog "It should contains two lines: the first line lists the AWS Account's"
elog "AWS Access Key ID, and the second line lists the AWS Account's"
elog "Secret Access Key. For example:"
elog
elog " AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
elog " AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
}

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sergey.zhuga@gmail.com</email>
<name>Sergey Zhuga</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>

@ -1,3 +0,0 @@
DIST CloudWatch-1.0.12.1.zip 6156651 BLAKE2B 140dc28fa44423824f180f34ab05918068e941f31de3081c0ee7ae462ee8d63f26c4fdc838a9e677638a34609a215f52b83572980e488d34557d39d610c434e7 SHA512 881a428a2861b86196a691f24a3471058426f049170d16f067d7cc319712beb161c80041e9ae89339d5298ffbf2869c04509fbe4620cd60cc74658c8d3ab11ec
EBUILD aws-cw-tools-1.0.12.1.ebuild 1644 BLAKE2B 16edd301ca96cee51d87ec0949c36a07d3489e495020a7f8c63da072b46ec1168570ef9d41474c12c2de2da3c5d04bbae8a7be1c372434cbabe6cb8c35bb23d6 SHA512 a1d5b319c2389852bce354ee7fc7f460ac30042256a681964173dff877445d5bbd7f619c8e5d9574c260294a07d3b643f514852f637b37b5d3bce58263a19c5b
MISC metadata.xml 379 BLAKE2B d22bbbcde5c8f4712e3c66652f3fcd0ee0042c8a60e9dc07e736820170f74ca32ffea2f1b3ef6524fe0c01302acfa6bac61aa52a58d9b0df31a8b27e382adfeb SHA512 bdff2b298c7db59ad37e2bc71a778e91ffe8cdad327fbe4c8824ff83ea79709e23f87c1bea605ccd8491ac87bc0920295570089303613f76ffd897fd91fc939e

@ -1,62 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="The API tools serve as the client interface to the Amazon CloudWatch web service"
HOMEPAGE="http://aws.amazon.com/developertools/2534"
# SRC_URI="http://ec2-downloads.s3.amazonaws.com/CloudWatch-2010-08-01.zip"
SRC_URI="mirror://sabayon/${CATEGORY}/CloudWatch-${PV}.zip"
LICENSE="Amazon"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RESTRICT="mirror"
DEPEND="app-arch/unzip"
RDEPEND="virtual/jre"
S="${WORKDIR}/CloudWatch-${PV}"
src_prepare() {
default
find . -name '*.cmd' -delete || die
}
src_install() {
insinto /opt/${PN}/lib
doins -r lib/.
exeinto /opt/${PN}/bin
doexe bin/*
dodir /etc/env.d
cat - > "${T}"/99${PN} <<- EOF || die
AWS_CLOUDWATCH_HOME=/opt/${PN}
PATH=/opt/${PN}/bin
ROOTPATH=/opt/${PN}/bin
EOF
doenvd "${T}"/99${PN}
dodoc "THIRDPARTYLICENSE.TXT"
}
pkg_postinst() {
ewarn "Remember to run: env-update && source /etc/profile if you plan"
ewarn "to use these tools in a shell before logging out (or restarting"
ewarn "your login manager)"
elog
elog "You need to put the following in your ~/.bashrc replacing the"
elog "values with the full path to your AWS credentials file."
elog
elog " export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
elog
elog "It should contains two lines: the first line lists the AWS Account's"
elog "AWS Access Key ID, and the second line lists the AWS Account's"
elog "Secret Access Key. For example:"
elog
elog " AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
elog " AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
}

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sergey.zhuga@gmail.com</email>
<name>Sergey Zhuga</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>

@ -1,3 +0,0 @@
DIST IAMCli-1.3.0.zip 3957057 BLAKE2B b2e429c2fb3169e23d6e6fc4c4b33594f2814bf976d1c584551008561b71977a3ee4abafd50bd3e52592e918624da01b83527557d2079772d083fbe96ee52eb5 SHA512 5012ece2d0569545848d83cf879b4d05f7f955f22bbc31b86f3993e4f5ee48de3099369fddf7f2b2d98f89e56c8c329e427a1f7dca0afa728ea9593c1b36497c
EBUILD aws-iam-tools-1.3.0.ebuild 1553 BLAKE2B b5a9214325f6ba6de22f9bfb774fdce73acdabf9a41bd6f27e06e4d967d3129820f855e35a3cacc82b49b13fcbd6142f97e8356f5ae6afbbdb15c5205de07925 SHA512 a437128c9f7dc8ff56e9cf4e0fd076aa2c8e596384581f8b8a11bf1c61369ebf1d7054a0c8cdd49522afa6037bc9129355875a2f79a9403e3edc41bc4cca1be7
MISC metadata.xml 379 BLAKE2B d22bbbcde5c8f4712e3c66652f3fcd0ee0042c8a60e9dc07e736820170f74ca32ffea2f1b3ef6524fe0c01302acfa6bac61aa52a58d9b0df31a8b27e382adfeb SHA512 bdff2b298c7db59ad37e2bc71a778e91ffe8cdad327fbe4c8824ff83ea79709e23f87c1bea605ccd8491ac87bc0920295570089303613f76ffd897fd91fc939e

@ -1,60 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="The Command Line Interface for the AWS Identity and Access Management Service"
HOMEPAGE="http://aws.amazon.com/developertools/AWS-Identity-and-Access-Management/4143"
SRC_URI="mirror://sabayon/${CATEGORY}/IAMCli-${PV}.zip"
LICENSE="Amazon"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RESTRICT="mirror"
DEPEND="app-arch/unzip"
RDEPEND="virtual/jre"
S="${WORKDIR}/IAMCli-${PV}"
src_prepare() {
default
find . -name '*.cmd' -delete || die
}
src_install() {
insinto /opt/${PN}/lib
doins -r lib/.
exeinto /opt/${PN}/bin
doexe bin/*
cat > "${T}"/99${PN} <<- EOF || die
AWS_IAM_HOME=/opt/${PN}
PATH=/opt/${PN}/bin
ROOTPATH=/opt/${PN}/bin
EOF
doenvd "${T}"/99${PN}
dodoc LICENSE.txt
}
pkg_postinst() {
ewarn "Remember to run: env-update && source /etc/profile if you plan"
ewarn "to use these tools in a shell before logging out (or restarting"
ewarn "your login manager)"
elog
elog "You need to put the following in your ~/.bashrc replacing the"
elog "values with the full path to your AWS credentials file."
elog
elog " export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
elog
elog "It should contains two lines: the first line lists the AWS Account's"
elog "AWS Access Key ID, and the second line lists the AWS Account's"
elog "Secret Access Key. For example:"
elog
elog " AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
elog " AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
}

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sergey.zhuga@gmail.com</email>
<name>Sergey Zhuga</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>

@ -1,3 +0,0 @@
DIST RDSCli-1.6.001.zip 6291974 BLAKE2B bdb7f9bce07e920b144cce15e6b05f9d98aeab4cbb33c181914d8584c5e24f70ef486e3d2b677e166ad9f936a2d15758ba55cc26f7fc129ed907989c2d3424a8 SHA512 29eb31064cc9b067bdc625e9777dd1cc77bdbd01a167c91c396d52f89fd9617496e2383fe343a17abb0d8029e47eb87f8ae7e60c0dd5a89cee485dbe45a05963
EBUILD aws-rds-tools-1.6.001.ebuild 1518 BLAKE2B e6d08e03f73f1e262b5adb5e43b6a8ac23c317c01b3aaa757dc6fd57fcc5d4d39d40bef4e9f4794708d3751f44ba22ab36aa864375ddf7b3a63890263a4e86cc SHA512 01ce630b9ca713f6b7495c3e12dfc03c97ec6ece0c9c6f216c1463bf0ce8ec3360032cf84ee5f04cce2d621297d14af8de88a808acf5f3073fb16b340306bddf
MISC metadata.xml 379 BLAKE2B d22bbbcde5c8f4712e3c66652f3fcd0ee0042c8a60e9dc07e736820170f74ca32ffea2f1b3ef6524fe0c01302acfa6bac61aa52a58d9b0df31a8b27e382adfeb SHA512 bdff2b298c7db59ad37e2bc71a778e91ffe8cdad327fbe4c8824ff83ea79709e23f87c1bea605ccd8491ac87bc0920295570089303613f76ffd897fd91fc939e

@ -1,60 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="The Command Line Toolkit for the Amazon Relational Database Service"
HOMEPAGE="http://aws.amazon.com/developertools/2928"
SRC_URI="mirror://sabayon/${CATEGORY}/RDSCli-${PV}.zip"
LICENSE="Amazon"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RESTRICT="mirror"
DEPEND="app-arch/unzip"
RDEPEND="virtual/jre"
S="${WORKDIR}/RDSCli-${PV}"
src_prepare() {
default
find . -name '*.cmd' -delete || die
}
src_install() {
insinto /opt/${PN}/lib
doins -r lib/.
exeinto /opt/${PN}/bin
doexe bin/*
cat > "${T}"/99${PN} <<- EOF || die
AWS_RDS_HOME=/opt/${PN}
PATH=/opt/${PN}/bin
ROOTPATH=/opt/${PN}/bin
EOF
doenvd "${T}"/99${PN}
dodoc THIRDPARTYLICENSE.TXT
}
pkg_postinst() {
ewarn "Remember to run: env-update && source /etc/profile if you plan"
ewarn "to use these tools in a shell before logging out (or restarting"
ewarn "your login manager)"
elog
elog "You need to put the following in your ~/.bashrc replacing the"
elog "values with the full path to your AWS credentials file."
elog
elog " export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
elog
elog "It should contains two lines: the first line lists the AWS Account's"
elog "AWS Access Key ID, and the second line lists the AWS Account's"
elog "Secret Access Key. For example:"
elog
elog " AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
elog " AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
}

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sergey.zhuga@gmail.com</email>
<name>Sergey Zhuga</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,5 @@
AUX bind_exporter.confd 57 BLAKE2B dfffea2f2859b377d5132a2c56ace0260f2d272463c104144acea0a2489141d01e35f4899d53af1526fe0ca1ae760fef62c96a0b6849c8b8678b7693a53ac20f SHA512 54c5162993d488eecec2453b06b2cbedd5eb4599074cf43fda644e2faba4c35ad481840dbb8b05979bf1a0dcdff32edd9efa56bc779f264d81056793d1d00be0
AUX bind_exporter.initd 550 BLAKE2B fcb4eb3066023024b8605a2c9787ba7c8871d05d1b11a1ea97ebab91e403e21876c8b29136b114c6ceef29e9be79056accdde7061e13f615b1f55c25998b938e SHA512 1471a0644c1c2d5a242987638b6fa0576913b9dfbcf886ade42951b3cc71f632c210060a619637988c5239a3ff934c2073e2bd34b913abd9871eb028fd71e2e1
DIST bind_exporter-0.2.0_p20180307.tar.gz 873965 BLAKE2B e59cbd2ccbd13dd60b673c6816e2d4c151e85ed159daa272996081814f7f276bc686b5d6a94db59e41085d57a12974bd2dcb8ef7696dba3940de705dfc800f25 SHA512 63331f877d988a41b86c0204569a1cd19cbfa176be9e811ef8fa5509d0af4a2f7dda0b27f9ba3b0f3df985f7c075f4535225298ce8808f97497d8bfa3b41256d
EBUILD bind_exporter-0.2.0_p20180307.ebuild 1565 BLAKE2B 4ed446d4ef07c661013d29f6f5082ae01df0180864fd5367b022c36c1250e46093a58a46a61aa4935989b12cde5288bacc93ccabb35954560954b098b527b792 SHA512 317f04dc0afc7dc9f17a807e8a2f3e499832b83928e9550a0b22532fc3639706a662d3e35bfdde2ac02625d01c03fba75bf636d0e5c706d0972c499d1ec08d0d
MISC metadata.xml 336 BLAKE2B 5b39247fdfd604232cfc3025e79ef77b109e9751e5eb2221da402420058a2b54686030592b30f6337575e5d6fc7f4080b46afc133e06ca4c48408b15bfd550e9 SHA512 e66208ff143de58a4a947c7de9b1ef414211dfd68ef5d2b18529c5b23252941bb32208cd6747cd5892d01986eb4a872f96083ee8ca166d322d8bdcdbe998c7c1

@ -0,0 +1,59 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit user golang-build golang-vcs-snapshot
EGO_PN="github.com/digitalocean/bind_exporter"
EXPORTER_COMMIT="38ef3a6caa68e8c42a08e72d51e90b00333e6894"
ARCHIVE_URI="https://${EGO_PN}/archive/${EXPORTER_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
DESCRIPTION="Elasticsearch stats exporter for Prometheus"
HOMEPAGE="https://github.com/digitalocean/bind_exporter"
SRC_URI="${ARCHIVE_URI}"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
DEPEND="dev-util/promu"
pkg_setup() {
enewgroup ${PN}
enewuser ${PN} -1 -1 -1 ${PN}
}
src_prepare() {
default
sed -i -e "/-s$/d" -e "s/{{.Revision}}/${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/${PN}
dodoc {README,CHANGELOG}.md
popd || die
keepdir /var/log/${PN}
fowners ${PN}:${PN} /var/log/${PN}
newinitd "${FILESDIR}"/${PN}.initd ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
}
pkg_postinst() {
elog "Make sure BIND was built with libxml2 support. You can check with the"
elog "following command: named -V | grep libxml2."
elog "Configure BIND to open a statistics channel. It's recommended to run"
elog "the bind_exporter next to BIND, so it's only necessary to open a port"
elog "locally."
elog ""
elog "statistics-channels {"
elog "inet 127.0.0.1 port 8053 allow { 127.0.0.1; };"
elog "};"
}

@ -0,0 +1,2 @@
# arguments for prometheus bind exporter
command_args=""

@ -0,0 +1,19 @@
#!/sbin/openrc-run
# Copyright 2016-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
description="Prometheus bind exporter"
pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
user=${user:-${RC_SVCNAME}}
group=${group:-${RC_SVCNAME}}
command="/usr/bin/bind_exporter"
command_args="${command_args:-}"
command_background="true"
start_stop_daemon_args="--user ${user} --group ${group} \
--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
depend() {
after net
}

@ -2,11 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
<upstream>
<remote-id type="google-code">specto</remote-id>
<remote-id type="sourceforge">specto</remote-id>
<remote-id type="github">digitalocean/bind_exporter</remote-id>
</upstream>
</pkgmetadata>

@ -1,3 +1,3 @@
DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
EBUILD equo-302.ebuild 937 BLAKE2B 3703b5d48d3744e05584c51e3ad961e436ebc0cd495d191645ddd898cfacfbb1038a6026f8e13af00072c1d3e3c223249af8adba1751c9f777b1f185024ce74b SHA512 4c9be7016d4a190812a8df5361ab3bea74a29b0a400275d7395c757867e6411c6915f723fca59a0ded43022407a61ec593487d9275f06b4b29d93c297902361b
MISC metadata.xml 359 BLAKE2B 7987fb2521bb8430b58406f7c8e23edf0d71f637202d58c924edaf68be47537cb34a7b505ef55ead988df3d5bfd435280965f11342ead07dd99330418e036e10 SHA512 b52ececf876369aa09bf3f332b5f11a457c6c61bc11af3541f55eb186c32bb844027b0d951744d21449f3386b896ee207fadcbc6b5da31885e55879bc2355201
MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174

@ -5,8 +5,4 @@
<email>mudler@gentoo.org</email>
<name>Ettore Di Giacinto</name>
</maintainer>
<maintainer type="person">
<email>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
</pkgmetadata>

@ -1,4 +0,0 @@
AUX jinit-0.1.12-gcc43.patch 297 BLAKE2B ef22f8545c8c5f1795da3245e446555c80f6a67b59c433f8115a0e05bf608099465d04aff9c2332a07aec9607b3ae18a3376e47271f728547bde5e13b3bf58f4 SHA512 e147e9e28a61b573e371b84709d9e26b669ba72d0cd79b336495c10c668e3a855110ec431206319681e940b098ae319038eb71d35b41f78b24689fe1796a7adb
DIST jinit-0.1.12.tar.gz 110745 BLAKE2B 411f02a45726b20045de7ce6e40627c0652ae778631e3bb1de37182839b316efaccb84b4270a3dc15258d3eb479ff3fcc1a99cd7f313a615d06326154c61cd78 SHA512 3428ba2c9bc57f6a1e30d75b9c2b86f597753fdb29e5c748986a3bf90b8189f35b88591dffb8f861b728e7ce08e78c6c5f1780147bfdb5b6a1d5f2128d34db5d
EBUILD jinit-0.1.12-r1.ebuild 892 BLAKE2B 03ebde790e93bd5bc334485e5f40ac4f146aff38722fd85229bcd0ac389e23656a821dfd519053435af608cf71eb253388ebc05168c308559b8d0723210490e7 SHA512 147c5d3f8180de5cf36d96366763a114706af71faec2defce6057ede42d62b781e1c8e240a1ae02565c3a9969ed3ab51f00ad3c5df60d995543aab17eb07f797
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84

@ -1,10 +0,0 @@
--- org/jinit-0.1.12/init_ipc/User.hh 2003-04-29 23:35:53.000000000 +0200
+++ jinit-0.1.12/init_ipc/User.hh 2009-01-04 11:19:16.000000000 +0100
@@ -13,6 +13,7 @@
#include <errno.h>
#include <time.h>
#include <err.h>
+#include <cstdlib>
#include "init_ipc/sysvq.hh"
#include "need/error.hh"

@ -1,33 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit eutils
DESCRIPTION="An alternative to sysvinit which supports the need(8) concept"
HOMEPAGE="http://john.fremlin.de/programs/linux/jinit/"
SRC_URI="http://john.fremlin.de/programs/linux/jinit/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-amd64 ~ppc ~sparc ~x86"
IUSE=""
DEPEND=""
RDEPEND=""
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-gcc43.patch
}
src_install() {
emake DESTDIR="${D}" install || die "failed emake install"
emake prefix="${D}"/usr/share/doc/${PF}/example-setup install-initscripts \
|| die "failed installing example setup"
mv "${D}"/usr/sbin "${D}"/ || die
mv "${D}"/sbin/init "${D}"/sbin/jinit || die
mv "${D}"/sbin/shutdown "${D}"/sbin/jinit-shutdown || die
dodoc AUTHORS ChangeLog NEWS README TODO || die
}

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>

@ -1,5 +1,6 @@
AUX logrotate-3.13.0-fbsd.patch 855 BLAKE2B 48494caecc49d7b819f889bc7acf6bd29e71583625a0638b39c1f2d535396a88c205534353430d70fbb577093ab43bee4bec0325443cf3c233f5f28dcb20cb12 SHA512 5343814545554392f1ee1be5b35866ebce0d8f2f580cb7807940e3a5b2092025f1b9619fa0ff3bdf4b99aada4c46a602d6c34c6e3c1e42b15ce51cf9d879a3ed
AUX logrotate-3.13.0-ignore-hidden.patch 542 BLAKE2B 01c6e92306eaa2356090e5539555711ff09c7bdc6042aad7f3c5d9faacf449f00bb3040132bd00774104f8c0a8cb40073cb7c26323978ef199847a88eee26e45 SHA512 88bd9dd906171d45877e4c21e40cfc9a729742825b4c5d583fd9364d3943aa604e037e4b58e053a1fc7c0b77bd5ed6171f741778716ef753ecbb02ebaf012589
AUX logrotate-3.14.0-ignore-hidden.patch 548 BLAKE2B 29a8efd36b000cc670a8a2db46cac3ad12ca49c5900409c3e1b456da88acc869e66a479481fcb24731d44d7d1815fce54068542afaa4737093a65a35ea7cd79e SHA512 2f08e4b1b483d301e2c6f9a5440957f43d336d44b3393c4408a02b5491826f887d53c782a6c7472bdb1ede9baacf2d1608d7385a576da0a8441a4b5a48ee5113
AUX logrotate-3.9.1-Werror.patch 344 BLAKE2B 6f132592ec2446943cb4f6426b7e25b432e9e44d82d080b3773ab7f5c34de019594ef77fa74cd74e026605e775ee2b119ab39c2eeb50a092dec1a1c502409b4a SHA512 6ae8b49d1f29ce1c32603716555085b7fa2d865177558abe92c84867c69ca84b8174563db07537801ad01572717670478b273acb34b5885b9170354d1cc02493
AUX logrotate-3.9.1-atomic-create.patch 1253 BLAKE2B 2e3486f31991ea351300241fe2ea64ad8bea952c4faf7fbdf363b594a7823312c6c9497397abaf051c760e9fe93bb8b592ebb78ac85a23bba2f5db619de6c35f SHA512 92fa8e04522f9bf06840befcb019a498d465f2d8afa3475f97e953b4e8abf2cf63f2fa27d8c89c5620da59468f753d94720f5f3a604376d7e51b86c9eb156c99
AUX logrotate-3.9.1-fbsd.patch 1393 BLAKE2B 27f82ffb51644ce117d53a0e484779692b0b8d547d14c944c87a41862127cf05c31477c73721bd2729dfc2c22264305ce60738063640dfef47c06bcdd9dd78e1 SHA512 dd8bc024eb280e5bcb2869682bedaf5c8db6d18976e412de3283f32bc5d9ad370fdda27194eae11fa3da53339d83ff20fe541e99eb8ed183997ecb85a606f822
@ -8,7 +9,9 @@ AUX logrotate-3.9.1-noasprintf.patch 1263 BLAKE2B 5f145d46e3c372d3999d58bb8e01ea
AUX logrotate.conf 743 BLAKE2B d623d150d9959ae57e61af2c442434f81636521c133479aecbad8731662ee3743cb3db858ed8326ff87d61262d20893ab6141fe09d12979785e8c52c428f5964 SHA512 c0357a432a4619392895d8180db3c593239a96f62aba7cfd981c76e9d1dfd9d93d63860655025b1e9473374c2a51068028c3a3f316cb5cbb71562ca4a61d8d24
AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe8d0bd1703e5075671dd1e13a030ec06fa269214bff9552670d3e0932e3dbde2e3673d59b7a50a2458b SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36
DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a1623cf1aae2444e818339361c7b7762ce51fcbd124fefafbe47d529dd21ef346a6c9a267da20547914388db99dce003 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76
DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
EBUILD logrotate-3.13.0.ebuild 2543 BLAKE2B d79fec2304b6b52ec1cc064fc40aed2054edecf4abeb8dbd0d5df7f8bbb27e1a17a384cf4d44042197eac0c8ac7d5e6e888ef689fe2794ae206d946661b6196a SHA512 2f6b6caef77088ff1aee15f8a289f1b3559180034b5f2bfa5520b2c3627bb0f92e0f5555cbe914f4877b50729f84e3ca3f0353c6e1b63442e156b530819294a4
EBUILD logrotate-3.14.0.ebuild 2525 BLAKE2B e4553d646d97e0153dd86bc7357089ab53852fe5d315b71964720463830a78fc7429915400c51112afb73562d82ed1c376d67c4c5694e02195b7248f2dd1a447 SHA512 74ddbacb17722995f34c7a55d6d4ccefd689401e34e81b123149d3798e1e6cfbcfcb7b9bd5aa9c71b6e0e88984eb5cfe79434ae90c594f82802a6ebb2bfdf685
EBUILD logrotate-3.9.1.ebuild 1767 BLAKE2B a59f23a8a0a24b416f23a087c60fe046260cc24521f68f2551bb2a2821d12e94307e2d620ec4b625cd1b6be21cafa3d2c0f044468dbc2760897e5bb7854ac7af SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03
MISC metadata.xml 1119 BLAKE2B ddb2266925506c260c4b3f67e4dd906d9446a17a54b5a0ffce547d3c942750ead45dd1cfdcbae548a096d87ee1e247fcda9bcb81e83b829f0526d4bfd7b4a01d SHA512 99725d54d1cf68b257446ef8afc43d4bfe05cc789c818222d603012ae1e636624962c23a845f8858f4fc7aaf5a7e7f8085a7b173185ba66d7e390012dbceef79

@ -0,0 +1,14 @@
diff -Nuar a/config.c b/config.c
--- a/config.c 2018-03-09 17:47:08.000000000 +0100
+++ b/config.c 2018-03-09 19:47:42.274696766 +0100
@@ -440,7 +440,9 @@
int i;
/* Check if fname is '.' or '..'; if so, return false */
- if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
+ /* Don't include 'hidden' files either; this breaks Gentoo
+ portage config file management http://bugs.gentoo.org/87683 */
+ if (fname[0] == '.')
return 0;
/* Check if fname is ending in a taboo-extension; if so, return false */

@ -0,0 +1,98 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit systemd
DESCRIPTION="Rotates, compresses, and mails system logs"
HOMEPAGE="https://github.com/logrotate/logrotate"
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="acl +cron selinux"
CDEPEND="
>=dev-libs/popt-1.5
selinux? ( sys-libs/libselinux )
acl? ( virtual/acl )"
DEPEND="${CDEPEND}
>=sys-apps/sed-4"
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-logrotate )
cron? ( virtual/cron )"
STATEFILE="/var/lib/misc/logrotate.status"
OLDSTATEFILE="/var/lib/logrotate.status"
move_old_state_file() {
elog "logrotate state file is now located at ${STATEFILE}"
elog "See bug #357275"
if [[ -e "${OLDSTATEFILE}" ]] ; then
elog "Moving your current state file to new location: ${STATEFILE}"
mv -n "${OLDSTATEFILE}" "${STATEFILE}"
fi
}
install_cron_file() {
exeinto /etc/cron.daily
newexe "${S}"/examples/logrotate.cron "${PN}"
}
PATCHES=(
"${FILESDIR}/${P}-ignore-hidden.patch"
)
src_prepare() {
sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
eapply_user
}
src_configure() {
econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
}
src_test() {
emake test
}
src_install() {
insinto /usr
dobin logrotate
doman logrotate.8
dodoc ChangeLog.md examples/logrotate-default
insinto /etc
doins "${FILESDIR}"/logrotate.conf
use cron && install_cron_file
systemd_dounit examples/logrotate.{service,timer}
systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
keepdir /etc/logrotate.d
}
pkg_postinst() {
elog
elog "The ${PN} binary is now installed under /usr/bin. Please"
elog "update your links"
elog
move_old_state_file
elog "If you are running systemd you might need to run:"
elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
elog "in order to create the new location of the logrotate state file"
elog
if [[ -z ${REPLACING_VERSIONS} ]] ; then
elog "If you wish to have logrotate e-mail you updates, please"
elog "emerge virtual/mailx and configure logrotate in"
elog "/etc/logrotate.conf appropriately"
elog
elog "Additionally, /etc/logrotate.conf may need to be modified"
elog "for your particular needs. See man logrotate for details."
fi
}

@ -1,3 +1,3 @@
DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
EBUILD matter-302.ebuild 903 BLAKE2B c1970417d8565c4d51b1aa6bc91e7e53a3303cbf0373a6f62aba3197b5796d19ea355d96b3d2c97923ed79976a2de4126560f9feeb3a6e39095248e6e7a9412b SHA512 5726e57bb3a94c9ca263a5be2aaf83ae2894f54b9a1f8958ceb286d13af609798f4928a498d6ade9f445d9554cbcf6d1449f303aa2c13f4e0e69058139f8c331
MISC metadata.xml 424 BLAKE2B b4e80ffddba7b4646fb7c3df8b46698e54e1ad17e18766ee40f8da3cd0c6499e0e0f38baf2b35b4228953a1036221d6395322e7962c77991cebf7b12d085da3d SHA512 98c9bf0d8fecb4d914d83c6fe4b7be399e39f0504ad6311c68f0430c07f052df3e5948b79caa2a6c0480a55031b14c2888ee3f1c5cb47ec9e8668a6533dc93cc
MISC metadata.xml 316 BLAKE2B a4b75b27426512d6fdcc5c82017121dbbd1e2a3438ade9329957bdce4c54b1d6f4c3404c577f50cbfcf8d03c41187b9efab14189a169c655bc2f98a6f9e82495 SHA512 f4ba14f543d1d69eb89eb098013f40a1cd7d872525e7ad683a6e4f6d6f4bb9a96ed81adb32aad5011c33dfebe694e10e429440343c16ed5497f03a4515ccffe4

@ -5,10 +5,6 @@
<email>mudler@gentoo.org</email>
<name>Ettore Di Giacinto</name>
</maintainer>
<maintainer type="person">
<email>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
<use>
<flag name="entropy">Add Entropy support</flag>
</use>

@ -0,0 +1,5 @@
AUX nginx-vts-exporter.confd 138 BLAKE2B 5276947629899f4e338324d7bbfcd7afadac604fbe9d0b9bc101fbbfc5af2bccc2d9968315abcf060932defb3a054885527dd058e6ff20594ddfb77fafc8d138 SHA512 2b41b8efdef35f4beaf8b991e77a7ccf76be55290f9ddfa1262f860dc3b57411bcd1a3332f23119d87e3f72640d23da28d9080df43902f711cb1d1bff838532f
AUX nginx-vts-exporter.initd 637 BLAKE2B 9fb8c9e1908846391ef0afc4b586f40a0ae13410c9f04e0ee594874b0434fe6fc0bab029f9d5021e5ce41a67df622bd2d7dff1f014baf25deee07d3e65a22eed SHA512 75ed5cfb084022e86058e20a7daee0c9c0fed3ee68090818e6f9d9b92dd8aee86145267c6b5309ede12f0a5103f80b74c43fd2522015ec866217e927c16a3803
DIST nginx-vts-exporter-0.10.0.tar.gz 149620 BLAKE2B 6856240886d1a7082c901535954193798e8636ef744a5960441726cb12a5510706f7b8c1757e9f719c756d0beabc355cde8ec626c9bd4f14f7ff84894d0cc6da SHA512 bdd3993b3fee24d3332db720df2880493eeb0724cd5b099ccdd5fe6456df1b344132e4e585271999df355fb2042954cb3d452e6dc0b92dead288e94dd71f627c
EBUILD nginx-vts-exporter-0.10.0.ebuild 1120 BLAKE2B d1200212f0ae09284a27b18826a49d3a30e55334d7f55e48134d4d6cfb704fa27ec95f99c5e8d5ee8a5c40c5f92bada71092d6b2c1e5bccdd58ac5fc1452e274 SHA512 871899a662d4d6b4c3b36fcce440cdc5ef57abf36016b8d0f535b0fb3a3e78adc71aff16ffc314cc1ef99167324aa1230dfe423bab0ffab7def00650f28842c3
MISC metadata.xml 336 BLAKE2B 1efba2e3d984ebbd079fe45c406fb14932d9eaf9275e25b62fd915c6e9216fe2af377808436f66a8f0e3167126c1dbd2667021e155906e1e880a03ab1397b9bd SHA512 4f84f5262f71494fe5edbc2e1ffd96213f856f317c732f8833a865fa8bd4ea8268b43134e5f0dbcb51f18c3d52203b9000fd7afd346c68d631c5c42d2237917f

@ -0,0 +1,2 @@
# arguments for prometheus nginx virtual host traffic stats exporter
command_args="-nginx.scrape_uri=http://localhost/status/format/json"

@ -0,0 +1,19 @@
#!/sbin/openrc-run
# Copyright 2016-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
description="Prometheus nginx virtual host traffic status exporter"
pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
user=${user:-${RC_SVCNAME}}
group=${group:-${RC_SVCNAME}}
command="/usr/bin/nginx-vts-exporter"
command_args="${command_args:--nginx.scrape_uri=http://localhost/status/format/json}"
command_background="true"
start_stop_daemon_args="--user ${user} --group ${group} \
--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
depend() {
after net
}

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
<upstream>
<remote-id type="github">hnlq715/nginx-vts-exporter</remote-id>
</upstream>
</pkgmetadata>

@ -0,0 +1,47 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit user golang-build golang-vcs-snapshot
EGO_PN="github.com/hnlq715/nginx-vts-exporter"
EXPORTER_COMMIT="f5b3491cd0a8cc2df7088470f2727b0ae39a2700"
ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
DESCRIPTION="Nginx virtual host traffic stats exporter for Prometheus"
HOMEPAGE="https://github.com/hnlq715/nginx-vts-exporter"
SRC_URI="${ARCHIVE_URI}"
LICENSE="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$/d" -e "s/{{.Revision}}/${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/${PN}
dodoc README.md
popd || die
keepdir /var/log/${PN}
fowners ${PN}:${PN} /var/log/${PN}
newinitd "${FILESDIR}"/${PN}.initd ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
}

@ -11,4 +11,4 @@ EBUILD packagekit-base-1.1.1.ebuild 3338 BLAKE2B 82a68620c4e6e9ff616dfce5b579eb3
EBUILD packagekit-base-1.1.4.ebuild 3372 BLAKE2B bac2e0a5ff37132fbf315e0958fec7237f0059191f0074169e1eaa53cda2338f408dff543325e859e6f20e0d8d900cf470e563196506fbc99af7cbcb2e4dcb36 SHA512 44ccfdf2114a4d2d0d90ce39e7b18ce8adebac5f423fda4661c0e848d39efd7a9dba12a54022e77e6171aa44037cb65b6a6c584346d1181c0ddfe18212354046
EBUILD packagekit-base-1.1.5-r2.ebuild 3769 BLAKE2B 0f492fd80c02c3e057d862061f39b058ea403d56c6f453f4d824b5df7b884a3c4996113419fee66c2fcaffd1403e4d86dc05e4bdafdf4ac7ea9483344daad4c9 SHA512 a750ec8210a7b052452b5f8cae6f5a21fd2123225a92ad610b757368123235c048f8022f0609971b092b038493538a078db0f00655dd159e830383a49bad7c90
EBUILD packagekit-base-1.1.7.ebuild 3600 BLAKE2B 4972be8607c5f37249007eaef0dbc37cc5063604fdc5ba7ef056ce3bf90b2518ea1011799365ced8c2396bdfa9d35d04d9ebe539ca342290b0cda30e83d1ab25 SHA512 6e8900312b7b0b8a5710433d92fad6a31448be49a6f219d4cb326bceaaad292fe2f028d6998e2a730c2f95d776af941592886dc38cfb0f3666e2601007b0aea1
MISC metadata.xml 772 BLAKE2B e730d761ba28dd19864a0e34c6cc2fa11712d853f4a5abc05f5935d8091f4c7692735ff8e48f2bc1a6b985c1fd56ee8b6dddd072365b847b1d65d712d7c8dd89 SHA512 c6cd1b091c8da4a6b183de55f498a8ff0de459cf4c466715d10dd9bc654ae4d16f71736c26c5011412b9b0584e1b4df58a257eb55c0c7dea2c16cc99107e4248
MISC metadata.xml 664 BLAKE2B 4dcdb79a089d9ec0734d9af4c2b6206ad1add7b17f8c8984b2e7763672fc334000749b4332e92224d11b0382fe22a2ca0f83ced4da218fbd1e85d8b101fd3e1f SHA512 9b80a98e97af44ab81b497b2c71c73db41da7f250734d6b032e80151719a0a82e2c1e295b068a5e3657a509dbd74d1f65f6e49fc211f77d0623eb7bdcd32b323

@ -5,10 +5,6 @@
<email>mudler@gentoo.org</email>
<name>Ettore Di Giacinto</name>
</maintainer>
<maintainer type="person">
<email>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>

@ -8,4 +8,4 @@ EBUILD packagekit-gtk-1.1.1.ebuild 1173 BLAKE2B d61381e48795b15c194e5e7f9eaad9ae
EBUILD packagekit-gtk-1.1.4.ebuild 1173 BLAKE2B d61381e48795b15c194e5e7f9eaad9ae5235379e84b527d59e2658809728aea9aa6d31334e3da70a9f6f672022d989eb31a0782a270f0a525ff1bed81f21bb89 SHA512 a77a29ed66c671e5a53ecea3b2b27bc7ac54d51578d05fe80570d626b6654933fc3645bad4c792af6e284b2ba4f475fbcc0f5327bc0456dd822aed169b574d3e
EBUILD packagekit-gtk-1.1.5.ebuild 1173 BLAKE2B d61381e48795b15c194e5e7f9eaad9ae5235379e84b527d59e2658809728aea9aa6d31334e3da70a9f6f672022d989eb31a0782a270f0a525ff1bed81f21bb89 SHA512 a77a29ed66c671e5a53ecea3b2b27bc7ac54d51578d05fe80570d626b6654933fc3645bad4c792af6e284b2ba4f475fbcc0f5327bc0456dd822aed169b574d3e
EBUILD packagekit-gtk-1.1.7.ebuild 1144 BLAKE2B 9f80f2b49dd5aa373c5198dfce9005d475259a0dc3842ceb8644a1170b27a3e95edd479a3feae96fe18673d463f88d6c32fa288fa1861b02c866148853c918e4 SHA512 468f8af2b8bf4b957b1f20f1ecec644ad36d3e1ed11a7ad841f4304bd9f66ec6a75b96bf935aab02844e5795b38127e23ba3ad36839cb097af7d1e7a9d4b67e2
MISC metadata.xml 473 BLAKE2B f35c01c9b65f6b8b245d99d2c790e24df27583bbe5d82f41bbdb6ba2ec04e88c860ac1fa20cc86ab0380fdea3f279d8e8d796a905f806253ec67a9e74bb9ae9d SHA512 9f68f311e2ac50b05f30e6471276402e37309561e91824abbf7c24bb90a6cc909a8b18472341ed6da45d7982bc1f40f83898e47d5fa34d0857e9290ee7668639
MISC metadata.xml 365 BLAKE2B 56b0b07f000f1e0960650c60d41063585322a4d4c6067db315c85ae2fb113b747c46e6f89f99183bc607007f9d625d9e45c12d4bb81f82f002eab046e16b3f48 SHA512 7efd2e5bf58f32e97348200e6a891143009398504480ec30a8ee4f71bef600065094a8cb451bf8d5a86342add5251c5b54cd522b9f8b458501dc21fb3190bb69

@ -5,10 +5,6 @@
<email>mudler@gentoo.org</email>
<name>Ettore Di Giacinto</name>
</maintainer>
<maintainer type="person">
<email>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>

@ -2,4 +2,4 @@ DIST packagekit-qt-1.0.0.tar.gz 53495 BLAKE2B a19ff095ec42bc16e498455323a4046365
DIST packagekit-qt-1.0.1.tar.gz 53503 BLAKE2B af96899e520f4139d6025746c2a2e7a65c67c2900cdf4fbdb410c12e33f494343d078ec24e7dcdb33749b1d5206b0bf622809827ed64beae162888e48d0aaec0 SHA512 e1291545b496571c00a6a24586c45b7173e85e3704d419af6a0ec47ea5ce256c8ec7e887721b1bf8038cb967ceb82726925800ab06aa784b2bdd560e49be724a
EBUILD packagekit-qt-1.0.0.ebuild 571 BLAKE2B c727718b29d9defc285a177eb4eb1c3d4f31d9f153e636efbd1d9d7508b47602d425ea75ad4061b1c8ed7107c1af6a644065564764093497d456327fe03110ee SHA512 e55e2dae9a6bd9a40526eb451f1b2b0a4df166bed31a839e6857311bf25f9a5fdda748935aed51050dd4c956af35a9f70212de63f5abf0cef0f17d66f00994e7
EBUILD packagekit-qt-1.0.1.ebuild 573 BLAKE2B 00cfe9c488622ff84ef1dd979ef3c0475105a86348eca5d72ff862ef8c5fcee233b78a8f037a55e3b2e4c03d9a900619cacdfc33c5ef9766f1684567752db719 SHA512 73cbce3de7c9f7cef8ab4e08dcb1b70bd7f01ae79609caa9606ac42ac3de7aa3c8ddd67ab0464ad3302ccd3bf4e669248188ace3c5eefc70a786e011ae17f544
MISC metadata.xml 551 BLAKE2B 2a6881f45a4f44ea61556de150346743992c914d56673e51160a8fbf708a0cd22dfd3c0a89b272122a003af150e6f8311e7d472bd9696770481fe0c1e93778d3 SHA512 bebe5e7a9945182bf7650f762be1cd319a8ecd17a0f8822ad584ff67c363f87125e5f08b3f8a9934875f28c732451a6d9ac84b9b3b57284b799c76fa73415b70
MISC metadata.xml 443 BLAKE2B 83c6d5495baf3a9909dbb0ea06f912b92f6faf6f48e6f1da7610a16cca3770c097516a748b44fc0aef99985929e16b7dc20de131bf5404bfd72895acca56f04b SHA512 f63f424329b0ffeac0dcfb50841e94644bd3a44852bebd0834fc36bedbbe4bbbb13bfdfd46e065ca3ddd9cffac1ba86590310267939c486f108913db84e1d093

@ -5,10 +5,6 @@
<email>mudler@gentoo.org</email>
<name>Ettore Di Giacinto</name>
</maintainer>
<maintainer type="person">
<email>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
<maintainer type="person">
<email>johu@gentoo.org</email>
<name>Johannes Huber</name>

@ -3,4 +3,4 @@ EBUILD packagekit-1.1.1.ebuild 421 BLAKE2B ac293ca36f37ecec31339ced2ef5e9d43d905
EBUILD packagekit-1.1.4.ebuild 421 BLAKE2B ac293ca36f37ecec31339ced2ef5e9d43d905c1d93116e5630ca8c938328a60fc497476ad922623181533058515df2d05aa714d539d1300e637ea7010ec76ae8 SHA512 f8a38a3fd1fee29c4472f79d4d40259c68a7aa8b7a6c1da460f05411dbc454cbeb02ac5fae85ae7ab41d2e7a238ed293e4467a783580de0ba354c18a768a3a26
EBUILD packagekit-1.1.5.ebuild 421 BLAKE2B 8ab2f31f153e6de1d4e7fda0cb7530159327df662178c672b8a7742d2d1b41623e748e6ca0614ed6ec266c6a39f1612788ef4fdc53764029657b72c2db332c6e SHA512 7da902195434263cb7bc9cc22326b819299055c82f8910d358463969709b17b27a9478ce9a8833a29b9f4108102fdf2704387de8396907f19b727d655a1e438f
EBUILD packagekit-1.1.7.ebuild 421 BLAKE2B 8ab2f31f153e6de1d4e7fda0cb7530159327df662178c672b8a7742d2d1b41623e748e6ca0614ed6ec266c6a39f1612788ef4fdc53764029657b72c2db332c6e SHA512 7da902195434263cb7bc9cc22326b819299055c82f8910d358463969709b17b27a9478ce9a8833a29b9f4108102fdf2704387de8396907f19b727d655a1e438f
MISC metadata.xml 473 BLAKE2B f35c01c9b65f6b8b245d99d2c790e24df27583bbe5d82f41bbdb6ba2ec04e88c860ac1fa20cc86ab0380fdea3f279d8e8d796a905f806253ec67a9e74bb9ae9d SHA512 9f68f311e2ac50b05f30e6471276402e37309561e91824abbf7c24bb90a6cc909a8b18472341ed6da45d7982bc1f40f83898e47d5fa34d0857e9290ee7668639
MISC metadata.xml 365 BLAKE2B 56b0b07f000f1e0960650c60d41063585322a4d4c6067db315c85ae2fb113b747c46e6f89f99183bc607007f9d625d9e45c12d4bb81f82f002eab046e16b3f48 SHA512 7efd2e5bf58f32e97348200e6a891143009398504480ec30a8ee4f71bef600065094a8cb451bf8d5a86342add5251c5b54cd522b9f8b458501dc21fb3190bb69

@ -5,10 +5,6 @@
<email>mudler@gentoo.org</email>
<name>Ettore Di Giacinto</name>
</maintainer>
<maintainer type="person">
<email>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>

@ -1,7 +0,0 @@
AUX cpu-usage-fix.patch 791 BLAKE2B 1928875ea3e73dc7cdb804f57485b474d554b343a73901b717301d9e27912937d17b30dea9050b10db9d9c4b378d431792c01201856d8b253f4000de769255a2 SHA512 48b8bae8a8f117edd60dbb43172768bdbf8c8c0f718739ab1957afbecab323255de48504298ae2c03e3c52fac86dc47cd6bd44cd5c48d1f450404268833fd090
AUX kernel-2.6.patch 9954 BLAKE2B 26c886b77d3eef12da4728191330a29bb7834d371a177f243f638379b54b96b2ce59b7ac1bcdf0bc2bc2fb236e1e5a776bf24a4adbf211f414675fe1f4b4199e SHA512 4c5ee12f199bb24459c1a41a927343bf4c1503229f8522c36ed07df7ec953331346e1271e5ac9bd1ad2d0a5efa5dfdc0276da40d68185655e1a5a96f4b8c0cff
AUX procinfo-18-stat.patch 778 BLAKE2B cfe86d478607ea97f9110d5864e8ab053a1496d1f78471cabca6c45172a52bde8985379cdf69c8118c683ca2d8ba9c9f9d75766fcbcc1248328bd49456b3f59c SHA512 d9672780ca78976e84cddd80469553b1d5dcbb8c361ec4e2c6229e608a6a309293ced9ac41ee55b609ce7c8b4019571e406bda5228c2277e0e1ff7553ba700da
AUX procinfo-flags.patch 373 BLAKE2B c8c4d62c88cbfd30a1c6844e7534a33c8fe4bd3fb0b743b2e5abe1190e34263e690ddd29263dc705437177a73afc26057074985c4fc099962f7e8089bfc3b42a SHA512 00ee615dc6156a5c162237abcfaec7596dd358e534c68208b39d1f2487d73e10cde77bf3ead8650d18cce640f2a5381eb13078c87e6525ce8d2448beba1454c1
DIST procinfo-18.tar.gz 24365 BLAKE2B 7da2f2afe014dc5b991244c0f2eff631db87ed00942a38dcbd1f5080df0bc7c2fb30fd5c7af14a180dfc2ce0562b2a26633451e0a3a17a577cd15a5f281f0118 SHA512 12c4d7983f5d6531be6d4df39f5f1e1ee2ea2394a6eb8fb8df0573f0085499e4b7d43355bfa549a24ddf1ecb09bbfa7b038cef9c483620c74ad5cedc219e35fa
EBUILD procinfo-18-r2.ebuild 836 BLAKE2B 02275d37224802d4c08ffbe6a85b8d2de710d0b912b5b918f36f4009151a91ebb60253ab796f97b828c6bee202076cba4b655967e1646a989955dfd6bdce80a4 SHA512 f91367e56f4b3191eff3050a3e4b388eca8bc65d070c5592821b22ca7fea6fdb53dbbeb912a5ebf7b3091d1ea66950b62f3c5777318c4f8df7ee37f50a843d91
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84

@ -1,31 +0,0 @@
--- procinfo.c~ 2005-01-31 20:52:29.250918264 +0200
+++ procinfo-18/procinfo.c 2005-01-31 20:48:55.907351416 +0200
@@ -402,26 +402,8 @@
}
elapsed = new.uptime;
-
-/* XXX Is this stuff still relevant/true? */
-
-#ifdef __i386__ /* IRQ 0 is timer tick on i386's... */
- if (nr_irqs) {
- if (fs && old.uptime)
- elapsed = DIFF (intr[0]);
- } else
-#endif
-#ifdef __sparc__ /* IRQ 10 is timer tick on sparc's... */
- if (nr_irqs) {
- if (fs && old.uptime)
- elapsed = DIFF (intr[10]);
- } else
-#endif
- {
- /* This won't be exact... */
- if (fs && old.uptime)
- elapsed = DIFF (uptime);
- }
+ if (fs && old.uptime)
+ elapsed = DIFF (uptime);
printf ("user : %s %s",
hms (bDIFF (cpu_user)), perc (bDIFF (cpu_user), elapsed, nr_cpus));

@ -1,296 +0,0 @@
diff -ruN procinfo-18/procinfo.c procinfo-19/procinfo.c
--- procinfo-18/procinfo.c 2001-02-25 11:29:16.000000000 +0000
+++ procinfo-19/procinfo.c 2004-06-17 10:28:33.767925439 +0100
@@ -5,9 +5,10 @@
Displays general info from /proc.
Date: 1995-07-08 05:30:34
- Last Change: 2001-02-25 00:27:21
+ Last Change: 2004-06-17 11:28:13
Copyright (c) 1994-2001 svm@kozmix.cistron.nl
+ Copyright (c) 2004 procinfo@meisel.cc (upgrades for 2.6 kernel)
This software is released under the GNU Public Licence. See the file
`COPYING' for details. Since you're probably running Linux I'm sure
@@ -26,6 +27,7 @@
#include <string.h>
#include <termios.h>
#include <termcap.h>
+#include <ctype.h>
#include <time.h>
#include <unistd.h>
#include <sys/param.h> /* for HZ -- should be in <time.h> ? */
@@ -72,9 +74,9 @@
int nr_irqs = 0;
int nr_cpus = 0;
-FILE *loadavgfp, *meminfofp, *modulesfp, *statfp, *uptimefp,
+FILE *loadavgfp, *meminfofp, *modulesfp, *statfp, *uptimefp, *diskstatsfp,
*devicesfp, *filesystemsfp, *interruptsfp, *dmafp, *cmdlinefp,
- *versionfp, *cpuinfofp;
+ *versionfp, *cpuinfofp, *vmstatfp;
char line[1024], cmdline[1024], booted[40], *version = NULL, *message = NULL;
@@ -89,9 +91,13 @@
{
unsigned long elapsed;
char loadavg[32];
- int i;
+ int i, havetwosix = 0, lastdisk;
static int have_m_c = -1; /* Do we have cache info? */
static int have_m_l = -1; /* Do we have new-style-one-datum-per-line? */
+ char devicename[10];
+ char *last;
+ unsigned int q,w,a,s,d,f,g,h,j,k,l,y,x;
+ int disk_counter = 0, ret;
/**** /proc/uptime ****/
@@ -237,6 +243,50 @@
printf ("Bootup: %s Load average: %s\n\n", booted, loadavg);
+/**** /proc/vmstat ... 2.6.x kernel only ****/
+ if (vmstatfp) {
+ havetwosix = 1;
+ fseek (vmstatfp, 0L, SEEK_SET);
+ while (fgets (line, sizeof (line), vmstatfp)) {
+ char *type = strtok (line, " ");
+ if (ISSTR ("pgpgin")) {
+ new.pgin = VAL;
+ } else if (ISSTR ("pgpgout")) {
+ new.pgout = VAL;
+ } else if (ISSTR ("pgactivate")) {
+ new.pgac = VAL;
+ } else if (ISSTR ("pgdeactivate")) {
+ new.pgdeac = VAL;
+ } else if (ISSTR ("pgfault")) {
+ new.pgfault = VAL;
+ } else if (ISSTR ("pswpin")) {
+ new.swin = VAL;
+ } else if (ISSTR ("pswpout")) {
+ new.swout = VAL;
+ }
+ }
+ }
+
+/**** /proc/diskstats ... 2.6.x kernel only ****/
+ if (diskstatsfp) {
+ havetwosix = 1;
+ fseek (diskstatsfp, 0L, SEEK_SET);
+ while (fgets (line, sizeof (line), diskstatsfp)) {
+ char *type = strtok (line, "\n");
+ ret = sscanf (type, "%d%d%s%d%d%d%d%d%d%d%d%d%d%d", &q, &w, devicename, &a, &s, &d, &f, &g, &h, &j, &k, &l, &y, &x);
+ if (ret != 14) /* Everything with less than 14 elements is not a disk device */
+ continue;
+ last = devicename+strlen(devicename)-1;
+ if (isalpha(*last)) {/* Is the last char is a number ignore it .. like fd0 */
+ if (++disk_counter > 7) /* 7 disks is all we have room for */
+ continue;
+ else {
+ new.disk_r[disk_counter-1] = a;
+ new.disk_w[disk_counter-1] = g;
+ }
+ }
+ }
+ }
/**** /proc/stat ****/
@@ -249,6 +299,9 @@
new.cpu_nice = VAL;
new.cpu_sys = VAL;
new.cpu_idle = VAL;
+ new.cpu_iowait = VAL;
+ new.cpu_hirq = VAL;
+ new.cpu_sirq = VAL;
/*
* according to bug #1959, sometimes the cpu_idle
* seems to go backwards(!) on SMP boxes. This may
@@ -262,34 +315,54 @@
new.disk[1] = VAL;
new.disk[2] = VAL;
new.disk[3] = VAL;
+ new.disk[4] = VAL;
+ new.disk[5] = VAL;
+ new.disk[6] = VAL;
} else if (ISSTR ("disk_rio") && io_or_blk == 0) {
new.disk_r[0] = VAL;
new.disk_r[1] = VAL;
new.disk_r[2] = VAL;
new.disk_r[3] = VAL;
+ new.disk_r[4] = VAL;
+ new.disk_r[5] = VAL;
+ new.disk_r[6] = VAL;
+ } else if (ISSTR ("disk_wio") && io_or_blk == 0) {
+ new.disk_w[0] = VAL;
+ } else if (ISSTR ("disk_wio") && io_or_blk == 0) {
+ new.disk_w[0] = VAL;
+ } else if (ISSTR ("disk_wio") && io_or_blk == 0) {
+ new.disk_w[0] = VAL;
} else if (ISSTR ("disk_wio") && io_or_blk == 0) {
new.disk_w[0] = VAL;
new.disk_w[1] = VAL;
new.disk_w[2] = VAL;
new.disk_w[3] = VAL;
+ new.disk_w[4] = VAL;
+ new.disk_w[5] = VAL;
+ new.disk_w[6] = VAL;
} else if (ISSTR ("disk_rblk") && io_or_blk == 1) {
new.disk_r[0] = VAL;
new.disk_r[1] = VAL;
new.disk_r[2] = VAL;
new.disk_r[3] = VAL;
+ new.disk_r[4] = VAL;
+ new.disk_r[5] = VAL;
+ new.disk_r[6] = VAL;
} else if (ISSTR ("disk_wblk") && io_or_blk == 1) {
new.disk_w[0] = VAL;
new.disk_w[1] = VAL;
new.disk_w[2] = VAL;
new.disk_w[3] = VAL;
+ new.disk_w[4] = VAL;
+ new.disk_w[5] = VAL;
+ new.disk_w[6] = VAL;
} else if (ISSTR ("disk_io:")) {
- int disk_counter = 0, ret;
unsigned int q, w, e, r, t, y, u; /* I'm NOT in the mood today. */
char *barf;
while ((barf = strtok (NULL, " "))) {
- if (++disk_counter > 4) /* 4 is all we have room for */
+ if (++disk_counter > 7) /* 7 is all we have room for */
continue;
ret = sscanf (barf, "(%d,%d):(%d,%d,%d,%d,%d)",
@@ -374,7 +447,10 @@
printf ("system: %s %s",
hms (bDIFF (cpu_sys)), perc (bDIFF (cpu_sys), elapsed, nr_cpus));
- printf (" swap in :%9lu", bDIFF (swin));
+ if (havetwosix)
+ printf (" page act:%9lu", bDIFF (pgac));
+ else
+ printf (" swap in :%9lu", bDIFF (swin));
if (new.disk_r[2])
printf (" disk 3: %8lur%8luw\n", bDIFF (disk_r[2]),
bDIFF (disk_w[2]));
@@ -383,14 +459,53 @@
else
putchar ('\n');
+ if (havetwosix) {
+ printf ("IOwait: %s %s",
+ hms (bDIFF (cpu_iowait)), perc (bDIFF (cpu_iowait), elapsed, nr_cpus));
+ printf (" page dea:%9lu", bDIFF (pgdeac));
+ if (new.disk_r[3])
+ printf (" disk 4: %8lur%8luw\n", bDIFF (disk_r[3]),
+ bDIFF (disk_w[3]));
+ else if (new.disk[3])
+ printf (" disk 4: %8lu\n", bDIFF (disk[3]));
+ else
+ putchar ('\n');
+
+ printf ("hw irq: %s %s",
+ hms (bDIFF (cpu_hirq)), perc (bDIFF (cpu_hirq), elapsed, nr_cpus));
+ printf (" page flt:%9lu", bDIFF (pgfault));
+ if (new.disk_r[4])
+ printf (" disk 5: %8lur%8luw\n", bDIFF (disk_r[4]),
+ bDIFF (disk_w[4]));
+ else if (new.disk[4])
+ printf (" disk 5: %8lu\n", bDIFF (disk[4]));
+ else
+ putchar ('\n');
+
+ printf ("sw irq: %s %s",
+ hms (bDIFF (cpu_sirq)), perc (bDIFF (cpu_sirq), elapsed, nr_cpus));
+ printf (" swap in :%9lu", bDIFF (swin));
+ if (new.disk_r[5])
+ printf (" disk 6: %8lur%8luw\n", bDIFF (disk_r[5]),
+ bDIFF (disk_w[5]));
+ else if (new.disk[5])
+ printf (" disk 6: %8lu\n", bDIFF (disk[5]));
+ else
+ putchar ('\n');
+ }
+
printf ("idle : %s %s",
hms (bDIFF (cpu_idle)), perc (bDIFF (cpu_idle), elapsed, nr_cpus));
printf (" swap out:%9lu", bDIFF (swout));
- if (new.disk_r[3])
- printf (" disk 4: %8lur%8luw\n", bDIFF (disk_r[3]),
- bDIFF (disk_w[3]));
- else if (new.disk[3])
- printf (" disk 4: %8lu\n", bDIFF (disk[3]));
+ if (havetwosix)
+ lastdisk = 3;
+ else
+ lastdisk = 6;
+ if (new.disk_r[lastdisk])
+ printf (" disk %d: %8lur%8luw\n", lastdisk+1, bDIFF (disk_r[lastdisk]),
+ bDIFF (disk_w[lastdisk]));
+ else if (new.disk[lastdisk])
+ printf (" disk %d: %8lu\n", lastdisk+1, bDIFF (disk[lastdisk]));
else
putchar ('\n');
@@ -786,6 +901,8 @@
meminfofp = myfopen (PROC_DIR "meminfo");
statfp = myfopen (PROC_DIR "stat");
/* These may be missing, so check for NULL later. */
+ diskstatsfp = fopen (PROC_DIR "diskstats", "r");
+ vmstatfp = fopen (PROC_DIR "vmstat", "r");
modulesfp = fopen (PROC_DIR "modules", "r");
devicesfp = fopen (PROC_DIR "devices", "r");
filesystemsfp = fopen (PROC_DIR "filesystems", "r");
@@ -990,6 +1107,9 @@
new.disk_r[1] = new.disk_w[1] =
new.disk_r[2] = new.disk_w[2] =
new.disk_r[3] = new.disk_w[3] = 0;
+ new.disk_r[4] = new.disk_w[4] = 0;
+ new.disk_r[5] = new.disk_w[5] = 0;
+ new.disk_r[6] = new.disk_w[6] = 0;
redrawn = 1;
message = io_or_blk ? "showing I/O in blocks" :
"showing I/O per requests";
diff -ruN procinfo-18/procinfo.h procinfo-19/procinfo.h
--- procinfo-18/procinfo.h 2001-02-24 23:30:45.000000000 +0000
+++ procinfo-19/procinfo.h 2004-06-17 09:24:16.511726412 +0100
@@ -81,11 +81,11 @@
unsigned long uptime;
long m_to, m_us, m_fr, m_sh, m_bu, m_ca;
long s_to, s_us, s_fr;
- unsigned long cpu_user, cpu_nice, cpu_sys, cpu_idle;
- unsigned long disk[5];
- unsigned long disk_r[5];
- unsigned long disk_w[5];
- unsigned long pgin, pgout, swin, swout;
+ unsigned long cpu_user, cpu_nice, cpu_sys, cpu_idle, cpu_iowait, cpu_hirq, cpu_sirq;
+ unsigned long disk[8];
+ unsigned long disk_r[8];
+ unsigned long disk_w[8];
+ unsigned long pgin, pgout, pgac, pgdeac, pgfault, swin, swout;
unsigned long *intr; /* Phew. That's better. */
unsigned long old_intr;
unsigned long ctxt;
diff -ruN procinfo-18/routines.c procinfo-19/routines.c
--- procinfo-18/routines.c 2001-02-24 23:30:45.000000000 +0000
+++ procinfo-19/routines.c 2004-06-16 16:36:51.000000000 +0100
@@ -388,9 +388,13 @@
hms (unsigned long t)
{
unsigned int d, h, m, s;
+ unsigned long q;
static char buf[22];
- t = t * 100 / HZ;
+ q = 100 / HZ; /* We need this because the libc does something funny here */
+ /* if we try to use: t = t * 100 / HZ; here! */
+ /* procinfo@meisel.cc 11. Feb. 2004 */
+ t = t * q;
d = (int) (t / 8640000);
t = t - (long) (d * 8640000);
h = (int) (t / 360000);

@ -1,21 +0,0 @@
diff -ur procinfo-18/procinfo.c procinfo-18-mod/procinfo.c
--- procinfo-18/procinfo.c 2001-02-25 11:29:16.000000000 +0000
+++ procinfo-18-mod/procinfo.c 2008-04-16 10:16:29.000000000 +0100
@@ -76,7 +76,7 @@
*devicesfp, *filesystemsfp, *interruptsfp, *dmafp, *cmdlinefp,
*versionfp, *cpuinfofp;
-char line[1024], cmdline[1024], booted[40], *version = NULL, *message = NULL;
+char line[4096], cmdline[1024], booted[40], *version = NULL, *message = NULL;
float rate = 1.0; /* per interval or per sec */
@@ -446,7 +446,7 @@
*/
char *q;
- if ((q = strstr (p, "PIC"))) {
+ if ((q = strstr (p, "PIC")) || (q = strstr (p, "MSI"))) {
while (*q != ' ') /* eat up "PIC" or "PIC-foo" */
q++;
while (*q == ' ') /* eat up spaces */

@ -1,16 +0,0 @@
--- procinfo-18/Makefile.orig 2001-02-25 00:29:53.000000000 +0100
+++ procinfo-18/Makefile 2006-10-21 13:57:47.000000000 +0200
@@ -2,10 +2,10 @@
prefix=/usr
-CC = gcc -Wall -Wstrict-prototypes
+CC +=
-CFLAGS = -O2
-LDFLAGS = -s
+CFLAGS += -Wall -Wstrict-prototypes
+LDFLAGS +=
# If you get lots of `undefined references', you probably need -lncurses
# instead:

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>

@ -1,38 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils toolchain-funcs
DESCRIPTION="Displays some kernel stats and info on a running Linux system"
HOMEPAGE="http://www.kozmix.org/src/"
SRC_URI="http://www.kozmix.org/src/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86"
IUSE=""
DEPEND="virtual/pkgconfig"
src_prepare() {
epatch "${FILESDIR}"/kernel-2.6.patch
epatch "${FILESDIR}"/cpu-usage-fix.patch
epatch "${FILESDIR}"/${PN}-flags.patch
epatch "${FILESDIR}"/${P}-stat.patch
}
src_compile() {
emake \
CC=$(tc-getCC) \
LDLIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
}
src_install() {
dobin procinfo
newbin lsdev.pl lsdev
newbin socklist.pl socklist
doman *.8
dodoc README CHANGES
}

@ -35,9 +35,8 @@ DIST salt-2016.11.8.tar.gz 10142142 BLAKE2B e6805dae84c0d2e39109c95f603fcb54e1b7
DIST salt-2016.11.9.tar.gz 10062996 BLAKE2B 5176d04d07a69de21c9c136c201d334614c5675fd78e306a0160fae829b633441cd859f4ba1a0822dfbb9ae716475c53f6eb058187d4acc8a5770dd4ceace577 SHA512 896fd27c111e926e246b51d00b69d41c8f4d25ec0c034c9ff3dc5414f5e93592fd637cdeaecf02b3b98a4e5a7ce478bfda86b15497961078374608d76516593d
DIST salt-2017.7.2.tar.gz 11471191 BLAKE2B 0b7184eb4dcb29f2a9603117d1c6fb9c729093c1ff11e18370929ec3fdbfe7bf8c0914f17260c3f613842c23359205a4a84d3e0bcd67476705e50f805bcd7b69 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b
DIST salt-2017.7.4.tar.gz 11718327 BLAKE2B c197284ee56d039ee7942534af979f0606093ebdf40e0b11a55ca28a2f64c4b584b09b0901d5cb2c350f4ede52636e7927bbed48355d731472970eda5e32632f SHA512 79d7853c2614ed581e441babe6fbb73809816ec53aa47016b5066b771de449d4dcc999927d7e1c92c5ca68c816d27779e34e31ec1408d473a07120d62846de73
EBUILD salt-2016.11.8.ebuild 4623 BLAKE2B e01c069e867334c3312df92d6235c85124ae2bf2d1ac591e083e928f3522bdf3a4bc77351170721b2b290356776bb82ec8ca0afd894a1d28deb46df25d2831e2 SHA512 946eccb7bbe7175d81fa3746e6c87d7880ede9ed9c1f27106c2d6d782cbc001b05976fa113e2c5dc8b03c8b5d9a6ebfb0dd739250f82bf623ae4ab0f799f6738
EBUILD salt-2016.11.9.ebuild 4623 BLAKE2B 921ffcd61f97d98f56c6335cd4d4f87de25fe653644736ebf4ed1c214410c395fe4462fadbbcb58ef9b8716cc5bc34bb6d0becfcb17f9f246fecee8e2ab99149 SHA512 c4f1e95a633b29d711388ccd8609a8e27cdfcac908e0686ba98e9f4b94fc6c8badd11e8d684dab70aea73730409d059e1a8757aa7605f46f18e423545c99f4bf
EBUILD salt-2017.7.2-r1.ebuild 4381 BLAKE2B e8f1a417b75b19e24474b96d8681b477045d19c1dbca1c3b4fd5e90e9aca7fa2d7f3bfa6223a8e508fd8695875e268bb12a246c4217376a3c37d6faba45e243d SHA512 2976747e1d16c4d3eb0868f489feba22fad18ce74543c6ffed5fd25d760594f1871e90ee0e6a8cf0827f131d7581cb6e50921ef9997e5f2cda32f4610cccf603
EBUILD salt-2017.7.2.ebuild 4331 BLAKE2B fa924819154053c76ac002074d0d31867e7cd9b98b4abdae7a00a9aefd5281649d1924dc833c2f3ef8123796baec48d77c547ebcc410ce988a252986b9005486 SHA512 91f78244df90369ca0f1251618c463ef0c5ae34c2a7569c8cc23dd2cd5d4fc9000c0da521846a82d938fd1a49506d567307898c1368ffeb98babc93eabe6821b
EBUILD salt-2017.7.4.ebuild 4466 BLAKE2B a8364703700e39e57f6b3edfee662393b6cfa0ac5a2ed305ecdd1e4e5273389f734623bbaae847f9ec336e8343902ecffe99f5e47c7a72e8c5ee695275bfddbe SHA512 d19fd10da3d7e2a2d5bc6c4185f3cd9726aa804df44ab40ff1670a103df15a8abb08d1f87b3fa853090aad31e39aec0f64f3a7443846871b4696ab69f9392d21
EBUILD salt-2016.11.8-r1.ebuild 4715 BLAKE2B 32ce9ffe4698b20c9d0d73acc56ed01cf9bcc232c14b509a406f31ddadceed70e30ecd03368768f7e2c41e280adb5a8486e825d4597bbbff309f73e3b724b8c4 SHA512 e0a194c95bdc17e92d481612f171876925aea54eead946206e4b65632bde29b4da15d8ea7951e617aebf888958d708f5f3c9a6fde0004d56822ad6da8fcc209f
EBUILD salt-2016.11.9-r1.ebuild 4715 BLAKE2B 32ce9ffe4698b20c9d0d73acc56ed01cf9bcc232c14b509a406f31ddadceed70e30ecd03368768f7e2c41e280adb5a8486e825d4597bbbff309f73e3b724b8c4 SHA512 e0a194c95bdc17e92d481612f171876925aea54eead946206e4b65632bde29b4da15d8ea7951e617aebf888958d708f5f3c9a6fde0004d56822ad6da8fcc209f
EBUILD salt-2017.7.2-r2.ebuild 4472 BLAKE2B 53e91df5216b70e39b0fb37d607f912f781cc784e95ad70c4ffd52dbb6d335121ea84ed77dc0067f7777362a623773332959731420db6bd45e31ff5ee7d0e852 SHA512 a77a72b91b62c7ec615c79a1634cd869d881b9fffe34d3fd5965a1a21e59a87b76298623c89f65b1e4afb590f7f75de4b20cdc47ae29fcb022d427e9ca03dd82
EBUILD salt-2017.7.4-r1.ebuild 4557 BLAKE2B 23de9b90ef9c9727da785ac5a9dc5589dc00a4908132359282cdb952f0aa9a06f5f4130640f6f64a0c3ba47d644b980a56d59a6f95e62c3bf315db86c2f04ca7 SHA512 cf9cb9ffe381bf39c4fffa0306fd2449c1c03cf023bff256fcda365b9fdf7c51c9826ce81f83646bedae1f2b8c0b5eb5e17f8d011e02bfbb7694c778f365b95b
MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969

@ -105,6 +105,9 @@ python_prepare() {
# seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
rm tests/unit/cloud/clouds/gce_test.py || die
# allow the use of the renamed msgpack
sed -i '/^msgpack/d' requirements/base.txt || die
}
python_install_all() {

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -105,6 +105,9 @@ python_prepare() {
# seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
rm tests/unit/cloud/clouds/gce_test.py || die
# allow the use of the renamed msgpack
sed -i '/^msgpack/d' requirements/base.txt || die
}
python_install_all() {

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -95,6 +95,8 @@ python_prepare() {
rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
rm tests/unit/states/test_boto_vpc.py || die
# allow the use of the renamed msgpack
sed -i '/^msgpack/d' requirements/base.txt || die
}
python_install_all() {

@ -1,140 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit eutils systemd distutils-r1
DESCRIPTION="Salt is a remote execution and configuration manager"
HOMEPAGE="http://saltstack.org/"
if [[ ${PV} == 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
EGIT_BRANCH="develop"
SRC_URI=""
KEYWORDS=""
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~x86 ~amd64"
fi
LICENSE="Apache-2.0"
SLOT="0"
IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
RDEPEND="sys-apps/pciutils
dev-python/jinja[${PYTHON_USEDEP}]
>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/markupsafe[${PYTHON_USEDEP}]
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
virtual/python-futures[${PYTHON_USEDEP}]
libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
openssl? (
dev-libs/openssl:*[-bindist]
dev-python/pyopenssl[${PYTHON_USEDEP}]
)
raet? (
>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
)
zeromq? (
>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
)
cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
selinux? ( sec-policy/selinux-salt )
timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
vim-syntax? ( app-vim/salt-vim )"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? (
dev-python/pytest-salt[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pip[${PYTHON_USEDEP}]
dev-python/virtualenv[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
dev-python/timelib[${PYTHON_USEDEP}]
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
${RDEPEND}
)"
DOCS=( README.rst AUTHORS )
REQUIRED_USE="|| ( raet zeromq )"
RESTRICT="x86? ( test )"
PATCHES=(
"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
)
python_prepare() {
rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
rm tests/unit/states/test_boto_vpc.py || die
}
python_install_all() {
local svc
USE_SETUPTOOLS=1 distutils-r1_python_install_all
for svc in minion master syndic api; do
newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
systemd_dounit "${FILESDIR}"/salt-${svc}.service
done
insinto /etc/${PN}
doins -r conf/*
}
python_test() {
local tempdir
# testsuite likes lots of files
ulimit -n 3072 || die
# ${T} is too long a path for the tests to work
tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
mkdir "${T}/$(basename "${tempdir}")"
mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
(
cleanup() {
rm -f "${tempdir}"
rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
}
trap cleanup EXIT
addwrite "${tempdir}"
ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
USE_SETUPTOOLS=1 SHELL="/bin/bash" \
TMPDIR="${tempdir}" \
${EPYTHON} tests/runtests.py \
--unit-tests --no-report --verbose
) || die "testing failed"
}

@ -97,6 +97,8 @@ python_prepare() {
rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
rm tests/unit/states/test_boto_vpc.py || die
rm tests/unit/modules/test_kubernetes.py || die
# allow the use of the renamed msgpack
sed -i '/^msgpack/d' requirements/base.txt || die
}
python_install_all() {

@ -1,3 +1,3 @@
DIST stow-2.2.2.tar.gz 579324 BLAKE2B fc4ab7f386e8245b361cee5fc0decd91caec543ec6178c82720866c33a974ba9d68e999a68c3b7357d873ab1b58bb8b022bf02dad029972f42c317ffc288bd04 SHA512 8a3e5da6b5cb4c1ee1b512bae5a9859f83659d5de05f7a9af1dd09df2a32f6b8c6d43b79736db91232c43621d542041d4ef92eb088925796adad0676f200a9b5
EBUILD stow-2.2.2-r1.ebuild 576 BLAKE2B d57e40f7788701209240fd8443a5d0c415e9b4adf36c3365b8744b0ebd2f7a56f39612eb8687b55200c22d54cf6e9b759ca116219cf3fa285cc38461b64d0d78 SHA512 fa5ce84c1b276d878f9b12d7850ee3fffd3f9c519c1b37c33ae27447f559f4c0ebb0999fa3f15fd7f0060bb2df84e3365c3a7bc35cc3a59c3b1d22bd5ede078f
EBUILD stow-2.2.2-r1.ebuild 604 BLAKE2B a13e8903738049963109d49fce6be1f2943eacc13689822c300a26d2e36f7e7eb5b85290868914c5578b650e32a1152a198dd5d03f357fd8ca1375c5896cdf13 SHA512 d3405f3722fea01623e0ec49973743df773d1e48095f51b22a9cd48a0b70f8be16fb59c5276d9520392e8bef73d7f904bc77bdd9ab480182916e477e645a0bda
MISC metadata.xml 469 BLAKE2B c09f5d5ad52c89661d6c2b43f1762584cf3282ec9812233df01900ea4b738faf2c66b4405f0d5b01f33016b7c98714cb14fb503f84ed2332596d65ad676217f1 SHA512 d2dedba051ac4de16316392a51e87ea36f435c7f568523ddbd06aa620f4d350edafc6bc996954d9982dd1496951c22731fc5cb5df2725414986281709dafb126

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -11,11 +11,12 @@ SRC_URI="mirror://gnu/stow/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="test"
DEPEND="dev-lang/perl
test? (
dev-perl/IO-stringy
virtual/perl-Test-Harness
dev-perl/Test-Output
)"

@ -1,7 +1,3 @@
DIST supernova-2.0.9.tar.gz 22877 BLAKE2B 02bb230c8392946bf43faedb19d8b5660a144f07b9ee4c3638f3211dcd25d2336c6a032a9c0b1006cc01ab61ea9d8e3769704ba034b676f0b115b32b39855b20 SHA512 8270f871efcf7c8741078e4658dd8413796a14bd9eb43514beb8b120462db757a5324c5c3c9e4988d8725ec9b903e7743c6ae336dd5f73536e1e0df456ba54a9
DIST supernova-2.1.0.tar.gz 23196 BLAKE2B 70d41d42c8504075657aa869c666d6e8ec079c62535276a12e49687a139eec54d068ced7ee1f2bc18c8da708ec50edb11e2bdcdf324a36b9c309c3e134887e6d SHA512 fa4f6b3f0a3b5a19c309b507ce8c356a929c8a8cf805c45d58a8f4c1bc36f508a0d04477570cf79e7660e94d803df8a02e67206465e75eb3452e43cb6ca186aa
DIST supernova-2.2.0.tar.gz 24068 BLAKE2B 129c077baf9b415851f3c17eb5a9870ff2d8109a54c424d9039204620b6dd68d8f17183b5c52d863882bd2586ed03b7d1c397f70f337bfba9e9c8255b6feb578 SHA512 436ec13dfaf5ff7cadacc1dedc3545a579784cfce3b0c7925cc0d877ba76a4c865ad3687ae8ae22fdb11d880282dd555f9a9d709c005ad024299a34607fd8063
EBUILD supernova-2.0.9.ebuild 1255 BLAKE2B 616e906e2e6c513b8d5882b4ce209200472d53f9c237718c04be9560b880557f5d3163bd5d14320cb424eb3a8e6538560567b894214ddecf3718c42f21ed2830 SHA512 cc96e4e331c6deb1a714973d93f64d418804756fd80d27a51cbb0775d292504f96a47d038544e87bac3485f8f36cc3e2fd2a858430c22fe494b2881ec64cfcdd
EBUILD supernova-2.1.0.ebuild 1246 BLAKE2B 0b6da2ad5949e34a4671c2d31249005f37502b9ea8fc6fd03324064b4005b397ef1a8c8b94957d6874e79406c932c813bd16c98046b36da2774a7a29a11d73d9 SHA512 a0a7cf3bc5f829c04d4f06762a87239bf153e2f76d395f8b353cd30f661b8070208c8e5213d53d69af3da8fb7709a8abfa3bd2ba428625244c500b9b4892240d
EBUILD supernova-2.2.0.ebuild 1246 BLAKE2B 0b6da2ad5949e34a4671c2d31249005f37502b9ea8fc6fd03324064b4005b397ef1a8c8b94957d6874e79406c932c813bd16c98046b36da2774a7a29a11d73d9 SHA512 a0a7cf3bc5f829c04d4f06762a87239bf153e2f76d395f8b353cd30f661b8070208c8e5213d53d69af3da8fb7709a8abfa3bd2ba428625244c500b9b4892240d
MISC metadata.xml 392 BLAKE2B 5b23db21278557cf725aa717947b5a49712c7524303d7762493baee979c6775b2551b6d677bdbb225305cc36d1dc20e703ef842c462f1117fd36e5c47706a216 SHA512 6dd5869a5d45116b13cffd648948305c17b0248bee5804feff4062064bf662c5e879731f5fc526320a5a28d49d290e961229085dc4e450d3a4cdf1f5fda8f158
MISC metadata.xml 513 BLAKE2B 902b49ed2456d8b8742d17a03370e66a3299b540cf5d6c84b39333d3de8fd849fbae680378b79397bb00faeed0e1e54c9fc160fd710f11888ca442f0dff6a074 SHA512 8253bfed9a47098f43a96906fbd72144005ca7bae46aa3f4e2f3bdc00b95a7dfc5d8b7106a1127cb3a6b3d3ab34748f6560bb38917047074674ed4955f389834

@ -2,8 +2,12 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>alunduil@gentoo.org</email>
<name>Alex Brandt</name>
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
</maintainer>
<upstream>
<remote-id type="github">rackerhacker/supernova</remote-id>

@ -1,52 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit bash-completion-r1 distutils-r1
DESCRIPTION="novaclient wrapper for multiple nova environments"
HOMEPAGE="https://github.com/rackerhacker/supernova"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE="doc examples test"
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="
${CDEPEND}
doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
test? ( dev-python/pytest[${PYTHON_USEDEP}] )
"
RDEPEND="
${CDEPEND}
dev-python/click[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
>=dev-python/keyring-0.9.2[${PYTHON_USEDEP}]
dev-python/python-novaclient[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
"
python_compile_all() {
if use doc; then
mkdocs build || die "docs failed to build"
fi
}
python_test() {
distutils_install_for_testing
cd "${TEST_DIR}"/lib || die
py.test || die "tests failed under ${EPYTHON}"
}
python_install_all() {
use doc && local HTML_DOCS=( site/. )
use examples && local EXAMPLES=( example_configs/. )
distutils-r1_python_install_all
newbashcomp contrib/${PN}-completion.bash ${PN}
}

@ -1,51 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit bash-completion-r1 distutils-r1
DESCRIPTION="novaclient wrapper for multiple nova environments"
HOMEPAGE="https://github.com/rackerhacker/supernova"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE="doc examples test"
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="
${CDEPEND}
doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
test? ( dev-python/pytest[${PYTHON_USEDEP}] )
"
RDEPEND="
${CDEPEND}
dev-python/click[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
>=dev-python/keyring-0.9.2[${PYTHON_USEDEP}]
dev-python/python-novaclient[${PYTHON_USEDEP}]
dev-python/rackspace-novaclient[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
"
python_compile_all() {
if use doc; then
mkdocs build || die "docs failed to build"
fi
}
python_test() {
py.test || die "tests failed under ${EPYTHON}"
}
python_install_all() {
use doc && local HTML_DOCS=( site/. )
use examples && local EXAMPLES=( example_configs/. )
distutils-r1_python_install_all
newbashcomp contrib/${PN}-completion.bash ${PN}
}

@ -1,28 +1,22 @@
AUX 3.12/syslog-ng.conf.gentoo 1184 BLAKE2B 44e7ed22649a32f8ba179466ab1fdb05d3e140b2f7d4094e29dc0bd7b5d9d4c5bf76e7f589929f6893c406faa1753356ec3f9afaa068c4c806475f3796e3b1c6 SHA512 d59aa50c836cfedd59bb596f73e9286094cdeeed7a02a8c4178613a8b8fa8b7151f82ea0fb6e66270a75cfdd6c1431e9c2991dd2ae96148581403e525203e653
AUX 3.12/syslog-ng.conf.gentoo.fbsd 577 BLAKE2B 4f92dcd741eb7ba41d38a947d03d118e859f3a8a9c4ee8f02d9a2142af188a2783e898b2ef77857fa71bb5cf3b13960fac529a4c7228d615a50272397ac51b34 SHA512 9a8913f1375ee96c946d9af4f43d9bdb100b19362ca82b7e5538449e4360c085c84e225d204e04db83214304c7be8a1dc4a5ff8aaa8e25c071d8e0d99d5f2464
AUX 3.12/syslog-ng.conf.gentoo.hardened 4511 BLAKE2B 18e4d0895dbc289f014ca917f9cc3493077021a8caddca4dc103f1f8c81376ccdf074407bbe1540f05c6b008c328200b3cda06bcb58ca2adf79f2578b5095365 SHA512 75cb811608f43c914ba31897ce417af6e3681dd3aa6f081841bfcea0455dded37f4b0b9beacbe9c958f37d57c382d96f0def24a03e955ae7d470337f33e2cc4a
AUX 3.12/syslog-ng.confd 1492 BLAKE2B 8df9e16ec0fd8de141d1624f7451fefe19c49b2ba91ebdd63b6cce730ab2997715d7d352629f8bc6f7c700fce7fa04f291d3507dc421e1382a104dc264395e83 SHA512 8a346864dd88ac393f7080c4a073b20f21dfd547c2517abdd963beb50b9ac49565487a9508b042eb5d00055b2a5bef8db245cfa94c36ba1a60922caaae8bc4e0
AUX 3.12/syslog-ng.rc 1921 BLAKE2B 3e93f17544f27450d80de36504dd4cf39a0aa6b7c51d9df057f254e784cd6b937d57a098ddd5f636da202c54e802ea255698b079032481089145f091fa5ccbd4 SHA512 51c0a7856b481030136a025ebe815d696156393b4318662847237db9a792c52ce0802fd3cdc2cfa325fc75ea22c89fef1c46d44b312e5f8167a9786eacea8ecb
AUX 3.13/syslog-ng.conf.gentoo 1184 BLAKE2B 1a4b78d913c24f085efdbe36893f22e71295af5fcf6f085462ab6baf265aa9e26d796a1fd41d8bef6dd20b119a0920c1d07cf19e8d70640f88d70e333875d1fe SHA512 1dc14fc8ff4f16dac750436e4472e0f69e81f287981b31aa3864a8267beea19fd040b14b955c5011992c70092213a08b2a8350bac792c4d5c256f753b318ed6a
AUX 3.13/syslog-ng.conf.gentoo.fbsd 577 BLAKE2B b8aa747638899024ea8b04fdf3cc623ee77ac2522eb68e6763943808735ab6ef85c29db9f076cc2c3768d377a43530ccd634a50a51a6face8d1b93239aee6839 SHA512 3a0cc8685be4af41690bbd4aaec87b0d44ed8dd3b1dec0bac32818288c4adac1f4673dd73ffdc4164feb4afe8b98728c66a51a323bf302958e422595130a5ee2
AUX 3.13/syslog-ng.conf.gentoo.hardened 4498 BLAKE2B 42626430ef11c3db6b56bfa07f6514551191e6c0e6086eab7c7ffad61d48c4f7931c97ec53af7e26b7187481f3ff572e67e442478995e39e80ab2fcc912251cc SHA512 0501c56996b619c92ae7ea7d7bc2b3110ed099f7efe4708faafd4dab06092d2cec3c015dcc9a4db6b7c7cc94bea278146b840bdb151278eab9a68bf186703bf9
AUX 3.13/syslog-ng.confd 1492 BLAKE2B 8df9e16ec0fd8de141d1624f7451fefe19c49b2ba91ebdd63b6cce730ab2997715d7d352629f8bc6f7c700fce7fa04f291d3507dc421e1382a104dc264395e83 SHA512 8a346864dd88ac393f7080c4a073b20f21dfd547c2517abdd963beb50b9ac49565487a9508b042eb5d00055b2a5bef8db245cfa94c36ba1a60922caaae8bc4e0
AUX 3.13/syslog-ng.rc 1799 BLAKE2B cf9ee36cdf27600f5caa75453b746ced42cda3e3dc8909925b11604967216061f8b3103b6b9f1af499a8c1d986cd9fb82d616138577773ce35c353bea055c6ac SHA512 2a0996057d4dcd730c89af87845749d9ec28c04f99d4f72be809f0f70a213a89a190c86a717169927f292049b326136fd76c6e02413963f7cd554d8acb74d555
AUX 3.7/syslog-ng.conf.gentoo 1203 BLAKE2B 786a4315e11d2feb839aaad7af5fd3544c3c3319857009b716e732a34618a026f25e8f44b2f8c4ebb2fd74cd78eb676bb65c6573f3bb8f357cde71f728ef56a5 SHA512 44de47c9ba8927ab69cbd9479bc18f87a311fb7a7273912b236650385bbaddec28d3a706d822e53a4264fc8fd9895887243fb070252024b732bdb41a840d44be
AUX 3.7/syslog-ng.conf.gentoo.fbsd 593 BLAKE2B 2b161a0aed035fdeba7dffdadcce28f29d2bd4077e391b8af98c031fa92366cf454349463f4ba457e08cf44f9b78a25b525bda9c55405102b079a89223a328d0 SHA512 947be1b330a98490da99d9e64d76732fe8eb54beb266ae1a546df7319cea998a89963ddf086e993025efbba1a8aefc2ecc4ff5bd440a50e565cfddbe35536d90
AUX 3.7/syslog-ng.conf.gentoo.hardened 4520 BLAKE2B 968f77526cb027259acf507177f02b8d735a48aff78f809eb14e50795c26fee62b1e15602ed3ee16317ecb15f14d33135fa0dc54bea2ead002f96618991f87ec SHA512 2a0d31178e83ea9685ac1b5988652ef077b71d368d75eda46ebf0e1ef3dbb79e8c911bc6498d6a934912250ead902cfa4bb8ceff1f14a08e06f6152824e36128
AUX 3.7/syslog-ng.confd 1492 BLAKE2B 8df9e16ec0fd8de141d1624f7451fefe19c49b2ba91ebdd63b6cce730ab2997715d7d352629f8bc6f7c700fce7fa04f291d3507dc421e1382a104dc264395e83 SHA512 8a346864dd88ac393f7080c4a073b20f21dfd547c2517abdd963beb50b9ac49565487a9508b042eb5d00055b2a5bef8db245cfa94c36ba1a60922caaae8bc4e0
AUX 3.7/syslog-ng.rc6 1919 BLAKE2B 5769cd9f4464dbdde9a8af7b700292f59772132b3f32cf542b4cb4f596541c7f244c906d236650f09921c131e84722813578493b36e8d8281df401a1d127d3c9 SHA512 2681f6b1c4acd9fbb9e29b4b732c09b8384ffdb501aed15bbaac97409cc79269f2e5068dac5746bfcc52751c5943279c3cce5d3f869b4c6ec2cc5f23d2ad3b04
AUX 3.14/syslog-ng.conf.gentoo 1184 BLAKE2B ad9a75f4b25518d44f8dc0fa48af5bd0df9d27742af3bc3a30ad9e11dd1f201fafe15436a84d4b608052b79cff87a21d27ab4b5556ff2a9fe08f93c415c0ed8b SHA512 8b12f9a13090613460f5985d25d9ec5628c768bb8ccbfd326de56ca8b3d6c36295fc4bdd9f290b4e3fe3407ce5270e18b6b301224f074a679d91838282bfd306
AUX 3.14/syslog-ng.conf.gentoo.fbsd 577 BLAKE2B bf18a1b56899483c83d80a4e36e99a594977d3af7905ed025d532a028ee0737f0d24c8076139f42a8e3c70c2f10d1a679f070fed59d088769ed54c72e3b8cda2 SHA512 d60f491b80b8b388392776abf327dcea6f4e1f0822e8361d1ee5949a7d5bcdc52130cc941d3933724b3f2425a105122eee6b7df0fc67bde0ca9bbbed5d58ad24
AUX 3.14/syslog-ng.conf.gentoo.hardened 4498 BLAKE2B 568cf2b335d52865910d3324579635e1630a927ac12dfc4243c57f0f33fe7ffe63598843462810d71cf043f4d4672b4a4e45fae7ad5fc5f61096b52bbd64f5fb SHA512 539bc6480b85a0ae789bc0063d1af6225aa3fc61bca2d57190ee8676ad21aefdc88a9c3f66287575547a84099f4b989cfcf297e1317d2ed34de8b25363377081
AUX 3.14/syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530903659828565018dff71d62e56bfba28afa6c5e9fcb55aee2a41bcfff53c9ad006ee319124adbd66a SHA512 c945d27560afa310ac7f15e0cde3a564d5296892c747827d68df1b49c728998b056b596f93ac2564a5cb349f88db6585de58ec64cdaa13b92f20f5aac213ef44
AUX 3.14/syslog-ng.rc 1892 BLAKE2B 6596679ca09eb9c74c4971d99cebb400f7de483adc23f723ed2e0c1541c4badd89a2ba2dba8845cb6457e64bd44e53024034b7c59e7c438018e240daa73333b6 SHA512 b350fbb9a6cf5fd44aeb2e778968b7d4a51b5447057721f36cf528c57753d83ee9b889ca1f1d54a3a25f3c5cff5dedd9dcac2d4591ad6e77246eb420f523f36e
AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f43d5bf06fb77b86959a75c7680df87e7ded7fd72073ad469a06bdec1e739784c82776d04a91bd3add SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e
AUX patches/syslog-ng-3.12.1-json-c-0.13+.patch 862 BLAKE2B aeab5c994f0c9e5c3909300f5f8b56ed22194746f95b6cc2f6e600dbe04c9f4016b3f1d085c222f0d7d6922765f71c56d1bd3ac1757b1ca07d11c9d15a6fc1b4 SHA512 ded991eeee706e4d51f48e803db75d39e907f83aaf9cb9994eef146ba8d7cc784e5d3890eb18acdb4ff2702dcf8291686c6975ba3b0c4f0d3817a301ae81a641
AUX patches/syslog-ng-3.14.1-fix-tls-client.patch 6248 BLAKE2B 8671b724886a62bbd9e61987a6e7e95ed5773278b6fd8cb1c2ba3285ba4c6589190484386da9d8865326f3588937b825a738462e7a935363d103942982c68dd4 SHA512 1999cc1107d8b22a58f5919a8bc0f8930d0c60170bb9f23a20e25f49f84f8d10ceecd6903de9cd7cc738dbc8cdec690880be400f5dafc3b06ae88681d4848694
AUX syslog-ng.logrotate 231 BLAKE2B ede8c2e3bd6fa67b2740bca74fa45e799a88dcb9aac456df4fbad5db919f0ac8671b7e073efa1d7fdf1f2c119521d6fe8d5e6d4209b0fb09062e8499bd3377be SHA512 f8dfdbc4ea59c4cbb500b9ac0d4f8c7e33d0510049c7945ee1ae50039dc011b1ca2835c18ee145bf3d9ca306aca0d0de879735c3298b8a0f944db6ba4747ab1b
AUX syslog-ng.logrotate.hardened 1614 BLAKE2B c9845bb43bd09a210f06912131dd2ba88164f0dc58f9d81455c13bba0ee923d1b9a6025f6b8e5fd066254bf6d0c81588b8d515aa055da157c29aaa0aa63fd700 SHA512 141b0ce95ca8ea6a9faf1f94ae1feffceffae19dbd4337c55d7dd4e554d41b7b8846680fab77f361ff4bf6093e3fe239fd3cec32dbb56ddc7b5e0f40bc054760
AUX syslog-ng.logrotate.hardened.in 1518 BLAKE2B c13fd2707266edef0e74476aaf8446c8f77d2ffa8508cd7b8c32d13a22ff63bc883ac7a79f21287681b906430ecb05bae7665c064adbe161e4e1647e3ace9c29 SHA512 43ab59f037d6955844ba9a12675b745351fd3144dc1db8b81fe1c6ef48798452ac9a6d94caa68978dae396eceaa1a6d476fc99221989cb40265d6bb9dbbbf620
AUX syslog-ng.logrotate.in 219 BLAKE2B acfde709749d11790b451e3f9a0d9bc33f129e86e3f68bdd36cf2d2c9c5561c5308805aea36378e8d79995e1bf173e4471845805681be2c409b52479333c35d8 SHA512 7a838006ce61c9702d6ea77672affa8cb1dc2ec2c6a1a268a4ae4f5a59dcac1ccfe835d25144ef8376a60a11227fa64e38dc16f8d0eaff182f14a6644a3a5ceb
DIST syslog-ng-3.12.1.tar.gz 8905646 BLAKE2B abe273c561569047ef4ea0b21b08341d207ecc9a37ba88d1aa28f00de8a0c28cab2942b3d461b7b4fea940668b44ceda7f9c71b6f7c7583143f4bf65adb54036 SHA512 00370f8b090156c064d9fe932e2aafe3f78ffc01bc47b2bc2f0f3c6cbdf98ea8cc2084317b8c2b1a9755cce404646b20e131039ce55b87e24f4401a55b95ff7e
DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
EBUILD syslog-ng-3.12.1.ebuild 4376 BLAKE2B 2d746d6733b9da5cc81684254743769c5c769fed298c852d71e8a5cc8b51380a90fd4e43f88c9fa236e7189dde850266cf244fac30a7df04650ac0d38918ec78 SHA512 f110f4d7f66cc910c845490e7f61aa094a83ff95d8d886d3a807eb1bc9ccb20fc3c6cf0ef335ffa7d08ed673918edf30362f964cd349516074b14f26438a52e2
DIST syslog-ng-3.14.1.tar.gz 9039910 BLAKE2B 688eb52557c41a2556835978809b74ef4cc6b78e54580c4f349a8b9ebc07a6cf5ab99d8cda2a0212cb0186fe9e0a276d46ab9846c5ed1c391d734596ccc2d0a9 SHA512 86e5b59f76de3f585781accc9e426b2f74a73a560a6b49364e3f2b71b6fdd382b8473b468ac396e09c1dd0e00aa525a25874af67ce6c81978df2995c9b920aa7
EBUILD syslog-ng-3.13.2.ebuild 4674 BLAKE2B 866870f74bc238d749ec04d59f6a20adebb11107ca5180707f1314f30bc7eb03ce07d48a3707ac3862152f69e21429390574df3308e3b51f922d0083ee5d76f6 SHA512 e0a43d536200f183894f119e87166deb66d07ccb4a78ef395d8c4241a0f1e3fccaca1eaadb76811ec09650022e2163be3066c85bd3519296d0e296903d94fd3e
EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
EBUILD syslog-ng-3.14.1.ebuild 4692 BLAKE2B 05b0cf13bd7e041a02b0ed3941333843d94829a0b3095b1e18bf9d8206a1055cc1f963ca838fc64c836c9809ffe2fbb59c3c07b0104a39d1f7e044a99e7b5592 SHA512 923e12dca49880e8f2db4786b874600675815255eaf0ecd28374f2ad50bc6b9a7b094b59541fe415bd1fe14a2b37ea08f94eae6f8b17f076495d134b3ea98d28
MISC metadata.xml 1080 BLAKE2B 913203dd1c18414dfb03794e9053151638c56bbb306b9da3c731c64e392a126a30adc38f8516b99c3c5cec024675e9779a10bdd5178f8e87f8bee2ad0b08044b SHA512 4d776d710534634a84d1415f93e3412a580319bf2580451fb27581ca498d2ca81747d3247aaaadde10319b82cefd36e9d29899778ce918838a583aec17130f00

@ -1,4 +1,4 @@
@version: 3.12
@version: 3.14
#
# Syslog-ng default configuration file for Gentoo Linux

@ -1,4 +1,4 @@
@version: 3.12
@version: 3.14
#
# Syslog-ng default configuration file for Gentoo FreeBSD
#

@ -1,5 +1,5 @@
@version: 3.12
# Copyright 1999-2017 Gentoo Foundation
@version: 3.14
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# https://bugs.gentoo.org/426814
@ -16,9 +16,10 @@ options {
};
source src {
unix-dgram("/dev/log");
system();
internal();
};
source kernsrc {
file("/proc/kmsg");
};

@ -29,6 +29,7 @@
# For very customized setups these variables can be adjusted as needed
# but for most situations they should remain commented:
# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
# SYSLOG_NG_CONTROLFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.ctl
# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
# SYSLOG_NG_PIDFILE_DIR=/run

@ -1,22 +1,23 @@
#!/sbin/openrc-run
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run}
SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
: ${SYSLOG_NG_CONFIGFILE:=/etc/syslog-ng/${RC_SVCNAME}.conf}
: ${SYSLOG_NG_STATEFILE_DIR:=/var/lib/${RC_SVCNAME}}
: ${SYSLOG_NG_STATEFILE:=${SYSLOG_NG_STATEFILE_DIR}/${RC_SVCNAME}.persist}
: ${SYSLOG_NG_PIDFILE_DIR:=/run}
: ${SYSLOG_NG_PIDFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
: ${SYSLOG_NG_CONTROLFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.ctl}
SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
: ${SYSLOG_NG_GROUP:=root}
: ${SYSLOG_NG_USER:=root}
command="/usr/sbin/syslog-ng"
command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
command_args="--cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --control \"${SYSLOG_NG_CONTROLFILE}\" --persist-file \"${SYSLOG_NG_STATEFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
command_user="${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}"
extra_commands="checkconfig"
extra_started_commands="reload"
pidfile="${SYSLOG_NG_PIDFILE}"
start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
description="Syslog-ng is a syslog replacement with advanced filtering features."
description_checkconfig="Check the configuration file that will be used by \"start\""
description_reload="Reload the configuration without exiting"

@ -1,36 +0,0 @@
@version: 3.7
#
# Syslog-ng default configuration file for Gentoo Linux
# https://bugs.gentoo.org/show_bug.cgi?id=426814
@include "scl.conf"
options {
threaded(yes);
chain_hostnames(no);
# The default action of syslog-ng is to log a STATS line
# to the file every 10 minutes. That's pretty ugly after a while.
# Change it to every 12 hours so you get a nice daily update of
# how many messages syslog-ng missed (0).
stats_freq(43200);
# The default action of syslog-ng is to log a MARK line
# to the file every 20 minutes. That's seems high for most
# people so turn it down to once an hour. Set it to zero
# if you don't want the functionality at all.
mark_freq(3600);
};
source src { system(); internal(); };
destination messages { file("/var/log/messages"); };
# By default messages are logged to tty12...
destination console_all { file("/dev/tty12"); };
# ...if you intend to use /dev/console for programs like xconsole
# you can comment out the destination line above that references /dev/tty12
# and uncomment the line below.
#destination console_all { file("/dev/console"); };
log { source(src); destination(messages); };
log { source(src); destination(console_all); };

@ -1,24 +0,0 @@
@version: 3.7
#
# Syslog-ng default configuration file for Gentoo FreeBSD
#
# https://bugs.gentoo.org/show_bug.cgi?id=426814
@include "scl.conf"
options {
threaded(yes);
chain_hostnames(no);
# The default action of syslog-ng is to log a STATS line
# to the file every 10 minutes. That's pretty ugly after a while.
# Change it to every 12 hours so you get a nice daily update of
# how many messages syslog-ng missed (0).
stats_freq(43200);
};
source src { system(); internal(); };
destination messages { file("/var/log/messages"); };
log { source(src); destination(messages); };

@ -1,114 +0,0 @@
@version: 3.7
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# https://bugs.gentoo.org/show_bug.cgi?id=426814
@include "scl.conf"
#
# Syslog-ng configuration file, compatible with default hardened installations.
#
options {
threaded(yes);
chain_hostnames(no);
stats_freq(43200);
};
source src {
unix-dgram("/dev/log");
internal();
};
source kernsrc {
file("/proc/kmsg");
};
#source net { udp(); };
#log { source(net); destination(net_logs); };
#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
destination authlog { file("/var/log/auth.log"); };
destination _syslog { file("/var/log/syslog"); };
destination cron { file("/var/log/cron.log"); };
destination daemon { file("/var/log/daemon.log"); };
destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
destination lpr { file("/var/log/lpr.log"); };
destination user { file("/var/log/user.log"); };
destination uucp { file("/var/log/uucp.log"); };
#destination ppp { file("/var/log/ppp.log"); };
destination mail { file("/var/log/mail.log"); };
destination avc { file("/var/log/avc.log"); };
destination audit { file("/var/log/audit.log"); };
destination pax { file("/var/log/pax.log"); };
destination grsec { file("/var/log/grsec.log"); };
destination mailinfo { file("/var/log/mail.info"); };
destination mailwarn { file("/var/log/mail.warn"); };
destination mailerr { file("/var/log/mail.err"); };
destination newscrit { file("/var/log/news/news.crit"); };
destination newserr { file("/var/log/news/news.err"); };
destination newsnotice { file("/var/log/news/news.notice"); };
destination debug { file("/var/log/debug"); };
destination messages { file("/var/log/messages"); };
destination console { usertty("root"); };
destination console_all { file("/dev/tty12"); };
#destination loghost { udp("loghost" port(999)); };
destination xconsole { pipe("/dev/xconsole"); };
filter f_auth { facility(auth); };
filter f_authpriv { facility(auth, authpriv); };
filter f_syslog { not facility(authpriv, mail); };
filter f_cron { facility(cron); };
filter f_daemon { facility(daemon); };
filter f_kern { facility(kern); };
filter f_lpr { facility(lpr); };
filter f_mail { facility(mail); };
filter f_user { facility(user); };
filter f_uucp { facility(uucp); };
#filter f_ppp { facility(ppp); };
filter f_news { facility(news); };
filter f_debug { not facility(auth, authpriv, news, mail); };
filter f_messages { level(info..warn)
and not facility(auth, authpriv, mail, news); };
filter f_emergency { level(emerg); };
filter f_info { level(info); };
filter f_notice { level(notice); };
filter f_warn { level(warn); };
filter f_crit { level(crit); };
filter f_err { level(err); };
filter f_avc { message(".*avc: .*"); };
filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
log { source(src); filter(f_authpriv); destination(authlog); };
log { source(src); filter(f_syslog); destination(_syslog); };
log { source(src); filter(f_cron); destination(cron); };
log { source(src); filter(f_daemon); destination(daemon); };
log { source(kernsrc); filter(f_kern); destination(kern); };
log { source(src); filter(f_lpr); destination(lpr); };
log { source(src); filter(f_mail); destination(mail); };
log { source(src); filter(f_user); destination(user); };
log { source(src); filter(f_uucp); destination(uucp); };
log { source(kernsrc); filter(f_pax); destination(pax); };
log { source(kernsrc); filter(f_grsec); destination(grsec); };
log { source(kernsrc); filter(f_audit); destination(audit); };
log { source(kernsrc); filter(f_avc); destination(avc); };
log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
log { source(src); filter(f_news); filter(f_err); destination(newserr); };
log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
log { source(src); filter(f_debug); destination(debug); };
log { source(src); filter(f_messages); destination(messages); };
log { source(src); filter(f_emergency); destination(console); };
#log { source(src); filter(f_ppp); destination(ppp); };
log { source(src); destination(console_all); };

@ -1,42 +0,0 @@
# Config file for /etc/init.d/syslog-ng
# If you are not using network logging, this entire section should be
# commented out. Otherwise, choose one of the settings below based on
# how you are configuring your network.
#
# If you are using the net.* scripts to configure your network, you should
# set rc_need to match the interface through which your logging server
# can be reached.
#rc_need="net.eth0"
#
# If you are using an interface manager like wicd, dhcpcd in standalone
# mode, networkmanager, etc to control your interfaces, set rc_need to
# the name of that service.
# rc_need="dhcpcd"
#rc_need="networkmanager"
#
# If you are using newnet and configuring your interface statically with
# the network script, you should use this setting.
#rc_need="network"
#
# You can use this setting, but I do not recommend relying on it.
#rc_need="net"
#
# You may also want to uncomment the following if you are using network
# logging.
#rc_use="stunnel"
# For very customized setups these variables can be adjusted as needed
# but for most situations they should remain commented:
# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
# SYSLOG_NG_PIDFILE_DIR=/run
# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
# SYSLOG_NG_GROUP=root
# SYSLOG_NG_USER=root
# Put any additional options for syslog-ng here.
# See syslog-ng(8) for more information.
SYSLOG_NG_OPTS=""

@ -1,58 +0,0 @@
#!/sbin/openrc-run
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run}
SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
command="/usr/sbin/syslog-ng"
command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
extra_commands="checkconfig"
extra_started_commands="reload"
pidfile="${SYSLOG_NG_PIDFILE}"
start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
description="Syslog-ng is a syslog replacement with advanced filtering features."
description_checkconfig="Check the configuration file that will be used by \"start\""
description_reload="Reload the configuration without exiting"
required_files="${SYSLOG_NG_CONFIGFILE}"
required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
depend() {
use clock
need hostname localmount
after bootmisc
provide logger
}
checkconfig() {
ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
}
start_pre() {
checkconfig || return 1
checkpath \
-d \
--mode 0700 \
--owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
"${SYSLOG_NG_STATEFILE_DIR}"
}
stop_pre() {
[ "$RC_CMD" = restart ] && sleep 1
return 0
}
reload() {
checkconfig || return 1
ebegin "Reloading configuration and re-opening log files"
start-stop-daemon --signal HUP --pidfile "${pidfile}"
eend $?
}

@ -0,0 +1,173 @@
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)

@ -2,14 +2,14 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit autotools python-single-r1 eutils multilib systemd versionator
MY_PV=${PV/_/}
MY_PV_MM=$(get_version_component_range 1-2)
DESCRIPTION="syslog replacement with advanced filtering features"
HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
HOMEPAGE="https://syslog-ng.com/open-source-log-management"
SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2.1+"
@ -44,9 +44,13 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/patches/${PN}-3.12.1-json-c-0.13+.patch
"${FILESDIR}/patches/${PN}-3.14.1-fix-tls-client.patch"
)
DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened"
"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
S=${WORKDIR}/${PN}-${MY_PV}
pkg_setup() {
@ -61,8 +65,15 @@ src_prepare() {
# remove bundled libs
rm -rv lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
if use !json ; then
sed -i -e '/cim/d' scl/Makefile.am || die
# drop scl modules requiring json
if use !json; then
sed -i -r '/cim|ewmm|graylog2/d' scl/Makefile.am || die
fi
# use gentoo default path
if use systemd; then
sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
-i contrib/systemd/syslog-ng@default || die
fi
for f in "${FILESDIR}"/*logrotate*.in ; do
@ -70,7 +81,7 @@ src_prepare() {
sed \
-e "$(usex systemd \
's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng@default/' \
's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
"${f}" > "${T}/${bn/.in/}" || die
done
@ -114,13 +125,12 @@ src_configure() {
}
src_install() {
emake DESTDIR="${D}" install
dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
default
# Install default configuration
insinto /etc/default
doins contrib/systemd/syslog-ng@default
insinto /etc/syslog-ng
if use userland_BSD ; then
newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
@ -140,9 +150,6 @@ src_install() {
}
pkg_postinst() {
elog "For detailed documentation please see the upstream website:"
elog "https://www.balabit.com/sites/default/files/documents/syslog-ng-ose-${MY_PV_MM}-guides/en/syslog-ng-ose-v${MY_PV_MM}-guide-admin/html/index.html"
# bug #355257
if ! has_version app-admin/logrotate ; then
echo
@ -151,4 +158,12 @@ pkg_postinst() {
elog "for logrotate to use."
echo
fi
if use systemd; then
echo
ewarn "The service file for systemd has changed to support multiple instances."
ewarn "To start the default instance issue:"
ewarn "# systemctl start syslog-ng@default"
echo
fi
}

@ -1,138 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit autotools python-single-r1 eutils multilib systemd versionator
MY_PV=${PV/_/}
MY_PV_MM=$(get_version_component_range 1-2)
DESCRIPTION="syslog replacement with advanced filtering features"
HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
IUSE="amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="test"
RDEPEND="
caps? ( sys-libs/libcap )
dbi? ( >=dev-db/libdbi-0.8.3 )
geoip? ( >=dev-libs/geoip-1.5.0 )
json? ( >=dev-libs/json-c-0.9:= )
python? ( ${PYTHON_DEPS} )
redis? ( dev-libs/hiredis )
smtp? ( net-libs/libesmtp )
spoof-source? ( net-libs/libnet:1.1 )
systemd? ( sys-apps/systemd )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
dev-libs/libpcre
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
>=dev-libs/eventlog-0.2.12
>=dev-libs/glib-2.10.1:2"
DEPEND="${RDEPEND}
virtual/pkgconfig
sys-devel/flex"
S=${WORKDIR}/${PN}-${MY_PV}
pkg_setup() {
use python && python-single-r1_pkg_setup
}
src_prepare() {
local f
use python && python_fix_shebang .
if use !json ; then
sed -i -e '1 s/cim //' scl/Makefile.am || die
eautoreconf
fi
for f in "${FILESDIR}"/*logrotate*.in ; do
local bn=$(basename "${f}")
sed \
-e "$(usex systemd \
's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
"${f}" > "${T}/${bn/.in/}" || die
done
epatch_user
}
src_configure() {
econf \
--disable-java \
--disable-docs \
--enable-manpages \
--with-embedded-crypto \
--with-ivykis=internal \
--with-libmongo-client=internal \
--sysconfdir=/etc/syslog-ng \
--localstatedir=/var/lib/syslog-ng \
--with-pidfile-dir=/var/run \
--with-module-dir=/usr/$(get_libdir)/syslog-ng \
$(systemd_with_unitdir) \
$(use_enable systemd) \
$(use_enable caps linux-caps) \
$(use_enable geoip) \
$(use_enable ipv6) \
$(use_enable json) \
$(use_enable mongodb) \
$(use_enable pacct) \
$(use_enable python) \
$(use_enable redis) \
$(use_enable smtp) \
$(use_enable amqp) \
$(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
$(use_enable spoof-source) \
$(use_enable dbi sql) \
$(use_enable tcpd tcp-wrapper)
}
src_install() {
# -j1 for bug #484470
emake -j1 DESTDIR="${D}" install
dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
# Install default configuration
insinto /etc/syslog-ng
if use userland_BSD ; then
newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
else
newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
fi
insinto /etc/logrotate.d
newins "${T}/syslog-ng.logrotate" syslog-ng
newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc6" syslog-ng
newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
prune_libtool_files --modules
use python && python_optimize
}
pkg_postinst() {
elog "For detailed documentation please see the upstream website:"
elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.7-guides/en/syslog-ng-ose-v3.7-guide-admin/html/index.html"
# bug #355257
if ! has_version app-admin/logrotate ; then
echo
elog "It is highly recommended that app-admin/logrotate be emerged to"
elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
elog "for logrotate to use."
echo
fi
}

Binary file not shown.

@ -1,5 +1,5 @@
DIST pigz-2.3.4.tar.gz 105412 BLAKE2B 821fac7cd0f113ea81b284c1df5d464c2a2bf8f88742ee432eb6fdc31d097983983f22280a52dda04c3f1735297af690bcebdfd70679560525a5c3731652695e SHA512 c0d5da6c5b2da50841aaf3958d5694edca0356d4bef211175e9f2f17e0c815e80b2e62bb39c7761c8f83fdaa84ca7373e130cdb0fa2c96f91c397556cbf7ba2a
DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
EBUILD pigz-2.3.4.ebuild 939 BLAKE2B 758fe8bc5d39191bd4b3fe7ce27097e5a2066a102b33ff2985b7efbf528ffd407ae1512f93468c00629761d327879b4916a6efcf5dd901dbfcbc93c051036aca SHA512 302e35b9d71cc701aa80e51db4f15bb59ca2e539195fe15d765249cc7bad3e914bb5e0786a2c949b1916373a4d53f60fe009c58e1b9f4e2a4f43d4e697ca1804
EBUILD pigz-2.3.4.ebuild 938 BLAKE2B 35f8bf034d0f338db9b7705dd3158d56c8127354c84656a6a8c23672a38cbbe7c1b694eb83ebcd0ae6e325c5e083df5fd5456e12618cccfb819726c6afafcfee SHA512 9e2f9345815bffe6c377e809e34ba21d25447b95960ddc0fd3637696471bf3590023810c6f7c6b47d0e72948fc3060ade539523df2ed8bd7e4bd58a3ef744ac3
EBUILD pigz-2.4.ebuild 944 BLAKE2B f1e8735848abf2191d33d49d7b82ce5282a61729190f6ed50b189404d25b77bcefb6f37b6c8bbba1e4103cd8918795bf4ed0ba4ba1d339b27b48c26e657c6084 SHA512 9f2c44c679e867d4d813d93f975a0ed9de6cde5be6c0844c2b414593cc49bc03680bb075ee821c1b18c45dfaed540d976aa5c02e38404179b877f3ae93bf8109
MISC metadata.xml 499 BLAKE2B a3f4937154e9907d34d3779407b1bfc07e8de329cb34b0efe4b62f20b4c9f5b9eb09d22023496e4f5228f1cb64bb4829c30730fe6035128b14e759073ec83a82 SHA512 7c954984f01ee2bf1bb9b8f0840445fed7f47899188a884462c59a862bef568845c2cb81a966aa6d46222d45ab7a9fabfc24b1bb4d178f9f8fb1789554ca87fe

@ -11,7 +11,7 @@ SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
IUSE="static symlink test"
LIB_DEPEND="sys-libs/zlib[static-libs(+)]"

@ -6,6 +6,6 @@ AUX tar-1.30-fix-test-92.patch 257 BLAKE2B ee4fe8420f56191a8e4d9edefd109c948eb69
DIST tar-1.29.tar.bz2 2715993 BLAKE2B 656b77a49c463ec7ade87a97b71469dadbf01551131bdf0cfa895b7b2a7d073a4cd51e9bec4169b134d83155aca18af1a89ddb5d14cb1dc0d9968184870d69f3 SHA512 d2cea9892892dfa0c8efd390303b75dccc085c4895e07ced684074592d69729916d6ea12475aa6aff873d076a729bb7dc2499c233edcfb9c7e8e8995481eef3b
DIST tar-1.30.tar.bz2 2858639 BLAKE2B 82a8b1fbf1eb5c0347b2f8cf35854498e2955eb85eaf041ec44a38bbd9bc82cc7184d5cb858f9905f503c9178ec6d0ed50be2dc27be9933b29e0a18b8e6c0b8f SHA512 07a1157430898fee1a2c6fd3853d59d4ae13998db685669c8c702f73d2466eeb9892f84a5f0495bfe088c8190a643a99ac9f2cb16b85c9fe3ae0d83cc0f338e8
EBUILD tar-1.29-r1.ebuild 2157 BLAKE2B 4a1e4e3cbbc34cf71f41b5ce9e1f7b8b65a9413fdc3e08bb97f09eb64a4f72b8952461fef59d7b6beca00350ea0b7718d2a4d99d3f9a8a830479d1e194f44641 SHA512 9445561ce892822feb1365f6a227143a3bea6767a19bacea08345057ac2fab80cd5035c81281b27161a443c5103e5432288e9b69ec0fe33218c587ccb9d20a4b
EBUILD tar-1.29-r3.ebuild 2229 BLAKE2B aeb1ab736bcd66f770e075d34a693a07860d1ae8fed05fd24fa5360928fc9853fd46e7cc43915e8f7eaa1e5d1dac8771747ae184ac3e44ebd9e8abadd39a5990 SHA512 1582d16d5f1be6dcd50130b701940d1f24dcef73aa95c1ffc2dcb98e8945a832d662601a4831a6d17f959ffbe4255b0ceb7266abfb5f8225fa0a77c10d9b8a68
EBUILD tar-1.29-r3.ebuild 2228 BLAKE2B b3a18bafef6019abb6c95e31540654114bec45af3866b53c5af11194ed292a1cbfb0dc4453da5eca327bfb4718c4f238c1b9208fc38fd42e6f818db7b84ceb01 SHA512 1c866125c7829cfb289175dfabfa26ec1495fbd91adfc561545cdd834551d22aae85058d4a963a7225f889e6ac5c1a4b3cc863825f5797649c6953c65812d2a2
EBUILD tar-1.30.ebuild 2163 BLAKE2B c07de44b4f9c90532a5516e60091980ec53650c09e2d6aa04902b8a2045a7bbf0822d6ea4ea771ebd433e1861ecb0f2de3a521176b41e86df167750c8b035e60 SHA512 7accbccbbc5e107d6d86f3e9f5ba6d706d4f10046154587e7e45de52e68af9da7e1bf44c481c58b9b30103f0a3fae3d403c62edce6f5e380e672a7ffbc153985
MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7

@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
RDEPEND="acl? ( virtual/acl )

@ -7,5 +7,5 @@ DIST xar-1.6.1.tar.gz 180771 BLAKE2B efc15995941b7240486a02cad736981e4881dac8a57
DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
EBUILD xar-1.5.2-r1.ebuild 798 BLAKE2B cf559675c085e7f4f2b97a3496aab0aaa468ffc2f35a68cb94a686526ae0dd90ab96e92ff452226b678c02709e2b9c4fef78735bc7ba82909c6b43dd24c38634 SHA512 e5e8f4b9ddb93e892cc2c4072cb97d3204758b2957aceb0f6268edf525a7ba980f3d121705902bc9a7d51f2660f91fc86521db213aa2cadaf237d4c07765b8dc
EBUILD xar-1.6.1-r1.ebuild 796 BLAKE2B d90e8026e9aa22d2cfbc88337cd4d1102cb60f0d5834156d78a16739e7ebcb3ef169b1fc782dcdde6213c62245022d9fad1e8cf5f98e68eaa98ea9cacd4142f0 SHA512 f69913a2f0ae8de5e0cdc92ec071f4559f1994f2d3c89faa3b3801899134e729fa7ce2e41b29fd76c964de962cc0fbf1c0706eff9be7c89bd3e88e08733a47a9
EBUILD xar-1.8.ebuild 1150 BLAKE2B 3ef1e64c404672e805313c9427b7e62a4b0229945fb62ff0c5c7140dc2df3ddfee286ae688c80e35408ef86a539bc0eaa52c3cd7d7970110d5af9e4b9379586a SHA512 9bda0a5c1dc4b51f944355dc08fb2b1ce091eb501205e37fd53f19c85bc0725f7982c1838f6feacd0fae209ff8f574df4649a419070e0c6b83140edf25701c25
EBUILD xar-1.8.ebuild 1162 BLAKE2B 91a94417a7cc057a4df9ba6ee2bce98b9972fc0d7a2f0dbdd083cf0c37ab8ad88ef5710c995eb7edf212e2fcc3629f4b3dc1dcc63e28e0a1633631af769270b6 SHA512 afeca9c84293c6c08c8b9d2e7169e9159befe58f5cb8cf4d10a9a5f448baf91ccbe92d677e4f3461eb456c76d6af09befbb956b697c58fe8a8be3f1609bd754a
MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1

@ -11,7 +11,7 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="libressl kernel_Darwin"
DEPEND="

Binary file not shown.

@ -1,4 +1,4 @@
DIST attic-0.16.tar.gz 87985 BLAKE2B cc801d8e3b28f6041c053f368c1d5ab00b1b419928d6a84647da7dccb7fb46b477898249873e90ba15c721468c09ae243d450fc978fe8cc3947b2c2e035f2aae SHA512 16139cd93bff59414cc1ce3fd68e2dd0aed4937a20bd1003880961ad2e239a1e982fd0d4f6b791165464213b88dea6ccd8e5e59d2087809be2e1bfdfd3b3186c
EBUILD attic-0.16.ebuild 794 BLAKE2B 36e0a5f01f4c9059563439e97ffb46d301eed3769e678d53021a53f55d42fb689f05b41243dbdf981e6491db9b8b8919a30b5f977ec34ddedadf5a106b70b0ac SHA512 73001a32fd828a52085eef8ea01201b81243dbfee19892a983a96752c240734d4cb3d7a11604690658ad1222b702cf344506fadc717a8174014b45dbe144d0b4
EBUILD attic-9999.ebuild 794 BLAKE2B 36e0a5f01f4c9059563439e97ffb46d301eed3769e678d53021a53f55d42fb689f05b41243dbdf981e6491db9b8b8919a30b5f977ec34ddedadf5a106b70b0ac SHA512 73001a32fd828a52085eef8ea01201b81243dbfee19892a983a96752c240734d4cb3d7a11604690658ad1222b702cf344506fadc717a8174014b45dbe144d0b4
EBUILD attic-0.16-r1.ebuild 928 BLAKE2B 466663341caad33e0a6e6783873f6616056b1010427a73b7623b95ddf8c6b69ca7689db62422fe3f47895385fda6e8672bedffd641f3228110452f59cc0c7869 SHA512 c6d96f220bac2d1a7197995f63c16a8d368c442f402bdb23a3ddde18ff61e00742d972d1c3451ede86e1e0a7ebff20f94d9da9c83ef5e3b8b84f2b5c846c1d79
EBUILD attic-9999.ebuild 928 BLAKE2B 466663341caad33e0a6e6783873f6616056b1010427a73b7623b95ddf8c6b69ca7689db62422fe3f47895385fda6e8672bedffd641f3228110452f59cc0c7869 SHA512 c6d96f220bac2d1a7197995f63c16a8d368c442f402bdb23a3ddde18ff61e00742d972d1c3451ede86e1e0a7ebff20f94d9da9c83ef5e3b8b84f2b5c846c1d79
MISC metadata.xml 328 BLAKE2B 4b8c33c80a1e860ec347a8735aad642c9dc441f87b20c588dde534be6d4f9b6981a07314f0643769537ce946f1397eee20801d381c2632d5c98a1d6db12a00cd SHA512 2c24d7eaef0da74758f5726e2b88d2dc11db8a2ea3999abee9305c5e66b236b50d56034d5fae9a7b1d9caa98c7fa3aa54dd06d5279b3a636532010130e40f36a

@ -1,4 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@ -32,3 +32,9 @@ DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/cython[${PYTHON_USEDEP}]
${RDEPEND}"
python_prepare_all() {
# allow use of new (renamed) msgpack
sed -i '/msgpack/d' setup.py || die
distutils-r1_python_prepare_all
}

@ -1,4 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@ -32,3 +32,9 @@ DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/cython[${PYTHON_USEDEP}]
${RDEPEND}"
python_prepare_all() {
# allow use of new (renamed) msgpack
sed -i '/msgpack/d' setup.py || die
distutils-r1_python_prepare_all
}

@ -1,6 +1,6 @@
DIST borgbackup-1.1.3.tar.gz 2942183 BLAKE2B c7ca37459d35e06694cf9fdbef7328806cf03e6a4290368d47a2c06e1b6a0700d9dbba3efb170e130c7e59951d65ff8ca677955782150154f0ad2d12b93fe57b SHA512 8378e4f805bfb3e9a4e454f5ccfa58eef0517f13a2e8a2c3c6cbdb0304b763fa67152963b17d677daff09590eb777f12fbe1f3f69c3459bcc68781e5a747cb49
DIST borgbackup-1.1.4.tar.gz 3390046 BLAKE2B 27d1743718b9fdd303dbc7a01a586b9f87c119ed7f2464582a229bf2357c3f7d929bdf614689be7d7306a707e7332b8ae0ce5bd9898cea5af2311ca2210c5f41 SHA512 0853033f72406a2913dd74c6ebb8b33a318179843255c92481f5e4fdd0f436de6e4c77eed259a422e00bfadcf260facdfd00c813bb0628b82b8ff63a87e1bcfb
EBUILD borgbackup-1.1.3.ebuild 941 BLAKE2B 385972a0e8f3321c04148651c1d6ded98bfd520235000762a1c29fc89b4226cbdedd64fc8e3191686e082982670261299c9e4dfc4b7733712d991b82d62cde91 SHA512 17d9992a780a59564a41410ebc583dee3a7acf16e26f349856c37cfc33feb2b2f09366808969321ecebfcbf04a86a1f3e305a6fba7e3dcb8ce077470bd2b0ebb
EBUILD borgbackup-1.1.4.ebuild 942 BLAKE2B 5bafc749262fb831056a1f600c5f1e7e90a118f272182b32464563ee52978aea6c2134700ceca8b1eb5ddfe32c7bfd93b2061b68828c58ad9aa6256660ec806a SHA512 1891afff5a9e5b87cb05fce1d1c5fc5a3b7b28ff30da260ceb3de5086b4bf7e8a9c26db6c7227edae4a024ed561dad0ece87365ffd034641e6ad5516cd2a4a09
EBUILD borgbackup-9999.ebuild 942 BLAKE2B 5bafc749262fb831056a1f600c5f1e7e90a118f272182b32464563ee52978aea6c2134700ceca8b1eb5ddfe32c7bfd93b2061b68828c58ad9aa6256660ec806a SHA512 1891afff5a9e5b87cb05fce1d1c5fc5a3b7b28ff30da260ceb3de5086b4bf7e8a9c26db6c7227edae4a024ed561dad0ece87365ffd034641e6ad5516cd2a4a09
EBUILD borgbackup-1.1.3-r1.ebuild 1089 BLAKE2B 227958b734a324262ec7e2b5cd68ed388bed8919a0ade56d357e7d21a7558ac7c8c0467bec06d96cdd4e6d63ae73677e9d9209462beab44c0faf512fb3aef0e3 SHA512 8b4863da598d8a1b198ea2e6e40326051a867fc0671bf5e660aa5c5aac9f4838620f48e9a4787aad463b342fb6e68d04ea0fe93f160a8261f450d4ec629eea82
EBUILD borgbackup-1.1.4-r1.ebuild 1090 BLAKE2B 54321c9dadf7b6bf077a286375c3ebc84b5f8e545e6d103d0af24253fed071f67a547b6a33af03b00bf72b765122125c16041fe6668d42f99d4809a74f87047e SHA512 c135ae63d7fa35c806fd9ffb0bcf4be28fb935a539843253054c4169d38affaefa1dce2d9388def85022bcbe4b232f4e0e762abe5715b5e87d18fb70d7cb64a9
EBUILD borgbackup-9999.ebuild 1076 BLAKE2B 6077574567e4f83fb3b620688585cb414ee56759d723ab722ffd6b5a6a28c69e71706b1ab54d4f41a9f3a29ebab3d40c8741614e76c7b8a6847f06f45bb57016 SHA512 787ccd8d08b917e8e08cb7e80000193e9b0c94f522b42c53cddbfdb1d294219dc94d0281668fc1dbaafe89f69dd882ea6248e240d155e19b1f6d592470ac413c
MISC metadata.xml 380 BLAKE2B 2ac9cd2f49c605955fb4133ff30d52e578bb45b0717348e6909cf7cd172ce9a7436d30394466ece7d889d02802f500f86297072a755b24905c17342cd7aee5e4 SHA512 4160c5674dbb51e9e3fa3c0d29fca6b7ab4073f2e2be1a2eca88ff049b4b5f066d04c747130c45d31a9c63ee2fe3bcb5f521017a581e7f6b69eb07fb94b83661

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -38,3 +38,9 @@ DEPEND="
dev-python/cython[${PYTHON_USEDEP}]
${RDEPEND}
"
python_prepare_all() {
# allow use of new (renamed) msgpack
sed -i "s|'msgpack-python.*',||g" setup.py || die
distutils-r1_python_prepare_all
}

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -38,3 +38,9 @@ DEPEND="
dev-python/cython[${PYTHON_USEDEP}]
${RDEPEND}
"
python_prepare_all() {
# allow use of new (renamed) msgpack
sed -i "s|'msgpack-python.*',||g" setup.py || die
distutils-r1_python_prepare_all
}

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -38,3 +38,9 @@ DEPEND="
dev-python/cython[${PYTHON_USEDEP}]
${RDEPEND}
"
python_prepare_all() {
# allow use of new (renamed) msgpack
sed -i '/msgpack/d' setup.py || die
distutils-r1_python_prepare_all
}

Binary file not shown.

@ -1,3 +1,3 @@
DIST kali-archive-keyring_2015.2.tar.xz 6448 BLAKE2B 5fe0c7d9e6ac145d046e1d7bcd1002c1799aba7224462691a0f940c5ee362c134c47cce9a60b71476f6b66f2cf6937262fb665dd29faed7e40dbd5a8a11f340f SHA512 3f680fb31f0723f0c4b8aa7053488637c23ef2804a688ad307365c6eaa71b9559dba31c8aee6e9804b9f03e24397c077f4f057e58da8f7e06ffc5d36003d23ad
EBUILD kali-archive-keyring-2015.2.ebuild 387 BLAKE2B d6deeeb49f8486d8fd540d31db39d07f47815cad9ef3427b5d1787f44e37e033ba9cd85de546d20fea1d222abc87d514982d23fde35dce3000915e79a839099e SHA512 0cdb25c89101417df9fca24ef7f17a639632d7553b7b359768e1bb01a48f8b69e2dbb3d1586811401cc399955ffd635b2705fae00c1b01533235ab8a69682aa9
MISC metadata.xml 256 BLAKE2B f865bb6b76d5bad36698212439e9f3c05f8e464e933f5081bd467aeadc62e7f7215461c2844d1e6031458756d233c0235b0b2560922343c8b36194385488a44f SHA512 a67fc42e4fdc5839523b9ca9a2d84c65e9fb0a57305d6b7e0d5b309769825c98df750e903665df1fdcf14326820982965a489d5fb39791e647949fbcc8b04bf9
MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be

@ -1,8 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>steev@gentoo.org</email>
<name>Steev Klimaszewski</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,2 @@
EBUILD libnitrokey-9999.ebuild 1145 BLAKE2B 01a32d7b4498ede0e645ed6747e5d2901bacfe8602d598be4b92ff7952597f430b4b68123d60d8dc4277af4bba88b3598e0dd52fe645862d0b470ef0c9c4fc74 SHA512 bd3ddfb326baf091cdd4062819e2cc5635c4aaeb1f4b9436465f89e1cbb58289ca9ca061a6c938ef711604879dbcdb32e475d22184f5480b0c42b67bc1499fb1
MISC metadata.xml 397 BLAKE2B ec7996ade24566ed79175f047e18c18a7c51e3946c65c4b3cd986d3fe6372ed2a79ca13b6e2d0a21b5e907a2f8e27e7061ad9ce893ffbd93ead06c8814f4d00c SHA512 457d69deef3f3bcca1ac0b0a15d20ca03bf012523a03c311c5be065ad50a43ef5d7e0d7fb949a6a63f3198c35313d83e0e7a8ef882c1095234f93a2dd8be416e

@ -0,0 +1,50 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
inherit cmake-utils udev
DESCRIPTION="Support library for the Nitrokey"
HOMEPAGE="https://github.com/Nitrokey/libnitrokey"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Nitrokey/libnitrokey.git"
# Disable pulling in bundled dependencies
EGIT_SUBMODULES=()
else
SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
fi
LICENSE="GPL-3"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/hidapi:=
virtual/udev"
DEPEND="
${RDEPEND}
virtual/pkgconfig
test? ( >=dev-cpp/catch-2.2.0 )"
src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)"/rules.d
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-DBUILD_SHARED_LIBS=ON
# actual hardware tests
# 1. require a connected Nitrokey
# 2. may kill data on your Nitrokey
# hence the main testsuite is disabled
-DCOMPILE_TESTS=OFF
-DCOMPILE_OFFLINE_TESTS=$(usex test)
)
cmake-utils_src_configure
}

@ -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>soap@gentoo.org</email>
<name>David Seifert</name>
</maintainer>
<upstream>
<remote-id type="github">Nitrokey/libnitrokey</remote-id>
<bugs-to>https://github.com/Nitrokey/libnitrokey/issues</bugs-to>
</upstream>
</pkgmetadata>

@ -1,3 +1,4 @@
DIST nitrokey-app-0.6.3.tar.gz 769503 BLAKE2B 97b4f9951cb1ca1e3da1a2af32756b72a9a9e1f8b55d087115a6a95fe26a7aabde6c9503330f43308c3824211524dd1780e104ae6e28e3d60c38cc1b4158edeb SHA512 23960b0ca740a4c9520a3d7043f396ffb6fb730ef28ad44b299aadbb0b7d2fa1a182c38a88fd684fe664c2079c5a03c5a6b8e6ceb7f8ca69a37fb64ef64237a6
EBUILD nitrokey-app-0.6.3.ebuild 723 BLAKE2B 568bdb73d8a109ae377ba3f189ebd5c1760a13f886394f9421d7ee22ab9537a58aefe5adcb1b2204cd388edb4ba6865d0a96dfdcff575126602be61cf999d867 SHA512 11c36ae01ed31273939bf775b12d29063d9a08c9dd3d26a270f814b75c03e18863c10f702a0f7f6e00ee7b198e027d4fee31aa142b973e5fc08048fab0336c8a
EBUILD nitrokey-app-9999.ebuild 728 BLAKE2B fe94fdd87a6db5279e20cddd1ba4e787d03d6bfc2e794df9b4064c7761f41428ac7a785c0131d32928c9fa38d09c828f6c4614823da6406d73258bcda5d5ee64 SHA512 39c6a50773b1469897048521059804e7c225f963dfb656d00da63cb79138c2abd3041678003c0669835e059abf342eeec56f86fb6493cd8aa81e71463315e25c
MISC metadata.xml 399 BLAKE2B 622fa027d3ed6c95ea87e6c533289af1b66229f76bc163b490a8c5a819373c85d21ab22505c9a159a7598fdc17b1bfc7d01ff6217d3d8f8e64ef38f2d68d710e SHA512 fa204891e67b5c6f1ac7082fe49f52ae287f6aed77dd1fd8972770c7a5ddb7f2af71f543a3888c9f572dfb04197f98486a75ecba5960506274c634782af110ab

@ -0,0 +1,33 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
inherit cmake-utils
DESCRIPTION="Cross platform personalization tool for the Nitrokey"
HOMEPAGE="https://github.com/Nitrokey/nitrokey-app"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Nitrokey/nitrokey-app"
# Disable pulling in bundled dependencies
EGIT_SUBMODULES=()
else
SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
fi
LICENSE="GPL-3"
SLOT="0"
RDEPEND="
app-crypt/libnitrokey:=
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5"
DEPEND="
${RDEPEND}
virtual/pkgconfig"

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save