November 2023 - openSUSE Commits - openSUSE Mailing Lists

commit slurm for openSUSE:Factory
by Source-Sync 01 Nov '23

01 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package slurm for openSUSE:Factory checked in at 2023-11-01 22:09:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slurm (Old) and /work/SRC/openSUSE:Factory/.slurm.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "slurm" Wed Nov 1 22:09:57 2023 rev:98 rq:1121548 version:23.02.6 Changes: -------- --- /work/SRC/openSUSE:Factory/slurm/slurm.changes 2023-10-17 20:24:59.179256761 +0200 +++ /work/SRC/openSUSE:Factory/.slurm.new.17445/slurm.changes 2023-11-01 22:10:44.457357707 +0100 @@ -21 +21 @@ - 'GET /slurmdb/v0.0.39/assocations` and `GET /slurmdb/v0.0.39/qos` to + `GET /slurmdb/v0.0.39/assocations` and `GET /slurmdb/v0.0.39/qos` to ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit progress for openSUSE:Factory
by Source-Sync 01 Nov '23

01 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package progress for openSUSE:Factory checked in at 2023-11-01 22:09:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/progress (Old) and /work/SRC/openSUSE:Factory/.progress.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "progress" Wed Nov 1 22:09:56 2023 rev:6 rq:1121495 version:0.17 Changes: -------- --- /work/SRC/openSUSE:Factory/progress/progress.changes 2021-04-27 21:34:40.075984358 +0200 +++ /work/SRC/openSUSE:Factory/.progress.new.17445/progress.changes 2023-11-01 22:10:42.349279614 +0100 @@ -1,0 +2,10 @@ +Mon Oct 30 16:21:15 UTC 2023 - Andrea Manzini <andrea.manzini(a)suse.com> + +- Update to 0.17: + * bump MAX_PIDS and MAX_RESULTS to 128 + * support for zsh completion + +- dropped no more needed patch progress-fix_ncurses_without_pkgconfig.patch +- provide separate subpackage for zsh completion + +------------------------------------------------------------------- Old: ---- progress-0.16.tar.gz progress-fix_ncurses_without_pkgconfig.patch New: ---- progress-0.17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ progress.spec ++++++ --- /var/tmp/diff_new_pack.xDiX1H/_old 2023-11-01 22:10:43.953339036 +0100 +++ /var/tmp/diff_new_pack.xDiX1H/_new 2023-11-01 22:10:43.957339184 +0100 @@ -1,7 +1,7 @@ # # spec file for package progress # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,13 @@ Name: progress -Version: 0.16 +Version: 0.17 Release: 0 Summary: Coreutils Viewer License: GPL-3.0-or-later Group: System/Console URL: https://github.com/Xfennec/progress Source0: https://github.com/Xfennec/progress/archive/v%{version}.tar.gz#/%{name}-%{v… -Patch1: progress-fix_ncurses_without_pkgconfig.patch BuildRequires: pkgconfig BuildRequires: pkgconfig(form) BuildRequires: pkgconfig(formw) @@ -48,9 +47,22 @@ It can now also display an estimated throughput (using -w flag). +%package zsh-completion +Summary: ZSH Completion for %{name} +Group: Development/Tools/Other +Requires: %{name} = %{version} +%if 0%{?suse_version} == 1315 +Supplements: packageand(progress:zsh) +%else +Supplements: (progress and zsh) +%endif +BuildArch: noarch + +%description zsh-completion +ZSH command line completion support for %{name}. + %prep -%setup -q -%patch1 +%autosetup %build %make_build CFLAGS="-g -Wall -D_FILE_OFFSET_BITS=64 %{optflags}" @@ -64,3 +76,8 @@ %{_bindir}/%{name} %{_mandir}/man1/%{name}.1%{?ext_man} +%files zsh-completion +%{_datadir}/zsh/ +%{_datadir}/zsh/site-functions/ +%{_datadir}/zsh/site-functions/_progress + ++++++ progress-0.16.tar.gz -> progress-0.17.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/progress-0.16/.travis.yml new/progress-0.17/.travis.yml --- old/progress-0.16/.travis.yml 2021-03-04 11:26:40.000000000 +0100 +++ new/progress-0.17/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -os: - - linux - - osx - -language: c - -compiler: - - gcc - - clang - -script: make - -notifications: - email: - on_success: never - on_failure: always - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/progress-0.16/Makefile new/progress-0.17/Makefile --- old/progress-0.16/Makefile 2021-03-04 11:26:40.000000000 +0100 +++ new/progress-0.17/Makefile 2023-10-13 10:45:36.000000000 +0200 @@ -8,10 +8,10 @@ ifeq (, $(shell which $(PKG_CONFIG) 2> /dev/null)) $(error "pkg-config command not found") endif - ifeq (, $(shell $(PKG_CONFIG) ncurses --libs 2> /dev/null)) + ifeq (, $(shell $(PKG_CONFIG) ncursesw --libs 2> /dev/null)) $(error "ncurses package not found") endif - override LDFLAGS += $(shell $(PKG_CONFIG) ncurses --libs) + override LDFLAGS += $(shell $(PKG_CONFIG) ncursesw --libs) endif ifeq ($(UNAME), Darwin) override LDFLAGS += -lncurses @@ -22,6 +22,7 @@ PREFIX ?= /usr/local BINDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/share/man/man1 +ZSHDIR = $(PREFIX)/share/zsh/site-functions $(OBJ) : progress.o sizes.o hlist.o $(CC) -Wall $^ -o $@ $(LDFLAGS) @@ -38,6 +39,10 @@ @mkdir -p $(DESTDIR)$(MANDIR) @install -pm0644 $(OBJ).1 $(DESTDIR)$(MANDIR)/ || \ echo "Failed. Try "make PREFIX=~ install" ?" + @echo "Installing zsh completion to $(DESTDIR)$(ZSHDIR) ..." + @install -Dpm0644 _$(OBJ) -t $(DESTDIR)$(ZSHDIR)/ || \ + echo "Failed. Try "make PREFIX=~ install" ?" uninstall : @rm -f $(DESTDIR)$(BINDIR)/$(OBJ) @rm -f $(DESTDIR)$(MANDIR)/$(OBJ).1 + @rm -f $(DESTDIR)$(ZSHDIR)/_$(OBJ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/progress-0.16/README.md new/progress-0.17/README.md --- old/progress-0.16/README.md 2021-03-04 11:26:40.000000000 +0100 +++ new/progress-0.17/README.md 2023-10-13 10:45:36.000000000 +0200 @@ -1,10 +1,10 @@ -progress - Coreutils Progress Viewer [![Build Status](https://travis-ci.org/Xfennec/progress.svg?branch=master)](https://… +progress - Coreutils Progress Viewer ===================== What is it ---------- -This tool can be described as a **Tiny**, Dirty C command +This tool can be described as a **tiny**, dirty C command that looks for coreutils basic commands (cp, mv, dd, tar, gzip/gunzip, cat, etc.) currently running on your system and displays the **percentage** of copied data. It can also show **estimated time** and **throughput**, @@ -25,9 +25,17 @@ apt install progress -On rpm-based systems (Red Hat, CentOS, SUSE, etc.), run: +On Arch Linux, run: - yum install progress + pacman -S progress + +On Fedora, run: + + dnf install progress + +On openSUSE, run: + + zypper install progress On macOS, with homebrew, run: @@ -44,7 +52,7 @@ On FreeBSD, substitute `make` with `gmake`. -It depends on library ncurses, you may have to install corresponding packages (may be something like 'libncurses5-dev' or 'ncurses-devel'). +It depends on the library ncurses, you may have to install corresponding packages (maybe something like 'libncurses5-dev', 'libncursesw6' or 'ncurses-devel'). How do you run it ----------------- @@ -65,7 +73,7 @@ watch progress -wc firefox -* look at your Web server activity: +* look at your web server activity: progress -c httpd @@ -78,8 +86,10 @@ How does it work ---------------- -It simply scans `/proc` for interesting commands, and then looks at +It simply scans `/proc` for interesting commands*, and then looks at directories `fd` and `fdinfo` to find opened files and seek positions, and reports status for the largest file. -It's very light, and compatible with virtually any command. +It's very light and compatible with virtually any command. + +<em>(*) on macOS, it does the same thing using libproc</em> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/progress-0.16/_progress new/progress-0.17/_progress --- old/progress-0.16/_progress 1970-01-01 01:00:00.000000000 +0100 +++ new/progress-0.17/_progress 2023-10-13 10:45:36.000000000 +0200 @@ -0,0 +1,25 @@ +#compdef progress +# ------------------------------------------------------------------------------ +# Description +# ----------- +# +# zsh completion script for progress +# +# ------------------------------------------------------------------------------ + +local options=( + {-q,--quiet}'[hides all messages]' + {-d,--debug}'[shows all warning/error messages]' + {-w,--wait}'[estimate I/O throughput and ETA (slower display)]' + '(-w)'{-W,--wait-delay}'[wait 'secs' seconds for I/O estimation (implies -w, default=1.0)]:secs' + {-m,--monitor}'[loop while monitored processes are still running]' + {-M,--monitor-continuously}'[like monitor but never stop (similar to watch progress)]' + {-a,--additional-command}'[add additional command to default command list]: :{_command_names -e}' + {-c,--command}'[monitor only this command name (ex: firefox)]: :{_command_names -e}' + {-p,--pid}'[monitor only this process ID (ex: $(pidof firefox))]: :_ps' + {-i,--ignore-file}'[do not report process if using file]: :_files' + {-o,--open-mode}'[report only files opened for read or write]:rw:(r w)' + '(- : *)'{-v,--version}'[show program version and exit]' + '(- : *)'{-h,--help}'[display this help and exit]' +) +_arguments -s -S $options diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/progress-0.16/progress.c new/progress-0.17/progress.c --- old/progress-0.16/progress.c 2021-03-04 11:26:40.000000000 +0100 +++ new/progress-0.17/progress.c 2023-10-13 10:45:36.000000000 +0200 @@ -72,7 +72,7 @@ static int proc_names_cnt; static char **proc_names; char *default_proc_names[] = {"cp", "mv", "dd", "tar", "bsdtar", "cat", "rsync", "scp", - "grep", "fgrep", "egrep", "cut", "sort", "md5sum", "sha1sum", + "grep", "fgrep", "egrep", "cut", "sort", "cksum", "md5sum", "sha1sum", "sha224sum", "sha256sum", "sha384sum", "sha512sum", #ifdef __FreeBSD__ "md5", "sha1", "sha224", "sha256", "sha512", "sha512t256", "rmd160", @@ -797,7 +797,7 @@ printf(" -c --command cmd monitor only this command name (ex: firefox)\n"); printf(" -p --pid id monitor only this process ID (ex: `pidof firefox`)\n"); printf(" -i --ignore-file file do not report process if using file\n"); - printf(" -o --open-mode {r|w} report only files opened for read or write\n"); + printf(" -o --open-mode {r|w|u} report only files opened for read, write, or read and write\n"); printf(" -v --version show program version and exit\n"); printf(" -h --help display this help and exit\n"); printf("\n\n"); @@ -867,6 +867,8 @@ flag_open_mode = PM_READ; else if (!strcmp("w", optarg)) flag_open_mode = PM_WRITE; + else if (!strcmp("u", optarg)) + flag_open_mode = PM_READWRITE; else { fprintf(stderr,"Invalid --open-mode option value '%s'.\n", optarg); exit(EXIT_FAILURE); @@ -1035,9 +1037,8 @@ for (j = 0 ; j < fd_count ; j++) { get_fdinfo(pidinfo_list[i].pid, fdnum_list[j], &fdinfo); - if (flag_open_mode == PM_READ && fdinfo.mode != PM_READ && fdinfo.mode != PM_READWRITE) - continue; - if (flag_open_mode == PM_WRITE && fdinfo.mode != PM_WRITE && fdinfo.mode != PM_READWRITE) + // only select files with specified open mode + if (flag_open_mode && flag_open_mode != fdinfo.mode) continue; if (fdinfo.size > max_size) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/progress-0.16/progress.h new/progress-0.17/progress.h --- old/progress-0.16/progress.h 2021-03-04 11:26:40.000000000 +0100 +++ new/progress-0.17/progress.h 2023-10-13 10:45:36.000000000 +0200 @@ -25,11 +25,11 @@ #include "hlist.h" -#define PROGRESS_VERSION "0.16" +#define PROGRESS_VERSION "0.17" #define PROC_PATH "/proc" -#define MAX_PIDS 32 -#define MAX_RESULTS 32 +#define MAX_PIDS 128 +#define MAX_RESULTS 128 #define MAX_FD_PER_PID 512 #define LINE_LEN 256

1 0

commit python-PyQt6-DataVisualization for openSUSE:Factory
by Source-Sync 01 Nov '23

