July 2021 - openSUSE Commits - openSUSE Mailing Lists

commit blueberry for openSUSE:Factory
by Source-Sync 01 Jul '21

01 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package blueberry for openSUSE:Factory checked in at 2021-07-01 07:05:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blueberry (Old) and /work/SRC/openSUSE:Factory/.blueberry.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "blueberry" Thu Jul 1 07:05:34 2021 rev:40 rq:903133 version:1.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/blueberry/blueberry.changes 2021-05-21 21:50:43.222058439 +0200 +++ /work/SRC/openSUSE:Factory/.blueberry.new.2625/blueberry.changes 2021-07-01 07:05:44.311428301 +0200 @@ -1,0 +2,6 @@ +Tue Jun 29 10:44:30 UTC 2021 - Ferdinand Thiessen <rpm(a)fthiessen.de> + +- Update to 1.4.4 + * l10n: Update translations + +------------------------------------------------------------------- Old: ---- blueberry-1.4.2.tar.gz New: ---- blueberry-1.4.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blueberry.spec ++++++ --- /var/tmp/diff_new_pack.DFVa08/_old 2021-07-01 07:05:44.835424208 +0200 +++ /var/tmp/diff_new_pack.DFVa08/_new 2021-07-01 07:05:44.839424176 +0200 @@ -18,7 +18,7 @@ %define __requires_exclude typelib\$(St)\$ Name: blueberry -Version: 1.4.2 +Version: 1.4.4 Release: 0 Summary: A configuration tool for Bluetooth License: GPL-3.0-or-later ++++++ blueberry-1.4.2.tar.gz -> blueberry-1.4.4.tar.gz ++++++ ++++ 2181 lines of diff (skipped)

1 0

commit python-scp for openSUSE:Factory
by Source-Sync 01 Jul '21

01 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-scp for openSUSE:Factory checked in at 2021-07-01 07:05:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-scp (Old) and /work/SRC/openSUSE:Factory/.python-scp.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-scp" Thu Jul 1 07:05:33 2021 rev:6 rq:903121 version:0.13.5 Changes: -------- --- /work/SRC/openSUSE:Factory/python-scp/python-scp.changes 2020-11-26 23:16:09.077072888 +0100 +++ /work/SRC/openSUSE:Factory/.python-scp.new.2625/python-scp.changes 2021-07-01 07:05:43.623433676 +0200 @@ -1,0 +2,10 @@ +Tue Jun 29 20:06:41 UTC 2021 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 0.13.5 + * Fix extra space sent in SSH command-line for get(), causing + issues on some servers. +- Update to version 0.13.4 + * Add scp_command attribute, allowing changing the command run + on the server (for example to sudo scp) + +------------------------------------------------------------------- Old: ---- scp-0.13.3.tar.gz New: ---- scp-0.13.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-scp.spec ++++++ --- /var/tmp/diff_new_pack.rvazfH/_old 2021-07-01 07:05:44.023430551 +0200 +++ /var/tmp/diff_new_pack.rvazfH/_new 2021-07-01 07:05:44.027430519 +0200 @@ -1,8 +1,8 @@ # # spec file for package python-scp # -# Copyright (c) 2020 SUSE LLC -# Copyright (c) 2017, Martin Hauke <mardnh(a)gmx.de> +# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2017-2021, Martin Hauke <mardnh(a)gmx.de> # # 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 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-scp -Version: 0.13.3 +Version: 0.13.5 Release: 0 Summary: SSH scp module for paramiko License: LGPL-2.1-or-later ++++++ scp-0.13.3.tar.gz -> scp-0.13.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scp-0.13.3/CHANGELOG.md new/scp-0.13.5/CHANGELOG.md --- old/scp-0.13.3/CHANGELOG.md 2020-10-26 22:25:34.000000000 +0100 +++ new/scp-0.13.5/CHANGELOG.md 2021-06-28 21:51:32.000000000 +0200 @@ -1,5 +1,13 @@ # Changelog +## 0.13.5 (2021-06-28) + +- Fix extra space sent in SSH command-line for `get()`, causing issues on some servers + +## 0.13.4 (2021-06-08) + +- Add `scp_command` attribute, allowing changing the command run on the server (for example to `sudo scp`) + ## 0.13.3 (2020-10-26) - Fix hanging when underlying paramiko channel is closed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scp-0.13.3/PKG-INFO new/scp-0.13.5/PKG-INFO --- old/scp-0.13.3/PKG-INFO 2020-10-26 22:26:39.943341300 +0100 +++ new/scp-0.13.5/PKG-INFO 2021-06-28 21:52:45.039251800 +0200 @@ -1,11 +1,11 @@ Metadata-Version: 1.1 Name: scp -Version: 0.13.3 +Version: 0.13.5 Summary: scp module for paramiko Home-page: https://github.com/jbardin/scp.py Author: James Bardin Author-email: j.bardin(a)gmail.com -License: LGPL +License: LGPL-2.1-or-later Description: Pure python scp module ====================== @@ -53,13 +53,13 @@ from paramiko import SSHClient from scp import SCPClient - ssh = SSHClient() - ssh.load_system_host_keys() - ssh.connect('example.com') - - with SCPClient(ssh.get_transport()) as scp: - scp.put('test.txt', 'test2.txt') - scp.get('test2.txt') + with SSHClient() as ssh: + ssh.load_system_host_keys() + ssh.connect('example.com') + + with SCPClient(ssh.get_transport()) as scp: + scp.put('test.txt', 'test2.txt') + scp.get('test2.txt') .. code-block:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scp-0.13.3/README.rst new/scp-0.13.5/README.rst --- old/scp-0.13.3/README.rst 2020-06-15 04:52:26.000000000 +0200 +++ new/scp-0.13.5/README.rst 2021-06-08 19:48:24.000000000 +0200 @@ -45,13 +45,13 @@ from paramiko import SSHClient from scp import SCPClient - ssh = SSHClient() - ssh.load_system_host_keys() - ssh.connect('example.com') + with SSHClient() as ssh: + ssh.load_system_host_keys() + ssh.connect('example.com') - with SCPClient(ssh.get_transport()) as scp: - scp.put('test.txt', 'test2.txt') - scp.get('test2.txt') + with SCPClient(ssh.get_transport()) as scp: + scp.put('test.txt', 'test2.txt') + scp.get('test2.txt') .. code-block:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scp-0.13.3/scp.egg-info/PKG-INFO new/scp-0.13.5/scp.egg-info/PKG-INFO --- old/scp-0.13.3/scp.egg-info/PKG-INFO 2020-10-26 22:26:39.000000000 +0100 +++ new/scp-0.13.5/scp.egg-info/PKG-INFO 2021-06-28 21:52:44.000000000 +0200 @@ -1,11 +1,11 @@ Metadata-Version: 1.1 Name: scp -Version: 0.13.3 +Version: 0.13.5 Summary: scp module for paramiko Home-page: https://github.com/jbardin/scp.py Author: James Bardin Author-email: j.bardin(a)gmail.com -License: LGPL +License: LGPL-2.1-or-later Description: Pure python scp module ====================== @@ -53,13 +53,13 @@ from paramiko import SSHClient from scp import SCPClient - ssh = SSHClient() - ssh.load_system_host_keys() - ssh.connect('example.com') - - with SCPClient(ssh.get_transport()) as scp: - scp.put('test.txt', 'test2.txt') - scp.get('test2.txt') + with SSHClient() as ssh: + ssh.load_system_host_keys() + ssh.connect('example.com') + + with SCPClient(ssh.get_transport()) as scp: + scp.put('test.txt', 'test2.txt') + scp.get('test2.txt') .. code-block:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scp-0.13.3/scp.py new/scp-0.13.5/scp.py --- old/scp-0.13.3/scp.py 2020-10-26 22:25:40.000000000 +0100 +++ new/scp-0.13.5/scp.py 2021-06-28 21:51:32.000000000 +0200 @@ -5,7 +5,7 @@ Utilities for sending files over ssh using the scp1 protocol. """ -__version__ = '0.13.3' +__version__ = '0.13.5' import locale import os @@ -17,6 +17,8 @@ # this is quote from the shlex module, added in py3.3 _find_unsafe = re.compile(br'[^\w@%+=:,./~-]').search +SCP_COMMAND = b'scp' + def _sh_quote(s): """Return a shell-escaped version of the string `s`.""" @@ -123,6 +125,7 @@ self.sanitize = sanitize self._dirtimes = {} self.peername = self.transport.getpeername() + self.scp_command = SCP_COMMAND def __enter__(self): self.channel = self._open() @@ -152,7 +155,7 @@ self.channel = self._open() self._pushed = 0 self.channel.settimeout(self.socket_timeout) - scp_command = (b'scp -t ', b'scp -r -t ')[recursive] + scp_command = self.scp_command + b' ' + (b'-t ', b'-r -t ')[recursive] self.channel.exec_command(scp_command + self.sanitize(asbytes(remote_path))) self._recv_confirm() @@ -188,7 +191,7 @@ self.channel = self._open() self.channel.settimeout(self.socket_timeout) - self.channel.exec_command(b'scp -t ' + + self.channel.exec_command(self.scp_command + b' -t ' + self.sanitize(asbytes(remote_path))) self._recv_confirm() self._send_file(fl, remote_path, mode, size=size) @@ -230,7 +233,7 @@ self.channel = self._open() self._pushed = 0 self.channel.settimeout(self.socket_timeout) - self.channel.exec_command(b"scp" + + self.channel.exec_command(self.scp_command + rcsv + prsv + b" -f " + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scp-0.13.3/setup.py new/scp-0.13.5/setup.py --- old/scp-0.13.3/setup.py 2020-10-26 22:25:46.000000000 +0100 +++ new/scp-0.13.5/setup.py 2021-06-28 21:51:32.000000000 +0200 @@ -10,10 +10,10 @@ description = fp.read() setup( name = 'scp', - version = '0.13.3', + version = '0.13.5', author = 'James Bardin', author_email = 'j.bardin(a)gmail.com', - license = 'LGPL', + license = 'LGPL-2.1-or-later', url = 'https://github.com/jbardin/scp.py', description='scp module for paramiko', long_description=description,

1 0

commit libica for openSUSE:Factory
by Source-Sync 01 Jul '21

01 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libica for openSUSE:Factory checked in at 2021-07-01 07:05:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libica (Old) and /work/SRC/openSUSE:Factory/.libica.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libica" Thu Jul 1 07:05:32 2021 rev:22 rq:903102 version:3.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libica/libica.changes 2020-09-25 16:34:58.696073779 +0200 +++ /work/SRC/openSUSE:Factory/.libica.new.2625/libica.changes 2021-07-01 07:05:42.655441237 +0200 @@ -1,0 +2,19 @@ +Mon Jun 7 18:29:04 UTC 2021 - Michal Suchanek <msuchanek(a)suse.com> + +- Update to version 3.8.0 (jsc#SLE-18334) + - [FEATURE] provide libica-cex module to satisfy special security requirements + - [FEATURE] FIPS: enforce the HMAC check +- Remove upstreamed patches: + - libica-sles15sp2-FIPS-add-SHA3-KATs-to-fips_powerup_tests.patch + - libica-sles15sp2-FIPS-skip-SHA3-tests-if-running-on-hardware-without-.patch + - libica-sles15sp2-Zeroize-local-variables.patch +- Remove patches obsoleted by upstrea developent: + * FIPS: Find libica from phdrs. + - libica-sles15sp2-FIPS-use-full-library-version-for-hmac-filename.patch + * FIPS: enforce the hmac check + - libica-sles15sp2-FIPS-fix-inconsistent-error-handling.patch +- Fix up tests and hmac generation + + libica-FIPS-make-it-possible-to-specify-fipshmac-binary.patch +- Remove obsolete attributes from filelists + +------------------------------------------------------------------- Old: ---- libica-3.7.0.tar.gz libica-sles15sp2-FIPS-add-SHA3-KATs-to-fips_powerup_tests.patch libica-sles15sp2-FIPS-fix-inconsistent-error-handling.patch libica-sles15sp2-FIPS-skip-SHA3-tests-if-running-on-hardware-without-.patch libica-sles15sp2-FIPS-use-full-library-version-for-hmac-filename.patch libica-sles15sp2-Zeroize-local-variables.patch New: ---- libica-3.8.0.tar.gz libica-FIPS-make-it-possible-to-specify-fipshmac-binary.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libica.spec ++++++ --- /var/tmp/diff_new_pack.8sfKtw/_old 2021-07-01 07:05:43.223436800 +0200 +++ /var/tmp/diff_new_pack.8sfKtw/_new 2021-07-01 07:05:43.227436769 +0200 @@ -1,7 +1,7 @@ # # spec file for package libica # -# Copyright (c) 2018-2020 SUSE LLC +# Copyright (c) 2018-2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %endif Name: libica -Version: 3.7.0 +Version: 3.8.0 Release: 0 Summary: Library interface for the IBM Cryptographic Accelerator device driver License: CPL-1.0 @@ -37,11 +37,7 @@ Source5: z90crypt.service Source6: baselibs.conf Source7: %{name}-rpmlintrc -Patch01: libica-sles15sp2-Zeroize-local-variables.patch -Patch02: libica-sles15sp2-FIPS-add-SHA3-KATs-to-fips_powerup_tests.patch -Patch03: libica-sles15sp2-FIPS-skip-SHA3-tests-if-running-on-hardware-without-.patch -Patch04: libica-sles15sp2-FIPS-use-full-library-version-for-hmac-filename.patch -Patch05: libica-sles15sp2-FIPS-fix-inconsistent-error-handling.patch +Patch01: libica-FIPS-make-it-possible-to-specify-fipshmac-binary.patch Patch99: libica-sles15sp2-FIPS-hmac-key.patch BuildRequires: autoconf @@ -123,14 +119,14 @@ %configure CPPFLAGS="-Iinclude -fPIC" CFLAGS="%{optflags} -fPIC" \ --enable-fips %make_build clean -%make_build +%make_build FIPSHMAC=fipshmac %define major %(echo %{version} | sed -e 's/[.].*//') -%{expand:%%global __os_install_post {%__os_install_post fipshmac %{buildroot}/%{_libdir}/*.so.%{major} }} +%{expand:%%global __os_install_post {%__os_install_post fipshmac %{buildroot}/%{_libdir}/*.so.%{version} }} %install -%make_install +%make_install FIPSHMAC=fipshmac mkdir -p %{buildroot}%{_includedir} cp -p include/ica_api.h %{buildroot}%{_includedir} mkdir -p %{buildroot}%{_sbindir} @@ -138,17 +134,18 @@ install -D %{SOURCE3} %{buildroot}%{_fillupdir}/sysconfig.z90crypt install -D %{SOURCE4} %{buildroot}%{_prefix}/lib/systemd/scripts/z90crypt install -D -m 644 %{SOURCE5} %{buildroot}%{_prefix}/lib/systemd/system/z90crypt.service +# It is installed 444 and then the __os_install_post cannot update it once the debuginfo is stripped +# We need it early because there is %{buildroot}/%{_libdir}/.*.so.%{major}.hmac symlink pointing at it +# and the dangling symlink test would fail +chmod 644 %{buildroot}/%{_libdir}/.*.so.%{version}.hmac cp -a %{SOURCE2} . -rm -f %{buildroot}%{_libdir}/libica.la +rm -vf %{buildroot}%{_libdir}/libica*.la rm -f %{buildroot}%{_datadir}/doc/libica/* rmdir %{buildroot}%{_datadir}/doc/libica %check -echo Tests should fail without a hash file -! %make_build check -fipshmac src/.libs/libica.so.%{major} -%make_build check +%make_build check FIPSHMAC=fipshmac %pre tools %service_add_pre z90crypt.service @@ -167,19 +164,25 @@ %postun -n libica3 -p /sbin/ldconfig %files -n libica3 -%defattr(-,root,root) %{_libdir}/libica.so.%{version} %{_libdir}/libica.so.%{major} +%{_libdir}/.libica.so.%{version}.hmac %{_libdir}/.libica.so.%{major}.hmac +%{_libdir}/libica-cex.so.%{version} +%{_libdir}/libica-cex.so.%{major} +%{_libdir}/.libica-cex.so.%{version}.hmac +%{_libdir}/.libica-cex.so.%{major}.hmac %files tools %license LICENSE %doc README.SUSE %{_sbindir}/rcz90crypt -%attr(0644,root,root) %{_fillupdir}/sysconfig.z90crypt +%{_fillupdir}/sysconfig.z90crypt %{_bindir}/icainfo +%{_bindir}/icainfo-cex %{_bindir}/icastats %{_mandir}/man1/icainfo.1%{?ext_man} +%{_mandir}/man1/icainfo-cex.1%{?ext_man} %{_mandir}/man1/icastats.1%{?ext_man} %dir %{_prefix}/lib/systemd/scripts %{_prefix}/lib/systemd/scripts/z90crypt @@ -188,9 +191,11 @@ %{_libdir}/libica.so %files devel -%attr(0644,root,root) %{_includedir}/ica_api.h +%{_includedir}/ica_api.h +%{_libdir}/libica-cex.so %files devel-static -%attr(0644,root,root) %{_libdir}/libica.a +%{_libdir}/libica.a +%{_libdir}/libica-cex.a %changelog ++++++ libica-3.7.0.tar.gz -> libica-3.8.0.tar.gz ++++++ ++++ 4998 lines of diff (skipped) ++++++ libica-FIPS-make-it-possible-to-specify-fipshmac-binary.patch ++++++ From 88d54fd0b867d9ee29d2bb1043d014f93d3dffc9 Mon Sep 17 00:00:00 2001 From: Michal Suchanek <msuchanek(a)suse.de> Date: Mon, 7 Jun 2021 21:12:01 +0200 Subject: [PATCH] FIPS: make it possible to specify fipshmac binary. Signed-off-by: Michal Suchanek <msuchanek(a)suse.de> --- openssl-fipshmac | 12 ++++++++++++ src/Makefile.am | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100755 openssl-fipshmac diff --git a/openssl-fipshmac b/openssl-fipshmac new file mode 100755 index 0000000..60fd505 --- /dev/null +++ b/openssl-fipshmac @@ -0,0 +1,12 @@ +#!/bin/sh -e + +if [ "$#" -eq 0 ] ; then + echo "No library to hash specified." >&2 + exit 22 +fi + +while [ -n "$1" ] ; do + dgst="$(openssl dgst -sha256 -mac hmac -macopt hexkey:00000000 "$1")" + echo "$dgst" | sed -e 's/^.* //' > "$(dirname "$1")/.$(basename "$1")".hmac + shift +done diff --git a/src/Makefile.am b/src/Makefile.am index 4a1ef14..2be01a5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,13 +46,13 @@ mp.S : mp.pl ./mp.pl mp.S if ICA_FIPS +FIPSHMAC ?= ${top_srcdir}/openssl-fipshmac hmac-file-lnk: hmac-file $(AM_V_GEN) cd ${top_builddir}/src/.libs && ln -sf .libica.so.$(VERSION1).hmac .libica.so.$(MAJOR).hmac $(AM_V_GEN) cd ${top_builddir}/src/.libs && ln -sf .libica-cex.so.$(VERSION1).hmac .libica-cex.so.$(MAJOR).hmac hmac-file: libica.la libica-cex.la - $(AM_V_GEN) openssl dgst -sha256 -mac hmac -macopt hexkey:00000000 ${top_builddir}/src/.libs/libica.so.$(VERSION1) | sed -e 's/^.* //' > ${top_builddir}/src/.libs/.libica.so.$(VERSION1).hmac - $(AM_V_GEN) openssl dgst -sha256 -mac hmac -macopt hexkey:00000000 ${top_builddir}/src/.libs/libica-cex.so.$(VERSION1) | sed -e 's/^.* //' > ${top_builddir}/src/.libs/.libica-cex.so.$(VERSION1).hmac + $(AM_V_GEN) $(FIPSHMAC) ${top_builddir}/src/.libs/libica.so.$(VERSION1) ${top_builddir}/src/.libs/libica-cex.so.$(VERSION1) hmac_files = hmac-file hmac-file-lnk -- 2.31.1

1 0

commit rmw for openSUSE:Factory
by Source-Sync 01 Jul '21

