gentoo resync : 10.11.2017

5 files changed, 0 insertions, 158 deletions

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index f9f3bac576b1..ff2f3b3092d6 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -6,7 +6,6 @@ AUX ceph-10.2.3-CVE-2016-8626.patch 1102 SHA256 97e97c840e72d8bcfafbec610fd6b605
 AUX ceph-10.2.3-build-without-openldap.patch 1209 SHA256 45027bcd80ce3cc7ec573f2ddedd956cd6b99a911ef7bbd96dbab3625b61ee10 SHA512 2b0476eeb78246f252bd294eabc66c6fe5724d753d0cc2dde56720aada2517e42df3387eb368a53fa553617d436d18393a4e856d6fe7395022b249d522d1ec88 WHIRLPOOL 3ef938b99ba70f8eb3e382ca4e2d184dca2c85faba5b6838b123efdd84a92dcfe35059bed1aeb6cbc70a49e987bb978d68f55c49cf79551ef755801d101fb8d0
 AUX ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch 794 SHA256 de155f38a6a0811a2c34a85d3b32a6ade3d31a471b8d6403ce28d997f8b63f89 SHA512 1261d3f088ffc4514069e73e49f627c6f87e89683cedc0048dba6d0e18f53f9a784f6c558478ebe72dff70669e5a453809a720cde77f5b89675d92840e6609b7 WHIRLPOOL 665aa5983ae52a9c92ef4eb0468a47cae67f39e8f489115b8aab92e4b030dc25e26ad327f6112b44c5e0f57634a335a3dcc4e12f0a6fe3eaa4ca27b0bf2838b6
 AUX ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch 2155 SHA256 7c3472383a49683fdb45483d54d9d8758c6415f635a2703aad837d84bef34507 SHA512 c64b4def2ee9cdc9109ff6c32391384980d5ac4e33d425454fe1ff59910ba622ecb458a6722a5ed0f988e021b83ace5d89cb3974a1cf65862e8766595d8cfb0e WHIRLPOOL 60d6ac98552962c752054dc9d2fc0511966419baa452833710f3aef3985b775b19087e7dccfd670191171b18a3bec10a2ec33adb3a1bf9d01b6302693b5877bd
-AUX ceph-10.2.6-radosgw-swift-clean-up-flush-newline-behavior.patch 2997 SHA256 e734fc435c58374d897e246a047f1e0b241393dfc3b6f70b6587ee5b83c0c674 SHA512 6450981ca274216ae6d394804911a2d7fc57902914a6ad6e9ff1d9db69e71a46f59b5e05d3b2d743d026952405b86ceb5d88134aafc5f95d69ae490c805898dd WHIRLPOOL 5fe2df64fd6eb1871dbc8deb67af55ca2a98236ac6ae3bb21add422d945ec29e8d86eb91f80cc39eb3cd32b0e5076eb4529326e6d03afee65dd3c75135b95b3d
 AUX ceph-10.2.7-fix-compilation-with-zstd.patch 1782 SHA256 291664ca8c1fc51d560b58077eacdae10598aedfd38d73e73d2922053aa2df44 SHA512 5929217f64deb45fd803e33cd277443cbb5f5f956fc4be05490a07dae0b02467317426993c7fc44173a18955261e3a73e603775db12e788a93c851f992539ad6 WHIRLPOOL 06b4e7c8b44d11ed11f8645668bb35e9f25855c5f6e3d5777cdfcd3235584b897f73d40b6fbf50b8f6ed7784dfad6f0c622f2b150dd09215f63547100dad62a9
 AUX ceph-10.2.9-cflags.patch 449 SHA256 d848d0180728d2a79d58833795864eed7a0b8473763256166be21d11fce35881 SHA512 17a165710b0effacc34257daf077f70f55e27f0bddd4dd58bbc8638653ebd13eeabffbb4ead40ddc3a69586c65e01f911ee5f8e1bde94576d66928f0928fa510 WHIRLPOOL 323a1170d3ead0f2b7dcfe92170424b1fdbd29ab2edf2d77b43bf34515ae99ba17a4863b7287eed324f85a26f81e4d0cfae6e22c87c9370dfef41a59b6c0d312
 AUX ceph-10.2.9-dont-run-lsb_release.patch 2862 SHA256 6c3f0b1115f2731f33a02bb11d95d215520e743dcd2556e99c4258fc3cbfbc88 SHA512 e97a0c2a40c886029bbff12f8591147b88d5eae86dc79a63b267f10745a465da62786cf41c9fd0f01f51805907633c1fe954ebe09b0730660cf690f2c53a8252 WHIRLPOOL 601f58a0f764e1b7d97cfb70bb089eb79da1e8259951796571e1a39968333d67892c4232f17eaf2069d7991b26ed8a26208a8303e03a8c268fe741ba6a79be50
