[arch-commits] Commit in ceph/trunk (3 files)

2020-11-25 Thread Evangelos Foutras via arch-commits 
Date: Thursday, November 26, 2020 @ 03:52:24
  Author: foutrelis
Revision: 761400

Fix tests for Python 3.9; add CTEST_OUTPUT_ON_FAILURE=1

Added:
  ceph/trunk/mgr-dashboard-update-pylint-to-2.6.0.patch
  ceph/trunk/qa-src-update-mypy-to-0.782.patch
Modified:
  ceph/trunk/PKGBUILD

+
 PKGBUILD   |   18 
 mgr-dashboard-update-pylint-to-2.6.0.patch |  671 +++
 qa-src-update-mypy-to-0.782.patch  |   65 ++
 3 files changed, 752 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-26 03:51:19 UTC (rev 761399)
+++ PKGBUILD2020-11-26 03:52:24 UTC (rev 761400)
@@ -54,6 +54,8 @@
   'ceph-15.2.4-system-uring.patch'
   'ceph-15.2.5-missing-includes.patch'
   'disable-empty-readable.sh-test.patch'
+  'qa-src-update-mypy-to-0.782.patch'
+  'mgr-dashboard-update-pylint-to-2.6.0.patch'
 )
 
sha512sums=('0c532fb9f29437c094a86a1e58040f03b679e4d52ea9cc752ecf411c594c8ec37dc5e9f0ee47712d32b93b4e60b0f3fded280867d41c41b8db806b375e4e'
 
'4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
@@ -68,7 +70,9 @@
 
'20256de5c3227caa149f8285bcc90fcbd67be8cefa568fb72ad0d43688f1f62db7c7fc231dfd4ecf2dd11be68bf1ccc284ebbc691a82a26f3968200f12c82097'
 
'8258661e56b5360f4260fdd29b07bac4d415068a112b61ca8c55c529fb1593d8d61a0d59a4eec8f1567b97167c058082198d008f55f8ee701cb46489df5f7823'
 
'84de66f64ea96cd59b40dfb5b8c5d093fe49df1139b45ad9d1bd6b9ebd2f1200b6e931adcf032639a4995af322cf05c1ef9050eb1cb6673e29e040d4e348b3d5'
-
'2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222')
+
'2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222'
+
'204741c65b8ceeddae0a58a49e2b4249ee7ffc624ce8d9faa6284af198abe63bffb6758e064eeff6d1857be044647f99749a45443e258b35e92cc36b9edeba80'
+
'f65a028832a7d8ec6db55b4399c4448f0f7182031d81c239e3d7a04d2d27394481af2e4313bcff54c775934389773658b0bb0574107677f377e581bd51876d59')
 
 
 # -fno-plt causes linker errors (undefined reference to internal methods)
@@ -92,6 +96,15 @@
 fi
   done
 
+  # temporarily disable unsubscriptable-object (buggy on Python 3.9)
+  # https://github.com/PyCQA/pylint/issues/3882
+  sed -i '/^disable=/a\unsubscriptable-object,' \
+src/pybind/mgr/dashboard/.pylintrc
+
+  # mypy complains about this but the exception is handled; not sure what's up
+  sed -i 's/from base64 import encodestring$/&  # type: ignore/' \
+src/pybind/mgr/dashboard/awsauth.py
+
   # suppress deprecation warnings
   sed -i '/#ifndef CEPH_CONFIG_H/i#define BOOST_ALLOW_DEPRECATED_HEADERS' \
 src/common/config.h
@@ -177,7 +190,8 @@
 check() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  export CTEST_PARALLEL_LEVEL="8"
+  export CTEST_PARALLEL_LEVEL=8
+  export CTEST_OUTPUT_ON_FAILURE=1
   VERBOSE=1 make -C build check
 
   # sometimes processes are not properly terminated...