01 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-PyQt6-DataVisualization for openSUSE:Factory checked in at 2023-11-01 22:09:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-PyQt6-DataVisualization (Old) and /work/SRC/openSUSE:Factory/.python-PyQt6-DataVisualization.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-PyQt6-DataVisualization" Wed Nov 1 22:09:54 2023 rev:9 rq:1121504 version:6.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-PyQt6-DataVisualization/python-PyQt6-DataVisualization.changes 2023-04-27 20:01:08.633999388 +0200 +++ /work/SRC/openSUSE:Factory/.python-PyQt6-DataVisualization.new.17445/python-PyQt6-DataVisualization.changes 2023-11-01 22:10:40.209200335 +0100 @@ -1,0 +2,6 @@ +Mon Oct 30 14:37:19 UTC 2023 - Markéta Machová <mmachova(a)suse.com> + +- Update to 6.6.0 + * This adds support for Qt v6.6. + +------------------------------------------------------------------- Old: ---- PyQt6_DataVisualization-6.5.0.tar.gz New: ---- PyQt6_DataVisualization-6.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PyQt6-DataVisualization.spec ++++++ --- /var/tmp/diff_new_pack.GDr3ka/_old 2023-11-01 22:10:41.509248495 +0100 +++ /var/tmp/diff_new_pack.GDr3ka/_new 2023-11-01 22:10:41.513248643 +0100 @@ -21,7 +21,7 @@ %define pyqt_build_for_qt6 1 %define plainpython python Name: python-%{mname} -Version: 6.5.0 +Version: 6.6.0 Release: 0 Summary: Python bindings for the Qt Data Visualization library License: GPL-3.0-only ++++++ PyQt6_DataVisualization-6.5.0.tar.gz -> PyQt6_DataVisualization-6.6.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_DataVisualization-6.5.0/ChangeLog new/PyQt6_DataVisualization-6.6.0/ChangeLog --- old/PyQt6_DataVisualization-6.5.0/ChangeLog 2023-04-04 17:22:06.571153900 +0200 +++ new/PyQt6_DataVisualization-6.6.0/ChangeLog 2023-10-25 12:23:47.479840000 +0200 @@ -1,3 +1,15 @@ +2023-10-22 Phil Thompson <phil(a)riverbankcomputing.com> + + * NEWS, PyQt6-DataVisualization.msp: + Updated to Qt v6.6. + [c976fdb9e01e] [6.6.0] + +2023-04-04 Phil Thompson <phil(a)riverbankcomputing.com> + + * .hgtags: + Added tag 6.5.0 for changeset f93c93b4661a + [4cb95a89841c] + 2023-03-31 Phil Thompson <phil(a)riverbankcomputing.com> * NEWS, PyQt6-DataVisualization.msp: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_DataVisualization-6.5.0/NEWS new/PyQt6_DataVisualization-6.6.0/NEWS --- old/PyQt6_DataVisualization-6.5.0/NEWS 2023-04-04 17:21:14.839851000 +0200 +++ new/PyQt6_DataVisualization-6.6.0/NEWS 2023-10-25 12:22:51.793457000 +0200 @@ -1,3 +1,6 @@ +v6.6.0 22nd October 2023 + - Added support for Qt v6.6. + v6.5.0 31st March 2023 - Added support for Qt v6.5. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_DataVisualization-6.5.0/PKG-INFO new/PyQt6_DataVisualization-6.6.0/PKG-INFO --- old/PyQt6_DataVisualization-6.5.0/PKG-INFO 2023-04-04 17:22:07.208520700 +0200 +++ new/PyQt6_DataVisualization-6.6.0/PKG-INFO 2023-10-25 12:23:48.172622000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: PyQt6-DataVisualization -Version: 6.5.0 +Version: 6.6.0 Requires-Python: >=3.7 Summary: Python bindings for the Qt Data Visualization library Home-Page: https://www.riverbankcomputing.com/software/pyqtdatavisualization/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_DataVisualization-6.5.0/pyproject.toml new/PyQt6_DataVisualization-6.6.0/pyproject.toml --- old/PyQt6_DataVisualization-6.5.0/pyproject.toml 2023-04-04 17:22:06.572411500 +0200 +++ new/PyQt6_DataVisualization-6.6.0/pyproject.toml 2023-10-25 12:23:47.481643700 +0200 @@ -6,7 +6,7 @@ # Specify the PEP 566 metadata for the project. [tool.sip.metadata] name = "PyQt6-DataVisualization" -version = "6.5.0" +version = "6.6.0" summary = "Python bindings for the Qt Data Visualization library" home-page = "https://www.riverbankcomputing.com/software/pyqtdatavisualization/" author = "Riverbank Computing Limited" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_DataVisualization-6.5.0/sip/QtDataVisualization/QtDataVisualizationmod.sip new/PyQt6_DataVisualization-6.6.0/sip/QtDataVisualization/QtDataVisualizationmod.sip --- old/PyQt6_DataVisualization-6.5.0/sip/QtDataVisualization/QtDataVisualizationmod.sip 2023-04-04 17:22:06.972336000 +0200 +++ new/PyQt6_DataVisualization-6.6.0/sip/QtDataVisualization/QtDataVisualizationmod.sip 2023-10-25 12:23:47.920319000 +0200 @@ -24,7 +24,7 @@ %Import QtGui/QtGuimod.sip -%Timeline {QtDataVisualization_6_0_0 QtDataVisualization_6_1_0 QtDataVisualization_6_2_0 QtDataVisualization_6_3_0 QtDataVisualization_6_4_0 QtDataVisualization_6_5_0} +%Timeline {QtDataVisualization_6_0_0 QtDataVisualization_6_1_0 QtDataVisualization_6_2_0 QtDataVisualization_6_3_0 QtDataVisualization_6_4_0 QtDataVisualization_6_5_0 QtDataVisualization_6_6_0} %Copying Copyright (c) 2023 Riverbank Computing Limited <info(a)riverbankcomputing.com> @@ -51,8 +51,8 @@ const char *PYQT_DATAVISUALIZATION_VERSION_STR; %ModuleCode -static int PYQT_DATAVISUALIZATION_VERSION = 0x060500; -static const char *PYQT_DATAVISUALIZATION_VERSION_STR = "6.5.0"; +static int PYQT_DATAVISUALIZATION_VERSION = 0x060600; +static const char *PYQT_DATAVISUALIZATION_VERSION_STR = "6.6.0"; %End %Include q3dbars.sip ++++++ support-python3.6.patch ++++++ --- /var/tmp/diff_new_pack.GDr3ka/_old 2023-11-01 22:10:41.593251607 +0100 +++ /var/tmp/diff_new_pack.GDr3ka/_new 2023-11-01 22:10:41.597251755 +0100 @@ -1,11 +1,11 @@ -Index: PyQt6_DataVisualization-6.5.0/PKG-INFO +Index: PyQt6_DataVisualization-6.6.0/PKG-INFO =================================================================== ---- PyQt6_DataVisualization-6.5.0.orig/PKG-INFO -+++ PyQt6_DataVisualization-6.5.0/PKG-INFO +--- PyQt6_DataVisualization-6.6.0.orig/PKG-INFO ++++ PyQt6_DataVisualization-6.6.0/PKG-INFO @@ -1,7 +1,7 @@ Metadata-Version: 2.1 Name: PyQt6-DataVisualization - Version: 6.5.0 + Version: 6.6.0 -Requires-Python: >=3.7 +Requires-Python: >=3.6 Summary: Python bindings for the Qt Data Visualization library

1 0

commit python-PyQt6-NetworkAuth for openSUSE:Factory
by Source-Sync 01 Nov '23

01 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-PyQt6-NetworkAuth for openSUSE:Factory checked in at 2023-11-01 22:09:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-PyQt6-NetworkAuth (Old) and /work/SRC/openSUSE:Factory/.python-PyQt6-NetworkAuth.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-PyQt6-NetworkAuth" Wed Nov 1 22:09:53 2023 rev:8 rq:1121502 version:6.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-PyQt6-NetworkAuth/python-PyQt6-NetworkAuth.changes 2023-04-27 20:01:09.666005455 +0200 +++ /work/SRC/openSUSE:Factory/.python-PyQt6-NetworkAuth.new.17445/python-PyQt6-NetworkAuth.changes 2023-11-01 22:10:38.973154546 +0100 @@ -1,0 +2,6 @@ +Mon Oct 30 14:39:49 UTC 2023 - Markéta Machová <mmachova(a)suse.com> + +- Update to 6.6.0 + * This adds support for Qt v6.6. + +------------------------------------------------------------------- Old: ---- PyQt6_NetworkAuth-6.5.0.tar.gz New: ---- PyQt6_NetworkAuth-6.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PyQt6-NetworkAuth.spec ++++++ --- /var/tmp/diff_new_pack.33R2f0/_old 2023-11-01 22:10:39.761183738 +0100 +++ /var/tmp/diff_new_pack.33R2f0/_new 2023-11-01 22:10:39.765183886 +0100 @@ -20,7 +20,7 @@ %define mname PyQt6-%{qtlib} %define pyqt_build_for_qt6 1 Name: python-%{mname} -Version: 6.5.0 +Version: 6.6.0 Release: 0 Summary: Python bindings for the Qt Network Authorization library License: GPL-3.0-only ++++++ PyQt6_NetworkAuth-6.5.0.tar.gz -> PyQt6_NetworkAuth-6.6.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_NetworkAuth-6.5.0/ChangeLog new/PyQt6_NetworkAuth-6.6.0/ChangeLog --- old/PyQt6_NetworkAuth-6.5.0/ChangeLog 2023-04-04 17:22:32.448360000 +0200 +++ new/PyQt6_NetworkAuth-6.6.0/ChangeLog 2023-10-25 12:24:15.555321000 +0200 @@ -1,3 +1,15 @@ +2023-10-22 Phil Thompson <phil(a)riverbankcomputing.com> + + * NEWS, PyQt6-NetworkAuth.msp: + Updated for Qt v6.6. + [dc9c78d01cb5] [6.6.0] + +2023-04-04 Phil Thompson <phil(a)riverbankcomputing.com> + + * .hgtags: + Added tag 6.5.0 for changeset b75be9d64045 + [771efcd5ffcf] + 2023-03-31 Phil Thompson <phil(a)riverbankcomputing.com> * NEWS, PyQt6-NetworkAuth.msp: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_NetworkAuth-6.5.0/NEWS new/PyQt6_NetworkAuth-6.6.0/NEWS --- old/PyQt6_NetworkAuth-6.5.0/NEWS 2023-04-04 17:22:08.530599000 +0200 +++ new/PyQt6_NetworkAuth-6.6.0/NEWS 2023-10-25 12:23:49.612040000 +0200 @@ -1,3 +1,6 @@ +v6.6.0 22nd October 2023 + - Added support for Qt v6.6. + v6.5.0 31st March 2023 - Added support for Qt v6.5. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_NetworkAuth-6.5.0/PKG-INFO new/PyQt6_NetworkAuth-6.6.0/PKG-INFO --- old/PyQt6_NetworkAuth-6.5.0/PKG-INFO 2023-04-04 17:22:32.880674100 +0200 +++ new/PyQt6_NetworkAuth-6.6.0/PKG-INFO 2023-10-25 12:24:16.028390200 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: PyQt6-NetworkAuth -Version: 6.5.0 +Version: 6.6.0 Requires-Python: >=3.7 Summary: Python bindings for the Qt Network Authorization library Home-Page: https://www.riverbankcomputing.com/software/pyqtnetworkauth/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_NetworkAuth-6.5.0/pyproject.toml new/PyQt6_NetworkAuth-6.6.0/pyproject.toml --- old/PyQt6_NetworkAuth-6.5.0/pyproject.toml 2023-04-04 17:22:32.449808000 +0200 +++ new/PyQt6_NetworkAuth-6.6.0/pyproject.toml 2023-10-25 12:24:15.557282700 +0200 @@ -6,7 +6,7 @@ # Specify the PEP 566 metadata for the project. [tool.sip.metadata] name = "PyQt6-NetworkAuth" -version = "6.5.0" +version = "6.6.0" summary = "Python bindings for the Qt Network Authorization library" home-page = "https://www.riverbankcomputing.com/software/pyqtnetworkauth/" author = "Riverbank Computing Limited" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_NetworkAuth-6.5.0/sip/QtNetworkAuth/QtNetworkAuthmod.sip new/PyQt6_NetworkAuth-6.6.0/sip/QtNetworkAuth/QtNetworkAuthmod.sip --- old/PyQt6_NetworkAuth-6.5.0/sip/QtNetworkAuth/QtNetworkAuthmod.sip 2023-04-04 17:22:32.706021800 +0200 +++ new/PyQt6_NetworkAuth-6.6.0/sip/QtNetworkAuth/QtNetworkAuthmod.sip 2023-10-25 12:24:15.829358600 +0200 @@ -25,7 +25,7 @@ %Import QtCore/QtCoremod.sip %Import QtNetwork/QtNetworkmod.sip -%Timeline {QtNetworkAuth_6_0_0 QtNetworkAuth_6_1_0 QtNetworkAuth_6_2_0 QtNetworkAuth_6_3_0 QtNetworkAuth_6_4_0 QtNetworkAuth_6_5_0} +%Timeline {QtNetworkAuth_6_0_0 QtNetworkAuth_6_1_0 QtNetworkAuth_6_2_0 QtNetworkAuth_6_3_0 QtNetworkAuth_6_4_0 QtNetworkAuth_6_5_0 QtNetworkAuth_6_6_0} %Copying Copyright (c) 2023 Riverbank Computing Limited <info(a)riverbankcomputing.com> @@ -52,8 +52,8 @@ const char *PYQT_NETWORKAUTH_VERSION_STR; %ModuleCode -static int PYQT_NETWORKAUTH_VERSION = 0x060500; -static const char *PYQT_NETWORKAUTH_VERSION_STR = "6.5.0"; +static int PYQT_NETWORKAUTH_VERSION = 0x060600; +static const char *PYQT_NETWORKAUTH_VERSION_STR = "6.6.0"; %End %Include qabstractoauth.sip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_NetworkAuth-6.5.0/sip/QtNetworkAuth/qabstractoauthreplyhandler.sip new/PyQt6_NetworkAuth-6.6.0/sip/QtNetworkAuth/qabstractoauthreplyhandler.sip --- old/PyQt6_NetworkAuth-6.5.0/sip/QtNetworkAuth/qabstractoauthreplyhandler.sip 2023-04-04 17:22:32.705016400 +0200 +++ new/PyQt6_NetworkAuth-6.6.0/sip/QtNetworkAuth/qabstractoauthreplyhandler.sip 2023-10-25 12:24:15.828303300 +0200 @@ -39,4 +39,7 @@ void tokensReceived(const QVariantMap &tokens); void replyDataReceived(const QByteArray &data); void callbackDataReceived(const QByteArray &data); +%If (QtNetworkAuth_6_6_0 -) + void tokenRequestErrorOccurred(QAbstractOAuth::Error error, const QString &errorString); +%End }; ++++++ support-python3.6.patch ++++++ --- /var/tmp/diff_new_pack.33R2f0/_old 2023-11-01 22:10:39.841186702 +0100 +++ /var/tmp/diff_new_pack.33R2f0/_new 2023-11-01 22:10:39.841186702 +0100 @@ -1,11 +1,11 @@ Index: PyQt6_NetworkAuth-6.5.0/PKG-INFO =================================================================== ---- PyQt6_NetworkAuth-6.5.0.orig/PKG-INFO -+++ PyQt6_NetworkAuth-6.5.0/PKG-INFO +--- PyQt6_NetworkAuth-6.6.0.orig/PKG-INFO ++++ PyQt6_NetworkAuth-6.6.0/PKG-INFO @@ -1,7 +1,7 @@ Metadata-Version: 2.1 Name: PyQt6-NetworkAuth - Version: 6.5.0 + Version: 6.6.0 -Requires-Python: >=3.7 +Requires-Python: >=3.6 Summary: Python bindings for the Qt Network Authorization library

1 0

commit python-PyQt6-Charts for openSUSE:Factory
by Source-Sync 01 Nov '23