@@ -22,18 +21,15 @@ AUX ceph-12.2.0-use-provided-cpu-flag-values.patch 1590 SHA256 37a33221333559d86
 AUX ceph-12.2.1-systemd-unitdir.patch 345 SHA256 9ecea9307cc8831d14175127b10ed78d81dbfbfff0debbaf6d25b72daa147844 SHA512 a29373704f645f5b52597f5482fb4538f3d335bb1020c206a089ba58707f988cf42d335f17a36911f373936f8e769613c3d3fa98f55c1fd91d433d036b769bcc WHIRLPOOL b17902983baf2dde5a7e1ece73476be566d722e74a1651a2f130af1a5a195259a0b0556e5135df3640e3ccd888af8f2feda9a381f0b9bdeeea5b60bf291673f7
 AUX ceph-mds_at.service 282 SHA256 f4788a5ed5c9b2fff1eed094b76888b7cc7fc75efcf35cd4f8dda7d9e3c29eb2 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d WHIRLPOOL f274492e8a7239d99cc4fe2efc76e0abc6c55bf111598403ffc515866e731a13ff04329ca0b1711d9446664c8e7355634945f39b1062d63434a11df3445aa166
 AUX ceph-mds_at.service.conf 115 SHA256 d3303079beb2a5aa715016ab489279e142557877382fa8b066abea631189b835 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8 WHIRLPOOL dde434fc21857a36179f2681261a3b821cfa1be9cce66c83fed2faeaa0df6dc2c6b2613b795d12cbce4f31eab15767dd058d0c354b333a1b87cbbb01b93f4132
-AUX ceph-mon_at.service 508 SHA256 0804d32699777c981ebecc616999bec3c019cbf1379f8e308f1a8a1a6c306a7d SHA512 4e5846b10f2d7e1d2156eb35c96afb3cbb00f38ddd7dc4672a7f249f25142018d507cbccb747d2f552954834ee23c357d6d82b305b9fd30e78d92e5aaa3fc98e WHIRLPOOL d85a1fb22b7768217a40694b18861af29377839a1d843bc7f94e77d3b68233b304490ec4dfd238cf181ec579a01bc66284668905e6375feb6894c3a0d4edea66
 AUX ceph-osd_at.service 362 SHA256 c628755279d58a860d8a35c693d21d7b532c13880a181e46bdce30fd81de9052 SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300 WHIRLPOOL 3a44c5a6c25e9e4543a9540420940ae683d014fd4d71d9fd3beefd669dd07a287a1363de6fe03e71906def9c555a27e9d02558dfb40954954d87d6ce7e65b372
 AUX ceph-osd_at.service.conf 115 SHA256 e3515ad3e002969ff3b06069ef8ccdad2fae5cd4aa35d9e982b59d386ae0e40e SHA512 8f169a73f21968f550c6fb21ca7b1efde522b7cccaae0e0c4e22c67ee9c7ccfec7845de3cf84af1075ac9f8840b044dc9440e7936fb9079899df06df350ff9f2 WHIRLPOOL b783cf96382d901b4203d12cd4be6278cdd2f9b53808fbf9194bde58a252d855343f802586925731abc97e2d8c605ef7b5d19fcf3a5e2e6fbf2695c0404c17aa
 AUX ceph.confd-r1 69 SHA256 68d0b46b925fbc0e1571230c8bcc55f46beab4e575a3d964a3753534d751fe31 SHA512 b7f7ebb48b94398eaabb6df2cf3a5697d9a055ea4dd9b73c40d2bbf0e1445f418ed760b1f4ebb13cbb7315b2583847eb97b8649f67b6b7cf98081c0599c86aaa WHIRLPOOL 0e1989d813e7e8234112f656a4e017fae521aa5f09d344ddd1f685a6afbe3afdd51adcaf979a8395ab85ae30e6526a03d8c838d10e46f674eec7651d2df43abe
 AUX ceph.confd-r2 171 SHA256 8c6d7e408165eaf95b2736b27d670a0c2c43b60c6458e4e33969140c3f3fb171 SHA512 f7170644341e6c8dcb71ca3a4325c8da3325ebe83898cbf11b47b41ea4f899781b9bc87fd21e006292de78fe9e905ac4703d10afcf91a4687002663469201ba9 WHIRLPOOL f64c2db5852675b88da0c8db64b0702f1282d27763453f6a8c7aa0c92fcf5295d6e02acde76bc4a1c374c7ceeb5754d81978fd6467000b8a3dc6ebf1a7b3aaaf
 AUX ceph.confd-r3 1315 SHA256 5790d77b9ed6ffb6173f9f8de24e2db58b3d9fb1a56d5454c698d4842e08bcf3 SHA512 1d192cc8eec9b294440ee6c43966ccc36669b94007dd6b990c5ee8d18ee1b36730a9a0082ef7170846dcc64adcc61481808e854b6c9bdb2eb1db1c71435d3f05 WHIRLPOOL f91b980a925f70c4b475264fe7af3fe82ed3a9a8e9b393f5ce3f6f36a59166e45f820d25ed12ce3b31f4d0ddfa54e0b8be00fed2975e433a6df11965213ad6d3