01 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rmw for openSUSE:Factory checked in at 2021-07-01 07:05:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rmw (Old) and /work/SRC/openSUSE:Factory/.rmw.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rmw" Thu Jul 1 07:05:32 2021 rev:3 rq:903084 version:0.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rmw/rmw.changes 2021-05-10 15:41:13.149123985 +0200 +++ /work/SRC/openSUSE:Factory/.rmw.new.2625/rmw.changes 2021-07-01 07:05:41.615449360 +0200 @@ -1,0 +2,24 @@ +Sun Jun 28 01:00:00 UTC 2021 - Andy Alt <andy400-dev(a)yahoo.com> + +- rmw 0.8.0: + * The config option 'purge_after' has been deprecated and replaced + with 'expire_age' ('purge_after' will still be accepted, but the user + will be given a deprecation warning). + * When '-u' is used, the mrl file will no longer be removed, but + emptied instead. If a user gives the '-u' option when the mrl file is + empty, they will get a friendlier message stating that there are no + items in the list (instead of an error message about the file not + being found). + * fixed handling of dot dirs ('.' and '..'). Instead of giving an + error message and quitting, rmw will print a message stating that + they'll be skipped. + * The environmental variable RMWTEST_HOME has been replaced with + RMW_FAKE_HOME (Trying to use RMWTEST_HOME will give a deprecation + warning and still work). + * Expanded the man page and updated the README (improved documentation) + * Replaced autotools build system with meson + * rmw now uses the canfigger library for parsing the configuration file. +- disabled a restore test that failed when 'make check' is run with + superuser privileges + +------------------------------------------------------------------- Old: ---- rmw-0.7.09.tar.gz New: ---- rmw-0.8.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rmw.spec ++++++ --- /var/tmp/diff_new_pack.RJXAar/_old 2021-07-01 07:05:42.115445455 +0200 +++ /var/tmp/diff_new_pack.RJXAar/_new 2021-07-01 07:05:42.119445424 +0200 @@ -17,23 +17,25 @@ Name: rmw -Version: 0.7.09 +Version: 0.8.0 Release: 0 Summary: Safe-remove utility for the command line License: GPL-3.0-or-later +Group: System/Management URL: https://remove-to-waste.info/ Source: https://github.com/theimpossibleastronaut/rmw/releases/download/v%{version}… BuildRequires: pkgconfig >= 0.9.0 BuildRequires: pkgconfig(ncurses) +BuildRequires: meson >= 0.54.0 %description -rmw (ReMove to Waste) is a safe-remove utility for the command line. -Its goal is to conform to the FreeDesktop.org Trash specification -and therefore be compatible with KDE, GNOME, XFCE, and others. -Desktop integration is optional however, and by default, rmw will -only use a waste folder separated from your desktop trash. One of -its unique features is the ability to purge files from your -Waste/Trash directories after x number of days. +rmw (ReMove to Waste) is a safe-remove utility for the command line. It +can move and restore files to and from directories specified in a +configuration file, and can also be integrated with your regular +desktop trash folder (if your desktop environment uses the +FreeDesktop.org Trash specification). One of the unique features of rmw +is the ability to purge items from your waste (or trash) directories +after x number of days. %lang_package @@ -41,17 +43,20 @@ %setup -q %build -%configure \ - --docdir=%{_docdir}/%{name} -%make_build +%meson \ + -Ddocdir=%{_docdir}/%{name} \ + --buildtype=release \ + -Dstrip=true +%meson_build %install -%make_install +%meson_install + rm %{buildroot}%{_docdir}/%{name}/COPYING %find_lang %{name} %check -%make_build check +%meson_test %files %license COPYING ++++++ rmw-0.7.09.tar.gz -> rmw-0.8.0.tar.gz ++++++ ++++ 43071 lines of diff (skipped)

1 0

commit leechcraft for openSUSE:Factory
by Source-Sync 01 Jul '21

01 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package leechcraft for openSUSE:Factory checked in at 2021-07-01 07:05:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/leechcraft (Old) and /work/SRC/openSUSE:Factory/.leechcraft.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "leechcraft" Thu Jul 1 07:05:29 2021 rev:62 rq:903223 version:0.6.70+git.14522.g3ce98b2ddb Changes: -------- --- /work/SRC/openSUSE:Factory/leechcraft/leechcraft-doc.changes 2020-06-02 14:39:58.183773760 +0200 +++ /work/SRC/openSUSE:Factory/.leechcraft.new.2625/leechcraft-doc.changes 2021-07-01 07:05:36.563488824 +0200 @@ -1,0 +2,6 @@ +Mon Jun 7 06:58:38 UTC 2021 - Dmitriy Perlow <dap.darkness(a)gmail.com> + +- Updated to 0.6.70-14522-g3ce98b2ddb snapshot: + * Source-url is back. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/leechcraft/leechcraft.changes 2020-09-25 16:32:53.123962333 +0200 +++ /work/SRC/openSUSE:Factory/.leechcraft.new.2625/leechcraft.changes 2021-07-01 07:05:36.595488574 +0200 @@ -1,0 +2,15 @@ +Tue Jun 29 06:48:04 UTC 2021 - Dmitriy Perlow <dap.darkness(a)gmail.com> + +- Disabled qml requires. + +------------------------------------------------------------------- +Tue Jun 22 06:34:38 UTC 2021 - Dmitriy Perlow <dap.darkness(a)gmail.com> + +- Updated to 0.6.70-14522-g3ce98b2ddb snapshot: + * Qt 5.12 (Leap 15.*) compatibility no more, deleted + leechcraft-Qt5_12.patch & leechcraft-qtermwidget-Leap-15_2.patch ; + * Gcc 10 temporarily untill upstream gcc 11 compatibility fix; + * ��make options clean-up; + * Source-url is back. + +------------------------------------------------------------------- Old: ---- leechcraft-0.6.70-13907-g785196c688.tar.xz leechcraft-Qt5_12.patch leechcraft-qtermwidget-Leap-15_2.patch New: ---- leechcraft-0.6.70-14522-g3ce98b2ddb.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ leechcraft-doc.spec ++++++ --- /var/tmp/diff_new_pack.M8qYqI/_old 2021-07-01 07:05:37.319482919 +0200 +++ /var/tmp/diff_new_pack.M8qYqI/_new 2021-07-01 07:05:37.323482887 +0200 @@ -1,7 +1,7 @@ # # spec file for package leechcraft-doc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,16 @@ # -%define LEECHCRAFT_VERSION 0.6.70-13907-g785196c688 +%define LEECHCRAFT_VERSION 0.6.70-14522-g3ce98b2ddb Name: leechcraft-doc -Version: 0.6.70+git.13907.g785196c688 +Version: 0.6.70+git.14522.g3ce98b2ddb Release: 0 Summary: Modular Internet Client Documentation License: BSL-1.0 Group: Development/Libraries/Other URL: http://leechcraft.org -Source0: leechcraft-%{LEECHCRAFT_VERSION}.tar.xz +Source0: https://dist.leechcraft.org/LeechCraft/0.6.75/leechcraft-%{LEECHCRAFT_VERSI… BuildRequires: doxygen >= 1.8.3.1 BuildRequires: fdupes ++++++ leechcraft.spec ++++++ --- /var/tmp/diff_new_pack.M8qYqI/_old 2021-07-01 07:05:37.347482700 +0200 +++ /var/tmp/diff_new_pack.M8qYqI/_new 2021-07-01 07:05:37.351482669 +0200 @@ -1,7 +1,7 @@ # # spec file for package leechcraft # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,9 @@ # +# Qml autorequires off: +%global __requires_exclude (org.LC.common.1)|(org.LC.Blasq.1)|(SB2.1)|(Mellonetray.1)|(org.LC.Ooronee.1) + %bcond_without ffmpeg %define plugin_dir %{_libdir}/leechcraft/plugins-qt5 @@ -24,7 +27,7 @@ %define qml_dir %{_datadir}/leechcraft/qml5 %define so_ver -qt5-0_6_75 -%define LEECHCRAFT_VERSION 0.6.70-13907-g785196c688 +%define LEECHCRAFT_VERSION 0.6.70-14522-g3ce98b2ddb %define db_postfix %{so_ver}_1 %define gui_postfix %{so_ver}_1 @@ -43,38 +46,32 @@ %define xsd_postfix %{so_ver} Name: leechcraft -Version: 0.6.70+git.13907.g785196c688 +Version: 0.6.70+git.14522.g3ce98b2ddb Release: 0 Summary: Modular Internet Client License: BSL-1.0 Group: Productivity/Networking/Other URL: http://leechcraft.org -Source0: leechcraft-%{LEECHCRAFT_VERSION}.tar.xz +Source0: https://dist.leechcraft.org/LeechCraft/0.6.75/leechcraft-%{LEECHCRAFT_VERSI… Source4: %{name}-rpmlintrc Source8: leechcraft-session.1 Source9: lc_plugin_wrapper-qt5.1 -# PATCH-FIX-OPENSUSE to save Qt 5.12 (i.e. Leap 15.2) compatibility. -Patch0: leechcraft-Qt5_12.patch -# PATCH-FIX-OPENSUSE vs. Leap 15.2 qtermwidget' pkgconfig issue. -Patch1: leechcraft-qtermwidget-Leap-15_2.patch # PATCH-FIX-OPENSUSE leechcraft-libtorrent-legacy.patch Patch2: leechcraft-libtorrent-legacy.patch BuildRequires: cmake >= 3.8 BuildRequires: fdupes BuildRequires: file-devel -%if 0%{?sle_version} > 150300 || 0%{?suse_version} > 1500 -BuildRequires: gcc-c++ >= 8 -%else -BuildRequires: gcc8-c++ -%endif +# gcc <=7 & 11 break build, gcc 8 - 10 may be OK. +BuildRequires: gcc10-c++ BuildRequires: hicolor-icon-theme -BuildRequires: libQt5Gui-private-headers-devel >= 5.9 -BuildRequires: libQt5Sql5-sqlite >= 5.9 +BuildRequires: libQt5Gui-private-headers-devel >= 5.13 +BuildRequires: libQt5Sql5-sqlite >= 5.13 BuildRequires: libboost_atomic-devel BuildRequires: libboost_chrono-devel +BuildRequires: libboost_container-devel >= 1.76.0 BuildRequires: libboost_date_time-devel BuildRequires: libboost_filesystem-devel BuildRequires: libboost_locale-devel @@ -83,7 +80,7 @@ BuildRequires: libboost_thread-devel BuildRequires: libjpeg-devel BuildRequires: liblastfm-qt5-devel -BuildRequires: libqt5-qtbase-common-devel >= 5.9 +BuildRequires: libqt5-qtbase-common-devel >= 5.13 BuildRequires: libqxmpp-qt5-devel >= 1.1 BuildRequires: libsensors4-devel BuildRequires: libtidy-devel @@ -91,35 +88,33 @@ %if 0%{?suse_version} > 1325 BuildRequires: wt-devel %endif -BuildRequires: cmake(Qt5LinguistTools) >= 5.9 -BuildRequires: pkgconfig(Qt5Concurrent) >= 5.9 -BuildRequires: pkgconfig(Qt5Core) >= 5.9 -BuildRequires: pkgconfig(Qt5DBus) >= 5.9 -BuildRequires: pkgconfig(Qt5Gui) >= 5.9 -BuildRequires: pkgconfig(Qt5Multimedia) >= 5.9 -BuildRequires: pkgconfig(Qt5Network) >= 5.9 -BuildRequires: pkgconfig(Qt5OpenGL) >= 5.9 -BuildRequires: pkgconfig(Qt5Positioning) >= 5.9 -BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.9 -BuildRequires: pkgconfig(Qt5Qml) >= 5.9 -BuildRequires: pkgconfig(Qt5Quick) >= 5.9 -BuildRequires: pkgconfig(Qt5QuickWidgets) >= 5.9 -BuildRequires: pkgconfig(Qt5Qwt6) >= 5.9 -BuildRequires: pkgconfig(Qt5Script) >= 5.9 -BuildRequires: pkgconfig(Qt5Sensors) >= 5.9 -BuildRequires: pkgconfig(Qt5Sql) >= 5.9 -BuildRequires: pkgconfig(Qt5Svg) >= 5.9 -BuildRequires: pkgconfig(Qt5WebChannel) >= 5.9 -BuildRequires: pkgconfig(Qt5WebKit) >= 5.9 -BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.9 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.9 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.9 -BuildRequires: pkgconfig(Qt5Xml) >= 5.9 -BuildRequires: pkgconfig(Qt5XmlPatterns) >= 5.9 +BuildRequires: cmake(Qt5LinguistTools) >= 5.13 +BuildRequires: pkgconfig(Qt5Concurrent) >= 5.13 +BuildRequires: pkgconfig(Qt5Core) >= 5.13 +BuildRequires: pkgconfig(Qt5DBus) >= 5.13 +BuildRequires: pkgconfig(Qt5Gui) >= 5.13 +BuildRequires: pkgconfig(Qt5Multimedia) >= 5.13 +BuildRequires: pkgconfig(Qt5Network) >= 5.13 +BuildRequires: pkgconfig(Qt5OpenGL) >= 5.13 +BuildRequires: pkgconfig(Qt5Positioning) >= 5.13 +BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.13 +BuildRequires: pkgconfig(Qt5Qml) >= 5.13 +BuildRequires: pkgconfig(Qt5Quick) >= 5.13 +BuildRequires: pkgconfig(Qt5QuickWidgets) >= 5.13 +BuildRequires: pkgconfig(Qt5Qwt6) >= 5.13 +BuildRequires: pkgconfig(Qt5Script) >= 5.13 +BuildRequires: pkgconfig(Qt5Sensors) >= 5.13 +BuildRequires: pkgconfig(Qt5Sql) >= 5.13 +BuildRequires: pkgconfig(Qt5Svg) >= 5.13 +BuildRequires: pkgconfig(Qt5WebChannel) >= 5.13 +BuildRequires: pkgconfig(Qt5WebKit) >= 5.13 +BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.13 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.13 +BuildRequires: pkgconfig(Qt5X11Extras) >= 5.13 +BuildRequires: pkgconfig(Qt5Xml) >= 5.13 +BuildRequires: pkgconfig(Qt5XmlPatterns) >= 5.13 BuildRequires: pkgconfig(bzip2) -%if 0%{?suse_version} > 1325 || 0%{?sle_version} >= 120300 BuildRequires: pkgconfig(ddjvuapi) -%endif BuildRequires: pkgconfig(gstreamer-app-1.0) BuildRequires: pkgconfig(hunspell) %if %{with ffmpeg} @@ -140,11 +135,9 @@ %if %{with ffmpeg} BuildRequires: pkgconfig(libpostproc) %endif -%if 0%{?sle_version} > 150300 || 0%{?suse_version} > 1500 %ifarch %ix86 x86_64 ppc64 ppc64le BuildRequires: pkgconfig(libprojectM) >= 3 %endif -%endif BuildRequires: pkgconfig(libqrencode) %if %{with ffmpeg} BuildRequires: pkgconfig(libswresample) @@ -152,18 +145,12 @@ %endif BuildRequires: pkgconfig(libtcmalloc) %ifarch %ix86 x86_64 %arm ppc64le -%if 0%{?suse_version} > 1500 BuildRequires: pkgconfig(libtorrent-rasterbar-1) >= 1.2.0 -%else -BuildRequires: pkgconfig(libtorrent-rasterbar) >= 1.2.0 -%endif %endif BuildRequires: pkgconfig(libudev) -%if 0%{?suse_version} > 1325 || 0%{?sle_version} >= 120300 BuildRequires: pkgconfig(poppler-cpp) BuildRequires: pkgconfig(poppler-qt5) -%endif BuildRequires: pkgconfig(purple) BuildRequires: pkgconfig(qca2-qt5) BuildRequires: pkgconfig(qtermwidget5) @@ -206,9 +193,6 @@ %endif Obsoletes: %{name}-choroid Obsoletes: %{name}-harbinger -%if 0%{?suse_version} < 1325 && 0%{?sle_version} <= 120200 -Obsoletes: %{name}-monocle -%endif Obsoletes: %{name}-nacheku Obsoletes: %{name}-popishu Obsoletes: %{name}-qrosp @@ -920,16 +904,16 @@ Requires: libleechcraft-util-xdg%{xdg_postfix} = %{version} Requires: libleechcraft-util-xpc%{xpc_postfix} = %{version} Requires: libleechcraft-util-xsd%{xsd_postfix} = %{version} -Requires: libqt5-linguist-devel >= 5.9 -Requires: pkgconfig(Qt5Concurrent) >= 5.9 -Requires: pkgconfig(Qt5DBus) >= 5.9 -Requires: pkgconfig(Qt5OpenGL) >= 5.9 -Requires: pkgconfig(Qt5PrintSupport) >= 5.9 -Requires: pkgconfig(Qt5Script) >= 5.9 -Requires: pkgconfig(Qt5Svg) >= 5.9 -Requires: pkgconfig(Qt5WebKitWidgets) >= 5.9 -Requires: pkgconfig(Qt5X11Extras) >= 5.9 -Requires: pkgconfig(Qt5XmlPatterns) >= 5.9 +Requires: libqt5-linguist-devel >= 5.13 +Requires: pkgconfig(Qt5Concurrent) >= 5.13 +Requires: pkgconfig(Qt5DBus) >= 5.13 +Requires: pkgconfig(Qt5OpenGL) >= 5.13 +Requires: pkgconfig(Qt5PrintSupport) >= 5.13 +Requires: pkgconfig(Qt5Script) >= 5.13 +Requires: pkgconfig(Qt5Svg) >= 5.13 +Requires: pkgconfig(Qt5WebKitWidgets) >= 5.13 +Requires: pkgconfig(Qt5X11Extras) >= 5.13 +Requires: pkgconfig(Qt5XmlPatterns) >= 5.13 Recommends: leechcraft-azoth-doc Recommends: leechcraft-doc Recommends: leechcraft-monocle-doc @@ -1328,8 +1312,8 @@ Recommends: ffmpeg Requires: gstreamer-plugins-base >= 1.0 Requires: gstreamer-plugins-good >= 1.0 -Requires: libqt5-qtgraphicaleffects >= 5.9 -Requires: libqt5-qtquickcontrols >= 5.9 +Requires: libqt5-qtgraphicaleffects >= 5.13 +Requires: libqt5-qtquickcontrols >= 5.13 Recommends: gstreamer-plugins-bad Recommends: gstreamer-plugins-libav Provides: %{name}-audioplayer @@ -1430,7 +1414,6 @@ This package allows to synchronize with MTP devices via LeechCraft. -%if 0%{?sle_version} > 150300 || 0%{?suse_version} > 1500 %ifarch %ix86 x86_64 ppc64 ppc64le %package lmp-potorchu Summary: LeechCraft Visualization Effects Module @@ -1441,7 +1424,6 @@ %description lmp-potorchu This package provides visualization effects for the LeechCraft audio player. %endif -%endif %package lmp-ppl Summary: LeechCraft Portable Player Logging Module @@ -1465,7 +1447,6 @@ for LeechCraft SB2. -%if 0%{?suse_version} > 1325 || 0%{?sle_version} >= 120300 %package monocle Summary: LeechCraft Document viewer Module License: BSL-1.0 @@ -1539,7 +1520,6 @@ %description monocle-seen This package contains a LeechCraft Monocle subplugin for djvu document support via the djvulibre backend. -%endif %package musiczombie Summary: LeechCraft Azoth MusicBrainz.org client Module @@ -1891,7 +1871,7 @@ Group: Productivity/Networking/Other Requires: %{name} = %{version} Provides: %{name}-sb = %{version} -Requires: libqt5-qtquickcontrols >= 5.9 +Requires: libqt5-qtquickcontrols >= 5.13 %description sb2 This package provides another side bar plugin for Leechcraft. @@ -2156,7 +2136,7 @@ Summary: QML utility library for LeechCraft License: BSL-1.0 Group: Productivity/Networking/Other -Requires: libQtQuick5 >= 5.9 +Requires: libQtQuick5 >= 5.13 %description -n libleechcraft-util-qml%{qml_postfix} A library providing some commonly used QML items as well as @@ -2264,13 +2244,7 @@ %prep %setup -q -n leechcraft-%{LEECHCRAFT_VERSION} -%if 0%{?sle_version} <= 150300 && 0%{?suse_version} < 1550 -%patch0 -p1 -%patch1 -p1 -%endif -%if 0%{?suse_version} > 1500 %patch2 -p1 -%endif #removing non-free icons rm -rf src/plugins/azoth/share/azoth/iconsets/clients/default @@ -2293,17 +2267,14 @@ # NOTE that %%cmake macro breaks compiler configuring. cmake ../src \ -Wno-dev \ - -DGPTOOLS_MEM=True \ %if "%{_lib}" == "lib64" -DLIB_SUFFIX=64 \ %endif -DCMAKE_CXX_FLAGS="${tmpflags} -Doverride= $(pkg-config --cflags gstreamer-1.0)" \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -%if 0%{?sle_version} <= 150300 && 0%{?suse_version} < 1550 - -DCMAKE_C_COMPILER=/usr/bin/gcc-8 \ - -DCMAKE_CXX_COMPILER=/usr/bin/g++-8 \ -%endif + -DCMAKE_C_COMPILER=/usr/bin/gcc-10 \ + -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 \ -DSTRICT_LICENSING=True \ -DWITH_DBUS_LOADERS=True \ -DWITH_PCRE=True \ @@ -2311,40 +2282,56 @@ -DENABLE_UTIL_TESTS=True \ -DENABLE_ADVANCEDNOTIFICATIONS=True \ -DENABLE_AGGREGATOR=True \ -%if 0%{?suse_version} > 1325 + -DENABLE_AGGREGATOR_BODYFETCH=True \ -DENABLE_AGGREGATOR_WEBACCESS=True \ -%else - -DENABLE_AGGREGATOR_WEBACCESS=False \ -%endif -DENABLE_AUSCRIE=True \ -DENABLE_AZOTH=True \ -DENABLE_AZOTH_ABBREV=True \ -DENABLE_AZOTH_ACETAMIDE=True \ + -DENABLE_AZOTH_ADIUMSTYLES=True \ -DENABLE_AZOTH_ASTRALITY=False \ + -DENABLE_AZOTH_AUTOIDLER=True \ -DENABLE_AZOTH_AUTOPASTE=True \ + -DENABLE_AZOTH_BIRTHDAYNOTIFIER=True \ + -DENABLE_AZOTH_CHATHISTORY=True \ + -DENABLE_AZOTH_DEPESTER=True \ + -DENABLE_AZOTH_EMBEDMEDIA=True \ -DENABLE_AZOTH_HERBICIDE=True \ + -DENABLE_AZOTH_HILI=True \ + -DENABLE_AZOTH_ISTERIQUE=True \ + -DENABLE_AZOTH_JUICK=True \ + -DENABLE_AZOTH_KEESO=True \ + -DENABLE_AZOTH_LASTSEEN=True \ + -DENABLE_AZOTH_METACONTACTS=True \ + -DENABLE_AZOTH_MODNOK=True \ -DENABLE_AZOTH_MUCOMMANDS=True \ -DENABLE_AZOTH_MUCOMMANDS_TESTS=True \ -DENABLE_AZOTH_MURM=True \ + -DENABLE_AZOTH_NATIVEEMOTICONS=True \ -DENABLE_AZOTH_OTROID=True \ + -DENABLE_AZOTH_ROSENTHAL=True \ -DENABLE_AZOTH_SARIN=False \ + -DENABLE_AZOTH_STANDARDSTYLES=True \ -DENABLE_AZOTH_SHX=True \ -DENABLE_AZOTH_TRACOLOR=False \ + -DENABLE_AZOTH_VADER=True \ -DENABLE_AZOTH_VELVETBIRD=True \ - -DENABLE_AZOTH_WOODPECKER=False \ - -DENABLE_AZOTH_ZHEET=False \ + -DENABLE_AZOTH_XTAZY=True \ + -DENABLE_AZOTH_XOOX=True \ -DENABLE_CRYPT=True \ -DENABLE_MEDIACALLS=False \ - -DENABLE_BLACKDASH=False \ -DENABLE_BLASQ=True \ + -DENABLE_BLASQ_DEATHNOTE=True \ + -DENABLE_BLASQ_RAPPOR=True \ -DENABLE_BLASQ_SPEGNERSI=False \ -DENABLE_BLASQ_VANGOG=True \ -DENABLE_BLOGIQUE=True \ + -DENABLE_BLOGIQUE_HESTIA=True \ + -DENABLE_BLOGIQUE_METIDA=True \ -DENABLE_CERTMGR=True \ -DENABLE_CHOROID=False \ -DENABLE_CPULOAD=True \ -DENABLE_DEVMON=True \ - -DENABLE_DLNIWE=False \ -DENABLE_DOLOZHEE=True \ -DENABLE_DUMBEEP=True \ -DENABLE_ELEEMINATOR=True \ @@ -2353,7 +2340,6 @@ -DENABLE_GACTS=True \ -DENABLE_GLANCE=True \ -DENABLE_GMAILNOTIFIER=True \ - -DENABLE_HARBINGER=False \ -DENABLE_HOTSENSORS=False \ -DENABLE_HOTSTREAMS=True \ -DENABLE_HTTHARE=True \ @@ -2371,11 +2357,6 @@ -DENABLE_LEMON=True \ -DENABLE_LHTR=True \ -DWITH_LHTR_HTML=True \ -%if 0%{?suse_version} > 1325 - -DUSE_LIBTIDY_HTML5=True \ -%else - -DUSE_LIBTIDY_HTML5=False \ -%endif -DENABLE_LIZNOO=True \ -DENABLE_LMP=True \ -DENABLE_LMP_BRAINSLUGZ=True \ @@ -2385,26 +2366,21 @@ -DENABLE_LMP_LIBGUESS=True \ -DENABLE_LMP_MPRIS=True \ -DENABLE_LMP_MTPSYNC=True \ -%if 0%{?sle_version} > 150300 || 0%{?suse_version} > 1500 %ifarch %ix86 x86_64 ppc64 ppc64le -DENABLE_LMP_POTORCHU=True \ %else -DENABLE_LMP_POTORCHU=False \ %endif -%else - -DENABLE_LMP_POTORCHU=False \ -%endif -DENABLE_LMP_PPL=True \ -DENABLE_LMP_PPL_TESTS=True \ -DENABLE_MELLONETRAY=True \ -%if 0%{?suse_version} > 1325 || 0%{?sle_version} >= 120300 -DENABLE_MONOCLE=True \ + -DENABLE_MONOCLE_DIK=True \ + -DENABLE_MONOCLE_FXB=True \ -DENABLE_MONOCLE_MU=False \ -DENABLE_MONOCLE_PDF=True \ -DENABLE_MONOCLE_POSTRUS=True \ -%else - -DENABLE_MONOCLE=False \ -%endif + -DENABLE_MONOCLE_SEEN=True \ -DENABLE_MUSICZOMBIE=True \ %if %{with ffmpeg} -DWITH_MUSICZOMBIE_CHROMAPRINT=True \ @@ -2427,13 +2403,21 @@ -DENABLE_POSHUKU=True \ -DENABLE_IDN=True \ -DENABLE_POSHUKU_AUTOSEARCH=True \ + -DENABLE_POSHUKU_CLEANWEB=True \ -DENABLE_POSHUKU_DCAC=True \ %ifarch %ix86 x86_64 -DENABLE_POSHUKU_DCAC_TESTS=True \ %else -DENABLE_POSHUKU_DCAC_TESTS=False \ %endif + -DENABLE_POSHUKU_FATAPE=True \ + -DENABLE_POSHUKU_FILESCHEME=True \ -DENABLE_POSHUKU_FOC=True \ + -DENABLE_POSHUKU_FUA=True \ + -DENABLE_POSHUKU_KEYWORDS=True \ + -DENABLE_POSHUKU_ONLINEBOOKMARKS=True \ + -DENABLE_POSHUKU_ONLINEBOOKMARKS_DELICIOUS=True \ + -DENABLE_POSHUKU_ONLINEBOOKMARKS_READITLATER=True \ -DENABLE_POSHUKU_QRD=True \ -DENABLE_POSHUKU_SPEEDDIAL=True \ -DENABLE_QROSP=False \ @@ -2441,22 +2425,19 @@ -DENABLE_SCROBLIBRE=True \ -DENABLE_SECMAN=True \ -DTESTS_SECMAN=True \ - -DENABLE_SHELLOPEN=False \ -DENABLE_SNAILS=False \ -DENABLE_SYNCER=False \ -DENABLE_TABSESSMANAGER=True \ -DENABLE_TABSLIST=True \ -DENABLE_TEXTOGROOSE=True \ %ifarch %ix86 x86_64 %arm ppc64le - -DENABLE_TORRENT=True \ + -DENABLE_BITTORRENT=True \ -DENABLE_BITTORRENT_GEOIP=True \ %else - -DENABLE_TORRENT=False \ + -DENABLE_BITTORRENT=False \ %endif -DENABLE_TOUCHSTREAMS=True \ -DENABLE_TPI=True \ - -DENABLE_TWIFEE=False \ - -DENABLE_VTYULC=False \ -DENABLE_VROOBY=True \ -DENABLE_WKPLUGINS=False \ -DENABLE_XPROXY=True \ @@ -2795,7 +2776,6 @@ %files blogique %defattr(-,root,root) %{plugin_dir}/lib%{name}_blogique.so -%{settings_dir}/blogiquesettings.xml %{translations_dir}/*craft_blogique_??.qm %{translations_dir}/*craft_blogique_??_??.qm %dir %{qml_dir}/blogique @@ -2831,6 +2811,7 @@ %{settings_dir}/cstpsettings.xml %{translations_dir}/*craft_cstp*.qm %{plugin_dir}/*leechcraft_cstp.so +%{_datadir}/leechcraft/cstp %files dbusmanager %defattr(-,root,root) @@ -2881,7 +2862,7 @@ %dir %{_datadir}/leechcraft/fenet %dir %{_datadir}/leechcraft/fenet/compositing %dir %{_datadir}/leechcraft/fenet/wms -%{_datadir}/xsessions/LCDE.desktop +%{_datadir}/leechcraft/xsessions %{translations_dir}/*craft_fenet_*.qm %{_datadir}/leechcraft/fenet/compositing/*compton* @@ -3072,7 +3053,6 @@ %defattr(-,root,root) %{plugin_dir}/*craft_lmp_mtpsync.so -%if 0%{?sle_version} > 150300 || 0%{?suse_version} > 1500 %ifarch %ix86 x86_64 ppc64 ppc64le %files lmp-potorchu %defattr(-,root,root) @@ -3080,7 +3060,6 @@ %{translations_dir}/*craft_lmp_potorchu_??.qm %{translations_dir}/*craft_lmp_potorchu_??_??.qm %endif -%endif %files lmp-ppl %defattr(-,root,root) @@ -3093,7 +3072,6 @@ %{qml_dir}/mellonetray/ %{translations_dir}/*craft_mellonetray_*.qm -%if 0%{?suse_version} > 1325 || 0%{?sle_version} >= 120300 %files monocle %defattr(-,root,root) %{plugin_dir}/lib%{name}_monocle.so @@ -3136,7 +3114,6 @@ %{_datadir}/applications/%{name}-monocle-seen-qt5.desktop %{translations_dir}/*craft_monocle_seen_??.qm %{translations_dir}/*craft_monocle_seen_??_??.qm -%endif %files musiczombie %defattr(-,root,root) @@ -3154,12 +3131,15 @@ %{settings_dir}/netstoremanagersettings.xml %{translations_dir}/*craft_netstoremanager_??.qm %{translations_dir}/*craft_netstoremanager_??_??.qm +%dir %{_datadir}/leechcraft/netstoremanager +%dir %{_datadir}/leechcraft/netstoremanager/services %files netstoremanager-googledrive %defattr(-,root,root) %{plugin_dir}/*craft_netstoremanager_googledrive.so %{settings_dir}/nsmgoogledrivesettings.xml %{translations_dir}/*craft_netstoremanager_googledrive_*.qm +%{_datadir}/leechcraft/netstoremanager/services/googledrive.png %files networkmonitor %defattr(-,root,root) @@ -3170,6 +3150,7 @@ %defattr(-,root,root) %{translations_dir}/*craft_newlife*.qm %{plugin_dir}/*craft_newlife.so +%{_datadir}/leechcraft/newlife %files ooronee %defattr(-,root,root) @@ -3196,8 +3177,6 @@ %files poshuku %defattr(-,root,root) -%dir %{_datadir}/leechcraft/installed -%{_datadir}/leechcraft/installed/poshuku/ %{settings_dir}/poshukusettings.xml %{translations_dir}/*craft_poshuku_??.qm %{translations_dir}/*craft_poshuku_??_??.qm ++++++ _service ++++++ --- /var/tmp/diff_new_pack.M8qYqI/_old 2021-07-01 07:05:37.395482325 +0200 +++ /var/tmp/diff_new_pack.M8qYqI/_new 2021-07-01 07:05:37.395482325 +0200 @@ -1,7 +1,7 @@ <services> <service name="verify_file" mode="buildtime"> - <param name="file">leechcraft-0.6.70-13907-g785196c688.tar.xz</param> + <param name="file">leechcraft-0.6.70-14522-g3ce98b2ddb.tar.xz</param> <param name="verifier">sha1</param> - <param name="checksum">1f5b6f0c4e39a9c964f3bfd3b62190f2485581f4</param> + <param name="checksum">cc7b246d00d6382e4aea82d7bb33b9433f32b27d</param> </service> </services> ++++++ leechcraft-0.6.70-13907-g785196c688.tar.xz -> leechcraft-0.6.70-14522-g3ce98b2ddb.tar.xz ++++++ ++++ 343431 lines of diff (skipped)