01 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-PyQt6-Charts for openSUSE:Factory checked in at 2023-11-01 22:09:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-PyQt6-Charts (Old) and /work/SRC/openSUSE:Factory/.python-PyQt6-Charts.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-PyQt6-Charts" Wed Nov 1 22:09:52 2023 rev:9 rq:1121501 version:6.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-PyQt6-Charts/python-PyQt6-Charts.changes 2023-04-27 20:01:07.729994074 +0200 +++ /work/SRC/openSUSE:Factory/.python-PyQt6-Charts.new.17445/python-PyQt6-Charts.changes 2023-11-01 22:10:38.081121500 +0100 @@ -1,0 +2,6 @@ +Mon Oct 30 14:34:54 UTC 2023 - Markéta Machová <mmachova(a)suse.com> + +- Update to version 6.6.0 + * This adds support for Qt v6.6. + +------------------------------------------------------------------- Old: ---- PyQt6_Charts-6.5.0.tar.gz New: ---- PyQt6_Charts-6.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PyQt6-Charts.spec ++++++ --- /var/tmp/diff_new_pack.AkeY4u/_old 2023-11-01 22:10:38.733145655 +0100 +++ /var/tmp/diff_new_pack.AkeY4u/_new 2023-11-01 22:10:38.733145655 +0100 @@ -21,7 +21,7 @@ %define pyqt_build_for_qt6 1 %define plainpython python Name: python-%{mname} -Version: 6.5.0 +Version: 6.6.0 Release: 0 Summary: Python bindings for the Qt Charts library License: GPL-3.0-only ++++++ PyQt6_Charts-6.5.0.tar.gz -> PyQt6_Charts-6.6.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_Charts-6.5.0/ChangeLog new/PyQt6_Charts-6.6.0/ChangeLog --- old/PyQt6_Charts-6.5.0/ChangeLog 2023-04-04 17:21:12.851539100 +0200 +++ new/PyQt6_Charts-6.6.0/ChangeLog 2023-10-25 12:22:49.573891200 +0200 @@ -1,3 +1,15 @@ +2023-10-22 Phil Thompson <phil(a)riverbankcomputing.com> + + * NEWS, PyQt6-Charts.msp: + Updated for Qt v6.6. + [117d52b9b18f] [6.6.0] + +2023-04-04 Phil Thompson <phil(a)riverbankcomputing.com> + + * .hgtags: + Added tag 6.5.0 for changeset 80730b8fbcef + [789b97448939] + 2023-03-31 Phil Thompson <phil(a)riverbankcomputing.com> * NEWS, PyQt6-Charts.msp: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_Charts-6.5.0/NEWS new/PyQt6_Charts-6.6.0/NEWS --- old/PyQt6_Charts-6.5.0/NEWS 2023-04-04 17:19:46.373401000 +0200 +++ new/PyQt6_Charts-6.6.0/NEWS 2023-10-25 12:21:18.154686000 +0200 @@ -1,3 +1,6 @@ +v6.6.0 22nd October 2023 + - Added support for Qt v6.6. + v6.5.0 31st March 2023 - Added support for Qt v6.5. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_Charts-6.5.0/PKG-INFO new/PyQt6_Charts-6.6.0/PKG-INFO --- old/PyQt6_Charts-6.5.0/PKG-INFO 2023-04-04 17:21:13.516805000 +0200 +++ new/PyQt6_Charts-6.6.0/PKG-INFO 2023-10-25 12:22:50.291886600 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: PyQt6-Charts -Version: 6.5.0 +Version: 6.6.0 Requires-Python: >=3.7 Summary: Python bindings for the Qt Charts library Home-Page: https://www.riverbankcomputing.com/software/pyqtchart/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_Charts-6.5.0/pyproject.toml new/PyQt6_Charts-6.6.0/pyproject.toml --- old/PyQt6_Charts-6.5.0/pyproject.toml 2023-04-04 17:21:12.852815400 +0200 +++ new/PyQt6_Charts-6.6.0/pyproject.toml 2023-10-25 12:22:49.575826400 +0200 @@ -6,7 +6,7 @@ # Specify the PEP 566 metadata for the project. [tool.sip.metadata] name = "PyQt6-Charts" -version = "6.5.0" +version = "6.6.0" summary = "Python bindings for the Qt Charts library" home-page = "https://www.riverbankcomputing.com/software/pyqtchart/" author = "Riverbank Computing Limited" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_Charts-6.5.0/sip/QtCharts/QtChartsmod.sip new/PyQt6_Charts-6.6.0/sip/QtCharts/QtChartsmod.sip --- old/PyQt6_Charts-6.5.0/sip/QtCharts/QtChartsmod.sip 2023-04-04 17:21:13.283779900 +0200 +++ new/PyQt6_Charts-6.6.0/sip/QtCharts/QtChartsmod.sip 2023-10-25 12:22:50.029009000 +0200 @@ -25,7 +25,7 @@ %Import QtGui/QtGuimod.sip %Import QtWidgets/QtWidgetsmod.sip -%Timeline {QtCharts_6_0_0 QtCharts_6_1_0 QtCharts_6_2_0 QtCharts_6_3_0 QtCharts_6_4_0 QtCharts_6_5_0} +%Timeline {QtCharts_6_0_0 QtCharts_6_1_0 QtCharts_6_2_0 QtCharts_6_3_0 QtCharts_6_4_0 QtCharts_6_5_0 QtCharts_6_6_0} %Copying Copyright (c) 2023 Riverbank Computing Limited <info(a)riverbankcomputing.com> @@ -52,8 +52,8 @@ const char *PYQT_CHART_VERSION_STR; %ModuleCode -static int PYQT_CHART_VERSION = 0x060500; -static const char *PYQT_CHART_VERSION_STR = "6.5.0"; +static int PYQT_CHART_VERSION = 0x060600; +static const char *PYQT_CHART_VERSION_STR = "6.6.0"; %End %Include qabstractaxis.sip ++++++ support-python3.6.patch ++++++ --- /var/tmp/diff_new_pack.AkeY4u/_old 2023-11-01 22:10:38.813148618 +0100 +++ /var/tmp/diff_new_pack.AkeY4u/_new 2023-11-01 22:10:38.817148766 +0100 @@ -1,11 +1,11 @@ -Index: PyQt6_Charts-6.5.0/PKG-INFO +Index: PyQt6_Charts-6.6.0/PKG-INFO =================================================================== ---- PyQt6_Charts-6.5.0.orig/PKG-INFO -+++ PyQt6_Charts-6.5.0/PKG-INFO +--- PyQt6_Charts-6.6.0.orig/PKG-INFO ++++ PyQt6_Charts-6.6.0/PKG-INFO @@ -1,7 +1,7 @@ Metadata-Version: 2.1 Name: PyQt6-Charts - Version: 6.5.0 + Version: 6.6.0 -Requires-Python: >=3.7 +Requires-Python: >=3.6 Summary: Python bindings for the Qt Charts library

1 0

commit python-PyQt6-WebEngine for openSUSE:Factory
by Source-Sync 01 Nov '23

01 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-PyQt6-WebEngine for openSUSE:Factory checked in at 2023-11-01 22:09:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-PyQt6-WebEngine (Old) and /work/SRC/openSUSE:Factory/.python-PyQt6-WebEngine.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-PyQt6-WebEngine" Wed Nov 1 22:09:51 2023 rev:10 rq:1121500 version:6.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-PyQt6-WebEngine/python-PyQt6-WebEngine.changes 2023-06-30 19:59:54.646014088 +0200 +++ /work/SRC/openSUSE:Factory/.python-PyQt6-WebEngine.new.17445/python-PyQt6-WebEngine.changes 2023-11-01 22:10:36.209052150 +0100 @@ -1,0 +2,6 @@ +Mon Oct 30 14:42:29 UTC 2023 - Markéta Machová <mmachova(a)suse.com> + +- Update to 6.6.0 + * This adds support for Qt v6.6. + +------------------------------------------------------------------- Old: ---- PyQt6_WebEngine-6.5.0.tar.gz New: ---- PyQt6_WebEngine-6.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PyQt6-WebEngine.spec ++++++ --- /var/tmp/diff_new_pack.hh54tj/_old 2023-11-01 22:10:37.181088159 +0100 +++ /var/tmp/diff_new_pack.hh54tj/_new 2023-11-01 22:10:37.185088308 +0100 @@ -21,7 +21,7 @@ %define pyqt_build_for_qt6 1 %{?sle15_python_module_pythons} Name: python-%{mname} -Version: 6.5.0 +Version: 6.6.0 Release: 0 Summary: Python bindings for the Qt WebEngine framework License: GPL-3.0-only ++++++ PyQt6_WebEngine-6.5.0.tar.gz -> PyQt6_WebEngine-6.6.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_WebEngine-6.5.0/ChangeLog new/PyQt6_WebEngine-6.6.0/ChangeLog --- old/PyQt6_WebEngine-6.5.0/ChangeLog 2023-04-04 17:25:06.752939500 +0200 +++ new/PyQt6_WebEngine-6.6.0/ChangeLog 2023-10-25 12:26:54.015344400 +0200 @@ -1,3 +1,21 @@ +2023-10-25 Phil Thompson <phil(a)riverbankcomputing.com> + + * NEWS, rb-product.toml: + Removed an out of date entry in the product file. + [6b4eda057dbf] [6.6.0] + +2023-10-22 Phil Thompson <phil(a)riverbankcomputing.com> + + * NEWS, PyQt6-WebEngine.msp: + Updated for Qt v6.6. + [618f2f9800e9] + +2023-04-04 Phil Thompson <phil(a)riverbankcomputing.com> + + * .hgtags: + Added tag 6.5.0 for changeset 105702805a7a + [d3ffa12ad593] + 2023-03-31 Phil Thompson <phil(a)riverbankcomputing.com> * NEWS, PyQt6-WebEngine.msp: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_WebEngine-6.5.0/NEWS new/PyQt6_WebEngine-6.6.0/NEWS --- old/PyQt6_WebEngine-6.5.0/NEWS 2023-04-04 17:22:33.896329000 +0200 +++ new/PyQt6_WebEngine-6.6.0/NEWS 2023-10-25 12:24:17.227279000 +0200 @@ -1,3 +1,6 @@ +v6.6.0 25th October 2023 + - Added support for Qt v6.6. + v6.5.0 31st March 2023 - Added support for Qt v6.5. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_WebEngine-6.5.0/PKG-INFO new/PyQt6_WebEngine-6.6.0/PKG-INFO --- old/PyQt6_WebEngine-6.5.0/PKG-INFO 2023-04-04 17:25:07.309887200 +0200 +++ new/PyQt6_WebEngine-6.6.0/PKG-INFO 2023-10-25 12:26:54.697385500 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: PyQt6-WebEngine -Version: 6.5.0 +Version: 6.6.0 Requires-Python: >=3.7 Summary: Python bindings for the Qt WebEngine framework Home-Page: https://www.riverbankcomputing.com/software/pyqtwebengine/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_WebEngine-6.5.0/pyproject.toml new/PyQt6_WebEngine-6.6.0/pyproject.toml --- old/PyQt6_WebEngine-6.5.0/pyproject.toml 2023-04-04 17:25:06.754313700 +0200 +++ new/PyQt6_WebEngine-6.6.0/pyproject.toml 2023-10-25 12:26:54.017134200 +0200 @@ -6,7 +6,7 @@ # Specify the PEP 566 metadata for the project. [tool.sip.metadata] name = "PyQt6-WebEngine" -version = "6.5.0" +version = "6.6.0" summary = "Python bindings for the Qt WebEngine framework" home-page = "https://www.riverbankcomputing.com/software/pyqtwebengine/" author = "Riverbank Computing Limited" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/QtWebEngineCoremod.sip new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/QtWebEngineCoremod.sip --- old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/QtWebEngineCoremod.sip 2023-04-04 17:25:07.124042700 +0200 +++ new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/QtWebEngineCoremod.sip 2023-10-25 12:26:54.460937300 +0200 @@ -27,7 +27,7 @@ %Import QtNetwork/QtNetworkmod.sip %Import QtWebChannel/QtWebChannelmod.sip -%Timeline {QtWebEngine_6_0_0 QtWebEngine_6_1_0 QtWebEngine_6_2_0 QtWebEngine_6_3_0 QtWebEngine_6_4_0 QtWebEngine_6_5_0} +%Timeline {QtWebEngine_6_0_0 QtWebEngine_6_1_0 QtWebEngine_6_2_0 QtWebEngine_6_3_0 QtWebEngine_6_4_0 QtWebEngine_6_5_0 QtWebEngine_6_6_0} %Copying Copyright (c) 2023 Riverbank Computing Limited <info(a)riverbankcomputing.com> @@ -54,8 +54,8 @@ const char *PYQT_WEBENGINE_VERSION_STR; %ModuleCode -static int PYQT_WEBENGINE_VERSION = 0x060500; -static const char *PYQT_WEBENGINE_VERSION_STR = "6.5.0"; +static int PYQT_WEBENGINE_VERSION = 0x060600; +static const char *PYQT_WEBENGINE_VERSION_STR = "6.6.0"; %End %Include qtwebenginecoreglobal.sip @@ -68,6 +68,7 @@ %Include qwebenginefilesystemaccessrequest.sip %Include qwebenginefindtextresult.sip %Include qwebenginefullscreenrequest.sip +%Include qwebengineglobalsettings.sip %Include qwebenginehistory.sip %Include qwebenginehttprequest.sip %Include qwebengineloadinginfo.sip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qtwebenginecoreglobal.sip new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qtwebenginecoreglobal.sip --- old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qtwebenginecoreglobal.sip 2023-04-04 17:25:07.133484100 +0200 +++ new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qtwebenginecoreglobal.sip 2023-10-25 12:26:54.471652700 +0200 @@ -38,3 +38,6 @@ %If (QtWebEngine_6_5_0 -) const char *qWebEngineProcessName(); %End +%If (QtWebEngine_6_6_0 -) +QString qWebEngineGetDomainAndRegistry(const QUrl &url); +%End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qwebengineglobalsettings.sip new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qwebengineglobalsettings.sip --- old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qwebengineglobalsettings.sip 1970-01-01 01:00:00.000000000 +0100 +++ new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qwebengineglobalsettings.sip 2023-10-25 12:26:54.469471500 +0200 @@ -0,0 +1,49 @@ +// qwebengineglobalsettings.sip generated by MetaSIP +// +// This file is part of the QtWebEngineCore Python extension module. +// +// Copyright (c) 2023 Riverbank Computing Limited <info(a)riverbankcomputing.com> +// +// This file is part of PyQt6-WebEngine. +// +// This file may be used under the terms of the GNU General Public License +// version 3.0 as published by the Free Software Foundation and appearing in +// the file LICENSE included in the packaging of this file. Please review the +// following information to ensure the GNU General Public License version 3.0 +// requirements will be met: http://www.gnu.org/copyleft/gpl.html. +// +// If you do not wish to use this file under the terms of the GPL version 3.0 +// then you may purchase a commercial license. For more information contact +// info(a)riverbankcomputing.com. +// +// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + +%If (QtWebEngine_6_6_0 -) + +namespace QWebEngineGlobalSettings +{ +%TypeHeaderCode +#include <qwebengineglobalsettings.h> +%End + + enum class SecureDnsMode + { + SystemOnly, + SecureWithFallback, + SecureOnly, + }; + + struct DnsMode + { +%TypeHeaderCode +#include <qwebengineglobalsettings.h> +%End + + QWebEngineGlobalSettings::SecureDnsMode secureMode; + QStringList serverTemplates; + }; +}; + +%End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qwebengineloadinginfo.sip new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qwebengineloadinginfo.sip --- old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qwebengineloadinginfo.sip 2023-04-04 17:25:07.132276800 +0200 +++ new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qwebengineloadinginfo.sip 2023-10-25 12:26:54.470176200 +0200 @@ -49,6 +49,15 @@ %End }; +private: +%If (QtWebEngine_6_6_0 -) + QWebEngineLoadingInfo(const QUrl &url, QWebEngineLoadingInfo::LoadStatus status, bool isErrorPage = false, const QString &errorString = QString(), int errorCode = 0, QWebEngineLoadingInfo::ErrorDomain errorDomain = QWebEngineLoadingInfo::NoErrorDomain, const QMultiMap<QByteArray, QByteArray> &responseHeaders = {}); +%End +%If (- QtWebEngine_6_6_0) + QWebEngineLoadingInfo(const QUrl &url, QWebEngineLoadingInfo::LoadStatus status, bool isErrorPage = false, const QString &errorString = QString(), int errorCode = 0, QWebEngineLoadingInfo::ErrorDomain errorDomain = QWebEngineLoadingInfo::NoErrorDomain); +%End + +public: QWebEngineLoadingInfo(const QWebEngineLoadingInfo &other); ~QWebEngineLoadingInfo(); QUrl url() const; @@ -57,7 +66,7 @@ QString errorString() const; QWebEngineLoadingInfo::ErrorDomain errorDomain() const; int errorCode() const; - -private: - QWebEngineLoadingInfo(const QUrl &url, QWebEngineLoadingInfo::LoadStatus status, bool isErrorPage = false, const QString &errorString = QString(), int errorCode = 0, QWebEngineLoadingInfo::ErrorDomain errorDomain = QWebEngineLoadingInfo::NoErrorDomain); +%If (QtWebEngine_6_6_0 -) + QMultiMap<QByteArray, QByteArray> responseHeaders() const; +%End }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qwebenginepage.sip new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qwebenginepage.sip --- old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qwebenginepage.sip 2023-04-04 17:25:07.130143400 +0200 +++ new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qwebenginepage.sip 2023-10-25 12:26:54.467186000 +0200 @@ -75,6 +75,12 @@ Outdent, InsertOrderedList, InsertUnorderedList, +%If (QtWebEngine_6_6_0 -) + ChangeTextDirectionLTR, +%End +%If (QtWebEngine_6_6_0 -) + ChangeTextDirectionRTL, +%End }; enum FindFlag /BaseType=Flag/ @@ -456,4 +462,9 @@ %If (QtWebEngine_6_4_0 -) void fileSystemAccessRequested(QWebEngineFileSystemAccessRequest request); %End + +public: +%If (QtWebEngine_6_6_0 -) + QString devToolsId() const; +%End }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qwebenginesettings.sip new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qwebenginesettings.sip --- old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qwebenginesettings.sip 2023-04-04 17:25:07.133041900 +0200 +++ new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qwebenginesettings.sip 2023-10-25 12:26:54.471067400 +0200 @@ -74,6 +74,9 @@ %If (QtWebEngine_6_4_0 -) NavigateOnDropEnabled, %End +%If (QtWebEngine_6_6_0 -) + ReadingFromCanvasEnabled, +%End }; enum FontSize diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qwebengineurlrequestinterceptor.sip new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qwebengineurlrequestinterceptor.sip --- old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qwebengineurlrequestinterceptor.sip 2023-04-04 17:25:07.114900000 +0200 +++ new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qwebengineurlrequestinterceptor.sip 2023-10-25 12:26:54.450787000 +0200 @@ -29,4 +29,7 @@ public: explicit QWebEngineUrlRequestInterceptor(QObject *parent /TransferThis/ = 0); virtual void interceptRequest(QWebEngineUrlRequestInfo &info) = 0; +%If (QtWebEngine_6_6_0 -) + virtual ~QWebEngineUrlRequestInterceptor(); +%End }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qwebengineurlrequestjob.sip new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qwebengineurlrequestjob.sip --- old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qwebengineurlrequestjob.sip 2023-04-04 17:25:07.121447600 +0200 +++ new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qwebengineurlrequestjob.sip 2023-10-25 12:26:54.458040500 +0200 @@ -46,4 +46,7 @@ void redirect(const QUrl &url); QUrl initiator() const; QMap<QByteArray, QByteArray> requestHeaders() const; +%If (QtWebEngine_6_6_0 -) + void setAdditionalResponseHeaders(const QMultiMap<QByteArray, QByteArray> &additionalResponseHeaders) const; +%End }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qwebengineurlscheme.sip new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qwebengineurlscheme.sip --- old/PyQt6_WebEngine-6.5.0/sip/QtWebEngineCore/qwebengineurlscheme.sip 2023-04-04 17:25:07.122965000 +0200 +++ new/PyQt6_WebEngine-6.6.0/sip/QtWebEngineCore/qwebengineurlscheme.sip 2023-10-25 12:26:54.459746400 +0200 @@ -50,6 +50,9 @@ ViewSourceAllowed, ContentSecurityPolicyIgnored, CorsEnabled, +%If (QtWebEngine_6_6_0 -) + FetchApiAllowed, +%End }; typedef QFlags<QWebEngineUrlScheme::Flag> Flags; ++++++ support-python3.6.patch ++++++ --- /var/tmp/diff_new_pack.hh54tj/_old 2023-11-01 22:10:37.261091123 +0100 +++ /var/tmp/diff_new_pack.hh54tj/_new 2023-11-01 22:10:37.261091123 +0100 @@ -1,11 +1,11 @@ -Index: PyQt6_WebEngine-6.4.0/PKG-INFO +Index: PyQt6_WebEngine-6.6.0/PKG-INFO =================================================================== ---- PyQt6_WebEngine-6.4.0.orig/PKG-INFO -+++ PyQt6_WebEngine-6.4.0/PKG-INFO +--- PyQt6_WebEngine-6.6.0.orig/PKG-INFO ++++ PyQt6_WebEngine-6.6.0/PKG-INFO @@ -1,7 +1,7 @@ Metadata-Version: 2.1 Name: PyQt6-WebEngine - Version: 6.5.0 + Version: 6.6.0 -Requires-Python: >=3.7 +Requires-Python: >=3.6 Summary: Python bindings for the Qt WebEngine framework

