summaryrefslogtreecommitdiff
path: root/app-admin
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/Manifest.gzbin33954 -> 33965 bytes
-rw-r--r--app-admin/augeas/Manifest2
-rw-r--r--app-admin/augeas/augeas-1.10.1.ebuild46
-rw-r--r--app-admin/clog/Manifest2
-rw-r--r--app-admin/clog/clog-1.3.0.ebuild14
-rw-r--r--app-admin/collectd/Manifest2
-rw-r--r--app-admin/collectd/collectd-5.7.2-r1.ebuild2
-rw-r--r--app-admin/conserver/Manifest2
-rw-r--r--app-admin/conserver/conserver-8.1.18-r1.ebuild2
-rw-r--r--app-admin/glance/Manifest12
-rw-r--r--app-admin/glance/files/glance.initd16
-rw-r--r--app-admin/glance/files/glance.initd-215
-rw-r--r--app-admin/glance/files/glance.initd-r217
-rw-r--r--app-admin/glance/glance-14.0.0-r1.ebuild135
-rw-r--r--app-admin/glance/glance-14.0.0.ebuild135
-rw-r--r--app-admin/glance/glance-15.0.0.ebuild4
-rw-r--r--app-admin/glance/glance-2017.1.9999.ebuild136
-rw-r--r--app-admin/glance/glance-2017.2.9999.ebuild4
-rw-r--r--app-admin/mcelog/Manifest2
-rw-r--r--app-admin/mcelog/mcelog-149.ebuild52
-rw-r--r--app-admin/paxtest/Manifest2
-rw-r--r--app-admin/paxtest/paxtest-0.9.15-r1.ebuild4
-rw-r--r--app-admin/puppet/Manifest3
-rw-r--r--app-admin/puppet/files/puppet-4-webrick-ruby.patch53
-rw-r--r--app-admin/puppet/puppet-4.10.9-r1.ebuild199
-rw-r--r--app-admin/puppet/puppet-5.3.3-r1.ebuild147
-rw-r--r--app-admin/rsyslog/Manifest2
-rw-r--r--app-admin/rsyslog/rsyslog-8.32.0-r1.ebuild2
-rw-r--r--app-admin/su-exec/Manifest2
-rw-r--r--app-admin/su-exec/su-exec-0.2.ebuild6
30 files changed, 491 insertions, 529 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 40d42c467ab0..596981ee8c57 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
Binary files differ
diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index f11d523692c8..c045432efbb8 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -1,5 +1,7 @@
+DIST augeas-1.10.1.tar.gz 2289207 BLAKE2B 6e3cf750c4d3faf7dc472ec7bfe3c46f5babca294d2bd5169cca419c2f93e21bdd656bbc44b30ab66c00fb793df1aa045f60c1260963901773c334b9019eff0b SHA512 382e8ef6a5bd3d12d7d2e0d2987f39c04ff7df3f07cd68aa732bf266b89d5d59a85be63921a7ff70f9219dbc6bb8547f80528242caa9417e08a008d1721cb1d2
DIST augeas-1.8.1.tar.gz 2165325 BLAKE2B aa309984b5b11441fd2b10f3dc0b4a5f79a39038c1a71af6f7ef68b4fc24074db0bbcfd97341828211cc63d60d4b814515b119d0305367e9594cd5aa5159b822 SHA512 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b
DIST augeas-1.9.0.tar.gz 2199534 BLAKE2B 174d3da7f4c7da3146e4bf21245533fdb0cf6927c160153013e0b7d1afac54088daa1e14eecaaed6412fa9c5e353e944eba48013d69fd997ba9c30f609f159e3 SHA512 340aed78ac2df455770735b41f3c10a1cbe40f160e236a735d4580edf5b635afeaf7ddadc10e759e9197c4b233e98b3b6b94a3c2f072aa765c104d64371ce171
+EBUILD augeas-1.10.1.ebuild 1007 BLAKE2B 28cbb683fd12dd15ac1047e207d745d902600665c2fa67f828effd7b54dbfa5e7a02cb397bf13be2234ad088ac1223dd5f743e302c85bbe5e9175bca00514357 SHA512 db2d5a5d287994e5135ae9234e430c9c970fb4107f9ba6c6cfe261cfe282f268f6e9042032e8608820b0e4b587b07803d3db18768bab6dad905ea54b7c375c89
EBUILD augeas-1.8.1.ebuild 1000 BLAKE2B 601f1da391549d104db635310c3fbc7ce590c0b14428b4059e6f32c4f5265a3821eb28f7581766cc773572646e67434d3114ba8d2959cf15a4418884f18e482b SHA512 47871941fbcb08efce33560c5e8d857fef6e2dff1cdde7c31af6b205517af837840b83664fde9b6943b5ee3c3a367a7709c603b9409397cb79d7f879fedde1a0
EBUILD augeas-1.9.0.ebuild 1005 BLAKE2B 49f621d5a5e3317a7c50e0ed60e38fc912ba1c1f9f8daacf2975d58d9b420755d6eb828c1f0db8f6e1702ef1d78596b5f6b1fcafade89b5ac398b3eab60f5c4f SHA512 8283b10f74ea521f7241ecd2b6bf1cac084a337e7f411ff3b665ba429a018336cd71e3ef53e69308c4c371985417e6f16ddd201f9da2409030aa1d794d625622
MISC metadata.xml 693 BLAKE2B c47bd36818c81a0fcb3d8f2e18e7a48797038c8a4a93302d592140faaed41d093523b6ad407b58dc7ae8c5f81c999c04e8514511b685e2a9b7d556dea177bde8 SHA512 1fcdcea259ed6cb652d08e763ccc67bee7bd5da9a7d3600dd492beaec7300868a47a7afdd71950ca8631886042428fce36cc17602a0776a9fa489f0fa2d27436
diff --git a/app-admin/augeas/augeas-1.10.1.ebuild b/app-admin/augeas/augeas-1.10.1.ebuild
new file mode 100644
index 000000000000..3ea24d340802
--- /dev/null
+++ b/app-admin/augeas/augeas-1.10.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://download.augeas.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+ dev-libs/libxml2
+ sys-libs/readline:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=app-doc/NaturalDocs-1.40
+ test? ( dev-lang/ruby )"
+
+PATCHES=(
+)
+
+src_prepare() {
+ if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Languages.txt
+ fi
+ if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Topics.txt
+ fi
+ default
+}
+
+src_configure() {
+ # Needs to implemented
+ local myeconfargs="--without-selinux
+ $(use_enable !static-libs shared)
+ $(use_enable static-libs static)"
+ eautoreconf
+ econf ${myeconfargs}
+ default
+}
diff --git a/app-admin/clog/Manifest b/app-admin/clog/Manifest
index d8ad987dcb1d..7dd4ff5679e8 100644
--- a/app-admin/clog/Manifest
+++ b/app-admin/clog/Manifest
@@ -1,3 +1,5 @@
DIST clog-1.1.0.tar.gz 76267 BLAKE2B 4e3a7637dff51ed7e7161a2630121912672f514606672a0b9747323d3020283afbb9ef591bfec463ad33508e72ed919693da9b48132613b59281e8ce4f7f11c8 SHA512 e44449025a1eb7490152d467167a7417f8982caf14dbdf6b54cf83fd5f47cf037740d99ec322b74381052f96064a1f6e0f01fced9a2414644ad86eeab0ce448d
+DIST clog-1.3.0.tar.gz 705807 BLAKE2B 5e78cf1ed209ef7dae301175e11048eec3e9227ca740ae444a0302e5ee40af260349c9b02d8fe86a159c2db9bc29b5854240000f793e868b270a5852eb552229 SHA512 dfd4ae9c5e31be1620c246edd4b1642ff2351589da04c4fb805d3566e3efe0958ba6978fea567d40b7faeb217ba9f7b42b201a059f939c35564ee8f40b8b452a
EBUILD clog-1.1.0.ebuild 866 BLAKE2B 14394d898d1ab8cf262d4b4b585eba7748aeed366596025698af8d0e27ce1e7b43dbe92d60c0cd25dcee704b35d3e686562b7a31422a322bc4385668c50b3ddd SHA512 341ee31a60270e4fca7e6d4469613f8b82d029f115aa315c87e0eb01adfe8b5e58953bb66bfe68870d879f53b5d05733941d893308083fa4133b608d75af938d
+EBUILD clog-1.3.0.ebuild 356 BLAKE2B 2b7e681143d2987519b4e8baa8d693f332ea812c0017a0a4b4766a8f54d62b12faf99410ea2f22bc6aa6e7040aec8dd8b7eb69e57db385e517a0af07057f3d27 SHA512 d4db65539c4e274d181cd4342ac6b6fdcdd11ebce8a110ee4dec5b4c6ae02eefe9f2ff62634d67adbceab6f880769775ce0dbaafb4c872d8e06de3fc36a428f4
MISC metadata.xml 247 BLAKE2B 481f340933d489b2df2b718152ba79fac9d5561acac95070086d5abcd5c5bcca3d9e33eb3b2e56a9fa87978cff3ea33127e0672b3e721f71058eff43ef04acfb SHA512 f7f4f34a879fe0fee0e2054e2c47ed3348c773c96767475a8587272825b7af88a610f35ac2fe22fcba6d973acea82e073dcf3bb3abe0b6b9acbb2dc9c543db24
diff --git a/app-admin/clog/clog-1.3.0.ebuild b/app-admin/clog/clog-1.3.0.ebuild
new file mode 100644
index 000000000000..75da7a4d0b56
--- /dev/null
+++ b/app-admin/clog/clog-1.3.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="clog is a colorized log tail utility"
+HOMEPAGE="https://taskwarrior.org/docs/clog"
+SRC_URI="https://tasktools.org/download/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~x64-macos ~amd64-fbsd"
+LICENSE="MIT"
+SLOT="0"
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 45d710ae7a33..e9c287bb2dcc 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -14,6 +14,6 @@ DIST collectd-5.7.1.tar.bz2 1797725 BLAKE2B 5a24d74ff26ed8745d3b50d3b22db0a939ae
DIST collectd-5.7.2.tar.bz2 1798777 BLAKE2B 4af359a773457bb9c05b6a301d7728eea7598c200f7ca534875b07d1d011b280ab138f680d9607723f14523dd71dcbec3a41e0d8d183848c8ef809cef86c2b8f SHA512 8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3
EBUILD collectd-5.6.2-r4.ebuild 19013 BLAKE2B 01d5c6d9c6258f7956d115e562e8166c3efbe59e4e99a19ed4ee58c4751c1e0c0f896bbd6a0e3a65f562ed404446ebbafef4d728ca0116e4a90896062090b423 SHA512 b5f7790378a0c78c1c7bb052f52d8736fe52b4f7046083a55df33b4139f78b67110a4ca63391f8d5748a8d3085ac24dc141fa47c17b88b3e7431e33b1250e7f1
EBUILD collectd-5.7.1.ebuild 19243 BLAKE2B 419ca67a4e4ad7526305101feeacd723a11b4ec0807f81e23aa9f0fcb44375798a4e400b5e4c1b5a361a4fdb6b418073069957675dbc0f0f47b1f0d5af366018 SHA512 608a21594c5d608be74f3ab55e206c0ead06e3ae8444bee34e6131a981959de9d01a41ca5ce3664986513873f872da02ce58546d593e52ff44da3275bd98bbba
-EBUILD collectd-5.7.2-r1.ebuild 19331 BLAKE2B a057460c4ad4de502693e5ed405ecfaa4a640f4c15e3c5cd07115768521d9f8637187b2981d6657f3bef3178f8f752ea8117b60fe39bad4102b5f37fe5069c34 SHA512 d138224a5aedeefd98c2b42108902077be8c135e2837b647526ff07f0e6e275c0ede02e493d2582f1bc00638baf74a8b28fd03d17ae5eb76e6890a3c833bf626
+EBUILD collectd-5.7.2-r1.ebuild 19329 BLAKE2B aa64ba6b60ef6343824c63436ab3907ad34331efc169ff8866ec736b2713d19ffc4e84519fa33003297663da73b6ad7114e0edfdb13d33e5cdbadbc93a662c45 SHA512 f836ca92c9f37e438478edbbe4d3c925ef0fe43f1c205ce3c4928e57f6a734f42736871ace94b581ccc88ff2c4d72d7db09cd0467ccda3f9a0cedbef1d9ec806
EBUILD collectd-5.7.2.ebuild 19197 BLAKE2B 2696638e0bc1b82d5522040ec654cf720acaa16b947d3248d6b9c5f7eeba61840103e6757271ef561ad3c4cb0d353b0d34b0ddf4be18c97b8dc7e2d8542a51e0 SHA512 810a8f73af91f7cd03caedc361eb421c912bc6ca1386c87527d9e20b8bfba7f25e0064fb5fec52ee00dff264f0756d64a7cc2aa78569ebecca427512f40c5075
MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
diff --git a/app-admin/collectd/collectd-5.7.2-r1.ebuild b/app-admin/collectd/collectd-5.7.2-r1.ebuild
index 57b4bf62aef5..43537509b26c 100644
--- a/app-admin/collectd/collectd-5.7.2-r1.ebuild
+++ b/app-admin/collectd/collectd-5.7.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
# The plugin lists have to follow here since they extend IUSE
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index aa0a23e217df..67f2c5af63dd 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -5,6 +5,6 @@ AUX conserver.initd 1055 BLAKE2B a515ff3c81c1e66b53f49d28db082d2a9eb3cd69a60f73b
AUX conserver.initd-r1 1088 BLAKE2B 2ab26bafddf29f24488b147c2a90dca6e482361af96fc008df0029581a0308f380db36b7985ac8fdfc1884e0eeb897d3e84fed9ed3341e2b9ba35c9393850200 SHA512 332e59313f066a8e313f65b0f04c4a7f464cb77f9ac2b3ab5beb24b5fee393d9036b9f80a1c9cc0f6ba43a5c3519801aea6d61f96bed861d5caa3130ab4ff1e3
AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
DIST conserver-8.1.18.tar.gz 323247 BLAKE2B 48176ba8be648df16ddb18c1a760af8069f7d926d2e0767e3b7ef903276d6104cfa9464a6ebdce009720fe5118862d89cf5371e104d17b967e11fe8e8968e8f9 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f
-EBUILD conserver-8.1.18-r1.ebuild 2295 BLAKE2B 12fa9d3f0521ed32178e4897d88467b6fa96189ae893ae3cfbfa7052f5840c31f36e1c9161a6b61b3598ddc96258cfc44c3b02dab7f0f8777efc9909e0b98207 SHA512 313f09acf336e2e9d7acf2447f0b9545741835a9e32b70db716b1136542b7cfb8ac6a03182e5d2d4f421b700e99e3b8dab393f857a5317f857f5dca3661230e0
+EBUILD conserver-8.1.18-r1.ebuild 2294 BLAKE2B 3df61824650b1243e0b57764ea5e9268616b69c8862775e72892349edcbb32a2ee8ca92d05d20d5f2034a761b6d29284c264b991fd81b5561f25272a291b3de7 SHA512 567fa7751509fdcdbbbcf7b8a71b2322a2396e77b15a85549a5b3e9caf771d7561b2fde485059a362b5f3510f3f1b5721b04879f84a957f1bb78f35700f4fb27
EBUILD conserver-8.1.18.ebuild 2230 BLAKE2B 2aa79efe824e6fbaa8fba254016187842699ca9aa119c693e25ba071d670065ef3ac8aa0f6363275b11703210d8d5baf6dd6ecef053de236f3ef48353f9d4e96 SHA512 a77a9c4550d25b134033f7d549528f58438f06012d2ecc8564dde521ed4dca880b7fd9ad75b43e0061988574a43c395e7760bb3b10e9709bdae54cfbf9311dc1
MISC metadata.xml 1247 BLAKE2B c404870bc8f1d87848d3243cfe7b23509a3975a22a45d43e55b94218a2e6dd8b529116e17c3c1b3183d86446ffbeecc9ee7cb7849635f0b9cb55e2fefce26c0a SHA512 a5d15b8c926b8f073c1c70bfe591d118880f58157e4e128d9f048f96898905bf0a49ea6710f8684d169d5e128a80bde242b9c1d787de59dba4449816d0e30e54
diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 33156624841e..2ea0b792127e 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.conserver.com/${P}.tar.gz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="kerberos libressl pam ssl tcpd debug"
DEPEND="ssl? (
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 6edc99ed6554..72f9b3dbff5d 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,11 +1,5 @@
-AUX glance.initd 542 BLAKE2B c7ffc55f6c949970c5459b9165794cfe39aa1bb73a50f824ae3e438866c85f11cb63661b73c4e360e69937edd461fc41f2cef2784d0d6ca3f0ff005f6268883b SHA512 3aa35dbc71239d63f52fde3b1ca334b89b2b65a38c8e469ad853f6d2d993a848ac45097a899f13fdb74638024f43cd4a7857f2b3837b74e7fb471c24e9943a52
-AUX glance.initd-2 375 BLAKE2B 1f38427bcb187239e73ce97404cda4efb8d1f8f8ebdca43c131de83ddb599d8ab73bf1d57a3c055ab123cc2b6053d7c2ca6799363c4bfd61f5bcb7f135f482eb SHA512 1ec49c74fc46157262278f03f2e118d79f1eb9d631b45730959b2060048851b27af2964c3a258ebb97c1b0bd35cf7185d48def744d368c371d2a74f15303a4f2
-AUX glance.initd-r2 412 BLAKE2B a92a8d88b23c89c7e0a7e2287016b253d1516c17f3876c503eae457cc4b0f3b11a31b82add38573cf75fe9e7e1c069b2ee1d96cb74b539609b67ad15c85b1359 SHA512 7e8e2d4ee08d845cdd222435abfe2328317a07426b5305933201b233b9a625539f5149ca23607ee28afca0779f73a429413f2e3e8772fb0cd43b2299f4a40916
-DIST glance-14.0.0.tar.gz 1788173 BLAKE2B 91834050aea925325a61f99c817e9d289270de30b88c53430b6b9c5845dbfc943678db734b9592657eb7ab8c49d5d6a7c110411c45c1fd82d8c829db67ef174b SHA512 4d0b6654dc6a9848e164422d138d4f6c1ec3711a7eb56a3c437202aa5c8cf86bf341201c9007b2f12173189f18beb73eadbaaade936ececf705a31e8b6eac155
+AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f3078cea66bc6086e80a530729b6484f110c02e23375fddde7f0ddfd22a6451ef84d9ec3caaa9d6cc SHA512 c6c433334bb337c708e31fac7869bf29e89516b857800d7cb77d264766483f54976dda6d83460078eed0dee14f0770a31adce344ec7fca04c2040b21dcf239b5
DIST glance-15.0.0.tar.gz 1803491 BLAKE2B 70e0f1f7eab6aa0066d16e30e9325ac45d9c0eb9df875e3b26e90463e10299d6c7c272c0b070137f27332bdfcb33abeda68e3375e2562c83942ca72fcb24de38 SHA512 beb5744f9e8b296356cb731c79f1efd7b60408c1282e8a64ab7d414929c447c4f2ff0562a0d59c0a05f828d420ba190946866543a37dbd2df73ae322cbcabab5
-EBUILD glance-14.0.0-r1.ebuild 4695 BLAKE2B 09f46526c5b55943f385f7cd0a8a26c83700a44087b1f2b81cde71c699c1fc6692eadee1147236a7d9a8d38d07110bf17d44a211b706693ce8c2442eb2186bcc SHA512 9b9b06a73d53ff7de05b271536307c0a7f1d4e5617a940c8307b9b31a60c52f26716cdb36874ec9fb01c1d383075b19995a6463ae6762aa9cc3f8fd705c7d017
-EBUILD glance-14.0.0.ebuild 4693 BLAKE2B c7d5f2c01629334da2273bc3d13b83c53c17dfe640ab940efb545468a898e7a3d381f1ec4069ab24f6532de6efae644a0d9b9914cef559b3066470fc57d450a1 SHA512 0669cb057f5a89ddf9f145f2974d6bbd85ec6e3e7f82ffe24dc2f313f808bf0ba930736a5422d56d126d9e250e8075f4a84b9593ef0f216eb29955e82165b267
-EBUILD glance-15.0.0.ebuild 5139 BLAKE2B e91e2823565c099be4eaf764d179b0ae871cfd8eb36a7a4327d05849373ee5aa1ff98e1b8b6188ce07937056277b16158de39dff9c53eba43d4aa4497315570c SHA512 eef444849d4d35efc532973d24bdf596a45fac50160631ac89be9e74991c3fb9dda235d091d4a6c93351ddc67abea4cc0870abe61cb09b7d58c3963581374891
-EBUILD glance-2017.1.9999.ebuild 4711 BLAKE2B 44a7ae3b727937d5ed75ac68de991d1437cd01333fb96b63094ce160bf367f534493928f95b0dffc82381a980909c765912afcd11d8c2c41ebfdc51accd7e1d2 SHA512 c0a57d6b678a1575ca17d1c8935db3f3759fa5edcb670079f6155e729fa69e4e9f9b035c93f010e3bae2690d53e71eb74b8511dedd7a9b54d4e55c3ffdac1d27
-EBUILD glance-2017.2.9999.ebuild 5153 BLAKE2B e563b85642631191a9cea85df6520bbe17611e90648b2dff122b586c5a0b099edffce921bd41a28f9bdbb5a5fb22c71b7eef984f52dfd22aad1edf8ae081f71b SHA512 0d9c66e1eb973c708778316df7315759ed1341c20ade1ad77a64bd834cc5ada837c8bdb5279f8a505d62e8d61779fe02fc21f5d695d0e1fe1ebddcbf37688928
+EBUILD glance-15.0.0.ebuild 5137 BLAKE2B fc41aadc655ec1cbf88820a51114944efaff287087105b79fa08e886f80f6abec36aeaad1f1a5d3162bde04e6e3590427adf5c7837ef3b7b915be1c9f9f397af SHA512 127baee4875ca362a2f791c7218aa8ed531efe63b54d36f7c57e2d3761d8ba09d5f599bff5503ae20df232978d575b7ed6abae255725df0c20f08565c0815a96
+EBUILD glance-2017.2.9999.ebuild 5151 BLAKE2B 6d251e35b8bc16b1ea08fc83e5269cd159b1cc4d5b7925f779e487365a0ced20c1c5b3d6fd730c69b9bac6b984c49b6b26979348c2e4e737fb10cd22f041f27f SHA512 e75ae4339b67632a84385cdb17d18f41101b189e79c4a2ad6d5113895881b400688c5693f86b10133934ac5b8860ff27f81249c153e10777bf45a9e5056f2c11
MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/files/glance.initd b/app-admin/glance/files/glance.initd
index 1ece1ad58f82..57274ac2dfee 100644
--- a/app-admin/glance/files/glance.initd
+++ b/app-admin/glance/files/glance.initd
@@ -1,21 +1,15 @@
#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
description="Starts ${SVCNAME} service for OpenStack"
-command=/usr/bin/${SVCNAME}
+command=/usr/bin/${RC_SVCNAME}
+command_user="${GLANCE_USER:-glance}"
command_background=yes
-pidfile=/var/run/glance/${SVCNAME}.pid
-required_files=/etc/glance/${SVCNAME}.conf
-
-start_stop_daemon_args="--quiet --user ${GLANCE_USER:-glance}"
+pidfile=/run/${RC_SVCNAME}.pid
+required_files=/etc/glance/${RC_SVCNAME}.conf
depend() {
need net
}
-
-start_pre() {
- checkpath --directory --owner ${GLANCE_USER:-glance}:${GLANCE_GROUP:-glance} --mode 0755 ${GLANCE_RUN:-/var/run/glance}
-}
-
diff --git a/app-admin/glance/files/glance.initd-2 b/app-admin/glance/files/glance.initd-2
deleted file mode 100644
index 4d4849f77e78..000000000000
--- a/app-admin/glance/files/glance.initd-2
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Starts ${SVCNAME} service for OpenStack"
-
-command=/usr/bin/${RC_SVCNAME}
-command_user="${GLANCE_USER:-glance}"
-command_background=yes
-pidfile=/run/${RC_SVCNAME}.pid
-required_files=/etc/glance/${RC_SVCNAME}.conf
-
-depend() {
- need net
-}
diff --git a/app-admin/glance/files/glance.initd-r2 b/app-admin/glance/files/glance.initd-r2
deleted file mode 100644
index 338de069750c..000000000000
--- a/app-admin/glance/files/glance.initd-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Starts ${RC_SVCNAME} service for OpenStack"
-
-command=/usr/bin/${RC_SVCNAME}
-command_user="${GLANCE_USER:-glance}"
-command_background=yes
-pidfile=/run/${RC_SVCNAME}.pid
-required_files=/etc/glance/${RC_SVCNAME}.conf
-
-start_stop_daemon_args="--quiet"
-
-depend() {
- need net
-}
diff --git a/app-admin/glance/glance-14.0.0-r1.ebuild b/app-admin/glance/glance-14.0.0-r1.ebuild
deleted file mode 100644
index 02f04305b642..000000000000
--- a/app-admin/glance/glance-14.0.0-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 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-1.8.0[${PYTHON_USEDEP}]"
-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.0[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.0[${PYTHON_USEDEP}]
- )
- postgres? (
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
- )
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
- >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
- !~dev-python/routes-2.0[${PYTHON_USEDEP}]
- !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
- !~dev-python/routes-2.3[${PYTHON_USEDEP}]
- >=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-migrate-0.9.6[${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/pycrypto-2.6[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
- >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
- !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
- >=dev-python/taskflow-2.7.0.0[${PYTHON_USEDEP}]
- >=dev-python/keystoneauth-2.18.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.15.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-policy-1.17.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.18.0[${PYTHON_USEDEP}]
- >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
- !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/cursive-0.1.1[${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
-
- for svc in api glare registry scrubber; do
- newinitd "${FILESDIR}/glance.initd" glance-${svc}
- done
-
- 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-14.0.0.ebuild b/app-admin/glance/glance-14.0.0.ebuild
deleted file mode 100644
index d968f2a9e32d..000000000000
--- a/app-admin/glance/glance-14.0.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 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-1.8.0[${PYTHON_USEDEP}]"
-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.0[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.0[${PYTHON_USEDEP}]
- )
- postgres? (
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
- )
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
- >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
- !~dev-python/routes-2.0[${PYTHON_USEDEP}]
- !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
- !~dev-python/routes-2.3[${PYTHON_USEDEP}]
- >=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-migrate-0.9.6[${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/pycrypto-2.6[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
- >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
- !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
- >=dev-python/taskflow-2.7.0.0[${PYTHON_USEDEP}]
- >=dev-python/keystoneauth-2.18.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.15.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-policy-1.17.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.18.0[${PYTHON_USEDEP}]
- >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
- !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/cursive-0.1.1[${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
-
- for svc in api glare registry scrubber; do
- newinitd "${FILESDIR}/glance.initd" glance-${svc}
- done
-
- 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.0.ebuild b/app-admin/glance/glance-15.0.0.ebuild
index b32fcd4c7e8b..56945afeb415 100644
--- a/app-admin/glance/glance-15.0.0.ebuild
+++ b/app-admin/glance/glance-15.0.0.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
@@ -125,7 +125,7 @@ python_compile_all() {
python_install_all() {
distutils-r1_python_install_all
- newinitd "${FILESDIR}/glance.initd-2" glance-api
+ 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
diff --git a/app-admin/glance/glance-2017.1.9999.ebuild b/app-admin/glance/glance-2017.1.9999.ebuild
deleted file mode 100644
index abe2dce67249..000000000000
--- a/app-admin/glance/glance-2017.1.9999.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 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 git-r3 user
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-EGIT_REPO_URI="https://github.com/openstack/glance.git"
-EGIT_BRANCH="stable/ocata"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc mysql postgres +sqlite +swift"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-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.0[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.0[${PYTHON_USEDEP}]
- )
- postgres? (
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
- )
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
- >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
- !~dev-python/routes-2.0[${PYTHON_USEDEP}]
- !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
- !~dev-python/routes-2.3[${PYTHON_USEDEP}]
- >=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-migrate-0.9.6[${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/pycrypto-2.6[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
- >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
- !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
- >=dev-python/taskflow-2.7.0.0[${PYTHON_USEDEP}]
- >=dev-python/keystoneauth-2.18.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.15.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-policy-1.17.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.18.0[${PYTHON_USEDEP}]
- >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
- !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/cursive-0.1.1[${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
-
- for svc in api glare registry scrubber; do
- newinitd "${FILESDIR}/glance.initd-r2" glance-${svc}
- done
-
- 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-2017.2.9999.ebuild b/app-admin/glance/glance-2017.2.9999.ebuild
index 71b923e6de69..34a29aa8cf51 100644
--- a/app-admin/glance/glance-2017.2.9999.ebuild
+++ b/app-admin/glance/glance-2017.2.9999.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
@@ -126,7 +126,7 @@ python_compile_all() {
python_install_all() {
distutils-r1_python_install_all
- newinitd "${FILESDIR}/glance.initd-2" glance-api
+ 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
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 497fba09cf43..ccab813f4741 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -2,8 +2,6 @@ AUX mcelog-0.8_pre1-timestamp-mcelog.patch 425 BLAKE2B 5952e26c668fb71f712fc70b3
AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de41215890cb4b6431ad694c2684f498d13287e385119304a816270f470ff26529967701c92bfc845a8aac698a0aa0f67271 SHA512 cda86c3e74f56fcd9d8771b26ca91c32ccc33e6bcd6dd0fcf856c14096daa619257d237e1e187e7820d6a0a0553ae6fd9ec160ea59e237b4e05ebca4e6656e20
AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
AUX mcelog.service 213 BLAKE2B 08da6eac0afe17a04948f5ff958aba5c64ff491f6842a0b84e914a82cce16782b2c9dfdc83123d609cabd4e9e60eb38a9e43fe7a22a2afca8f53c3dc8e65ac87 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75
-DIST mcelog-149.tar.gz 296943 BLAKE2B 9eba78eb5f96a36f29d12759f1d05a656ebd094e595c39fc3542a6e6b388a360d183042d884c789baee4a507a5a1d638344a80047d34b56877ea52f4e881c0da SHA512 d2cb7cb26d4407dd03a425568a19c96e5f53cc9447c58cd105d74a2f69b645ef6b444c9533186aac6b052f0721959a321a3f8061477d1451a62be36add097aeb
DIST mcelog-154.tar.gz 297148 BLAKE2B 80b2b6b13222d0194d63516607b3132e2146894189e2c3c793c953dc43705a5b386ecb76ae3c8b7b345f8d440f547b3e566b16bf0802d17188cce978e1ad2fc1 SHA512 8a160aaa8a0ed736cb81082321e199e6a6e4f7f6528915752af545db28918e89dcb6bf321a92472d776c61914d08c613900273b3d265a375684e3212547abe38
-EBUILD mcelog-149.ebuild 1216 BLAKE2B e1f5f1ba77ae2ff29433765729b8cc6db33dad1528e1dff2ae52c3038b13503c312aa6a90bfc1e134b6ec7cb10f9fedea8c55a44044819e3a8f99c9a07eafbae SHA512 a0414d1608bfde9177e2f10dcd135f6f1dd8c9f9498a187fce8e3868db02a65f09dd74520b6659aa1424725a15d7a4c58542d505c1ce1ad12ffd48afce1e8b86
EBUILD mcelog-154.ebuild 1370 BLAKE2B 3ba5600340047d02065bf402c29bdc96059865758b0d4cfc72c1251f85f7de20b37253bfc0d1f988d93f8dd9b7453e341f30e2e45c6f67401afea1463dbb8e8f SHA512 40cbe04aa5aba05eaedd1c1c9a3da4ea309be834864d405e532a20ba1190ec2aa44fc40cb968e43f37ddebb2698d380774b6601aaf4b0ad48559a929d4c526d7
MISC metadata.xml 837 BLAKE2B f807ddd64ddb222c1956ce95040ece7f5dffdcf157539d79c492505787a28bc161e52d2017fb8040374d335ec3e9b5df4701cb945a45e1da3819905dd03e815e SHA512 f6e69af6afc0de8c5436fbe468a3afbcb96e808c5e21d8a5fa65878bbff0c31ee883c4cda638acfeef1dabd77c85d0fbb3091b180b0cd16df14471e64db8df80
diff --git a/app-admin/mcelog/mcelog-149.ebuild b/app-admin/mcelog/mcelog-149.ebuild
deleted file mode 100644
index fffa27b121a3..000000000000
--- a/app-admin/mcelog/mcelog-149.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-CONFIG_CHECK="~X86_MCE"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
- "${FILESDIR}"/${PN}-129-debugflags.patch
- eapply_user
- tc-export CC
-}
-
-src_install() {
- default
-
- insinto /etc/cron.daily
- newins ${PN}.cron ${PN}
-
- insinto /etc/logrotate.d/
- newins ${PN}.logrotate ${PN}
-
- newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- dodoc *.pdf
-}
-
-pkg_postinst() {
- einfo "The default configuration set is now installed in /etc/${PN}"
- einfo "you might want to edit those files."
- einfo
- einfo "A sample cronjob is installed into /etc/cron.daily"
- einfo "without executable bit (system service is the preferred method now)"
-}
diff --git a/app-admin/paxtest/Manifest b/app-admin/paxtest/Manifest
index 5dce828b4202..480a810d1a9d 100644
--- a/app-admin/paxtest/Manifest
+++ b/app-admin/paxtest/Manifest
@@ -1,4 +1,4 @@
AUX paxtest-0.9.13-Makefile.patch 675 BLAKE2B 1ed7f94daaf1823aa50b83f5b1565fb5929e04b01cadc9d7f232a688040d45c6864093e45cd5592c0dc558b893ea23cab84c1297d2ba922c74e595847c7aaf44 SHA512 91447e797fcb320abade16bd8c0bd9ec53a112fe157165407790eddac15f02338e59244fb56715b5ada1d1ed526093bba600ec8b7c2a0f330315b7a821c7c276
DIST paxtest-0.9.15.tar.gz 37929 BLAKE2B 0b0290212fa27b8f27bea62c209423b6ea57e9c3e7d972fd069f0213b3963eb7a65921c669ac402b5d83f6556ba9ede90375b58f0f7ec6daf6cc3a293372edf5 SHA512 e152f5ada943f69b3745b51ac6d80f35a4c1aff777e93360287ef18b117d07861216d9d0d2075d2511d33e2cb4ea07168bb9ff2f00e79de6060e546b6806c487
-EBUILD paxtest-0.9.15-r1.ebuild 956 BLAKE2B 32c3c0c2871728811935ac82c3006d2462cadbb59667068ff11f973ad30bfd8f7b7aa32b99ae02517acf10edaa9480f468a5262e57ffba85ba0f8d33b001d5ad SHA512 5777b5c648ab9826c2cbbf7c0bf907a5fb663cf36f2516ab5ab5ccedf3805e0d2ffe121cf09cb33fcdf17bc4290df07540c5222a268ea8daccda28a3b061efaa
+EBUILD paxtest-0.9.15-r1.ebuild 958 BLAKE2B 53dd0dbcfcf101d81245e611a3cbed2327c4af34fe6abda213a87105ec67bddf8077da01db1cb22727b84c0e9fe80a100428bd531cac07e93d63ccd1d7ba9f15 SHA512 04480944defd3d5a2322ada44b7ecfabcd6bfcb6ea2b7266d0f3cb06e66f987f2fdbd670735d157fd8b16799060d3996f2c090852ab8ecc1fc057d88e96dcac0
MISC metadata.xml 1188 BLAKE2B e5a210f2b156f941c2dc100ebd835c803e6af7298c8548a07a0a2423a57ebf5336e00c827ca647641d0387fdecf961ebcaf13819134be8ac3e0c0aed4bf63c43 SHA512 5224b34a3ee3e84ec703588292cb379d24091ec4a1b5a3b1f433b8b41c1212c82f467f14573834898c869f0321cc70344b882d4f4a64b244e64529f6daaec5f8
diff --git a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
index f90f07439b8e..ed402aa9eaf8 100644
--- a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
+++ b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
@@ -6,8 +6,8 @@ EAPI="6"
inherit eutils multilib toolchain-funcs
DESCRIPTION="PaX regression test suite"
-HOMEPAGE="http://pax.grsecurity.net"
-SRC_URI="http://grsecurity.net/~spender/${P}.tar.gz"
+HOMEPAGE="https://pax.grsecurity.net"
+SRC_URI="https://grsecurity.net/~spender/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index e2904700b9f7..08eee8a9faf2 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,5 +1,6 @@
AUX 43e2c935252b995134ce353e5e6312cf77aea480.patch 13618 BLAKE2B 91727c30b968b41dc8f6bb2ca217d5b9ccc2b5d08872be5a65a45b7f8bc37130255df139a17b7ca09b39b5b1a0b9ddcd6c54d2448148495cf493e7a085d2f0f5 SHA512 65b303c957a29bb5782a2b849944fba029dea3a533c25d4c17830391b5e4963fef304c0be876f5e7892b1a0eb4da16390d4ab1e39f459c05ecbb7100c9c0a9ca
AUX 50puppet-mode-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
+AUX puppet-4-webrick-ruby.patch 2062 BLAKE2B 49cecd9d0ff077dd8d9e435bfaa1f51cfd45ad6baa2fcc8198d0c2cd53e2b0e04cbc49c8488ddbe23d3187f423c03a0e14b77f242d3fda6a019770be927a78da SHA512 045fec755dea2ef258d76962fee795b4e7b01f596cb6b622434226f978d4756e059bbdf8c140c88c32d145e99f3aa627ae15349430588d00a0ed90f2371bd934
AUX puppet-fix-tests-4.7.0.patch 1102 BLAKE2B e5c98627620f9f76f1421a13969dba3b1d279a63cdb65fc28713a9a2849c8e8cd0e42a30c9058e341d5bbabd3d24ae17c050fa551566e6c61301b83396a0b80a SHA512 81485af1a218b5616195ed80b3fc963c42d56265477be9a636c0e915a18771ff93e12cdbded45ce90da17ce72be4ea4881b5ad8e9d5a997be271df3cd2e8a2c8
AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
AUX puppet.init 917 BLAKE2B 0ebbcdd8c9d4154984130ba3f597969f5f070f65f246770583663df4f192052a0ed666d09d4d417864457814d6a680ac4f327dc2a83b774da3a3c0d4efea1c8d SHA512 6bd2e1c21abaa5149b853f1732a6bb84335a8b4ae4129db52da463597691fd983d347bc04aad69724034d37f953f50c6aa5316d517b9efed2414db8e3d94d7bf
@@ -13,8 +14,10 @@ DIST puppet-4.10.9.tar.gz 2981668 BLAKE2B 315c39953c2ba70b547fd7a393c7be0bd3c387
DIST puppet-5.1.0.tar.gz 2734018 BLAKE2B d4169fee328710b7685de2606196de68e21ca31f9a9945bdd84255f5185fd2d95c6543a7b88b5130f1f01e60e04294664de71a8ccd1319c2e0bebf4d031e6225 SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15
DIST puppet-5.3.3.tar.gz 2843386 BLAKE2B dc96282ff2d6bb6719362cd9b2e856537019bd888af8ba897e37fc97584cd76c1d4179b3b629d2bb20d1dade0f84ec88ab41dd0d66cccd2c850a87f96ccf4b65 SHA512 b5bb9ac4059855c7cac624ea0fdc2c3366cea82bf07bee195a179a0a709fa53e7fffe883e581c1e07a64705a638b156288301227f7334226ddc401a9bf770afe
EBUILD puppet-4.10.8.ebuild 5564 BLAKE2B 51164a6bd2fb31c08d9a1f0f08fa67861f11c1b6de316322f9596defbc3df05b980d897bad8b13f0c7fc3d3344eae0fdf81574555f6736969f797d6d91306424 SHA512 c9a64796ff31f9416606ee37e019d400294a1bbcbbfe1603577e47bf64ee95d0afd307711c06cde3a6bbc01fecae7c2b755ab16700ff697aa01f6cff5e510c74
+EBUILD puppet-4.10.9-r1.ebuild 5737 BLAKE2B a88a8d8fbdfa65751d4cad48af0234e7c1891eb35855cbb2ee9b4a62d75538af9d6c1445ec056505046d753a40eb93cc5bc65e9e2fb719c1f377ca1188941d81 SHA512 7592ae092281c6212bd958dce00d622252271db2f8d38fa447f3f53f756f0cad0f43c518aa0c652b6452b0856165b0db64fff48d3f797b65cbe9058a441b75b0
EBUILD puppet-4.10.9.ebuild 5635 BLAKE2B 42c4009603b09985df1574ca66ea4821a337e2859b31c3d923e4784003c486fb648e27cfbc42e638477913659720883cb5ed09fc51f5e895f03eff867738a9a9 SHA512 6f2d6b3ae4a7bcd053eca8dc599cba96b8043797c0ebf7689f660207d777514a01caa98985d426cbb05811dc7ad2d45f9927e098927a5cb34292ecdae376cb02
EBUILD puppet-5.1.0-r1.ebuild 3823 BLAKE2B 19a08621366ab57b447b76c1209b288736b40861eb6703d84166581bdb19c22c212b9d4247d33bcd39134748b186b13a8bfafede5a57d73c64b49045cd7cf43d SHA512 8ec7cdf210c22563867716154a316b07b96ec36bd3a7bd8bd0aa15f6a5b0dd8f61fb5855a94465049709d9e1e3db1b4e33dbdbe3ce4fc0650d9b51fcebbd631c
EBUILD puppet-5.1.0.ebuild 3865 BLAKE2B 10999d7fe76eb19c04fc54cdb995843091a8157fbbb90acac504baacc5cf9c411d351462497cfdac9594b40326b9d914f219be8ab3f1e31734211fd79262750e SHA512 6a62c22b405fe4b5ef9df3d8878a8ef401e97e4f62d00a681d95c16502805b8e505be0beb9362c7dff361f722de6bcf322fbcde5d45bef5fe4b0f23212bb99ec
+EBUILD puppet-5.3.3-r1.ebuild 3928 BLAKE2B 86cb095bbca6b665ac749539b97865fffa6192fc9a6ce6b9599e29d51221043075db5120bbf80c4e297030f3dac4011dff9fca116d0736d740c81fe3c8bab92f SHA512 ed742128919ea071b7cabb2cf1cdaa45710a09aa9e4e49306e1cd9c601b0a6955700afbdb8013d500a04ae10cf3cbc2d83e88f225157fb1d617701e2112facf4
EBUILD puppet-5.3.3.ebuild 3823 BLAKE2B 19a08621366ab57b447b76c1209b288736b40861eb6703d84166581bdb19c22c212b9d4247d33bcd39134748b186b13a8bfafede5a57d73c64b49045cd7cf43d SHA512 8ec7cdf210c22563867716154a316b07b96ec36bd3a7bd8bd0aa15f6a5b0dd8f61fb5855a94465049709d9e1e3db1b4e33dbdbe3ce4fc0650d9b51fcebbd631c
MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/files/puppet-4-webrick-ruby.patch b/app-admin/puppet/files/puppet-4-webrick-ruby.patch
new file mode 100644
index 000000000000..ce4b055644f6
--- /dev/null
+++ b/app-admin/puppet/files/puppet-4-webrick-ruby.patch
@@ -0,0 +1,53 @@
+From a358d5ec01c6f87b39e5bfbab7a35582624fdbf7 Mon Sep 17 00:00:00 2001
+From: Josh Cooper <josh@puppet.com>
+Date: Fri, 12 Jan 2018 15:30:38 -0800
+Subject: [PATCH] (PUP-8297) Don't accept already connected socket
+
+Webrick's start method yields an already connected socket, so it is not
+necessary to call accept on the socket. In ruby versions prior to 2.3.6 and
+2.4.3, the accept call was a noop.
+
+In 2.3.6 and 2.4.3, it is an error, because ruby those versions use a
+non-blocking accept to handle clients that make an TCP connection, but
+are slow to negotiate the TLS handshake[1,2]. On these versions, puppet
+master would report:
+
+ SSL_accept returned=1 errno=0 state=unknown state: unexpected record
+
+Remove the call to Socket#accept.
+
+[1] https://bugs.ruby-lang.org/issues/14005
+[2] https://github.com/ruby/ruby/commit/2e728d51e70ed3756ad760c687a08b8487b0112f
+---
+ lib/puppet/network/http/webrick.rb | 1 -
+ spec/unit/network/http/webrick_spec.rb | 5 +++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/lib/puppet/network/http/webrick.rb b/lib/puppet/network/http/webrick.rb
+index 9ebf1763be5..3ac2ff40650 100644
+--- a/lib/puppet/network/http/webrick.rb
++++ b/lib/puppet/network/http/webrick.rb
+@@ -29,7 +29,6 @@ def listen(address, port)
+ if ! IO.select([sock],nil,nil,timeout)
+ raise "Client did not send data within %.1f seconds of connecting" % timeout
+ end
+- sock.accept
+ @server.run(sock)
+ end
+ end
+diff --git a/spec/unit/network/http/webrick_spec.rb b/spec/unit/network/http/webrick_spec.rb
+index a90fc3f3378..843b0d54c8a 100644
+--- a/spec/unit/network/http/webrick_spec.rb
++++ b/spec/unit/network/http/webrick_spec.rb
+@@ -92,6 +92,11 @@
+ expect(server).to be_listening
+ end
+
++ it "is passed an already connected socket" do
++ socket.expects(:accept).never
++ server.listen(address, port)
++ end
++
+ describe "when the REST protocol is requested" do
+ it "should register the REST handler at /" do
+ # We don't care about the options here.
diff --git a/app-admin/puppet/puppet-4.10.9-r1.ebuild b/app-admin/puppet/puppet-4.10.9-r1.ebuild
new file mode 100644
index 000000000000..c404e787afc1
--- /dev/null
+++ b/app-admin/puppet/puppet-4.10.9-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ >=dev-ruby/gettext-setup-0.10:0
+ >=dev-ruby/hiera-2.0
+ >=dev-ruby/locale-2.1
+ >=dev-ruby/rgen-0.6.5
+ dev-ruby/json:=
+ >=dev-ruby/facter-3.0.0
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl"
+
+# ruby_add_bdepend "
+# test? (
+# dev-ruby/mocha:0.14
+# =dev-ruby/rack-1*
+# dev-ruby/rspec-its
+# dev-ruby/rspec-collection_matchers
+# >=dev-ruby/vcr-2.9:2
+# >=dev-ruby/webmock-1.24:0
+# )"
+
+DEPEND+=" ${DEPEND}
+ xemacs? ( app-editors/xemacs )"
+RDEPEND+=" ${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # can't be run within portage.
+ epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+ # fix systemd path
+ epatch "${FILESDIR}/puppet-systemd.patch"
+
+ if use experimental; then
+ epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
+ fi
+
+ # fix compatibility with ruby 2.3.6/2.4.3 webrick
+ epatch "${FILESDIR}/puppet-4-webrick-ruby.patch"
+
+ # Use working version of mocha
+ sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb || die
+
+ # Avoid failing specs that need further investigation.
+ sed -i -e '/should resolve external facts/,/^ end/ s:^:#:' \
+ spec/integration/indirector/facts/facter_spec.rb || die
+ sed -i -e "/describe 'cfacter'/,/^ end/ s:^:#:" spec/unit/defaults_spec.rb || die
+ rm -f spec/unit/indirector/ldap_spec.rb \
+ spec/unit/parser/functions/create_resources_spec.rb || die
+
+ # Avoid specs that rely on tools from other OSs
+ rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
+ spec/unit/provider/user/directoryservice_spec.rb || die
+
+ # Avoid specs that depend on hiera-eyaml to avoid circular
+ # dependencies
+ rm -f spec/unit/functions/lookup_spec.rb || die
+
+ # Avoid specs that fail due to an unpackaged file
+ sed -i -e '/when loading pp resource types using auto loading/,/^ end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
+}
+
+all_ruby_compile() {
+ if use xemacs ; then
+ # Create a separate version for xemacs to be able to install
+ # emacs and xemacs in parallel.
+ mkdir ext/xemacs
+ cp ext/emacs/* ext/xemacs/
+ xemacs-elisp-compile ext/xemacs/puppet-mode.el
+ fi
+}
+
+each_ruby_install() {
+ each_fakegem_install
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ # systemd stuffs
+ insinto /usr/lib/systemd/system
+ doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ insinto /usr/lib/tmpfiles.d
+ newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init-4.x puppet
+ newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+ newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+ keepdir /etc/puppetlabs/puppet/ssl
+
+ keepdir /var/lib/puppet/facts
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/lib/puppet
+
+ fperms 0750 /var/lib/puppet
+
+ fperms 0750 /etc/puppetlabs
+ fperms 0750 /etc/puppetlabs/puppet
+ fperms 0750 /etc/puppetlabs/puppet/ssl
+ fowners -R :puppet /etc/puppetlabs
+ fowners -R :puppet /var/lib/puppet
+
+ if use xemacs ; then
+ xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+ xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ if use ldap ; then
+ insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+ fi
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"; dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Portage Puppet module with Gentoo-specific resources:"
+ elog "http://forge.puppetlabs.com/gentoo/portage"
+ elog
+
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if [ "$(get_major_version $v)" = "3" ]; then
+ elog
+ elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+ elog "/etc/puppetlabs/puppet"
+ elog "Also, puppet now uses config directories for modules and manifests."
+ elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+ elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+ elog "for more information."
+ elog
+ fi
+ done
+
+ use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+ use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/puppet/puppet-5.3.3-r1.ebuild b/app-admin/puppet/puppet-5.3.3-r1.ebuild
new file mode 100644
index 000000000000..1f8461b191db
--- /dev/null
+++ b/app-admin/puppet/puppet-5.3.3-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ dev-ruby/hiera
+ dev-ruby/json:=
+ >=dev-ruby/facter-3.0.0
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl
+ dev-ruby/hocon"
+
+ruby_add_bdepend "
+ doc? ( dev-ruby/yard )
+ test? (
+ dev-ruby/mocha
+ dev-ruby/rack
+ dev-ruby/rspec-its
+ )"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+# dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # can't be run within portage.
+ epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+ # fix systemd path
+ epatch "${FILESDIR}/puppet-systemd.patch"
+
+ # backport upstream fix for ruby 2.3.6 compatibility
+ epatch "${FILESDIR}/puppet-4-webrick-ruby.patch"
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb || die
+
+ # Avoid failing spec that need further investigation.
+ rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ # systemd stuffs
+ insinto /usr/lib/systemd/system
+ doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ insinto /usr/lib/tmpfiles.d
+ newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init-4.x puppet
+ newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+ newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+ keepdir /etc/puppetlabs/puppet/ssl
+
+ keepdir /var/lib/puppet/facts
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/lib/puppet
+
+ fperms 0750 /var/lib/puppet
+
+ fperms 0750 /etc/puppetlabs
+ fperms 0750 /etc/puppetlabs/puppet
+ fperms 0750 /etc/puppetlabs/puppet/ssl
+ fowners -R :puppet /etc/puppetlabs
+ fowners -R :puppet /var/lib/puppet
+
+ if use ldap ; then
+ insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+ fi
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"; dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Portage Puppet module with Gentoo-specific resources:"
+ elog "http://forge.puppetlabs.com/gentoo/portage"
+ elog
+
+ for v in ${REPLACING_VERSIONS}; do
+ if [ "$(get_major_version $v)" = "4" ]; then
+ elog
+ elog "Please see the following url for the release notes for puppet-5"
+ elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+ elog
+ fi
+ done
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 92c00fde9da5..7b73ab97dba8 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -41,5 +41,5 @@ EBUILD rsyslog-8.28.0.ebuild 12504 BLAKE2B 7fbd8ed2298fce7926f40963571d4b38c03a3
EBUILD rsyslog-8.29.0.ebuild 12527 BLAKE2B c992fcb0783af6c15d89f8455ff47dc11248f5245b1a682f62b468150d814c672715d853acf31d3f551cb8c97dec1a02f9a676737033fe3e128d39a4b7412d71 SHA512 8f7593cca44eaa50929e03978dd9f066cc73aa9f725ce36585d274da925e0cc9a6a8791ab199c38b496e857335b8359c8cf19cc9ea3fae2ced4267ae69b05ef8
EBUILD rsyslog-8.30.0.ebuild 12518 BLAKE2B d50e7a8dbeb492e8339d2b6f6fc237554059db89b0b9593bfc34111d1ffbef1cc518282f0b1b3c90dd04828fba7639dffab49c50e2ba779b4e4009886d5a2ce1 SHA512 aade46a36a893585f63d11a6030f6ad1ec0529e6cd79650ed96278a1a12f943d1710a1c853bcf54d528cff34dc8a706ab6d69823cab861f8a5c3f2f58b8f588f
EBUILD rsyslog-8.31.0.ebuild 12565 BLAKE2B 29ca871aa60781bacec26e4809b8b3710958120011a5b3c7f31867c992faaab2f6b66707e013e855563e875104bb7e9fb93dac60836903c1a2f031600f2083fc SHA512 cb044ac578f29e7332191af95113882b2973870e37994b216eeb54b816e05cb42dae6e492c53b18d54dcac7425f6228aa1ac805f267dd6bf4fa344019c2b121f
-EBUILD rsyslog-8.32.0-r1.ebuild 12705 BLAKE2B eb7ef755e3bfda708d4f6668ad187b92fab410dc9d12781f64ab4cccd3af0c3a9caeb8081f3debd9a27f7c7db7f4df7d3f2c87b311123d438e369bb82933aba5 SHA512 60d7b0c6801502f6bd4e6def6f737226626c1eac04c12d7d7961bfa31da4b88786a62e5e1cd2088966c3033ca6c980cba62e66c1428b47b80926e9182e1223c1
+EBUILD rsyslog-8.32.0-r1.ebuild 12704 BLAKE2B 68d02b434fd9fa01a7f664361a7d522d09a1ebfc2bf5341780c526ac5c22ae3d007051b350ef5713d23cdddea8a957b7354169a6f28467034b4733b95680543f SHA512 5c6ee260ec353e35846677e8f881f2824b605cd9460af06025a410c01a73d01e85a49e5e49410f3d15d7df2e81caeb625c144399a054d0a1a61593696db8448c
MISC metadata.xml 3397 BLAKE2B 368cc15a6a51952b0aeed7314e0d8cf4be6a82f0bb5275f87f09b8707353543d26d839be016e7ae9523e8594e2ddf85f2f26e36ce2332b95131729f4da959a90 SHA512 8d5f78dafe981b3874fe60a54d3f041ab163e3e94a5f3ceb943bfe075e55dbdc260aa2dd035c7d241708f21b8f8f1f9d268ffd65538b0fc5b36c43a59f5a0f27
diff --git a/app-admin/rsyslog/rsyslog-8.32.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.32.0-r1.ebuild
index 3dc7a42ded17..38c0e9447e8e 100644
--- a/app-admin/rsyslog/rsyslog-8.32.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.32.0-r1.ebuild
@@ -40,7 +40,7 @@ else
unset _tmp_last_index
unset _tmp_suffix
else
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
fi
SRC_URI="
diff --git a/app-admin/su-exec/Manifest b/app-admin/su-exec/Manifest
index f52e708876e5..7e5ba2aa118b 100644
--- a/app-admin/su-exec/Manifest
+++ b/app-admin/su-exec/Manifest
@@ -1,3 +1,3 @@
DIST su-exec-0.2.tar.gz 2426 BLAKE2B 79eda06463a238371e35dcc7acf2df9e8a7696a531a5dc9d0e9650219a5c72d71cf0e368f2178f83e949cf0f05fbc01e7023085fa2cffebcd8b78e82ab9756e2 SHA512 68155a06c716b362aee1214f22cd325b3e934c05b653d3b084a720458fb04207c0681d218b72adfd5ae8fab0262f7ab90e49eb2e218d1b0d7d7af7911715d4e1
-EBUILD su-exec-0.2.ebuild 522 BLAKE2B d7e5de3abe8ea11cb7ed2cb5a5f2271862c4bb1e649a626d59f07b309f715d2c3e047863e20b0ff0f1f10d182a80596f1dcea219a97433de384a62e95d4bf710 SHA512 3d11459e325685a3dd5e4247f0abc4561b467bad45d087f417153bbceecd867404652a5d4564ba762de7e0fa058f425e311d21748768ad952f325e0cc55da03b
+EBUILD su-exec-0.2.ebuild 595 BLAKE2B 44e9e1e201b74506b2d1bdd0d25f8e957ba5b7dd4db859de6708bd33d2c122d046a51122f7096936621c7e60dd0e5d44e565295cba4de4b055b3d2e7f8244f9d SHA512 2a008451f0277ac2bf5e97cca68078e4f333f0b488ca8750b22e75dc6424d45ce34c214e5b6513835b8faba6c40caab1506ec8e208ea231f2144ea2fb0d6a4cf
MISC metadata.xml 323 BLAKE2B 56dfb262d3d2714721cbd8436aaaa6628ca11013bc801a7d9a18fa5a87d4e20e41d98584f344a98b8f697ad6427f6641bba7090b562594b08995e8b31d4d2292 SHA512 3eadc250f3acadea3d3b3f29ef78380ed153b12b34b5e752dd088470949dec3590889b8daa6db37472ed043a10f14f5bf2e8c280fae7efd3ee398fa5d88b0caf
diff --git a/app-admin/su-exec/su-exec-0.2.ebuild b/app-admin/su-exec/su-exec-0.2.ebuild
index 4a1e1f1eab69..f51e2f258af4 100644
--- a/app-admin/su-exec/su-exec-0.2.ebuild
+++ b/app-admin/su-exec/su-exec-0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ncopa/su-exec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
-IUSE=""
+IUSE="static"
src_prepare() {
default
@@ -20,10 +20,10 @@ src_prepare() {
}
src_compile() {
- CC=$(tc-getCC) emake
+ CC=$(tc-getCC) emake $(usex static "${PN}-static" "")
}
src_install() {
- dobin ${PN}
+ newbin ${PN}$(usex static "-static" "") ${PN}
dodoc README.md
}