1 0

commit notmuch for openSUSE:Factory
by Source-Sync 01 Jul '21

01 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package notmuch for openSUSE:Factory checked in at 2021-07-01 07:05:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/notmuch (Old) and /work/SRC/openSUSE:Factory/.notmuch.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "notmuch" Thu Jul 1 07:05:29 2021 rev:34 rq:903184 version:0.32.2 Changes: -------- --- /work/SRC/openSUSE:Factory/notmuch/notmuch.changes 2021-06-09 21:53:03.550555708 +0200 +++ /work/SRC/openSUSE:Factory/.notmuch.new.2625/notmuch.changes 2021-07-01 07:05:35.307498636 +0200 @@ -1,0 +2,33 @@ +Mon Jun 28 06:35:16 UTC 2021 - Dan ��erm��k <dcermak(a)suse.com> + +What's new in notmuch 0.32.2 +========================= + +General +------- + +Fix a bug from 2017 that can add duplicate thread-id terms to message +documents. + +CLI +--- + +Fix small memory leak in notmuch new. + +Emacs +----- + +Add `(require 'seq)` for `seq-some`. + +Documentation +------------- + +Fix man page build for Sphinx 4.x. Fix variable name in emacs docs. + +Tests +----- + +Fix backup creation in `perf-test/T00-new`. Check openssl +prerequisite in `add_gpgsm_home`. + +------------------------------------------------------------------- Old: ---- notmuch-0.32.1.tar.xz notmuch-0.32.1.tar.xz.asc New: ---- notmuch-0.32.2.tar.xz notmuch-0.32.2.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notmuch.spec ++++++ --- /var/tmp/diff_new_pack.nnnIQE/_old 2021-07-01 07:05:35.891494074 +0200 +++ /var/tmp/diff_new_pack.nnnIQE/_new 2021-07-01 07:05:35.895494042 +0200 @@ -18,7 +18,7 @@ %define libversion 5 Name: notmuch -Version: 0.32.1 +Version: 0.32.2 Release: 0 Summary: The mail indexer License: GPL-3.0-or-later @@ -126,7 +126,6 @@ %if %{with python3} %package -n python3-%{name} Summary: Python3 bindings for %{name} -Requires: python = %{?py3_ver:%py3_ver}%{?!py3_ver:%(python3 --version|awk '{print $2}')} Recommends: python-%{name}-doc = %{version} %description -n python3-%{name} ++++++ notmuch-0.32.1.tar.xz -> notmuch-0.32.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.1/NEWS new/notmuch-0.32.2/NEWS --- old/notmuch-0.32.1/NEWS 2021-05-15 14:04:24.000000000 +0200 +++ new/notmuch-0.32.2/NEWS 2021-06-27 13:56:21.000000000 +0200 @@ -1,3 +1,33 @@ +Notmuch 0.32.2 (2021-06-27) +=========================== + +General +------- + +Fix a bug from 2017 that can add duplicate thread-id terms to message +documents. + +CLI +--- + +Fix small memory leak in notmuch new. + +Emacs +----- + +Add `(require 'seq)` for `seq-some`. + +Documentation +------------- + +Fix man page build for Sphinx 4.x. Fix variable name in emacs docs. + +Tests +----- + +Fix backup creation in `perf-test/T00-new`. Check openssl +prerequisite in `add_gpgsm_home`. + Notmuch 0.32.1 (2021-05-15) =========================== @@ -93,6 +123,13 @@ `notmuch-sexp-eof`, `notmuch-split-content-type`, and `notmuch-tree-button-activate`. +Keymaps are no longer fset, which means they need to be referred to in +define-key directly (without quotes). If your Emacs configuration has a +keybinding like: + (define-key 'notmuch-show-mode-map "7" 'foo) +you should change it to: + (define-key notmuch-show-mode-map "7" 'foo) + Notmuch 0.31.4 (2021-02-18) =========================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.1/bindings/python/notmuch/version.py new/notmuch-0.32.2/bindings/python/notmuch/version.py --- old/notmuch-0.32.1/bindings/python/notmuch/version.py 2021-05-15 14:04:24.000000000 +0200 +++ new/notmuch-0.32.2/bindings/python/notmuch/version.py 2021-06-27 13:56:21.000000000 +0200 @@ -1,3 +1,3 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.32.1' +__VERSION__ = '0.32.2' SOVERSION = '5' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.1/bindings/python-cffi/version.txt new/notmuch-0.32.2/bindings/python-cffi/version.txt --- old/notmuch-0.32.1/bindings/python-cffi/version.txt 2021-05-15 14:04:24.000000000 +0200 +++ new/notmuch-0.32.2/bindings/python-cffi/version.txt 2021-06-27 13:56:21.000000000 +0200 @@ -1 +1 @@ -0.32.1 +0.32.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.1/debian/changelog new/notmuch-0.32.2/debian/changelog --- old/notmuch-0.32.1/debian/changelog 2021-05-15 14:04:24.000000000 +0200 +++ new/notmuch-0.32.2/debian/changelog 2021-06-27 13:56:21.000000000 +0200 @@ -1,3 +1,11 @@ +notmuch (0.32.2-1) experimental; urgency=medium + + * New upstream bugfix release + * Fix for memory leak in "notmuch new" introduced in 0.32 + * Fix for bug from 2017 that can add duplicate thread-ids to messages. + + -- David Bremner <bremner(a)debian.org> Sat, 26 Jun 2021 22:33:56 -0300 + notmuch (0.32.1-1) experimental; urgency=medium * New upstream bugfix release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.1/doc/conf.py new/notmuch-0.32.2/doc/conf.py --- old/notmuch-0.32.1/doc/conf.py 2021-05-15 14:04:24.000000000 +0200 +++ new/notmuch-0.32.2/doc/conf.py 2021-06-27 13:56:21.000000000 +0200 @@ -87,6 +87,8 @@ notmuch_authors = u'Carl Worth and many others' +man_make_section_directory = False + man_pages = [ ('man1/notmuch', 'notmuch', u'thread-based email index, search, and tagging', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.1/doc/man1/notmuch-config.rst new/notmuch-0.32.2/doc/man1/notmuch-config.rst --- old/notmuch-0.32.1/doc/man1/notmuch-config.rst 2021-05-15 14:04:24.000000000 +0200 +++ new/notmuch-0.32.2/doc/man1/notmuch-config.rst 2021-06-27 13:56:21.000000000 +0200 @@ -74,10 +74,13 @@ `backups`. **database.hook_dir** - Directory containing hooks run by notmuch commands. See **notmuch-hooks(5)**. + History: this configuration value was introduced in notmuch 0.32. + + Default: See HOOKS, below. + **user.name** Your full name. @@ -256,7 +259,7 @@ - ``${HOME}/.notmuch-config<profile>`` where ``<profile>`` is ``.$NOTMUCH_PROFILE`` or "" -Hooks +HOOKS ----- If ``database.hook_dir`` is unset, notmuch tries (in order) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.1/doc/notmuch-emacs.rst new/notmuch-0.32.2/doc/notmuch-emacs.rst --- old/notmuch-0.32.1/doc/notmuch-emacs.rst 2021-05-15 14:04:24.000000000 +0200 +++ new/notmuch-0.32.2/doc/notmuch-emacs.rst 2021-06-27 13:56:21.000000000 +0200 @@ -100,7 +100,7 @@ The list of saved searches, including names, queries, and additional per-query options. -:index:`notmuch-saved-searches-sort-function` +:index:`notmuch-saved-search-sort-function` This variable controls how saved searches should be sorted. A value of ``nil`` displays the saved searches in the order they are stored in ��notmuch-saved-searches��. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.1/emacs/notmuch-maildir-fcc.el new/notmuch-0.32.2/emacs/notmuch-maildir-fcc.el --- old/notmuch-0.32.1/emacs/notmuch-maildir-fcc.el 2021-05-15 14:04:24.000000000 +0200 +++ new/notmuch-0.32.2/emacs/notmuch-maildir-fcc.el 2021-06-27 13:56:21.000000000 +0200 @@ -21,6 +21,8 @@ ;;; Code: +(require 'seq) + (require 'message) (require 'notmuch-lib) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.1/lib/add-message.cc new/notmuch-0.32.2/lib/add-message.cc --- old/notmuch-0.32.1/lib/add-message.cc 2021-05-15 14:04:24.000000000 +0200 +++ new/notmuch-0.32.2/lib/add-message.cc 2021-06-27 13:56:21.000000000 +0200 @@ -407,14 +407,17 @@ _notmuch_database_link_message (notmuch_database_t *notmuch, notmuch_message_t *message, notmuch_message_file_t *message_file, - bool is_ghost) + bool is_ghost, + bool is_new) { void *local = talloc_new (NULL); notmuch_status_t status; const char *thread_id = NULL; /* Check if the message already had a thread ID */ - if (notmuch->features & NOTMUCH_FEATURE_GHOSTS) { + if (! is_new) { + thread_id = notmuch_message_get_thread_id (message); + } else if (notmuch->features & NOTMUCH_FEATURE_GHOSTS) { if (is_ghost) thread_id = notmuch_message_get_thread_id (message); } else { @@ -541,7 +544,7 @@ } ret = _notmuch_database_link_message (notmuch, message, - message_file, is_ghost); + message_file, is_ghost, is_new); if (ret) goto DONE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.1/lib/config.cc new/notmuch-0.32.2/lib/config.cc --- old/notmuch-0.32.1/lib/config.cc 2021-05-15 14:04:24.000000000 +0200 +++ new/notmuch-0.32.2/lib/config.cc 2021-06-27 13:56:21.000000000 +0200 @@ -318,7 +318,7 @@ const char * notmuch_config_values_get (notmuch_config_values_t *values) { - return talloc_strndup (values, values->iterator, values->tok_len); + return talloc_strndup (values->children, values->iterator, values->tok_len); } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.1/performance-test/T00-new.sh new/notmuch-0.32.2/performance-test/T00-new.sh --- old/notmuch-0.32.1/performance-test/T00-new.sh 2021-05-15 14:04:24.000000000 +0200 +++ new/notmuch-0.32.2/performance-test/T00-new.sh 2021-06-27 13:56:21.000000000 +0200 @@ -5,16 +5,16 @@ . $(dirname "$0")/perf-test-lib.sh || exit 1 uncache_database - time_start +manifest=$(mktemp manifestXXXXXX) +find mail -type f ! -path 'mail/.notmuch/*' | sed -n '1~4 p' > $manifest +xargs tar uf backup.tar < $manifest + for i in $(seq 2 6); do time_run "notmuch new #$i" 'notmuch new' done -manifest=$(mktemp manifestXXXXXX) - -find mail -type f ! -path 'mail/.notmuch/*' | sed -n '1~4 p' > $manifest # arithmetic context is to eat extra whitespace on e.g. some BSDs count=$((`wc -l < $manifest`)) @@ -26,8 +26,6 @@ time_run "new ($count mv back)" 'notmuch new' -xargs tar cf backup.tar < $manifest - perl -nle 'unlink $_; unlink $_.copy' $manifest time_run "new ($count rm)" 'notmuch new' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.1/test/T357-index-decryption.sh new/notmuch-0.32.2/test/T357-index-decryption.sh --- old/notmuch-0.32.1/test/T357-index-decryption.sh 2021-05-15 14:04:24.000000000 +0200 +++ new/notmuch-0.32.2/test/T357-index-decryption.sh 2021-06-27 13:56:21.000000000 +0200 @@ -112,12 +112,10 @@ "$expected" # try inserting it with decryption, should appear as a single copy -# (note: i think thread id skips 4 because of duplicate message-id -# insertion, above) test_begin_subtest "message cleartext is present with insert --decrypt=true" notmuch insert --folder=sent --decrypt=true <<<"$contents" -output=$(notmuch search wumpus) -expected='thread:0000000000000005 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (encrypted inbox unread)' +output=$(notmuch search wumpus | notmuch_search_sanitize) +expected='thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (encrypted inbox unread)' test_expect_equal \ "$output" \ "$expected" @@ -127,9 +125,9 @@ test_begin_subtest 'tagging all messages' test_expect_success 'notmuch tag +blarney "encrypted message"' test_begin_subtest "verify that tags have not changed" -output=$(notmuch search tag:blarney) -expected='thread:0000000000000001 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 001 (blarney encrypted inbox) -thread:0000000000000005 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (blarney encrypted inbox unread)' +output=$(notmuch search tag:blarney | notmuch_search_sanitize) +expected='thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 001 (blarney encrypted inbox) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (blarney encrypted inbox unread)' test_expect_equal \ "$output" \ "$expected" @@ -138,14 +136,14 @@ test_begin_subtest 'reindex old messages' test_expect_success 'notmuch reindex --decrypt=true tag:encrypted and not property:index.decryption=success' test_begin_subtest "reindexed encrypted message, including cleartext" -output=$(notmuch search wumpus) +output=$(notmuch search wumpus | notmuch_search_sanitize) test_expect_equal \ "$output" \ "$expected" # and the same search, but by property ($expected is untouched): test_begin_subtest "emacs search by property for both messages" -output=$(notmuch search property:index.decryption=success) +output=$(notmuch search property:index.decryption=success | notmuch_search_sanitize) test_expect_equal \ "$output" \ "$expected" @@ -154,7 +152,7 @@ test_begin_subtest 'reindex in auto mode' test_expect_success 'notmuch reindex tag:encrypted and property:index.decryption=success' test_begin_subtest "reindexed encrypted messages, should not have changed" -output=$(notmuch search wumpus) +output=$(notmuch search wumpus | notmuch_search_sanitize) test_expect_equal \ "$output" \ "$expected" @@ -188,9 +186,9 @@ # ensure that the tags remain even when we are dropping the cleartext. test_begin_subtest "verify that tags remain without cleartext" -output=$(notmuch search tag:blarney) -expected='thread:0000000000000001 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 001 (blarney encrypted inbox) -thread:0000000000000005 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (blarney encrypted inbox unread)' +output=$(notmuch search tag:blarney | notmuch_search_sanitize) +expected='thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 001 (blarney encrypted inbox) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; test encrypted message for cleartext index 002 (blarney encrypted inbox unread)' test_expect_equal \ "$output" \ "$expected" @@ -199,7 +197,7 @@ test_expect_success "notmuch reindex --decrypt=nostash tag:blarney" test_begin_subtest "Ensure that the indexed terms are present" -output=$(notmuch search wumpus) +output=$(notmuch search wumpus | notmuch_search_sanitize) test_expect_equal \ "$output" \ "$expected" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.1/test/T670-duplicate-mid.sh new/notmuch-0.32.2/test/T670-duplicate-mid.sh --- old/notmuch-0.32.1/test/T670-duplicate-mid.sh 2021-05-15 14:04:24.000000000 +0200 +++ new/notmuch-0.32.2/test/T670-duplicate-mid.sh 2021-06-27 13:56:21.000000000 +0200 @@ -2,10 +2,25 @@ test_description="duplicate message ids" . $(dirname "$0")/test-lib.sh || exit 1 +test_require_external_prereq xapian-delve + add_message '[id]="duplicate"' '[subject]="message 1" [filename]=copy1' add_message '[id]="duplicate"' '[subject]="message 2" [filename]=copy2' add_message '[id]="duplicate"' '[subject]="message 0" [filename]=copy0' + +test_begin_subtest 'at most 1 thread-id per xapian document' +db=${MAIL_DIR}/.notmuch/xapian +for doc in $(xapian-delve -1 -t '' "$db" | grep '^[1-9]'); do + xapian-delve -1 -r "$doc" "$db" | grep -c '^G' +done > OUTPUT.raw +sort -u < OUTPUT.raw > OUTPUT +cat <<EOF > EXPECTED +0 +1 +EOF +test_expect_equal_file EXPECTED OUTPUT + test_begin_subtest 'search: first indexed subject preserved' cat <<EOF > EXPECTED thread:XXX 2001-01-05 [1/1(3)] Notmuch Test Suite; message 1 (inbox unread) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.1/test/test-lib.sh new/notmuch-0.32.2/test/test-lib.sh --- old/notmuch-0.32.1/test/test-lib.sh 2021-05-15 14:04:24.000000000 +0200 +++ new/notmuch-0.32.2/test/test-lib.sh 2021-06-27 13:56:21.000000000 +0200 @@ -136,6 +136,8 @@ add_gpgsm_home () { + test_require_external_prereq openssl + local fpr [ -e "$GNUPGHOME/gpgsm.conf" ] && return _gnupg_exit () { gpgconf --kill all 2>/dev/null || true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notmuch-0.32.1/version.txt new/notmuch-0.32.2/version.txt --- old/notmuch-0.32.1/version.txt 2021-05-15 14:04:24.000000000 +0200 +++ new/notmuch-0.32.2/version.txt 2021-06-27 13:56:21.000000000 +0200 @@ -1 +1 @@ -0.32.1 +0.32.2

1 0

commit yast2 for openSUSE:Factory
by Source-Sync 01 Jul '21

01 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2021-07-01 07:05:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2" Thu Jul 1 07:05:28 2021 rev:513 rq:903112 version:4.4.14 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2021-06-05 23:31:56.324480392 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new.2625/yast2.changes 2021-07-01 07:05:33.591512040 +0200 @@ -1,0 +2,38 @@ +Wed Jun 23 13:24:04 UTC 2021 - Ancor Gonzalez Sosa <ancor(a)suse.com> + +- Y2Issues::Issue: renamed severity "fatal" to "error", to be more + consistent with other parts of (Auto)YaST +- Added options to configure the behavior of Y2Issues.report + (related to jsc#PM-2620 and bsc#1166743) +- 4.4.14 + +------------------------------------------------------------------- +Mon Jun 21 20:51:57 UTC 2021 - Josef Reidinger <jreidinger(a)suse.com> + +- Y2Issues::List: Add methods size and concat (related to + bsc#1181295). +- 4.4.13 + +------------------------------------------------------------------- +Thu Jun 17 06:15:02 UTC 2021 - Dirk M��ller <dmueller(a)suse.com> + +- add riscv64 architecture helper (jsc#PM-2612) +- 4.4.12 + +------------------------------------------------------------------- +Fri Jun 11 15:45:21 UTC 2021 - Josef Reidinger <jreidinger(a)suse.com> + +- Yast2::AutoClient.run: Ensure that Reset, Read, and SetModified + return nil regardless of their implementation, to prevent + a crash in the component system (bsc#1187233) +- 4.4.11 + +------------------------------------------------------------------- +Tue Jun 8 08:26:13 UTC 2021 - Imobach Gonzalez Sosa <igonzalezsosa(a)suse.com> + +- Ignore sysctl configuration files that do not have the .conf + extension. The only exception are kernel files + (/boot/sysctl.conf-*) (bsc#1187018). +- 4.4.10 + +------------------------------------------------------------------- Old: ---- yast2-4.4.9.tar.bz2 New: ---- yast2-4.4.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.2yjbab/_old 2021-07-01 07:05:34.191507353 +0200 +++ /var/tmp/diff_new_pack.2yjbab/_new 2021-07-01 07:05:34.195507321 +0200 @@ -17,13 +17,12 @@ Name: yast2 -Version: 4.4.9 +Version: 4.4.14 Release: 0 Summary: YaST2 Main Package License: GPL-2.0-only Group: System/YaST URL: https://github.com/yast/yast-yast2 - Source0: %{name}-%{version}.tar.bz2 Source1: yast2-rpmlintrc ++++++ yast2-4.4.9.tar.bz2 -> yast2-4.4.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/README.md new/yast2-4.4.14/README.md --- old/yast2-4.4.9/README.md 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/README.md 2021-06-29 18:19:30.000000000 +0200 @@ -47,4 +47,4 @@ If you have any question, feel free to ask at the [development mailing list](http://lists.opensuse.org/yast-devel/) or at the -[#yast](https://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. +[#yast](https://web.libera.chat/#yast) IRC channel on libera.chat. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/doc/README_Template.md new/yast2-4.4.14/doc/README_Template.md --- old/yast2-4.4.9/doc/README_Template.md 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/doc/README_Template.md 2021-06-29 18:19:30.000000000 +0200 @@ -104,4 +104,4 @@ If you have any question, feel free to ask at the [development mailing list](http://lists.opensuse.org/yast-devel/) or at the -[#yast](https://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. +[#yast](https://web.libera.chat/#yast) IRC channel on libera.chat. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/library/general/src/lib/cfa/sysctl_config.rb new/yast2-4.4.14/library/general/src/lib/cfa/sysctl_config.rb --- old/yast2-4.4.9/library/general/src/lib/cfa/sysctl_config.rb 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/library/general/src/lib/cfa/sysctl_config.rb 2021-06-29 18:19:30.000000000 +0200 @@ -157,7 +157,9 @@ if Yast::FileUtils.IsFile(path) [path] elsif Yast::FileUtils.IsDirectory(path) - Yast::SCR.Read(Yast::Path.new(".target.dir"), path).map { |file| File.join(path, file) } + Yast::SCR.Read(Yast::Path.new(".target.dir"), path) + .select { |f| f.end_with?(".conf") } # according to 'sysctl.conf' manpage, only .conf files are considered + .map { |f| File.join(path, f) } else log.debug("Ignoring not valid path: #{path}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/library/general/src/lib/installation/auto_client.rb new/yast2-4.4.14/library/general/src/lib/installation/auto_client.rb --- old/yast2-4.4.9/library/general/src/lib/installation/auto_client.rb 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/library/general/src/lib/installation/auto_client.rb 2021-06-29 18:19:30.000000000 +0200 @@ -69,6 +69,7 @@ summary when "Reset" reset + nil # return type is ignored, so always return nil to avoid issues with ycp component system when "Change" change when "Write" @@ -77,10 +78,12 @@ packages when "Read" read + nil # return type is ignored, so always return nil to avoid issues with ycp component system when "GetModified" modified? when "SetModified" modified + nil # return type is ignored, so always return nil to avoid issues with ycp component system else raise ArgumentError, "Invalid action for auto client '#{func.inspect}'" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/library/general/src/lib/installation/autoinst_issues/missing_value.rb new/yast2-4.4.14/library/general/src/lib/installation/autoinst_issues/missing_value.rb --- old/yast2-4.4.9/library/general/src/lib/installation/autoinst_issues/missing_value.rb 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/library/general/src/lib/installation/autoinst_issues/missing_value.rb 2021-06-29 18:19:30.000000000 +0200 @@ -32,7 +32,7 @@ # @param section [String] Section where it was detected # @param attribute [String] Name of the missing attribute # @param description [String] additional explanation; optional - # @param severity [Symbol] :warn, :fatal = abort the installation ; optional + # @param severity [Symbol] :warn, :error = abort the installation ; optional def initialize(section, attr, description = "", severity = :warn) textdomain "base" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/library/general/src/lib/y2issues/issue.rb new/yast2-4.4.14/library/general/src/lib/y2issues/issue.rb --- old/yast2-4.4.9/library/general/src/lib/y2issues/issue.rb 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/library/general/src/lib/y2issues/issue.rb 2021-06-29 18:19:30.000000000 +0200 @@ -27,7 +27,7 @@ # specific information. See {InvalidValue} as an example. # # @example Create a new error - # Issue.new("Could not read network configuration", severity: :fatal) + # Issue.new("Could not read network configuration", severity: :error) # # @example Create an error from an specific location # Issue.new( @@ -42,25 +42,27 @@ attr_reader :location # @return [String] Error message attr_reader :message - # @return [Symbol] Error severity (:warn, :fatal) + # @return [Symbol] Error severity (:warn, :error) attr_reader :severity # @param message [String] User-oriented message describing the problem # @param location [String,nil] Where the error is located. Use a URI or # a string to represent the error location. Use 'nil' if it # does not exist an specific location. - # @param severity [Symbol] warning (:warn) or fatal (:fatal) + # @param severity [Symbol] warning (:warn) or error (:error) def initialize(message, location: nil, severity: :warn) @message = message @location = location.is_a?(String) ? Location.parse(location) : location @severity = severity end - # Determines whether the error is fatal or not + # Determines whether the issue is an error # # @return [Boolean] - def fatal? - @severity == :fatal + def error? + @severity == :error end + + alias_method :fatal?, :error? end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/library/general/src/lib/y2issues/list.rb new/yast2-4.4.14/library/general/src/lib/y2issues/list.rb --- old/yast2-4.4.9/library/general/src/lib/y2issues/list.rb 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/library/general/src/lib/y2issues/list.rb 2021-06-29 18:19:30.000000000 +0200 @@ -25,7 +25,7 @@ include Enumerable extend Forwardable - def_delegators :@items, :each, :empty?, :<< + def_delegators :@items, :each, :empty?, :<<, :size # Constructor # @@ -34,18 +34,31 @@ @items = issues end - # Determine whether any of the problem on the list is fatal + # Determine whether any of the issues on the list is an error # - # @return [Boolean] true if any of them is a fatal problem - def fatal? - any?(&:fatal?) + # @return [Boolean] + def error? + any?(&:error?) end + alias_method :fatal?, :error? + # Returns an array containing registered problems # # @return [Array<Issue>] List of problems def to_a @items end + + # concats issues + # @param args [Array[List]] args to concat. see Array#concat + # + # @note also self is modified + # @return [List] + def concat(*args) + @items.concat(*args.map(&:to_a)) + + self + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/library/general/src/lib/y2issues/presenter.rb new/yast2-4.4.14/library/general/src/lib/y2issues/presenter.rb --- old/yast2-4.4.9/library/general/src/lib/y2issues/presenter.rb 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/library/general/src/lib/y2issues/presenter.rb 2021-06-29 18:19:30.000000000 +0200 @@ -48,10 +48,10 @@ # # @return [String] HTML representing the list of issues def to_html - fatal, non_fatal = issues.partition(&:fatal?) + errors, warnings = issues.partition(&:error?) parts = [] - parts << error_text(fatal) unless fatal.empty? - parts << warning_text(non_fatal) unless non_fatal.empty? + parts << error_text(errors) unless errors.empty? + parts << warning_text(warnings) unless warnings.empty? parts.join end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/library/general/src/lib/y2issues/reporter.rb new/yast2-4.4.14/library/general/src/lib/y2issues/reporter.rb --- old/yast2-4.4.9/library/general/src/lib/y2issues/reporter.rb 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/library/general/src/lib/y2issues/reporter.rb 2021-06-29 18:19:30.000000000 +0200 @@ -22,6 +22,7 @@ Yast.import "Label" Yast.import "Report" +Yast.import "HTML" module Y2Issues # This class provides a mechanism to report YaST2 issues @@ -37,45 +38,101 @@ def initialize(issues, report_settings: Yast::Report.Export) textdomain "base" @presenter = Presenter.new(issues) - @level = issues.fatal? ? :error : :warn + @level = issues.error? ? :error : :warn @log, @show, @timeout = find_settings(report_settings, @level) end # Reports the issues to the user # # Depending on the given report settings, it may display a pop-up, and/or log the error. - def report + # + # In case of displaying the pop-up, the way to present the information and the possible return + # values are determined by the severity of the issues and the value of `warn` and `error`. + # + # If the value specified for the corresponding level is :abort, the pop-up contains the + # information and a single button to abort, the method returns false. + # + # If the value is :ask, the information is presented and the user is asked whether they want to + # continue or abort. The returned value depends on the answer. + # + # In the value is :continue (or any other symbol), the information is displayed with a button to + # simply close the pop-up and the method always returns true. + # + # @param warn [Symbol] what to do if the list of issues only contains warnings + # @param error [Symbol] what to do if the list of issues contains some error + # @return [Boolean] whether the process may continue, false means aborting + def report(warn: :ask, error: :abort) log_issues if @log - show_issues if @show + return true unless @show + + show_issues(warn, error) end private - attr_reader :level, :presenter + # Severity of the set of issues + # + # @return [Symbol] :warn if all the issues are just warnings, :error if any + # of the issues is an error + attr_reader :level + + # @return [Presenter] + attr_reader :presenter # Displays a pop-up containing the issues # - # It can behave in two different ways depending if a fatal issue was found: - # - # * Ask the user if she/he wants to continue or abort the installation. - # * Display a message and only offer an 'Abort' button. - def show_issues - if level == :error - headline = :error - buttons = { abort: Yast::Label.AbortButton } - question = _("Please, correct these problems and try again.") - timeout = 0 + # @return [Boolean] see {#report} + def show_issues(warn, error) + action = (level == :error) ? error : warn + case action + when :abort + show_issues_abort + when :ask + show_issues_ask else - headline = :warning - buttons = :yes_no - question = _("Do you want to continue?") - timeout = @timeout + show_issues_continue end + end + + # @see #show_issues + # + # @return [Boolean] see {#report}, always false in this case + def show_issues_abort + buttons = { abort: Yast::Label.AbortButton } + question = _("Please, correct these problems and try again.") + popup(question, buttons, with_timeout: false) + + false + end + + # @see #show_issues + # + # @return [Boolean] see {#report} + def show_issues_ask + popup(_("Do you want to continue?"), :yes_no) == :yes + end + + # @see #show_issues + # + # @return [Boolean] see {#report}, always true in this case + def show_issues_continue + popup("", :ok) + true + end + + # Displays pop-up with information about the issues + def popup(footer, btns, with_timeout: true) + text = presenter.to_html + text += Yast::HTML.Para(footer) if footer && !footer.empty? + time = with_timeout ? @timeout : 0 + Yast2::Popup.show(text, richtext: true, headline: header, buttons: btns, timeout: time) + end + + # @see #popup + def header + return :error if level == :error - content = presenter.to_html + Yast::HTML.Para(question) - Yast2::Popup.show( - content, richtext: true, headline: headline, buttons: buttons, timeout: timeout - ) + :warning end # Writes the issues diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/library/general/src/lib/y2issues.rb new/yast2-4.4.14/library/general/src/lib/y2issues.rb --- old/yast2-4.4.9/library/general/src/lib/y2issues.rb 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/library/general/src/lib/y2issues.rb 2021-06-29 18:19:30.000000000 +0200 @@ -28,17 +28,20 @@ # # @example Registering an error # list = Y2Issues::List.new -# list << Y2Issues::Issue.new("Could not read network configuration", severity: :fatal) +# list << Y2Issues::Issue.new("Could not read network configuration", severity: :error) module Y2Issues # Reports the errors to the user # # This is a helper method that offers an stable API on top of {Reporter}. Depending on # Yast::Report settings, it may show a pop-up with the found issues and log them. # - # @param [List] Issues list + # @param issues [List] Issues list + # @param warn [Symbol] what to do if the list of issues only contains warnings + # @param error [Symbol] what to do if the list of issues contains some error + # @return [Boolean] whether the process may continue, false means YaST is expected to abort # @see Y2Issues::Reporter - def self.report(issues) - Reporter.new(issues).report + def self.report(issues, warn: :ask, error: :abort) + Reporter.new(issues).report(warn: warn, error: error) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/library/general/src/modules/Arch.rb new/yast2-4.4.14/library/general/src/modules/Arch.rb --- old/yast2-4.4.9/library/general/src/modules/Arch.rb 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/library/general/src/modules/Arch.rb 2021-06-29 18:19:30.000000000 +0200 @@ -63,7 +63,8 @@ # ************************************************************ # system architecture - # Returns full architecture type (one of i386, sparc, sparc64, ppc, ppc64, alpha, s390_32, s390_64, ia64, x86_64, arm, aarch64) + # Returns full architecture type + # (one of i386, sparc, sparc64, ppc, ppc64, alpha, s390_32, s390_64, ia64, x86_64, arm, aarch64, risv64) # # @return [String] architecture def architecture @@ -169,6 +170,11 @@ architecture == "aarch64" end + # true for all riscv64 (RISC-V 64-bit) architectures + def riscv64 + architecture == "riscv64" + end + # Returns general architecture type (one of sparc, ppc, s390, i386, alpha, ia64, x86_64, arm, aarch64) # # @return [String] arch_short @@ -521,6 +527,7 @@ publish function: :x86_64, type: "boolean ()" publish function: :arm, type: "boolean ()" publish function: :aarch64, type: "boolean ()" + publish function: :riscv64, type: "boolean ()" publish function: :arch_short, type: "string ()" publish function: :board_mac, type: "boolean ()" publish function: :board_mac_new, type: "boolean ()" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/library/general/test/auto_client_test.rb new/yast2-4.4.14/library/general/test/auto_client_test.rb --- old/yast2-4.4.9/library/general/test/auto_client_test.rb 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/library/general/test/auto_client_test.rb 2021-06-29 18:19:30.000000000 +0200 @@ -105,7 +105,13 @@ end it "dispatch call to abstract method reset" do - expect(subject.run).to eq "reset" + expect_any_instance_of(subject).to receive(:reset) + + subject.run + end + + it "always return nil" do + expect(subject.run).to eq nil end it "raise NotImplementedError exception if abstract method not defined" do @@ -147,7 +153,13 @@ end it "dispatch call to abstract method read" do - expect(subject.run).to eq "read" + expect_any_instance_of(subject).to receive(:read) + + subject.run + end + + it "always return nil" do + expect(subject.run).to eq nil end it "raise NotImplementedError exception if abstract method not defined" do @@ -175,7 +187,13 @@ end it "dispatch call to abstract method modified" do - expect(subject.run).to eq "modified" + expect_any_instance_of(subject).to receive(:modified) + + subject.run + end + + it "always return nil" do + expect(subject.run).to eq nil end it "raise NotImplementedError exception if abstract method not defined" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/library/general/test/y2issues/issue_test.rb new/yast2-4.4.14/library/general/test/y2issues/issue_test.rb --- old/yast2-4.4.9/library/general/test/y2issues/issue_test.rb 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/library/general/test/y2issues/issue_test.rb 2021-06-29 18:19:30.000000000 +0200 @@ -27,14 +27,14 @@ described_class.new( "Something went wrong", location: Y2Issues::Location.parse("file:/etc/hosts"), - severity: :fatal + severity: :error ) end it "creates an issue" do expect(issue.message).to eq("Something went wrong") expect(issue.location).to eq(Y2Issues::Location.parse("file:/etc/hosts")) - expect(issue.severity).to eq(:fatal) + expect(issue.severity).to eq(:error) end context "when location is given as a string" do @@ -59,20 +59,20 @@ end end - describe "#fatal?" do - context "when severity is :fatal" do - subject(:issue) { described_class.new("Something went wrong", severity: :fatal) } + describe "#error?" do + context "when severity is :error" do + subject(:issue) { described_class.new("Something went wrong", severity: :error) } it "returns true" do - expect(issue.fatal?).to eq(true) + expect(issue.error?).to eq(true) end end - context "when severity is :fatal" do + context "when severity is :error" do subject(:issue) { described_class.new("Something went wrong", severity: :warn) } it "returns false" do - expect(issue.fatal?).to eq(false) + expect(issue.error?).to eq(false) end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/library/general/test/y2issues/list_test.rb new/yast2-4.4.14/library/general/test/y2issues/list_test.rb --- old/yast2-4.4.9/library/general/test/y2issues/list_test.rb 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/library/general/test/y2issues/list_test.rb 2021-06-29 18:19:30.000000000 +0200 @@ -56,20 +56,33 @@ end end - describe "#fatal?" do - context "when contains some fatal error" do - let(:issue) { Y2Issues::Issue.new("Something went wrong", severity: :fatal) } + describe "#error?" do + context "when contains some error" do + let(:issue) { Y2Issues::Issue.new("Something went wrong", severity: :error) } it "returns true" do - expect(list.fatal?).to eq(true) + expect(list.error?).to eq(true) end end - context "when does not contain any fatal error" do + context "when does not contain any error error" do it "returns false" do - expect(list.fatal?).to eq(false) + expect(list.error?).to eq(false) end end end + + describe "#concat" do + it "concats all passed Lists" do + issue1 = Y2Issues::Issue.new("Something went wrong", severity: :fatal) + issue2 = Y2Issues::Issue.new("Something went wrong2") + issue3 = Y2Issues::Issue.new("Something went wrong3") + expect(described_class.new([issue1]).concat( + described_class.new([issue2]), described_class.new([issue3]) + ).to_a).to eq( + described_class.new([issue1, issue2, issue3]).to_a + ) + end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/library/general/test/y2issues/presenter_test.rb new/yast2-4.4.14/library/general/test/y2issues/presenter_test.rb --- old/yast2-4.4.9/library/general/test/y2issues/presenter_test.rb 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/library/general/test/y2issues/presenter_test.rb 2021-06-29 18:19:30.000000000 +0200 @@ -26,9 +26,9 @@ let(:list) { Y2Issues::List.new } describe "#to_html" do - context "when a fatal issue was found" do + context "when an error was found" do before do - list << Y2Issues::Issue.new("Something is invalid", severity: :fatal) + list << Y2Issues::Issue.new("Something is invalid", severity: :error) end it "includes issues messages" do @@ -36,12 +36,12 @@ expect(presenter.to_html.to_s).to include "<li>#{issue.message}</li>" end - it "includes an introduction to fatal issues qlist" do + it "includes an introduction to the errors list" do expect(presenter.to_html.to_s).to include "Important issues" end end - context "when a non fatal issue was found" do + context "when a warning was found" do before do list << Y2Issues::Issue.new("Something is missing", severity: :warn) end @@ -51,7 +51,7 @@ expect(presenter.to_html.to_s).to include "<li>#{issue.message}</li>" end - it "includes an introduction to non fatal issues list" do + it "includes an introduction to the warnings list" do expect(presenter.to_html.to_s).to include "<p>Minor issues" end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/library/general/test/y2issues/reporter_test.rb new/yast2-4.4.14/library/general/test/y2issues/reporter_test.rb --- old/yast2-4.4.9/library/general/test/y2issues/reporter_test.rb 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/library/general/test/y2issues/reporter_test.rb 2021-06-29 18:19:30.000000000 +0200 @@ -39,7 +39,7 @@ let(:errors_settings) do { "log" => true, "show" => true, "timeout" => 15 } end - let(:level) { :fatal } + let(:level) { :error } describe "#report" do before do @@ -51,15 +51,25 @@ reporter.report end - context "when there is a fatal error" do - let(:level) { :fatal } + context "when there is an error" do + let(:level) { :error } - it "displays issues as errors with no timeout" do - expect(Yast2::Popup).to receive(:show) .with( + it "displays issues as errors with the proper timeout and buttons" do + expect(Yast2::Popup).to receive(:show).with( /Important issues/, headline: :error, richtext: true, timeout: 0, buttons: a_hash_including(abort: String) ) - reporter.report + reporter.report(error: :abort) + + expect(Yast2::Popup).to receive(:show).with( + /Important issues/, headline: :error, richtext: true, timeout: 15, buttons: :yes_no + ) + reporter.report(error: :ask) + + expect(Yast2::Popup).to receive(:show).with( + /Important issues/, headline: :error, richtext: true, timeout: 15, buttons: :ok + ) + reporter.report(error: :continue) end it "logs the issues" do @@ -84,39 +94,49 @@ reporter.report end end + end - context "when there are just warnings" do - let(:level) { :warn } + context "when there are just warnings" do + let(:level) { :warn } - it "displays issues as errors with no timeout" do - expect(Yast2::Popup).to receive(:show) .with( - /Minor issues/, headline: :warning, richtext: true, timeout: 10, - buttons: :yes_no - ) - reporter.report - end + it "displays issues as warning with the proper timeout and buttons" do + expect(Yast2::Popup).to receive(:show).with( + /Minor issues/, headline: :warning, richtext: true, timeout: 0, + buttons: a_hash_including(abort: String) + ) + reporter.report(warn: :abort) - it "logs the issues" do - expect(reporter.log).to receive(:warn).with(/Minor issues/) - reporter.report - end + expect(Yast2::Popup).to receive(:show).with( + /Minor issues/, headline: :warning, richtext: true, timeout: 10, buttons: :yes_no + ) + reporter.report(warn: :ask) - context "if showing warnings is disabled" do - let(:warnings_settings) { { "show" => false, "log" => true } } + expect(Yast2::Popup).to receive(:show).with( + /Minor issues/, headline: :warning, richtext: true, timeout: 10, buttons: :ok + ) + reporter.report(warn: :continue) + end + + it "logs the issues" do + expect(reporter.log).to receive(:warn).with(/Minor issues/) + reporter.report + end - it "does not display the issues" do - expect(Yast2::Popup).to_not receive(:show) - reporter.report - end + context "if showing warnings is disabled" do + let(:warnings_settings) { { "show" => false, "log" => true } } + + it "does not display the issues" do + expect(Yast2::Popup).to_not receive(:show) + reporter.report end + end - context "if loggin warnings is disabled" do - let(:warnings_settings) { { "show" => true, "log" => false } } + context "if loggin warnings is disabled" do + let(:warnings_settings) { { "show" => true, "log" => false } } - it "does not log the warning" do - expect(reporter.log).to_not receive(:warn) - reporter.report - end + it "does not log the warning" do + expect(reporter.log).to_not receive(:warn) + reporter.report end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/package/yast2.changes new/yast2-4.4.14/package/yast2.changes --- old/yast2-4.4.9/package/yast2.changes 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/package/yast2.changes 2021-06-29 18:19:30.000000000 +0200 @@ -1,4 +1,42 @@ ------------------------------------------------------------------- +Wed Jun 23 13:24:04 UTC 2021 - Ancor Gonzalez Sosa <ancor(a)suse.com> + +- Y2Issues::Issue: renamed severity "fatal" to "error", to be more + consistent with other parts of (Auto)YaST +- Added options to configure the behavior of Y2Issues.report + (related to jsc#PM-2620 and bsc#1166743) +- 4.4.14 + +------------------------------------------------------------------- +Mon Jun 21 20:51:57 UTC 2021 - Josef Reidinger <jreidinger(a)suse.com> + +- Y2Issues::List: Add methods size and concat (related to + bsc#1181295). +- 4.4.13 + +------------------------------------------------------------------- +Thu Jun 17 06:15:02 UTC 2021 - Dirk M��ller <dmueller(a)suse.com> + +- add riscv64 architecture helper (jsc#PM-2612) +- 4.4.12 + +------------------------------------------------------------------- +Fri Jun 11 15:45:21 UTC 2021 - Josef Reidinger <jreidinger(a)suse.com> + +- Yast2::AutoClient.run: Ensure that Reset, Read, and SetModified + return nil regardless of their implementation, to prevent + a crash in the component system (bsc#1187233) +- 4.4.11 + +------------------------------------------------------------------- +Tue Jun 8 08:26:13 UTC 2021 - Imobach Gonzalez Sosa <igonzalezsosa(a)suse.com> + +- Ignore sysctl configuration files that do not have the .conf + extension. The only exception are kernel files + (/boot/sysctl.conf-*) (bsc#1187018). +- 4.4.10 + +------------------------------------------------------------------- Thu Jun 3 15:40:30 UTC 2021 - Jos�� Iv��n L��pez Gonz��lez <jlopez(a)suse.com> - AutoYaST: SectionWithAttributes allows to indicate whether an diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.4.9/package/yast2.spec new/yast2-4.4.14/package/yast2.spec --- old/yast2-4.4.9/package/yast2.spec 2021-06-04 10:57:39.000000000 +0200 +++ new/yast2-4.4.14/package/yast2.spec 2021-06-29 18:19:30.000000000 +0200 @@ -17,13 +17,12 @@ Name: yast2 -Version: 4.4.9 +Version: 4.4.14 Release: 0 Summary: YaST2 Main Package License: GPL-2.0-only Group: System/YaST -Url: https://github.com/yast/yast-yast2 - +URL: https://github.com/yast/yast-yast2 Source0: %{name}-%{version}.tar.bz2 Source1: yast2-rpmlintrc

1 0

commit systemd for openSUSE:Factory
by Source-Sync 01 Jul '21

01 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2021-07-01 07:05:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd" Thu Jul 1 07:05:27 2021 rev:330 rq:902866 version:248.3 Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2021-06-04 00:33:08.388871352 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new.2625/systemd-mini.changes 2021-07-01 07:05:31.787526132 +0200 @@ -1,0 +2,168 @@ +Mon Jun 28 16:45:04 UTC 2021 - Franck Bui <fbui(a)suse.com> + +- Import commit e9a23d9e064c2e7ac21a1b984d116bcf15327e63 + + 8dd19c6ee3 sd-device: allow to read sysattr which contains embedded NUL + d52409e5fe pid1: only add a Wants= type dependency on /tmp when PrivateTmp=yes (bsc#1181970 + +------------------------------------------------------------------- +Thu Jun 24 13:39:30 UTC 2021 - Franck Bui <fbui(a)suse.com> + +- Import commit fcdb8dce591db2f5fc3c1e3eeb7abe9a2090b401 + + aa2d840a3b compat-rules: fix warning: "label ��out�� defined but not used" in path_id_compat.c + +- Restore 61-persistent-storage-compat.rules that was mistakenly + dropped during the merge of v248. + +------------------------------------------------------------------- +Fri Jun 18 12:53:34 UTC 2021 - Franck Bui <fbui(a)suse.com> + +- Create /run/lock/subsys again (bsc#1187292) + + The creation of this directory was mistakenly dropped when + 'filesystem' package took the initialization of the generic paths + over. + + Paths under /run/lock are still managed by systemd for lack of + better place. + +------------------------------------------------------------------- +Fri Jun 4 13:10:30 UTC 2021 - Franck Bui <fbui(a)suse.com> + +- Drop systemd's dependency on udev (jsc#PM-2677) + + In some environments (i.e. containers) udev is usually not necessary + but pulls in unnecessary packages. + +------------------------------------------------------------------- +Fri Jun 4 07:32:16 UTC 2021 - Franck Bui <fbui(a)suse.com> + +- Now that chkconfig/insserv are history, let's implement the strict + minimum in systemd-sysv-install to enable/disable SysV init scripts + (bsc#1186595 bsc#1186359) + + Indeed there's no much point in dropping SysV support completely + until upstream will do especially since 3rd party applications such + as vmware still rely on it, see bsc#1186359). + +------------------------------------------------------------------- +Tue May 25 16:30:40 UTC 2021 - Franck Bui <fbui(a)suse.com> + +- Allow the sysusers config files shipped by systemd rpms to be + overriden during system installation (bsc#1171962) + +- While at it, add a comment to explain why we don't use + %sysusers_create in %pre and why it should be safe in %post. + +------------------------------------------------------------------- +Thu May 20 20:19:27 UTC 2021 - Franck Bui <fbui(a)suse.com> + +- udev requires systemd in its %post (bsc#1185958) + + udevadm, called in udev's %post, requires libsystemd-shared-248.so. + +------------------------------------------------------------------- +Thu May 20 18:52:53 UTC 2021 - Franck Bui <fbui(a)suse.com> + +- Restore all "License:" tags + + udev uses a different license (GPL-2.0-only) than the main package + and "osc service localrun format_spec_file" has the good taste to + restore the license tags for all other subpackages if one of the + subpackage tag differs. + +------------------------------------------------------------------- +Thu May 20 15:47:38 UTC 2021 - Franck Bui <fbui(a)suse.com> + +- Expect 644 permissions for /usr/lib/udev/compat-symlink-generation (bsc#1185807) + +------------------------------------------------------------------- +Wed May 19 06:54:57 UTC 2021 - Franck Bui <fbui(a)suse.com> + +- Spec file minor cleanups: + + - Drop all "Group:" tags as they are deprecated. + + - Drop "License:" tags from all subpackages and make it inherited + from the main package. + + - Drop "%bcond_with parentpathid" as it's not used. + +------------------------------------------------------------------- +Tue May 18 18:31:20 UTC 2021 - Franck Bui <fbui(a)suse.com> + +- Introduce subpackage systemd-tests + + This subpackage is mainly used before submitting a new version of + the systemd packages. As such it's not intended for regular users + hence can be removed/renamed at any time. One might wonder why the + unit tests are not executed during package builds (%check)... the + reason is that the environment used to build package (chroot) is too + limited and therefore only a subset of the unit tests would be + executed in this environment. + + To disable the build of the subpackage, use "--without=tests". + +------------------------------------------------------------------- +Tue May 18 10:04:16 UTC 2021 - Franck Bui <fbui(a)suse.com> + +- Add 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch + + A temporary patch until + https://github.com/systemd/systemd/issues/19464 is solved. + +------------------------------------------------------------------- +Tue May 18 08:19:57 UTC 2021 - Franck Bui <fbui(a)suse.com> + +- Import commit bc08011f04ac4f12569ec05965149f665a0b110b (merge of v248.3) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/6f5c11b28f5739b901390f22c2bf4c0… + +------------------------------------------------------------------- +Mon May 10 13:12:56 UTC 2021 - Franck Bui <fbui(a)suse.com> + +- Import commit 6f5c11b28f5739b901390f22c2bf4c003cadedaa (merge of v248.2) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/e5f93c9d2e9e26dd0dff430c4c072a5… + +------------------------------------------------------------------- +Mon Apr 26 16:25:38 UTC 2021 - Franck Bui <fbui(a)suse.com> + +- Upgrade to v248 (commit 5d3d934a5c2f4593207497db94e6f313348e89e7) + + See https://github.com/openSUSE/systemd/blob/SUSE/v248/NEWS for + details. + + - A couple runtime dependencies on libraries are now tracked + manually (with Recommends:) due to the fact that some symbols of + these libs are dynamically loaded with dlopen() (heck!) + + - oomd is left disablde for now + + - pam configuration file 'systemd-user' is now shipped in + /usr/etc/pam.d + + - Rebased 0001-conf-parser-introduce-early-drop-ins.patch + 0003-strip-the-domain-part-from-etc-hostname-when-setting.patch + 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch + + - Dropped 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch + as it is SLE specific. + +- Clean systemd-experimental up: + + - Enclose "%package/%descriptoin experimental" within a "%if + %experimental/%endif" block condition + + - List the build requirements in the sub-package instead of listing + them in the main package. + + - Enable support for fido2, pwquality and qrencode in the home + stuff + + - Improve the package description + +------------------------------------------------------------------- systemd.changes: same change Old: ---- 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch systemd-v246.13+suse.105.g14581e0120.tar.xz New: ---- 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch systemd-v248.3+suse.30.ge9a23d9e06.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.ku8fIG/_old 2021-07-01 07:05:32.887517539 +0200 +++ /var/tmp/diff_new_pack.ku8fIG/_new 2021-07-01 07:05:32.891517508 +0200 @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.105.g14581e0120 +%define suse_version +suse.30.ge9a23d9e06 %bcond_with gnuefi %if 0%{?bootstrap} @@ -39,6 +39,7 @@ %bcond_with resolved %bcond_with sysvcompat %bcond_with experimental +%bcond_with tests %else %bcond_without coredump %ifarch %{ix86} x86_64 @@ -52,16 +53,15 @@ %bcond_without resolved %bcond_without sysvcompat %bcond_without experimental +%bcond_without tests %endif -%bcond_with parentpathid Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.13 +Version: 248.3 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later -Group: System/Base BuildRoot: %{_tmppath}/%{name}-%{version}-build %if ! 0%{?bootstrap} BuildRequires: docbook-xsl-stylesheets @@ -76,6 +76,7 @@ BuildRequires: pkgconfig(audit) BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libdw) +BuildRequires: pkgconfig(libfido2) BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpcre2-8) @@ -113,10 +114,6 @@ %if %{with gnuefi} BuildRequires: gnu-efi %endif -%if %{with experimental} -BuildRequires: pkgconfig(fdisk) -BuildRequires: pkgconfig(openssl) -%endif %if 0%{?bootstrap} #!BuildIgnore: dbus-1 @@ -128,13 +125,15 @@ Requires: aaa_base >= 13.2 Requires: dbus-1 >= 1.4.0 Requires: kbd -Requires: kmod >= 15 Requires: netcfg >= 11.5 Requires: systemd-default-settings-branding Requires: systemd-presets-branding -Requires: udev = %{version}-%{release} Requires: util-linux >= 2.27.1 Requires: group(lock) +# This Recommends because some symbols of libpcre2 are dlopen()ed by journalctl +Recommends: libpcre2-8-0 +# ditto but dlopen()ed by systemd-cryptenroll +Recommends: libfido2 Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding @@ -175,7 +174,6 @@ Patch1: 0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch Patch2: 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch Patch3: 0003-strip-the-domain-part-from-etc-hostname-when-setting.patch -Patch4: 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch Patch5: 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch Patch6: 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch @@ -191,6 +189,7 @@ # upstream and need an urgent fix. Even in this case, the patches are # temporary and should be removed as soon as a fix is merged by # upstream. +Patch100: 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -206,7 +205,6 @@ %package doc Summary: HTML documentation for systemd License: LGPL-2.1-or-later -Group: Documentation/Other Supplements: (systemd and patterns-base-documentation) %description doc @@ -218,7 +216,6 @@ %package devel Summary: Development headers for systemd License: LGPL-2.1-or-later -Group: Development/Libraries/C and C++ Requires: libsystemd0%{?mini} = %{version}-%{release} Requires: systemd-rpm-macros %if 0%{?bootstrap} @@ -231,7 +228,6 @@ %package sysvinit Summary: System V init tools License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} Provides: sbin_init Conflicts: otherproviders(sbin_init) @@ -244,7 +240,6 @@ %package -n libsystemd0%{?mini} Summary: Component library for systemd License: LGPL-2.1-or-later -Group: System/Libraries %if 0%{?bootstrap} Conflicts: libsystemd0 Requires: this-is-only-for-build-envs @@ -274,14 +269,14 @@ %package -n udev%{?mini} Summary: A rule-based device node and kernel event manager License: GPL-2.0-only -Group: System/Kernel URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +Requires: kmod Requires: system-group-hardware Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun): coreutils -Requires(postun): /usr/bin/systemctl +%systemd_requires Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 @@ -307,7 +302,6 @@ %package -n libudev%{?mini}1 Summary: Dynamic library to access udev device information License: LGPL-2.1-or-later -Group: System/Libraries %if 0%{?bootstrap} Conflicts: libudev1 Conflicts: kiwi @@ -322,7 +316,6 @@ %package -n libudev%{?mini}-devel Summary: Development files for libudev License: LGPL-2.1-or-later -Group: Development/Libraries/Other Requires: libudev%{?mini}1 = %{version}-%{release} %if 0%{?bootstrap} Provides: libudev-devel = %{version}-%{version} @@ -338,7 +331,6 @@ %package coredump Summary: Systemd tools for coredump management License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/coredumpctl @@ -352,7 +344,6 @@ %package container Summary: Systemd tools for container management License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/systemd-nspawn @@ -370,8 +361,9 @@ %package network Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} +# This Recommends because some symbols of libidn2 are dlopen()ed by resolved +Recommends: pkgconfig(libidn2) BuildRequires: pkgconfig(libidn2) Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved @@ -387,7 +379,6 @@ %package portable Summary: Systemd tools for portable services License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires @@ -407,7 +398,6 @@ %package logger Summary: Journal only logging License: LGPL-2.1-or-later -Group: System/Base Provides: syslog Provides: sysvinit(syslog) Requires(post): /usr/bin/systemctl @@ -419,7 +409,6 @@ %package -n nss-systemd Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-systemd This package contains a plugin for the Name Service Switch (NSS), @@ -432,7 +421,6 @@ %package -n nss-myhostname Summary: Plugin for local system host name resolution License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-myhostname This package contains a plug-in module for the Name Service Switch @@ -449,7 +437,6 @@ %package -n nss-resolve Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1-or-later -Group: System/Libraries Requires: %{name}-network = %{version}-%{release} %description -n nss-resolve @@ -466,7 +453,6 @@ %package -n nss-mymachines Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-mymachines This package contains a plugin for the Name Service Switch (NSS), @@ -483,11 +469,8 @@ %package journal-remote Summary: Gateway for serving journal events over the network using HTTP License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%systemd_requires %description journal-remote This extends the journal functionality to keep a copy of logs on a @@ -499,23 +482,61 @@ systemd-journal-remote, and systemd-journal-upload. %endif +%if %{with tests} +%package tests +Summary: Unit tests for systemd +License: LGPL-2.1-or-later +Requires: %{name} = %{version}-%{release} +Recommends: python3 +Recommends: python3-colorama +# Optional dep for mkfs.vfat needed by test-loop-block (otherwise skipped) +Recommends: dosfstools + +%description tests +This package contains the unit tests used to check various internal +functions used by systemd and all its components. + +The python script /usr/lib/systemd/tests/run-unit-tests.py can be used +to run all unit tests at once. +%endif + +%if %{with experimental} %package experimental Summary: Experimental systemd features License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} +# These Recommends because some symbols of these libs are dlopen()ed by home stuff +Recommends: libfido2 +Recommends: libpwquality1 +Recommends: libqrencode4 +# libfido2, libpwquality1 and libqrencode4 are build requirements for home stuff +BuildRequires: pkgconfig(libfido2) +BuildRequires: pkgconfig(libqrencode) +BuildRequires: pkgconfig(pwquality) +# fdisk and openssl are build requirements for home stuff and repart +BuildRequires: pkgconfig(fdisk) +BuildRequires: pkgconfig(openssl) %systemd_requires %description experimental -This package contains optional extra systemd services that are -considered a preview feature. Behaviour details and option names are -subject to change without the usual backwards-compatibility promises. - -Components that turn out to be stable may be merged into the main or a -dedicated package later. +This package contains optional extra services that are considered as +previews and are provided so users can do early experiments with the +new features or technologies without waiting for them to be fully +supported by either upstream and openSUSE. + +Please note that all services should be considered in development +phase and as such their behaviors details, unit files, option names, +etc... are subject to change without the usual backwards-compatibility +promises. + +Components that turn out to be stable and considered as fully +supported will be merged into the main package or moved into a +dedicated package. -Use at your own risk. +The package contains: homed, pstore, repart, userdbd. +Have fun with these services at your own risk. +%endif %if ! 0%{?bootstrap} %lang_package @@ -528,6 +549,7 @@ %build # keep split-usr until all packages have moved their systemd rules to /usr %meson \ + -Dmode=release \ -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ @@ -535,6 +557,7 @@ -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ + -Dpamconfdir=%{_distconfdir}/pam.d \ -Dpamlibdir=%{_pamdir} \ -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ @@ -550,6 +573,7 @@ -Dsmack=false \ -Dima=false \ -Delfutils=auto \ + -Doomd=false \ %if %{with experimental} -Dpstore=true \ -Drepart=true \ @@ -562,16 +586,11 @@ -Duserdb=false \ %endif %if 0%{?bootstrap} - -Dfdisk=false \ - -Dpwquality=false \ - -Dp11kit=false \ + -Dnss-myhostname=false \ %else -Dman=true \ -Dhtml=true \ %endif -%if 0%{?bootstrap} - -Dnss-myhostname=false \ -%endif %if %{without coredump} -Dcoredump=false \ %endif @@ -600,6 +619,13 @@ -Dsysvinit-path= \ -Dsysvrcnd-path= \ %endif +%if %{with tests} + -Dtests=unsafe \ + -Dinstall-tests=true \ +%else + -Dtests=false \ + -Dinstall-tests=false \ +%endif -Dadm-group=false \ -Dwheel-group=false \ -Dgshadow=false \ @@ -660,8 +686,8 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target -# Replace /etc/pam.d/systemd-user shipped by upstream with the openSUSE one. -install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ +# Replace upstream systemd-user with the openSUSE one. +install -m0644 %{S:2} %{buildroot}%{_distconfdir}/pam.d # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path @@ -838,10 +864,16 @@ pam-config --add --systemd || : %endif -%sysusers_create %{_sysusersdir}/systemd.conf +# systemd-sysusers is not available in %pre so this needs to be done +# in %post. However this shouldn't be an issue since all files the +# main package ships are owned by root. +%sysusers_create systemd.conf + [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : /usr/lib/systemd/systemd-random-seed save || : + systemctl daemon-reexec || : + %journal_catalog_update %tmpfiles_create @@ -908,7 +940,7 @@ fi %postun -# daemon-reload is implied by %systemd_postun_with_restart +# daemon-reload is implied by %%systemd_postun_with_restart %systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-timesyncd.service # Avoid restarting logind until fixed upstream (issue #1163) @@ -1012,7 +1044,8 @@ %service_add_pre systemd-journal-upload.service %post journal-remote -%sysusers_create %{_sysusersdir}/systemd-remote.conf +# Assume that all files shipped by systemd-journal-remove are owned by root. +%sysusers_create systemd-remote.conf %service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %service_add_post systemd-journal-remote.socket systemd-journal-remote.service %service_add_post systemd-journal-upload.service @@ -1116,7 +1149,11 @@ %{_bindir}/localectl %{_bindir}/systemctl %{_bindir}/systemd-analyze +%if ! 0%{?bootstrap} +%{_bindir}/systemd-cryptenroll +%endif %{_bindir}/systemd-delta +%{_bindir}/systemd-dissect %{_bindir}/systemd-escape %{_bindir}/systemd-firstboot %{_bindir}/systemd-id128 @@ -1126,6 +1163,7 @@ %{_bindir}/systemd-umount %{_bindir}/systemd-notify %{_bindir}/systemd-run +%{_bindir}/systemd-sysext %{_bindir}/journalctl %{_bindir}/systemd-ask-password %{_bindir}/loginctl @@ -1166,6 +1204,7 @@ %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service +%exclude %{_unitdir}/kmod-static-nodes.service %exclude %{_unitdir}/systemd-nspawn@.service %if %{with machined} %exclude %{_prefix}/lib/systemd/systemd-machined @@ -1262,6 +1301,7 @@ %{_modulesloaddir} %dir %{_sysusersdir} +%doc %{_sysusersdir}/README %{_sysusersdir}/systemd.conf %dir %{_sysconfdir}/tmpfiles.d @@ -1275,6 +1315,7 @@ %dir %{_sysctldir} %dir %{_sysconfdir}/sysctl.d +%doc %{_sysctldir}/README %{_sysctldir}/99-sysctl.conf %dir %{_sysconfdir}/X11/xorg.conf.d @@ -1289,7 +1330,7 @@ %dir %{_distconfdir}/X11/xinit/xinitrc.d %{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh -%config(noreplace) %{_sysconfdir}/pam.d/systemd-user +%{_distconfdir}/pam.d/systemd-user %config(noreplace) %{_sysconfdir}/systemd/journald.conf %config(noreplace) %{_sysconfdir}/systemd/logind.conf @@ -1313,6 +1354,7 @@ # FIXME: why do we have to own this dir ? %dir %{_modprobedir} +%doc %{_modprobedir}/README %{_modprobedir}/systemd.conf # Some files created at runtime. @@ -1353,6 +1395,7 @@ %{_mandir}/man7/[bdfks]* %{_mandir}/man8/kern* %{_mandir}/man8/pam_* +%{_mandir}/man8//rc-local.* %{_mandir}/man8/systemd-[a-gik-tvx]* %{_mandir}/man8/systemd-h[aioy]* %{_mandir}/man8/systemd-journald* @@ -1477,13 +1520,18 @@ %dir %{_prefix}/lib/udev/ %{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/cdrom_id +# dmi_memory_id is only relevant on arches with DMI +%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips +%{_prefix}/lib/udev/dmi_memory_id +%endif %{_prefix}/lib/udev/fido_id %{_prefix}/lib/udev/mtd_probe %{_prefix}/lib/udev/path_id_compat %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id -%ghost %{_prefix}/lib/udev/compat-symlink-generation +%ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation %dir %{_udevrulesdir}/ +%doc %{_udevrulesdir}/README %exclude %{_udevrulesdir}/70-uaccess.rules %exclude %{_udevrulesdir}/71-seat.rules %exclude %{_udevrulesdir}/73-seat-late.rules @@ -1504,6 +1552,7 @@ %endif %dir %{_unitdir} %{_prefix}/lib/systemd/systemd-udevd +%{_unitdir}/kmod-static-nodes.service %{_unitdir}/systemd-udev*.service %{_unitdir}/systemd-udevd*.socket %{_unitdir}/initrd-udevadm-cleanup-db.service @@ -1696,10 +1745,15 @@ %{_mandir}/man*/systemd-portabled* %endif +%if %{with tests} +%files tests +%{_prefix}/lib/systemd/tests +%endif + %if %{with experimental} %files experimental %defattr(-,root,root) -%config(noreplace) /etc/systemd/pstore.conf +%config(noreplace) %{_sysconfdir}/systemd/pstore.conf %{_prefix}/lib/systemd/systemd-pstore %{_unitdir}/systemd-pstore.service %{_tmpfilesdir}/systemd-pstore.conf @@ -1707,18 +1761,19 @@ %{_bindir}/systemd-repart %{_unitdir}/systemd-repart.service %{_mandir}/man*/*repart* -/usr/bin/userdbctl +%{_bindir}/userdbctl %{_prefix}/lib/systemd/systemd-userwork %{_prefix}/lib/systemd/systemd-userdbd %{_unitdir}/systemd-userdbd.service %{_unitdir}/systemd-userdbd.socket %{_mandir}/man*/userdbctl* %{_mandir}/man*/systemd-userdbd* -%config %{_sysconfdir}/homed.conf +%config(noreplace) %{_sysconfdir}/systemd/homed.conf %{_bindir}/homectl %{_prefix}/lib/systemd/systemd-homed %{_prefix}/lib/systemd/systemd-homework %{_unitdir}/systemd-homed.service +%{_unitdir}/systemd-homed-activate.service %{_pamdir}/pam_systemd_home.so %{_datadir}/dbus-1/system-services/org.freedesktop.home1.service %{_datadir}/dbus-1/system.d/org.freedesktop.home1.conf ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.ku8fIG/_old 2021-07-01 07:05:32.923517258 +0200 +++ /var/tmp/diff_new_pack.ku8fIG/_new 2021-07-01 07:05:32.927517227 +0200 @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.105.g14581e0120 +%define suse_version +suse.30.ge9a23d9e06 %bcond_with gnuefi %if 0%{?bootstrap} @@ -37,6 +37,7 @@ %bcond_with resolved %bcond_with sysvcompat %bcond_with experimental +%bcond_with tests %else %bcond_without coredump %ifarch %{ix86} x86_64 @@ -50,16 +51,15 @@ %bcond_without resolved %bcond_without sysvcompat %bcond_without experimental +%bcond_without tests %endif -%bcond_with parentpathid Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.13 +Version: 248.3 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later -Group: System/Base BuildRoot: %{_tmppath}/%{name}-%{version}-build %if ! 0%{?bootstrap} BuildRequires: docbook-xsl-stylesheets @@ -74,6 +74,7 @@ BuildRequires: pkgconfig(audit) BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libdw) +BuildRequires: pkgconfig(libfido2) BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpcre2-8) @@ -111,10 +112,6 @@ %if %{with gnuefi} BuildRequires: gnu-efi %endif -%if %{with experimental} -BuildRequires: pkgconfig(fdisk) -BuildRequires: pkgconfig(openssl) -%endif %if 0%{?bootstrap} #!BuildIgnore: dbus-1 @@ -126,13 +123,15 @@ Requires: aaa_base >= 13.2 Requires: dbus-1 >= 1.4.0 Requires: kbd -Requires: kmod >= 15 Requires: netcfg >= 11.5 Requires: systemd-default-settings-branding Requires: systemd-presets-branding -Requires: udev = %{version}-%{release} Requires: util-linux >= 2.27.1 Requires: group(lock) +# This Recommends because some symbols of libpcre2 are dlopen()ed by journalctl +Recommends: libpcre2-8-0 +# ditto but dlopen()ed by systemd-cryptenroll +Recommends: libfido2 Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding @@ -173,7 +172,6 @@ Patch1: 0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch Patch2: 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch Patch3: 0003-strip-the-domain-part-from-etc-hostname-when-setting.patch -Patch4: 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch Patch5: 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch Patch6: 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch @@ -189,6 +187,7 @@ # upstream and need an urgent fix. Even in this case, the patches are # temporary and should be removed as soon as a fix is merged by # upstream. +Patch100: 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -204,7 +203,6 @@ %package doc Summary: HTML documentation for systemd License: LGPL-2.1-or-later -Group: Documentation/Other Supplements: (systemd and patterns-base-documentation) %description doc @@ -216,7 +214,6 @@ %package devel Summary: Development headers for systemd License: LGPL-2.1-or-later -Group: Development/Libraries/C and C++ Requires: libsystemd0%{?mini} = %{version}-%{release} Requires: systemd-rpm-macros %if 0%{?bootstrap} @@ -229,7 +226,6 @@ %package sysvinit Summary: System V init tools License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} Provides: sbin_init Conflicts: otherproviders(sbin_init) @@ -242,7 +238,6 @@ %package -n libsystemd0%{?mini} Summary: Component library for systemd License: LGPL-2.1-or-later -Group: System/Libraries %if 0%{?bootstrap} Conflicts: libsystemd0 Requires: this-is-only-for-build-envs @@ -272,14 +267,14 @@ %package -n udev%{?mini} Summary: A rule-based device node and kernel event manager License: GPL-2.0-only -Group: System/Kernel URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +Requires: kmod Requires: system-group-hardware Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun): coreutils -Requires(postun): /usr/bin/systemctl +%systemd_requires Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 @@ -305,7 +300,6 @@ %package -n libudev%{?mini}1 Summary: Dynamic library to access udev device information License: LGPL-2.1-or-later -Group: System/Libraries %if 0%{?bootstrap} Conflicts: libudev1 Conflicts: kiwi @@ -320,7 +314,6 @@ %package -n libudev%{?mini}-devel Summary: Development files for libudev License: LGPL-2.1-or-later -Group: Development/Libraries/Other Requires: libudev%{?mini}1 = %{version}-%{release} %if 0%{?bootstrap} Provides: libudev-devel = %{version}-%{version} @@ -336,7 +329,6 @@ %package coredump Summary: Systemd tools for coredump management License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/coredumpctl @@ -350,7 +342,6 @@ %package container Summary: Systemd tools for container management License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/systemd-nspawn @@ -368,8 +359,9 @@ %package network Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} +# This Recommends because some symbols of libidn2 are dlopen()ed by resolved +Recommends: pkgconfig(libidn2) BuildRequires: pkgconfig(libidn2) Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved @@ -385,7 +377,6 @@ %package portable Summary: Systemd tools for portable services License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires @@ -405,7 +396,6 @@ %package logger Summary: Journal only logging License: LGPL-2.1-or-later -Group: System/Base Provides: syslog Provides: sysvinit(syslog) Requires(post): /usr/bin/systemctl @@ -417,7 +407,6 @@ %package -n nss-systemd Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-systemd This package contains a plugin for the Name Service Switch (NSS), @@ -430,7 +419,6 @@ %package -n nss-myhostname Summary: Plugin for local system host name resolution License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-myhostname This package contains a plug-in module for the Name Service Switch @@ -447,7 +435,6 @@ %package -n nss-resolve Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1-or-later -Group: System/Libraries Requires: %{name}-network = %{version}-%{release} %description -n nss-resolve @@ -464,7 +451,6 @@ %package -n nss-mymachines Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-mymachines This package contains a plugin for the Name Service Switch (NSS), @@ -481,11 +467,8 @@ %package journal-remote Summary: Gateway for serving journal events over the network using HTTP License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%systemd_requires %description journal-remote This extends the journal functionality to keep a copy of logs on a @@ -497,23 +480,61 @@ systemd-journal-remote, and systemd-journal-upload. %endif +%if %{with tests} +%package tests +Summary: Unit tests for systemd +License: LGPL-2.1-or-later +Requires: %{name} = %{version}-%{release} +Recommends: python3 +Recommends: python3-colorama +# Optional dep for mkfs.vfat needed by test-loop-block (otherwise skipped) +Recommends: dosfstools + +%description tests +This package contains the unit tests used to check various internal +functions used by systemd and all its components. + +The python script /usr/lib/systemd/tests/run-unit-tests.py can be used +to run all unit tests at once. +%endif + +%if %{with experimental} %package experimental Summary: Experimental systemd features License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} +# These Recommends because some symbols of these libs are dlopen()ed by home stuff +Recommends: libfido2 +Recommends: libpwquality1 +Recommends: libqrencode4 +# libfido2, libpwquality1 and libqrencode4 are build requirements for home stuff +BuildRequires: pkgconfig(libfido2) +BuildRequires: pkgconfig(libqrencode) +BuildRequires: pkgconfig(pwquality) +# fdisk and openssl are build requirements for home stuff and repart +BuildRequires: pkgconfig(fdisk) +BuildRequires: pkgconfig(openssl) %systemd_requires %description experimental -This package contains optional extra systemd services that are -considered a preview feature. Behaviour details and option names are -subject to change without the usual backwards-compatibility promises. - -Components that turn out to be stable may be merged into the main or a -dedicated package later. +This package contains optional extra services that are considered as +previews and are provided so users can do early experiments with the +new features or technologies without waiting for them to be fully +supported by either upstream and openSUSE. + +Please note that all services should be considered in development +phase and as such their behaviors details, unit files, option names, +etc... are subject to change without the usual backwards-compatibility +promises. + +Components that turn out to be stable and considered as fully +supported will be merged into the main package or moved into a +dedicated package. -Use at your own risk. +The package contains: homed, pstore, repart, userdbd. +Have fun with these services at your own risk. +%endif %if ! 0%{?bootstrap} %lang_package @@ -526,6 +547,7 @@ %build # keep split-usr until all packages have moved their systemd rules to /usr %meson \ + -Dmode=release \ -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ @@ -533,6 +555,7 @@ -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ + -Dpamconfdir=%{_distconfdir}/pam.d \ -Dpamlibdir=%{_pamdir} \ -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ @@ -548,6 +571,7 @@ -Dsmack=false \ -Dima=false \ -Delfutils=auto \ + -Doomd=false \ %if %{with experimental} -Dpstore=true \ -Drepart=true \ @@ -560,16 +584,11 @@ -Duserdb=false \ %endif %if 0%{?bootstrap} - -Dfdisk=false \ - -Dpwquality=false \ - -Dp11kit=false \ + -Dnss-myhostname=false \ %else -Dman=true \ -Dhtml=true \ %endif -%if 0%{?bootstrap} - -Dnss-myhostname=false \ -%endif %if %{without coredump} -Dcoredump=false \ %endif @@ -598,6 +617,13 @@ -Dsysvinit-path= \ -Dsysvrcnd-path= \ %endif +%if %{with tests} + -Dtests=unsafe \ + -Dinstall-tests=true \ +%else + -Dtests=false \ + -Dinstall-tests=false \ +%endif -Dadm-group=false \ -Dwheel-group=false \ -Dgshadow=false \ @@ -658,8 +684,8 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target -# Replace /etc/pam.d/systemd-user shipped by upstream with the openSUSE one. -install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ +# Replace upstream systemd-user with the openSUSE one. +install -m0644 %{S:2} %{buildroot}%{_distconfdir}/pam.d # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path @@ -836,10 +862,16 @@ pam-config --add --systemd || : %endif -%sysusers_create %{_sysusersdir}/systemd.conf +# systemd-sysusers is not available in %pre so this needs to be done +# in %post. However this shouldn't be an issue since all files the +# main package ships are owned by root. +%sysusers_create systemd.conf + [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : /usr/lib/systemd/systemd-random-seed save || : + systemctl daemon-reexec || : + %journal_catalog_update %tmpfiles_create @@ -906,7 +938,7 @@ fi %postun -# daemon-reload is implied by %systemd_postun_with_restart +# daemon-reload is implied by %%systemd_postun_with_restart %systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-timesyncd.service # Avoid restarting logind until fixed upstream (issue #1163) @@ -1010,7 +1042,8 @@ %service_add_pre systemd-journal-upload.service %post journal-remote -%sysusers_create %{_sysusersdir}/systemd-remote.conf +# Assume that all files shipped by systemd-journal-remove are owned by root. +%sysusers_create systemd-remote.conf %service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %service_add_post systemd-journal-remote.socket systemd-journal-remote.service %service_add_post systemd-journal-upload.service @@ -1114,7 +1147,11 @@ %{_bindir}/localectl %{_bindir}/systemctl %{_bindir}/systemd-analyze +%if ! 0%{?bootstrap} +%{_bindir}/systemd-cryptenroll +%endif %{_bindir}/systemd-delta +%{_bindir}/systemd-dissect %{_bindir}/systemd-escape %{_bindir}/systemd-firstboot %{_bindir}/systemd-id128 @@ -1124,6 +1161,7 @@ %{_bindir}/systemd-umount %{_bindir}/systemd-notify %{_bindir}/systemd-run +%{_bindir}/systemd-sysext %{_bindir}/journalctl %{_bindir}/systemd-ask-password %{_bindir}/loginctl @@ -1164,6 +1202,7 @@ %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service +%exclude %{_unitdir}/kmod-static-nodes.service %exclude %{_unitdir}/systemd-nspawn@.service %if %{with machined} %exclude %{_prefix}/lib/systemd/systemd-machined @@ -1260,6 +1299,7 @@ %{_modulesloaddir} %dir %{_sysusersdir} +%doc %{_sysusersdir}/README %{_sysusersdir}/systemd.conf %dir %{_sysconfdir}/tmpfiles.d @@ -1273,6 +1313,7 @@ %dir %{_sysctldir} %dir %{_sysconfdir}/sysctl.d +%doc %{_sysctldir}/README %{_sysctldir}/99-sysctl.conf %dir %{_sysconfdir}/X11/xorg.conf.d @@ -1287,7 +1328,7 @@ %dir %{_distconfdir}/X11/xinit/xinitrc.d %{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh -%config(noreplace) %{_sysconfdir}/pam.d/systemd-user +%{_distconfdir}/pam.d/systemd-user %config(noreplace) %{_sysconfdir}/systemd/journald.conf %config(noreplace) %{_sysconfdir}/systemd/logind.conf @@ -1311,6 +1352,7 @@ # FIXME: why do we have to own this dir ? %dir %{_modprobedir} +%doc %{_modprobedir}/README %{_modprobedir}/systemd.conf # Some files created at runtime. @@ -1351,6 +1393,7 @@ %{_mandir}/man7/[bdfks]* %{_mandir}/man8/kern* %{_mandir}/man8/pam_* +%{_mandir}/man8//rc-local.* %{_mandir}/man8/systemd-[a-gik-tvx]* %{_mandir}/man8/systemd-h[aioy]* %{_mandir}/man8/systemd-journald* @@ -1475,13 +1518,18 @@ %dir %{_prefix}/lib/udev/ %{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/cdrom_id +# dmi_memory_id is only relevant on arches with DMI +%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips +%{_prefix}/lib/udev/dmi_memory_id +%endif %{_prefix}/lib/udev/fido_id %{_prefix}/lib/udev/mtd_probe %{_prefix}/lib/udev/path_id_compat %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id -%ghost %{_prefix}/lib/udev/compat-symlink-generation +%ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation %dir %{_udevrulesdir}/ +%doc %{_udevrulesdir}/README %exclude %{_udevrulesdir}/70-uaccess.rules %exclude %{_udevrulesdir}/71-seat.rules %exclude %{_udevrulesdir}/73-seat-late.rules @@ -1502,6 +1550,7 @@ %endif %dir %{_unitdir} %{_prefix}/lib/systemd/systemd-udevd +%{_unitdir}/kmod-static-nodes.service %{_unitdir}/systemd-udev*.service %{_unitdir}/systemd-udevd*.socket %{_unitdir}/initrd-udevadm-cleanup-db.service @@ -1694,10 +1743,15 @@ %{_mandir}/man*/systemd-portabled* %endif +%if %{with tests} +%files tests +%{_prefix}/lib/systemd/tests +%endif + %if %{with experimental} %files experimental %defattr(-,root,root) -%config(noreplace) /etc/systemd/pstore.conf +%config(noreplace) %{_sysconfdir}/systemd/pstore.conf %{_prefix}/lib/systemd/systemd-pstore %{_unitdir}/systemd-pstore.service %{_tmpfilesdir}/systemd-pstore.conf @@ -1705,18 +1759,19 @@ %{_bindir}/systemd-repart %{_unitdir}/systemd-repart.service %{_mandir}/man*/*repart* -/usr/bin/userdbctl +%{_bindir}/userdbctl %{_prefix}/lib/systemd/systemd-userwork %{_prefix}/lib/systemd/systemd-userdbd %{_unitdir}/systemd-userdbd.service %{_unitdir}/systemd-userdbd.socket %{_mandir}/man*/userdbctl* %{_mandir}/man*/systemd-userdbd* -%config %{_sysconfdir}/homed.conf +%config(noreplace) %{_sysconfdir}/systemd/homed.conf %{_bindir}/homectl %{_prefix}/lib/systemd/systemd-homed %{_prefix}/lib/systemd/systemd-homework %{_unitdir}/systemd-homed.service +%{_unitdir}/systemd-homed-activate.service %{_pamdir}/pam_systemd_home.so %{_datadir}/dbus-1/system-services/org.freedesktop.home1.service %{_datadir}/dbus-1/system.d/org.freedesktop.home1.conf ++++++ 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch ++++++ From c9bce1f07276c591d8637dbfc3244ee11e8fa4e1 Mon Sep 17 00:00:00 2001 From: Franck Bui <fbui(a)suse.com> Date: Tue, 18 May 2021 11:53:55 +0200 Subject: [PATCH 1/1] Revert "core: prevent excessive /proc/self/mountinfo parsing" This reverts commit d586f642fd90e3bb378f7b6d3e3a64a753e51756. This reverts commit d586f642fd90e3bb378f7b6d3e3a64a753e51756 temporarly until more investigation is done to find the root cause of https://github.com/systemd/systemd/issues/19464. --- src/core/mount.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/core/mount.c b/src/core/mount.c index ca5d0939a1..2939062161 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -1859,12 +1859,6 @@ static void mount_enumerate(Manager *m) { goto fail; } - r = sd_event_source_set_ratelimit(m->mount_event_source, 1 * USEC_PER_SEC, 5); - if (r < 0) { - log_error_errno(r, "Failed to enable rate limit for mount events: %m"); - goto fail; - } - (void) sd_event_source_set_description(m->mount_event_source, "mount-monitor-dispatch"); } -- 2.26.2 ++++++ 0001-conf-parser-introduce-early-drop-ins.patch ++++++ --- /var/tmp/diff_new_pack.ku8fIG/_old 2021-07-01 07:05:32.959516976 +0200 +++ /var/tmp/diff_new_pack.ku8fIG/_new 2021-07-01 07:05:32.959516976 +0200 @@ -1,4 +1,4 @@ -From 569f94a86a608fa7a47fef583f3f504ec8223967 Mon Sep 17 00:00:00 2001 +From 0eb84d049c77dceeb48724770f89f0fa01557c87 Mon Sep 17 00:00:00 2001 From: Franck Bui <fbui(a)suse.com> Date: Fri, 22 Jan 2021 14:57:08 +0100 Subject: [PATCH 1/1] conf-parser: introduce 'early' drop-ins @@ -61,23 +61,23 @@ Fixes: #2121 --- - src/shared/conf-parser.c | 47 ++++++++++- - src/test/test-conf-parser.c | 151 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 194 insertions(+), 4 deletions(-) + src/shared/conf-parser.c | 48 ++++++++++-- + src/test/test-conf-parser.c | 152 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 195 insertions(+), 5 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index 7499b3b882..799026626c 100644 +index 9dfa190751..b5dee9cbb1 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c -@@ -426,6 +426,7 @@ int config_parse(const char *unit, +@@ -428,6 +428,7 @@ int config_parse( static int config_parse_many_files( - const char *conf_file, + const char* const* conf_files, + char **early_files, char **files, const char *sections, ConfigItemLookup lookup, -@@ -438,6 +439,12 @@ static int config_parse_many_files( +@@ -440,6 +441,12 @@ static int config_parse_many_files( char **fn; int r; @@ -87,10 +87,10 @@ + return r; + } + - if (conf_file) { - r = config_parse(NULL, conf_file, NULL, sections, lookup, table, flags, userdata, &mtime); - if (r < 0) -@@ -456,6 +463,28 @@ static int config_parse_many_files( + /* First read the first found main config file. */ + STRV_FOREACH(fn, (char**) conf_files) { + r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); +@@ -462,6 +469,28 @@ static int config_parse_many_files( return 0; } @@ -119,7 +119,7 @@ /* Parse each config file in the directories specified as nulstr. */ int config_parse_many_nulstr( const char *conf_file, -@@ -467,14 +496,19 @@ int config_parse_many_nulstr( +@@ -473,15 +502,19 @@ int config_parse_many_nulstr( void *userdata, usec_t *ret_mtime) { @@ -131,17 +131,18 @@ if (r < 0) return r; -- return config_parse_many_files(conf_file, files, sections, lookup, table, flags, userdata, ret_mtime); +- return config_parse_many_files(STRV_MAKE_CONST(conf_file), +- files, sections, lookup, table, flags, userdata, + r = config_parse_split_conf_files(files, &early_files, &late_files); + if (r < 0) + return r; + -+ return config_parse_many_files(conf_file, early_files, late_files, sections, -+ lookup, table, flags, userdata, ret_mtime); ++ return config_parse_many_files(STRV_MAKE_CONST(conf_file), early_files, late_files, ++ sections, lookup, table, flags, userdata, + ret_mtime); } - /* Parse each config file in the directories specified as strv. */ -@@ -489,8 +523,8 @@ int config_parse_many( +@@ -497,8 +530,8 @@ int config_parse_many( void *userdata, usec_t *ret_mtime) { @@ -151,22 +152,22 @@ const char *suffix; int r; -@@ -503,7 +537,12 @@ int config_parse_many( +@@ -511,7 +544,12 @@ int config_parse_many( if (r < 0) return r; -- return config_parse_many_files(conf_file, files, sections, lookup, table, flags, userdata, ret_mtime); +- return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_mtime); + r = config_parse_split_conf_files(files, &early_files, &late_files); + if (r < 0) + return r; + -+ return config_parse_many_files(conf_file, early_files, late_files, sections, -+ lookup, table, flags, userdata, ret_mtime); ++ return config_parse_many_files(conf_files, early_files, late_files, ++ sections, lookup, table, flags, userdata, ret_mtime); } #define DEFINE_PARSER(type, vartype, conv_func) \ diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c -index 07edc17f92..2df4b073c5 100644 +index 5da864347e..77d9f28a79 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -5,6 +5,9 @@ @@ -179,7 +180,7 @@ #include "string-util.h" #include "strv.h" #include "tmpfile-util.h" -@@ -385,6 +388,151 @@ static void test_config_parse(unsigned i, const char *s) { +@@ -385,6 +388,152 @@ static void test_config_parse(unsigned i, const char *s) { } } @@ -263,7 +264,8 @@ + NULL, + NULL); + } else { -+ r = config_parse_many(conf_file, (const char * const*) conf_dirs, "", ++ r = config_parse_many(STRV_MAKE_CONST(conf_file), ++ (const char * const*) conf_dirs, "", + "Section\0", + config_item_table_lookup, items, + CONFIG_PARSE_WARN, @@ -331,7 +333,7 @@ int main(int argc, char **argv) { unsigned i; -@@ -407,5 +555,8 @@ int main(int argc, char **argv) { +@@ -407,5 +556,8 @@ int main(int argc, char **argv) { for (i = 0; i < ELEMENTSOF(config_file); i++) test_config_parse(i, config_file[i]); ++++++ 0003-strip-the-domain-part-from-etc-hostname-when-setting.patch ++++++ --- /var/tmp/diff_new_pack.ku8fIG/_old 2021-07-01 07:05:32.971516883 +0200 +++ /var/tmp/diff_new_pack.ku8fIG/_new 2021-07-01 07:05:32.975516852 +0200 @@ -1,7 +1,7 @@ -From f299a8180f1db0680b454c0e37696891361e3067 Mon Sep 17 00:00:00 2001 +From 54366ae306ae19bdb2a5af7eb5158260cdc37e8f Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcrozat(a)suse.com> Date: Tue, 28 May 2013 15:17:35 +0200 -Subject: [PATCH 03/12] strip the domain part from /etc/hostname when setting +Subject: [PATCH 1/1] strip the domain part from /etc/hostname when setting system host name [fbui: fixes bnc#820213] @@ -13,19 +13,17 @@ possibility was to fix the installer to create a correct /etc/hostname file. Need to investigate...] --- - src/core/hostname-setup.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) + src/shared/hostname-setup.c | 7 +++++++ + 1 file changed, 7 insertions(+) -diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c -index 6d047db838..1acc0c998b 100644 ---- a/src/core/hostname-setup.c -+++ b/src/core/hostname-setup.c -@@ -39,8 +39,16 @@ int hostname_setup(void) { - enoent = true; +diff --git a/src/shared/hostname-setup.c b/src/shared/hostname-setup.c +index 511aa7d031..351d0e761d 100644 +--- a/src/shared/hostname-setup.c ++++ b/src/shared/hostname-setup.c +@@ -189,6 +189,13 @@ int hostname_setup(bool really) { else log_warning_errno(r, "Failed to read configured hostname: %m"); -- } else -+ } else { + } else { + char *domain; + + /* SUSE: strip the domain name */ @@ -34,10 +32,8 @@ + *domain = '\0'; + hn = b; -+ } - } - - if (isempty(hn)) { + source = HOSTNAME_STATIC; + } -- 2.26.2 ++++++ 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch ++++++ --- /var/tmp/diff_new_pack.ku8fIG/_old 2021-07-01 07:05:32.987516758 +0200 +++ /var/tmp/diff_new_pack.ku8fIG/_new 2021-07-01 07:05:32.987516758 +0200 @@ -1,7 +1,7 @@ -From f9521480d5dc5af747fecc9adc4c617e473e5494 Mon Sep 17 00:00:00 2001 +From ac7bfed30245145ce68a037e7578da12ce2de009 Mon Sep 17 00:00:00 2001 From: Franck Bui <fbui(a)suse.com> Date: Thu, 26 May 2016 08:59:41 +0200 -Subject: [PATCH 06/12] sysv-generator: add (back) support for SysV scripts for +Subject: [PATCH 1/1] sysv-generator: add (back) support for SysV scripts for the early boot For the record, the upstream support was removed by commit @@ -43,7 +43,7 @@ 1 file changed, 23 insertions(+) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index a2c72d1009..1c01008967 100644 +index 8c7aef23c3..f88f9119fb 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -31,6 +31,9 @@ static const struct { @@ -63,8 +63,8 @@ + bool early; } SysvStub; - static void free_sysvstub(SysvStub *s) { -@@ -147,6 +151,12 @@ static int generate_unit_file(SysvStub *s) { + static SysvStub* free_sysvstub(SysvStub *s) { +@@ -146,6 +150,12 @@ static int generate_unit_file(SysvStub *s) { fprintf(f, "Description=%s\n", t); } @@ -77,7 +77,7 @@ STRV_FOREACH(p, s->before) fprintf(f, "Before=%s\n", *p); STRV_FOREACH(p, s->after) -@@ -213,6 +223,10 @@ static char *sysv_translate_name(const char *name) { +@@ -212,6 +222,10 @@ static char *sysv_translate_name(const char *name) { _cleanup_free_ char *c = NULL; char *res; @@ -88,7 +88,7 @@ c = strdup(name); if (!c) return NULL; -@@ -289,6 +303,11 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, +@@ -288,6 +302,11 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, return 1; } @@ -100,7 +100,7 @@ /* Strip ".sh" suffix from file name for comparison */ filename_no_sh = strdupa(filename); e = endswith(filename_no_sh, ".sh"); -@@ -676,6 +695,9 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { +@@ -674,6 +693,9 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { if (other->sysv_start_priority < 0) continue; @@ -110,7 +110,7 @@ /* If both units have modern headers we don't care * about the priorities */ if (s->has_lsb && other->has_lsb) -@@ -800,6 +822,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { +@@ -798,6 +820,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { .sysv_start_priority = -1, .name = TAKE_PTR(name), .path = TAKE_PTR(fpath), ++++++ systemd-sysv-install ++++++ --- /var/tmp/diff_new_pack.ku8fIG/_old 2021-07-01 07:05:33.115515758 +0200 +++ /var/tmp/diff_new_pack.ku8fIG/_new 2021-07-01 07:05:33.115515758 +0200 @@ -1,41 +1,148 @@ -#!/bin/sh +#!/bin/bash + # This script is called by "systemctl enable/disable" when the given unit is a # SysV init.d script. It needs to call the distribution's mechanism for # enabling/disabling those, such as chkconfig, update-rc.d, or similar. This # can optionally take a --root argument for enabling a SysV init script # in a chroot or similar. +# +# chkconfig(8) and insserv(8) are no more available hence let's do the +# bare minimum and create/remote the symlinks for the well known +# runlevels and nothing more. Note that we don't take care of +# enabling/disabling the service dependencies as the sysv-generator +# will take care of them for us (openSUSE specific). +# + set -e usage() { - echo "Usage: $0 [--root=path] enable|disable|is-enabled <sysv script name>" >&2 - exit 1 + echo >&2 "Usage: $0 [--quiet] [--root=path] enable|disable|is-enabled <sysv script name>" + exit 1 +} + +info() { + $quiet || echo "$*" +} + +die() { + echo >&2 "error: $*, aborting." + exit 1 +} + +declare -A lsb_header + +check_runlevels() { + for l in $*; do + # Sanity check + case $l in + 0|1|2|3|4|5|6) continue ;; + *) return 1 + esac + done } +load_initscript() { + local found_lsb_start_marker=false + local found_lsb_end_marker=false + + [ -r $1 ] || die "initscript /etc/init.d/$1 can't be read" + + lsb_header=() + + while read line; do + # skip anything that is not a comment + [[ "$line" =~ ^# ]] || continue + + if ! $found_lsb_start_marker; then + [ "$line" == "### BEGIN INIT INFO" ] && + found_lsb_start_marker=true + continue + fi + + line=$(echo ${line:1}) + + case "$line" in + Default-Start:*) + levels=$(echo ${line:14}) + + check_runlevels $levels || + die "Invalid runlevels specified in $line" + + lsb_header[Default-Start]=$levels + ;; + "## END INIT INFO") + found_lsb_end_marker=true + break ;; + esac + done <$1 + + $found_lsb_end_marker || + die "malformated LSB header in $1: missing LSB end marker" +} + +enable_initscript() { + load_initscript $1 + + for l in ${lsb_header[Default-Start]}; do + symlink="$(pwd)/rc${l}.d/S50$1" + + info "ln -sf ../$1 $symlink" + ln -sf ../$1 "$symlink" + done +} + +disable_initscript() { + for symlink in rc*.d/[SK]*; do + [ -L $symlink ] && [ $(readlink $symlink) = "../$1" ] && { + info "rm $(pwd)/$symlink" + rm $symlink + } + done +} + +is_initscript_enabled() { + for symlink in rc*.d/S*; do + [ -L $symlink ] && [ $(readlink $symlink) = "../$1" ] && + return 0 + done + return 1 +} + +root= +quiet=false + # parse options -eval set -- "$(getopt -o r: --long root: -- "$@")" +eval set -- "$(getopt --name $(basename $0) -o hqr: --long help,quiet,root: -- "$@")" while true; do - case "$1" in - -r|--root) - ROOT="$2" - shift 2 ;; - --) shift ; break ;; - *) usage ;; - esac + case "$1" in + -h|--help) + usage ;; + -r|--root) + shift + root=$1 ;; + -q|--quiet) + quiet=true ;; + --) + shift + break ;; + *) + usage ;; + esac + shift done -NAME="$2" -[ -n "$NAME" ] || usage +[ $# -eq 2 ] || usage +action=$1 +name=$2 + +sysvinit_path=$(realpath -q -e $root/etc/init.d) || + die "$root/etc/init.d: no such file or directory" + +cd $sysvinit_path -case "$1" in - enable) - chkconfig $ROOT --no-systemctl -s "$NAME" on - ;; - disable) - chkconfig $ROOT --no-systemctl -s "$NAME" off - ;; - is-enabled) - chkconfig $ROOT --no-systemctl -c "$NAME" - ;; - *) - usage ;; +case "$action" in +enable) enable_initscript $name ;; +disable) disable_initscript $name ;; +is-enabled) is_initscript_enabled $name ;; +*) usage esac ++++++ systemd-v246.13+suse.105.g14581e0120.tar.xz -> systemd-v248.3+suse.30.ge9a23d9e06.tar.xz ++++++ /work/SRC/openSUSE:Factory/systemd/systemd-v246.13+suse.105.g14581e0120.tar.xz /work/SRC/openSUSE:Factory/.systemd.new.2625/systemd-v248.3+suse.30.ge9a23d9e06.tar.xz differ: char 26, line 1 ++++++ tmpfiles-suse.conf ++++++ --- /var/tmp/diff_new_pack.ku8fIG/_old 2021-07-01 07:05:33.171515320 +0200 +++ /var/tmp/diff_new_pack.ku8fIG/_new 2021-07-01 07:05:33.171515320 +0200 @@ -9,6 +9,10 @@ # FIXME: Might be moved to lockded. d /run/lock 0775 root lock - +# /run/lock/subsys is used for serializing SysV service execution, and +# hence without use on SysV-less systems. +d /run/lock/subsys 0755 root root - + # FIXME: Should these one be moved to shadow ? f /var/log/wtmp 0664 root utmp - f /var/log/btmp 0660 root utmp -

1 0

commit sysuser-tools for openSUSE:Factory
by Source-Sync 01 Jul '21

01 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sysuser-tools for openSUSE:Factory checked in at 2021-07-01 07:05:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysuser-tools (Old) and /work/SRC/openSUSE:Factory/.sysuser-tools.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sysuser-tools" Thu Jul 1 07:05:26 2021 rev:18 rq:901701 version:3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/sysuser-tools/sysuser-tools.changes 2021-05-17 18:44:55.792721568 +0200 +++ /work/SRC/openSUSE:Factory/.sysuser-tools.new.2625/sysuser-tools.changes 2021-07-01 07:05:30.699534630 +0200 @@ -1,0 +2,19 @@ +Mon Jun 21 09:56:17 UTC 2021 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Bump version up to 3.1. The --replace parameter only appeared in + systemd 238, so we need to ensure to get the update order correct + for sysuser-generate when using the 3rd command line parameters: + * systemd -> sysuser-tools -> system-{user|group}-FOO. +- Add dependency on systemd >=238 if systemd is installed to + sysuser-shadow +- update sysuser_requires to request sysuser-shadow 3.1 + +------------------------------------------------------------------- +Mon Jun 7 11:11:27 UTC 2021 - Thorsten Kukuk <kukuk(a)suse.com> + +- Support systemd-sysusers --replace=/usr/lib/sysusers.d/ option +- sysusers-generate-pre: only use first argument for grep +- sysusers2shadow.sh: use "run" prefix for systemd-sysusers call +- macros.sysusers: fix typo + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysuser-tools.spec ++++++ --- /var/tmp/diff_new_pack.zG5n9n/_old 2021-07-01 07:05:31.199530725 +0200 +++ /var/tmp/diff_new_pack.zG5n9n/_new 2021-07-01 07:05:31.203530694 +0200 @@ -17,7 +17,7 @@ Name: sysuser-tools -Version: 3.0 +Version: 3.1 Release: 0 Summary: Auto provides for system users License: MIT @@ -41,6 +41,12 @@ Requires(pre): (/usr/sbin/useradd or busybox) # prefer original shadow over busybox by default Suggests: shadow +# sysusers2shdow uses sysusers2shadow uses systemd-sysusers if available. And we might pass --replace to it +# --replace only appeared in systemd 238,so we want to ensure: if we have systemd, it must be recent enough +# the Requires(pre) statement is to ensure we get it at any moment recent enough, not only at the end of +# transactions, otherwise upgrades might randomly fail +Requires(pre): (systemd >= 238 if systemd) +Requires: (systemd >= 238 if systemd) %description -n sysuser-shadow This package contians a tool, which expects as input a sysusers.d ++++++ macros.sysusers ++++++ --- /var/tmp/diff_new_pack.zG5n9n/_old 2021-07-01 07:05:31.235530444 +0200 +++ /var/tmp/diff_new_pack.zG5n9n/_new 2021-07-01 07:05:31.239530412 +0200 @@ -10,7 +10,7 @@ # add "%sysusers_generate_pre <source file> <account> [<config>]" to build section # ## <source file> is the source file as defined in the spec file header -## <account> is just a random name, th output file will be "<account>.pre" +## <account> is just a random name, the output file will be "<account>.pre" ## <config> is the name of the configuration file as stored in ## /usr/lib/sysusers.d/<config> # @@ -18,7 +18,7 @@ # ### -%sysusers_requires Requires(pre): sysuser-shadow +%sysusers_requires Requires(pre): sysuser-shadow >= 3.1 %sysusers_generate_pre() \ %{_prefix}/lib/rpm/sysusers-generate-pre "%1" "%3" > "%2".pre ++++++ sysusers-generate-pre ++++++ --- /var/tmp/diff_new_pack.zG5n9n/_old 2021-07-01 07:05:31.259530257 +0200 +++ /var/tmp/diff_new_pack.zG5n9n/_new 2021-07-01 07:05:31.259530257 +0200 @@ -1,6 +1,6 @@ #!/bin/sh # pass systemd sysusers config paths as argument to this script. -echo "/usr/sbin/sysusers2shadow $3 <<\"EOF\" || [ -f /.buildenv ]" -grep -he '^[ugmr]' "$@" +echo "/usr/sbin/sysusers2shadow $2 <<\"EOF\" || [ -f /.buildenv ]" +grep -he '^[ugmr]' "$1" echo 'EOF' ++++++ sysusers2shadow.sh ++++++ --- /var/tmp/diff_new_pack.zG5n9n/_old 2021-07-01 07:05:31.291530006 +0200 +++ /var/tmp/diff_new_pack.zG5n9n/_new 2021-07-01 07:05:31.291530006 +0200 @@ -9,11 +9,11 @@ if [ -x /usr/bin/systemd-sysusers ] && [ -e /proc/version ]; then - if [ -n "$1" ]; then + if [ -n "$1" ] && [ "$1" != "%3" ]; then REPLACE_ARG="--replace=/usr/lib/sysusers.d/$1" ||: fi # Use systemd-sysusers and let it read the input directly from stdin - /usr/bin/systemd-sysusers $REPLACE_ARG - + run /usr/bin/systemd-sysusers $REPLACE_ARG - else # Absolute path to busybox, if found

1 0

commit iodine for openSUSE:Factory
by Source-Sync 01 Jul '21

01 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package iodine for openSUSE:Factory checked in at 2021-07-01 07:05:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iodine (Old) and /work/SRC/openSUSE:Factory/.iodine.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iodine" Thu Jul 1 07:05:26 2021 rev:9 rq:901170 version:0.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/iodine/iodine.changes 2021-06-13 23:05:29.439597786 +0200 +++ /work/SRC/openSUSE:Factory/.iodine.new.2625/iodine.changes 2021-07-01 07:05:29.315545442 +0200 @@ -1,0 +2,12 @@ +Sun Jun 13 13:35:10 UTC 2021 - Callum Farmer <gmbr3(a)opensuse.org> + +- Add now working CONFIG parameter to sysusers generator + +------------------------------------------------------------------- +Tue Jun 8 15:48:30 UTC 2021 - Jan Engelhardt <jengelh(a)inai.de> + +- Use noun phrasing in descriptions. +- Use more modern rpm macros. +- Reduce sh code emissions of %service_*. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iodine.spec ++++++ --- /var/tmp/diff_new_pack.gjnf1e/_old 2021-07-01 07:05:30.467536443 +0200 +++ /var/tmp/diff_new_pack.gjnf1e/_new 2021-07-01 07:05:30.471536411 +0200 @@ -1,7 +1,7 @@ # # spec file for package iodine # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2012 Malcolm J Lewis <malcolmlewis(a)opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,10 +25,10 @@ Name: iodine Version: 0.7.0 Release: 0 -Summary: Tunnel IPv4 data through a DNS server +Summary: IPv4-through-DNS tunnel server and client License: ISC Group: Productivity/Networking/System -Url: http://code.kryo.se/iodine/ +URL: http://code.kryo.se/iodine/ Source0: http://code.kryo.se/iodine/iodine-%{version}.tar.gz Source1: iodine.service Source2: sysconfig.iodine @@ -38,8 +38,8 @@ #PATCH-FIX-OPENSUSE iodine-fix-makefile-prefix.patch malcolmlewis(a)opensuse.org -- Modify default install prefix. Patch0: iodine-fix-makefile-prefix.patch BuildRequires: fdupes -BuildRequires: pkgconfig(systemd) BuildRequires: zlib-devel +BuildRequires: pkgconfig(systemd) # iodine still uses ifconfig Requires: net-tools-deprecated Requires(pre): %fillup_prereq @@ -54,22 +54,21 @@ %endif %description -Lets you tunnel IPv4 data through a DNS server. This can be usable -in different situations where internet access is firewalled, but DNS -queries are allowed. +This software lets one tunnel IPv4 data through a DNS server. This +can be usable in different situations where internet access is +firewalled, but DNS queries are allowed. %prep -%setup -q -n %{name}-%{version} -%patch0 -p1 +%autosetup -p1 %build -make PREFIX=%{_prefix} %{?_smp_mflags} +make PREFIX="%{_prefix}" %if 0%{?suse_version} >= 1550 -%sysusers_generate_pre %{SOURCE5} iodine +%sysusers_generate_pre %{SOURCE5} iodine system-user-iodined.conf %endif %install -make install PREFIX=%{buildroot}%{_prefix} +make install PREFIX="%{buildroot}/%{_prefix}" # Install client files mkdir -p %{buildroot}%{_unitdir} install -m 0644 %{S:1} %{buildroot}%{_unitdir}/ @@ -95,28 +94,24 @@ %if 0%{?suse_version} >= 1550 %pre -f iodine.pre %else + %pre /usr/sbin/useradd -r -d /var/lib/iodined -s /bin/false -c "user for iodine dns tunnel" -g nobody iodined 2> /dev/null || : %endif -%service_add_pre iodine.service -%service_add_pre iodined.service +%service_add_pre iodine.service iodined.service %post -%service_add_post iodine.service -%service_add_post iodined.service +%service_add_post iodine.service iodined.service %{fillup_only -n iodine} %{fillup_only -n iodined} %preun -%service_del_preun iodine.service -%service_del_preun iodined.service +%service_del_preun iodine.service iodined.service %postun -%service_del_postun iodine.service -%service_del_postun iodined.service +%service_del_postun iodine.service iodined.service %files -%defattr(-,root,root) %doc CHANGELOG README TODO %{_sbindir}/%{name} %{_sbindir}/%{name}d

1 0