1 0

commit python-PyQt6 for openSUSE:Factory
by Source-Sync 01 Nov '23

01 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-PyQt6 for openSUSE:Factory checked in at 2023-11-01 22:09:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-PyQt6 (Old) and /work/SRC/openSUSE:Factory/.python-PyQt6.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-PyQt6" Wed Nov 1 22:09:51 2023 rev:19 rq:1121486 version:6.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-PyQt6/python-PyQt6.changes 2023-10-18 21:26:37.954706270 +0200 +++ /work/SRC/openSUSE:Factory/.python-PyQt6.new.17445/python-PyQt6.changes 2023-11-01 22:10:34.376984282 +0100 @@ -1,0 +2,7 @@ +Mon Oct 30 11:14:53 UTC 2023 - Markéta Machová <mmachova(a)suse.com> + +- Update to 6.6.0 + * This adds support for Qt v6.6. +- Drop no longer needed pyqt6-fix-build-with-qt-6.6.0.patch + +------------------------------------------------------------------- Old: ---- PyQt6-6.5.3.tar.gz pyqt6-fix-build-with-qt-6.6.0.patch New: ---- PyQt6-6.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PyQt6.spec ++++++ --- /var/tmp/diff_new_pack.VrWldz/_old 2023-11-01 22:10:35.325019402 +0100 +++ /var/tmp/diff_new_pack.VrWldz/_new 2023-11-01 22:10:35.325019402 +0100 @@ -21,7 +21,7 @@ %define pyqt_build_for_qt6 1 %{?sle15_python_module_pythons} Name: python-%{mname} -Version: 6.5.3 +Version: 6.6.0 Release: 0 Summary: Python bindings for Qt 6 License: GPL-3.0-only OR SUSE-GPL-2.0-with-FLOSS-exception OR NonFree @@ -32,8 +32,6 @@ Patch0: disable-rpaths.diff # PATCH-FIX-OPENSUSE - install binary dbus mainloop integration in arch dependent directory Patch1: 0001-Use-a-noarch-wrapper-for-dbus-mainloop-integration.patch -# PATCH-FIX-OPENSUSE - fix build with Qt 6.6.0 -Patch2: pyqt6-fix-build-with-qt-6.6.0.patch BuildRequires: %{python_module PyQt6-sip >= 13.6} BuildRequires: %{python_module dbus-python-devel >= 0.8} BuildRequires: %{python_module devel} ++++++ PyQt6-6.5.3.tar.gz -> PyQt6-6.6.0.tar.gz ++++++ ++++ 1898 lines of diff (skipped)

1 0

commit python-PyQt6-3D for openSUSE:Factory
by Source-Sync 01 Nov '23

01 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-PyQt6-3D for openSUSE:Factory checked in at 2023-11-01 22:09:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-PyQt6-3D (Old) and /work/SRC/openSUSE:Factory/.python-PyQt6-3D.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-PyQt6-3D" Wed Nov 1 22:09:49 2023 rev:9 rq:1121485 version:6.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-PyQt6-3D/python-PyQt6-3D.changes 2023-04-27 20:01:06.841988854 +0200 +++ /work/SRC/openSUSE:Factory/.python-PyQt6-3D.new.17445/python-PyQt6-3D.changes 2023-11-01 22:10:32.608918784 +0100 @@ -1,0 +2,6 @@ +Mon Oct 30 14:29:23 UTC 2023 - Markéta Machová <mmachova(a)suse.com> + +- Update to 6.6.0 + * This adds support for Qt v6.6. + +------------------------------------------------------------------- Old: ---- PyQt6_3D-6.5.0.tar.gz New: ---- PyQt6_3D-6.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PyQt6-3D.spec ++++++ --- /var/tmp/diff_new_pack.RPWLSI/_old 2023-11-01 22:10:33.416948717 +0100 +++ /var/tmp/diff_new_pack.RPWLSI/_new 2023-11-01 22:10:33.420948865 +0100 @@ -19,7 +19,7 @@ %define mname PyQt6-3D %define pyqt_build_for_qt6 1 Name: python-%{mname} -Version: 6.5.0 +Version: 6.6.0 Release: 0 Summary: Python bindings for the Qt 3D framework License: GPL-3.0-only ++++++ PyQt6_3D-6.5.0.tar.gz -> PyQt6_3D-6.6.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-PyQt6-3D/PyQt6_3D-6.5.0.tar.gz /work/SRC/openSUSE:Factory/.python-PyQt6-3D.new.17445/PyQt6_3D-6.6.0.tar.gz differ: char 5, line 1

1 0

commit matrix-synapse for openSUSE:Factory
by Source-Sync 01 Nov '23

01 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package matrix-synapse for openSUSE:Factory checked in at 2023-11-01 22:09:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/matrix-synapse (Old) and /work/SRC/openSUSE:Factory/.matrix-synapse.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "matrix-synapse" Wed Nov 1 22:09:47 2023 rev:89 rq:1121497 version:1.95.1 Changes: -------- --- /work/SRC/openSUSE:Factory/matrix-synapse/matrix-synapse.changes 2023-10-25 18:03:50.524500024 +0200 +++ /work/SRC/openSUSE:Factory/.matrix-synapse.new.17445/matrix-synapse.changes 2023-11-01 22:10:29.952820389 +0100 @@ -1,0 +2,10 @@ +Tue Oct 31 20:03:55 UTC 2023 - Marcus Rueckert <mrueckert(a)suse.de> + +- Update to 1.95.1 + - Security: + - GHSA-mp92-3jfm-3575 / CVE-2023-43796 — Moderate Severity + Cached device information of remote users can be queried from + Synapse. This can be used to enumerate the remote users known + to a homeserver. + +------------------------------------------------------------------- Old: ---- matrix-synapse-1.95.0.obscpio New: ---- matrix-synapse-1.95.1.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ matrix-synapse-test.spec ++++++ --- /var/tmp/diff_new_pack.I0m63y/_old 2023-11-01 22:10:31.616882035 +0100 +++ /var/tmp/diff_new_pack.I0m63y/_new 2023-11-01 22:10:31.616882035 +0100 @@ -27,7 +27,7 @@ %define pkgname matrix-synapse Name: %{pkgname}-test -Version: 1.95.0 +Version: 1.95.1 Release: 0 Summary: Test package for %{pkgname} License: Apache-2.0 ++++++ matrix-synapse.spec ++++++ --- /var/tmp/diff_new_pack.I0m63y/_old 2023-11-01 22:10:31.644883071 +0100 +++ /var/tmp/diff_new_pack.I0m63y/_new 2023-11-01 22:10:31.648883220 +0100 @@ -157,7 +157,7 @@ %define pkgname matrix-synapse %define eggname matrix_synapse Name: %{pkgname} -Version: 1.95.0 +Version: 1.95.1 Release: 0 Summary: Matrix protocol reference homeserver License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.I0m63y/_old 2023-11-01 22:10:31.700885146 +0100 +++ /var/tmp/diff_new_pack.I0m63y/_new 2023-11-01 22:10:31.704885294 +0100 @@ -4,7 +4,7 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="url">https://github.com/matrix-org/synapse.git</param> <param name="scm">git</param> - <param name="revision">v1.95.0</param> + <param name="revision">v1.95.1</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-replacement">\1</param> <!-- ++++++ cargo_config ++++++ --- /var/tmp/diff_new_pack.I0m63y/_old 2023-11-01 22:10:31.728886183 +0100 +++ /var/tmp/diff_new_pack.I0m63y/_new 2023-11-01 22:10:31.728886183 +0100 @@ -3,5 +3,4 @@ [source.vendored-sources] directory = "vendor" -(No newline at EOF) ++++++ matrix-synapse-1.95.0.obscpio -> matrix-synapse-1.95.1.obscpio ++++++ /work/SRC/openSUSE:Factory/matrix-synapse/matrix-synapse-1.95.0.obscpio /work/SRC/openSUSE:Factory/.matrix-synapse.new.17445/matrix-synapse-1.95.1.obscpio differ: char 49, line 1 ++++++ matrix-synapse.obsinfo ++++++ --- /var/tmp/diff_new_pack.I0m63y/_old 2023-11-01 22:10:31.784888258 +0100 +++ /var/tmp/diff_new_pack.I0m63y/_new 2023-11-01 22:10:31.788888406 +0100 @@ -1,5 +1,5 @@ name: matrix-synapse -version: 1.95.0 -mtime: 1698148862 -commit: 79f48b2b4fd6a90d919dc64f5a8d393c50cd5652 +version: 1.95.1 +mtime: 1698760952 +commit: a11511954a58975d2e5400257a0cecfd27413447 ++++++ vendor.tar.zst ++++++ Binary files /var/tmp/diff_new_pack.I0m63y/_old and /var/tmp/diff_new_pack.I0m63y/_new differ

1 0

commit monitoring-plugins for openSUSE:Factory
by Source-Sync 01 Nov '23