-AUX ceph.initd-r1.1 908 SHA256 7ec4e82f8ed2b25accb929a6700e70078a64a7ecf5abc92f9a2c918b3dbbbcfc SHA512 a6860372f935d64a978f0b2584074791ed945af8172f57910b42a2d92f373711c655a566e6935ca4bba28d3d87aafecb3242d307631378481fd9d05207dd4809 WHIRLPOOL c110163ed12b9220d970b198c789435eff137b55f595aa31f3c2b765338d91e2d88343e6542509714f4ea694f3f6764213402e1f90238e719de09615361b8735
 AUX ceph.initd-r2 958 SHA256 49e69cb418f76a45dc933edca944d78630a8460153bf0a4c511b6d10223615f4 SHA512 6f42b8540797d3f55d64b9842e190ca2973c1779c720b7c9923b8bcc06dddf95672bee066275599e4feafeff38652235746433305dd4d7df8ad086a8deb960c0 WHIRLPOOL 3670c40a1ecd935667f1c8e5d3ebd25d0a41dcc18c3ac6a6e155e95a28682295858f2c06794beba7c7173c40ad403986541ebe8827370ee4aa9c922b40ae636c
 AUX ceph.initd-r4 1189 SHA256 03a6fe825f5bdfe2a9e91b8dc2f1b1d16bb2f487f617bf35f58cfd8b514de5b8 SHA512 dbb69228ee566490bec93823040885e419bfbd7dc076c802cc97b47dde9fbb06a99f61498cc438c90fd0474b2ad7247d756b977fb415b0f1168442036a48bd97 WHIRLPOOL 11dfa061dfad1018f0f4feff279cc2d449bdb57c85bebc5160271a65752c1e9198be5cfcd55ad457b8649aa997a0cb61e41650c6c29cd2be0863d35a5febe9f1
 AUX ceph.initd-r5 2178 SHA256 234f27c1f880954b660f3366f4c12748d346aa7f84b5bea8c8044c7c8f4b64b4 SHA512 4037639b6de65e0966f1aa850778b87f4f8f926af621f68155e98f103e233b7ebb2fba18a65ca150b16767bb80581259f4720c925ed00777d640f19471147c90 WHIRLPOOL e66279a443835e00a9c48f691b13b2fecab49d5fdc641d8119e0bbc2265a1485501c894f49f13445943e0f0a3a0b705ca25caaccfe7536c37bee92188231d036
 AUX ceph.logrotate 427 SHA256 f893364080dfaf5fb3b250e4811be7f1880ea937c7a6b70f913ad560fb14381d SHA512 6edace611f46683ca3b8d2154b86ec77cc241909704e0362b728a5f51c2a809c22e83d69df0d58ec6b3a6b8dc8ef2518c220cac920f51e63fe668cdfe1b48bae WHIRLPOOL f9e3643177805202a0c07b04cc38e7a3e8bdce76f59bbdd4aca050527ceab04ddcfb293e13632c2fd25eeff725f3bc532e90e223b4f003ecfc5bab377e8669cb