Added: mgr-dashboard-update-pylint-to-2.6.0.patch
===
--- mgr-dashboard-update-pylint-to-2.6.0.patch  (rev 0)
+++ mgr-dashboard-update-pylint-to-2.6.0.patch  2020-11-26 03:52:24 UTC (rev 
761400)
@@ -0,0 +1,671 @@
+From e4f179fa960ed18e8f45bc87d26552d720bc819b Mon Sep 17 00:00:00 2001
+From: Volker Theile 
+Date: Fri, 25 Sep 2020 13:17:19 +0200
+Subject: [PATCH] mgr/dashboard: update pylint to 2.6.0
+
+* Update pylint to 2.6.0.
+* Fix pylint issues.
+
+Fixes: https://tracker.ceph.com/issues/47647
+
+(cherry picked from commit 298c91958a41674a928d53f010b20f174f16d68f)
+---
+ src/pybind/mgr/dashboard/.pylintrc|  8 ++--
+ .../mgr/dashboard/controllers/nfsganesha.py   |  2 +-
+ src/pybind/mgr/dashboard/controllers/osd.py   |  2 +-
+ src/pybind/mgr/dashboard/plugins/__init__.py  |  2 +-
+ .../mgr/dashboard/requirements-lint.txt   |  2 +-
+ src/pybind/mgr/dashboard/services/auth.py |  1 -
+ .../mgr/dashboard/services/ceph_service.py|  2 +-
+ src/pybind/mgr/dashboard/services/cephx.py|  2 +-
+ src/pybind/mgr/dashboard/services/ganesha.py  | 20 +--
+ .../mgr/dashboard/services/iscsi_client.py|  2 +-
+ .../mgr/dashboard/services/iscsi_config.py|  2 +-
+ src/pybind/mgr/dashboard/services/progress.py |  2 +-
+ .../mgr/dashboard/services/rgw_client.py  |  3 ++-
+ src/pybind/mgr/dashboard/tests/__init__.py|  2 +-
+ src/pybind/mgr/dashboard/tests/helper.py  |  2 +-
+ .../dashboard/tests/test_access_control.py|  2 +-
+ .../mgr/dashboard/tests/test_api_auditing.py  |  2 +-
+ src/pybind/mgr/dashboard/tests/test_cephfs.py |  2 +-
+ .../mgr/dashboard/tests/test_controllers.py   |  2

[arch-commits] Commit in ceph/trunk (3 files)

2016-10-09 Thread Sébastien Luttringer 
Date: Sunday, October 9, 2016 @ 15:31:53
  Author: seblu
Revision: 277967

upgpkg: ceph 10.2.3-1

Added:
  ceph/trunk/03-Revert-rgw-ldap-fix-ldap-bindpw-parsing.patch
  ceph/trunk/04-fix-686-build.patch
Modified:
  ceph/trunk/PKGBUILD

--+
 03-Revert-rgw-ldap-fix-ldap-bindpw-parsing.patch |  309 +
 04-fix-686-build.patch   |  199 +
 PKGBUILD |   18 -
 3 files changed, 519 insertions(+), 7 deletions(-)

Added: 03-Revert-rgw-ldap-fix-ldap-bindpw-parsing.patch
===
--- 03-Revert-rgw-ldap-fix-ldap-bindpw-parsing.patch
(rev 0)
+++ 03-Revert-rgw-ldap-fix-ldap-bindpw-parsing.patch2016-10-09 15:31:53 UTC 
(rev 277967)
@@ -0,0 +1,309 @@
+From b1099e8edcda1ab658eaac424bd2e09d6e7cbabd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= 
+Date: Sun, 9 Oct 2016 01:53:36 +0200
+Subject: [PATCH] Revert "rgw ldap: fix ldap bindpw parsing"
+
+This reverts commit fe57aceeb02ad9163feb2d196589b5927cedfa0f.
+---
+ src/rgw/librgw.cc |  6 ++--
+ src/rgw/rgw_ldap.cc   | 35 -
+ src/rgw/rgw_ldap.h| 54 -
+ src/rgw/rgw_rest_s3.cc| 77 +++
+ src/test/test_rgw_ldap.cc |  4 +--
+ 5 files changed, 34 insertions(+), 142 deletions(-)
+
+diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
+index c476129..37414fc 100644
+--- a/src/rgw/librgw.cc
 b/src/rgw/librgw.cc
