diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-13 16:55:35 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-13 16:55:35 +0000 |
| commit | 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 (patch) | |
| tree | c99a472cce74148d499f42ada873454b0e32a42d /app-admin | |
| parent | da6a52f691ef980bab92d003d5df8f463c623af8 (diff) | |
gentoo resync : 13.03.2018
Diffstat (limited to 'app-admin')
51 files changed, 357 insertions, 1383 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz Binary files differindex 40e6f758d3b6..46875fbef162 100644 --- a/app-admin/Manifest.gz +++ b/app-admin/Manifest.gz diff --git a/app-admin/aws-as-tools/Manifest b/app-admin/aws-as-tools/Manifest deleted file mode 100644 index 2376a45fa4e9..000000000000 --- a/app-admin/aws-as-tools/Manifest +++ /dev/null @@ -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 diff --git a/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild b/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild deleted file mode 100644 index a9b3692c2a2a..000000000000 --- a/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild +++ /dev/null @@ -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" -} diff --git a/app-admin/aws-as-tools/metadata.xml b/app-admin/aws-as-tools/metadata.xml deleted file mode 100644 index 6d127b5ab82c..000000000000 --- a/app-admin/aws-as-tools/metadata.xml +++ /dev/null @@ -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> diff --git a/app-admin/aws-cw-tools/Manifest b/app-admin/aws-cw-tools/Manifest deleted file mode 100644 index 851adb0e14fe..000000000000 --- a/app-admin/aws-cw-tools/Manifest +++ /dev/null @@ -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 diff --git a/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild b/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild deleted file mode 100644 index ab4c5fb5543e..000000000000 --- a/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild +++ /dev/null @@ -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" -} diff --git a/app-admin/aws-cw-tools/metadata.xml b/app-admin/aws-cw-tools/metadata.xml deleted file mode 100644 index 6d127b5ab82c..000000000000 --- a/app-admin/aws-cw-tools/metadata.xml +++ /dev/null @@ -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> diff --git a/app-admin/aws-iam-tools/Manifest b/app-admin/aws-iam-tools/Manifest deleted file mode 100644 index ff5445c53eb5..000000000000 --- a/app-admin/aws-iam-tools/Manifest +++ /dev/null @@ -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 diff --git a/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild b/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild deleted file mode 100644 index 5714f191ff31..000000000000 --- a/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild +++ /dev/null @@ -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" -} diff --git a/app-admin/aws-iam-tools/metadata.xml b/app-admin/aws-iam-tools/metadata.xml deleted file mode 100644 index 6d127b5ab82c..000000000000 --- a/app-admin/aws-iam-tools/metadata.xml +++ /dev/null @@ -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> diff --git a/app-admin/aws-rds-tools/Manifest b/app-admin/aws-rds-tools/Manifest deleted file mode 100644 index 1863bc36cfea..000000000000 --- a/app-admin/aws-rds-tools/Manifest +++ /dev/null @@ -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 diff --git a/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild b/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild deleted file mode 100644 index 1cd6d1b4857c..000000000000 --- a/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild +++ /dev/null @@ -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" -} diff --git a/app-admin/aws-rds-tools/metadata.xml b/app-admin/aws-rds-tools/metadata.xml deleted file mode 100644 index 6d127b5ab82c..000000000000 --- a/app-admin/aws-rds-tools/metadata.xml +++ /dev/null @@ -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> diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index 90c00f22ca9a..edfe21f0b26c 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -1,6 +1,7 @@ AUX conky-1.10.4-x11-build.patch 944 BLAKE2B eafeab1078e1c1c96190dce1207f49272a86fb964b153cd971d3e773ddfb8094a55b0c8e77f0d152c5cc4ec77f0863b694fca8d776208f2aae26d6366cc898ef SHA512 4ef0fb7467101befd1adbc0ae43268d69ceaa35af0185ade1f3b8ce4ebe8d8083cc6c71ddabae73bae1c5f92f5f95b0a4595dd92dd55bd9ffc4a34d10af26afa +AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4 DIST conky-1.10.4.tar.gz 365145 BLAKE2B 60f6f53ef67a9958d4dd4c3f1ab53886235927ed457ad3e98d2f6f61568a14baa7cd2afa0d3ddde9ed5e16aae17891213d906f49c308269f678adf37ea627329 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a EBUILD conky-1.10.4.ebuild 4850 BLAKE2B 4d7e00ca639cfc5eed0b80f2ddb473e2979014e2564c684a07e0d4647612ee53c0cee16e6d2806e25a70c0725521678a04d5e43cc3544d4612fee749bbf50510 SHA512 612694ed4db70e8198f6a5b4110f972ab09dff8e3f8619367db3e2697dce97d22fae09b971b3c7800b150f744e86a3268c0999f4e1f3ed3f3041bb32dbbb7663 -EBUILD conky-1.10.8.ebuild 4911 BLAKE2B efb1279166ce96dc20b6aeaa829469c6258b7fbe172a77d09cfe51c70d8399b5f88e085a600cb73eaa7d662287fa88f21916f8fe18333926f46bedbe8d161f14 SHA512 e85637fa8a03ba611bd4f0f4eb243e737ed1479ba7db460393da8ab1565b34e82441e295913fbfa63b3c4e5b5c25988e1a658828cdd6125087ac351250a53c9c +EBUILD conky-1.10.8.ebuild 4963 BLAKE2B c40c96c0ab05f65f84258c014d88dd0d62613c42c82affd60cf8e73cc51fd7e91d58374b06a3c63cc0c6f7a21cccd48a51a99da94e1913726b2db5386763b1d7 SHA512 ba98bdb8bd55f6aca2b2e98ffe7a8364adadd3d9d66633c8ca7d34cb109c03bc4df4b7a050082c2c3d194ccb446b5b659cfba76f049c9670da01f35b643b7fe0 MISC metadata.xml 2525 BLAKE2B 805fd872d69f00911fa599d87f2c638b1126c438fd0c8ccdda84ff5cbddecbca882b74fa1828e703c32a4035a4223606a1da75bb27cc63ac19b8dd61f5f90b42 SHA512 ccfe5718005f521aa00e7a66429493ea1301f7691acf0cca2faa5372c5f1349ba62d5046b85059f395fe51b30130a06f6867e0736b80cf4b76f9388b05fa76bb diff --git a/app-admin/conky/conky-1.10.8.ebuild b/app-admin/conky/conky-1.10.8.ebuild index 2679d6611621..e46eaaa3096c 100644 --- a/app-admin/conky/conky-1.10.8.ebuild +++ b/app-admin/conky/conky-1.10.8.ebuild @@ -73,6 +73,8 @@ CONFIG_CHECK=~IPV6 DOCS=( README.md TODO ChangeLog NEWS AUTHORS ) +PATCHES=( "${FILESDIR}"/${P}-use-pkgconfig.patch ) + DISABLE_AUTOFORMATTING="yes" DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}. To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf diff --git a/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch new file mode 100644 index 000000000000..97e6bd02323f --- /dev/null +++ b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch @@ -0,0 +1,34 @@ +Reversed patch + +From abd0be51a00444d3be6b213e0926675e5a4e5ed3 Mon Sep 17 00:00:00 2001 +From: Brenden Matthews <brenden@diddyinc.com> +Date: Tue, 23 Jan 2018 12:56:06 -0500 +Subject: [PATCH] Use FindCurses instead of pkg_check_modules. + +This should resolve #217. +--- + cmake/ConkyPlatformChecks.cmake | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake +index c5b39b2f..19ec7b9b 100644 +--- a/cmake/ConkyPlatformChecks.cmake ++++ b/cmake/ConkyPlatformChecks.cmake +@@ -129,12 +129,12 @@ if(BUILD_HTTP) + endif(BUILD_HTTP) + + if(BUILD_NCURSES) ++ pkg_check_modules(NCURSES ncurses) ++ if(NOT NCURSES_FOUND) +- include(FindCurses) +- if(NOT CURSES_FOUND) + message(FATAL_ERROR "Unable to find ncurses library") ++ endif(NOT NCURSES_FOUND) ++ set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES}) ++ set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS}) +- endif(NOT CURSES_FOUND) +- set(conky_libs ${conky_libs} ${CURSES_LIBRARIES}) +- set(conky_includes ${conky_includes} ${CURSES_INCLUDE_DIR}) + endif(BUILD_NCURSES) + + if(BUILD_MYSQL) diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest index 13d98df35bd3..ec283eff4800 100644 --- a/app-admin/glance/Manifest +++ b/app-admin/glance/Manifest @@ -1,9 +1,7 @@ AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f3078cea66bc6086e80a530729b6484f110c02e23375fddde7f0ddfd22a6451ef84d9ec3caaa9d6cc SHA512 c6c433334bb337c708e31fac7869bf29e89516b857800d7cb77d264766483f54976dda6d83460078eed0dee14f0770a31adce344ec7fca04c2040b21dcf239b5 -DIST glance-15.0.0.tar.gz 1803491 BLAKE2B 70e0f1f7eab6aa0066d16e30e9325ac45d9c0eb9df875e3b26e90463e10299d6c7c272c0b070137f27332bdfcb33abeda68e3375e2562c83942ca72fcb24de38 SHA512 beb5744f9e8b296356cb731c79f1efd7b60408c1282e8a64ab7d414929c447c4f2ff0562a0d59c0a05f828d420ba190946866543a37dbd2df73ae322cbcabab5 DIST glance-15.0.1.tar.gz 1815463 BLAKE2B ec6e51340fc4d737e2bd777baf03163a0b515d19c1dc8e5203918e07b304a9539f47ba763207e26def985c6a384d21250ffe1386b433d8b606b55d3d70e4431a SHA512 2da3ada256424a7817d0c49aac0940443cbefcfff3df77a623d7099badf356808b5df59f109ac233f84ac561b7310d3b8d53cafd6c9955a8e2b296a1655cedd3 DIST glance-16.0.0.tar.gz 1956293 BLAKE2B 457f18412885287d8a3ea1b702af0e7b826eeeaf93ce8b1b7456a42d3a84594cfe270670ac35e9c63d8fbb464a3ed0db823a6949fbfa37f993b260681222d9c1 SHA512 20ff8ba74eee3a5b69f7e357f69870398e96341831bea56bbad61314d3eff9d6767dfd48634d04f96cfbc4cc96c7eff3ab900748461ecaa14e2cf329aec40481 -EBUILD glance-15.0.0.ebuild 5135 BLAKE2B 0b2055f6e1ffb2cf59eec038d8656ca51aa80227c2698b0fd139119b1f3c7dff9cc8e23081c31852150cbb95693f46b7e5252b8f203362b70a33e3c8a0415e9b SHA512 b8291f97a9cbfc2336fa596c23142ae8ddb74a929e109cecc1f8195cf07b0e6070bd987b7b063be01b66fdafb155a1f7e8655a968f5caba105bf452457f8ce42 -EBUILD glance-15.0.1.ebuild 5277 BLAKE2B b6b68c59d4d45ee94c78ffd465c38d3d3f1dce98fc4b71051d23b1858a7cdc199dc1ab64f6153c9f5a75c4263528cf75334f085a1b556a37220619d1d11e6fd2 SHA512 f79d9aaccc149061028bc1a4fa8ba131fcdbe2f7b708da4dc71d91c78bc26e8f2e8102ebd62fd7aafac0f58e73e5aea19b62a00dfdd0af372ebd3d1e980e6147 +EBUILD glance-15.0.1.ebuild 5275 BLAKE2B 4f8c013b81327ce5020b5a2ad63b707e79939fe979ff5d7c07fbd95680dee369f2e30402c7303d3e9c521fc92a8093cf5149a7a431c7f50180db41d51a90bbf6 SHA512 9a59f6431a047dbea53eb17c09b3363ca50e8c1e93d4c565d28e96dcebacd00b43f18403753ab28427f87813d1e0f9f4cc57776486bcbae21138313ceed6e554 EBUILD glance-16.0.0.ebuild 5041 BLAKE2B 95bf44041a4e387394ffe140a08699aa895dd8b99e1d28ddc1f35700840e530555134885bad23e03771e6ac29ea66471eb4ae38f83d8e7a3b9cdb077b88f3386 SHA512 4408e7cdc946b1f1ac47a259f87ac68ba3d5e1756da49cbc2260f92c7c5e6533b511283b013f0d2585c9ccbbd712fbed03b82689b8410e240eb09c476557b0f7 EBUILD glance-2017.2.9999.ebuild 5277 BLAKE2B b6b68c59d4d45ee94c78ffd465c38d3d3f1dce98fc4b71051d23b1858a7cdc199dc1ab64f6153c9f5a75c4263528cf75334f085a1b556a37220619d1d11e6fd2 SHA512 f79d9aaccc149061028bc1a4fa8ba131fcdbe2f7b708da4dc71d91c78bc26e8f2e8102ebd62fd7aafac0f58e73e5aea19b62a00dfdd0af372ebd3d1e980e6147 EBUILD glance-2018.1.9999.ebuild 5041 BLAKE2B 95bf44041a4e387394ffe140a08699aa895dd8b99e1d28ddc1f35700840e530555134885bad23e03771e6ac29ea66471eb4ae38f83d8e7a3b9cdb077b88f3386 SHA512 4408e7cdc946b1f1ac47a259f87ac68ba3d5e1756da49cbc2260f92c7c5e6533b511283b013f0d2585c9ccbbd712fbed03b82689b8410e240eb09c476557b0f7 diff --git a/app-admin/glance/glance-15.0.0.ebuild b/app-admin/glance/glance-15.0.0.ebuild deleted file mode 100644 index 601d8f56ec29..000000000000 --- a/app-admin/glance/glance-15.0.0.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) - -inherit distutils-r1 user - -DESCRIPTION="Services for discovering, registering, and retrieving VM images" -HOMEPAGE="https://launchpad.net/glance" -SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="doc mysql postgres +sqlite +swift" -REQUIRED_USE="|| ( mysql postgres sqlite )" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" - -#note to self, wsgiref is a python builtin, no need to package it -#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}] - -RDEPEND=" - ${CDEPEND} - sqlite? ( - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}] - ) - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}] - <dev-python/eventlet-0.21.0[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] - >=dev-python/routes-2.3.1[${PYTHON_USEDEP}] - >=dev-python/webob-1.7.1[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}] - >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}] - >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] - >=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}] - !~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}] - !~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] - >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}] - !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}] - >=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] - >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}] - >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}] - <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}] - dev-python/paste[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] - !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}] - <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - !~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}] - !~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}] - >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] - !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/glance_store-0.22.0[${PYTHON_USEDEP}] - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.6[${PYTHON_USEDEP}] - !~dev-python/cryptography-2.0[${PYTHON_USEDEP}] - >=dev-python/cursive-0.1.2[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/monotonic-0.6[${PYTHON_USEDEP}] -" - -#PATCHES=( -#) - -pkg_setup() { - enewgroup glance - enewuser glance -1 -1 /var/lib/glance glance -} - -python_prepare_all() { - sed -i '/xattr/d' test-requirements.txt || die - sed -i '/pysendfile/d' test-requirements.txt || die - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && "${PYTHON}" setup.py build_sphinx -} - -python_install_all() { - distutils-r1_python_install_all - - newinitd "${FILESDIR}/glance.initd" glance-api - - diropts -m 0750 -o glance -g glance - dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber - keepdir /etc/glance - keepdir /var/log/glance - keepdir /var/lib/glance/images - keepdir /var/lib/glance/scrubber - - insinto /etc/glance - insopts -m 0640 -o glance -g glance - doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta* - - use doc && local HTML_DOCS=( doc/build/html/. ) - distutils-r1_python_install_all -} diff --git a/app-admin/glance/glance-15.0.1.ebuild b/app-admin/glance/glance-15.0.1.ebuild index 408b991b18c1..affe9f8be82a 100644 --- a/app-admin/glance/glance-15.0.1.ebuild +++ b/app-admin/glance/glance-15.0.1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then EGIT_BRANCH="stable/pike" else SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 x86" fi LICENSE="Apache-2.0" diff --git a/app-admin/jinit/Manifest b/app-admin/jinit/Manifest deleted file mode 100644 index b16287350efd..000000000000 --- a/app-admin/jinit/Manifest +++ /dev/null @@ -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 diff --git a/app-admin/jinit/files/jinit-0.1.12-gcc43.patch b/app-admin/jinit/files/jinit-0.1.12-gcc43.patch deleted file mode 100644 index c9f6d92fcb03..000000000000 --- a/app-admin/jinit/files/jinit-0.1.12-gcc43.patch +++ /dev/null @@ -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" diff --git a/app-admin/jinit/jinit-0.1.12-r1.ebuild b/app-admin/jinit/jinit-0.1.12-r1.ebuild deleted file mode 100644 index b5e444f27838..000000000000 --- a/app-admin/jinit/jinit-0.1.12-r1.ebuild +++ /dev/null @@ -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 -} diff --git a/app-admin/jinit/metadata.xml b/app-admin/jinit/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/app-admin/jinit/metadata.xml +++ /dev/null @@ -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> diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest index 06d4e65b0711..ca2d3e81f240 100644 --- a/app-admin/logstash-bin/Manifest +++ b/app-admin/logstash-bin/Manifest @@ -4,10 +4,12 @@ AUX logstash.confd 775 BLAKE2B fdcf55e1155c746764aa765350367c421f9ba84b6a1a1cdba AUX logstash.confd-r1 837 BLAKE2B dd8362a386c865b44e05dd4a244146c5b593e4497d876c23c64e2f2811155355fac51e1af7ec079a8dad7141c2ad3e0eecf3b58971efe3352d4e61d210b46400 SHA512 7a7dcbfe2a8f80804083099a942ca51b235440cd356c1e2310ed060c9260ca0ee7d970b0f5293c67290b17bab4e9c8e0669bdef98f51ed1a97f83ae444c7861e AUX logstash.initd 2091 BLAKE2B 980722c1c3cd0cc60cf440d5a06185c66ac4348c0e8990036812ad8f5cbd4e2561affab3ef1de2482990635169afdd10c0841167494d2bf024b28101a0df45fc SHA512 5592918e82182f638a02f6446f9103f70274fdf615573aa4463fde1dfcfa7955c715b0fdcb1f98de9c19ab86268b439d253a696b27f32e55d830cc3839231e30 AUX logstash.initd-r1 2176 BLAKE2B 37c05148d3789c69805ae5151bed5e297d71b9d60d71ff98ed411ac59b73c4a2a9462e6223a2c960301c6228c84879460ae0f793a24806768fb727b01d982709 SHA512 392c8297c6429e0384dd75073773e1f8f51dd62fd155b2a524efd9e862df114b13cc63cf37237526aebe838b5ff26a8f26a3ad08058a56a723e25025df9a16af -DIST logstash-5.6.5.zip 109135563 BLAKE2B 6846231439807dd4fc77ae86af849aaefcc9084482f2f88de6148da3d31ef583164da6749ebe0c4def83217e95729a933acbb3e04777db58639eaab91de06831 SHA512 f1dcbb8f67d2f2868e38646b56376428e0996cbf302837300939b8c7ff6d764417fccea40f90559c48441f939e6940e84501ee3ad1e29ad2538969f2cc12b2b8 +DIST logstash-5.6.8.zip 109269226 BLAKE2B 7537b1a9687cc1f45f2573ed0ac9d4065bfc7e6d94e5a9d861a4227ace47346f1320e2fe9139a6bb82b8a75d5b4766e9a1e844dcc43c6b89990f1c1eb88f1262 SHA512 31dfc2792d54813d1361f117bcd4a489a5e37e1a3ad1c6f811fc0e15b4bbfeb84f5d842dea2b8fcb08e503a51ad58ccc298da9bf86536abcfb5541e71b999806 DIST logstash-6.0.1.zip 116215793 BLAKE2B 676810b9cd62f578e31e1d63d4aae8c920590905a7344434d5e14607bab0e3ce59e2740e6839491f44ce769b24330a7a060174dcb5e6cb9cf51a31d165ba990b SHA512 395e4e2ff199d9ffc5156901d6ba6ab17771ab8f8859acede74567b2294e2d7ee2a6693e79f7b3e82c8d5c1959ad259bfb22e7992670cdcd3b73c7b72a635a31 DIST logstash-6.1.1.zip 116335093 BLAKE2B e7a990c2ea0eb3ec7de714f038765817c76eaf9e6cef0e55106f1f1aca406ec95d6be779f24c1fa28e096b51feeef968cb31f416f99c85c2f45d798bb74aadf7 SHA512 a2a420169dff31f3d5d65628a9d1eaad930a8e544fc4e986e3671ffeea3a1d03c8f77f8b51568a0da082588a843568fb7aefe29c1c90365882f429f9536f9240 -EBUILD logstash-bin-5.6.5.ebuild 2200 BLAKE2B 47aea0d24f81032ada30e99c70553d95c2faae35814299ae3ec25bf033f3bc06b94720ace62dfbb902be4a5d0c45ddc150683e152a1eaa044e8e589c5ace60b0 SHA512 acb1cbb0cfd64c21f656f98d065e68fb2803f99035c195d13e670619f4f847da92115e3ccb48bae2635827fcaba7324ca81f1f0ecb4dcd258bf41b2df9e79f85 +DIST logstash-6.2.2.zip 146093122 BLAKE2B 0bd01673bb030593a944ecdd859ff0f44d8732f3ffef2b45b38798124c9caa547f625ae9c85300500683bac149b6ca4b9976bd0769fa0684989d40aa452a3584 SHA512 eb67b1fbe2530e4b24252a03aca572a41188e119cbf4a88267795782b347155f2e20405add6626585688fa6ed9d38fa463a0818fccd12612285950904dbd0cad +EBUILD logstash-bin-5.6.8.ebuild 2200 BLAKE2B bf08e722dcd1ffc2ff38892c960d2c65407b00cc0ffd694f4ba443bce457f000e41c72c2d7d2d0c2961884d0c42a6e40feb6dad7f56c4339ec1f2ef5fb1a0c89 SHA512 21d8e0bf96cfb356e823e49ea4f5d6031f27055b9a95288cc9bf74989a7a7f9d4d8d88d0a5d89c3beb9badc2a76bd98cdfcd8cbbab110cd8da7dc544960bef10 EBUILD logstash-bin-6.0.1.ebuild 2200 BLAKE2B 47aea0d24f81032ada30e99c70553d95c2faae35814299ae3ec25bf033f3bc06b94720ace62dfbb902be4a5d0c45ddc150683e152a1eaa044e8e589c5ace60b0 SHA512 acb1cbb0cfd64c21f656f98d065e68fb2803f99035c195d13e670619f4f847da92115e3ccb48bae2635827fcaba7324ca81f1f0ecb4dcd258bf41b2df9e79f85 EBUILD logstash-bin-6.1.1.ebuild 2203 BLAKE2B cd2127e338eead00002113add534ac31c23ac5578263ebcbd7ec96b9d234a82a50a86ec7c476596afc4c51ae51a0be434a89165138b7b1515a4fda4a8efd5aba SHA512 96e4e8391a149c4350d28c40f28efe652216171e4026be735df4aa48c1427e8e6f37fcb16720e288ca1d69bbbea6a3657db93f5bf3ef5d7a55b757296a5e2e68 +EBUILD logstash-bin-6.2.2.ebuild 2203 BLAKE2B cd2127e338eead00002113add534ac31c23ac5578263ebcbd7ec96b9d234a82a50a86ec7c476596afc4c51ae51a0be434a89165138b7b1515a4fda4a8efd5aba SHA512 96e4e8391a149c4350d28c40f28efe652216171e4026be735df4aa48c1427e8e6f37fcb16720e288ca1d69bbbea6a3657db93f5bf3ef5d7a55b757296a5e2e68 MISC metadata.xml 578 BLAKE2B 739149a851fd22460a5cf86deaa74732e44ef44c9edfcba880e7734a8660c92d18df33728939addff8e95241c0475cafed5b0df77d0b9acde609b163f8e7eb0f SHA512 ce9ff07c8fa8edf104692b2736dd7e1a4b2d456dfd2f2cebc2a3dec28d7c11020abf21dad583663266ed5ab26670959bd4650a411524581019e0b27504fba049 diff --git a/app-admin/logstash-bin/logstash-bin-5.6.5.ebuild b/app-admin/logstash-bin/logstash-bin-5.6.8.ebuild index f5c2a9c0a255..b14f892c2844 100644 --- a/app-admin/logstash-bin/logstash-bin-5.6.5.ebuild +++ b/app-admin/logstash-bin/logstash-bin-5.6.8.ebuild @@ -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 diff --git a/app-admin/logstash-bin/logstash-bin-6.2.2.ebuild b/app-admin/logstash-bin/logstash-bin-6.2.2.ebuild new file mode 100644 index 000000000000..1977b1915acb --- /dev/null +++ b/app-admin/logstash-bin/logstash-bin-6.2.2.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit java-pkg-2 user + +MY_PN="${PN%-bin}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Tool for managing events and logs" +HOMEPAGE="https://www.elastic.co/products/logstash" +SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip" + +# source: LICENSE.txt and NOTICE.txt +LICENSE="Apache-2.0 MIT" +SLOT="0" +KEYWORDS="~amd64" + +RESTRICT="strip" +QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so" + +RDEPEND="virtual/jre:1.8" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + enewgroup ${MY_PN} + enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN} +} + +src_install() { + keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins} + keepdir "/var/lib/${MY_PN}" + keepdir "/var/log/${MY_PN}" + + insinto "/usr/share/${MY_PN}" + newins "${FILESDIR}/agent.conf.sample" agent.conf + + rm -v config/startup.options || die + insinto /etc/${MY_PN} + doins -r config/. + rm -rv config data || die + + insinto "/opt/${MY_PN}" + doins -r . + fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin" + + newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}" + newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}" + + insinto /usr/share/eselect/modules + doins "${FILESDIR}"/logstash-plugin.eselect +} + +pkg_postinst() { + ewarn "The default pidfile directory has been changed from /run/logstash to /run." + ewarn "Please ensure any running logstash processes are shut down cleanly." + ewarn + ewarn "The default data directory has been moved from /opt/logstash/data to" + ewarn "/var/lib/logstash/data. Please check and move its contents as necessary." + ewarn + ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)" + ewarn "Install the plugins via eselect module that will automatically re-install" + ewarn "all self installed plugins after Logstash upgrades." + einfo + einfo "Installing plugins:" + einfo "eselect logstash-plugin install logstash-output-gelf" + einfo + + einfo "Reinstalling self installed plugins (installed via eselect module):" + eselect logstash-plugin reinstall + + einfo + einfo "Sample configuration:" + einfo "${EROOT%/}/usr/share/${MY_PN}" +} diff --git a/app-admin/procinfo/Manifest b/app-admin/procinfo/Manifest deleted file mode 100644 index e0f7baa1cc81..000000000000 --- a/app-admin/procinfo/Manifest +++ /dev/null @@ -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 diff --git a/app-admin/procinfo/files/cpu-usage-fix.patch b/app-admin/procinfo/files/cpu-usage-fix.patch deleted file mode 100644 index f2bace1bd2cc..000000000000 --- a/app-admin/procinfo/files/cpu-usage-fix.patch +++ /dev/null @@ -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)); diff --git a/app-admin/procinfo/files/kernel-2.6.patch b/app-admin/procinfo/files/kernel-2.6.patch deleted file mode 100644 index b1eef39e3088..000000000000 --- a/app-admin/procinfo/files/kernel-2.6.patch +++ /dev/null @@ -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); diff --git a/app-admin/procinfo/files/procinfo-18-stat.patch b/app-admin/procinfo/files/procinfo-18-stat.patch deleted file mode 100644 index d7dc4a458b28..000000000000 --- a/app-admin/procinfo/files/procinfo-18-stat.patch +++ /dev/null @@ -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 */ diff --git a/app-admin/procinfo/files/procinfo-flags.patch b/app-admin/procinfo/files/procinfo-flags.patch deleted file mode 100644 index e254c254e1a9..000000000000 --- a/app-admin/procinfo/files/procinfo-flags.patch +++ /dev/null @@ -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: diff --git a/app-admin/procinfo/metadata.xml b/app-admin/procinfo/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/app-admin/procinfo/metadata.xml +++ /dev/null @@ -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> diff --git a/app-admin/procinfo/procinfo-18-r2.ebuild b/app-admin/procinfo/procinfo-18-r2.ebuild deleted file mode 100644 index 33a1d8dc6daa..000000000000 --- a/app-admin/procinfo/procinfo-18-r2.ebuild +++ /dev/null @@ -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 -} diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest index 772e0ce12ab2..7d7152de7b3d 100644 --- a/app-admin/sshguard/Manifest +++ b/app-admin/sshguard/Manifest @@ -8,5 +8,5 @@ DIST sshguard-2.1.0.tar.gz 1117466 BLAKE2B 1a105f346aa9b774fb0314161d779eadaab29 EBUILD sshguard-1.7.1.ebuild 1226 BLAKE2B 2f9e967c832fdf3e0fc5a3bd1d1c7e18f54b5210ba1a7b3a5b39a49ee8bef6f1ccdc812e3fa5886b7760c023dba971b23aa10ed50132e51a3aa149b494911e42 SHA512 c0e4e5219c2e95e07d83cdb8b2d9fc9efdc666b74eca4de0adea96fe50539da23d5e143d81dfc2c71e738fd5ba182309c0b51530bafe19b6ee6fc2c96d063973 EBUILD sshguard-2.0.0.ebuild 891 BLAKE2B ad8dbd8fe855078c1699aefa4e41436f453a0ce458f954cb910603aceadaef2d3241f1db343a03ac33be4c016b1c21a661ea3644f9dbbdecd9fbbaaaad3384c8 SHA512 9fe8e23d3ff513956d40835a93e97f008ffdecd989a4602bf2069505bda63df62fd854756e90a1ab04536943a5832416ad74e6dcea765be2780a910f04b42965 EBUILD sshguard-2.0.99.ebuild 710 BLAKE2B eb05727f0a20c707f402ca0411b11f968ec451f5239d45d17a5d4fb2b7cc114c4616e5fe942304636e33a2c4e1035a7d864a74886786bc1fc43766a43dd9a19a SHA512 c378de845ef6b78eac17757bea66c67ea73d244abaacb8674a52e1c6297761cc7b65d2b35ba92e5f8ac5faa5c24e07b7f4c2be9f009a172546501bb05f88a268 -EBUILD sshguard-2.1.0-r1.ebuild 760 BLAKE2B e7534956e7e157116ed768a8b911442ed77abc6ecd574e2a8d10257c9d3c1c76a48087b9f8939d8c0f173acadfb16ee396e71f257fc2cb325c10a4c86cce568c SHA512 6d2c3063f88b19ee48baf89d200fe5e14e229b3c5ba5536137c8fe764d3d136e27723631c7db634fdd30706e53cb8119770d8fa7a22866876be892a5c60cfd6c +EBUILD sshguard-2.1.0-r1.ebuild 759 BLAKE2B 78cbe417086ba15d3609c06bf36251e038a4072b30db6afb52c5dd6e071dc019dd7efa6ed8ec169c93e574eba5e6563dac2481adcc844b428b38b3638d9424c4 SHA512 aec35e1ebab5470439ab642406a153ba163bd565707c30a3d2615e125758fac9bf0c5b1eff7a5268ee6bfa07289d64ed74505de8de06b32eebee679d3257704a MISC metadata.xml 467 BLAKE2B f64fc0f6c5d090ccb435bc562fc601bd86631855b48bb8354833928782b66ad00dcd26bcbcabb0f5e7a94351acdd98eee558ed281917a447f318a6abf4619da8 SHA512 3d936c9b01370bdee03cf23d2ff8632eabc3352054b1b7797baa6e8f1496adc35e79ae286a63bc9a9d6ae5f1e920300f417c08f637ad78e0c40711f2e51dc7b9 diff --git a/app-admin/sshguard/sshguard-2.1.0-r1.ebuild b/app-admin/sshguard/sshguard-2.1.0-r1.ebuild index e4aaf2332fd2..03a8536fa97d 100644 --- a/app-admin/sshguard/sshguard-2.1.0-r1.ebuild +++ b/app-admin/sshguard/sshguard-2.1.0-r1.ebuild @@ -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 @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" +KEYWORDS="~amd64 x86 ~x86-fbsd" DEPEND=" sys-devel/flex diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest index 14d6df410ff0..b4f5723a9391 100644 --- a/app-admin/stow/Manifest +++ b/app-admin/stow/Manifest @@ -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 diff --git a/app-admin/stow/stow-2.2.2-r1.ebuild b/app-admin/stow/stow-2.2.2-r1.ebuild index d4c2355c5953..bd7405804f21 100644 --- a/app-admin/stow/stow-2.2.2-r1.ebuild +++ b/app-admin/stow/stow-2.2.2-r1.ebuild @@ -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 )" diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index 3ea3f8c3b6b0..2c889bc9e094 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -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 diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo index 523a6804e149..7833f3aac376 100644 --- a/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo +++ b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo @@ -1,4 +1,4 @@ -@version: 3.12 +@version: 3.14 # # Syslog-ng default configuration file for Gentoo Linux diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.fbsd index a0f516c7a582..bb21cdf0f04d 100644 --- a/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.fbsd +++ b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.fbsd @@ -1,4 +1,4 @@ -@version: 3.12 +@version: 3.14 # # Syslog-ng default configuration file for Gentoo FreeBSD # diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.hardened index 8497ad8a3215..51b41e8ea48b 100644 --- a/app-admin/syslog-ng/files/3.12/syslog-ng.conf.gentoo.hardened +++ b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.hardened @@ -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"); }; diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.confd b/app-admin/syslog-ng/files/3.14/syslog-ng.confd index 42fa26ab4cf4..9ddeda7e0987 100644 --- a/app-admin/syslog-ng/files/3.12/syslog-ng.confd +++ b/app-admin/syslog-ng/files/3.14/syslog-ng.confd @@ -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 diff --git a/app-admin/syslog-ng/files/3.12/syslog-ng.rc b/app-admin/syslog-ng/files/3.14/syslog-ng.rc index abc652a4df60..fddf34c4ecda 100644 --- a/app-admin/syslog-ng/files/3.12/syslog-ng.rc +++ b/app-admin/syslog-ng/files/3.14/syslog-ng.rc @@ -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" diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo deleted file mode 100644 index 131dea1f71ad..000000000000 --- a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo +++ /dev/null @@ -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); }; diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd deleted file mode 100644 index eb2e3d986e6d..000000000000 --- a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd +++ /dev/null @@ -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); }; diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.hardened deleted file mode 100644 index b7443f0bd66a..000000000000 --- a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.hardened +++ /dev/null @@ -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); }; diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.confd b/app-admin/syslog-ng/files/3.7/syslog-ng.confd deleted file mode 100644 index 42fa26ab4cf4..000000000000 --- a/app-admin/syslog-ng/files/3.7/syslog-ng.confd +++ /dev/null @@ -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="" diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.rc6 b/app-admin/syslog-ng/files/3.7/syslog-ng.rc6 deleted file mode 100644 index a27ae55dcbdf..000000000000 --- a/app-admin/syslog-ng/files/3.7/syslog-ng.rc6 +++ /dev/null @@ -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 $? -} diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch new file mode 100644 index 000000000000..b4046bdbadb1 --- /dev/null +++ b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch @@ -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) diff --git a/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild index 4dd8f23a9bfc..95bd96d2e5bf 100644 --- a/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild +++ b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild @@ -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 } diff --git a/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild b/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild deleted file mode 100644 index 45a21915a87a..000000000000 --- a/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild +++ /dev/null @@ -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 -} |