-AUX ceph.target 128 SHA256 2dc38c2aff560067604d4ee0a3b569ed0032928223bf865198c500560bd8ea0e SHA512 f667a92e9d8dfcd52dab8ce8bcdeb4c7da1fc65f5b11df96340df3b6362a06b3ba71bbc6677aef278514b856a85a65ddfd9e7b96b48a9684256ccf4825e98dd5 WHIRLPOOL 0bd67c47391ad21853f3a859b8cfa53d740f41a06f024526bba29c69c98a5bffb871ba45581a3fbfaf8b3fff9ac2c04a8e4e042e364926ccbfd0c01f52a1ebd9
 AUX envd-tcmalloc 48 SHA256 b24741f787828fa45844af0a5ed36ac89e2e4139244990bf044268e28f0d7e15 SHA512 d180b1a888ec6d870ff523a3b10fd00eca479ee2586a236458af5ffaba21c84e7b8098da6d4bc08fb86c82c61a861dd3c3596a01063d734c329a92808682fc8c WHIRLPOOL 73468450e14c4e55dcfef10c8cf17ca1f2471a54752d4c0ae110dccf43bae47db5641d62f16ac331b0fb78e0b0a52edcae370a18c7870dcc1501c3d288cf791a
 AUX rbdmap.initd 2373 SHA256 7e1c5507f015eb42d274af165492d8ca495bdf9467e77c276b962605fe8080a8 SHA512 bbd48d6987e52eaf6d02bccf3aecd06596465af4d3ac93063f9a814106de162a27bf1a33ae1646e669efb3c754f3ba57f395523293ad643b0d81ee588252216b WHIRLPOOL 5605cb10e847492c5e73353ce2f41f8d9f2d2e5fb17fe41266b6d0f3e045a328b9e1dffe547c2ef24e4ed916ff9f2fd52b137678d6c532ad5dba459470ed1610
 AUX sysctld 57 SHA256 de2d90c6a49e8703565858a912e0806edd3b96322ccfbb8454751ecfe33dc373 SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a WHIRLPOOL fe714df1d7b42f2767ebbb4d365534b2ed6dcee3a90589150ead40cd3b911e06431c6c94465ba3ab97321d43b6d3a0b67f83210cc6506d40a8e2f36b4698b7b8