+@@ -52,7 +52,6 @@
+ #include 
+ #include 
+ 
+-
+ #define dout_subsys ceph_subsys_rgw
+ 
+ bool global_stop = false;
+@@ -470,10 +469,9 @@ namespace rgw {
+ const string& ldap_searchdn = store->ctx()->_conf->rgw_ldap_searchdn;
+ const string& ldap_dnattr =
+   store->ctx()->_conf->rgw_ldap_dnattr;
+-std::string ldap_bindpw = parse_rgw_ldap_bindpw(store->ctx());
+ 
+-ldh = new rgw::LDAPHelper(ldap_uri, ldap_binddn, ldap_bindpw.c_str(),
+-ldap_searchdn, ldap_dnattr);
++ldh = new rgw::LDAPHelper(ldap_uri, ldap_binddn, ldap_searchdn,
++ldap_dnattr);
+ ldh->init();
+ ldh->bind();
+ 
+diff --git a/src/rgw/rgw_ldap.cc b/src/rgw/rgw_ldap.cc
+index 6cca3b8..ac420e3 100644
+--- a/src/rgw/rgw_ldap.cc
 b/src/rgw/rgw_ldap.cc
+@@ -2,38 +2,3 @@
+ // vim: ts=8 sw=2 smarttab
+ 
+ #include "rgw_ldap.h"
+-
+-#include "common/ceph_context.h"
+-#include "common/common_init.h"
+-#include "common/dout.h"
+-#include "common/safe_io.h"
+-#include 
+-
+-#include "include/assert.h"
+-
+-#define dout_subsys ceph_subsys_rgw
+-
+-std::string parse_rgw_ldap_bindpw(CephContext* ctx)
+-{
+-  string ldap_bindpw;
+-  string ldap_secret = ctx->_conf->rgw_ldap_secret;
+-
+-  if (ldap_secret.empty()) {
+-ldout(ctx, 10)
+-  << __func__ << " LDAP auth no rgw_ldap_secret file found in conf"
+-  << dendl;
+-} else {
+-  char bindpw[1024];
+-  memset(bindpw, 0, 1024);
+-  int pwlen = safe_read_file("" /* base */, ldap_secret.c_str(),
+-   bindpw, 1023);
+-if (pwlen) {
+-  ldap_bindpw = bindpw;
+-  boost::algorithm::trim(ldap_bindpw);
+-  if (ldap_bindpw.back() == '\n')
+-  ldap_bindpw.pop_back();
+-}
+-  }
+-
+-  return std::move(ldap_bindpw);
+-}
+diff --git a/src/rgw/rgw_ldap.h b/src/rgw/rgw_ldap.h
+index b29e33ad..02eb61e 100644
+--- a/src/rgw/rgw_ldap.h
 b/src/rgw/rgw_ldap.h
+@@ -23,38 +23,27 @@ namespace rgw {
+   {
+ std::string uri;
+ std::string binddn;
+-std::string bindpw;
+ std::string searchdn;
+ std::string dnattr;
+ LDAP *ldap;
+-bool msad = false; /* TODO: possible future specialization */
+ 
+   public:
+-LDAPHelper(std::string _uri, std::string _binddn, std::string _bindpw,
+- std::string _searchdn, std::string _dnattr)
+-  : uri(std::move(_uri)), binddn(std::move(_binddn)),
+-  bindpw(std::move(_bindpw)), searchdn(_searchdn), dnattr(_dnattr),
+-  ldap(nullptr) {
++LDAPHelper(std::string _uri, std::string _binddn, std::string _searchdn,
++std::string _dnattr)
++  : uri(std::move(_uri)), binddn(std::move(_binddn)), searchdn(_searchdn),
++  dnattr(_dnattr), ldap(nullptr) {
+   // nothing
+ }
+ 
+ int init() {
+   int ret;
+   ret = ldap_initialize(, uri.c_str());
+-  if (ret == LDAP_SUCCESS) {
+-  unsigned long ldap_ver = LDAP_VERSION3;
+-  ret = ldap_set_option(ldap, LDAP_OPT_PROTOCOL_VERSION,
+-(void*) _ver);
+-  }
+-  if (ret == LDAP_SUCCESS) {
+-  ret = ldap_set_option(ldap, LDAP_OPT_REFERRALS, LDAP_OPT_OFF); 
+-  }
+   return (ret == LDAP_SUCCESS) ? ret : -EINVAL;
+ }
+ 
+ int bind() {
+   int ret;
+-  ret = ldap_simple_bind_s(ldap, binddn.c_str(),