01 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package monitoring-plugins for openSUSE:Factory checked in at 2023-11-01 22:09:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/monitoring-plugins (Old) and /work/SRC/openSUSE:Factory/.monitoring-plugins.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "monitoring-plugins" Wed Nov 1 22:09:45 2023 rev:28 rq:1121479 version:2.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins.changes 2022-10-15 16:41:05.306676951 +0200 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.17445/monitoring-plugins.changes 2023-11-01 22:10:23.516581960 +0100 @@ -1,0 +2,208 @@ +Mon Oct 30 18:19:23 CET 2023 - ro(a)suse.de + +- renamed patches + monitoring-plugins-wrong_return_in_check_swap.patch + to monitoring-plugins-2.3.3-wrong_percent_in_check_swap.patch + monitoring-plugins.check_snmp.arrayaddress.patch + to monitoring-plugins-2.3.3-check_snmp.arrayaddress.patch + monitoring-plugins-2.3-check_ntp_perf_absolute.patch + to monitoring-plugins-2.3.3-check_ntp_perf_absolute.patch + +------------------------------------------------------------------- +Mon Oct 16 13:23:42 UTC 2023 - Thorsten Kukuk <kukuk(a)suse.com> + +- Add buildrequires for coreutils-systemd, as the configure script + checks for uptime [bsc#1216148] + +------------------------------------------------------------------- +Thu Jun 15 14:44:14 UTC 2023 - Thorsten Kukuk <kukuk(a)suse.com> + +- systemd-not-utmp.patch: let check_users prefer systemd-logind + over utmp (jsc#PED-3144) + +------------------------------------------------------------------- +Wed May 31 21:57:07 UTC 2023 - David Disseldorp <ddiss(a)suse.com> + +- Add attach_disconnected flag for usr.lib.nagios.plugins.check_procs + and usr.lib.nagios.plugins.check_procs.sle15 apparmor profiles to + permit /proc/PID/exe access; (bsc#1209194) + +------------------------------------------------------------------- +Thu Apr 13 15:27:12 UTC 2023 - Lars Vogdt <lars(a)linux-schulserver.de> - 2.3.3 + +- added monitoring-plugins-2.3.3-check_icmp.patch + Simple patch to avoid compiler errors with latest gcc +- removed monitoring-plugins-2.3.1-fixing-shellcheck.patch - upstream +- renamed monitoring-plugins-2.2-mariadb_102_build_fix.patch + to monitoring-plugins-2.3.3-mariadb_102_build_fix.patch + +------------------------------------------------------------------- +Wed Apr 12 20:54:19 UTC 2023 - Archie Cobbs <archie.cobbs(a)gmail.com> + +- added monitoring-plugins-2.3.3-check_http-proxy.patch + Fixes a check_http bug when trying to follow a redirect + returned from a URL retrieved via SSL proxy (issue #1764) + +------------------------------------------------------------------- +Wed Apr 12 17:35:53 UTC 2023 - Lars Vogdt <lars(a)linux-schulserver.de> - 2.3.3 + +- finally remove monitoring-plugins-1.4.6-Makefile_-_no_chown.patch: + obsoleted by monitoring-plugins-2.3.3-root-plugins-Makefile_-_no_chown.patch +- monitoring-plugins-2.1.1-check_log_-_quoting.patch renamed to + monitoring-plugins-2.3.3-check_log_-_quoting.patch + +------------------------------------------------------------------- +Thu Feb 2 17:11:00 UTC 2023 - Lars Vogdt <lars(a)linux-schulserver.de> - 2.3.3 + +- Update to 2.3.3 + Enhancements + General + + using PRId64 and PRIu64 instead of %ld directly + Single Plugins + + check_http: Make faster with larger files + + check_snmp: add 'multiplier' to modify current value + + check_http: Implement chunked encoding decoding + + check_http/check_curl: add chunked encoding test + + check_log: Added --exclude to exclude patterns + + check_log: Add tests + + check_disk: Clarify usage possibilites + + Fixes + General + + fixed two PRId64 to PRIu64 in perfdata_uint64 + Single Plugins + + check_pgsql: Removing is_pg_dbname alltogether,using postgres API. + + check_http: Remove superflous CRLF in HTTP-Requests + + check_curl: detect ipv6 + + check_icmp: fix parsing help/version long options + + check_http: fix test plan + + check_disk: Find accessible mount path if multiple are available + + check_apt: Fix unknown escape sequence error output + + check_curl: fix checking large bodys + + check_snmp: Improve tests for check_snmp & multiply option + + check_snmp: always apply format when applying multiplier + + check_http: Use real booleans instead of ints + + check_http: Document process_arguments a little bit better + + check_http: Remove dead code + + check_http: Fix several bug in the implementation of unchunking + + check_http: Reformat a part to increase readability + + check_apt: Put upgrade options in the root sections + + check_apt: Fix comment + + check_apt: Use real booleans + + check_mailq: Fixing nullmailer regex + + check_snmp: Fix regex matches + + check_log: Fixed a bug when using --all + + check_log: Cleaned up duplicated code in the args + + check_http: Fix memory reallocation error in chunk decoding logic + + check_http: Add space for ending NULL byte in array for chunked encoding + +- included changes in 2.3.2 + General + + Use silent automake by default + + Fixes + Single Plugins + + check_by_ssh: added option to exit with an warning, if there is output on STDERR + + check_by_ssh: Add "-U" flag (#1123). + + check_by_ssh: Let ssh decide if a host is valid, enables usage of ssh .config file + + check_curl: Add an option to check_curl to verify the peer certificate & host using the system CA's + + check_curl: fixed -ffollow for HTTP/2.0 (Fixes #1685): added major_version parsing to PicoHTTPParser + + check_curl: fixes check_curl: "CRITICAL - Cannot retrieve certificate subject." + + check_curl: fix if http header contains leading spaces + + check_curl: Update check_curl.c to display a specific human-readable error message where possible + + check_curl: verify certificates option should not force SSL to be used + + check_disk: Description for -M was the wrong way around + + check_disk: Fixing the stuff that is broken on btrfs + + check_disk: Fix perfdata for big values for check disk + + check_disk_smb: Add configfile feature + + check_disk_smb: Add timeout + + check_dns: Add --expect-nxdomain + + check_dns: split multiple IP addresses passed in one -a argument + + check_file_age: Make size parameter a little bit more intelligible + + check_fping: Implements 'host-alive' mode (Closes. #1027) + + check_game: Update Url to qstat + + check_http: changed 'STATE_CRITICAL' to 'STATE_WARNING' for infinite loop + + check_http: Increase regexp limit by @hydrapolic + + check_http: Support http redirect by @waja + + check_icmp: buffer offerflow + + check_icmp: delay set_source_ip() until address_family is detected + + check_icmp: Fix "Invalid Argument" from sendmsg() under FreeBSD 13.1 and "setsockopt failed" for TTL setting + + check_icmp: Fix pkt perfdata in check_host mode + + check_ldap: Allows check_ldap to read password from environment variable + + check_load: add LOAD prefix to load plugin + + check_load: Display total and scaled load values if check_load scales the values by number of CPUs + + check_log: Missing oldlog now aborts check_log + + check_mailq: Add mailq -C option for config dir or config file + + check_mailq: Check mailq domain specific warnings + + check_mailq: Fix regexp for nullmailer "mailq" output + + check_mysql: fix segfaults with mysql-connector-c #1562 + + check_pgsql: add --queryname parameter to check_pgsql + + check_ping: Do not show RTA if no connection was possible + + check_ping: understang ping6 output from iputils package + + check_proc: Fix check proc ps detection + + check_procs: exchange needle and haystack in strstr() for proper state match + + check_smtp: add -L flag to support LMTP (LHLO instead of HELO/EHLO). + + check_snmp: Added option for null zero length string exit codes + + check_snmp: fix performance thresholds when using multiple oids + + check_snmp fix segfaults + + check_snmp: put the "c" (to mark a counter) after the perfdata value + + check_swap: fix parsing swap values + + check_swap: Fix perfdata for check swap + + check_swap: Fix unit for total in perfdata + + check_swap: Handle cached swap + + check_swap: Small fix to threshold validation and style (indentation) fixes + + check_ups: Fix possible overflow in check_ups + + check_uptime: Add option to report uptime in days instead of seconds + + check_uptime: Fix/improve output message "Uptime is ..." + + Multiple Plugins + + check_http, check_curl: added --max-redirs=N option (feature #1684) + + check_http, check_curl: Enhancement --continue-after-certificate (backport from nagios-plugins) + + check_http, check_curl: Remove check_http and check_curl test which are somehow always failing + + check_log, check_oracle, check_sensors: Several fixes shellcheck complaining about + + sslutils: use chain from client certificates + + Non functional changes + + Trivial source code whitespace formatting fixes to standard. + + docs: fix simple typo, conspicuosly -> conspicuously + + Migrate to GitHub actions + + Point to Icinga Exchange instead of dead Monitoring Exchange + + github actions: fix check_users test case + + Add CodeQL checks + + Fix some QL problems + + Update CodeQL and update runner before installing + + check_disk: Check disk compiler warnings + + check_disk: Trivial printf fix and a little bit of code style + + check_http: Docs: make -C obvious + + check_ifoperstatus: Re-attach a comment to where it actually belongs + + check_ircd: Restrict the nickname length of the test user for check_ircd + + check_load: Check load compiler warnings + + check_log Modernize check log + + check_mailq: remove duplicate W=i/C=i args in check_mailq.pl + + check_ntp: Check ntp remove unused variables + + check_pgsql: Using snprintf which honors the buffers size and guarantees null temination. (Closes: #1601) + + check_procs: Fix double percentage sign in usage + + check_sensors.sh: Make shellcheck happier + + check_snmp: Fixed option description authpassword -> authpasswd + whitespaces + + check_swap: Check swap compiler warnings + +- refreshed monitoring-plugins-1.4.6-Makefile_-_no_chown.patch + -> monitoring-plugins-2.3.3-root-plugins-Makefile_-_no_chown.patch +- refreshed monitoring-plugins-2.3.1-check_ssh.patch + -> monitoring-plugins-2.3.3-check_ssh.patch +- refreshed monitoring-plugins-2.3.1-check_dhcp_-_detect_rogue_dhcp_servers.patch + -> monitoring-plugins-2.3.3-check_dhcp_-_detect_rogue_dhcp_servers.patch +- refreshed monitoring-plugins-2.3.1-check_ssh.t_-_improve_testing.patch + -> monitoring-plugins-2.3.3-check_ssh.t_-_improve_testing.patch +- refreshed monitoring-plugins-2.3.1-check_disk_on_btrfs.patch + -> monitoring-plugins-2.3.3-check_disk_on_btrfs.patch +- refreshed monitoring-plugins-2.3.1-check_by_ssh.patch + -> monitoring-plugins-2.3.3-check_by_ssh.patch +- removed monitoring-plugins-too_few_arguments_for_check_disk.patch + -> fixed upstream +- removed monitoring-plugins.check_hpjd.c-64bit-portability-issue.patch + -> fixed upstream +- removed monitoring-plugins-2.3.1-check_snmp_segfaults.patch + -> fixed upstream + +------------------------------------------------------------------- Old: ---- monitoring-plugins-1.4.6-Makefile_-_no_chown.patch monitoring-plugins-2.1.1-check_log_-_quoting.patch monitoring-plugins-2.2-mariadb_102_build_fix.patch monitoring-plugins-2.3-check_ntp_perf_absolute.patch monitoring-plugins-2.3.1-check_by_ssh.patch monitoring-plugins-2.3.1-check_dhcp_-_detect_rogue_dhcp_servers.patch monitoring-plugins-2.3.1-check_disk_on_btrfs.patch monitoring-plugins-2.3.1-check_snmp_segfaults.patch monitoring-plugins-2.3.1-check_ssh.patch monitoring-plugins-2.3.1-check_ssh.t_-_improve_testing.patch monitoring-plugins-2.3.1-fixing-shellcheck.patch monitoring-plugins-2.3.1.tar.gz monitoring-plugins-2.3.1.tar.gz.sha1 monitoring-plugins-too_few_arguments_for_check_disk.patch monitoring-plugins-wrong_return_in_check_swap.patch monitoring-plugins.check_hpjd.c-64bit-portability-issue.patch monitoring-plugins.check_snmp.arrayaddress.patch New: ---- monitoring-plugins-2.3.3-check_by_ssh.patch monitoring-plugins-2.3.3-check_dhcp_-_detect_rogue_dhcp_servers.patch monitoring-plugins-2.3.3-check_disk_on_btrfs.patch monitoring-plugins-2.3.3-check_http-proxy.patch monitoring-plugins-2.3.3-check_icmp.patch monitoring-plugins-2.3.3-check_log_-_quoting.patch monitoring-plugins-2.3.3-check_ntp_perf_absolute.patch monitoring-plugins-2.3.3-check_snmp.arrayaddress.patch monitoring-plugins-2.3.3-check_ssh.patch monitoring-plugins-2.3.3-check_ssh.t_-_improve_testing.patch monitoring-plugins-2.3.3-mariadb_102_build_fix.patch monitoring-plugins-2.3.3-root-plugins-Makefile_-_no_chown.patch monitoring-plugins-2.3.3-wrong_percent_in_check_swap.patch monitoring-plugins-2.3.3.tar.gz monitoring-plugins-2.3.3.tar.gz.sha1 systemd-not-utmp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monitoring-plugins.spec ++++++ --- /var/tmp/diff_new_pack.noQ4EA/_old 2023-11-01 22:10:24.868632046 +0100 +++ /var/tmp/diff_new_pack.noQ4EA/_new 2023-11-01 22:10:24.872632195 +0100 @@ -17,7 +17,7 @@ Name: monitoring-plugins -Version: 2.3.1 +Version: 2.3.3 Release: 0 Summary: The Monitoring Plug-Ins License: GPL-2.0-or-later AND GPL-3.0-only @@ -62,33 +62,32 @@ Source59: nrpe-check_mysql Source60: nrpe-check_ups # PATCH-FIX-UPSTREAM Quote the options comming in from users (path names might contain whitespaces) -Patch1: %{name}-2.1.1-check_log_-_quoting.patch +Patch1: %{name}-2.3.3-check_log_-_quoting.patch # PATH-FIX-openSUSE - do not use/run chown in Makefile: we use RPM for this -Patch6: %{name}-1.4.6-Makefile_-_no_chown.patch +Patch6: %{name}-2.3.3-root-plugins-Makefile_-_no_chown.patch # PATCH-FIX-UPSTREAM Use correct pointer -Patch11: %{name}.check_snmp.arrayaddress.patch -# PATCH-FIX-UPSTREAM print out all arguments out a Group if in verbose mode -Patch15: %{name}-too_few_arguments_for_check_disk.patch -# PATCH-FIX-UPSTREAM port should be integer, not character -Patch118: %{name}.check_hpjd.c-64bit-portability-issue.patch +Patch11: %{name}-2.3.3-check_snmp.arrayaddress.patch # PATCH-FIX-UPSTREAM kstreitova(a)suse.com -- fix build with MariaDB 10.2 -Patch119: monitoring-plugins-2.2-mariadb_102_build_fix.patch +Patch119: %{name}-2.3.3-mariadb_102_build_fix.patch # PATCH-FIX-UPSTREAM see https://bugzilla.redhat.com/512559 -Patch121: %{name}-wrong_return_in_check_swap.patch +Patch121: %{name}-2.3.3-wrong_percent_in_check_swap.patch # PATCH-FIX-UPSTREAM - return ntp offset absolute (as positive value) in performance data since warn and crit are also positive values -Patch122: monitoring-plugins-2.3-check_ntp_perf_absolute.patch -# PATCH-FIX-UPSTREAM - see https://github.com/monitoring-plugins/monitoring-plugins/pull/1589 -Patch123: monitoring-plugins-2.3.1-check_snmp_segfaults.patch -# PATCH-FIX-UPSTREAM - see https://github.com/monitoring-plugins/monitoring-plugins/pull/1459 -Patch124: monitoring-plugins-2.3.1-fixing-shellcheck.patch +Patch122: %{name}-2.3.3-check_ntp_perf_absolute.patch # PATCH-FIX-UPSTREAM - see https://github.com/monitoring-plugins/monitoring-plugins/pull/1322 -Patch125: monitoring-plugins-2.3.1-check_ssh.patch -Patch126: monitoring-plugins-2.3.1-check_ssh.t_-_improve_testing.patch +Patch125: monitoring-plugins-2.3.3-check_ssh.patch +Patch126: monitoring-plugins-2.3.3-check_ssh.t_-_improve_testing.patch # PATCH-FIX-UPSTREAM - see https://github.com/monitoring-plugins/monitoring-plugins/issues/1375 -Patch127: monitoring-plugins-2.3.1-check_dhcp_-_detect_rogue_dhcp_servers.patch -Patch128: monitoring-plugins-2.3.1-check_disk_on_btrfs.patch +Patch127: monitoring-plugins-2.3.3-check_dhcp_-_detect_rogue_dhcp_servers.patch +Patch128: monitoring-plugins-2.3.3-check_disk_on_btrfs.patch # PATCH-FIX-UPSTREAM - see https://github.com/monitoring-plugins/monitoring-plugins/pull/1774 -Patch129: monitoring-plugins-2.3.1-check_by_ssh.patch +Patch129: monitoring-plugins-2.3.3-check_by_ssh.patch +# +# PATCH-FIX-UPSTREAM - see https://github.com/monitoring-plugins/monitoring-plugins/pull/1862 +Patch130: monitoring-plugins-2.3.3-check_http-proxy.patch +# PATCH-FIX-UPSTREAM - simple fix for compiler error regarding no return value in function get_ip_address +Patch131: monitoring-plugins-2.3.3-check_icmp.patch +# PATCH-FEATURE-SLE - Use systemd-logind instead of utmp (jsc#PED-3144) +Patch132: systemd-not-utmp.patch BuildRequires: bind-utils BuildRequires: dhcp-devel BuildRequires: fping @@ -98,6 +97,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake +%if 0%{?suse_version} > 1599 +BuildRequires: coreutils-systemd +%endif BuildRequires: iputils BuildRequires: libdbi-devel BuildRequires: pkgconfig(smbclient) @@ -112,11 +114,14 @@ BuildRequires: net-snmp-perl BuildRequires: net-snmp-utils %else -BuildRequires: perl-Net-SNMP +BuildRequires: perl(Net::SNMP) %endif BuildRequires: postfix BuildRequires: postgresql-devel BuildRequires: procps +%if 0%{?suse_version} > 1599 +BuildRequires: systemd-devel +%endif BuildRequires: samba-client %if 0%{?suse_version} %if 0%{?suse_version} > 1020 @@ -631,7 +636,7 @@ Requires: net-snmp-perl Requires: net-snmp-utils %else -Requires: perl-Net-SNMP +Requires: perl(Net::SNMP) %endif Provides: nagios-plugins-ifoperstatus = %{version} Obsoletes: nagios-plugins-ifoperstatus <= 1.5 @@ -648,7 +653,7 @@ Requires: net-snmp-perl Requires: net-snmp-utils %else -Requires: perl-Net-SNMP +Requires: perl(Net::SNMP) %endif Provides: nagios-plugins-ifstatus = %{version} Obsoletes: nagios-plugins-ifstatus <= 1.5 @@ -1130,20 +1135,19 @@ %patch1 -p1 %patch6 -p1 %patch11 -p1 -%patch15 -p1 # Debian patches -%patch118 -p1 %patch119 -p1 %patch121 -p1 %patch122 -p1 # Github patches -%patch123 -p1 -%patch124 -p1 %patch125 -p1 %patch126 -p1 %patch127 -p1 %patch128 -p1 %patch129 -p1 +%patch130 -p1 +%patch131 -p1 +%patch132 -p1 find -type f -exec chmod 644 {} + %build ++++++ monitoring-plugins-2.3.1-check_by_ssh.patch -> monitoring-plugins-2.3.3-check_by_ssh.patch ++++++ --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins-2.3.1-check_by_ssh.patch 2022-07-14 16:34:38.180649004 +0200 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.17445/monitoring-plugins-2.3.3-check_by_ssh.patch 2023-11-01 22:10:22.400540617 +0100 @@ -1,17 +1,10 @@ -diff -ur monitoring-plugins-2.3.1.orig/plugins/check_by_ssh.c monitoring-plugins-2.3.1/plugins/check_by_ssh.c ---- monitoring-plugins-2.3.1.orig/plugins/check_by_ssh.c 2021-04-10 07:13:41.000000000 -0500 -+++ monitoring-plugins-2.3.1/plugins/check_by_ssh.c 2022-07-02 10:33:49.977417534 -0500 -@@ -49,6 +49,7 @@ - unsigned int services = 0; - int skip_stdout = 0; - int skip_stderr = 0; -+int unknown_timeout = 0; - char *remotecmd = NULL; - char **commargv = NULL; - int commargc = 0; -@@ -100,6 +101,13 @@ - - result = cmd_run_array (commargv, &chld_out, &chld_err, 0); +Index: monitoring-plugins-2.3.3/plugins/check_by_ssh.c +=================================================================== +--- monitoring-plugins-2.3.3.orig/plugins/check_by_ssh.c ++++ monitoring-plugins-2.3.3/plugins/check_by_ssh.c +@@ -109,6 +109,13 @@ main (int argc, char **argv) + return STATE_UNKNOWN; + } + /* SSH returns 255 if connection attempt fails; include the first line of error output */ + if (result == 255 && unknown_timeout) { @@ -23,48 +16,31 @@ if (verbose) { for(i = 0; i < chld_out.lines; i++) printf("stdout: %s\n", chld_out.line[i]); -@@ -176,6 +184,7 @@ - {"verbose", no_argument, 0, 'v'}, - {"fork", no_argument, 0, 'f'}, - {"timeout", required_argument, 0, 't'}, -+ {"unknown-timeout", no_argument, 0, 'U'}, - {"host", required_argument, 0, 'H'}, /* backward compatibility */ - {"hostname", required_argument, 0, 'H'}, - {"port", required_argument,0,'p'}, -@@ -207,7 +216,7 @@ - strcpy (argv[c], "-t"); - - while (1) { -- c = getopt_long (argc, argv, "Vvh1246fqt:H:O:p:i:u:l:C:S::E::n:s:o:F:", longopts, -+ c = getopt_long (argc, argv, "Vvh1246fqt:UH:O:p:i:u:l:C:S::E::n:s:o:F:", longopts, - &option); - - if (c == -1 || c == EOF) -@@ -229,6 +238,9 @@ - else - timeout_interval = atoi (optarg); - break; -+ case 'U': -+ unknown_timeout = 1; -+ break; - case 'H': /* host */ - host_or_die(optarg); - hostname = optarg; -@@ -437,6 +449,8 @@ +@@ -455,12 +462,12 @@ print_help (void) + printf (" %s\n", _("Tell ssh to use this configfile [optional]")); + printf (" %s\n","-q, --quiet"); printf (" %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]")); - printf (UT_WARN_CRIT); - printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); -+ printf (" %s\n","-U, --unknown-timeout"); -+ printf (" %s\n", _("Make connection problems return UNKNOWN instead of CRITICAL")); - printf (UT_VERBOSE); - printf("\n"); +- printf (UT_WARN_CRIT); +- printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); +- printf (" %s\n","-U, --unknown-timeout"); +- printf (" %s\n", _("Make connection problems return UNKNOWN instead of CRITICAL")); +- printf (UT_VERBOSE); +- printf("\n"); ++ printf (UT_WARN_CRIT); ++ printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); ++ printf (" %s\n","-U, --unknown-timeout"); ++ printf (" %s\n", _("Make connection problems return UNKNOWN instead of CRITICAL")); ++ printf (UT_VERBOSE); ++ printf("\n"); printf (" %s\n", _("The most common mode of use is to refer to a local identity file with")); -@@ -466,7 +480,7 @@ - print_usage (void) - { - printf ("%s\n", _("Usage:")); -- printf (" %s -H <host> -C <command> [-fqv] [-1|-2] [-4|-6]\n" -+ printf (" %s -H <host> -C <command> [-fqvU] [-1|-2] [-4|-6]\n" - " [-S [lines]] [-E [lines]] [-t timeout] [-i identity]\n" - " [-l user] [-n name] [-s servicelist] [-O outputfile]\n" - " [-p port] [-o ssh-option] [-F configfile]\n", + printf (" %s\n", _("the '-i' option. In this mode, the identity pair should have a null")); + printf (" %s\n", _("passphrase and the public key should be listed in the authorized_keys")); +@@ -479,7 +486,7 @@ print_help (void) + printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c2;0; up 2 days"); + printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c3;0; up 2 days"); + +- printf(UT_SUPPORT); ++ printf(UT_SUPPORT); + } + + ++++++ monitoring-plugins-2.3.1-check_dhcp_-_detect_rogue_dhcp_servers.patch -> monitoring-plugins-2.3.3-check_dhcp_-_detect_rogue_dhcp_servers.patch ++++++ --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins-2.3.1-check_dhcp_-_detect_rogue_dhcp_servers.patch 2021-11-23 22:12:48.138435036 +0100 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.17445/monitoring-plugins-2.3.3-check_dhcp_-_detect_rogue_dhcp_servers.patch 2023-11-01 22:10:22.408540913 +0100 @@ -1,7 +1,7 @@ -Index: monitoring-plugins-2.3.1/plugins-root/check_dhcp.c +Index: monitoring-plugins-2.3.3/plugins-root/check_dhcp.c =================================================================== ---- monitoring-plugins-2.3.1.orig/plugins-root/check_dhcp.c -+++ monitoring-plugins-2.3.1/plugins-root/check_dhcp.c +--- monitoring-plugins-2.3.3.orig/plugins-root/check_dhcp.c ++++ monitoring-plugins-2.3.3/plugins-root/check_dhcp.c @@ -156,6 +156,7 @@ typedef struct dhcp_offer_struct{ u_int32_t lease_time; /* lease time in seconds */ u_int32_t renewal_time; /* renewal time in seconds */ ++++++ monitoring-plugins-2.3.1-check_disk_on_btrfs.patch -> monitoring-plugins-2.3.3-check_disk_on_btrfs.patch ++++++ --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins-2.3.1-check_disk_on_btrfs.patch 2022-03-26 22:31:23.381980229 +0100 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.17445/monitoring-plugins-2.3.3-check_disk_on_btrfs.patch 2023-11-01 22:10:22.420541358 +0100 @@ -4,21 +4,21 @@ check_disk - fix false DISK CRITICAL alert for btrfs filesystems due to BSD Gnulib workaround -diff --git a/plugins/check_disk.c b/plugins/check_disk.c -index 2f20e47a..c813ad65 100755 ---- a/plugins/check_disk.c -+++ b/plugins/check_disk.c -@@ -1310,10 +1310,14 @@ get_stats (struct parameter_list *p, struct fs_usage *fsp) { +Index: monitoring-plugins-2.3.3/plugins/check_disk.c +=================================================================== +--- monitoring-plugins-2.3.3.orig/plugins/check_disk.c ++++ monitoring-plugins-2.3.3/plugins/check_disk.c +@@ -1041,7 +1041,14 @@ get_stats (struct parameter_list *p, str void get_path_stats (struct parameter_list *p, struct fs_usage *fsp) { +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(OpenBSD ) - /* 2007-12-08 - Workaround for Gnulib reporting insanely high available - * space on BSD (the actual value should be negative but fsp->fsu_bavail - * is unsigned) */ - p->available = fsp->fsu_bavail > fsp->fsu_bfree ? 0 : fsp->fsu_bavail; ++ /* 2007-12-08 - Workaround for Gnulib reporting insanely high available ++ * space on BSD (the actual value should be negative but fsp->fsu_bavail ++ * is unsigned) */ ++ p->available = fsp->fsu_bavail > fsp->fsu_bfree ? 0 : fsp->fsu_bavail; +#else -+ p->available = fsp->fsu_bavail; + p->available = fsp->fsu_bavail; +#endif p->available_to_root = fsp->fsu_bfree; p->used = fsp->fsu_blocks - fsp->fsu_bfree; ++++++ monitoring-plugins-2.3.3-check_http-proxy.patch ++++++ diff --git a/plugins/check_http.c b/plugins/check_http.c index 8dda046f..2ab6a7a3 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -126,6 +126,9 @@ int sd; int min_page_len = 0; int max_page_len = 0; int redir_depth = 0; +bool ssl_proxy = false; +char *proxy_server_address; +int proxy_server_port; int max_depth = DEFAULT_MAX_REDIRS; char *http_method; char *http_method_proxy; @@ -139,6 +142,7 @@ char *client_privkey = NULL; bool process_arguments (int, char **); int check_http (void); void redir (char *pos, char *status_line); +const char *find_uri_path (const char *url); bool server_type_check(const char *type); int server_port_check(int ssl_flag); char *perfd_time (double microsec); @@ -608,6 +612,17 @@ bool process_arguments (int argc, char **argv) if (virtual_port == 0) virtual_port = server_port; + /* if we are called with the -I option, the -j method is CONNECT and */ + /* we received -S for SSL, then we tunnel the request through a proxy*/ + /* @20100414, public[at]frank4dd.com, http://www.frank4dd.com/howto */ + + ssl_proxy = server_address != NULL && strcmp(http_method, "CONNECT") == 0 + && host_name != NULL && use_ssl == true; + if (ssl_proxy) { + proxy_server_address = strdup(server_address); + proxy_server_port = server_port; + } + return true; } @@ -939,18 +954,18 @@ check_http (void) /* try to connect to the host at the given port number */ gettimeofday (&tv_temp, NULL); - if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK) + result = ssl_proxy ? + my_tcp_connect (proxy_server_address, proxy_server_port, &sd) : + my_tcp_connect (server_address, server_port, &sd); + if (result != STATE_OK) die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n")); microsec_connect = deltime (tv_temp); - /* if we are called with the -I option, the -j method is CONNECT and */ - /* we received -S for SSL, then we tunnel the request through a proxy*/ - /* @20100414, public[at]frank4dd.com, http://www.frank4dd.com/howto */ + /* handle connection via SSL proxy */ + if (ssl_proxy) { - if ( server_address != NULL && strcmp(http_method, "CONNECT") == 0 - && host_name != NULL && use_ssl == true) { - - if (verbose) printf ("Entering CONNECT tunnel mode with proxy %s:%d to dst %s:%d\n", server_address, server_port, host_name, HTTPS_PORT); + if (verbose) printf ("Entering CONNECT tunnel mode with proxy %s:%d to dst %s:%d\n", + proxy_server_address, proxy_server_port, host_name, HTTPS_PORT); asprintf (&buf, "%s %s:%d HTTP/1.1\r\n%s\r\n", http_method, host_name, HTTPS_PORT, user_agent); if (strlen(proxy_auth)) { base64_encode_alloc (proxy_auth, strlen (proxy_auth), &auth); @@ -985,7 +1000,7 @@ check_http (void) if (use_ssl == true) { gettimeofday (&tv_temp, NULL); result = np_net_ssl_init_with_hostname_version_and_cert(sd, (use_sni ? host_name : NULL), ssl_version, client_cert, client_privkey); - if (verbose) printf ("SSL initialized\n"); + if (verbose) printf ("SSL initialization %s\n", result == STATE_OK ? "successful" : "failed"); if (result != STATE_OK) die (STATE_CRITICAL, NULL); microsec_ssl = deltime (tv_temp); @@ -1001,9 +1016,8 @@ check_http (void) } #endif /* HAVE_SSL */ - if ( server_address != NULL && strcmp(http_method, "CONNECT") == 0 - && host_name != NULL && use_ssl == true) - asprintf (&buf, "%s %s %s\r\n%s\r\n", http_method_proxy, server_url, host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent); + if (ssl_proxy) + asprintf (&buf, "%s %s %s\r\n%s\r\n", http_method_proxy, find_uri_path(server_url), host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent); else asprintf (&buf, "%s %s %s\r\n%s\r\n", http_method, server_url, host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent); @@ -1032,8 +1046,7 @@ check_http (void) */ if ((use_ssl == false && virtual_port == HTTP_PORT) || (use_ssl == true && virtual_port == HTTPS_PORT) || - (server_address != NULL && strcmp(http_method, "CONNECT") == 0 - && host_name != NULL && use_ssl == true)) + ssl_proxy) xasprintf (&buf, "%sHost: %s\r\n", buf, host_name); else xasprintf (&buf, "%sHost: %s:%d\r\n", buf, host_name, virtual_port); @@ -1137,10 +1150,17 @@ check_http (void) /* leave full_page untouched so we can free it later */ page = full_page; - if (verbose) - printf ("%s://%s:%d%s is %d characters\n", - use_ssl ? "https" : "http", server_address, - server_port, server_url, (int)pagesize); + if (verbose) { + if (ssl_proxy) { + printf ("[via proxy %s://%s:%d] %s returned %d bytes\n", + use_ssl ? "https" : "http", proxy_server_address, proxy_server_port, + server_url, (int)pagesize); + } else { + printf ("%s://%s:%d%s returned %d bytes\n", + use_ssl ? "https" : "http", server_address, + server_port, server_url, (int)pagesize); + } + } /* find status line and null-terminate it */ status_line = page; @@ -1300,7 +1320,12 @@ check_http (void) bcopy("...", &output_string_search[sizeof(output_string_search) - 4], 4); } - xasprintf (&msg, _("%sstring '%s' not found on '%s://%s:%d%s', "), msg, output_string_search, use_ssl ? "https" : "http", host_name ? host_name : server_address, server_port, server_url); + if (ssl_proxy) { + xasprintf (&msg, _("%sstring '%s' not found on '%s', "), msg, output_string_search, server_url); + } else { + xasprintf (&msg, _("%sstring '%s' not found on '%s://%s:%d%s', "), msg, output_string_search, + use_ssl ? "https" : "http", host_name ? host_name : server_address, server_port, server_url); + } result = STATE_CRITICAL; } } @@ -1642,6 +1667,25 @@ redir (char *pos, char *status_line) check_http (); } +// Locate the URI path inside a complete URL. If we fail, just return the original URL. +const char * +find_uri_path (const char *url) +{ + const char *s = url; + + if (strncmp(s, "http://", 7) == 0) + s += 7; + else if (strncmp(s, "https://", 8) == 0) + s += 8; + else + return url; + while (*s != '\0') { + if (strchr("/?#", *s) != NULL) + return s; + s++; + } + return url; +} bool server_type_check (const char *type) @@ -1861,7 +1905,7 @@ print_help (void) printf (" %s\n", _("a STATE_OK is returned. When the certificate is still valid, but for less than")); printf (" %s\n", _("30 days, but more than 14 days, a STATE_WARNING is returned.")); printf (" %s\n", _("A STATE_CRITICAL will be returned when certificate expires in less than 14 days")); - + printf ("\n"); printf (" %s\n\n", "CHECK SSL WEBSERVER CONTENT VIA PROXY USING HTTP 1.1 CONNECT: "); printf (" %s\n", _("check_http -I 192.168.100.35 -p 80 -u https://www.verisign.com/ -S -j CONNECT -H www.verisign.com ")); printf (" %s\n", _("all these options are needed: -I <proxy> -p <proxy-port> -u <check-url> -S(sl) -j CONNECT -H <webserver>")); ++++++ monitoring-plugins-2.3.3-check_icmp.patch ++++++ Index: monitoring-plugins-2.3.3/plugins-root/check_icmp.c =================================================================== --- monitoring-plugins-2.3.3.orig/plugins-root/check_icmp.c +++ monitoring-plugins-2.3.3/plugins-root/check_icmp.c @@ -1446,6 +1446,7 @@ get_ip_address(const char *ifname) #else errno = 0; crash("Cannot get interface IP address on this platform."); + return INADDR_NONE; #endif } ++++++ monitoring-plugins-2.1.1-check_log_-_quoting.patch -> monitoring-plugins-2.3.3-check_log_-_quoting.patch ++++++ --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins-2.1.1-check_log_-_quoting.patch 2021-11-23 22:12:48.126435076 +0100 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.17445/monitoring-plugins-2.3.3-check_log_-_quoting.patch 2023-11-01 22:10:22.448542395 +0100 @@ -1,90 +1,33 @@ -Index: monitoring-plugins-2.3.1/plugins-scripts/check_log.sh +Index: monitoring-plugins-2.3.3/plugins-scripts/check_log.sh =================================================================== ---- monitoring-plugins-2.3.1.orig/plugins-scripts/check_log.sh -+++ monitoring-plugins-2.3.1/plugins-scripts/check_log.sh -@@ -115,27 +115,27 @@ while test -n "$1"; do - exit $STATE_OK +--- monitoring-plugins-2.3.3.orig/plugins-scripts/check_log.sh ++++ monitoring-plugins-2.3.3/plugins-scripts/check_log.sh +@@ -112,23 +112,23 @@ while test -n "$1"; do + exit "$STATE_OK" ;; - --filename) + -F | --filename) - logfile=$2 + logfile="$2" - shift + shift 2 ;; - -F) -- logfile=$2 -+ logfile="$2" - shift - ;; - --oldlog) -- oldlog=$2 -+ oldlog="$2" - shift - ;; - -O) + -O | --oldlog) - oldlog=$2 + oldlog="$2" - shift + shift 2 ;; - --query) + -q | --query) - query=$2 + query="$2" - shift + shift 2 ;; - -q) -- query=$2 -+ query="$2" - shift + --exclude) +- exclude=$2 ++ exclude="$2" + shift 2 + ;; + -x | --exitstatus) +- exitstatus=$2 ++ exitstatus="$2" + shift 2 ;; - -x) -@@ -157,10 +157,10 @@ done - - # If the source log file doesn't exist, exit - --if [ ! -e $logfile ]; then -+if [ ! -e "$logfile" ]; then - echo "Log check error: Log file $logfile does not exist!" - exit $STATE_UNKNOWN --elif [ ! -r $logfile ] ; then -+elif [ ! -r "$logfile" ] ; then - echo "Log check error: Log file $logfile is not readable!" - exit $STATE_UNKNOWN - fi -@@ -169,8 +169,8 @@ fi - # we're running this test, so copy the original log file over to - # the old diff file and exit - --if [ ! -e $oldlog ]; then -- cat $logfile > $oldlog -+if [ ! -e "$oldlog" ]; then -+ cat "$logfile" > "$oldlog" - echo "Log check data initialized..." - exit $STATE_OK - fi -@@ -184,20 +184,20 @@ if [ -x /bin/mktemp ]; then - else - tempdiff=`/bin/date '+%H%M%S'` - tempdiff="/tmp/check_log.${tempdiff}" -- touch $tempdiff -- chmod 600 $tempdiff -+ touch "$tempdiff" -+ chmod 600 "$tempdiff" - fi - --diff $logfile $oldlog | grep -v "^>" > $tempdiff -+diff "$logfile" "$oldlog" | grep -v "^>" > "$tempdiff" - - # Count the number of matching log entries we have --count=`grep -c "$query" $tempdiff` -+count=`grep -c "$query" "$tempdiff"` - - # Get the last matching entry in the diff file --lastentry=`grep "$query" $tempdiff | tail -1` -+lastentry=`grep "$query" "$tempdiff" | tail -1` - --rm -f $tempdiff --cat $logfile > $oldlog -+rm -f "$tempdiff" -+cat "$logfile" > "$oldlog" - - if [ "$count" = "0" ]; then # no matches, exit with no error - echo "Log check ok - 0 pattern matches found" + -e | --extended-regex) ++++++ monitoring-plugins-2.3-check_ntp_perf_absolute.patch -> monitoring-plugins-2.3.3-check_ntp_perf_absolute.patch ++++++ --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins-2.3-check_ntp_perf_absolute.patch 2021-04-29 01:39:22.482661293 +0200 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.17445/monitoring-plugins-2.3.3-check_ntp_perf_absolute.patch 2023-11-01 22:10:22.456542691 +0100 @@ -1,7 +1,7 @@ -Index: monitoring-plugins-2.3.1/plugins/check_ntp_time.c +Index: monitoring-plugins-2.3.3/plugins/check_ntp_time.c =================================================================== ---- monitoring-plugins-2.3.1.orig/plugins/check_ntp_time.c -+++ monitoring-plugins-2.3.1/plugins/check_ntp_time.c +--- monitoring-plugins-2.3.3.orig/plugins/check_ntp_time.c ++++ monitoring-plugins-2.3.3/plugins/check_ntp_time.c @@ -533,7 +533,7 @@ int process_arguments(int argc, char **a char *perfd_offset (double offset) ++++++ monitoring-plugins-2.3.3-check_snmp.arrayaddress.patch ++++++ Index: monitoring-plugins-2.3.3/plugins/check_snmp.c =================================================================== --- monitoring-plugins-2.3.3.orig/plugins/check_snmp.c +++ monitoring-plugins-2.3.3/plugins/check_snmp.c @@ -594,7 +594,7 @@ main (int argc, char **argv) len = sizeof(perfstr)-strlen(perfstr)-1; strncat(perfstr, show, len>ptr-show ? ptr-show : len); - if (type) + if (type[0]) strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1); if (warning_thresholds) { ++++++ monitoring-plugins-2.3.1-check_ssh.patch -> monitoring-plugins-2.3.3-check_ssh.patch ++++++ --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins-2.3.1-check_ssh.patch 2021-11-23 22:12:48.170434930 +0100 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.17445/monitoring-plugins-2.3.3-check_ssh.patch 2023-11-01 22:10:22.636549359 +0100 @@ -26,11 +26,20 @@ plugins/t/check_ssh.t | 97 ++++++++++++++++++++++++++------- 2 files changed, 164 insertions(+), 55 deletions(-) -diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c -index 3658965e5..fc2ceb78b 100644 ---- a/plugins/check_ssh.c -+++ b/plugins/check_ssh.c -@@ -215,8 +215,13 @@ ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol +Index: monitoring-plugins-2.3.3/plugins/check_ssh.c +=================================================================== +--- monitoring-plugins-2.3.3.orig/plugins/check_ssh.c ++++ monitoring-plugins-2.3.3/plugins/check_ssh.c +@@ -106,7 +106,7 @@ process_arguments (int argc, char **argv + {"timeout", required_argument, 0, 't'}, + {"verbose", no_argument, 0, 'v'}, + {"remote-version", required_argument, 0, 'r'}, +- {"remote-protcol", required_argument, 0, 'P'}, ++ {"remote-protocol", required_argument, 0, 'P'}, + {0, 0, 0, 0} + }; + +@@ -215,8 +215,13 @@ ssh_connect (char *haddr, int hport, cha { int sd; int result; @@ -44,7 +53,7 @@ char *ssh_proto = NULL; char *ssh_server = NULL; static char *rev_no = VERSION; -@@ -231,51 +236,94 @@ ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol +@@ -231,51 +236,118 @@ ssh_connect (char *haddr, int hport, cha return result; output = (char *) malloc (BUFF_SZ + 1); @@ -95,11 +104,35 @@ + printf("SSH CRITICAL - No version control string received"); + exit(STATE_CRITICAL); + } ++ /* ++ * "When the connection has been established, both sides MUST send an ++ * identification string. This identification string MUST be ++ * ++ * SSH-protoversion-softwareversion SP comments CR LF" ++ * - RFC 4253:4.2 ++ */ + strip (version_control_string); + if (verbose) + printf ("%s\n", version_control_string); + ssh_proto = version_control_string + 4; -+ ssh_server = ssh_proto + strspn (ssh_proto, "-0123456789."); ++ ++ /* ++ * We assume the protoversion is of the form Major.Minor, although ++ * this is not _strictly_ required. See ++ * ++ * "Both the 'protoversion' and 'softwareversion' strings MUST consist of ++ * printable US-ASCII characters, with the exception of whitespace ++ * characters and the minus sign (-)" ++ * - RFC 4253:4.2 ++ * and, ++ * ++ * "As stated earlier, the 'protoversion' specified for this protocol is ++ * "2.0". Earlier versions of this protocol have not been formally ++ * documented, but it is widely known that they use 'protoversion' of ++ * "1.x" (e.g., "1.5" or "1.3")." ++ * - RFC 4253:5 ++ */ ++ ssh_server = ssh_proto + strspn (ssh_proto, "0123456789.") + 1; /* (+1 for the '-' separating protoversion from softwareversion) */ + + /* If there's a space in the version string, whatever's after the space is a comment + * (which is NOT part of the server name/version)*/ @@ -131,8 +164,7 @@ - close(sd); - exit (STATE_CRITICAL); - } -+ ssh_proto[strspn (ssh_proto, "0123456789. ")] = 0; - +- - if (remote_protocol && strcmp(remote_protocol, ssh_proto)) { - printf - (_("SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s'\n"), @@ -140,31 +172,33 @@ - close(sd); - exit (STATE_CRITICAL); - } ++ ssh_proto[strspn (ssh_proto, "0123456789. ")] = 0; + +- elapsed_time = (double)deltime(tv) / 1.0e6; + xasprintf (&buffer, "SSH-%s-check_ssh_%s\r\n", ssh_proto, rev_no); + send (sd, buffer, strlen (buffer), MSG_DONTWAIT); + if (verbose) + printf ("%s\n", buffer); -- elapsed_time = (double)deltime(tv) / 1.0e6; + if (remote_version && strcmp(remote_version, ssh_server)) { -+ printf -+ (_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"), -+ ssh_server, ssh_proto, remote_version); -+ close(sd); -+ exit (STATE_CRITICAL); -+ } - -+ if (remote_protocol && strcmp(remote_protocol, ssh_proto)) { printf - (_("SSH OK - %s (protocol %s) | %s\n"), - ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s", - FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout)); -+ (_("SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s'\n"), -+ ssh_server, ssh_proto, remote_protocol); ++ (_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"), ++ ssh_server, ssh_proto, remote_version); close(sd); - exit (STATE_OK); + exit (STATE_CRITICAL); } ++ ++ if (remote_protocol && strcmp(remote_protocol, ssh_proto)) { ++ printf ++ (_("SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s'\n"), ++ ssh_server, ssh_proto, remote_protocol); ++ close(sd); ++ exit (STATE_CRITICAL); ++ } + elapsed_time = (double)deltime(tv) / 1.0e6; + + printf @@ -176,71 +210,3 @@ } -diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c -index fc2ceb78b..7b576895f 100644 ---- a/plugins/check_ssh.c -+++ b/plugins/check_ssh.c -@@ -278,11 +278,35 @@ ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol - printf("SSH CRITICAL - No version control string received"); - exit(STATE_CRITICAL); - } -+ /* -+ * "When the connection has been established, both sides MUST send an -+ * identification string. This identification string MUST be -+ * -+ * SSH-protoversion-softwareversion SP comments CR LF" -+ * - RFC 4253:4.2 -+ */ - strip (version_control_string); - if (verbose) - printf ("%s\n", version_control_string); - ssh_proto = version_control_string + 4; -- ssh_server = ssh_proto + strspn (ssh_proto, "-0123456789."); -+ -+ /* -+ * We assume the protoversion is of the form Major.Minor, although -+ * this is not _strictly_ required. See -+ * -+ * "Both the 'protoversion' and 'softwareversion' strings MUST consist of -+ * printable US-ASCII characters, with the exception of whitespace -+ * characters and the minus sign (-)" -+ * - RFC 4253:4.2 -+ * and, -+ * -+ * "As stated earlier, the 'protoversion' specified for this protocol is -+ * "2.0". Earlier versions of this protocol have not been formally -+ * documented, but it is widely known that they use 'protoversion' of -+ * "1.x" (e.g., "1.5" or "1.3")." -+ * - RFC 4253:5 -+ */ -+ ssh_server = ssh_proto + strspn (ssh_proto, "0123456789.") + 1; /* (+1 for the '-' separating protoversion from softwareversion) */ - - /* If there's a space in the version string, whatever's after the space is a comment - * (which is NOT part of the server name/version)*/ - - -From 59bed139e84fd6342d4203ebebca28bf2f4dcc82 Mon Sep 17 00:00:00 2001 -From: Anton Lofgren <alofgren(a)op5.com> -Date: Fri, 30 Jan 2015 10:52:20 +0100 -Subject: [PATCH 4/4] check_ssh: Fix a typo in "remote-protocol parameter - -remote-protcol -> remote-protocol - -Signed-off-by: Anton Lofgren <alofgren(a)op5.com> ---- - plugins/check_ssh.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c -index 7b576895f..f12f34051 100644 ---- a/plugins/check_ssh.c -+++ b/plugins/check_ssh.c -@@ -106,7 +106,7 @@ process_arguments (int argc, char **argv) - {"timeout", required_argument, 0, 't'}, - {"verbose", no_argument, 0, 'v'}, - {"remote-version", required_argument, 0, 'r'}, -- {"remote-protcol", required_argument, 0, 'P'}, -+ {"remote-protocol", required_argument, 0, 'P'}, - {0, 0, 0, 0} - }; - ++++++ monitoring-plugins-2.3.1-check_ssh.t_-_improve_testing.patch -> monitoring-plugins-2.3.3-check_ssh.t_-_improve_testing.patch ++++++ --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins-2.3.1-check_ssh.t_-_improve_testing.patch 2021-11-23 22:12:48.182434891 +0100 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.17445/monitoring-plugins-2.3.3-check_ssh.t_-_improve_testing.patch 2023-11-01 22:10:22.732552916 +0100 @@ -1,11 +1,11 @@ -Index: monitoring-plugins-2.3.1/plugins/t/check_ssh.t +Index: monitoring-plugins-2.3.3/plugins/t/check_ssh.t =================================================================== ---- monitoring-plugins-2.3.1.orig/plugins/t/check_ssh.t -+++ monitoring-plugins-2.3.1/plugins/t/check_ssh.t +--- monitoring-plugins-2.3.3.orig/plugins/t/check_ssh.t ++++ monitoring-plugins-2.3.3/plugins/t/check_ssh.t @@ -8,34 +8,105 @@ use strict; use Test::More; use NPTest; - + -# Required parameters -my $ssh_host = getTestParameter("NP_SSH_HOST", "A host providing SSH service", "localhost"); -my $host_nonresponsive = getTestParameter("NP_HOST_NONRESPONSIVE", "The hostname of system not responsive to network requests", "10.0.0.1" ); @@ -21,7 +21,8 @@ - ); -cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)"); -like($result->output, '/^SSH OK - /', "Status text if command returned none (OK)"); -- ++my $res; + - -$result = NPTest->testCmd( - "./check_ssh -H $host_nonresponsive -t 2" @@ -36,8 +37,6 @@ - ); -cmp_ok($result->return_code, '==', 3, "Exit with return code 0 (OK)"); -like($result->output, '/^check_ssh: Invalid hostname/', "Status text if command returned none (OK)"); -+my $res; - +# Required parameters +my $ssh_host = getTestParameter("NP_SSH_HOST", + "A host providing SSH service", @@ -137,4 +136,4 @@ + cmp_ok( $res->return_code, '==', 0, "Got delayed SSH protocol version control string"); + like( $res->output, '/^SSH OK - nagiosplug.ssh.0.2 $protocol 2.0$/', "Output OK"); + close NC; -+ + ++++++ monitoring-plugins-2.2-mariadb_102_build_fix.patch -> monitoring-plugins-2.3.3-mariadb_102_build_fix.patch ++++++ --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins-2.2-mariadb_102_build_fix.patch 2021-04-29 01:39:22.466661270 +0200 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.17445/monitoring-plugins-2.3.3-mariadb_102_build_fix.patch 2023-11-01 22:10:22.772554398 +0100 @@ -30,22 +30,20 @@ plugins/check_mysql_query.c | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) -Index: monitoring-plugins-2.3.1/plugins/check_mysql.c +Index: monitoring-plugins-2.3.3/plugins/check_mysql.c =================================================================== ---- monitoring-plugins-2.3.1.orig/plugins/check_mysql.c -+++ monitoring-plugins-2.3.1/plugins/check_mysql.c -@@ -36,6 +36,10 @@ const char *email = "devel@monitoring-pl +--- monitoring-plugins-2.3.3.orig/plugins/check_mysql.c ++++ monitoring-plugins-2.3.3/plugins/check_mysql.c +@@ -35,6 +35,8 @@ const char *copyright = "1999-2011"; + const char *email = "devel(a)monitoring-plugins.org"; #define SLAVERESULTSIZE 70 - +/* The default port that MySQL servers listen on. */ +#define CHECK_PORT_DEFAULT 3306 -+ -+ + #include "common.h" #include "utils.h" - #include "utils_base.h" -@@ -58,7 +62,7 @@ char *ciphers = NULL; +@@ -58,7 +60,7 @@ char *ciphers = NULL; bool ssl = false; char *opt_file = NULL; char *opt_group = NULL; @@ -54,7 +52,7 @@ int check_slave = 0, warn_sec = 0, crit_sec = 0; int ignore_auth = 0; int verbose = 0; -@@ -508,7 +512,7 @@ void +@@ -508,7 +510,7 @@ void print_help (void) { char *myport; @@ -63,22 +61,21 @@ print_revision (progname, NP_VERSION); -Index: monitoring-plugins-2.3.1/plugins/check_mysql_query.c +Index: monitoring-plugins-2.3.3/plugins/check_mysql_query.c =================================================================== ---- monitoring-plugins-2.3.1.orig/plugins/check_mysql_query.c -+++ monitoring-plugins-2.3.1/plugins/check_mysql_query.c -@@ -33,6 +33,10 @@ const char *progname = "check_mysql_quer +--- monitoring-plugins-2.3.3.orig/plugins/check_mysql_query.c ++++ monitoring-plugins-2.3.3/plugins/check_mysql_query.c +@@ -33,6 +33,9 @@ const char *progname = "check_mysql_quer const char *copyright = "1999-2007"; const char *email = "devel(a)monitoring-plugins.org"; +/* The default port that MySQL servers listen on. */ +#define CHECK_PORT_DEFAULT 3306 + -+ #include "common.h" #include "utils.h" #include "utils_base.h" -@@ -48,7 +52,7 @@ char *db_pass = NULL; +@@ -48,7 +51,7 @@ char *db_pass = NULL; char *db = NULL; char *opt_file = NULL; char *opt_group = NULL; @@ -87,7 +84,7 @@ int process_arguments (int, char **); int validate_arguments (void); -@@ -299,7 +303,7 @@ void +@@ -299,7 +302,7 @@ void print_help (void) { char *myport; ++++++ monitoring-plugins-2.3.3-root-plugins-Makefile_-_no_chown.patch ++++++ Index: monitoring-plugins-2.3.3/plugins-root/Makefile.am =================================================================== --- monitoring-plugins-2.3.3.orig/plugins-root/Makefile.am +++ monitoring-plugins-2.3.3/plugins-root/Makefile.am @@ -49,7 +49,6 @@ INSTALL_SUID = \ p=$$f; \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \ - echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \ chown root $(DESTDIR)$(libexecdir)/$$p; \ echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \ chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \ @@ -64,7 +63,7 @@ install-exec-local: $(noinst_PROGRAMS) echo > $$TMPFILE; \ ## See if we can create a setuid root executable in $(libexecdir). ## If not, then don't even try to install setuid plugins. - can_create_suid_root_executable=no; \ + can_create_suid_root_executable=yes; \ chown root $$TMPFILE > /dev/null 2>&1 \ && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \ && can_create_suid_root_executable=yes; \ ++++++ monitoring-plugins-2.3.3-wrong_percent_in_check_swap.patch ++++++ From f3e6c9663369d011b241c6fb2c8fd5312f98cacf Mon Sep 17 00:00:00 2001 From: Jan ONDREJ <ondrejj(a)salstar.sk> Date: Thu, 7 Oct 2010 17:28:48 +0400 Subject: [PATCH 6/6] Prevent check_swap from returning OK, if no swap activated My swap was not activated on boot for unknown reason and nagios does not report this as a problem. Here is an example: [root@kecom ~]# rpm -q nagios-plugins nagios-plugins-1.4.13-11.fc10.i386 [root@kecom ~]# /usr/lib/nagios/plugins/check_swap -w 80% -c 40% -c 1 -w 2 SWAP CRITICAL - 100% free (0 MB out of 0 MB) |swap=0MB;0;0;0;0 If there is no swap and users is trying to test percentage of free swap, consider 0 MB free swap space as problem, or of free/total raises division by zero, then set percentage to 0%, not to 100%. Steps to Reproduce: 1. make sure, your swap is empty or it's usage is not large 2. swapoff -a 3. /usr/lib/nagios/plugins/check_swap -w 80% -c 40% Actual results: SWAP OK - 100% free (0 MB out of 0 MB) |swap=0MB;0;0;0;0 Expected results: SWAP CRITICAL - 0% free (0 MB out of 0 MB) |swap=0MB;0;0;0;0 Additional info: https://bugzilla.redhat.com/512559 Index: monitoring-plugins-2.3.3/plugins/check_swap.c =================================================================== --- monitoring-plugins-2.3.3.orig/plugins/check_swap.c +++ monitoring-plugins-2.3.3/plugins/check_swap.c @@ -137,7 +137,7 @@ main (int argc, char **argv) free_swap_mb += dskfree_mb; if (allswaps) { if (dsktotal_mb == 0) - percent=100.0; + percent= 0.0; else percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb)); result = max_state (result, check_swap (dskfree_mb, dsktotal_mb)); ++++++ monitoring-plugins-2.3.1.tar.gz -> monitoring-plugins-2.3.3.tar.gz ++++++ ++++ 71332 lines of diff (skipped) ++++++ monitoring-plugins-2.3.1.tar.gz.sha1 -> monitoring-plugins-2.3.3.tar.gz.sha1 ++++++ --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins-2.3.1.tar.gz.sha1 2021-04-29 01:39:22.526661355 +0200 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.17445/monitoring-plugins-2.3.3.tar.gz.sha1 2023-11-01 22:10:23.244571883 +0100 @@ -1 +1 @@ -8cb4d72920ed99ff922b6989fe5213ea76b9388e *monitoring-plugins-2.3.1.tar.gz +4424d4ed0bfffa42b215ae4702a70adea968ad6d *monitoring-plugins-2.3.3.tar.gz ++++++ systemd-not-utmp.patch ++++++ --- monitoring-plugins-2.3.3.old/configure.ac 2023-02-01 14:40:55.000000000 +0100 +++ monitoring-plugins-2.3.3/configure.ac 2023-06-15 16:21:19.637049416 +0200 @@ -328,6 +328,25 @@ LIBS="$_SAVEDLIBS" ]) + +AC_ARG_WITH([systemd], [AS_HELP_STRING([--without-systemd], [Skips systemd support])]) + +dnl Check for libsystemd +AS_IF([test "x$with_systemd" != "xno"], [ + _SAVEDLIBS="$LIBS" + AC_CHECK_LIB(systemd,sd_get_sessions,,,-lsystemd) + if test "$ac_cv_lib_systemd_sd_get_sessions" = "yes"; then + SYSTEMDLIBS="-lsystemd" + SYSTEMDINCLUDE="" + AC_SUBST(SYSTEMDLIBS) + AC_SUBST(SYSTEMDINCLUDE) + else + AC_MSG_WARN([Skipping systemd support]) + fi + LIBS="$_SAVEDLIBS" +]) + + dnl Check for headers used by check_ide_smart case $host in *linux*) diff -wur monitoring-plugins-2.3.3.old/plugins/check_users.c monitoring-plugins-2.3.3/plugins/check_users.c --- monitoring-plugins-2.3.3.old/plugins/check_users.c 2023-02-01 14:40:55.000000000 +0100 +++ monitoring-plugins-2.3.3/plugins/check_users.c 2023-06-15 16:16:34.879700400 +0200 @@ -48,6 +48,11 @@ # include "popen.h" #endif +#ifdef HAVE_LIBSYSTEMD +#include <systemd/sd-daemon.h> +#include <systemd/sd-login.h> +#endif + #define possibly_set(a,b) ((a) == 0 ? (b) : 0) int process_arguments (int, char **); @@ -115,6 +120,11 @@ WTSFreeMemory(wtsinfo); #elif HAVE_UTMPX_H +#ifdef HAVE_LIBSYSTEMD + if (sd_booted () > 0) + users = sd_get_sessions (NULL); + else { +#endif /* get currently logged users from utmpx */ setutxent (); @@ -123,6 +133,9 @@ users++; endutxent (); +#ifdef HAVE_LIBSYSTEMD + } +#endif #else /* run the command */ child_process = spopen (WHO_COMMAND); Nur in monitoring-plugins-2.3.3/plugins: check_users.c~. diff -wur monitoring-plugins-2.3.3.old/plugins/Makefile.am monitoring-plugins-2.3.3/plugins/Makefile.am --- monitoring-plugins-2.3.3.old/plugins/Makefile.am 2023-02-01 14:40:55.000000000 +0100 +++ monitoring-plugins-2.3.3/plugins/Makefile.am 2023-06-15 16:23:36.925699810 +0200 @@ -112,7 +112,7 @@ check_time_LDADD = $(NETLIBS) check_ntp_time_LDADD = $(NETLIBS) $(MATHLIBS) check_ups_LDADD = $(NETLIBS) -check_users_LDADD = $(BASEOBJS) $(WTSAPI32LIBS) +check_users_LDADD = $(BASEOBJS) $(WTSAPI32LIBS) $(SYSTEMDLIBS) check_by_ssh_LDADD = $(NETLIBS) check_ide_smart_LDADD = $(BASEOBJS) negate_LDADD = $(BASEOBJS) ++++++ usr.lib.nagios.plugins.check_procs ++++++ --- /var/tmp/diff_new_pack.noQ4EA/_old 2023-11-01 22:10:25.672661831 +0100 +++ /var/tmp/diff_new_pack.noQ4EA/_new 2023-11-01 22:10:25.676661980 +0100 @@ -1,5 +1,5 @@ #include <tunables/global> -/usr/lib/nagios/plugins/check_procs { +/usr/lib/nagios/plugins/check_procs flags=(attach_disconnected) { #include <abstractions/nameservice> #include <abstractions/base> #include <abstractions/consoles> ++++++ usr.lib.nagios.plugins.check_procs.sle15 ++++++ --- /var/tmp/diff_new_pack.noQ4EA/_old 2023-11-01 22:10:25.692662572 +0100 +++ /var/tmp/diff_new_pack.noQ4EA/_new 2023-11-01 22:10:25.692662572 +0100 @@ -1,5 +1,5 @@ #include <tunables/global> -/usr/lib/nagios/plugins/check_procs { +/usr/lib/nagios/plugins/check_procs flags=(attach_disconnected) { #include <abstractions/nameservice> #include <abstractions/base> #include <abstractions/consoles>

1 0