diff --git a/sys-cluster/ceph/files/ceph-10.2.6-radosgw-swift-clean-up-flush-newline-behavior.patch b/sys-cluster/ceph/files/ceph-10.2.6-radosgw-swift-clean-up-flush-newline-behavior.patch
deleted file mode 100644
index 3202de3cbe98..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.6-radosgw-swift-clean-up-flush-newline-behavior.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 39848e41b7c517cc5faab1ccf77c2804fd7d2628 Mon Sep 17 00:00:00 2001
-From: Marcus Watts <mwatts@redhat.com>
-Date: Wed, 11 Jan 2017 00:06:15 -0500
-Subject: [PATCH] radosgw/swift: clean up flush / newline behavior.
-
-The current code emits a newline after swift errors, but fails
-to account for it when it calculates 'content-length'.  This results in
-some clients (go github.com/ncw/swift) producing complaints about the
-unsolicited newline such as this,
-	Unsolicited response received on idle HTTP channel starting with "\n"; err=<nil>
-
-This logic eliminates the newline on flush.  This makes the content length
-calculation correct and eliminates the stray newline.
-
-There was already existing separator logic in the rgw plain formatter
-that can emit a newline at the correct point.  It had been checking
-"len" to decide if previous data had been emitted, but that's reset to 0
-by flush().  So, this logic adds a new per-instance variable to separately
-track state that it emitted a previous item (and should emit a newline).
-
-Fixes: http://tracker.ceph.com/issues/18473
-Signed-off-by: Marcus Watts <mwatts@redhat.com>
-Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
-(cherry picked from commit 5f229d6a33eae4906f22cdb90941835e47ee9f02)
----
- src/rgw/rgw_formats.cc | 11 +++++++----
- src/rgw/rgw_formats.h  |  1 +
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/rgw/rgw_formats.cc b/src/rgw/rgw_formats.cc
-index 698ec96..61e9b66 100644
---- a/src/rgw/rgw_formats.cc
-+++ b/src/rgw/rgw_formats.cc
-@@ -25,6 +25,7 @@ RGWFormatter_Plain::RGWFormatter_Plain(const bool ukv)
-   : buf(NULL),
-     len(0),
-     max_len(0),
-+    wrote_something(false),
-     min_stack_level(0),
-     use_kv(ukv)
- {
-@@ -41,7 +42,7 @@ void RGWFormatter_Plain::flush(ostream& os)
-     return;
- 
-   if (len) {
--    os << buf << "\n";
-+    os << buf;
-     os.flush();
-   }
- 
-@@ -156,13 +157,14 @@ void RGWFormatter_Plain::dump_format_va(const char *name, const char *ns, bool q
-   vsnprintf(buf, LARGE_SIZE, fmt, ap);
- 
-   const char *eol;
--  if (len) {
-+  if (wrote_something) {
-     if (use_kv && entry.is_array && entry.size > 1)
-       eol = ", ";
-     else
-       eol = "\n";
-   } else
-     eol = "";
-+  wrote_something = true;
- 
-   if (use_kv && !entry.is_array)
-     write_data("%s%s: %s", eol, name, buf);
-@@ -268,10 +270,11 @@ void RGWFormatter_Plain::dump_value_int(const char *name, const char *fmt, ...)
-   va_end(ap);
- 
-   const char *eol;
--  if (len)
-+  if (wrote_something) {
-     eol = "\n";
--  else
-+  } else
-     eol = "";
-+  wrote_something = true;
- 
-   if (use_kv && !entry.is_array)
-     write_data("%s%s: %s", eol, name, buf);
-diff --git a/src/rgw/rgw_formats.h b/src/rgw/rgw_formats.h
-index 9df5251..1c5afd1 100644
---- a/src/rgw/rgw_formats.h
-+++ b/src/rgw/rgw_formats.h
-@@ -56,6 +56,7 @@ class RGWFormatter_Plain : public Formatter {
-   std::list<struct plain_stack_entry> stack;
-   size_t min_stack_level;
-   bool use_kv;
-+  bool wrote_something;
- };
- 
- class RGWFormatterFlusher {
diff --git a/sys-cluster/ceph/files/ceph-mon_at.service b/sys-cluster/ceph/files/ceph-mon_at.service
deleted file mode 100644
index 4f54cc158c5b..000000000000
--- a/sys-cluster/ceph/files/ceph-mon_at.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Ceph cluster monitor daemon
-After=network-online.target
-Wants=network-online.target
-
-# According to:
-#   http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget
-# these can be removed once ceph-mon will dynamically change network
-# configuration.
-After=network-online.target local-fs.target
-Wants=network-online.target local-fs.target
-PartOf=ceph.target
-
-[Service]
-Environment=CLUSTER=ceph
-ExecStart=/usr/bin/ceph-mon -f --cluster ${CLUSTER} --id %i
-
-[Install]
-WantedBy=ceph.target
diff --git a/sys-cluster/ceph/files/ceph.initd-r1.1 b/sys-cluster/ceph/files/ceph.initd-r1.1
deleted file mode 100644
index bb603259715d..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r1.1
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-command="/usr/bin/ceph-${daemon_type}"
-pidfile="/run/ceph/${daemon_type}.${daemon_id}.pid"
-command_args="-i ${daemon_id} --pid-file ${pidfile} -c ${ceph_conf}"
-
-depend() {
-	after net ntpd ntp-client chronyd
-	before netmount
-}
-
-is_type_valid() {
-	case ${daemon_type} in
-		mon|mds|osd) return 0;;
-		*) return 1;;
-	esac
-}
-
-start_pre() {
-	checkpath -d -q -o ceph "$(dirname "${pidfile}")"
-	if ! is_type_valid ;then
-		eerror "Please give valid Ceph Server Type: mds, mon, osd"
-		return 1
-	fi
-}
-
-reload() {
-	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
-	start-stop-daemon --signal 1 ${start_stop_daemon_args} --pidfile "${pidfile}"
-	eend $?
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.target b/sys-cluster/ceph/files/ceph.target
deleted file mode 100644
index 60734baff689..000000000000
--- a/sys-cluster/ceph/files/ceph.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=ceph target allowing to start/stop all ceph*@.service instances at once
-[Install]
-WantedBy=multi-user.target