openSUSE Commits
Threads by month
- ----- 2024 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
June 2024
- 2 participants
- 1219 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sane-airscan for openSUSE:Factory checked in at 2024-06-04 12:52:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sane-airscan (Old)
and /work/SRC/openSUSE:Factory/.sane-airscan.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sane-airscan"
Tue Jun 4 12:52:22 2024 rev:2 rq:1178457 version:0.99.29
Changes:
--------
--- /work/SRC/openSUSE:Factory/sane-airscan/sane-airscan.changes 2024-04-07 22:15:23.423227454 +0200
+++ /work/SRC/openSUSE:Factory/.sane-airscan.new.24587/sane-airscan.changes 2024-06-04 12:53:01.523950106 +0200
@@ -1,0 +2,28 @@
+Tue Jun 4 07:45:35 UTC 2024 - Richard Rahl <rrahl0(a)disroot.org>
+
+- final adjustment for Obsoletes
+
+-------------------------------------------------------------------
+Tue Jun 4 07:15:42 UTC 2024 - Richard Rahl <rrahl0(a)disroot.org>
+
+- add Provides and Obsoletes for old packages
+
+-------------------------------------------------------------------
+Mon Jun 3 23:14:30 UTC 2024 - Richard Rahl <rrahl0(a)disroot.org>
+
+- remove code which related to the old packaging
+
+-------------------------------------------------------------------
+Mon Jun 3 22:57:13 UTC 2024 - Richard Rahl <rrahl0(a)disroot.org>
+
+- adapt packaging according to
+ https://build.opensuse.org/request/show/1177729#comment-1944225
+ (remove .so file and include the libsane-airscan.so.1 in the main
+ package
+
+-------------------------------------------------------------------
+Thu May 30 10:25:59 UTC 2024 - Richard Rahl <rrahl0(a)disroot.org>
+
+- add runtime dependency
+
+------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sane-airscan.spec ++++++
--- /var/tmp/diff_new_pack.ghBfMB/_old 2024-06-04 12:53:02.007967613 +0200
+++ /var/tmp/diff_new_pack.ghBfMB/_new 2024-06-04 12:53:02.011967758 +0200
@@ -16,7 +16,6 @@
#
-%define soversion 1
Name: sane-airscan
Version: 0.99.29
Release: 0
@@ -27,6 +26,7 @@
BuildRequires: gcc-c++
BuildRequires: meson
BuildRequires: pkgconfig
+BuildRequires: zstd
BuildRequires: pkgconfig(avahi-core)
BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(libjpeg)
@@ -34,20 +34,10 @@
BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(sane-backends)
-BuildRequires: zstd
-
-%package devel
-Summary: Devel files for %{name}
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-%{summary}.
-
-%package -n lib%{name}%{soversion}
-Summary: Library files for %{name}
-
-%description -n lib%{name}%{soversion}
-Libary files for %{name}.
+Provides: lib%{name}1 = %{version}
+Obsoletes: lib%{name}1 <= %{version}
+Provides: %{name}-devel = %{version}
+Obsoletes: %{name}-devel <= %{version}
%description
This package contains a SANE backend for MFP and document scanners that
@@ -63,6 +53,7 @@
%install
%meson_install
+rm %{buildroot}%{_libdir}/sane/libsane-airscan.so
%files
%license LICENSE COPYING
@@ -70,16 +61,9 @@
%{_bindir}/airscan-discover
%config %{_sysconfdir}/sane.d/airscan.conf
%config %{_sysconfdir}/sane.d/dll.d/airscan
+%{_libdir}/sane/libsane-airscan.so.1
%{_mandir}/man?/{sane-airscan,airscan-discover}.?.gz
%if 0%{?suse_version} == 1500
%dir %{_sysconfdir}/sane.d/dll.d
%endif
-%files -n lib%{name}%{soversion}
-%{_libdir}/sane/libsane-airscan.so.1
-
-%files devel
-%license LICENSE COPYING
-%doc README.md
-%{_libdir}/sane/libsane-airscan.so
-
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mesheryctl for openSUSE:Factory checked in at 2024-06-04 12:51:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mesheryctl (Old)
and /work/SRC/openSUSE:Factory/.mesheryctl.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mesheryctl"
Tue Jun 4 12:51:34 2024 rev:46 rq:1178377 version:0.7.69
Changes:
--------
--- /work/SRC/openSUSE:Factory/mesheryctl/mesheryctl.changes 2024-05-31 22:17:08.220720498 +0200
+++ /work/SRC/openSUSE:Factory/.mesheryctl.new.24587/mesheryctl.changes 2024-06-04 12:52:44.263324571 +0200
@@ -1,0 +2,55 @@
+Mon Jun 3 15:24:44 UTC 2024 - Johannes Kastl <opensuse_buildservice(a)ojkastl.de>
+
+- update to 0.7.69 (.68 does not exist):
+ * General
+ - [Relationships]: Add kube-prometheus-stack relationships
+ @innocentrda (#11072)
+ - [Server] Remove hardcoded registrant/host @MUzairS15 (#11073)
+ - generate view link for the deployed design @MUzairS15
+ (#11071)
+ * Meshery UI
+ - Revert "chore(deps-dev): Bump eslint from 8.57.0 to 9.4.0 in
+ /provider-ui" @leecalcote (#11092)
+ - chore(deps-dev): Bump eslint from 8.57.0 to 9.4.0 in
+ /provider-ui @dependabot (#11085)
+ - chore(deps): Bump cron-time-generator from 1.3.2 to 2.0.3 in
+ /ui @dependabot (#11080)
+ - chore(deps-dev): Bump @cypress/code-coverage from 3.12.26 to
+ 3.12.39 in /provider-ui @dependabot (#11084)
+ - chore(deps-dev): Bump @storybook/addon-interactions from
+ 6.5.16 to 8.1.5 in /ui @dependabot (#11083)
+ - chore(deps-dev): Bump @cypress/code-coverage from 3.12.16 to
+ 3.12.39 in /ui @dependabot (#11082)
+ - chore(deps-dev): Bump eslint-plugin-cypress from 2.15.1 to
+ 3.3.0 in /provider-ui @dependabot (#11087)
+ - chore(deps): Bump react-dom from 18.2.0 to 18.3.1 in
+ /provider-ui @dependabot (#11088)
+ - Alignment of Notification Center and backdrop on Open
+ @captain-Akshay (#11078)
+ - missing permission page @captain-Akshay (#11076)
+ - Replace tooltips with sistent tooltips @dragon-slayer875
+ (#11067)
+ * Maintenance
+ - chore(deps): Bump github.com/prometheus/common from 0.45.0 to
+ 0.53.0 @dependabot (#11090)
+ - chore(deps-dev): Bump eslint from 8.57.0 to 9.4.0 in
+ /provider-ui @dependabot (#11085)
+ - chore(deps): Bump cron-time-generator from 1.3.2 to 2.0.3 in
+ /ui @dependabot (#11080)
+ - chore(deps-dev): Bump @cypress/code-coverage from 3.12.26 to
+ 3.12.39 in /provider-ui @dependabot (#11084)
+ - chore(deps-dev): Bump @storybook/addon-interactions from
+ 6.5.16 to 8.1.5 in /ui @dependabot (#11083)
+ - chore(deps-dev): Bump @cypress/code-coverage from 3.12.16 to
+ 3.12.39 in /ui @dependabot (#11082)
+ - chore(deps-dev): Bump eslint-plugin-cypress from 2.15.1 to
+ 3.3.0 in /provider-ui @dependabot (#11087)
+ - chore(deps): Bump react-dom from 18.2.0 to 18.3.1 in
+ /provider-ui @dependabot (#11088)
+ - chore(deps): Bump github.com/spf13/viper from 1.17.0 to
+ 1.18.2 @dependabot (#11091)
+ * Documentation
+ - Categorization of Permissions @iArchitSharma (#11053)
+ - [Docs] Meshery Registry @leecalcote (#11069)
+
+-------------------------------------------------------------------
Old:
----
meshery-0.7.67.obscpio
New:
----
meshery-0.7.69.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mesheryctl.spec ++++++
--- /var/tmp/diff_new_pack.2gxlH7/_old 2024-06-04 12:52:54.031679042 +0200
+++ /var/tmp/diff_new_pack.2gxlH7/_new 2024-06-04 12:52:54.051679769 +0200
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: mesheryctl
-Version: 0.7.67
+Version: 0.7.69
Release: 0
Summary: CLI for the meshery cloud native management plane
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.2gxlH7/_old 2024-06-04 12:52:54.307689058 +0200
+++ /var/tmp/diff_new_pack.2gxlH7/_new 2024-06-04 12:52:54.339690219 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/meshery/meshery</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v0.7.67</param>
+ <param name="revision">v0.7.69</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">disable</param>
<param name="versionrewrite-pattern">v(.*)</param>
@@ -17,7 +17,7 @@
<param name="compression">gz</param>
</service>
<service name="go_modules" mode="manual">
- <param name="archive">meshery-0.7.67.obscpio</param>
+ <param name="archive">meshery-0.7.69.obscpio</param>
</service>
</services>
++++++ meshery-0.7.67.obscpio -> meshery-0.7.69.obscpio ++++++
/work/SRC/openSUSE:Factory/mesheryctl/meshery-0.7.67.obscpio /work/SRC/openSUSE:Factory/.mesheryctl.new.24587/meshery-0.7.69.obscpio differ: char 50, line 1
++++++ meshery.obsinfo ++++++
--- /var/tmp/diff_new_pack.2gxlH7/_old 2024-06-04 12:52:54.703703423 +0200
+++ /var/tmp/diff_new_pack.2gxlH7/_new 2024-06-04 12:52:54.743704870 +0200
@@ -1,5 +1,5 @@
name: meshery
-version: 0.7.67
-mtime: 1716941752
-commit: 1ae040e685f146d5635f80b075af87d49b0e4f6d
+version: 0.7.69
+mtime: 1717287867
+commit: c3e713c908e34935fea7cb843c76c8de7b2cd27c
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/mesheryctl/vendor.tar.gz /work/SRC/openSUSE:Factory/.mesheryctl.new.24587/vendor.tar.gz differ: char 5, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pyscard for openSUSE:Factory checked in at 2024-06-04 12:51:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pyscard (Old)
and /work/SRC/openSUSE:Factory/.python-pyscard.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pyscard"
Tue Jun 4 12:51:32 2024 rev:19 rq:1178369 version:2.0.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pyscard/python-pyscard.changes 2024-04-08 17:53:18.795991325 +0200
+++ /work/SRC/openSUSE:Factory/.python-pyscard.new.24587/python-pyscard.changes 2024-06-04 12:52:11.982153160 +0200
@@ -1,0 +2,6 @@
+Mon Jun 3 17:20:29 UTC 2024 - Martin Hauke <mardnh(a)gmx.de>
+
+- Update to version 2.0.10
+ * CardMonitoringThread(): do not catch unexpected exceptions
+
+-------------------------------------------------------------------
Old:
----
pyscard-2.0.9.tar.gz
New:
----
pyscard-2.0.10.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pyscard.spec ++++++
--- /var/tmp/diff_new_pack.8PpacR/_old 2024-06-04 12:52:12.722180014 +0200
+++ /var/tmp/diff_new_pack.8PpacR/_new 2024-06-04 12:52:12.722180014 +0200
@@ -19,7 +19,7 @@
%define modname pyscard
Name: python-pyscard
-Version: 2.0.9
+Version: 2.0.10
Release: 0
Summary: Python module adding smart card support
License: LGPL-2.0-or-later
++++++ pyscard-2.0.9.tar.gz -> pyscard-2.0.10.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyscard-2.0.9/ChangeLog new/pyscard-2.0.10/ChangeLog
--- old/pyscard-2.0.9/ChangeLog 2024-04-05 22:30:03.000000000 +0200
+++ new/pyscard-2.0.10/ChangeLog 2024-06-01 11:15:52.000000000 +0200
@@ -1,3 +1,8 @@
+2.0.10 (June 2024)
+==================
+ * add 'swig' in pyproject.toml build requires
+ * CardMonitoringThread(): do not catch unexpected exceptions
+
2.0.9 (April 2024)
==================
* fix a bug with CardRequestTimeoutException introduced in 2.0.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyscard-2.0.9/Makefile new/pyscard-2.0.10/Makefile
--- old/pyscard-2.0.9/Makefile 2023-12-24 13:13:32.000000000 +0100
+++ new/pyscard-2.0.10/Makefile 2024-06-01 11:22:03.000000000 +0200
@@ -1,9 +1,12 @@
PYTHON ?= python3
-COVERAGE ?= python3-coverage
+COVERAGE ?= coverage
build:
$(PYTHON) -m build
+install: clean
+ $(PYTHON) -m pip install --editable .
+
clean:
$(PYTHON) setup.py clean
rm -rf build
@@ -21,8 +24,7 @@
$(PYTHON) -m build
python3 -m twine upload dist/*
-test:
- $(PYTHON) -m pip install --editable .
+test: install
pytest
coverage:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyscard-2.0.9/PKG-INFO new/pyscard-2.0.10/PKG-INFO
--- old/pyscard-2.0.9/PKG-INFO 2024-04-06 15:11:10.804715400 +0200
+++ new/pyscard-2.0.10/PKG-INFO 2024-06-01 11:48:06.619062400 +0200
@@ -1,9 +1,9 @@
Metadata-Version: 2.1
Name: pyscard
-Version: 2.0.9
+Version: 2.0.10
Summary: Smartcard module for Python.
Home-page: https://github.com/LudovicRousseau/pyscard
-Download-URL: http://sourceforge.net/projects/pyscard/files/pyscard/pyscard%202.0.9/pysca…
+Download-URL: http://sourceforge.net/projects/pyscard/files/pyscard/pyscard%202.0.10/pysc…
Author: Ludovic Rousseau
Author-email: ludovic.rousseau(a)free.fr
Platform: linux
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyscard-2.0.9/pyproject.toml new/pyscard-2.0.10/pyproject.toml
--- old/pyscard-2.0.9/pyproject.toml 2023-12-24 13:13:32.000000000 +0100
+++ new/pyscard-2.0.10/pyproject.toml 2024-05-16 19:12:54.000000000 +0200
@@ -1,3 +1,3 @@
[build-system]
-requires = ["setuptools"]
+requires = ["setuptools","swig"]
build-backend = "setuptools.build_meta"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyscard-2.0.9/pyscard.egg-info/PKG-INFO new/pyscard-2.0.10/pyscard.egg-info/PKG-INFO
--- old/pyscard-2.0.9/pyscard.egg-info/PKG-INFO 2024-04-06 15:11:10.000000000 +0200
+++ new/pyscard-2.0.10/pyscard.egg-info/PKG-INFO 2024-06-01 11:48:06.000000000 +0200
@@ -1,9 +1,9 @@
Metadata-Version: 2.1
Name: pyscard
-Version: 2.0.9
+Version: 2.0.10
Summary: Smartcard module for Python.
Home-page: https://github.com/LudovicRousseau/pyscard
-Download-URL: http://sourceforge.net/projects/pyscard/files/pyscard/pyscard%202.0.9/pysca…
+Download-URL: http://sourceforge.net/projects/pyscard/files/pyscard/pyscard%202.0.10/pysc…
Author: Ludovic Rousseau
Author-email: ludovic.rousseau(a)free.fr
Platform: linux
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyscard-2.0.9/setup.py new/pyscard-2.0.10/setup.py
--- old/pyscard-2.0.9/setup.py 2024-04-05 22:30:24.000000000 +0200
+++ new/pyscard-2.0.10/setup.py 2024-06-01 11:16:03.000000000 +0200
@@ -64,7 +64,7 @@
except:
platform_include_dirs = ['/usr/include/PCSC', '/usr/local/include/PCSC']
-VERSION_INFO = (2, 0, 9, 0)
+VERSION_INFO = (2, 0, 10, 0)
VERSION_STR = '%i.%i.%i' % VERSION_INFO[:3]
VERSION_ALT = '%i,%01i,%01i,%04i' % VERSION_INFO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyscard-2.0.9/smartcard/CardMonitoring.py new/pyscard-2.0.10/smartcard/CardMonitoring.py
--- old/pyscard-2.0.9/smartcard/CardMonitoring.py 2024-03-04 18:44:32.000000000 +0100
+++ new/pyscard-2.0.10/smartcard/CardMonitoring.py 2024-05-08 22:37:07.000000000 +0200
@@ -180,17 +180,6 @@
self.observable.notifyObservers(
(addedcards, removedcards))
- # when CardMonitoringThread.__del__() is invoked in
- # response to shutdown, e.g., when execution of the
- # program is done, other globals referenced by the
- # __del__() method may already have been deleted.
- # this causes ReaderMonitoringThread.run() to except
- # with a TypeError or AttributeError
- except TypeError:
- pass
- except AttributeError:
- pass
-
except SmartcardException as exc:
# FIXME Tighten the exceptions caught by this block
traceback.print_exc()
@@ -223,13 +212,6 @@
if self.instance:
return getattr(self.instance, name)
- # commented to avoid bad clean-up sequence of python where __del__
- # is called when some objects it uses are already gargabe collected
- # def __del__(self):
- # if CardMonitoringThread.instance!=None:
- # CardMonitoringThread.instance.stop()
- # CardMonitoringThread.instance = None
-
if __name__ == "__main__":
print('insert or remove cards in the next 10 seconds')
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package monitoring-plugins-http_json for openSUSE:Factory checked in at 2024-06-04 12:51:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-http_json (Old)
and /work/SRC/openSUSE:Factory/.monitoring-plugins-http_json.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "monitoring-plugins-http_json"
Tue Jun 4 12:51:16 2024 rev:4 rq:1178354 version:2.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/monitoring-plugins-http_json/monitoring-plugins-http_json.changes 2023-03-16 22:58:23.407471921 +0100
+++ /work/SRC/openSUSE:Factory/.monitoring-plugins-http_json.new.24587/monitoring-plugins-http_json.changes 2024-06-04 12:51:44.709163484 +0200
@@ -1,0 +2,11 @@
+Thu May 16 18:25:45 UTC 2024 - Martin Hauke <mardnh(a)gmx.de>
+
+- Update to version 2.2.0
+ * Bugfix: Disabled check_hostname to prevent error message when
+ setting CERT_NONE.
+ * Feature: Add flag to increase verbosity and flag to override
+ unreachable state.
+ * Feature: Add flag to override unreachable state.
+ * Extend tests for array syntax.
+
+-------------------------------------------------------------------
Old:
----
nagios-http-json-2.1.2.tar.gz
New:
----
nagios-http-json-2.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ monitoring-plugins-http_json.spec ++++++
--- /var/tmp/diff_new_pack.CqOKYC/_old 2024-06-04 12:51:45.121178435 +0200
+++ /var/tmp/diff_new_pack.CqOKYC/_new 2024-06-04 12:51:45.121178435 +0200
@@ -1,7 +1,7 @@
#
# spec file for package monitoring-plugins-http_json
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define modname monitoring-plugins-http_json
%define pythons python3
Name: monitoring-plugins-http_json
-Version: 2.1.2
+Version: 2.2.0
Release: 0
Summary: Plugin for Nagios which checks json values from a given HTTP endpoint
License: Apache-2.0
++++++ nagios-http-json-2.1.2.tar.gz -> nagios-http-json-2.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-http-json-2.1.2/.github/workflows/unittest.yml new/nagios-http-json-2.2.0/.github/workflows/unittest.yml
--- old/nagios-http-json-2.1.2/.github/workflows/unittest.yml 2022-09-15 15:25:38.000000000 +0200
+++ new/nagios-http-json-2.2.0/.github/workflows/unittest.yml 2024-05-16 10:24:10.000000000 +0200
@@ -7,7 +7,7 @@
runs-on: ubuntu-latest
strategy:
matrix:
- python-version: [3.8, 3,9]
+ python-version: [3.8, 3.11, 3.12]
name: GitHub Action
steps:
- name: Checkout
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-http-json-2.1.2/.gitignore new/nagios-http-json-2.2.0/.gitignore
--- old/nagios-http-json-2.1.2/.gitignore 2022-09-15 15:25:38.000000000 +0200
+++ new/nagios-http-json-2.2.0/.gitignore 2024-05-16 10:24:10.000000000 +0200
@@ -25,6 +25,7 @@
.installed.cfg
*.egg
.venv/
+venv/
# PyInstaller
# Usually these files are written by a python script from a template
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-http-json-2.1.2/Makefile new/nagios-http-json-2.2.0/Makefile
--- old/nagios-http-json-2.1.2/Makefile 2022-09-15 15:25:38.000000000 +0200
+++ new/nagios-http-json-2.2.0/Makefile 2024-05-16 10:24:10.000000000 +0200
@@ -1,9 +1,11 @@
.PHONY: lint test coverage
+PYTHON_PATH?=python3
+
lint:
- python -m pylint check_http_json.py
+ $(PYTHON_PATH) -m pylint check_http_json.py
test:
- python -m unittest discover
+ $(PYTHON_PATH) -m unittest discover
coverage:
- python -m coverage run -m unittest discover
- python -m coverage report -m --include check_http_json.py
+ $(PYTHON_PATH) -m coverage run -m unittest discover
+ $(PYTHON_PATH) -m coverage report -m --include check_http_json.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-http-json-2.1.2/README.md new/nagios-http-json-2.2.0/README.md
--- old/nagios-http-json-2.1.2/README.md 2022-09-15 15:25:38.000000000 +0200
+++ new/nagios-http-json-2.2.0/README.md 2024-05-16 10:24:10.000000000 +0200
@@ -38,11 +38,12 @@
argument specified rules and determines the status and performance data for
that service.
-Version: 2.1.2 (2022-09-15)
+Version: 2.2.0 (2024-05-14)
-optional arguments:
+options:
-h, --help show this help message and exit
-d, --debug debug mode
+ -v, --verbose Verbose mode. Multiple -v options increase the verbosity
-s, --ssl use TLS to connect to remote host
-H HOST, --host HOST remote host to query
-k, --insecure do not check server SSL certificate
@@ -56,61 +57,44 @@
-p PATH, --path PATH Path
-t TIMEOUT, --timeout TIMEOUT
Connection timeout (seconds)
+ --unreachable-state UNREACHABLE_STATE
+ Exit with specified code if URL unreachable. Examples: 1 for Warning, 2 for Critical, 3 for Unknown (default: 3)
-B AUTH, --basic-auth AUTH
Basic auth string "username:password"
-D DATA, --data DATA The http payload to send as a POST
-A HEADERS, --headers HEADERS
The http headers in JSON format.
-f SEPARATOR, --field_separator SEPARATOR
- JSON Field separator, defaults to "."; Select element
- in an array with "(" ")"
- -F SEPARATOR, --value_separator SEPARATOR
- JSON Value separator, defaults to ":";
- -w [KEY_THRESHOLD_WARNING [KEY_THRESHOLD_WARNING ...]], --warning [KEY_THRESHOLD_WARNING [KEY_THRESHOLD_WARNING ...]]
- Warning threshold for these values
- (key1[>alias],WarnRange key2[>alias],WarnRange).
- WarnRange is in the format [@]start:end, more
- information at nagios-plugins.org/doc/guidelines.html.
- -c [KEY_THRESHOLD_CRITICAL [KEY_THRESHOLD_CRITICAL ...]], --critical [KEY_THRESHOLD_CRITICAL [KEY_THRESHOLD_CRITICAL ...]]
- Critical threshold for these values
- (key1[>alias],CriticalRange
- key2[>alias],CriticalRange. CriticalRange is in the
- format [@]start:end, more information at nagios-
- plugins.org/doc/guidelines.html.
- -e [KEY_LIST [KEY_LIST ...]], --key_exists [KEY_LIST [KEY_LIST ...]]
- Checks existence of these keys to determine status.
- Return warning if key is not present.
- -E [KEY_LIST_CRITICAL [KEY_LIST_CRITICAL ...]], --key_exists_critical [KEY_LIST_CRITICAL [KEY_LIST_CRITICAL ...]]
+ JSON Field separator, defaults to "."; Select element in an array with "(" ")"
+ -F VALUE_SEPARATOR, --value_separator VALUE_SEPARATOR
+ JSON Value separator, defaults to ":"
+ -w [KEY_THRESHOLD_WARNING ...], --warning [KEY_THRESHOLD_WARNING ...]
+ Warning threshold for these values (key1[>alias],WarnRange key2[>alias],WarnRange). WarnRange is in the format
+ [@]start:end, more information at nagios-plugins.org/doc/guidelines.html.
+ -c [KEY_THRESHOLD_CRITICAL ...], --critical [KEY_THRESHOLD_CRITICAL ...]
+ Critical threshold for these values (key1[>alias],CriticalRange key2[>alias],CriticalRange. CriticalRange is in
+ the format [@]start:end, more information at nagios-plugins.org/doc/guidelines.html.
+ -e [KEY_LIST ...], --key_exists [KEY_LIST ...]
+ Checks existence of these keys to determine status. Return warning if key is not present.
+ -E [KEY_LIST_CRITICAL ...], --key_exists_critical [KEY_LIST_CRITICAL ...]
Same as -e but return critical if key is not present.
- -q [KEY_VALUE_LIST [KEY_VALUE_LIST ...]], --key_equals [KEY_VALUE_LIST [KEY_VALUE_LIST ...]]
- Checks equality of these keys and values
- (key[>alias],value key2,value2) to determine status.
- Multiple key values can be delimited with colon
- (key,value1:value2). Return warning if equality check
- fails
- -Q [KEY_VALUE_LIST_CRITICAL [KEY_VALUE_LIST_CRITICAL ...]], --key_equals_critical [KEY_VALUE_LIST_CRITICAL [KEY_VALUE_LIST_CRITICAL ...]]
- Same as -q but return critical if equality check
- fails.
- -u [KEY_VALUE_LIST_UNKNOWN [KEY_VALUE_LIST_UNKNOWN ...]], --key_equals_unknown [KEY_VALUE_LIST_UNKNOWN [KEY_VALUE_LIST_UNKNOWN ...]]
+ -q [KEY_VALUE_LIST ...], --key_equals [KEY_VALUE_LIST ...]
+ Checks equality of these keys and values (key[>alias],value key2,value2) to determine status. Multiple key values
+ can be delimited with colon (key,value1:value2). Return warning if equality check fails
+ -Q [KEY_VALUE_LIST_CRITICAL ...], --key_equals_critical [KEY_VALUE_LIST_CRITICAL ...]
+ Same as -q but return critical if equality check fails.
+ -u [KEY_VALUE_LIST_UNKNOWN ...], --key_equals_unknown [KEY_VALUE_LIST_UNKNOWN ...]
Same as -q but return unknown if equality check fails.
- -y [KEY_VALUE_LIST_NOT [KEY_VALUE_LIST_NOT ...]], --key_not_equals [KEY_VALUE_LIST_NOT [KEY_VALUE_LIST_NOT ...]]
- Checks equality of these keys and values
- (key[>alias],value key2,value2) to determine status.
- Multiple key values can be delimited with colon
- (key,value1:value2). Return warning if equality check
- succeeds
- -Y [KEY_VALUE_LIST_NOT_CRITICAL [KEY_VALUE_LIST_NOT_CRITICAL ...]], --key_not_equals_critical [KEY_VALUE_LIST_NOT_CRITICAL [KEY_VALUE_LIST_NOT_CRITICAL ...]]
- Same as -q but return critical if equality check
- succeeds.
- -m [METRIC_LIST [METRIC_LIST ...]], --key_metric [METRIC_LIST [METRIC_LIST ...]]
- Gathers the values of these keys (key[>alias],
- UnitOfMeasure,WarnRange,CriticalRange,Min,Max) for
- Nagios performance data. More information about Range
- format and units of measure for nagios can be found at
- nagios-plugins.org/doc/guidelines.html Additional
- formats for this parameter are: (key[>alias]),
- (key[>alias],UnitOfMeasure),
- (key[>alias],UnitOfMeasure,WarnRange, CriticalRange).
+ -y [KEY_VALUE_LIST_NOT ...], --key_not_equals [KEY_VALUE_LIST_NOT ...]
+ Checks equality of these keys and values (key[>alias],value key2,value2) to determine status. Multiple key values
+ can be delimited with colon (key,value1:value2). Return warning if equality check succeeds
+ -Y [KEY_VALUE_LIST_NOT_CRITICAL ...], --key_not_equals_critical [KEY_VALUE_LIST_NOT_CRITICAL ...]
+ Same as -q but return critical if equality check succeeds.
+ -m [METRIC_LIST ...], --key_metric [METRIC_LIST ...]
+ Gathers the values of these keys (key[>alias], UnitOfMeasure,WarnRange,CriticalRange,Min,Max) for Nagios
+ performance data. More information about Range format and units of measure for nagios can be found at nagios-
+ plugins.org/doc/guidelines.html Additional formats for this parameter are: (key[>alias]),
+ (key[>alias],UnitOfMeasure), (key[>alias],UnitOfMeasure,WarnRange, CriticalRange).
```
## Examples
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-http-json-2.1.2/check_http_json.py new/nagios-http-json-2.2.0/check_http_json.py
--- old/nagios-http-json-2.1.2/check_http_json.py 2022-09-15 15:25:38.000000000 +0200
+++ new/nagios-http-json-2.2.0/check_http_json.py 2024-05-16 10:24:10.000000000 +0200
@@ -6,7 +6,6 @@
import argparse
import sys
import ssl
-from pprint import pprint
from urllib.error import HTTPError
from urllib.error import URLError
@@ -24,8 +23,8 @@
CRITICAL_CODE = 2
UNKNOWN_CODE = 3
-__version__ = '2.1.2'
-__version_date__ = '2022-09-15'
+__version__ = '2.2.0'
+__version_date__ = '2024-05-14'
class NagiosHelper:
"""
@@ -69,20 +68,19 @@
code = UNKNOWN_CODE
return code
- def append_warning(self, warning_message):
- self.warning_message += warning_message
-
- def append_critical(self, critical_message):
- self.critical_message += critical_message
-
- def append_unknown(self, unknown_message):
- self.unknown_message += unknown_message
+ def append_message(self, code, msg):
+ if code > 2 or code < 0:
+ self.unknown_message += msg
+ if code == 1:
+ self.warning_message += msg
+ if code == 2:
+ self.critical_message += msg
def append_metrics(self, metrics):
(performance_data, warning_message, critical_message) = metrics
self.performance_data += performance_data
- self.append_warning(warning_message)
- self.append_critical(critical_message)
+ self.append_message(WARNING_CODE, warning_message)
+ self.append_message(CRITICAL_CODE, critical_message)
class JsonHelper:
@@ -423,6 +421,9 @@
parser.add_argument('-d', '--debug', action='store_true',
help='debug mode')
+ parser.add_argument('-v', '--verbose', action='count', default=0,
+ help='Verbose mode. Multiple -v options increase the verbosity')
+
parser.add_argument('-s', '--ssl', action='store_true',
help='use TLS to connect to remote host')
parser.add_argument('-H', '--host', dest='host',
@@ -444,6 +445,8 @@
parser.add_argument('-p', '--path', dest='path', help='Path')
parser.add_argument('-t', '--timeout', type=int,
help='Connection timeout (seconds)')
+ parser.add_argument('--unreachable-state', type=int, default=3,
+ help='Exit with specified code if URL unreachable. Examples: 1 for Warning, 2 for Critical, 3 for Unknown (default: 3)')
parser.add_argument('-B', '--basic-auth', dest='auth',
help='Basic auth string "username:password"')
parser.add_argument('-D', '--data', dest='data',
@@ -516,16 +519,92 @@
return parser.parse_args(args)
-def debugPrint(debug_flag, message, pretty_flag=False):
+def debugPrint(debug_flag, message):
"""
- Print debug messages if -d (debug_flat ) is set.
+ Print debug messages if -d is set.
"""
+ if not debug_flag:
+ return
- if debug_flag:
- if pretty_flag:
- pprint(message)
- else:
- print(message)
+ print(message)
+
+def verbosePrint(verbose_flag, when, message):
+ """
+ Print verbose messages if -v is set.
+ Since -v can be used multiple times, the when parameter sets the required amount before printing
+ """
+ if not verbose_flag:
+ return
+ if verbose_flag >= when:
+ print(message)
+
+def prepare_context(args):
+ """
+ Prepare TLS Context
+ """
+ nagios = NagiosHelper()
+
+ context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+ context.options |= ssl.OP_NO_SSLv2
+ context.options |= ssl.OP_NO_SSLv3
+
+ if args.insecure:
+ context.check_hostname = False
+ context.verify_mode = ssl.CERT_NONE
+ else:
+ context.verify_mode = ssl.CERT_OPTIONAL
+ context.load_default_certs()
+ if args.cacert:
+ try:
+ context.load_verify_locations(args.cacert)
+ except ssl.SSLError:
+ nagios.append_message(UNKNOWN_CODE, 'Error loading SSL CA cert "%s"!' % args.cacert)
+ if args.cert:
+ try:
+ context.load_cert_chain(args.cert, keyfile=args.key)
+ except ssl.SSLError:
+ if args.key:
+ nagios.append_message(UNKNOWN_CODE, 'Error loading SSL cert. Make sure key "%s" belongs to cert "%s"!' % (args.key, args.cert))
+ else:
+ nagios.append_message(UNKNOWN_CODE, 'Error loading SSL cert. Make sure "%s" contains the key as well!' % (args.cert))
+
+ if nagios.getCode() != OK_CODE:
+ print(nagios.getMessage())
+ sys.exit(nagios.getCode())
+
+ return context
+
+
+def make_request(args, url, context):
+ """
+ Performs the actual request to the given URL
+ """
+ req = urllib.request.Request(url, method=args.method)
+ req.add_header("User-Agent", "check_http_json")
+ if args.auth:
+ authbytes = str(args.auth).encode()
+ base64str = base64.encodebytes(authbytes).decode().replace('\n', '')
+ req.add_header('Authorization', 'Basic %s' % base64str)
+ if args.headers:
+ headers = json.loads(args.headers)
+ debugPrint(args.debug, "Headers:\n %s" % headers)
+ for header in headers:
+ req.add_header(header, headers[header])
+ if args.timeout and args.data:
+ databytes = str(args.data).encode()
+ response = urllib.request.urlopen(req, timeout=args.timeout,
+ data=databytes, context=context)
+ elif args.timeout:
+ response = urllib.request.urlopen(req, timeout=args.timeout,
+ context=context)
+ elif args.data:
+ databytes = str(args.data).encode()
+ response = urllib.request.urlopen(req, data=databytes, context=context)
+ else:
+ # pylint: disable=consider-using-with
+ response = urllib.request.urlopen(req, context=context)
+
+ return response.read()
def main(cliargs):
@@ -543,41 +622,7 @@
if args.ssl:
url = "https://%s" % args.host
-
- context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
- context.options |= ssl.OP_NO_SSLv2
- context.options |= ssl.OP_NO_SSLv3
-
- if args.insecure:
- context.verify_mode = ssl.CERT_NONE
- else:
- context.verify_mode = ssl.CERT_OPTIONAL
- context.load_default_certs()
- if args.cacert:
- try:
- context.load_verify_locations(args.cacert)
- except ssl.SSLError:
- nagios.append_unknown(
- 'Error loading SSL CA cert "%s"!'
- % args.cacert)
-
- if args.cert:
- try:
- context.load_cert_chain(args.cert, keyfile=args.key)
- except ssl.SSLError:
- if args.key:
- nagios.append_unknown(
- 'Error loading SSL cert. Make sure key "%s" belongs to cert "%s"!'
- % (args.key, args.cert))
- else:
- nagios.append_unknown(
- 'Error loading SSL cert. Make sure "%s" contains the key as well!'
- % (args.cert))
-
- if nagios.getCode() != OK_CODE:
- print(nagios.getMessage())
- sys.exit(nagios.getCode())
-
+ context = prepare_context(args)
else:
url = "http://%s" % args.host
if args.port:
@@ -585,60 +630,37 @@
if args.path:
url += "/%s" % args.path
- debugPrint(args.debug, "url:%s" % url)
+ debugPrint(args.debug, "url: %s" % url)
json_data = ''
try:
- req = urllib.request.Request(url, method=args.method)
- req.add_header("User-Agent", "check_http_json")
- if args.auth:
- authbytes = str(args.auth).encode()
- base64str = base64.encodebytes(authbytes).decode().replace('\n', '')
- req.add_header('Authorization', 'Basic %s' % base64str)
- if args.headers:
- headers = json.loads(args.headers)
- debugPrint(args.debug, "Headers:\n %s" % headers)
- for header in headers:
- req.add_header(header, headers[header])
- if args.timeout and args.data:
- databytes = str(args.data).encode()
- response = urllib.request.urlopen(req, timeout=args.timeout,
- data=databytes, context=context)
- elif args.timeout:
- response = urllib.request.urlopen(req, timeout=args.timeout,
- context=context)
- elif args.data:
- databytes = str(args.data).encode()
- response = urllib.request.urlopen(req, data=databytes, context=context)
- else:
- # pylint: disable=consider-using-with
- response = urllib.request.urlopen(req, context=context)
-
- json_data = response.read()
-
+ json_data = make_request(args, url, context)
except HTTPError as e:
# Try to recover from HTTP Error, if there is JSON in the response
if "json" in e.info().get_content_subtype():
json_data = e.read()
else:
- nagios.append_unknown(" HTTPError[%s], url:%s" % (str(e.code), url))
+ nagios.append_message(UNKNOWN_CODE, " Could not find JSON in HTTP body. HTTPError[%s], url:%s" % (str(e.code), url))
except URLError as e:
- nagios.append_critical(" URLError[%s], url:%s" % (str(e.reason), url))
+ # Some users might prefer another exit code if the URL wasn't reached
+ exit_code = args.unreachable_state
+ nagios.append_message(exit_code, " URLError[%s], url:%s" % (str(e.reason), url))
+ # Since we don't got any data, we can simply exit
+ print(nagios.getMessage())
+ sys.exit(nagios.getCode())
try:
data = json.loads(json_data)
except ValueError as e:
- nagios.append_unknown(" Parser error: %s" % str(e))
-
+ nagios.append_message(UNKNOWN_CODE, " JSON Parser error: %s" % str(e))
else:
- debugPrint(args.debug, 'json:')
- debugPrint(args.debug, data, True)
+ verbosePrint(args.verbose, 1, json.dumps(data, indent=2))
# Apply rules to returned JSON data
processor = JsonRuleProcessor(data, args)
- nagios.append_warning(processor.checkWarning())
- nagios.append_critical(processor.checkCritical())
+ nagios.append_message(WARNING_CODE, processor.checkWarning())
+ nagios.append_message(CRITICAL_CODE, processor.checkCritical())
nagios.append_metrics(processor.checkMetrics())
- nagios.append_unknown(processor.checkUnknown())
+ nagios.append_message(UNKNOWN_CODE, processor.checkUnknown())
# Print Nagios specific string and exit appropriately
print(nagios.getMessage())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-http-json-2.1.2/requirements-dev.txt new/nagios-http-json-2.2.0/requirements-dev.txt
--- old/nagios-http-json-2.1.2/requirements-dev.txt 2022-09-15 15:25:38.000000000 +0200
+++ new/nagios-http-json-2.2.0/requirements-dev.txt 2024-05-16 10:24:10.000000000 +0200
@@ -1,2 +1,2 @@
-coverage==6.4.4
-pylint==2.15.2
+coverage==6.5.0
+pylint==2.17.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-http-json-2.1.2/test/test_check_http_json.py new/nagios-http-json-2.2.0/test/test_check_http_json.py
--- old/nagios-http-json-2.1.2/test/test_check_http_json.py 2022-09-15 15:25:38.000000000 +0200
+++ new/nagios-http-json-2.2.0/test/test_check_http_json.py 2024-05-16 10:24:10.000000000 +0200
@@ -84,10 +84,10 @@
data = json.loads(jsondata)
nagios = NagiosHelper()
processor = JsonRuleProcessor(data, args)
- nagios.append_warning(processor.checkWarning())
- nagios.append_critical(processor.checkCritical())
+ nagios.append_message(WARNING_CODE, processor.checkWarning())
+ nagios.append_message(CRITICAL_CODE, processor.checkCritical())
nagios.append_metrics(processor.checkMetrics())
- nagios.append_unknown(processor.checkUnknown())
+ nagios.append_message(UNKNOWN_CODE, processor.checkUnknown())
self.assertEqual(code, nagios.getCode())
def test_metrics(self):
@@ -110,6 +110,14 @@
self.check_data(RulesHelper().dash_U(['metric,0']),
'{"metric": 3}', UNKNOWN_CODE)
+ def test_array(self):
+ self.check_data(RulesHelper().dash_q(['foo(0),bar']),
+ '{"foo": ["bar"]}', OK_CODE)
+ self.check_data(RulesHelper().dash_q(['foo(0),foo']),
+ '{"foo": ["bar"]}', WARNING_CODE)
+ self.check_data(RulesHelper().dash_Q(['foo(1),bar']),
+ '{"foo": ["bar"]}', CRITICAL_CODE)
+
def test_exists(self):
self.check_data(RulesHelper().dash_e(['nothere']),
'{"metric": 5}', WARNING_CODE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-http-json-2.1.2/test/test_cli.py new/nagios-http-json-2.2.0/test/test_cli.py
--- old/nagios-http-json-2.1.2/test/test_cli.py 2022-09-15 15:25:38.000000000 +0200
+++ new/nagios-http-json-2.2.0/test/test_cli.py 2024-05-16 10:24:10.000000000 +0200
@@ -9,6 +9,7 @@
sys.path.append('..')
from check_http_json import debugPrint
+from check_http_json import verbosePrint
class CLITest(unittest.TestCase):
@@ -31,10 +32,13 @@
debugPrint(True, 'debug')
mock_print.assert_called_once_with('debug')
- def test_debugprint_pprint(self):
- with mock.patch('check_http_json.pprint') as mock_pprint:
- debugPrint(True, 'debug', True)
- mock_pprint.assert_called_once_with('debug')
+ def test_verbose(self):
+ with mock.patch('builtins.print') as mock_print:
+ verbosePrint(0, 3, 'verbose')
+ mock_print.assert_not_called()
+
+ verbosePrint(3, 3, 'verbose')
+ mock_print.assert_called_once_with('verbose')
def test_cli_without_params(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-http-json-2.1.2/test/test_main.py new/nagios-http-json-2.2.0/test/test_main.py
--- old/nagios-http-json-2.1.2/test/test_main.py 2022-09-15 15:25:38.000000000 +0200
+++ new/nagios-http-json-2.2.0/test/test_main.py 2024-05-16 10:24:10.000000000 +0200
@@ -95,3 +95,37 @@
main(args)
self.assertEqual(test.exception.code, 0)
+
+ @mock.patch('builtins.print')
+ def test_main_with_tls(self, mock_print):
+ args = ['-H', 'localhost',
+ '--ssl',
+ '--cacert',
+ 'test/tls/ca-root.pem',
+ '--cert',
+ 'test/tls/cert.pem',
+ '--key',
+ 'test/tls/key.pem']
+
+ with self.assertRaises(SystemExit) as test:
+ main(args)
+
+ self.assertTrue('https://localhost' in str(mock_print.call_args))
+ self.assertEqual(test.exception.code, 3)
+
+ @mock.patch('builtins.print')
+ def test_main_with_tls_wrong_ca(self, mock_print):
+ args = ['-H', 'localhost',
+ '--ssl',
+ '--cacert',
+ 'test/tls/key.pem',
+ '--cert',
+ 'test/tls/cert.pem',
+ '--key',
+ 'test/tls/key.pem']
+
+ with self.assertRaises(SystemExit) as test:
+ main(args)
+
+ self.assertTrue('Error loading SSL CA' in str(mock_print.call_args))
+ self.assertEqual(test.exception.code, 3)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-http-json-2.1.2/test/tls/ca-root.pem new/nagios-http-json-2.2.0/test/tls/ca-root.pem
--- old/nagios-http-json-2.1.2/test/tls/ca-root.pem 1970-01-01 01:00:00.000000000 +0100
+++ new/nagios-http-json-2.2.0/test/tls/ca-root.pem 2024-05-16 10:24:10.000000000 +0200
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIUB6EZDl3ajJgJsoLzyC9DrOQQpKowDQYJKoZIhvcNAQEN
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0yNDAzMTgwODE5MDhaGA8yMDUx
+MDgwMzA4MTkwOFowRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx
+ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALVxioj+6zw6Snr+B1JOivC8Of6YptVYym5ICiHX
+wjpbSVVe+Py/P2LDb/uQ1QkAENlpvChFqSaRBZU5keXYS/DaFb2Evb2/zf5qIdWU
+2ju8B5V13gXSeaNNetyEn1Ivvk0lOCQo2RwEZXuStpLS4Q32rkRBvkoL+RXDc1NX
+c3RwcU1p9ybgBqAC7FYdV82sgHGugIrbzkjfFREJXp1AnqvKAdk39b1CnPxfmPZC
+nzPPetfr3iivH8yVO5rodU/LDtQNph22JR94YvPB89QO+bZ9bw2GHtPdAKFew9HF
+UxM1fmy381Mq2iS3KUq5vsC1jMe8slUAIFYEDzoPvOz+MpcCAwEAAaNTMFEwHQYD
+VR0OBBYEFOmCb+JnMzX29hwgtXSzrN+m6mTDMB8GA1UdIwQYMBaAFOmCb+JnMzX2
+9hwgtXSzrN+m6mTDMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQENBQADggEB
+AAkTD8K4UO4uO4i6p2BCofbhVm9LYA0ulmLO8Uro0U491TeEDOQpgMFAK+b2gZIU
+zvDHoCMn3UPVxHKl7XzDgLZVkYYEc2s9vArxk5vSnFmh3XvlDu2SO5gSLB2sf68A
+2+Jz2x6z9tjWWdZCGJWU/iwMbG2Y3JMHyv1NMF8cyOclJaSDNBAwF5c5sdlGTLKb
+WHGXzVqHSAFlGcHtQrcEKclHiuzw2G3LZzwghGk0XzxwvyKrnAEy408RY0mfNLtz
+32KHqYtrip0RYlGWKP7/7q6i0D8muEFW/I4emFI0z0I/1CcYZZS8tQkWaPf/wCN0
+llTD1kKJACsIMaqkkyy+EZM=
+-----END CERTIFICATE-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-http-json-2.1.2/test/tls/cert.pem new/nagios-http-json-2.2.0/test/tls/cert.pem
--- old/nagios-http-json-2.1.2/test/tls/cert.pem 1970-01-01 01:00:00.000000000 +0100
+++ new/nagios-http-json-2.2.0/test/tls/cert.pem 2024-05-16 10:24:10.000000000 +0200
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDDzCCAfcCFBOrBcHIH2x9xcUyUeDid0cvBxWtMA0GCSqGSIb3DQEBDQUAMEUx
+CzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
+cm5ldCBXaWRnaXRzIFB0eSBMdGQwIBcNMjQwMzE4MDgxOTM1WhgPMjA1MTA4MDMw
+ODE5MzVaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYD
+VQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEeMA0GCSqGSIb3DQEBAQUA
+A4IBCwAwggEGAoH+ALuzyIhEATF5YyAOsXKfr2mttF2HyJvEscGcoA7YetT57bjJ
+5lg944kc3QH/wTEdrGda3cwh3OXdUuyR7Wrm9jPw38hMArx/fWPkiISOShrUSHGd
+Qyy2bT+zxBaUo+pomyrlqlgwGlbxuwTAlTSFcI+i7yXrckl2HRj40EW4FNsYpPzv
+maxRXs0kg0J2JLTYF+fHlqlYbSX/hRU9wz2DYfkRSS0+OYJNSmqK0jayUsdZYurG
+gbPwOCgQ0QxLLh7P8z4sOanRowqUzqTI77cyUugEJRyoi+LJr4r0EwMTBX3STgPh
+S9B78+LNvwOrLrZFUhr144RfO9QPLnz0uWcCAwEAATANBgkqhkiG9w0BAQ0FAAOC
+AQEAeIR21PfLzgpL7WDBE2KgwI78nVc1wY9nwoAxSBzHjS0Olve3r9MaVzAKn5ZS
+xHtv8oroXjhTcczCIzxii6Imp6u0iIr3QVBIceofxrH3aWmICURcC9l+dIiY6sk9
+Ct8P8gm/Erv2iF/7bnsARwDnw0f41fC9eXtHZ7WLRQrc7tLHpjL0Z7bT77ysQJVK
+C1SWtBnq3afmwH3R1wVHENn0JVFQpBp+vqWU5KIlvjcz49yPU+aNODk1rJsHMlgS
+x2iddwF31GNOxNfXtw8fdw4UDUl2wYoZ45w2e2pXt4pbN43m0Wys1eQZdk3tyR6G
+AZOLP05073mLtbVlFRmcTdXIGg==
+-----END CERTIFICATE-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nagios-http-json-2.1.2/test/tls/key.pem new/nagios-http-json-2.2.0/test/tls/key.pem
--- old/nagios-http-json-2.1.2/test/tls/key.pem 1970-01-01 01:00:00.000000000 +0100
+++ new/nagios-http-json-2.2.0/test/tls/key.pem 2024-05-16 10:24:10.000000000 +0200
@@ -0,0 +1,27 @@
+-----BEGIN PRIVATE KEY-----
+MIIEqAIBADANBgkqhkiG9w0BAQEFAASCBJIwggSOAgEAAoH+ALuzyIhEATF5YyAO
+sXKfr2mttF2HyJvEscGcoA7YetT57bjJ5lg944kc3QH/wTEdrGda3cwh3OXdUuyR
+7Wrm9jPw38hMArx/fWPkiISOShrUSHGdQyy2bT+zxBaUo+pomyrlqlgwGlbxuwTA
+lTSFcI+i7yXrckl2HRj40EW4FNsYpPzvmaxRXs0kg0J2JLTYF+fHlqlYbSX/hRU9
+wz2DYfkRSS0+OYJNSmqK0jayUsdZYurGgbPwOCgQ0QxLLh7P8z4sOanRowqUzqTI
+77cyUugEJRyoi+LJr4r0EwMTBX3STgPhS9B78+LNvwOrLrZFUhr144RfO9QPLnz0
+uWcCAwEAAQKB/UQAYzMy5/fDkWzoxdLQFV3E56ZG7h+4x+lr0/Ts6rtD/KLIyqHH
+ciqXgV4bCSPBK1eabOZqkjvYzhUU3R2wpRu2NWy8VPVzfrr07ZyQbDqCE+jNX6vQ
+P44nk2/W0/e1hBmrcOZYLwK2utmC58tKWLhBAEENpq8EkpAcfF/1y9aRHKYwNnH7
+vouoQibN5NTs5m8s0VyjRTDwRZja98eWnn5NfU3orqYO8fSlF6CyzDtoyhMco6zR
+0skBgMzRYCRTuJpV+KekC7XFYyiJ6XZN5DKLbbqP6Y7YR8wjyFEruoGCS0mZH2H0
+9/rhTsJram1B2zohXHPsHJGGGv12/7kCfw5C7yda+8Yv0NmRp1F+EJYb75SCAWIP
+kzN/xvjP2bMKa6oSzU0DOga3Wc4ijJHDaND8rqdPqQe3zXFr1nPdBrybLSJ6k5CN
+4Dd6ENJWVWino0L460kpLtlBG6TsgmB8bkwhjWVE6Vgt4Vila+a3TGRXeniaRzdw
+icNOtMrjYlUCfw0pWEvO2uFq0DbNZbmzC2j5ClFcU96CAl4AqKG2PiGnuSy9TKVZ
+c5OiXFmyoig7v4LJzaKLSqVIN4hVBU80/MlhvG+dpeimvLaQKNtlZQethIs5hXlB
+R1XfaPhq6BQiYmQ3tufyS/0Es2OY+Cs3LU1uDB8qVzonlmnIi69OwMsCfwRPISfJ
+C+4UIIy8v8uVxbk1c6xxo61Xe2jCIQKo+uRoL6PRzoqIgQ3qdI4eTk70tkT/NF6F
+aVNVrBOrO78Cd7ihQn/6fX/d/nOExHRpdaELlf70a1NNyEQIsiug8rvonQMP2ENT
+ERZ9tmssgG/Tzpc6/1xVcVNFA7spmuL61YkCfwnu2zGTc0PO7kd96rkktIbL9YqD
+6NQ0QH8bdildtjSGNc3bLB5ajUytq48Sryk4NogJr8Vt5K8q+qZMrE4kCmgd+C4w
+x4b3V9Ncp0k1k/MgdLjyd5aUurbHfpyFapPPg3xpRAR3q/vP8WdIintrECiw1jsr
+JFvChtVdQnbTM9MCfw41RcjNwCaIG+uXc8bD6Yf+NyXD8zP6ZDywmBlkMWlGSzx4
+xM8J+wQiQsNWthDBbF7inJc+lbtJiEe4YOPkbjCYVZRHribL65HKJlEUv6M9bvQo
+3P1DS5tDrwo6z9UPs4tD1SgF9fDu/xA7fwPF1RTvuW07MhFJWlDo4FSWS9c=
+-----END PRIVATE KEY-----
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package orafce for openSUSE:Factory checked in at 2024-06-04 12:51:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/orafce (Old)
and /work/SRC/openSUSE:Factory/.orafce.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orafce"
Tue Jun 4 12:51:14 2024 rev:19 rq:1178357 version:4.10.3+git0.e050dd6
Changes:
--------
--- /work/SRC/openSUSE:Factory/orafce/orafce.changes 2024-05-24 19:51:59.519377371 +0200
+++ /work/SRC/openSUSE:Factory/.orafce.new.24587/orafce.changes 2024-06-04 12:51:43.553121534 +0200
@@ -1,0 +2,7 @@
+Mon Jun 03 07:22:01 UTC 2024 - emiliano.langella(a)suse.com
+
+- Update to version 4.10.3+git0.e050dd6:
+ * prepare for 4.10.3
+ * security check can be ignored when the value is configured by ALTER SYSTEM, and in reload the system is not in transactional state. fix #270
+
+-------------------------------------------------------------------
Old:
----
orafce-4.10.2+git0.8d10ace.obscpio
New:
----
orafce-4.10.3+git0.e050dd6.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ orafce.spec ++++++
--- /var/tmp/diff_new_pack.IXk72T/_old 2024-06-04 12:51:44.337149985 +0200
+++ /var/tmp/diff_new_pack.IXk72T/_new 2024-06-04 12:51:44.337149985 +0200
@@ -20,7 +20,7 @@
%define realname orafce
Name: %{pgname}-orafce
-Version: 4.10.2+git0.8d10ace
+Version: 4.10.3+git0.e050dd6
Release: 0
Summary: Implementation of some Oracle functions into PostgreSQL
Group: Productivity/Databases/Tools
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.IXk72T/_old 2024-06-04 12:51:44.393152017 +0200
+++ /var/tmp/diff_new_pack.IXk72T/_new 2024-06-04 12:51:44.397152162 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/orafce/orafce.git</param>
- <param name="changesrevision">8d10acec102616d9825d2f6e1b7c9f8b25dbc7cd</param></service></servicedata>
+ <param name="changesrevision">e050dd6ab1eb66c71450421977c0356799c36cfc</param></service></servicedata>
(No newline at EOF)
++++++ orafce-4.10.2+git0.8d10ace.obscpio -> orafce-4.10.3+git0.e050dd6.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orafce-4.10.2+git0.8d10ace/META.json new/orafce-4.10.3+git0.e050dd6/META.json
--- old/orafce-4.10.2+git0.8d10ace/META.json 2024-05-20 19:36:36.000000000 +0200
+++ new/orafce-4.10.3+git0.e050dd6/META.json 2024-05-29 09:29:23.000000000 +0200
@@ -2,7 +2,7 @@
"name": "orafce",
"abstract": "Oracle's compatibility functions and packages",
"description": "This module allows use a well known Oracle's functions and packages inside PostgreSQL",
- "version": "4.10.2",
+ "version": "4.10.3",
"maintainer": [
"Pavel Stehule <pavel.stehule(a)gmail.com>",
"Takahiro Itagaki <itagaki.takahiro(a)gmail.com>"
@@ -25,7 +25,7 @@
"orafce": {
"file": "sql/orafce.sql",
"docfile": "README.orafce",
- "version": "4.10.2",
+ "version": "4.10.3",
"abstract": "Oracle's compatibility functions and packages"
}
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orafce-4.10.2+git0.8d10ace/file.c new/orafce-4.10.3+git0.e050dd6/file.c
--- old/orafce-4.10.2+git0.8d10ace/file.c 2024-05-20 19:36:36.000000000 +0200
+++ new/orafce-4.10.3+git0.e050dd6/file.c 2024-05-29 09:29:23.000000000 +0200
@@ -146,7 +146,7 @@
char *ptr = *newval;
int *myextra;
- if (orafce_initialized && IsNormalProcessingMode())
+ if (orafce_initialized && IsNormalProcessingMode() && IsTransactionState())
{
if (!superuser())
{
++++++ orafce.obsinfo ++++++
--- /var/tmp/diff_new_pack.IXk72T/_old 2024-06-04 12:51:44.613160000 +0200
+++ /var/tmp/diff_new_pack.IXk72T/_new 2024-06-04 12:51:44.613160000 +0200
@@ -1,5 +1,5 @@
name: orafce
-version: 4.10.2+git0.8d10ace
-mtime: 1716226596
-commit: 8d10acec102616d9825d2f6e1b7c9f8b25dbc7cd
+version: 4.10.3+git0.e050dd6
+mtime: 1716967763
+commit: e050dd6ab1eb66c71450421977c0356799c36cfc
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocserv for openSUSE:Factory checked in at 2024-06-04 12:51:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocserv (Old)
and /work/SRC/openSUSE:Factory/.ocserv.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocserv"
Tue Jun 4 12:51:13 2024 rev:24 rq:1178350 version:1.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocserv/ocserv.changes 2024-03-01 23:40:06.667234832 +0100
+++ /work/SRC/openSUSE:Factory/.ocserv.new.24587/ocserv.changes 2024-06-04 12:51:42.349077842 +0200
@@ -1,0 +2,31 @@
+Wed May 15 12:58:13 UTC 2024 - Андрей Кувшинов <m407(a)mail.ru>
+
+- Update to version 1.3.0
+ * Switch to https://github.com/nodejs/llhttp from http-parser.
+ http-parser was a liability as an unmaintained project (#598)
+ * Bump the number of groups per account from 128 to 512 (#219)
+ * Allow connecting users to select an authgroup by appending the
+ group name to the URL, as in https://vpn.example.com/groupname;
+ this introduces the select-group-by-url config option (#597).
+ * Informational messages due to configuration loading are not printed
+ during worker initialization.
+- Update to version 1.2.4
+ * Get connection speed limits (traffic shaping) from RADIUS (#554)
+ * Fix logging to stderr: add missing newline.
+ * Fixed compatibility with AnyConnect clients on Linux (#544)
+ * Detect the new AnyConnect-compatible identifier of OpenConnect clients
+ * occtl: Print bit rates as kb/s.
+- Update to version 1.2.3
+ * Treat unknown clients as capable of IPv6 routes and DNS servers
+ * Introduced new ocserv options --log-stderr and --syslog that redirect
+ logging to stderr or syslog explicitly. The stderr option allows for better
+ integration with logging on containers or under systemd. The default remains
+ syslog.
+ * Warn when more than 2 DNS server IPv6 addresses are sent by Radius.
+ * Improved server shutdown (#563)
+ * Modified Camouflage functionality to allow AnyConnect clients (#544)
+ * ocserv-fw: Move under libexec.
+ * ocserv-fw: Fixed clean_all_rules logic on multiple similar devices (!384)
+ * occtl: added machine-readable raw_connected_at field for user stats
+
+-------------------------------------------------------------------
Old:
----
ocserv-1.2.2.tar.xz
ocserv-1.2.2.tar.xz.sig
New:
----
ocserv-1.3.0.tar.xz
ocserv-1.3.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocserv.spec ++++++
--- /var/tmp/diff_new_pack.ujcBAP/_old 2024-06-04 12:51:43.005101647 +0200
+++ /var/tmp/diff_new_pack.ujcBAP/_new 2024-06-04 12:51:43.009101793 +0200
@@ -17,7 +17,7 @@
Name: ocserv
-Version: 1.2.2
+Version: 1.3.0
Release: 0
Summary: OpenConnect VPN Server
License: GPL-2.0-only
@@ -45,6 +45,7 @@
BuildRequires: freeradius-client-devel
BuildRequires: gperf
BuildRequires: gpg2
+BuildRequires: ipcalc
BuildRequires: libev-devel
#!BuildIgnore: libevent-devel
BuildRequires: libgnutls-devel >= 3.1.10
@@ -145,7 +146,7 @@
%{_bindir}/occtl
%{_bindir}/ocpasswd
%{_bindir}/ocserv-script
-%{_bindir}/ocserv-fw
+%{_libexecdir}/ocserv-fw
%{_sbindir}/ocserv
%{_sbindir}/ocserv-forwarding
%{_sbindir}/ocserv-worker
++++++ ocserv-1.2.2.tar.xz -> ocserv-1.3.0.tar.xz ++++++
++++ 30272 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package tio for openSUSE:Factory checked in at 2024-06-04 12:51:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tio (Old)
and /work/SRC/openSUSE:Factory/.tio.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tio"
Tue Jun 4 12:51:11 2024 rev:18 rq:1178355 version:3.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/tio/tio.changes 2024-05-13 01:34:06.843424680 +0200
+++ /work/SRC/openSUSE:Factory/.tio.new.24587/tio.changes 2024-06-04 12:51:40.949027037 +0200
@@ -1,0 +2,11 @@
+Thu May 16 19:29:37 UTC 2024 - Martin Hauke <mardnh(a)gmx.de>
+
+- Update to version 3.3
+ * Force destructive backspace when using local echo
+ * Only takes effect in normal output mode.
+ * Fix local-echo in configuration file
+ * Clean up includes
+ * Force socket write operation to ignore any signals
+ * Man page cleanup
+
+-------------------------------------------------------------------
Old:
----
tio-3.2.tar.xz
New:
----
tio-3.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tio.spec ++++++
--- /var/tmp/diff_new_pack.wr403I/_old 2024-06-04 12:51:41.617051278 +0200
+++ /var/tmp/diff_new_pack.wr403I/_new 2024-06-04 12:51:41.621051424 +0200
@@ -17,7 +17,7 @@
Name: tio
-Version: 3.2
+Version: 3.3
Release: 0
Summary: Simple TTY terminal I/O application
License: GPL-2.0-or-later
++++++ tio-3.2.tar.xz -> tio-3.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/.github/workflows/codeql.yml new/tio-3.3/.github/workflows/codeql.yml
--- old/tio-3.2/.github/workflows/codeql.yml 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/.github/workflows/codeql.yml 2024-05-15 08:35:45.000000000 +0200
@@ -12,8 +12,8 @@
name: "CodeQL"
on:
- # push:
- # branches: [ "main", "master" ]
+ push:
+ branches: [ "main", "master" ]
schedule:
- cron: '0 0 * * *'
pull_request:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/.github/workflows/macos.yml new/tio-3.3/.github/workflows/macos.yml
--- old/tio-3.2/.github/workflows/macos.yml 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/.github/workflows/macos.yml 2024-05-15 08:35:45.000000000 +0200
@@ -1,4 +1,4 @@
-name: macOS build
+name: MacOS build
on:
push:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/NEWS new/tio-3.3/NEWS
--- old/tio-3.2/NEWS 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/NEWS 2024-05-15 08:35:45.000000000 +0200
@@ -1,5 +1,21 @@
-=== tio v3.2 ===
+=== tio v3.3 ===
+
+
+
+Changes since tio v3.2:
+
+ * Force destructive backspace when using local echo
+
+ Only takes effect in normal output mode.
+
+ * Fix local-echo in configuration file
+
+ * Clean up includes
+
+ * Force socket write operation to ignore any signals
+
+ * Man page cleanup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/README.md new/tio-3.3/README.md
--- old/tio-3.2/README.md 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/README.md 2024-05-15 08:35:45.000000000 +0200
@@ -73,6 +73,7 @@
* Configuration file support
* Support for configuration profiles
* Activate configuration profiles by name or pattern
+ * Redirect I/O of shell command to serial device
* Redirect I/O to UNIX socket or IPv4/v6 network socket
* Useful for scripting or TTY sharing
* Pipe input and/or output
@@ -88,7 +89,7 @@
* Send files via x/y-modem protocol
* Search for serial devices
* Man page documentation
- * Plays nicely with [tmux](https://tmux.github.io)
+ * Plays nicely with [tmux](https://tmux.github.io) and similar terminal multiplexers
## 3. Usage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/man/tio.1.in new/tio-3.3/man/tio.1.in
--- old/tio-3.2/man/tio.1.in 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/man/tio.1.in 2024-05-15 08:35:45.000000000 +0200
@@ -624,8 +624,7 @@
$ tio -b 115200 -c 11 /dev/serial/by-id/usb-FTDI_TTL232R-3V3_FTGQVXBL-if00-port0
.TP
-A configuration profile can also be activated by its pattern which supports
-regular expressions:
+A configuration profile can also be activated by its pattern which supports regular expressions:
.RS
.nf
@@ -649,8 +648,7 @@
$ tio -b 115200 /dev/ttyUSB12
.TP
-It is also possible to combine use of configuration profile and command-line
-options. For example:
+It is also possible to combine use of configuration profile and command-line options. For example:
$ tio -l -t usb12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/man/tio.1.txt new/tio-3.3/man/tio.1.txt
--- old/tio-3.2/man/tio.1.txt 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/man/tio.1.txt 2024-05-15 08:35:45.000000000 +0200
@@ -276,6 +276,10 @@
Default value is "always".
+ --exec <command>
+
+ Execute shell command with I/O redirected to device
+
-v, --version
Display program version.
@@ -468,6 +472,8 @@
script-run Run script on connect
+ exec Execute shell command with I/O redirected to device
+
CONFIGURATION FILE EXAMPLES
To change the default configuration simply set options like so:
@@ -494,8 +500,7 @@
$ tio -b 115200 -c 11 /dev/serial/by-id/usb-FTDI_TTL232R-3V3_FTGQVXBL-if00-port0
- A configuration profile can also be activated by its pattern which supports
- regular expressions:
+ A configuration profile can also be activated by its pattern which supports regular expressions:
[usb-devices]
pattern = ^usb([0-9]*)
@@ -510,8 +515,7 @@
$ tio -b 115200 /dev/ttyUSB12
- It is also possible to combine use of configuration profile and command-line
- options. For example:
+ It is also possible to combine use of configuration profile and command-line options. For example:
$ tio -l -t usb12
@@ -553,7 +557,7 @@
send -i $uart "ls -la\n"
expect -i $uart "prompt> "
- It is also possible to use the expect/send script functionality to e.g. automate logins:
+ It is also possible to use tio's own simpler expect/send script functionality to e.g. automate logins:
$ tio --script 'expect("login: "); send("root\n"); expect("Password: "); send("root\n")' /dev/ttyUSB0
@@ -585,14 +589,10 @@
$ tio --script "set{DTR=high,RTS=low}; msleep(100); set{RTS=toggle}" --script-run once /dev/ttyUSB0
- Automatically log in to connected OS:
-
- $ tio --script "expect('password:'); send('my_password\n')" /dev/ttyUSB0
-
WEBSITE
Visit https://tio.github.io
AUTHOR
Maintained by Martin Lund <martin.lund(a)keep-it-simple.com>.
-tio 3.1 2024-05-03 tio(1)
+tio 3.3 2024-05-15 tio(1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/meson.build new/tio-3.3/meson.build
--- old/tio-3.2/meson.build 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/meson.build 2024-05-15 08:35:45.000000000 +0200
@@ -1,12 +1,12 @@
project('tio', 'c',
- version : '3.2',
+ version : '3.3',
license : [ 'GPL-2'],
meson_version : '>= 0.53.2',
default_options : [ 'warning_level=2', 'buildtype=release', 'c_std=gnu99' ]
)
# The tag date of the project_version(), update when the version bumps.
-version_date = '2024-05-08'
+version_date = '2024-05-15'
# Test for dynamic baudrate configuration interface
compiler = meson.get_compiler('c')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/src/alert.c new/tio-3.3/src/alert.c
--- old/tio-3.2/src/alert.c 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/src/alert.c 2024-05-15 08:35:45.000000000 +0200
@@ -19,15 +19,10 @@
* 02110-1301, USA.
*/
-#include "alert.h"
-#include "config.h"
#include <stdio.h>
-#include <stdlib.h>
#include <unistd.h>
-#include <string.h>
-#include "error.h"
-#include "print.h"
#include "options.h"
+#include "alert.h"
void blink_background(void)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/src/configfile.c new/tio-3.3/src/configfile.c
--- old/tio-3.2/src/configfile.c 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/src/configfile.c 2024-05-15 08:35:45.000000000 +0200
@@ -21,31 +21,18 @@
*/
#define _GNU_SOURCE
-
-#include "config.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <stdbool.h>
-#include <errno.h>
-#include <getopt.h>
-#include <termios.h>
-#include <assert.h>
-#include <limits.h>
+#include <stdlib.h>
#include <unistd.h>
+#include <string.h>
+#include <assert.h>
+#include <errno.h>
#include <regex.h>
#include <glib.h>
-#include "options.h"
#include "configfile.h"
-#include "misc.h"
-#include "options.h"
-#include "error.h"
#include "print.h"
#include "rs485.h"
-#include "timestamp.h"
-#include "alert.h"
+#include "misc.h"
#define CONFIG_GROUP_NAME_DEFAULT "default"
@@ -196,7 +183,7 @@
config_get_string(key_file, group, "exclude-drivers", &option.exclude_devices, NULL);
config_get_string(key_file, group, "exclude-tids", &option.exclude_devices, NULL);
config_get_bool(key_file, group, "no-reconnect", &option.no_reconnect);
- config_get_bool(key_file, group, "local-echo", &option.no_reconnect);
+ config_get_bool(key_file, group, "local-echo", &option.local_echo);
config_get_string(key_file, group, "input-mode", &string, "normal", "hex", "line", NULL);
if (string != NULL)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/src/error.c new/tio-3.3/src/error.c
--- old/tio-3.2/src/error.c 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/src/error.c 2024-05-15 08:35:45.000000000 +0200
@@ -21,17 +21,8 @@
#define __STDC_WANT_LIB_EXT2__ 1 // To access vasprintf
-#include "config.h"
#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <string.h>
-#include <errno.h>
-#include "options.h"
#include "print.h"
-#include "error.h"
-#include "timestamp.h"
static char error[2][1000];
static bool in_session = false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/src/log.c new/tio-3.3/src/log.c
--- old/tio-3.2/src/log.c 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/src/log.c 2024-05-15 08:35:45.000000000 +0200
@@ -21,18 +21,10 @@
#define __STDC_WANT_LIB_EXT2__ 1 // To access vasprintf
-#include "config.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-#include <time.h>
#include <sys/time.h>
#include <libgen.h>
-#include "options.h"
+#include <errno.h>
#include "print.h"
-#include "error.h"
#include "fs.h"
#define IS_ESC_CSI_INTERMEDIATE_CHAR(c) ((c >= 0x20) && (c <= 0x3F))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/src/main.c new/tio-3.3/src/main.c
--- old/tio-3.2/src/main.c 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/src/main.c 2024-05-15 08:35:45.000000000 +0200
@@ -19,10 +19,10 @@
* 02110-1301, USA.
*/
-#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include "config.h"
#include "options.h"
#include "configfile.h"
#include "tty.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/src/misc.c new/tio-3.3/src/misc.c
--- old/tio-3.2/src/misc.c 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/src/misc.c 2024-05-15 08:35:45.000000000 +0200
@@ -20,25 +20,14 @@
*/
#define _GNU_SOURCE // For FNM_EXTMATCH
-#include "config.h"
-#include <ctype.h>
-#include <dirent.h>
-#include <regex.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <errno.h>
#include <sys/poll.h>
#include <sys/wait.h>
-#include <termios.h>
#include <fnmatch.h>
-#include "error.h"
+#include <regex.h>
+#include <errno.h>
#include "print.h"
-#include "options.h"
void delay(long ms)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/src/options.c new/tio-3.3/src/options.c
--- old/tio-3.2/src/options.c 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/src/options.c 2024-05-15 08:35:45.000000000 +0200
@@ -19,29 +19,15 @@
* 02110-1301, USA.
*/
-#include "config.h"
#include <assert.h>
#include <regex.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <errno.h>
#include <getopt.h>
-#include <termios.h>
-#include <limits.h>
-#include "options.h"
-#include "error.h"
+#include <errno.h>
+#include "config.h"
#include "misc.h"
#include "print.h"
-#include "tty.h"
#include "rs485.h"
-#include "timestamp.h"
-#include "alert.h"
#include "log.h"
-#include "script.h"
#include "configfile.h"
#define HEX_N_VALUE_MAX 4096
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/src/options.h new/tio-3.3/src/options.h
--- old/tio-3.2/src/options.h 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/src/options.h 2024-05-15 08:35:45.000000000 +0200
@@ -23,9 +23,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <limits.h>
-#include <termios.h>
-#include <sys/param.h>
#include "script.h"
#include "timestamp.h"
#include "alert.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/src/print.c new/tio-3.3/src/print.c
--- old/tio-3.2/src/print.c 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/src/print.c 2024-05-15 08:35:45.000000000 +0200
@@ -19,11 +19,6 @@
* 02110-1301, USA.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-#include "options.h"
#include "print.h"
bool print_tainted = false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/src/print.h new/tio-3.3/src/print.h
--- old/tio-3.2/src/print.h 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/src/print.h 2024-05-15 08:35:45.000000000 +0200
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <stdbool.h>
-#include "misc.h"
#include "error.h"
#include "options.h"
#include "timestamp.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/src/rs485.c new/tio-3.3/src/rs485.c
--- old/tio-3.2/src/rs485.c 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/src/rs485.c 2024-05-15 08:35:45.000000000 +0200
@@ -19,14 +19,13 @@
* 02110-1301, USA.
*/
-#include <stdlib.h>
-#include <string.h>
+#include <stdio.h>
#include <errno.h>
+#include <string.h>
#include <sys/ioctl.h>
-#include <stdbool.h>
#include "options.h"
#include "print.h"
-#include "error.h"
+#include "misc.h"
#ifdef HAVE_RS485
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/src/socket.c new/tio-3.3/src/socket.c
--- old/tio-3.2/src/socket.c 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/src/socket.c 2024-05-15 08:35:45.000000000 +0200
@@ -263,7 +263,7 @@
{
if (clientfds[i] != -1)
{
- if (write(clientfds[i], &input_char, 1) <= 0)
+ if (send(clientfds[i], &input_char, 1, MSG_NOSIGNAL) <= 0)
{
tio_error_printf_silent("Failed to write to socket (%s)", strerror(errno));
close(clientfds[i]);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/src/timestamp.c new/tio-3.3/src/timestamp.c
--- old/tio-3.2/src/timestamp.c 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/src/timestamp.c 2024-05-15 08:35:45.000000000 +0200
@@ -22,8 +22,6 @@
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
#include <sys/time.h>
#include <time.h>
#include "error.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/src/tty.c new/tio-3.3/src/tty.c
--- old/tio-3.2/src/tty.c 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/src/tty.c 2024-05-15 08:35:45.000000000 +0200
@@ -188,6 +188,12 @@
print(c);
+ if ((option.output_mode == OUTPUT_MODE_NORMAL) && (c == 127))
+ {
+ // Force destructive backspace
+ printf("\b \b");
+ }
+
if (option.log)
{
log_putc(c);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tio-3.2/src/xymodem.c new/tio-3.3/src/xymodem.c
--- old/tio-3.2/src/xymodem.c 2024-05-08 13:05:47.000000000 +0200
+++ new/tio-3.3/src/xymodem.c 2024-05-15 08:35:45.000000000 +0200
@@ -7,20 +7,15 @@
*
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
+#include <fcntl.h>
#include <errno.h>
#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
+#include <termios.h>
#include <sys/stat.h>
#include <sys/mman.h>
-#include <sys/poll.h>
-#include <termios.h>
#include "xymodem.h"
#include "print.h"
+#include "misc.h"
#define SOH 0x01
#define STX 0x02
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package vkquake for openSUSE:Factory checked in at 2024-06-04 12:51:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vkquake (Old)
and /work/SRC/openSUSE:Factory/.vkquake.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vkquake"
Tue Jun 4 12:51:05 2024 rev:19 rq:1178351 version:1.30.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/vkquake/vkquake.changes 2023-05-06 22:09:47.788918736 +0200
+++ /work/SRC/openSUSE:Factory/.vkquake.new.24587/vkquake.changes 2024-06-04 12:51:37.616906122 +0200
@@ -1,0 +2,5 @@
+Sun May 19 15:47:12 UTC 2024 - Carsten Ziepke <kieltux(a)gmail.com>
+
+- Fix building for openSUSE Leap, use gcc11
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vkquake.spec ++++++
--- /var/tmp/diff_new_pack.baGMsr/_old 2024-06-04 12:51:38.276930073 +0200
+++ /var/tmp/diff_new_pack.baGMsr/_new 2024-06-04 12:51:38.280930218 +0200
@@ -1,7 +1,7 @@
#
# spec file for package vkquake
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2017 Luke Jones <luke.nukem.jones(a)gmail.com>
#
# All modifications and additions to the file contributed by third parties
@@ -39,6 +39,12 @@
BuildRequires: pkgconfig(opusfile)
BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(vorbis)
+%if 0%{?sle_version} >= 150500 && 0%{?sle_version} < 160000 && 0%{?is_opensuse}
+BuildRequires: gcc11
+BuildRequires: gcc11-c++
+%else
+BuildRequires: gcc-c++
+%endif
%description
vkQuake is a Quake 1 port using Vulkan instead of OpenGL for rendering. It is based on the popular QuakeSpasm port and runs all mods compatible with it like Arcane Dimensions or In The Shadows.
@@ -47,10 +53,6 @@
%prep
%autosetup -n vkQuake-%{version} -p1
-%if 0%{?sle_version} < 150200
-sed -i 's#vulkan_core.h#vulkan.h#' Quake/quakedef.h
-%endif
-
# Drop pre-compiled Windows stuff
rm Windows -fr
@@ -62,6 +64,9 @@
%build
%make_build -C Quake \
+%if 0%{?sle_version} >= 150500 && 0%{?sle_version} < 160000 && 0%{?is_opensuse}
+ CC='/usr/bin/gcc-11' \
+%endif
STRIP=": do not strip:" \
DO_USERDIRS=1 \
USE_SDL2=1 \
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-registration for openSUSE:Factory checked in at 2024-06-04 12:51:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-registration (Old)
and /work/SRC/openSUSE:Factory/.yast2-registration.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-registration"
Tue Jun 4 12:51:03 2024 rev:98 rq:1178458 version:5.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-registration/yast2-registration.changes 2024-03-15 20:28:04.757005577 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-registration.new.24587/yast2-registration.changes 2024-06-04 12:51:36.376861124 +0200
@@ -1,0 +2,6 @@
+Wed May 29 13:34:10 UTC 2024 - Martin Vidner <mvidner(a)suse.com>
+
+- Ensure add_on_others in autoyast profile are added (bsc#1223301)
+- 5.0.2
+
+-------------------------------------------------------------------
Old:
----
yast2-registration-5.0.1.tar.bz2
New:
----
yast2-registration-5.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.kaHpBb/_old 2024-06-04 12:51:37.128888413 +0200
+++ /var/tmp/diff_new_pack.kaHpBb/_new 2024-06-04 12:51:37.128888413 +0200
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 5.0.1
+Version: 5.0.2
Release: 0
Summary: YaST2 - Registration Module
License: GPL-2.0-only
++++++ yast2-registration-5.0.1.tar.bz2 -> yast2-registration-5.0.2.tar.bz2 ++++++
++++ 2751 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gnome-settings-daemon for openSUSE:Factory checked in at 2024-06-04 12:51:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-settings-daemon"
Tue Jun 4 12:51:01 2024 rev:193 rq:1178363 version:46.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-settings-daemon/gnome-settings-daemon.changes 2024-04-25 20:47:52.291192244 +0200
+++ /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new.24587/gnome-settings-daemon.changes 2024-06-04 12:51:34.788803496 +0200
@@ -7,0 +8,7 @@
+Tue Apr 16 11:06:25 UTC 2024 - Joan Torres <joan.torres(a)suse.com>
+
+- Add gnome-settings-daemon-stop-service-when-no-network.patch
+ Fix to enable remote login.
+ Allows the g-r-d handover service to be started on wifi network.
+
+-------------------------------------------------------------------
New:
----
gnome-settings-daemon-stop-service-when-no-network.patch
BETA DEBUG BEGIN:
New:
- Add gnome-settings-daemon-stop-service-when-no-network.patch
Fix to enable remote login.
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.lpxnk7/_old 2024-06-04 12:51:36.020848205 +0200
+++ /var/tmp/diff_new_pack.lpxnk7/_new 2024-06-04 12:51:36.024848350 +0200
@@ -44,6 +44,8 @@
Patch1: gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-bgo793253.patch bgo#793253 dimstar(a)opensuse.org -- Fix no-return-in-nonvoid-function
Patch2: gnome-settings-daemon-bgo793253.patch
+# PATCH-FIX-UPSTREAM gnome-settings-daemon-stop-service-when-no-network.patch [merged] joan.torres(a)suse.com -- Stop assigned services only when no network connection
+Patch3: gnome-settings-daemon-stop-service-when-no-network.patch
## SLE/LEAP-only patches start at 1000
# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj(a)suse.com -- notify user about auto suspend when returning from sleep
++++++ gnome-settings-daemon-stop-service-when-no-network.patch ++++++
From 9a1c14127fd135a6bf6abbf5d57ae1a2961bf4d0 Mon Sep 17 00:00:00 2001
From: Joan Torres <joan.torres(a)suse.com>
Date: Thu, 4 Apr 2024 13:40:02 +0200
Subject: [PATCH] sharing: Stop assigned services only when no network
connection
This allows grd handover service to be started even with network access
through a mobile device or when the network access is from Wi-Fi.
---
plugins/sharing/gsd-sharing-manager.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/sharing/gsd-sharing-manager.c b/plugins/sharing/gsd-sharing-manager.c
index 7713569f..2ab2cb05 100644
--- a/plugins/sharing/gsd-sharing-manager.c
+++ b/plugins/sharing/gsd-sharing-manager.c
@@ -297,7 +297,7 @@ start_assigned_service (GsdSharingManager *manager,
{
AssignedService *service;
- if (manager->sharing_status != GSD_SHARING_STATUS_AVAILABLE)
+ if (manager->sharing_status == GSD_SHARING_STATUS_OFFLINE)
return;
if (!info->system_service_running)
@@ -414,10 +414,10 @@ gsd_sharing_manager_sync_assigned_services (GsdSharingManager *manager)
for (l = services; l != NULL; l = l->next) {
AssignedServiceInfo *info = l->data;
- if (manager->sharing_status == GSD_SHARING_STATUS_AVAILABLE)
- start_assigned_service (manager, info);
- else
+ if (manager->sharing_status == GSD_SHARING_STATUS_OFFLINE)
stop_assigned_service (manager, info);
+ else
+ start_assigned_service (manager, info);
}
g_list_free (services);
}
--
2.44.0
1
0