Issue 5371 - Update npm and cargo packages

Description:

Updated cockpit npm packages and rust cargo packages.  Fixed some compiler
errors.

In rpm.mk renamed FEDORA_SPECFILE to DS_SPECFILE because we use this for
other platforms besides FEDORA.  Also renamed bundle make command to be
more generic

Updated obsolete macros in configure.ac and m4 files.

relates: https://github.com/389ds/389-ds-base/issues/5371

Reviewed by: spichugi & firstyear (Thanks!!)

configure.ac

@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)
+AC_PREREQ([2.69])
 AC_INIT([dirsrv],[1.0],[http://bugzilla.redhat.com/])
 # AC_CONFIG_HEADER must be called right after AC_INIT.
 AC_CONFIG_HEADERS([config.h])
@@ -24,24 +24,20 @@ AC_PROG_CXX
 AC_PROG_CC
 AM_PROG_CC_C_O
 AM_PROG_AS
-AC_PROG_CC_STDC
 PKG_PROG_PKG_CONFIG
 
 # disable static libs by default - we only use a couple
 AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
+LT_INIT
 
 # Checks for header files.
 AC_HEADER_DIRENT
-AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS([arpa/inet.h errno.h fcntl.h malloc.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/file.h sys/socket.h sys/time.h syslog.h unistd.h mntent.h sys/sysinfo.h sys/endian.h endian.h])
-
 # These are *required* headers without option.
 AC_CHECK_HEADERS([inttypes.h], [], AC_MSG_ERROR([unable to locate required header inttypes.h]))
 AC_CHECK_HEADERS([crack.h], [], AC_MSG_ERROR([unable to locate required header crack.h]))
 
-
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STAT
 AC_C_CONST
@@ -49,7 +45,6 @@ AC_HEADER_STDBOOL
 AC_TYPE_UID_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
-AC_HEADER_TIME
 AC_STRUCT_TM
 
 # Checks for library functions.
@@ -62,7 +57,18 @@ AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
 AC_FUNC_MALLOC
 AC_FUNC_MEMCMP
 AC_FUNC_MMAP
-AC_TYPE_SIGNAL
+AC_DIAGNOSE([obsolete],[your code may safely assume C89 semantics that RETSIGTYPE is void.
+Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl
+AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE(
+[AC_LANG_PROGRAM([#include <sys/types.h>
+#include <signal.h>
+],
+		 [return *(signal (0, 0)) (0) == 1;])],
+		   [ac_cv_type_signal=int],
+		   [ac_cv_type_signal=void])])
+AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers
+		    (`int' or `void').])
+
 AC_FUNC_STAT
 AC_FUNC_STRERROR_R
 AC_FUNC_STRFTIME
@@ -570,7 +576,7 @@ AC_ARG_WITH(instconfigdir,
                        [Base directory for instance specific writable configuration directories (default $sysconfdir/$PACKAGE_NAME)]),
 [
   if test $withval = yes ; then
-     AC_ERROR([Please specify a full path with --with-instconfigdir])
+     AC_MSG_ERROR(Please specify a full path with --with-instconfigdir)
   fi
   instconfigdir="$withval"
   AC_MSG_RESULT($withval)

ldap/servers/slapd/back-ldbm/db-mdb/mdb_import.c

@@ -536,7 +536,8 @@ dbmdb_import_monitor_threads(ImportJob *job, int *status)
     int i = 0;
 
     for (current_worker = job->worker_list; current_worker != NULL;
-         current_worker = current_worker->next) {
+         current_worker = current_worker->next)
+    {
         current_worker->command = RUN;
         if (current_worker->work_type == PRODUCER)
             producer = current_worker;
@@ -545,11 +546,14 @@ dbmdb_import_monitor_threads(ImportJob *job, int *status)
     }
 
 
-    if (job->flags & FLAG_USE_FILES)
-        PR_ASSERT(producer != NULL);
-
+    if ((job->flags & FLAG_USE_FILES) && producer == NULL) {
+        import_log_notice(job, SLAPI_LOG_ERR, "dbmdb_import_monitor_threads","No producer ==> Aborting %s.\n",
+                          dbmdb_import_role(job));
+        return ERR_IMPORT_ABORTED;
+    }
     if (!writer) {
-        import_log_notice(job,SLAPI_LOG_ERR,"dbmdb_import_monitor_threads","No writer ==> Aborting %s.\n", dbmdb_import_role(job));
+        import_log_notice(job, SLAPI_LOG_ERR, "dbmdb_import_monitor_threads","No writer ==> Aborting %s.\n",
+                          dbmdb_import_role(job));
         return ERR_IMPORT_ABORTED;
     }
 
@@ -624,7 +628,8 @@ dbmdb_import_monitor_threads(ImportJob *job, int *status)
     import_log_notice(job, SLAPI_LOG_INFO, "dbmdb_import_monitor_threads",
                       "Workers finished; cleaning up...");
 
-    import_log_notice(job, SLAPI_LOG_INFO, "dbmdb_import_monitor_threads", "Workers cleaned up.");
+    import_log_notice(job, SLAPI_LOG_INFO, "dbmdb_import_monitor_threads",
+                      "Workers cleaned up.");
 
     *status = IMPORT_COMPLETE_PASS;
     return (job->flags & FLAG_ABORT) ? ERR_IMPORT_ABORTED : 0;

ldap/servers/slapd/back-ldbm/db-mdb/mdb_import_threads.c

@@ -438,7 +438,6 @@ dbmdb_import_producer(void *param)
     ImportJob *job = info->job;
     ImportCtx_t *ctx = job->writer_ctx;
     ID id = job->first_ID, id_filestart = id;
-    ldbm_instance *inst = job->inst;
     PRIntervalTime sleeptime;
     int detected_eof = 0;
     int fd, curr_file, curr_lineno = 0;
@@ -448,7 +447,7 @@ dbmdb_import_producer(void *param)
     WorkerQueueData_t wqelmt = {0};
 
     PR_ASSERT(info != NULL);
-    PR_ASSERT(inst != NULL);
+    PR_ASSERT(job->inst != NULL);
 
 
     ctx->wgc.str2entry_flags = SLAPI_STR2ENTRY_TOMBSTONE_CHECK |
@@ -482,19 +481,18 @@ dbmdb_import_producer(void *param)
         if (detected_eof) {
             /* check if the file can still be read, whine if so... */
             if (read(fd, (void *)&idx, 1) > 0) {
-                import_log_notice(job, SLAPI_LOG_WARNING, "dbmdb_import_producer", "Unexpected end of file found "
-                                                                             "at line %d of file \"%s\"",
-                                  curr_lineno,
-                                  curr_filename);
+                import_log_notice(job, SLAPI_LOG_WARNING, "dbmdb_import_producer",
+                                  "Unexpected end of file found at line %d of file \"%s\"",
+                                  curr_lineno, curr_filename);
             }
 
             if (fd == STDIN_FILENO) {
-                import_log_notice(job, SLAPI_LOG_INFO, "dbmdb_import_producer", "Finished scanning file stdin (%lu "
-                                                                          "entries)",
+                import_log_notice(job, SLAPI_LOG_INFO, "dbmdb_import_producer",
+                                  "Finished scanning file stdin (%lu entries)",
                                   (u_long)(id - id_filestart));
             } else {
-                import_log_notice(job, SLAPI_LOG_INFO, "dbmdb_import_producer", "Finished scanning file \"%s\" (%lu "
-                                                                          "entries)",
+                import_log_notice(job, SLAPI_LOG_INFO, "dbmdb_import_producer",
+                                 "Finished scanning file \"%s\" (%lu entries)",
                                   curr_filename, (u_long)(id - id_filestart));
             }
             close(fd);
@@ -736,8 +734,7 @@ dbmdb_import_prepare_worker_entry(WorkerQueueData_t *wqelmnt)
     /* Check attribute syntax */
     if (syntax_err != 0) {
         import_log_notice(job, SLAPI_LOG_WARNING, "dbmdb_import_prepare_worker_entry",
-                          "Skipping entry \"%s\" which violates attribute syntax, ending line %d of "
-                          "file \"%s\"",
+                          "Skipping entry \"%s\" which violates attribute syntax, ending line %d of file \"%s\"",
                           slapi_entry_get_dn(e), curr_lineno, curr_filename);
         slapi_entry_free(e);
 
@@ -931,8 +928,8 @@ dbmdb_index_producer(void *param)
         TXN_ABORT(txn);
     }
     if (rc) {
-        slapi_log_err(SLAPI_LOG_ERR, "dbmdb_index_producer", "%s: Failed to read database: "
-                                                       "failed to %s, errno=%d (%s)\n",
+        slapi_log_err(SLAPI_LOG_ERR, "dbmdb_index_producer",
+                      "%s: Failed to read database: failed to %s, errno=%d (%s)\n",
                       inst->inst_name, errinfo, rc, dblayer_strerror(rc));
         if (job->task) {
             slapi_task_log_notice(job->task,
@@ -1967,7 +1964,8 @@ static int
 err(const char *func, WorkerQueueData_t *wqelmnt, const Slapi_DN *sdn, char *msg)
 {
     if (wqelmnt->filename) {
-        slapi_log_err(SLAPI_LOG_WARNING, func, "Entry ignored because %s while importing entry at line %d from ldif file %s with DN: %s\n",
+        slapi_log_err(SLAPI_LOG_WARNING, func,
+                "Entry ignored because %s while importing entry at line %d from ldif file %s with DN: %s\n",
                 msg, wqelmnt->lineno, wqelmnt->filename, slapi_sdn_get_dn(sdn));
     }
     return -1;
@@ -2017,8 +2015,7 @@ rename_duplicate_entry(const char *funcname, ImportJob *job, backentry *ep)
         uuidstr = slapi_value_get_string(uival);
     } else {
         import_log_notice(job, SLAPI_LOG_ERR, (char*)funcname,
-                          "Failed to get nsUniqueId of the duplicated entry %s; "
-                          "Entry ID: %d",
+                          "Failed to get nsUniqueId of the duplicated entry %s; Entry ID: %d",
                           orig_dn, ep->ep_id);
         slapi_ch_free_string(&orig_dn);
         return PEA_SKIP;
@@ -2064,13 +2061,13 @@ dbmdb_import_handle_duplicate_dn(const char *funcname, WorkerQueueData_t *wqelmn
         return rename_duplicate_entry(funcname, job, ep);
     }
 
-    msg = slapi_ch_smprintf("Duplicated DN detected: \"%s\": Entry ID: (%d) and (%d)", slapi_sdn_get_udn(sdn), altID, ep->ep_id);
+    msg = slapi_ch_smprintf("Duplicated DN detected: \"%s\": Entry ID: (%d) and (%d)",
+                            slapi_sdn_get_udn(sdn), altID, ep->ep_id);
     err(funcname, wqelmnt, sdn, msg);
     slapi_ch_free_string(&msg);
     return PEA_DUPDN;
 }
 
-
 /*
  * dbmdb_add_op_attrs - add the parentid, entryid, dncomp,
  * and entrydn operational attributes to an entry.
@@ -2332,7 +2329,9 @@ process_entryrdn(backentry *ep, WorkerQueueData_t *wqelmnt)
         rdncache_elem_release(&child);
         child = rdncache_rdn_lookup(ctx->rdncache, wqelmnt, pid, srdn.all_nrdns[idx]);
         if (!child) {
-            slapi_log_err(SLAPI_LOG_ERR, "process_entryrdn", "Skipping entry \"%s\" which has no parent.\n", slapi_sdn_get_udn(sdn));
+            slapi_log_err(SLAPI_LOG_ERR, "process_entryrdn",
+                          "Skipping entry \"%s\" which has no parent.\n",
+                          slapi_sdn_get_udn(sdn));
             err(__FUNCTION__, wqelmnt, sdn, "No parent entry ");
             slapi_ch_free((void**)&ancestors);
             slapi_rdn_done(&srdn);
@@ -2619,13 +2618,12 @@ dbmdb_import_worker(void *param)
     ImportWorkerInfo *info = &wqelmnt->winfo;
     ImportJob *job = info->job;
     ImportCtx_t *ctx = job->writer_ctx;
-    ldbm_instance *inst = job->inst;
     backentry *ep = NULL;
     PRIntervalTime sleeptime;
     ID id = info->first_ID;
 
     PR_ASSERT(NULL != info);
-    PR_ASSERT(NULL != inst);
+    PR_ASSERT(NULL != job->inst);
 
 
     sleeptime = PR_MillisecondsToInterval(import_sleep_time);
@@ -2786,12 +2784,14 @@ dbmdb_add_import_index(ImportCtx_t *ctx, const char *name, IndexInfo *ii)
     if (ctx->role == IM_INDEX) {
         /* Required by CI test */
         if (a->flags & MII_NOATTR) {
-            slapi_log_err(SLAPI_LOG_INFO, "dbmdb_db2index", "%s: Indexing %s\n", job->inst->inst_name, mii->name);
+            slapi_log_err(SLAPI_LOG_INFO, "dbmdb_db2index",
+                          "%s: Indexing %s\n", job->inst->inst_name, mii->name);
         } else {
             if (job->task) {
                 slapi_task_log_notice(job->task, "%s: Indexing attribute: %s", job->inst->inst_name, mii->name);
             }
-            slapi_log_err(SLAPI_LOG_INFO, "dbmdb_db2index", "%s: Indexing attribute: %s\n", job->inst->inst_name, mii->name);
+            slapi_log_err(SLAPI_LOG_INFO, "dbmdb_db2index",
+                          "%s: Indexing attribute: %s\n", job->inst->inst_name, mii->name);
         }
     }
 
@@ -3463,5 +3463,3 @@ dbmdb_free_import_ctx(ImportJob *job)
     slapi_ch_free((void**)&job->writer_ctx);
 
 }
-
-

ldap/servers/slapd/back-ldbm/db-mdb/mdb_layer.c

@@ -387,12 +387,10 @@ dbmdb_get_db(backend *be, char *indexname, int open_flag, struct attrinfo *ai, d
     ldbm_instance *inst = (ldbm_instance *)be->be_instance_info;
     int open_flags = 0;
     dbmdb_cursor_t cur = {0};
-    dblayer_private *priv = NULL;
     int return_value = 0;
 
     PR_ASSERT(NULL != li);
-    priv = li->li_dblayer_private;
-    PR_ASSERT(NULL != priv);
+    PR_ASSERT(NULL != li->li_dblayer_private);
     *ppDB = NULL;
 
     if (NULL == inst->inst_name) {
@@ -539,9 +537,10 @@ dbmdb_txn_begin(struct ldbminfo *li, back_txnid parent_txn, back_txn *txn, PRBoo
 {
     int return_value = -1;
     dbmdb_ctx_t *conf = NULL;
-    dblayer_private *priv = NULL;
     back_txn new_txn = {NULL};
+
     PR_ASSERT(NULL != li);
+    PR_ASSERT(NULL != li->li_dblayer_private);
     /*
      * When server is shutting down, some components need to
      * flush some data (e.g. replication to write ruv).
@@ -552,9 +551,6 @@ dbmdb_txn_begin(struct ldbminfo *li, back_txnid parent_txn, back_txn *txn, PRBoo
     }
 
     conf = (dbmdb_ctx_t *)li->li_dblayer_config;
-    priv = li->li_dblayer_private;
-    PR_ASSERT(NULL != priv);
-
     if (txn) {
         txn->back_txn_txn = NULL;
     }
@@ -657,16 +653,14 @@ int
 dbmdb_txn_abort(struct ldbminfo *li, back_txn *txn, PRBool use_lock)
 {
     int return_value = -1;
-    dblayer_private *priv = NULL;
     dbi_txn_t *db_txn = NULL;
     back_txn *cur_txn = NULL;
     dbmdb_ctx_t *conf = NULL;
 
     PR_ASSERT(NULL != li);
+    PR_ASSERT(NULL != li->li_dblayer_private);
 
     conf = (dbmdb_ctx_t *)li->li_dblayer_config;
-    priv = li->li_dblayer_private;
-    PR_ASSERT(NULL != priv);
 
     /* use the transaction we are given - if none, see if there
        is a transaction in progress */
@@ -880,7 +874,6 @@ int
 dbmdb_backup(struct ldbminfo *li, char *dest_dir, Slapi_Task *task)
 {
     int return_value = LDAP_UNWILLING_TO_PERFORM;
-    dblayer_private *priv = NULL;
     PRDirEntry *direntry = NULL;
     PRDir *dirhandle = NULL;
     dbmdb_ctx_t *conf;
@@ -889,11 +882,10 @@ dbmdb_backup(struct ldbminfo *li, char *dest_dir, Slapi_Task *task)
     const char **pt;
     char *home;
 
-
     PR_ASSERT(NULL != li);
+    PR_ASSERT(NULL != li->li_dblayer_private);
+
     conf = (dbmdb_ctx_t *)li->li_dblayer_config;
-    priv = li->li_dblayer_private;
-    PR_ASSERT(NULL != priv);
     PR_ASSERT(NULL != conf);
     home = conf->home;
 
@@ -1023,7 +1015,6 @@ dbmdb_restore_file(struct ldbminfo *li, Slapi_Task *task, const char *src_dir, c
 int
 dbmdb_restore(struct ldbminfo *li, char *src_dir, Slapi_Task *task)
 {
-    dblayer_private *priv = NULL;
     int return_value = 0;
     int tmp_rval;
     int dbmode = DBLAYER_RESTORE_NO_RECOVERY_MODE;
@@ -1032,8 +1023,7 @@ dbmdb_restore(struct ldbminfo *li, char *src_dir, Slapi_Task *task)
     char *pathname;
 
     PR_ASSERT(NULL != li);
-    priv = li->li_dblayer_private;
-    PR_ASSERT(NULL != priv);
+    PR_ASSERT(NULL != li->li_dblayer_private);
 
     /* We find out if slapd is startcfg */
     /* If it is, we fail */

m4/db.m4

@@ -1,12 +1,12 @@
 # BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2007 Red Hat, Inc.
+# Copyright (C) 2022 Red Hat, Inc.
 # All rights reserved.
 #
 # License: GPL (version 3 or any later version).
 # See LICENSE for details. 
 # END COPYRIGHT BLOCK
 
-AC_CHECKING(for db)
+AC_MSG_CHECKING(for db)
 
 dnl  - check for --with-db
 AC_MSG_CHECKING(for --with-db)

m4/fhs.m4

@@ -1,12 +1,12 @@
 # BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
+# Copyright (C) 2022 Red Hat, Inc.
 # All rights reserved.
 #
 # License: GPL (version 3 or any later version).
 # See LICENSE for details. 
 # END COPYRIGHT BLOCK
 
-AC_CHECKING(for FHS)
+AC_MSG_CHECKING(for FHS)
 
 # check for --with-fhs
 AC_MSG_CHECKING(for --with-fhs)

m4/netsnmp.m4

@@ -1,12 +1,12 @@
 # BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
+# Copyright (C) 2022 Red Hat, Inc.
 # All rights reserved.
 #
 # License: GPL (version 3 or any later version).
 # See LICENSE for details. 
 # END COPYRIGHT BLOCK
 
-AC_CHECKING(for Net-SNMP)
+AC_MSG_CHECKING(for Net-SNMP)
 
 dnl - check for --with-netsnmp
 AC_MSG_CHECKING(for --with-netsnmp)

m4/openldap.m4

@@ -1,12 +1,12 @@
 # BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2009 Red Hat, Inc.
+# Copyright (C) 2022 Red Hat, Inc.
 # All rights reserved.
 #
 # License: GPL (version 3 or any later version).
 # See LICENSE for details. 
 # END COPYRIGHT BLOCK
 
-AC_CHECKING(for OpenLDAP)
+AC_MSG_CHECKING(for OpenLDAP)
 
 if test -z "$with_openldap"; then
     with_openldap=yes # Set default to yes

m4/selinux.m4

@@ -1,12 +1,12 @@
 # BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2009 Red Hat, Inc.
+# Copyright (C) 2022 Red Hat, Inc.
 # All rights reserved.
 #
 # License: GPL (version 3 or any later version).
 # See LICENSE for details. 
 # END COPYRIGHT BLOCK
 
-AC_CHECKING(for SELinux)
+AC_MSG_CHECKING(for SELinux)
 
 # check for --with-selinux
 AC_MSG_CHECKING(for --with-selinux)

m4/systemd.m4

@@ -1,12 +1,12 @@
 # BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2015 Red Hat, Inc.
+# Copyright (C) 2022 Red Hat, Inc.
 # All rights reserved.
 #
 # License: GPL (version 3 or any later version).
 # See LICENSE for details. 
 # END COPYRIGHT BLOCK
 
-AC_CHECKING(for Systemd)
+AC_MSG_CHECKING(for Systemd)
 
 # check for --with-systemd
 AC_MSG_CHECKING(for --with-systemd)

rpm.mk

@@ -44,8 +44,8 @@ download-cargo-dependencies:
 	cargo fetch --manifest-path=./src/Cargo.toml
 	tar -czf vendor.tar.gz vendor
 
-bundle-rust-on-fedora:
-	python3 rpm/bundle-rust-downstream.py ./src/Cargo.lock $(FEDORA_SPECFILE) ./vendor
+bundle-rust:
+	python3 rpm/bundle-rust-downstream.py ./src/Cargo.lock $(DS_SPECFILE) ./vendor
 
 install-node-modules:
 ifeq ($(COCKPIT_ON), 1)

src/Cargo.lock

@@ -35,9 +35,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "base64"
@@ -76,9 +76,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.72"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
 dependencies = [
  "jobserver",
 ]
@@ -137,9 +137,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.2"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
+checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -158,22 +158,23 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.6"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"
+checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d"
 dependencies = [
+ "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "lazy_static",
  "memoffset",
+ "once_cell",
  "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b979d76c9fcb84dffc80a73f7290da0f83e4c95773494674cb44b76d13a7a110"
+checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -181,12 +182,12 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.6"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
+checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83"
 dependencies = [
  "cfg-if",
- "lazy_static",
+ "once_cell",
 ]
 
 [[package]]
@@ -250,9 +251,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "getrandom"
-version = "0.2.4"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
 dependencies = [
  "cfg-if",
  "libc",
@@ -261,9 +262,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.11.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
  "ahash",
 ]
@@ -288,9 +289,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
 
 [[package]]
 name = "jobserver"
@@ -301,17 +302,11 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
 [[package]]
 name = "libc"
-version = "0.2.113"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eef78b64d87775463c549fbd80e19249ef436ea3bf1de2a1eb7e717ec7fab1e9"
+checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
 
 [[package]]
 name = "librnsslapd"
@@ -334,27 +329,28 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.5"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
+checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
 dependencies = [
+ "autocfg",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.14"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "lru"
-version = "0.7.2"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "274353858935c992b13c0ca408752e2121da852d07dec7ce5f108c77dfa14d1f"
+checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
 dependencies = [
  "hashbrown",
 ]
@@ -370,29 +366,41 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.9.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
+checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
 
 [[package]]
 name = "openssl"
-version = "0.10.38"
+version = "0.10.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
+checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0"
 dependencies = [
  "bitflags",
  "cfg-if",
  "foreign-types",
  "libc",
  "once_cell",
+ "openssl-macros",
  "openssl-sys",
 ]
 
+[[package]]
+name = "openssl-macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "openssl-sys"
-version = "0.9.72"
+version = "0.9.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
+checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f"
 dependencies = [
  "autocfg",
  "cc",
@@ -447,15 +455,15 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
+checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
 
 [[package]]
 name = "ppv-lite86"
@@ -471,11 +479,11 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.36"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
+checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
 dependencies = [
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -493,23 +501,22 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.15"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
+checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rand"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
  "rand_chacha",
  "rand_core",
- "rand_hc",
 ]
 
 [[package]]
@@ -531,20 +538,11 @@ dependencies = [
  "getrandom",
 ]
 
-[[package]]
-name = "rand_hc"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-dependencies = [
- "rand_core",
-]
-
 [[package]]
 name = "redox_syscall"
-version = "0.2.10"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
 dependencies = [
  "bitflags",
 ]
@@ -560,9 +558,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
+checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
 
 [[package]]
 name = "scopeguard"
@@ -572,18 +570,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "serde"
-version = "1.0.135"
+version = "1.0.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cf9235533494ea2ddcdb794665461814781c53f19d87b76e571a1c35acbad2b"
+checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.135"
+version = "1.0.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dcde03d87d4c973c04be249e7d8f0b35db1c848c487bd43032808e59dd8328d"
+checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -592,9 +590,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085"
+checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"
 dependencies = [
  "itoa",
  "ryu",
@@ -619,9 +617,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
+checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
 
 [[package]]
 name = "strsim"
@@ -631,13 +629,13 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "syn"
-version = "1.0.86"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
+checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -677,19 +675,21 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.15.0"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838"
+checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e"
 dependencies = [
+ "autocfg",
+ "once_cell",
  "pin-project-lite",
  "tokio-macros",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
+checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -698,13 +698,19 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.8"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
+checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
 dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "unicode-ident"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7"
+
 [[package]]
 name = "unicode-width"
 version = "0.1.9"
@@ -713,9 +719,9 @@ checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
 
 [[package]]
 name = "uuid"
@@ -746,9 +752,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "winapi"
@@ -774,18 +780,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "zeroize"
-version = "1.5.0"
+version = "1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc222aec311c323c717f56060324f32b82da1ce1dd81d9a09aa6a9030bfe08db"
+checksum = "20b578acffd8516a6c3f2a1bdefc1ec37e547bb4e0fb8b6b01a4cafc886b4442"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.3.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81e8f13fef10b63c06356d65d416b070798ddabcadc10d3ece0c5be9b3c7eddb"
+checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
 dependencies = [
  "proc-macro2",
  "quote",

src/cockpit/389-console/package.json

@@ -62,7 +62,6 @@
     "@patternfly/react-icons": "^4.8.4",
     "@patternfly/react-table": "^4.50.1",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "glob": "^7.1.7",
     "prop-types": "^15.7.2",
     "react": "17.0.2",
     "react-dom": "17.0.2"

src/cockpit/389-console/webpack.config.js

@@ -1,3 +1,4 @@
+const fs = require("fs");
 const path = require("path");
 
 const copy = require("copy-webpack-plugin");
@@ -6,8 +7,7 @@ const TerserJSPlugin = require('terser-webpack-plugin');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const CompressionPlugin = require("compression-webpack-plugin");
 const ESLintPlugin = require('eslint-webpack-plugin');
-// const CockpitPoPlugin = require("./src/lib/cockpit-po-plugin");
-const fs = require("fs");
+
 const webpack = require("webpack");
 const nodedir = path.resolve(process.env.SRCDIR || __dirname, "node_modules");
 
@@ -27,7 +27,7 @@ const copy_files = [
 const plugins = [
     new copy({ patterns: copy_files }),
     new extract({filename: "[name].css"}),
-    new ESLintPlugin({ extensions: ["js", "jsx"] }),
+    new ESLintPlugin({ extensions: ["js", "jsx"], failOnWarning: true, }),
     // new CockpitPoPlugin(),
 ];