From 0ed16c91dc5b457ddbd7f111a3d9a533e211d6d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 12 Jul 2017 14:11:41 +0200 Subject: [PATCH 01/83] perl dependency renamed to perl-interpreter --- man-db.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 0ff6e0e..6b37b78 100644 --- a/man-db.spec +++ b/man-db.spec @@ -27,7 +27,7 @@ Provides: bundled(gnulib) = %{gnulib_ver} Requires: coreutils, grep, groff-base, gzip, less BuildRequires: gdbm-devel, gettext, groff, less, libpipeline-devel, zlib-devel -BuildRequires: po4a, perl, perl-version +BuildRequires: po4a, perl-interpreter, perl-version %description The man-db package includes five tools for browsing man-pages: From 722d51b9b2f414d0d52fceecdcf7a2db5345b0c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 20:47:40 +0000 Subject: [PATCH 02/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 6b37b78..db68f47 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 3%{?dist} +Release: 4%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -163,6 +163,9 @@ MAN_NO_LOCALE_WARNING=1 /usr/bin/mandb -q %config(noreplace) %{_sysconfdir}/sysconfig/man-db %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.7.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.7.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From af41171ebdb3b6716bc8052f2aaa56d9afeddc3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 03:03:00 +0000 Subject: [PATCH 03/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index db68f47..96b70b7 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 4%{?dist} +Release: 5%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -163,6 +163,9 @@ MAN_NO_LOCALE_WARNING=1 /usr/bin/mandb -q %config(noreplace) %{_sysconfdir}/sysconfig/man-db %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 2.7.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.7.6.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 8e16b24da62775d932e666ba29ae229bc0e7fdc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Thu, 9 Nov 2017 10:44:15 +0100 Subject: [PATCH 04/83] run cache update in a transient service using systemd-run - resolves #1318058 --- man-db-cache-update.service | 13 +++++++++++++ man-db.spec | 19 ++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 man-db-cache-update.service diff --git a/man-db-cache-update.service b/man-db-cache-update.service new file mode 100644 index 0000000..2f2f0d5 --- /dev/null +++ b/man-db-cache-update.service @@ -0,0 +1,13 @@ +[Unit] +DefaultDependencies=no +After=local-fs.target +Before=reboot.target shutdown.target halt.target +JobTimeoutSec=15min + +[Service] +Type=oneshot +TimeoutStartSec=infinity +Environment=MAN_NO_LOCALE_WARNING=1 +ExecStart=/usr/bin/mandb +Nice=19 +IOWeight=20 diff --git a/man-db.spec b/man-db.spec index 96b70b7..d520ca7 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 5%{?dist} +Release: 6%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -14,6 +14,7 @@ URL: http://www.nongnu.org/man-db/ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz Source1: man-db.crondaily Source2: man-db.sysconfig +Source3: man-db-cache-update.service Patch0: man-db-2.7.6.1-change-owner-of-man-cache.patch # http://lists.nongnu.org/archive/html/man-db-devel/2017-01/msg00013.html @@ -26,6 +27,9 @@ Provides: man-pages-reader = %{version} Provides: bundled(gnulib) = %{gnulib_ver} Requires: coreutils, grep, groff-base, gzip, less +# for file trigger scriptlets +Requires: systemd +BuildRequires: systemd BuildRequires: gdbm-devel, gettext, groff, less, libpipeline-devel, zlib-devel BuildRequires: po4a, perl-interpreter, perl-version @@ -89,6 +93,9 @@ install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/man-db # config for tmpfiles.d install -D -p -m 0644 init/systemd/man-db.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/. +# man-db-cache-update.service +install -D -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/man-db-cache-update.service + %find_lang %{name} %find_lang %{name}-gnulib @@ -107,11 +114,12 @@ fi # update cache %transfiletriggerin -- %{_mandir} -MAN_NO_LOCALE_WARNING=1 /usr/bin/mandb -q +/usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update # update cache %transfiletriggerpostun -- %{_mandir} -MAN_NO_LOCALE_WARNING=1 /usr/bin/mandb -q +/usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update + %files -f %{name}.lang -f %{name}-gnulib.lang %{!?_licensedir:%global license %%doc} @@ -119,6 +127,7 @@ MAN_NO_LOCALE_WARNING=1 /usr/bin/mandb -q %doc README man-db-manual.txt man-db-manual.ps ChangeLog NEWS %config(noreplace) %{_sysconfdir}/man_db.conf %config(noreplace) /usr/lib/tmpfiles.d/man-db.conf +%{_unitdir}/man-db-cache-update.service %{_sbindir}/accessdb %{_bindir}/man %{_bindir}/whatis @@ -163,6 +172,10 @@ MAN_NO_LOCALE_WARNING=1 /usr/bin/mandb -q %config(noreplace) %{_sysconfdir}/sysconfig/man-db %changelog +* Wed Nov 08 2017 Nikola Forró - 2.7.6.1-6 +- run cache update in a transient service using systemd-run + resolves #1318058 + * Thu Aug 03 2017 Fedora Release Engineering - 2.7.6.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 2eca9ddb34658e24cdeed73f2b7a5d77372bb6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Thu, 9 Nov 2017 10:44:15 +0100 Subject: [PATCH 05/83] run cache update in a transient service using systemd-run - resolves #1318058 --- man-db-cache-update.service | 13 +++++++++++++ man-db.spec | 19 ++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 man-db-cache-update.service diff --git a/man-db-cache-update.service b/man-db-cache-update.service new file mode 100644 index 0000000..2f2f0d5 --- /dev/null +++ b/man-db-cache-update.service @@ -0,0 +1,13 @@ +[Unit] +DefaultDependencies=no +After=local-fs.target +Before=reboot.target shutdown.target halt.target +JobTimeoutSec=15min + +[Service] +Type=oneshot +TimeoutStartSec=infinity +Environment=MAN_NO_LOCALE_WARNING=1 +ExecStart=/usr/bin/mandb +Nice=19 +IOWeight=20 diff --git a/man-db.spec b/man-db.spec index 0ff6e0e..14dfdd1 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 3%{?dist} +Release: 4%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -14,6 +14,7 @@ URL: http://www.nongnu.org/man-db/ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz Source1: man-db.crondaily Source2: man-db.sysconfig +Source3: man-db-cache-update.service Patch0: man-db-2.7.6.1-change-owner-of-man-cache.patch # http://lists.nongnu.org/archive/html/man-db-devel/2017-01/msg00013.html @@ -26,6 +27,9 @@ Provides: man-pages-reader = %{version} Provides: bundled(gnulib) = %{gnulib_ver} Requires: coreutils, grep, groff-base, gzip, less +# for file trigger scriptlets +Requires: systemd +BuildRequires: systemd BuildRequires: gdbm-devel, gettext, groff, less, libpipeline-devel, zlib-devel BuildRequires: po4a, perl, perl-version @@ -89,6 +93,9 @@ install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/man-db # config for tmpfiles.d install -D -p -m 0644 init/systemd/man-db.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/. +# man-db-cache-update.service +install -D -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/man-db-cache-update.service + %find_lang %{name} %find_lang %{name}-gnulib @@ -107,11 +114,12 @@ fi # update cache %transfiletriggerin -- %{_mandir} -MAN_NO_LOCALE_WARNING=1 /usr/bin/mandb -q +/usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update # update cache %transfiletriggerpostun -- %{_mandir} -MAN_NO_LOCALE_WARNING=1 /usr/bin/mandb -q +/usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update + %files -f %{name}.lang -f %{name}-gnulib.lang %{!?_licensedir:%global license %%doc} @@ -119,6 +127,7 @@ MAN_NO_LOCALE_WARNING=1 /usr/bin/mandb -q %doc README man-db-manual.txt man-db-manual.ps ChangeLog NEWS %config(noreplace) %{_sysconfdir}/man_db.conf %config(noreplace) /usr/lib/tmpfiles.d/man-db.conf +%{_unitdir}/man-db-cache-update.service %{_sbindir}/accessdb %{_bindir}/man %{_bindir}/whatis @@ -163,6 +172,10 @@ MAN_NO_LOCALE_WARNING=1 /usr/bin/mandb -q %config(noreplace) %{_sysconfdir}/sysconfig/man-db %changelog +* Wed Nov 08 2017 Nikola Forró - 2.7.6.1-4 +- run cache update in a transient service using systemd-run + resolves #1318058 + * Fri Feb 10 2017 Fedora Release Engineering - 2.7.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 5794aabdfa5b220d4d6c8d72a5bcbff85a7eb2f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Thu, 16 Nov 2017 11:19:54 +0100 Subject: [PATCH 06/83] make file trigger scriptlets not to fail in case systemd is unavailable drop systemd dependency --- man-db.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/man-db.spec b/man-db.spec index d520ca7..fffc11d 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 6%{?dist} +Release: 7%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -27,8 +27,6 @@ Provides: man-pages-reader = %{version} Provides: bundled(gnulib) = %{gnulib_ver} Requires: coreutils, grep, groff-base, gzip, less -# for file trigger scriptlets -Requires: systemd BuildRequires: systemd BuildRequires: gdbm-devel, gettext, groff, less, libpipeline-devel, zlib-devel BuildRequires: po4a, perl-interpreter, perl-version @@ -114,11 +112,15 @@ fi # update cache %transfiletriggerin -- %{_mandir} -/usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update +if [ -x /usr/bin/systemd-run -a -x /usr/bin/systemctl ]; then + /usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update || : +fi # update cache %transfiletriggerpostun -- %{_mandir} -/usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update +if [ -x /usr/bin/systemd-run -a -x /usr/bin/systemctl ]; then + /usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update || : +fi %files -f %{name}.lang -f %{name}-gnulib.lang @@ -172,6 +174,10 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/man-db %changelog +* Thu Nov 16 2017 Nikola Forró - 2.7.6.1-7 +- make file trigger scriptlets not to fail in case systemd is unavailable +- drop systemd dependency + * Wed Nov 08 2017 Nikola Forró - 2.7.6.1-6 - run cache update in a transient service using systemd-run resolves #1318058 From 15260689d534a04960804e86504f275d9cdbc42d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Thu, 16 Nov 2017 11:19:54 +0100 Subject: [PATCH 07/83] make file trigger scriptlets not to fail in case systemd is unavailable drop systemd dependency --- man-db.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/man-db.spec b/man-db.spec index 14dfdd1..4f6594d 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 4%{?dist} +Release: 5%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -27,8 +27,6 @@ Provides: man-pages-reader = %{version} Provides: bundled(gnulib) = %{gnulib_ver} Requires: coreutils, grep, groff-base, gzip, less -# for file trigger scriptlets -Requires: systemd BuildRequires: systemd BuildRequires: gdbm-devel, gettext, groff, less, libpipeline-devel, zlib-devel BuildRequires: po4a, perl, perl-version @@ -114,11 +112,15 @@ fi # update cache %transfiletriggerin -- %{_mandir} -/usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update +if [ -x /usr/bin/systemd-run -a -x /usr/bin/systemctl ]; then + /usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update || : +fi # update cache %transfiletriggerpostun -- %{_mandir} -/usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update +if [ -x /usr/bin/systemd-run -a -x /usr/bin/systemctl ]; then + /usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update || : +fi %files -f %{name}.lang -f %{name}-gnulib.lang @@ -172,6 +174,10 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/man-db %changelog +* Thu Nov 16 2017 Nikola Forró - 2.7.6.1-5 +- make file trigger scriptlets not to fail in case systemd is unavailable +- drop systemd dependency + * Wed Nov 08 2017 Nikola Forró - 2.7.6.1-4 - run cache update in a transient service using systemd-run resolves #1318058 From 71f8f47846348cf6515a7bae0b6ab7126b0e7e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 21 Nov 2017 17:55:57 +0100 Subject: [PATCH 08/83] set group of /var/cache/man to root and drop setgid bit - resolves: #1515823 --- man-db-2.7.6.1-change-owner-of-man-cache.patch | 2 +- man-db.spec | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/man-db-2.7.6.1-change-owner-of-man-cache.patch b/man-db-2.7.6.1-change-owner-of-man-cache.patch index eb2e0df..eec8069 100644 --- a/man-db-2.7.6.1-change-owner-of-man-cache.patch +++ b/man-db-2.7.6.1-change-owner-of-man-cache.patch @@ -13,7 +13,7 @@ index 1eb40ce..21936d5 100644 +++ b/init/systemd/man-db.conf @@ -1 +1 @@ -d /var/cache/man 0755 man man 1w -+d /var/cache/man 0755 root man 1w ++d /var/cache/man 0755 root root 1w -- 2.7.4 diff --git a/man-db.spec b/man-db.spec index fffc11d..42d28e9 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 7%{?dist} +Release: 8%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -57,7 +57,7 @@ This package provides periodic update of man-db cache. %build %configure \ --with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \ - --disable-setuid --enable-cache-owner=root \ + --disable-setuid --disable-cache-owner \ --with-browser=elinks --with-lzip=lzip \ --with-override-dir=overrides make CC="%{__cc} %{optflags}" %{?_smp_mflags} V=1 @@ -144,7 +144,7 @@ fi %{_libexecdir}/man-db/globbing %{_libexecdir}/man-db/manconv %{_libexecdir}/man-db/zsoelim -%attr(2755,root,man) %verify(not mtime) %dir %{cache} +%verify(not mtime) %dir %{cache} # documentation and translation %{_mandir}/man1/apropos.1* %{_mandir}/man1/lexgrog.1* @@ -174,6 +174,10 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/man-db %changelog +* Tue Nov 21 2017 Nikola Forró - 2.7.6.1-8 +- set group of /var/cache/man to root and drop setgid bit + resolves: #1515823 + * Thu Nov 16 2017 Nikola Forró - 2.7.6.1-7 - make file trigger scriptlets not to fail in case systemd is unavailable - drop systemd dependency From b9daeebba2cd39ef543018202e42b875036f755a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 21 Nov 2017 17:58:28 +0100 Subject: [PATCH 09/83] allow configuration of man-db-cache-update service through sysconfig - resolves: #1514909 --- man-db-cache-update.service | 3 ++- man-db.spec | 8 ++++++-- man-db.sysconfig | 10 +++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/man-db-cache-update.service b/man-db-cache-update.service index 2f2f0d5..4ca914f 100644 --- a/man-db-cache-update.service +++ b/man-db-cache-update.service @@ -8,6 +8,7 @@ JobTimeoutSec=15min Type=oneshot TimeoutStartSec=infinity Environment=MAN_NO_LOCALE_WARNING=1 -ExecStart=/usr/bin/mandb +EnvironmentFile=/etc/sysconfig/man-db +ExecStart=/bin/sh -c '[ "$SERVICE" != "no" ] && /usr/bin/mandb $OPTS' Nice=19 IOWeight=20 diff --git a/man-db.spec b/man-db.spec index 42d28e9..3a4af90 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 8%{?dist} +Release: 9%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -128,6 +128,7 @@ fi %license docs/COPYING %doc README man-db-manual.txt man-db-manual.ps ChangeLog NEWS %config(noreplace) %{_sysconfdir}/man_db.conf +%config(noreplace) %{_sysconfdir}/sysconfig/man-db %config(noreplace) /usr/lib/tmpfiles.d/man-db.conf %{_unitdir}/man-db-cache-update.service %{_sbindir}/accessdb @@ -171,9 +172,12 @@ fi %files cron %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron -%config(noreplace) %{_sysconfdir}/sysconfig/man-db %changelog +* Tue Nov 21 2017 Nikola Forró - 2.7.6.1-9 +- allow configuration of man-db-cache-update service through sysconfig + resolves: #1514909 + * Tue Nov 21 2017 Nikola Forró - 2.7.6.1-8 - set group of /var/cache/man to root and drop setgid bit resolves: #1515823 diff --git a/man-db.sysconfig b/man-db.sysconfig index 608446d..e7449df 100644 --- a/man-db.sysconfig +++ b/man-db.sysconfig @@ -1,6 +1,10 @@ -# Set to no to disable daily man-db update by /etc/cron.daily/man-db.cron +# Set this to "no" to disable man-db update triggered by installation +# of any package containing manual pages +SERVICE="yes" + +# Set this to "no" to disable daily man-db update run by +# /etc/cron.daily/man-db.cron CRON="yes" -# Options used by mandb in /etc/cron.daily/man-db.cron, -# we use -q as default, too much noise without. +# Options used by mandb, we use "-q" as default, too much noise without it OPTS="-q" From 6722ef83e7b98fcd1d214a4c787bf3e4acd533bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 21 Nov 2017 17:55:57 +0100 Subject: [PATCH 10/83] set group of /var/cache/man to root and drop setgid bit - resolves: #1515823 --- man-db-2.7.6.1-change-owner-of-man-cache.patch | 2 +- man-db.spec | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/man-db-2.7.6.1-change-owner-of-man-cache.patch b/man-db-2.7.6.1-change-owner-of-man-cache.patch index eb2e0df..eec8069 100644 --- a/man-db-2.7.6.1-change-owner-of-man-cache.patch +++ b/man-db-2.7.6.1-change-owner-of-man-cache.patch @@ -13,7 +13,7 @@ index 1eb40ce..21936d5 100644 +++ b/init/systemd/man-db.conf @@ -1 +1 @@ -d /var/cache/man 0755 man man 1w -+d /var/cache/man 0755 root man 1w ++d /var/cache/man 0755 root root 1w -- 2.7.4 diff --git a/man-db.spec b/man-db.spec index 4f6594d..779e11e 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 5%{?dist} +Release: 6%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -57,7 +57,7 @@ This package provides periodic update of man-db cache. %build %configure \ --with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \ - --disable-setuid --enable-cache-owner=root \ + --disable-setuid --disable-cache-owner \ --with-browser=elinks --with-lzip=lzip \ --with-override-dir=overrides make CC="%{__cc} %{optflags}" %{?_smp_mflags} V=1 @@ -144,7 +144,7 @@ fi %{_libexecdir}/man-db/globbing %{_libexecdir}/man-db/manconv %{_libexecdir}/man-db/zsoelim -%attr(2755,root,man) %verify(not mtime) %dir %{cache} +%verify(not mtime) %dir %{cache} # documentation and translation %{_mandir}/man1/apropos.1* %{_mandir}/man1/lexgrog.1* @@ -174,6 +174,10 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/man-db %changelog +* Tue Nov 21 2017 Nikola Forró - 2.7.6.1-6 +- set group of /var/cache/man to root and drop setgid bit + resolves: #1515823 + * Thu Nov 16 2017 Nikola Forró - 2.7.6.1-5 - make file trigger scriptlets not to fail in case systemd is unavailable - drop systemd dependency From d238b49d5fdf804b018b6c9c1e70f79d8d62d90f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 21 Nov 2017 17:58:28 +0100 Subject: [PATCH 11/83] allow configuration of man-db-cache-update service through sysconfig - resolves: #1514909 --- man-db-cache-update.service | 3 ++- man-db.spec | 8 ++++++-- man-db.sysconfig | 10 +++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/man-db-cache-update.service b/man-db-cache-update.service index 2f2f0d5..4ca914f 100644 --- a/man-db-cache-update.service +++ b/man-db-cache-update.service @@ -8,6 +8,7 @@ JobTimeoutSec=15min Type=oneshot TimeoutStartSec=infinity Environment=MAN_NO_LOCALE_WARNING=1 -ExecStart=/usr/bin/mandb +EnvironmentFile=/etc/sysconfig/man-db +ExecStart=/bin/sh -c '[ "$SERVICE" != "no" ] && /usr/bin/mandb $OPTS' Nice=19 IOWeight=20 diff --git a/man-db.spec b/man-db.spec index 779e11e..f089ae6 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 6%{?dist} +Release: 7%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -128,6 +128,7 @@ fi %license docs/COPYING %doc README man-db-manual.txt man-db-manual.ps ChangeLog NEWS %config(noreplace) %{_sysconfdir}/man_db.conf +%config(noreplace) %{_sysconfdir}/sysconfig/man-db %config(noreplace) /usr/lib/tmpfiles.d/man-db.conf %{_unitdir}/man-db-cache-update.service %{_sbindir}/accessdb @@ -171,9 +172,12 @@ fi %files cron %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron -%config(noreplace) %{_sysconfdir}/sysconfig/man-db %changelog +* Tue Nov 21 2017 Nikola Forró - 2.7.6.1-7 +- allow configuration of man-db-cache-update service through sysconfig + resolves: #1514909 + * Tue Nov 21 2017 Nikola Forró - 2.7.6.1-6 - set group of /var/cache/man to root and drop setgid bit resolves: #1515823 diff --git a/man-db.sysconfig b/man-db.sysconfig index 608446d..e7449df 100644 --- a/man-db.sysconfig +++ b/man-db.sysconfig @@ -1,6 +1,10 @@ -# Set to no to disable daily man-db update by /etc/cron.daily/man-db.cron +# Set this to "no" to disable man-db update triggered by installation +# of any package containing manual pages +SERVICE="yes" + +# Set this to "no" to disable daily man-db update run by +# /etc/cron.daily/man-db.cron CRON="yes" -# Options used by mandb in /etc/cron.daily/man-db.cron, -# we use -q as default, too much noise without. +# Options used by mandb, we use "-q" as default, too much noise without it OPTS="-q" From 05a499482d24ed8105b74c13a8dbb8a7dda10538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 19 Dec 2017 17:31:32 +0100 Subject: [PATCH 12/83] fix failure of man-db-cache-update service when configured not to run - resolves: #1526715 --- man-db-cache-update.service | 2 +- man-db.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/man-db-cache-update.service b/man-db-cache-update.service index 4ca914f..dc218af 100644 --- a/man-db-cache-update.service +++ b/man-db-cache-update.service @@ -9,6 +9,6 @@ Type=oneshot TimeoutStartSec=infinity Environment=MAN_NO_LOCALE_WARNING=1 EnvironmentFile=/etc/sysconfig/man-db -ExecStart=/bin/sh -c '[ "$SERVICE" != "no" ] && /usr/bin/mandb $OPTS' +ExecStart=/bin/sh -c '[ "$SERVICE" != "no" ] && /usr/bin/mandb $OPTS || true' Nice=19 IOWeight=20 diff --git a/man-db.spec b/man-db.spec index 3a4af90..4673866 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 9%{?dist} +Release: 10%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -174,6 +174,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Dec 19 2017 Nikola Forró - 2.7.6.1-10 +- fix failure of man-db-cache-update service when configured not to run + resolves: #1526715 + * Tue Nov 21 2017 Nikola Forró - 2.7.6.1-9 - allow configuration of man-db-cache-update service through sysconfig resolves: #1514909 From 7bb3c7fad62c6c7b22071316a88303005dbf5214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 19 Dec 2017 17:31:32 +0100 Subject: [PATCH 13/83] fix failure of man-db-cache-update service when configured not to run - resolves: #1526715 --- man-db-cache-update.service | 2 +- man-db.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/man-db-cache-update.service b/man-db-cache-update.service index 4ca914f..dc218af 100644 --- a/man-db-cache-update.service +++ b/man-db-cache-update.service @@ -9,6 +9,6 @@ Type=oneshot TimeoutStartSec=infinity Environment=MAN_NO_LOCALE_WARNING=1 EnvironmentFile=/etc/sysconfig/man-db -ExecStart=/bin/sh -c '[ "$SERVICE" != "no" ] && /usr/bin/mandb $OPTS' +ExecStart=/bin/sh -c '[ "$SERVICE" != "no" ] && /usr/bin/mandb $OPTS || true' Nice=19 IOWeight=20 diff --git a/man-db.spec b/man-db.spec index f089ae6..4b27e66 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 7%{?dist} +Release: 8%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -174,6 +174,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Dec 19 2017 Nikola Forró - 2.7.6.1-8 +- fix failure of man-db-cache-update service when configured not to run + resolves: #1526715 + * Tue Nov 21 2017 Nikola Forró - 2.7.6.1-7 - allow configuration of man-db-cache-update service through sysconfig resolves: #1514909 From 3b5e95b9d2a01313584dc82c3acd5229486d4a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 16 Jan 2018 14:23:35 +0100 Subject: [PATCH 14/83] rebuild with gdbm-1.14 --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 4673866..399484b 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 10%{?dist} +Release: 11%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -174,6 +174,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Jan 16 2018 Nikola Forró - 2.7.6.1-11 +- rebuild with gdbm-1.14 + * Tue Dec 19 2017 Nikola Forró - 2.7.6.1-10 - fix failure of man-db-cache-update service when configured not to run resolves: #1526715 From b8aab2cabf70d53a0411f553f496ada888cdc383 Mon Sep 17 00:00:00 2001 From: Jiri Kucera Date: Tue, 16 Jan 2018 17:24:38 +0100 Subject: [PATCH 15/83] Fix man killed by SIGSEGV if invoked as 'man -D?' - resolves: #1495507 - related discussion: http://lists.nongnu.org/archive/html/man-db-devel/2018-01/msg00005.html - original patch: https://git.savannah.gnu.org/cgit/man-db.git/patch/?id=b32977ff73220cd351387abe558fb523d1deedbb --- man-db-2.7.6.1-fix_rhbz1495507.patch | 90 ++++++++++++++++++++++++++++ man-db.spec | 11 +++- 2 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 man-db-2.7.6.1-fix_rhbz1495507.patch diff --git a/man-db-2.7.6.1-fix_rhbz1495507.patch b/man-db-2.7.6.1-fix_rhbz1495507.patch new file mode 100644 index 0000000..a3237f5 --- /dev/null +++ b/man-db-2.7.6.1-fix_rhbz1495507.patch @@ -0,0 +1,90 @@ +From 79308ac147be9e9c889798cba78bab2af05048e1 Mon Sep 17 00:00:00 2001 +From: Jiri Kucera +Date: Wed, 17 Jan 2018 13:57:34 +0100 +Subject: [PATCH] Fix a segfault in 'man -D --help' + +This patch is an adjusted version (due to the patch rejected hunk issues) of its original (by Colin Watson) from: https://git.savannah.gnu.org/cgit/man-db.git/patch/?id=b32977ff73220cd351387abe558fb523d1deedbb + +Reported by Jiri Kucera. + +* src/man.c (init_html_pager): New function. +(parse_opt): Call init_html_pager rather than setting html_pager to +NULL. +(help_filter): Assert that browser is non-NULL. +(main): Call init_html_pager rather than doing the same thing directly. +* NEWS: Document this. +--- + NEWS | 10 ++++++++++ + src/man.c | 17 +++++++++++------ + 2 files changed, 21 insertions(+), 6 deletions(-) + +diff --git a/NEWS b/NEWS +index 366a0263..ff35e884 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,13 @@ ++man-db 2.7.7 ++============ ++ ++Major changes since man-db 2.7.6.1: ++ ++ Fixes: ++ ------ ++ ++ o Fix a segfault in 'man -D --help'. ++ + man-db 2.7.6.1 (12 December 2016) + ================================= + +diff --git a/src/man.c b/src/man.c +index 8b11f43e..cb0930b8 100644 +--- a/src/man.c ++++ b/src/man.c +@@ -345,6 +345,13 @@ static struct argp_option options[] = { + { 0 } + }; + ++static void init_html_pager (void) ++{ ++ html_pager = getenv ("BROWSER"); ++ if (!html_pager) ++ html_pager = WEB_BROWSER; ++} ++ + static error_t parse_opt (int key, char *arg, struct argp_state *state) + { + static int apropos, whatis; /* retain values between calls */ +@@ -369,7 +376,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) + ditroff = 0; + gxditview = NULL; + htmlout = 0; +- html_pager = NULL; ++ init_html_pager (); + #endif + roff_device = want_encoding = extension = pager = + locale = alt_system_name = external = +@@ -582,6 +589,7 @@ static char *help_filter (int key, const char *text, + # ifdef TROFF_IS_GROFF + case 'H': + browser = html_pager; ++ assert (browser); + if (STRNEQ (browser, "exec ", 5)) + browser += 5; + return xasprintf (text, browser); +@@ -4018,11 +4026,8 @@ int main (int argc, char *argv[]) + + #ifdef TROFF_IS_GROFF + /* used in --help, so initialise early */ +- if (!html_pager) { +- html_pager = getenv ("BROWSER"); +- if (!html_pager) +- html_pager = WEB_BROWSER; +- } ++ if (!html_pager) ++ init_html_pager (); + #endif /* TROFF_IS_GROFF */ + + /* First of all, find out if $MANOPT is set. If so, put it in +-- +2.14.3 + diff --git a/man-db.spec b/man-db.spec index 399484b..34690f4 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 11%{?dist} +Release: 12%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -19,6 +19,9 @@ Patch0: man-db-2.7.6.1-change-owner-of-man-cache.patch # http://lists.nongnu.org/archive/html/man-db-devel/2017-01/msg00013.html Patch1: man-db-2.7.6.1-fix-override-dir-handling.patch +# http://lists.nongnu.org/archive/html/man-db-devel/2018-01/msg00005.html +# https://bugzilla.redhat.com/show_bug.cgi?id=1495507 +Patch2: man-db-2.7.6.1-fix_rhbz1495507.patch Obsoletes: man < 2.0 Provides: man = %{version} @@ -174,6 +177,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Jan 16 2018 Jiri Kucera - 2.7.6.1-12 +- fix segmentation fault caused by 'man -D?' + resolves: #1495507 + * Tue Jan 16 2018 Nikola Forró - 2.7.6.1-11 - rebuild with gdbm-1.14 @@ -297,7 +304,7 @@ fi * Sun Oct 12 2014 jchaloup - 2.7.0.2-3 - remove executable flag for *.service and *.timer file - resolves: #1151558 + resolves: #1151558 * Wed Oct 08 2014 jchaloup - 2.7.0.2-2 - replacing cron with systemd.timer From 4f46ff3a0f23b00c26f6964a47379d2e95f852ac Mon Sep 17 00:00:00 2001 From: Jiri Kucera Date: Tue, 16 Jan 2018 17:24:38 +0100 Subject: [PATCH 16/83] Fix man killed by SIGSEGV if invoked as 'man -D?' - resolves: #1495507 - related discussion: http://lists.nongnu.org/archive/html/man-db-devel/2018-01/msg00005.html - original patch: https://git.savannah.gnu.org/cgit/man-db.git/patch/?id=b32977ff73220cd351387abe558fb523d1deedbb --- man-db-2.7.6.1-fix_rhbz1495507.patch | 90 ++++++++++++++++++++++++++++ man-db.spec | 11 +++- 2 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 man-db-2.7.6.1-fix_rhbz1495507.patch diff --git a/man-db-2.7.6.1-fix_rhbz1495507.patch b/man-db-2.7.6.1-fix_rhbz1495507.patch new file mode 100644 index 0000000..a3237f5 --- /dev/null +++ b/man-db-2.7.6.1-fix_rhbz1495507.patch @@ -0,0 +1,90 @@ +From 79308ac147be9e9c889798cba78bab2af05048e1 Mon Sep 17 00:00:00 2001 +From: Jiri Kucera +Date: Wed, 17 Jan 2018 13:57:34 +0100 +Subject: [PATCH] Fix a segfault in 'man -D --help' + +This patch is an adjusted version (due to the patch rejected hunk issues) of its original (by Colin Watson) from: https://git.savannah.gnu.org/cgit/man-db.git/patch/?id=b32977ff73220cd351387abe558fb523d1deedbb + +Reported by Jiri Kucera. + +* src/man.c (init_html_pager): New function. +(parse_opt): Call init_html_pager rather than setting html_pager to +NULL. +(help_filter): Assert that browser is non-NULL. +(main): Call init_html_pager rather than doing the same thing directly. +* NEWS: Document this. +--- + NEWS | 10 ++++++++++ + src/man.c | 17 +++++++++++------ + 2 files changed, 21 insertions(+), 6 deletions(-) + +diff --git a/NEWS b/NEWS +index 366a0263..ff35e884 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,13 @@ ++man-db 2.7.7 ++============ ++ ++Major changes since man-db 2.7.6.1: ++ ++ Fixes: ++ ------ ++ ++ o Fix a segfault in 'man -D --help'. ++ + man-db 2.7.6.1 (12 December 2016) + ================================= + +diff --git a/src/man.c b/src/man.c +index 8b11f43e..cb0930b8 100644 +--- a/src/man.c ++++ b/src/man.c +@@ -345,6 +345,13 @@ static struct argp_option options[] = { + { 0 } + }; + ++static void init_html_pager (void) ++{ ++ html_pager = getenv ("BROWSER"); ++ if (!html_pager) ++ html_pager = WEB_BROWSER; ++} ++ + static error_t parse_opt (int key, char *arg, struct argp_state *state) + { + static int apropos, whatis; /* retain values between calls */ +@@ -369,7 +376,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) + ditroff = 0; + gxditview = NULL; + htmlout = 0; +- html_pager = NULL; ++ init_html_pager (); + #endif + roff_device = want_encoding = extension = pager = + locale = alt_system_name = external = +@@ -582,6 +589,7 @@ static char *help_filter (int key, const char *text, + # ifdef TROFF_IS_GROFF + case 'H': + browser = html_pager; ++ assert (browser); + if (STRNEQ (browser, "exec ", 5)) + browser += 5; + return xasprintf (text, browser); +@@ -4018,11 +4026,8 @@ int main (int argc, char *argv[]) + + #ifdef TROFF_IS_GROFF + /* used in --help, so initialise early */ +- if (!html_pager) { +- html_pager = getenv ("BROWSER"); +- if (!html_pager) +- html_pager = WEB_BROWSER; +- } ++ if (!html_pager) ++ init_html_pager (); + #endif /* TROFF_IS_GROFF */ + + /* First of all, find out if $MANOPT is set. If so, put it in +-- +2.14.3 + diff --git a/man-db.spec b/man-db.spec index 4b27e66..a8dbd75 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 8%{?dist} +Release: 9%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -19,6 +19,9 @@ Patch0: man-db-2.7.6.1-change-owner-of-man-cache.patch # http://lists.nongnu.org/archive/html/man-db-devel/2017-01/msg00013.html Patch1: man-db-2.7.6.1-fix-override-dir-handling.patch +# http://lists.nongnu.org/archive/html/man-db-devel/2018-01/msg00005.html +# https://bugzilla.redhat.com/show_bug.cgi?id=1495507 +Patch2: man-db-2.7.6.1-fix_rhbz1495507.patch Obsoletes: man < 2.0 Provides: man = %{version} @@ -174,6 +177,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Jan 16 2018 Jiri Kucera - 2.7.6.1-9 +- fix segmentation fault caused by 'man -D?' + resolves: #1495507 + * Tue Dec 19 2017 Nikola Forró - 2.7.6.1-8 - fix failure of man-db-cache-update service when configured not to run resolves: #1526715 @@ -288,7 +295,7 @@ fi * Sun Oct 12 2014 jchaloup - 2.7.0.2-3 - remove executable flag for *.service and *.timer file - resolves: #1151558 + resolves: #1151558 * Wed Oct 08 2014 jchaloup - 2.7.0.2-2 - replacing cron with systemd.timer From fe82cc6fe9a1689f5eaa5c551f2e23379ceff481 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 3 Feb 2018 20:33:24 -0500 Subject: [PATCH 17/83] Avoid noisy output from man-db-cache-update triggers When the man-db-cache-update trigger added in 8e16b24 ("run cache update in a transient service using systemd-run - resolves #1318058", 2017-11-09) is run, it produces potentially confusing output: Running transaction Preparing : 1/1 Upgrading : fedpkg-1.31-1.fc26.noarch 1/2 Cleanup : fedpkg-1.30-4.fc26.noarch 2/2 Running scriptlet: fedpkg-1.30-4.fc26.noarch 2/2 Running as unit: run-re2635381e8fe44a6aad4926eddab6961.service Running as unit: run-r8f76223bb81544e8b6f53b8c88b3e72f.service Verifying : fedpkg-1.31-1.fc26.noarch 1/2 Verifying : fedpkg-1.30-4.fc26.noarch 2/2 The 'Running as unit: run-*.service' output is of little use to users. The start of the service is logged to syslog/journal already. Send stdout and stderr of the trigger scriptlet to /dev/null. --- man-db.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/man-db.spec b/man-db.spec index 34690f4..271f28a 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 12%{?dist} +Release: 13%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -116,13 +116,13 @@ fi # update cache %transfiletriggerin -- %{_mandir} if [ -x /usr/bin/systemd-run -a -x /usr/bin/systemctl ]; then - /usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update || : + /usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update >/dev/null 2>&1 || : fi # update cache %transfiletriggerpostun -- %{_mandir} if [ -x /usr/bin/systemd-run -a -x /usr/bin/systemctl ]; then - /usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update || : + /usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update >/dev/null 2>&1 || : fi @@ -177,6 +177,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Sat Feb 03 2018 Todd Zullinger - 2.7.6.1-13 +- Avoid noisy output from man-db-cache-update triggers + * Tue Jan 16 2018 Jiri Kucera - 2.7.6.1-12 - fix segmentation fault caused by 'man -D?' resolves: #1495507 From 6dc5835f0a703ccd3d6041c974df0ac206e22d43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 00:50:53 +0000 Subject: [PATCH 18/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 271f28a..2be952c 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 13%{?dist} +Release: 14%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -177,6 +177,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 2.7.6.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Feb 03 2018 Todd Zullinger - 2.7.6.1-13 - Avoid noisy output from man-db-cache-update triggers From b5ede82990fec1769061b0bf1d66b483a18b4798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 20 Feb 2018 16:53:53 +0100 Subject: [PATCH 19/83] add missing gcc build dependency --- man-db.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 2be952c..1ebe810 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.7.6.1 -Release: 14%{?dist} +Release: 15%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -30,6 +30,7 @@ Provides: man-pages-reader = %{version} Provides: bundled(gnulib) = %{gnulib_ver} Requires: coreutils, grep, groff-base, gzip, less +BuildRequires: gcc BuildRequires: systemd BuildRequires: gdbm-devel, gettext, groff, less, libpipeline-devel, zlib-devel BuildRequires: po4a, perl-interpreter, perl-version @@ -177,6 +178,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Feb 20 2018 Nikola Forró - 2.7.6.1-15 +- add missing gcc build dependency + * Thu Feb 08 2018 Fedora Release Engineering - 2.7.6.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From fd1fd80475cf1b970e51deb1e3644ea96acd8f9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Fri, 6 Apr 2018 12:22:50 +0200 Subject: [PATCH 20/83] update to 2.8.3 - resolves: #1564220 --- .gitignore | 1 + ...db-2.7.6.1-change-owner-of-man-cache.patch | 20 ++--- man-db-2.7.6.1-fix_rhbz1495507.patch | 90 ------------------- man-db.spec | 38 ++++---- sources | 2 +- 5 files changed, 33 insertions(+), 118 deletions(-) delete mode 100644 man-db-2.7.6.1-fix_rhbz1495507.patch diff --git a/.gitignore b/.gitignore index 725a297..8c537a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /man-db-2.7.5.tar.xz /man-db-2.7.6.1.tar.xz +/man-db-2.8.3.tar.xz diff --git a/man-db-2.7.6.1-change-owner-of-man-cache.patch b/man-db-2.7.6.1-change-owner-of-man-cache.patch index eec8069..deafa06 100644 --- a/man-db-2.7.6.1-change-owner-of-man-cache.patch +++ b/man-db-2.7.6.1-change-owner-of-man-cache.patch @@ -1,19 +1,19 @@ -From b872ee2e8ba470ed869db7dcf37eeb96563a62fa Mon Sep 17 00:00:00 2001 +From 99dd120b952a2a27fa31ae005149e6aaaed28755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= -Date: Thu, 19 Jan 2017 14:06:30 +0100 -Subject: [PATCH] Set owner of man cache to root instead of man +Date: Fri, 6 Apr 2018 11:52:33 +0200 +Subject: [PATCH] Set owner of man cache to root --- - init/systemd/man-db.conf | 2 +- + init/systemd/man-db.conf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/init/systemd/man-db.conf b/init/systemd/man-db.conf -index 1eb40ce..21936d5 100644 ---- a/init/systemd/man-db.conf -+++ b/init/systemd/man-db.conf +diff --git a/init/systemd/man-db.conf.in b/init/systemd/man-db.conf.in +index 90ca7f6..cac2b52 100644 +--- a/init/systemd/man-db.conf.in ++++ b/init/systemd/man-db.conf.in @@ -1 +1 @@ --d /var/cache/man 0755 man man 1w +-d /var/cache/man 0755 @man_owner@ @man_owner@ 1w +d /var/cache/man 0755 root root 1w -- -2.7.4 +2.13.6 diff --git a/man-db-2.7.6.1-fix_rhbz1495507.patch b/man-db-2.7.6.1-fix_rhbz1495507.patch deleted file mode 100644 index a3237f5..0000000 --- a/man-db-2.7.6.1-fix_rhbz1495507.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 79308ac147be9e9c889798cba78bab2af05048e1 Mon Sep 17 00:00:00 2001 -From: Jiri Kucera -Date: Wed, 17 Jan 2018 13:57:34 +0100 -Subject: [PATCH] Fix a segfault in 'man -D --help' - -This patch is an adjusted version (due to the patch rejected hunk issues) of its original (by Colin Watson) from: https://git.savannah.gnu.org/cgit/man-db.git/patch/?id=b32977ff73220cd351387abe558fb523d1deedbb - -Reported by Jiri Kucera. - -* src/man.c (init_html_pager): New function. -(parse_opt): Call init_html_pager rather than setting html_pager to -NULL. -(help_filter): Assert that browser is non-NULL. -(main): Call init_html_pager rather than doing the same thing directly. -* NEWS: Document this. ---- - NEWS | 10 ++++++++++ - src/man.c | 17 +++++++++++------ - 2 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/NEWS b/NEWS -index 366a0263..ff35e884 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,13 @@ -+man-db 2.7.7 -+============ -+ -+Major changes since man-db 2.7.6.1: -+ -+ Fixes: -+ ------ -+ -+ o Fix a segfault in 'man -D --help'. -+ - man-db 2.7.6.1 (12 December 2016) - ================================= - -diff --git a/src/man.c b/src/man.c -index 8b11f43e..cb0930b8 100644 ---- a/src/man.c -+++ b/src/man.c -@@ -345,6 +345,13 @@ static struct argp_option options[] = { - { 0 } - }; - -+static void init_html_pager (void) -+{ -+ html_pager = getenv ("BROWSER"); -+ if (!html_pager) -+ html_pager = WEB_BROWSER; -+} -+ - static error_t parse_opt (int key, char *arg, struct argp_state *state) - { - static int apropos, whatis; /* retain values between calls */ -@@ -369,7 +376,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) - ditroff = 0; - gxditview = NULL; - htmlout = 0; -- html_pager = NULL; -+ init_html_pager (); - #endif - roff_device = want_encoding = extension = pager = - locale = alt_system_name = external = -@@ -582,6 +589,7 @@ static char *help_filter (int key, const char *text, - # ifdef TROFF_IS_GROFF - case 'H': - browser = html_pager; -+ assert (browser); - if (STRNEQ (browser, "exec ", 5)) - browser += 5; - return xasprintf (text, browser); -@@ -4018,11 +4026,8 @@ int main (int argc, char *argv[]) - - #ifdef TROFF_IS_GROFF - /* used in --help, so initialise early */ -- if (!html_pager) { -- html_pager = getenv ("BROWSER"); -- if (!html_pager) -- html_pager = WEB_BROWSER; -- } -+ if (!html_pager) -+ init_html_pager (); - #endif /* TROFF_IS_GROFF */ - - /* First of all, find out if $MANOPT is set. If so, put it in --- -2.14.3 - diff --git a/man-db.spec b/man-db.spec index 1ebe810..fd86d89 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,8 +3,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.7.6.1 -Release: 15%{?dist} +Version: 2.8.3 +Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -19,9 +19,6 @@ Patch0: man-db-2.7.6.1-change-owner-of-man-cache.patch # http://lists.nongnu.org/archive/html/man-db-devel/2017-01/msg00013.html Patch1: man-db-2.7.6.1-fix-override-dir-handling.patch -# http://lists.nongnu.org/archive/html/man-db-devel/2018-01/msg00005.html -# https://bugzilla.redhat.com/show_bug.cgi?id=1495507 -Patch2: man-db-2.7.6.1-fix_rhbz1495507.patch Obsoletes: man < 2.0 Provides: man = %{version} @@ -161,23 +158,30 @@ fi %{_mandir}/man8/accessdb.8* %{_mandir}/man8/catman.8* %{_mandir}/man8/mandb.8* -%lang(da) %{_datadir}/man/da/man*/* -%lang(de) %{_datadir}/man/de/man*/* -%lang(es) %{_datadir}/man/es/man*/* -%lang(fr) %{_datadir}/man/fr/man*/* -%lang(id) %{_datadir}/man/id/man*/* -%lang(it) %{_datadir}/man/it/man*/* -%lang(ja) %{_datadir}/man/ja/man*/* -%lang(nl) %{_datadir}/man/nl/man*/* -%lang(pl) %{_datadir}/man/pl/man*/* -%lang(ru) %{_datadir}/man/ru/man*/* -%lang(sv) %{_datadir}/man/sv/man*/* -%lang(zh_CN) %{_datadir}/man/zh_CN/man*/* +%lang(da) %{_datadir}/man/da/man*/* +%lang(de) %{_datadir}/man/de/man*/* +%lang(es) %{_datadir}/man/es/man*/* +%lang(fr) %{_datadir}/man/fr/man*/* +%lang(id) %{_datadir}/man/id/man*/* +%lang(it) %{_datadir}/man/it/man*/* +%lang(ja) %{_datadir}/man/ja/man*/* +%lang(nl) %{_datadir}/man/nl/man*/* +%lang(pl) %{_datadir}/man/pl/man*/* +%lang(pt_BR) %{_datadir}/man/pt_BR/man*/* +%lang(ru) %{_datadir}/man/ru/man*/* +%lang(sr) %{_datadir}/man/sr/man*/* +%lang(sv) %{_datadir}/man/sv/man*/* +%lang(tr) %{_datadir}/man/tr/man*/* +%lang(zh_CN) %{_datadir}/man/zh_CN/man*/* %files cron %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Apr 06 2018 Nikola Forró - 2.8.3-1 +- update to 2.8.3 + resolves #1564220 + * Tue Feb 20 2018 Nikola Forró - 2.7.6.1-15 - add missing gcc build dependency diff --git a/sources b/sources index 90d7f85..af34393 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.7.6.1.tar.xz) = 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301 +SHA512 (man-db-2.8.3.tar.xz) = 35d5dda7a2bda94978d10770d24d4c78b3c62c71a68cfeb400df61b0df289ed17aa8aa223d4ae3ffa094d76df8d9172b878230fd7b0397ce7728b9c8ac0b1745 From f4fb27e8cb8a7e38476d400bcadcc2d791aee81e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Fri, 6 Apr 2018 15:48:35 +0200 Subject: [PATCH 21/83] fix version in the name of change-owner-of-man-cache patch --- ...e.patch => man-db-2.8.3-change-owner-of-man-cache.patch | 0 man-db.spec | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) rename man-db-2.7.6.1-change-owner-of-man-cache.patch => man-db-2.8.3-change-owner-of-man-cache.patch (100%) diff --git a/man-db-2.7.6.1-change-owner-of-man-cache.patch b/man-db-2.8.3-change-owner-of-man-cache.patch similarity index 100% rename from man-db-2.7.6.1-change-owner-of-man-cache.patch rename to man-db-2.8.3-change-owner-of-man-cache.patch diff --git a/man-db.spec b/man-db.spec index fd86d89..918d334 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.8.3 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -15,7 +15,7 @@ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.ta Source1: man-db.crondaily Source2: man-db.sysconfig Source3: man-db-cache-update.service -Patch0: man-db-2.7.6.1-change-owner-of-man-cache.patch +Patch0: man-db-2.8.3-change-owner-of-man-cache.patch # http://lists.nongnu.org/archive/html/man-db-devel/2017-01/msg00013.html Patch1: man-db-2.7.6.1-fix-override-dir-handling.patch @@ -178,6 +178,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Apr 06 2018 Nikola Forró - 2.8.3-2 +- fix version in the name of change-owner-of-man-cache patch + * Fri Apr 06 2018 Nikola Forró - 2.8.3-1 - update to 2.8.3 resolves #1564220 From 8f5abddba46778f7fe82d3ebb0d2372793692841 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 12 Jul 2018 11:00:56 +0200 Subject: [PATCH 22/83] Rebuild for new gdbm Signed-off-by: Igor Gnatenko --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 918d334..b5fc321 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.8.3 -Release: 2%{?dist} +Release: 3%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -178,6 +178,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Thu Jul 12 2018 Igor Gnatenko - 2.8.3-3 +- Rebuild for new gdbm + * Fri Apr 06 2018 Nikola Forró - 2.8.3-2 - fix version in the name of change-owner-of-man-cache patch From c63ae7e22e0054924cefb9151016ef23e3ea0ead Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 09:44:31 +0000 Subject: [PATCH 23/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index b5fc321..02b5f12 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.8.3 -Release: 3%{?dist} +Release: 4%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -178,6 +178,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.8.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jul 12 2018 Igor Gnatenko - 2.8.3-3 - Rebuild for new gdbm From 67da76e768a4946cf1e67bafe3a01f8d81cac8aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Mon, 30 Jul 2018 09:04:49 +0200 Subject: [PATCH 24/83] update to 2.8.4 - resolves: #1609438 --- .gitignore | 1 + man-db-2.8.3-change-owner-of-man-cache.patch | 4 ++-- man-db.spec | 8 ++++++-- sources | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8c537a1..c5c2e58 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /man-db-2.7.5.tar.xz /man-db-2.7.6.1.tar.xz /man-db-2.8.3.tar.xz +/man-db-2.8.4.tar.xz diff --git a/man-db-2.8.3-change-owner-of-man-cache.patch b/man-db-2.8.3-change-owner-of-man-cache.patch index deafa06..2e196a7 100644 --- a/man-db-2.8.3-change-owner-of-man-cache.patch +++ b/man-db-2.8.3-change-owner-of-man-cache.patch @@ -8,11 +8,11 @@ Subject: [PATCH] Set owner of man cache to root 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/systemd/man-db.conf.in b/init/systemd/man-db.conf.in -index 90ca7f6..cac2b52 100644 +index 7a461e8..cac2b52 100644 --- a/init/systemd/man-db.conf.in +++ b/init/systemd/man-db.conf.in @@ -1 +1 @@ --d /var/cache/man 0755 @man_owner@ @man_owner@ 1w +-d /var/cache/man 0755 @cache_top_owner@ @cache_top_owner@ 1w +d /var/cache/man 0755 root root 1w -- 2.13.6 diff --git a/man-db.spec b/man-db.spec index 02b5f12..bcbd646 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,8 +3,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.8.3 -Release: 4%{?dist} +Version: 2.8.4 +Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -178,6 +178,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Mon Jul 30 2018 Nikola Forró - 2.8.4-1 +- update to 2.8.4 + resolves #1609438 + * Fri Jul 13 2018 Fedora Release Engineering - 2.8.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index af34393..8c4f59e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.8.3.tar.xz) = 35d5dda7a2bda94978d10770d24d4c78b3c62c71a68cfeb400df61b0df289ed17aa8aa223d4ae3ffa094d76df8d9172b878230fd7b0397ce7728b9c8ac0b1745 +SHA512 (man-db-2.8.4.tar.xz) = 3cc160a5a8a0a4e918f6f6546582d1e5fe9851a13c5bd8dc94e3fcbf4ec28cb3cd1524b1ae30722931c84981fa8ca9ac64c9c4d9544c2d0bea80ac9f39cb5e66 From 542b8dea2f0baf82a70b09c3673b425513a5fe66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Wed, 7 Nov 2018 16:31:59 +0100 Subject: [PATCH 25/83] get rid of hardcoded path --- man-db.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/man-db.spec b/man-db.spec index bcbd646..ceb6852 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.8.4 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -130,7 +130,7 @@ fi %doc README man-db-manual.txt man-db-manual.ps ChangeLog NEWS %config(noreplace) %{_sysconfdir}/man_db.conf %config(noreplace) %{_sysconfdir}/sysconfig/man-db -%config(noreplace) /usr/lib/tmpfiles.d/man-db.conf +%config(noreplace) %{_tmpfilesdir}/man-db.conf %{_unitdir}/man-db-cache-update.service %{_sbindir}/accessdb %{_bindir}/man @@ -178,6 +178,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Wed Nov 07 2018 Nikola Forró - 2.8.4-2 +- get rid of hardcoded path + * Mon Jul 30 2018 Nikola Forró - 2.8.4-1 - update to 2.8.4 resolves #1609438 From c1072c5c1038865131ad8a60d5156847a63e4e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Mon, 7 Jan 2019 13:29:40 +0100 Subject: [PATCH 26/83] prioritize POSIX man pages over perl manuals - resolves: #1663919 --- man-db.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/man-db.spec b/man-db.spec index ceb6852..04c0b93 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.8.4 -Release: 2%{?dist} +Release: 3%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -57,7 +57,7 @@ This package provides periodic update of man-db cache. %build %configure \ - --with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \ + --with-sections="1 1p 8 2 3 3p 3pm 4 5 6 7 9 0p n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \ --disable-setuid --disable-cache-owner \ --with-browser=elinks --with-lzip=lzip \ --with-override-dir=overrides @@ -178,6 +178,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Mon Jan 07 2019 Nikola Forró - 2.8.4-3 +- prioritize POSIX man pages over perl manuals + resolves #1663919 + * Wed Nov 07 2018 Nikola Forró - 2.8.4-2 - get rid of hardcoded path From be65d01cced68a1d7f0a2ca24d6e1d6c65600476 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:53 +0100 Subject: [PATCH 27/83] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- man-db.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/man-db.spec b/man-db.spec index 04c0b93..e0198e1 100644 --- a/man-db.spec +++ b/man-db.spec @@ -8,7 +8,6 @@ Release: 3%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ -Group: System Environment/Base URL: http://www.nongnu.org/man-db/ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz @@ -42,7 +41,6 @@ manual pages. %package cron Summary: Periodic update of man-db cache -Group: System Environment/Base Requires: %{name} = %{version}-%{release} Requires: crontabs From 9cf7b03d3461d72137da2fd33968f4bbd5948d24 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 09:34:32 +0000 Subject: [PATCH 28/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index e0198e1..4f1981c 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.8.4 -Release: 3%{?dist} +Release: 4%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -176,6 +176,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.8.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 07 2019 Nikola Forró - 2.8.4-3 - prioritize POSIX man pages over perl manuals resolves #1663919 From 95ce280022b2b5900f31b37108a0764177a506ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 15:48:04 +0000 Subject: [PATCH 29/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 4f1981c..9d2840b 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.8.4 -Release: 4%{?dist} +Release: 5%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -176,6 +176,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.8.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 2.8.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 2d0db51d7d0d2d1636181049a423a9f9af1f80f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Wed, 28 Aug 2019 10:58:50 +0200 Subject: [PATCH 30/83] update to 2.8.6.1 - resolves #1742475 --- .gitignore | 1 + ...db-2.8.6.1-fix-override-dir-handling.patch | 119 +++++++++++------- man-db.spec | 12 +- sources | 2 +- 4 files changed, 83 insertions(+), 51 deletions(-) rename man-db-2.7.6.1-fix-override-dir-handling.patch => man-db-2.8.6.1-fix-override-dir-handling.patch (53%) diff --git a/.gitignore b/.gitignore index c5c2e58..435cbd6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /man-db-2.7.6.1.tar.xz /man-db-2.8.3.tar.xz /man-db-2.8.4.tar.xz +/man-db-2.8.6.1.tar.xz diff --git a/man-db-2.7.6.1-fix-override-dir-handling.patch b/man-db-2.8.6.1-fix-override-dir-handling.patch similarity index 53% rename from man-db-2.7.6.1-fix-override-dir-handling.patch rename to man-db-2.8.6.1-fix-override-dir-handling.patch index 89461d0..8f9da27 100644 --- a/man-db-2.7.6.1-fix-override-dir-handling.patch +++ b/man-db-2.8.6.1-fix-override-dir-handling.patch @@ -1,6 +1,6 @@ -From 84d6b3fab40be5e1ea288fb296df6cd8be06c985 Mon Sep 17 00:00:00 2001 +From 0aaea01eb448a2a66c1a00b156f19fac7d686b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= -Date: Thu, 19 Jan 2017 10:45:57 +0100 +Date: Tue, 27 Aug 2019 17:53:03 +0200 Subject: [PATCH] man(1): Fix override dir handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -21,15 +21,15 @@ is passed to ./configure. Reported-by: Nikola Forró Tested-by: Nikola Forró --- - src/man.c | 33 +++++++++++++++++++++++++++++++++ - src/manp.c | 52 +++++++++++++++++++++------------------------------- - 2 files changed, 54 insertions(+), 31 deletions(-) + src/man.c | 33 ++++++++++++++++++++++++++++++++ + src/manp.c | 55 +++++++++++++++++++++--------------------------------- + 2 files changed, 54 insertions(+), 34 deletions(-) diff --git a/src/man.c b/src/man.c -index 15a568a..8b11f43 100644 +index 78c8968..197e5fb 100644 --- a/src/man.c +++ b/src/man.c -@@ -2665,6 +2665,32 @@ static int duplicate_candidates (struct candidate *left, +@@ -2685,6 +2685,32 @@ static bool duplicate_candidates (struct candidate *left, return ret; } @@ -62,7 +62,7 @@ index 15a568a..8b11f43 100644 static int compare_candidates (const struct candidate *left, const struct candidate *right) { -@@ -2749,6 +2775,13 @@ static int compare_candidates (const struct candidate *left, +@@ -2774,6 +2800,13 @@ static int compare_candidates (const struct candidate *left, if (cmp) return cmp; @@ -77,17 +77,18 @@ index 15a568a..8b11f43 100644 * page in the user's preferred language than a page from a better * section, but that attracted objections, so now we prefer to get diff --git a/src/manp.c b/src/manp.c -index 0d864f1..b78a50f 100644 +index 1dfecf3..13dd72a 100644 --- a/src/manp.c +++ b/src/manp.c -@@ -931,23 +931,6 @@ static char *def_path (int flag) +@@ -935,23 +935,6 @@ static char *def_path (enum config_flag flag) + return manpath; } - /* +-/* - * If specified with configure, append OVERRIDE_DIR to dir param and add it -- * to the lp list. +- * to list. - */ --static void insert_override_dir (char **lp, const char *dir) +-static void insert_override_dir (gl_list_t list, const char *dir) -{ - char *override_dir = NULL; - @@ -95,53 +96,77 @@ index 0d864f1..b78a50f 100644 - return; - - if ((override_dir = xasprintf ("%s/%s", dir, OVERRIDE_DIR))) { -- add_dir_to_list (lp, override_dir); +- add_dir_to_list (list, override_dir); - free (override_dir); - } -} - --/* + /* * For each directory in the user's path, see if it is one of the * directories listed in the man_db.config file. If so, and it is - * not already in the manpath, add it. If the directory is not listed -@@ -994,8 +977,6 @@ char *get_manpath_from_path (const char *path, int mandatory) - if (mandir_list) { - debug ("is in the config file\n"); - while (mandir_list) { -- insert_override_dir (tmplist, -- mandir_list->cont); - add_dir_to_list (tmplist, mandir_list->cont); - mandir_list = iterate_over_list - (mandir_list, p, MANPATH_MAP); -@@ -1014,7 +995,6 @@ char *get_manpath_from_path (const char *path, int mandatory) - "../share/man, or share/man " - "subdirectory\n"); +@@ -1000,7 +983,6 @@ char *get_manpath_from_path (const char *path, int mandatory) + if (!manpath_map_found) + debug ("is in the config file\n"); + manpath_map_found = true; +- insert_override_dir (tmplist, config_item->cont); + add_dir_to_list (tmplist, config_item->cont); + } GL_LIST_FOREACH_END (config); -- insert_override_dir (tmplist, t); - add_dir_to_list (tmplist, t); - free (t); - } else -@@ -1030,10 +1010,8 @@ char *get_manpath_from_path (const char *path, int mandatory) +@@ -1021,11 +1003,8 @@ char *get_manpath_from_path (const char *path, int mandatory) debug ("\nadding mandatory man directories\n\n"); - for (list = namestore; list; list = list->next) -- if (list->flag == MANDATORY) { -- insert_override_dir (tmplist, list->key); -+ if (list->flag == MANDATORY) - add_dir_to_list (tmplist, list->key); + GL_LIST_FOREACH_START (config, config_item) { +- if (config_item->flag == MANDATORY) { +- insert_override_dir (tmplist, +- config_item->key); ++ if (config_item->flag == MANDATORY) + add_dir_to_list (tmplist, config_item->key); - } + } GL_LIST_FOREACH_END (config); } - len = 0; -@@ -1201,18 +1179,30 @@ void create_pathlist (const char *manp, char **mp) +@@ -1113,7 +1092,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) + if (subdir) { + newpath = xasprintf ("%.*s/man", (int) (subdir - path), path); + if (is_directory (newpath) == 1) { +- insert_override_dir (list, newpath); + add_dir_to_list (list, newpath); + found = 1; + } +@@ -1122,7 +1100,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) + + newpath = xasprintf ("%s/man", path); + if (is_directory (newpath) == 1) { +- insert_override_dir (list, newpath); + add_dir_to_list (list, newpath); + found = 1; + } +@@ -1132,7 +1109,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) + newpath = xasprintf ("%.*s/share/man", + (int) (subdir - path), path); + if (is_directory (newpath) == 1) { +- insert_override_dir (list, newpath); + add_dir_to_list (list, newpath); + found = 1; + } +@@ -1141,7 +1117,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) + + newpath = xasprintf ("%s/share/man", path); + if (is_directory (newpath) == 1) { +- insert_override_dir (list, newpath); + add_dir_to_list (list, newpath); + found = 1; + } +@@ -1193,19 +1168,31 @@ gl_list_t create_pathlist (const char *manp) + gl_list_node_t node; const char *p, *end; - char **mphead = mp; - /* Expand the manpath into a list for easier handling. */ + /* Expand the manpath into a list for easier handling. + * For each entry, add corresponding OVERRIDE_DIR. + * */ + list = new_string_list (GL_LINKEDHASH_LIST, true); for (p = manp;; p = end + 1) { + char *element, *element_override; + ssize_t p_len; @@ -149,10 +174,10 @@ index 0d864f1..b78a50f 100644 end = strchr (p, ':'); - if (end) { - char *element = xstrndup (p, end - p); -- mp = add_dir_to_path_list (mphead, mp, element); +- add_dir_to_path_list (list, element); - free (element); - } else { -- mp = add_dir_to_path_list (mphead, mp, p); +- add_dir_to_path_list (list, p); - break; + p_len = end ? end - p : (ssize_t)strlen(p); + @@ -160,18 +185,18 @@ index 0d864f1..b78a50f 100644 + + if (strlen(OVERRIDE_DIR)) { + element_override = xasprintf("%s/%s", element, OVERRIDE_DIR); -+ mp = add_dir_to_path_list (mphead, mp, element_override); ++ add_dir_to_path_list (list, element_override); + free (element_override); } + -+ mp = add_dir_to_path_list (mphead, mp, element); ++ add_dir_to_path_list (list, element); + free (element); + + if (!end) + break; } - *mp = NULL; + /* Eliminate duplicates due to symlinks. */ -- -2.7.4 +2.21.0 diff --git a/man-db.spec b/man-db.spec index 9d2840b..9f8d2f5 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,8 +3,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.8.4 -Release: 5%{?dist} +Version: 2.8.6.1 +Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -17,7 +17,7 @@ Source3: man-db-cache-update.service Patch0: man-db-2.8.3-change-owner-of-man-cache.patch # http://lists.nongnu.org/archive/html/man-db-devel/2017-01/msg00013.html -Patch1: man-db-2.7.6.1-fix-override-dir-handling.patch +Patch1: man-db-2.8.6.1-fix-override-dir-handling.patch Obsoletes: man < 2.0 Provides: man = %{version} @@ -57,6 +57,7 @@ This package provides periodic update of man-db cache. %configure \ --with-sections="1 1p 8 2 3 3p 3pm 4 5 6 7 9 0p n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \ --disable-setuid --disable-cache-owner \ + --with-systemdsystemunitdir=no \ --with-browser=elinks --with-lzip=lzip \ --with-override-dir=overrides make CC="%{__cc} %{optflags}" %{?_smp_mflags} V=1 @@ -165,6 +166,7 @@ fi %lang(ja) %{_datadir}/man/ja/man*/* %lang(nl) %{_datadir}/man/nl/man*/* %lang(pl) %{_datadir}/man/pl/man*/* +%lang(pt) %{_datadir}/man/pt/man*/* %lang(pt_BR) %{_datadir}/man/pt_BR/man*/* %lang(ru) %{_datadir}/man/ru/man*/* %lang(sr) %{_datadir}/man/sr/man*/* @@ -176,6 +178,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Aug 27 2019 Nikola Forró - 2.8.6.1-1 +- update to 2.8.6.1 + resolves #1742475 + * Thu Jul 25 2019 Fedora Release Engineering - 2.8.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 8c4f59e..09d35a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.8.4.tar.xz) = 3cc160a5a8a0a4e918f6f6546582d1e5fe9851a13c5bd8dc94e3fcbf4ec28cb3cd1524b1ae30722931c84981fa8ca9ac64c9c4d9544c2d0bea80ac9f39cb5e66 +SHA512 (man-db-2.8.6.1.tar.xz) = 0c43cdddf2e07cd4a2225e098ea4cbfb2842a9bbf08bfb073058be0d66efac3a77ca0f8725564677c8f61e671f471c76f1dbba77a7601d7a63bb81350ef51bb5 From 9c0f8d2201fc8fb88410d1b8153ebb22c693f761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Fri, 30 Aug 2019 11:45:26 +0200 Subject: [PATCH 31/83] update to 2.8.7 - resolves #1747042 --- .gitignore | 1 + ...tch => man-db-2.8.7-fix-override-dir-handling.patch | 10 +++++----- man-db.spec | 8 ++++++-- sources | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) rename man-db-2.8.6.1-fix-override-dir-handling.patch => man-db-2.8.7-fix-override-dir-handling.patch (95%) diff --git a/.gitignore b/.gitignore index 435cbd6..5d67279 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /man-db-2.8.3.tar.xz /man-db-2.8.4.tar.xz /man-db-2.8.6.1.tar.xz +/man-db-2.8.7.tar.xz diff --git a/man-db-2.8.6.1-fix-override-dir-handling.patch b/man-db-2.8.7-fix-override-dir-handling.patch similarity index 95% rename from man-db-2.8.6.1-fix-override-dir-handling.patch rename to man-db-2.8.7-fix-override-dir-handling.patch index 8f9da27..fe10e50 100644 --- a/man-db-2.8.6.1-fix-override-dir-handling.patch +++ b/man-db-2.8.7-fix-override-dir-handling.patch @@ -1,4 +1,4 @@ -From 0aaea01eb448a2a66c1a00b156f19fac7d686b04 Mon Sep 17 00:00:00 2001 +From 50e4ba5f8848a422cf82c5b79ab0e32c8bfa10eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 27 Aug 2019 17:53:03 +0200 Subject: [PATCH] man(1): Fix override dir handling @@ -26,10 +26,10 @@ Tested-by: Nikola Forró 2 files changed, 54 insertions(+), 34 deletions(-) diff --git a/src/man.c b/src/man.c -index 78c8968..197e5fb 100644 +index 207e6f6..9b3d038 100644 --- a/src/man.c +++ b/src/man.c -@@ -2685,6 +2685,32 @@ static bool duplicate_candidates (struct candidate *left, +@@ -2688,6 +2688,32 @@ static bool duplicate_candidates (struct candidate *left, return ret; } @@ -62,7 +62,7 @@ index 78c8968..197e5fb 100644 static int compare_candidates (const struct candidate *left, const struct candidate *right) { -@@ -2774,6 +2800,13 @@ static int compare_candidates (const struct candidate *left, +@@ -2777,6 +2803,13 @@ static int compare_candidates (const struct candidate *left, if (cmp) return cmp; @@ -77,7 +77,7 @@ index 78c8968..197e5fb 100644 * page in the user's preferred language than a page from a better * section, but that attracted objections, so now we prefer to get diff --git a/src/manp.c b/src/manp.c -index 1dfecf3..13dd72a 100644 +index 588f47c..db34c15 100644 --- a/src/manp.c +++ b/src/manp.c @@ -935,23 +935,6 @@ static char *def_path (enum config_flag flag) diff --git a/man-db.spec b/man-db.spec index 9f8d2f5..33645e9 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.8.6.1 +Version: 2.8.7 Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib @@ -17,7 +17,7 @@ Source3: man-db-cache-update.service Patch0: man-db-2.8.3-change-owner-of-man-cache.patch # http://lists.nongnu.org/archive/html/man-db-devel/2017-01/msg00013.html -Patch1: man-db-2.8.6.1-fix-override-dir-handling.patch +Patch1: man-db-2.8.7-fix-override-dir-handling.patch Obsoletes: man < 2.0 Provides: man = %{version} @@ -178,6 +178,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Aug 30 2019 Nikola Forró - 2.8.7-1 +- update to 2.8.7 + resolves #1747042 + * Tue Aug 27 2019 Nikola Forró - 2.8.6.1-1 - update to 2.8.6.1 resolves #1742475 diff --git a/sources b/sources index 09d35a3..a94390f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.8.6.1.tar.xz) = 0c43cdddf2e07cd4a2225e098ea4cbfb2842a9bbf08bfb073058be0d66efac3a77ca0f8725564677c8f61e671f471c76f1dbba77a7601d7a63bb81350ef51bb5 +SHA512 (man-db-2.8.7.tar.xz) = 9f9d6f3b776c0b35f95c179fb668f2dc3db3d3e63a162cfda98c5d126fe147f2418e1a1503037ebe28314f57d9b6f48b7f7674d611df14424973a866a61ff2d9 From 75b683fe495e761059857c797159610881208ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Fri, 27 Sep 2019 13:06:44 +0200 Subject: [PATCH 32/83] schedule interrupted cache update for the next boot, instead of blocking system reboot/shutdown - resolves #1678464 --- man-db-cache-update.service | 5 +---- man-db-restart-cache-update.service | 11 +++++++++++ man-db.spec | 12 ++++++++++-- 3 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 man-db-restart-cache-update.service diff --git a/man-db-cache-update.service b/man-db-cache-update.service index dc218af..fdf08d7 100644 --- a/man-db-cache-update.service +++ b/man-db-cache-update.service @@ -1,14 +1,11 @@ [Unit] -DefaultDependencies=no After=local-fs.target -Before=reboot.target shutdown.target halt.target -JobTimeoutSec=15min [Service] Type=oneshot -TimeoutStartSec=infinity Environment=MAN_NO_LOCALE_WARNING=1 EnvironmentFile=/etc/sysconfig/man-db ExecStart=/bin/sh -c '[ "$SERVICE" != "no" ] && /usr/bin/mandb $OPTS || true' +ExecStopPost=/bin/sh -c '[ "$SERVICE_RESULT" == "signal" ] && /usr/bin/systemctl enable man-db-restart-cache-update.service || true' Nice=19 IOWeight=20 diff --git a/man-db-restart-cache-update.service b/man-db-restart-cache-update.service new file mode 100644 index 0000000..1d0d6ef --- /dev/null +++ b/man-db-restart-cache-update.service @@ -0,0 +1,11 @@ +[Unit] +Before=multi-user.target + +[Service] +Type=oneshot +ExecStartPre=/usr/bin/rm -rf /var/cache/man/* +ExecStart=/usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update.service +ExecStartPost=/usr/bin/systemctl disable man-db-restart-cache-update.service + +[Install] +WantedBy=multi-user.target diff --git a/man-db.spec b/man-db.spec index 33645e9..406f805 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.8.7 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -14,6 +14,7 @@ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.ta Source1: man-db.crondaily Source2: man-db.sysconfig Source3: man-db-cache-update.service +Source4: man-db-restart-cache-update.service Patch0: man-db-2.8.3-change-owner-of-man-cache.patch # http://lists.nongnu.org/archive/html/man-db-devel/2017-01/msg00013.html @@ -91,8 +92,9 @@ install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/man-db # config for tmpfiles.d install -D -p -m 0644 init/systemd/man-db.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/. -# man-db-cache-update.service +# man-db-cache-update.service and man-db-restart-cache-update.service install -D -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/man-db-cache-update.service +install -D -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/man-db-restart-cache-update.service %find_lang %{name} %find_lang %{name}-gnulib @@ -131,6 +133,7 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/man-db %config(noreplace) %{_tmpfilesdir}/man-db.conf %{_unitdir}/man-db-cache-update.service +%{_unitdir}/man-db-restart-cache-update.service %{_sbindir}/accessdb %{_bindir}/man %{_bindir}/whatis @@ -178,6 +181,11 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Sep 27 2019 Nikola Forró - 2.8.7-2 +- schedule interrupted cache update for the next boot, instead of blocking + system reboot/shutdown + resolves #1678464 + * Fri Aug 30 2019 Nikola Forró - 2.8.7-1 - update to 2.8.7 resolves #1747042 From da858b86c2381db913750abf8b480d0e91cee2ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Thu, 9 Jan 2020 17:12:11 +0100 Subject: [PATCH 33/83] update to 2.9.0 - resolves #1764582 --- .gitignore | 1 + man-db-2.8.7-fix-override-dir-handling.patch | 68 +++++++++++--------- man-db.spec | 10 ++- sources | 2 +- 4 files changed, 46 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 5d67279..c69f367 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /man-db-2.8.4.tar.xz /man-db-2.8.6.1.tar.xz /man-db-2.8.7.tar.xz +/man-db-2.9.0.tar.xz diff --git a/man-db-2.8.7-fix-override-dir-handling.patch b/man-db-2.8.7-fix-override-dir-handling.patch index fe10e50..34d8ebf 100644 --- a/man-db-2.8.7-fix-override-dir-handling.patch +++ b/man-db-2.8.7-fix-override-dir-handling.patch @@ -1,4 +1,4 @@ -From 50e4ba5f8848a422cf82c5b79ab0e32c8bfa10eb Mon Sep 17 00:00:00 2001 +From 490ef9d4ea308491f56c4c51712126127b2de004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 27 Aug 2019 17:53:03 +0200 Subject: [PATCH] man(1): Fix override dir handling @@ -26,10 +26,10 @@ Tested-by: Nikola Forró 2 files changed, 54 insertions(+), 34 deletions(-) diff --git a/src/man.c b/src/man.c -index 207e6f6..9b3d038 100644 +index 24651d1..d5dc8e3 100644 --- a/src/man.c +++ b/src/man.c -@@ -2688,6 +2688,32 @@ static bool duplicate_candidates (struct candidate *left, +@@ -2684,6 +2684,32 @@ static bool duplicate_candidates (struct candidate *left, return ret; } @@ -62,7 +62,7 @@ index 207e6f6..9b3d038 100644 static int compare_candidates (const struct candidate *left, const struct candidate *right) { -@@ -2777,6 +2803,13 @@ static int compare_candidates (const struct candidate *left, +@@ -2773,6 +2799,13 @@ static int compare_candidates (const struct candidate *left, if (cmp) return cmp; @@ -77,10 +77,10 @@ index 207e6f6..9b3d038 100644 * page in the user's preferred language than a page from a better * section, but that attracted objections, so now we prefer to get diff --git a/src/manp.c b/src/manp.c -index 588f47c..db34c15 100644 +index 5441339..c4a25fd 100644 --- a/src/manp.c +++ b/src/manp.c -@@ -935,23 +935,6 @@ static char *def_path (enum config_flag flag) +@@ -903,23 +903,6 @@ static char *def_path (enum config_flag flag) return manpath; } @@ -104,7 +104,7 @@ index 588f47c..db34c15 100644 /* * For each directory in the user's path, see if it is one of the * directories listed in the man_db.config file. If so, and it is -@@ -1000,7 +983,6 @@ char *get_manpath_from_path (const char *path, int mandatory) +@@ -968,7 +951,6 @@ char *get_manpath_from_path (const char *path, int mandatory) if (!manpath_map_found) debug ("is in the config file\n"); manpath_map_found = true; @@ -112,8 +112,8 @@ index 588f47c..db34c15 100644 add_dir_to_list (tmplist, config_item->cont); } GL_LIST_FOREACH_END (config); -@@ -1021,11 +1003,8 @@ char *get_manpath_from_path (const char *path, int mandatory) - debug ("\nadding mandatory man directories\n\n"); +@@ -989,11 +971,8 @@ char *get_manpath_from_path (const char *path, int mandatory) + debug ("adding mandatory man directories\n"); GL_LIST_FOREACH_START (config, config_item) { - if (config_item->flag == MANDATORY) { @@ -125,48 +125,52 @@ index 588f47c..db34c15 100644 } GL_LIST_FOREACH_END (config); } -@@ -1113,7 +1092,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) +@@ -1078,7 +1057,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) if (subdir) { newpath = xasprintf ("%.*s/man", (int) (subdir - path), path); if (is_directory (newpath) == 1) { - insert_override_dir (list, newpath); add_dir_to_list (list, newpath); - found = 1; } -@@ -1122,7 +1100,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) + free (newpath); +@@ -1086,7 +1064,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) newpath = xasprintf ("%s/man", path); if (is_directory (newpath) == 1) { - insert_override_dir (list, newpath); add_dir_to_list (list, newpath); - found = 1; } -@@ -1132,7 +1109,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) + free (newpath); +@@ -1095,7 +1072,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) newpath = xasprintf ("%.*s/share/man", (int) (subdir - path), path); if (is_directory (newpath) == 1) { - insert_override_dir (list, newpath); add_dir_to_list (list, newpath); - found = 1; } -@@ -1141,7 +1117,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) + free (newpath); +@@ -1103,7 +1079,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) newpath = xasprintf ("%s/share/man", path); if (is_directory (newpath) == 1) { - insert_override_dir (list, newpath); add_dir_to_list (list, newpath); - found = 1; } -@@ -1193,19 +1168,31 @@ gl_list_t create_pathlist (const char *manp) - gl_list_node_t node; - const char *p, *end; + free (newpath); +@@ -1199,7 +1174,9 @@ gl_list_t create_pathlist (const char *manp) + const struct canonicalized_path *cp; -- /* Expand the manpath into a list for easier handling. */ -+ /* Expand the manpath into a list for easier handling. -+ * For each entry, add corresponding OVERRIDE_DIR. -+ * */ - - list = new_string_list (GL_LINKEDHASH_LIST, true); + /* Expand the manpath into a list of (path, canonicalized path) +- * pairs for easier handling. add_dir_to_path_list only adds items ++ * pairs for easier handling. For each entry, add corresponding ++ * OVERRIDE_DIR. ++ * add_dir_to_path_list only adds items + * if they do not have the same canonicalized path as an existing + * item, thereby eliminating duplicates due to symlinks. + */ +@@ -1208,15 +1185,25 @@ gl_list_t create_pathlist (const char *manp) + (GL_LINKEDHASH_LIST, canonicalized_path_equals, + canonicalized_path_hash, canonicalized_path_free, false); for (p = manp;; p = end + 1) { + char *element, *element_override; + ssize_t p_len; @@ -174,10 +178,10 @@ index 588f47c..db34c15 100644 end = strchr (p, ':'); - if (end) { - char *element = xstrndup (p, end - p); -- add_dir_to_path_list (list, element); +- add_dir_to_path_list (canonicalized_list, element); - free (element); - } else { -- add_dir_to_path_list (list, p); +- add_dir_to_path_list (canonicalized_list, p); - break; + p_len = end ? end - p : (ssize_t)strlen(p); + @@ -185,18 +189,18 @@ index 588f47c..db34c15 100644 + + if (strlen(OVERRIDE_DIR)) { + element_override = xasprintf("%s/%s", element, OVERRIDE_DIR); -+ add_dir_to_path_list (list, element_override); ++ add_dir_to_path_list (canonicalized_list, element_override); + free (element_override); } + -+ add_dir_to_path_list (list, element); ++ add_dir_to_path_list (canonicalized_list, element); + free (element); + + if (!end) + break; } - /* Eliminate duplicates due to symlinks. */ + list = new_string_list (GL_ARRAY_LIST, false); -- -2.21.0 +2.21.1 diff --git a/man-db.spec b/man-db.spec index 406f805..9f28f8a 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,8 +3,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.8.7 -Release: 2%{?dist} +Version: 2.9.0 +Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -136,6 +136,7 @@ fi %{_unitdir}/man-db-restart-cache-update.service %{_sbindir}/accessdb %{_bindir}/man +%{_bindir}/man-recode %{_bindir}/whatis %{_bindir}/apropos %{_bindir}/manpath @@ -153,6 +154,7 @@ fi %{_mandir}/man1/apropos.1* %{_mandir}/man1/lexgrog.1* %{_mandir}/man1/man.1* +%{_mandir}/man1/man-recode.1* %{_mandir}/man1/manconv.1* %{_mandir}/man1/manpath.1* %{_mandir}/man1/whatis.1* @@ -181,6 +183,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Thu Jan 09 2020 Nikola Forró - 2.9.0-1 +- update to 2.9.0 + resolves #1764582 + * Fri Sep 27 2019 Nikola Forró - 2.8.7-2 - schedule interrupted cache update for the next boot, instead of blocking system reboot/shutdown diff --git a/sources b/sources index a94390f..d868db3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.8.7.tar.xz) = 9f9d6f3b776c0b35f95c179fb668f2dc3db3d3e63a162cfda98c5d126fe147f2418e1a1503037ebe28314f57d9b6f48b7f7674d611df14424973a866a61ff2d9 +SHA512 (man-db-2.9.0.tar.xz) = 7deb4421c7944276c6edf974b1336ee2f6605ee470c98d374544e2fcaa32ec2afe077c5fd020fc1f74df058384a293b8ad5a92d86b1c15a949573af46ba09cda From 4030d1bbcbb155f1130aed92f828a386d8e6f6d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 11:57:46 +0000 Subject: [PATCH 34/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 9f28f8a..116a007 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.0 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -183,6 +183,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jan 09 2020 Nikola Forró - 2.9.0-1 - update to 2.9.0 resolves #1764582 From 847869c6b7a39507550aae2b1a790ba21adb64d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Wed, 26 Feb 2020 14:27:50 +0100 Subject: [PATCH 35/83] update to 2.9.1 - resolves #1807144 --- .gitignore | 1 + man-db-2.9.1-snap.patch | 13 +++++++++++++ man-db.spec | 12 ++++++++++-- sources | 2 +- 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 man-db-2.9.1-snap.patch diff --git a/.gitignore b/.gitignore index c69f367..7834e3f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /man-db-2.8.6.1.tar.xz /man-db-2.8.7.tar.xz /man-db-2.9.0.tar.xz +/man-db-2.9.1.tar.xz diff --git a/man-db-2.9.1-snap.patch b/man-db-2.9.1-snap.patch new file mode 100644 index 0000000..bb6f759 --- /dev/null +++ b/man-db-2.9.1-snap.patch @@ -0,0 +1,13 @@ +diff --git a/src/man_db.conf.in b/src/man_db.conf.in +index 2942000..6365ca0 100644 +--- a/src/man_db.conf.in ++++ b/src/man_db.conf.in +@@ -69,7 +69,7 @@ MANDB_MAP /usr/local/man /var/cache/man/oldlocal + MANDB_MAP /usr/local/share/man /var/cache/man/local + MANDB_MAP /usr/X11R6/man /var/cache/man/X11R6 + MANDB_MAP /opt/man /var/cache/man/opt +-MANDB_MAP /snap/man /var/cache/man/snap ++MANDB_MAP /var/lib/snapd/snap/man /var/cache/man/snap + # + #--------------------------------------------------------- + # Program definitions. These are commented out by default as the value diff --git a/man-db.spec b/man-db.spec index 116a007..aa03d6d 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,8 +3,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.9.0 -Release: 2%{?dist} +Version: 2.9.1 +Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -20,6 +20,10 @@ Patch0: man-db-2.8.3-change-owner-of-man-cache.patch # http://lists.nongnu.org/archive/html/man-db-devel/2017-01/msg00013.html Patch1: man-db-2.8.7-fix-override-dir-handling.patch +# change snap system directory from /snap to /var/lib/snapd/snap +# https://lists.gnu.org/archive/html/man-db-devel/2020-02/msg00000.html +Patch2: man-db-2.9.1-snap.patch + Obsoletes: man < 2.0 Provides: man = %{version} Provides: man-pages-reader = %{version} @@ -183,6 +187,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Wed Feb 26 2020 Nikola Forró - 2.9.1-1 +- update to 2.9.1 + resolves #1807144 + * Wed Jan 29 2020 Fedora Release Engineering - 2.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index d868db3..77df03b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.9.0.tar.xz) = 7deb4421c7944276c6edf974b1336ee2f6605ee470c98d374544e2fcaa32ec2afe077c5fd020fc1f74df058384a293b8ad5a92d86b1c15a949573af46ba09cda +SHA512 (man-db-2.9.1.tar.xz) = ae2d1e9f293795c63f5a9a1a765478a9a59cbe5fe6f759647be5057c1ae53f90baee8d5467921f3d0102300f2111a5026eeb25f78401bcb16ce45ad790634977 From 1139b5a35a40b8422bdec63bcbc97ffac82290a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 25 Feb 2020 14:30:09 +0100 Subject: [PATCH 36/83] use alternatives for man, apropos and whatis --- man-db.spec | 83 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 21 deletions(-) diff --git a/man-db.spec b/man-db.spec index aa03d6d..22b2114 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.1 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -36,6 +36,10 @@ BuildRequires: systemd BuildRequires: gdbm-devel, gettext, groff, less, libpipeline-devel, zlib-devel BuildRequires: po4a, perl-interpreter, perl-version +Requires(post): %{_sbindir}/update-alternatives +Requires(postun): %{_sbindir}/update-alternatives +Requires(preun): %{_sbindir}/update-alternatives + %description The man-db package includes five tools for browsing man-pages: man, whatis, apropos, manpath and lexgrog. man formats and displays @@ -73,6 +77,14 @@ make check %install make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} INSTALL='install -p' +# rename files for alternative usage +for f in man apropos whatis; do + mv %{buildroot}%{_bindir}/$f %{buildroot}%{_bindir}/$f.%{name} + touch %{buildroot}%{_bindir}/$f + mv %{buildroot}%{_mandir}/man1/$f.1 %{buildroot}%{_mandir}/man1/$f.%{name}.1 + touch %{buildroot}%{_mandir}/man1/$f.1 +done + # move the documentation to the relevant place mv $RPM_BUILD_ROOT%{_datadir}/doc/man-db/* ./ @@ -103,31 +115,51 @@ install -D -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/man-db-restart-cache %find_lang %{name} %find_lang %{name}-gnulib -# stop and disable timer from previous builds %pre +# stop and disable timer from previous builds if [ -e /usr/lib/systemd/system/mandb.timer ]; then - if test -d /run/systemd; then - systemctl stop man-db.timer - systemctl -q disable man-db.timer - fi + if test -d /run/systemd; then + systemctl stop man-db.timer >/dev/null 2>&1 || : + systemctl -q disable man-db.timer >/dev/null 2>&1 || : + fi fi +%post +# set up the alternatives files +%{_sbindir}/update-alternatives --install %{_bindir}/man man %{_bindir}/man.%{name} 300 \ + --slave %{_bindir}/apropos apropos %{_bindir}/apropos.%{name} \ + --slave %{_bindir}/whatis whatis %{_bindir}/whatis.%{name} \ + --slave %{_mandir}/man1/man.1.gz man.1.gz %{_mandir}/man1/man.%{name}.1.gz \ + --slave %{_mandir}/man1/apropos.1.gz apropos.1.gz %{_mandir}/man1/apropos.%{name}.1.gz \ + --slave %{_mandir}/man1/whatis.1.gz whatis.1.gz %{_mandir}/man1/whatis.%{name}.1.gz \ + >/dev/null 2>&1 || : + # clear the old cache -%post -%{__rm} -rf %{cache}/* +%{__rm} -rf %{cache}/* >/dev/null 2>&1 || : + +%preun +if [ $1 -eq 0 ]; then + %{_sbindir}/update-alternatives --remove man %{_bindir}/man.%{name} >/dev/null 2>&1 || : +fi + +%postun +if [ $1 -ge 1 ]; then + if [ "$(+readlink %{_sysconfdir}/alternatives/man+)" == "%{_bindir}/man.%{name}" ]; then + %{_sbindir}/update-alternatives --set man %{_bindir}/man.%{name} >/dev/null 2>&1 || : + fi +fi -# update cache %transfiletriggerin -- %{_mandir} -if [ -x /usr/bin/systemd-run -a -x /usr/bin/systemctl ]; then - /usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update >/dev/null 2>&1 || : -fi - # update cache -%transfiletriggerpostun -- %{_mandir} if [ -x /usr/bin/systemd-run -a -x /usr/bin/systemctl ]; then /usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update >/dev/null 2>&1 || : fi +%transfiletriggerpostun -- %{_mandir} +# update cache +if [ -x /usr/bin/systemd-run -a -x /usr/bin/systemctl ]; then + /usr/bin/systemd-run /usr/bin/systemctl start man-db-cache-update >/dev/null 2>&1 || : +fi %files -f %{name}.lang -f %{name}-gnulib.lang %{!?_licensedir:%global license %%doc} @@ -139,10 +171,13 @@ fi %{_unitdir}/man-db-cache-update.service %{_unitdir}/man-db-restart-cache-update.service %{_sbindir}/accessdb -%{_bindir}/man +%ghost %{_bindir}/man +%ghost %{_bindir}/apropos +%ghost %{_bindir}/whatis +%{_bindir}/man.%{name} +%{_bindir}/apropos.%{name} +%{_bindir}/whatis.%{name} %{_bindir}/man-recode -%{_bindir}/whatis -%{_bindir}/apropos %{_bindir}/manpath %{_bindir}/lexgrog %{_bindir}/catman @@ -155,13 +190,16 @@ fi %{_libexecdir}/man-db/zsoelim %verify(not mtime) %dir %{cache} # documentation and translation -%{_mandir}/man1/apropos.1* -%{_mandir}/man1/lexgrog.1* -%{_mandir}/man1/man.1* +%ghost %{_mandir}/man1/man.1* +%ghost %{_mandir}/man1/apropos.1* +%ghost %{_mandir}/man1/whatis.1* +%{_mandir}/man1/man.%{name}.1* +%{_mandir}/man1/apropos.%{name}.1* +%{_mandir}/man1/whatis.%{name}.1* %{_mandir}/man1/man-recode.1* +%{_mandir}/man1/lexgrog.1* %{_mandir}/man1/manconv.1* %{_mandir}/man1/manpath.1* -%{_mandir}/man1/whatis.1* %{_mandir}/man5/manpath.5* %{_mandir}/man8/accessdb.8* %{_mandir}/man8/catman.8* @@ -187,6 +225,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Wed Feb 26 2020 Nikola Forró - 2.9.1-2 +- use alternatives for man, apropos and whatis + * Wed Feb 26 2020 Nikola Forró - 2.9.1-1 - update to 2.9.1 resolves #1807144 From d0e8342d4a9af3210d60fa77fed646a9aee396c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Wed, 26 Feb 2020 17:13:25 +0100 Subject: [PATCH 37/83] fix %postun scriptlet --- man-db.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/man-db.spec b/man-db.spec index 22b2114..8e3a6cc 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.1 -Release: 2%{?dist} +Release: 3%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -144,7 +144,7 @@ fi %postun if [ $1 -ge 1 ]; then - if [ "$(+readlink %{_sysconfdir}/alternatives/man+)" == "%{_bindir}/man.%{name}" ]; then + if [ "$(readlink %{_sysconfdir}/alternatives/man)" == "%{_bindir}/man.%{name}" ]; then %{_sbindir}/update-alternatives --set man %{_bindir}/man.%{name} >/dev/null 2>&1 || : fi fi @@ -225,6 +225,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Wed Feb 26 2020 Nikola Forró - 2.9.1-3 +- fix %postun scriptlet + * Wed Feb 26 2020 Nikola Forró - 2.9.1-2 - use alternatives for man, apropos and whatis From ac2b993995956b3de2a8de5ac27871ba2dba1718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Fri, 28 Feb 2020 17:22:30 +0100 Subject: [PATCH 38/83] fix upgrades from non-alternativized versions --- man-db.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 8e3a6cc..d565f6a 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.1 -Release: 3%{?dist} +Release: 4%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -116,6 +116,9 @@ install -D -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/man-db-restart-cache %find_lang %{name}-gnulib %pre +# /usr/bin/man is now alternativized, so if it is not a symlink, remove it +[ -L %{_bindir}/man ] || rm -f %{_bindir}/man + # stop and disable timer from previous builds if [ -e /usr/lib/systemd/system/mandb.timer ]; then if test -d /run/systemd; then @@ -225,6 +228,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Feb 28 2020 Nikola Forró - 2.9.1-4 +- fix upgrades from non-alternativized versions + * Wed Feb 26 2020 Nikola Forró - 2.9.1-3 - fix %postun scriptlet From 902d5866bb493e0a076d04ceef67a280479abfa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Fri, 28 Feb 2020 18:05:54 +0100 Subject: [PATCH 39/83] fix upgrades from non-alternativized versions properly --- man-db.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/man-db.spec b/man-db.spec index d565f6a..0502cf2 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.1 -Release: 4%{?dist} +Release: 5%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -116,8 +116,11 @@ install -D -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/man-db-restart-cache %find_lang %{name}-gnulib %pre -# /usr/bin/man is now alternativized, so if it is not a symlink, remove it -[ -L %{_bindir}/man ] || rm -f %{_bindir}/man +# remove alternativized files if they are not symlinks +for f in man apropos whatis; do + [ -L %{_bindir}/$f ] || rm -f %{_bindir}/$f + [ -L %{_mandir}/man1/$f.1.gz ] || rm -f %{_mandir}/man1/$f.1.gz +done # stop and disable timer from previous builds if [ -e /usr/lib/systemd/system/mandb.timer ]; then @@ -228,6 +231,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Feb 28 2020 Nikola Forró - 2.9.1-5 +- fix upgrades from non-alternativized versions properly + * Fri Feb 28 2020 Nikola Forró - 2.9.1-4 - fix upgrades from non-alternativized versions From ac2b9872d50eab1f1abeecca966ce70718bec9b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Sun, 1 Mar 2020 23:14:55 +0100 Subject: [PATCH 40/83] fix %pre scriptlet --- man-db.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/man-db.spec b/man-db.spec index 0502cf2..15217c7 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.1 -Release: 5%{?dist} +Release: 6%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -118,8 +118,8 @@ install -D -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/man-db-restart-cache %pre # remove alternativized files if they are not symlinks for f in man apropos whatis; do - [ -L %{_bindir}/$f ] || rm -f %{_bindir}/$f - [ -L %{_mandir}/man1/$f.1.gz ] || rm -f %{_mandir}/man1/$f.1.gz + [ -L %{_bindir}/$f ] || %{__rm} -f %{_bindir}/$f >/dev/null 2>&1 || : + [ -L %{_mandir}/man1/$f.1.gz ] || %{__rm} -f %{_mandir}/man1/$f.1.gz >/dev/null 2>&1 || : done # stop and disable timer from previous builds @@ -231,6 +231,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Sun Mar 01 2020 Nikola Forró - 2.9.1-6 +- fix %pre scriptlet + * Fri Feb 28 2020 Nikola Forró - 2.9.1-5 - fix upgrades from non-alternativized versions properly From b86d63d2bef6ee8e4978dae097028a12b248073b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 2 Jun 2020 10:05:18 +0200 Subject: [PATCH 41/83] update to 2.9.2 - resolves #1842624 --- .gitignore | 1 + man-db-2.8.7-fix-override-dir-handling.patch | 12 ++++++------ man-db.spec | 8 ++++++-- sources | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 7834e3f..f6f1467 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /man-db-2.8.7.tar.xz /man-db-2.9.0.tar.xz /man-db-2.9.1.tar.xz +/man-db-2.9.2.tar.xz diff --git a/man-db-2.8.7-fix-override-dir-handling.patch b/man-db-2.8.7-fix-override-dir-handling.patch index 34d8ebf..4857c30 100644 --- a/man-db-2.8.7-fix-override-dir-handling.patch +++ b/man-db-2.8.7-fix-override-dir-handling.patch @@ -1,4 +1,4 @@ -From 490ef9d4ea308491f56c4c51712126127b2de004 Mon Sep 17 00:00:00 2001 +From c73e7dd16b7915ac9c67a376e014ea1220095348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 27 Aug 2019 17:53:03 +0200 Subject: [PATCH] man(1): Fix override dir handling @@ -26,10 +26,10 @@ Tested-by: Nikola Forró 2 files changed, 54 insertions(+), 34 deletions(-) diff --git a/src/man.c b/src/man.c -index 24651d1..d5dc8e3 100644 +index 6d1cba7..b3d13d1 100644 --- a/src/man.c +++ b/src/man.c -@@ -2684,6 +2684,32 @@ static bool duplicate_candidates (struct candidate *left, +@@ -2712,6 +2712,32 @@ static bool duplicate_candidates (struct candidate *left, return ret; } @@ -62,7 +62,7 @@ index 24651d1..d5dc8e3 100644 static int compare_candidates (const struct candidate *left, const struct candidate *right) { -@@ -2773,6 +2799,13 @@ static int compare_candidates (const struct candidate *left, +@@ -2801,6 +2827,13 @@ static int compare_candidates (const struct candidate *left, if (cmp) return cmp; @@ -77,7 +77,7 @@ index 24651d1..d5dc8e3 100644 * page in the user's preferred language than a page from a better * section, but that attracted objections, so now we prefer to get diff --git a/src/manp.c b/src/manp.c -index 5441339..c4a25fd 100644 +index 5441339..e437183 100644 --- a/src/manp.c +++ b/src/manp.c @@ -903,23 +903,6 @@ static char *def_path (enum config_flag flag) @@ -202,5 +202,5 @@ index 5441339..c4a25fd 100644 list = new_string_list (GL_ARRAY_LIST, false); -- -2.21.1 +2.26.2 diff --git a/man-db.spec b/man-db.spec index 15217c7..11caf66 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,8 +3,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.9.1 -Release: 6%{?dist} +Version: 2.9.2 +Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -231,6 +231,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Jun 02 2020 Nikola Forró - 2.9.2-1 +- update to 2.9.2 + resolves #1842624 + * Sun Mar 01 2020 Nikola Forró - 2.9.1-6 - fix %pre scriptlet diff --git a/sources b/sources index 77df03b..16bbef9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.9.1.tar.xz) = ae2d1e9f293795c63f5a9a1a765478a9a59cbe5fe6f759647be5057c1ae53f90baee8d5467921f3d0102300f2111a5026eeb25f78401bcb16ce45ad790634977 +SHA512 (man-db-2.9.2.tar.xz) = 47b63c074cf61c15f82230cc35a0062ab6ded8c3229475c6667a47ca518346d0555616c5b07bb01515b31bd80cbdc9870cd05ffff35097d013252401c6927002 From 0da6444c5ab0b9eff9320b233cbb487a425540b6 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 13 Jul 2020 22:55:25 +0000 Subject: [PATCH 42/83] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- man-db.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/man-db.spec b/man-db.spec index 11caf66..206f8fd 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.2 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -69,13 +69,13 @@ This package provides periodic update of man-db cache. --with-systemdsystemunitdir=no \ --with-browser=elinks --with-lzip=lzip \ --with-override-dir=overrides -make CC="%{__cc} %{optflags}" %{?_smp_mflags} V=1 +%make_build CC="%{__cc} %{optflags}" %check make check %install -make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} INSTALL='install -p' +%make_install prefix=%{_prefix} # rename files for alternative usage for f in man apropos whatis; do @@ -231,6 +231,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Mon Jul 13 2020 Tom Stellard - 2.9.2-2 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Tue Jun 02 2020 Nikola Forró - 2.9.2-1 - update to 2.9.2 resolves #1842624 From e5e25696ba200c0e9a4bec076e4b1f1397c0381a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 06:48:36 +0000 Subject: [PATCH 43/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 206f8fd..808a2a4 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.2 -Release: 2%{?dist} +Release: 3%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -231,6 +231,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 13 2020 Tom Stellard - 2.9.2-2 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From 0bd79418972a85b346f9c920736a76a6e39048ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 28 Jul 2020 12:24:45 +0200 Subject: [PATCH 44/83] disable LTO to avoid linker bug --- man-db.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 808a2a4..ae3f7ed 100644 --- a/man-db.spec +++ b/man-db.spec @@ -1,10 +1,14 @@ %global cache /var/cache/man %global gnulib_ver 20140202 +# disable LTO to avoid linker bug +# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/335QKVAYKCJSUXI4CIDN33NGEVKQKX7Y/ +%global _lto_cflags %{nil} + Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.2 -Release: 3%{?dist} +Release: 4%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -231,6 +235,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Jul 28 2020 Nikola Forró - 2.9.2-4 +- disable LTO to avoid linker bug + * Tue Jul 28 2020 Fedora Release Engineering - 2.9.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From d46b6d77293283bcccbc2bf25f733a5d2240471b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 4 Aug 2020 20:09:56 +0200 Subject: [PATCH 45/83] reenable LTO --- man-db.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/man-db.spec b/man-db.spec index ae3f7ed..5c32ea9 100644 --- a/man-db.spec +++ b/man-db.spec @@ -1,14 +1,10 @@ %global cache /var/cache/man %global gnulib_ver 20140202 -# disable LTO to avoid linker bug -# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/335QKVAYKCJSUXI4CIDN33NGEVKQKX7Y/ -%global _lto_cflags %{nil} - Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.2 -Release: 4%{?dist} +Release: 5%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -235,6 +231,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Aug 04 2020 Nikola Forró - 2.9.2-5 +- reenable LTO + * Tue Jul 28 2020 Nikola Forró - 2.9.2-4 - disable LTO to avoid linker bug From a28c5fba5a23e262c345664c1c5643d5cd24cf2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Thu, 3 Sep 2020 11:34:01 +0200 Subject: [PATCH 46/83] disable LTO to workaround a possible linker bug - related to #1871971 --- man-db.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 5c32ea9..5e9076c 100644 --- a/man-db.spec +++ b/man-db.spec @@ -1,10 +1,13 @@ %global cache /var/cache/man %global gnulib_ver 20140202 +# workaround for bug #1871971 +%global _lto_cflags %{nil} + Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.2 -Release: 5%{?dist} +Release: 6%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -231,6 +234,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Thu Sep 03 2020 Nikola Forró - 2.9.2-6 +- disable LTO to workaround a possible linker bug + related to #1871971 + * Tue Aug 04 2020 Nikola Forró - 2.9.2-5 - reenable LTO From 523067ee9b7e55529d9a5f81a74255f3f885e0bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 6 Oct 2020 16:45:54 +0200 Subject: [PATCH 47/83] update to 2.9.3 - resolves #1849809 --- .gitignore | 1 + man-db.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f6f1467..10449c5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /man-db-2.9.0.tar.xz /man-db-2.9.1.tar.xz /man-db-2.9.2.tar.xz +/man-db-2.9.3.tar.xz diff --git a/man-db.spec b/man-db.spec index 5e9076c..add33dd 100644 --- a/man-db.spec +++ b/man-db.spec @@ -6,8 +6,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.9.2 -Release: 6%{?dist} +Version: 2.9.3 +Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -234,6 +234,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Oct 06 2020 Nikola Forró - 2.9.3-1 +- update to 2.9.3 + resolves #1849809 + * Thu Sep 03 2020 Nikola Forró - 2.9.2-6 - disable LTO to workaround a possible linker bug related to #1871971 diff --git a/sources b/sources index 16bbef9..31ebd26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.9.2.tar.xz) = 47b63c074cf61c15f82230cc35a0062ab6ded8c3229475c6667a47ca518346d0555616c5b07bb01515b31bd80cbdc9870cd05ffff35097d013252401c6927002 +SHA512 (man-db-2.9.3.tar.xz) = ca1c1214753483f6e22efe69a9df9852e0de01a9ad3b9950dcbbc9f38e6060100b98a84333256f8c734002e66e2fd6256bc017a31bd9acfc42002dca2c0f879b From 6383fd236f2fbf28def75ff9dc3552916fe2fc77 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 9 Oct 2020 10:59:19 -0600 Subject: [PATCH 48/83] Re-enable LTO --- man-db.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/man-db.spec b/man-db.spec index add33dd..3607647 100644 --- a/man-db.spec +++ b/man-db.spec @@ -1,13 +1,10 @@ %global cache /var/cache/man %global gnulib_ver 20140202 -# workaround for bug #1871971 -%global _lto_cflags %{nil} - Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.3 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -234,6 +231,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Oct 09 2020 Jeff Law - 2.9.3-2 +- Re-enable LTO + * Tue Oct 06 2020 Nikola Forró - 2.9.3-1 - update to 2.9.3 resolves #1849809 From df234edddaef634c3f23c185474fa55a07f63f9b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 6 Jan 2021 21:25:28 +0000 Subject: [PATCH 49/83] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- man-db.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/man-db.spec b/man-db.spec index 3607647..e43df74 100644 --- a/man-db.spec +++ b/man-db.spec @@ -31,6 +31,7 @@ Provides: man-pages-reader = %{version} Provides: bundled(gnulib) = %{gnulib_ver} Requires: coreutils, grep, groff-base, gzip, less +BuildRequires: make BuildRequires: gcc BuildRequires: systemd BuildRequires: gdbm-devel, gettext, groff, less, libpipeline-devel, zlib-devel From f9aca722b0088b7532cc94dff4c11501a50a4989 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 19:11:49 +0000 Subject: [PATCH 50/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index e43df74..bac1342 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.3 -Release: 2%{?dist} +Release: 3%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -232,6 +232,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.9.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Oct 09 2020 Jeff Law - 2.9.3-2 - Re-enable LTO From 7ea2bb390c178dd843aec769a5ace72d42331993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Thu, 11 Feb 2021 10:07:42 +0100 Subject: [PATCH 51/83] update to 2.9.4 - resolves #1926527 --- .gitignore | 1 + man-db.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 10449c5..daba8b8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /man-db-2.9.1.tar.xz /man-db-2.9.2.tar.xz /man-db-2.9.3.tar.xz +/man-db-2.9.4.tar.xz diff --git a/man-db.spec b/man-db.spec index bac1342..4ff33c2 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,8 +3,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.9.3 -Release: 3%{?dist} +Version: 2.9.4 +Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -222,6 +222,7 @@ fi %lang(pl) %{_datadir}/man/pl/man*/* %lang(pt) %{_datadir}/man/pt/man*/* %lang(pt_BR) %{_datadir}/man/pt_BR/man*/* +%lang(ro) %{_datadir}/man/ro/man*/* %lang(ru) %{_datadir}/man/ru/man*/* %lang(sr) %{_datadir}/man/sr/man*/* %lang(sv) %{_datadir}/man/sv/man*/* @@ -232,6 +233,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Thu Feb 11 2021 Nikola Forró - 2.9.4-1 +- update to 2.9.4 + resolves #1926527 + * Tue Jan 26 2021 Fedora Release Engineering - 2.9.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 31ebd26..3a2be86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.9.3.tar.xz) = ca1c1214753483f6e22efe69a9df9852e0de01a9ad3b9950dcbbc9f38e6060100b98a84333256f8c734002e66e2fd6256bc017a31bd9acfc42002dca2c0f879b +SHA512 (man-db-2.9.4.tar.xz) = 169f091dd0a1d0dbd1583366f8257afb8f57e030d0f7d4213c14ce0b1fc5debf8b9cf2731de503830cb2826b3a22b3cff7da993d44ec18557935bd293529133c From 5dceb818842900df35e644bd8a47337d01e2f589 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 13:41:22 +0000 Subject: [PATCH 52/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 4ff33c2..8c20f8f 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.4 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -233,6 +233,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.9.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Feb 11 2021 Nikola Forró - 2.9.4-1 - update to 2.9.4 resolves #1926527 From f0f502e5dab387728351b40fec226b34407ec78c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 18:38:10 +0000 Subject: [PATCH 53/83] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 8c20f8f..4f08ae9 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.4 -Release: 2%{?dist} +Release: 3%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -233,6 +233,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.9.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 2.9.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 3547306052b7eb68cf0a6c484b2f3863218f97f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Sun, 6 Feb 2022 13:36:40 +0100 Subject: [PATCH 54/83] update to 2.10.0 - resolves #2050778 --- .gitignore | 1 + ...-db-2.10.0-fix-override-dir-handling.patch | 50 +++++++++---------- man-db.spec | 14 ++++-- sources | 2 +- 4 files changed, 34 insertions(+), 33 deletions(-) rename man-db-2.8.7-fix-override-dir-handling.patch => man-db-2.10.0-fix-override-dir-handling.patch (79%) diff --git a/.gitignore b/.gitignore index daba8b8..a2988ac 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /man-db-2.9.2.tar.xz /man-db-2.9.3.tar.xz /man-db-2.9.4.tar.xz +/man-db-2.10.0.tar.xz diff --git a/man-db-2.8.7-fix-override-dir-handling.patch b/man-db-2.10.0-fix-override-dir-handling.patch similarity index 79% rename from man-db-2.8.7-fix-override-dir-handling.patch rename to man-db-2.10.0-fix-override-dir-handling.patch index 4857c30..1412557 100644 --- a/man-db-2.8.7-fix-override-dir-handling.patch +++ b/man-db-2.10.0-fix-override-dir-handling.patch @@ -1,4 +1,4 @@ -From c73e7dd16b7915ac9c67a376e014ea1220095348 Mon Sep 17 00:00:00 2001 +From 28ca281040720168679bc23baeaa767b64f29201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 27 Aug 2019 17:53:03 +0200 Subject: [PATCH] man(1): Fix override dir handling @@ -21,15 +21,15 @@ is passed to ./configure. Reported-by: Nikola Forró Tested-by: Nikola Forró --- - src/man.c | 33 ++++++++++++++++++++++++++++++++ - src/manp.c | 55 +++++++++++++++++++++--------------------------------- - 2 files changed, 54 insertions(+), 34 deletions(-) + src/man.c | 33 +++++++++++++++++++++++++++++++++ + src/manp.c | 52 ++++++++++++++++++++-------------------------------- + 2 files changed, 53 insertions(+), 32 deletions(-) diff --git a/src/man.c b/src/man.c -index 6d1cba7..b3d13d1 100644 +index c91abf1..262e916 100644 --- a/src/man.c +++ b/src/man.c -@@ -2712,6 +2712,32 @@ static bool duplicate_candidates (struct candidate *left, +@@ -2725,6 +2725,32 @@ static bool duplicate_candidates (struct candidate *left, return ret; } @@ -62,7 +62,7 @@ index 6d1cba7..b3d13d1 100644 static int compare_candidates (const struct candidate *left, const struct candidate *right) { -@@ -2801,6 +2827,13 @@ static int compare_candidates (const struct candidate *left, +@@ -2814,6 +2840,13 @@ static int compare_candidates (const struct candidate *left, if (cmp) return cmp; @@ -77,10 +77,10 @@ index 6d1cba7..b3d13d1 100644 * page in the user's preferred language than a page from a better * section, but that attracted objections, so now we prefer to get diff --git a/src/manp.c b/src/manp.c -index 5441339..e437183 100644 +index 80b309a..4e3bff0 100644 --- a/src/manp.c +++ b/src/manp.c -@@ -903,23 +903,6 @@ static char *def_path (enum config_flag flag) +@@ -911,23 +911,6 @@ static char *def_path (enum config_flag flag) return manpath; } @@ -104,28 +104,24 @@ index 5441339..e437183 100644 /* * For each directory in the user's path, see if it is one of the * directories listed in the man_db.config file. If so, and it is -@@ -968,7 +951,6 @@ char *get_manpath_from_path (const char *path, int mandatory) +@@ -976,7 +959,6 @@ char *get_manpath_from_path (const char *path, int mandatory) if (!manpath_map_found) debug ("is in the config file\n"); manpath_map_found = true; - insert_override_dir (tmplist, config_item->cont); add_dir_to_list (tmplist, config_item->cont); - } GL_LIST_FOREACH_END (config); + } -@@ -989,11 +971,8 @@ char *get_manpath_from_path (const char *path, int mandatory) - debug ("adding mandatory man directories\n"); +@@ -998,8 +980,6 @@ char *get_manpath_from_path (const char *path, int mandatory) - GL_LIST_FOREACH_START (config, config_item) { -- if (config_item->flag == MANDATORY) { + GL_LIST_FOREACH (config, config_item) { + if (config_item->flag == MANDATORY) { - insert_override_dir (tmplist, - config_item->key); -+ if (config_item->flag == MANDATORY) add_dir_to_list (tmplist, config_item->key); -- } - } GL_LIST_FOREACH_END (config); - } - -@@ -1078,7 +1057,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) + } + } +@@ -1084,7 +1064,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) if (subdir) { newpath = xasprintf ("%.*s/man", (int) (subdir - path), path); if (is_directory (newpath) == 1) { @@ -133,7 +129,7 @@ index 5441339..e437183 100644 add_dir_to_list (list, newpath); } free (newpath); -@@ -1086,7 +1064,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) +@@ -1092,7 +1071,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) newpath = xasprintf ("%s/man", path); if (is_directory (newpath) == 1) { @@ -141,7 +137,7 @@ index 5441339..e437183 100644 add_dir_to_list (list, newpath); } free (newpath); -@@ -1095,7 +1072,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) +@@ -1101,7 +1079,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) newpath = xasprintf ("%.*s/share/man", (int) (subdir - path), path); if (is_directory (newpath) == 1) { @@ -149,7 +145,7 @@ index 5441339..e437183 100644 add_dir_to_list (list, newpath); } free (newpath); -@@ -1103,7 +1079,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) +@@ -1109,7 +1086,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) newpath = xasprintf ("%s/share/man", path); if (is_directory (newpath) == 1) { @@ -157,7 +153,7 @@ index 5441339..e437183 100644 add_dir_to_list (list, newpath); } free (newpath); -@@ -1199,7 +1174,9 @@ gl_list_t create_pathlist (const char *manp) +@@ -1205,7 +1181,9 @@ gl_list_t create_pathlist (const char *manp) const struct canonicalized_path *cp; /* Expand the manpath into a list of (path, canonicalized path) @@ -168,7 +164,7 @@ index 5441339..e437183 100644 * if they do not have the same canonicalized path as an existing * item, thereby eliminating duplicates due to symlinks. */ -@@ -1208,15 +1185,25 @@ gl_list_t create_pathlist (const char *manp) +@@ -1214,15 +1192,25 @@ gl_list_t create_pathlist (const char *manp) (GL_LINKEDHASH_LIST, canonicalized_path_equals, canonicalized_path_hash, canonicalized_path_free, false); for (p = manp;; p = end + 1) { @@ -202,5 +198,5 @@ index 5441339..e437183 100644 list = new_string_list (GL_ARRAY_LIST, false); -- -2.26.2 +2.34.1 diff --git a/man-db.spec b/man-db.spec index 4f08ae9..284a091 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,8 +3,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.9.4 -Release: 3%{?dist} +Version: 2.10.0 +Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -18,7 +18,7 @@ Source4: man-db-restart-cache-update.service Patch0: man-db-2.8.3-change-owner-of-man-cache.patch # http://lists.nongnu.org/archive/html/man-db-devel/2017-01/msg00013.html -Patch1: man-db-2.8.7-fix-override-dir-handling.patch +Patch1: man-db-2.10.0-fix-override-dir-handling.patch # change snap system directory from /snap to /var/lib/snapd/snap # https://lists.gnu.org/archive/html/man-db-devel/2020-02/msg00000.html @@ -170,8 +170,8 @@ fi %files -f %{name}.lang -f %{name}-gnulib.lang %{!?_licensedir:%global license %%doc} -%license docs/COPYING -%doc README man-db-manual.txt man-db-manual.ps ChangeLog NEWS +%license COPYING +%doc README.md man-db-manual.txt man-db-manual.ps ChangeLog NEWS.md %config(noreplace) %{_sysconfdir}/man_db.conf %config(noreplace) %{_sysconfdir}/sysconfig/man-db %config(noreplace) %{_tmpfilesdir}/man-db.conf @@ -233,6 +233,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Sun Feb 06 2022 Nikola Forró - 2.10.0-1 +- update to 2.10.0 + resolves #2050778 + * Thu Jan 20 2022 Fedora Release Engineering - 2.9.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 3a2be86..632527b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.9.4.tar.xz) = 169f091dd0a1d0dbd1583366f8257afb8f57e030d0f7d4213c14ce0b1fc5debf8b9cf2731de503830cb2826b3a22b3cff7da993d44ec18557935bd293529133c +SHA512 (man-db-2.10.0.tar.xz) = de9c9f3dd9e6a578eb99aca0d04ce5c98cf6733e83e3be5299b6cafc4aad202896429a263a34111529eccdf07c353438afdade278818fc5d884471df7a4816c9 From 6b9b7136e8162db4ba90666d9f708611bdc792f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 8 Feb 2022 09:50:04 +0100 Subject: [PATCH 55/83] skip unstable test --- ...0-skip-mandb-symlink-target-timestamp-test.patch | 13 +++++++++++++ man-db.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 man-db-2.10.0-skip-mandb-symlink-target-timestamp-test.patch diff --git a/man-db-2.10.0-skip-mandb-symlink-target-timestamp-test.patch b/man-db-2.10.0-skip-mandb-symlink-target-timestamp-test.patch new file mode 100644 index 0000000..b5ae55e --- /dev/null +++ b/man-db-2.10.0-skip-mandb-symlink-target-timestamp-test.patch @@ -0,0 +1,13 @@ +diff --git a/src/tests/mandb-symlink-target-timestamp b/src/tests/mandb-symlink-target-timestamp +index 1c87d3d..c84449f 100755 +--- a/src/tests/mandb-symlink-target-timestamp ++++ b/src/tests/mandb-symlink-target-timestamp +@@ -9,6 +9,8 @@ + : ${MANDB=mandb} + : ${ACCESSDB=accessdb} + ++skip "this test is unstable, skip for now: https://gitlab.com/cjwatson/man-db/-/issues/3" ++ + init + fake_config /usr/share/man + MANPATH="$tmpdir/usr/share/man" diff --git a/man-db.spec b/man-db.spec index 284a091..f5a9436 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.10.0 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -24,6 +24,9 @@ Patch1: man-db-2.10.0-fix-override-dir-handling.patch # https://lists.gnu.org/archive/html/man-db-devel/2020-02/msg00000.html Patch2: man-db-2.9.1-snap.patch +# https://gitlab.com/cjwatson/man-db/-/issues/3 +Patch3: man-db-2.10.0-skip-mandb-symlink-target-timestamp-test.patch + Obsoletes: man < 2.0 Provides: man = %{version} Provides: man-pages-reader = %{version} @@ -233,6 +236,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Feb 08 2022 Nikola Forró - 2.10.0-2 +- skip unstable test + * Sun Feb 06 2022 Nikola Forró - 2.10.0-1 - update to 2.10.0 resolves #2050778 From 2d66679cb954a8d38e33904563b65d95e12bb964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 8 Feb 2022 10:55:06 +0100 Subject: [PATCH 56/83] backport upstream fixes for the unstable test --- ...-mandb-symlink-target-timestamp-test.patch | 33 +++++++++++++++++++ ...-mandb-symlink-target-timestamp-test.patch | 13 -------- man-db.spec | 7 ++-- 3 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 man-db-2.10.0-fix-mandb-symlink-target-timestamp-test.patch delete mode 100644 man-db-2.10.0-skip-mandb-symlink-target-timestamp-test.patch diff --git a/man-db-2.10.0-fix-mandb-symlink-target-timestamp-test.patch b/man-db-2.10.0-fix-mandb-symlink-target-timestamp-test.patch new file mode 100644 index 0000000..a3c4257 --- /dev/null +++ b/man-db-2.10.0-fix-mandb-symlink-target-timestamp-test.patch @@ -0,0 +1,33 @@ +From b86431ba72c3a21484fb221db6b6a82a78cc4bd8 Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Fri, 4 Feb 2022 16:13:09 +0000 +Subject: [PATCH] Fix mandb-symlink-target-timestamp test + +* src/tests/mandb-symlink-target-timestamp: Fix handling of the case +where the nanosecond part of a timestamp starts with a zero. + +* src/tests/mandb-symlink-target-timestamp: Fix handling of the case +where the nanosecond part of a timestamp is exactly 0 (probably because +the filesystem doesn't support nanosecond resolution). +--- + src/tests/mandb-symlink-target-timestamp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tests/mandb-symlink-target-timestamp b/src/tests/mandb-symlink-target-timestamp +index 1c87d3d..bc1baf1 100755 +--- a/src/tests/mandb-symlink-target-timestamp ++++ b/src/tests/mandb-symlink-target-timestamp +@@ -21,8 +21,8 @@ write_page test 1 "$tmpdir/usr/share/man/man1/test.1.gz" \ + ln -s test.1.gz "$tmpdir/usr/share/man/man1/test-link.1.gz" + run $MANDB -C "$tmpdir/manpath.config" -u -q "$tmpdir/usr/share/man" + cat >"$tmpdir/1.exp" < "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test.1.gz" | tr . ' ') A - - gz test(1)" +-test-link -> "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test-link.1.gz" | tr . ' ') B - - gz test(1)" ++test -> "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test.1.gz" | sed 's/\.0*\([0-9]\)/ \1/') A - - gz test(1)" ++test-link -> "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test-link.1.gz" | sed 's/\.0*\([0-9]\)/ \1/') B - - gz test(1)" + EOF + run $ACCESSDB "$tmpdir/usr/share/man/index$db_ext" | \ + grep -v '^\$' >"$tmpdir/1.out" +-- +2.34.1 + diff --git a/man-db-2.10.0-skip-mandb-symlink-target-timestamp-test.patch b/man-db-2.10.0-skip-mandb-symlink-target-timestamp-test.patch deleted file mode 100644 index b5ae55e..0000000 --- a/man-db-2.10.0-skip-mandb-symlink-target-timestamp-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tests/mandb-symlink-target-timestamp b/src/tests/mandb-symlink-target-timestamp -index 1c87d3d..c84449f 100755 ---- a/src/tests/mandb-symlink-target-timestamp -+++ b/src/tests/mandb-symlink-target-timestamp -@@ -9,6 +9,8 @@ - : ${MANDB=mandb} - : ${ACCESSDB=accessdb} - -+skip "this test is unstable, skip for now: https://gitlab.com/cjwatson/man-db/-/issues/3" -+ - init - fake_config /usr/share/man - MANPATH="$tmpdir/usr/share/man" diff --git a/man-db.spec b/man-db.spec index f5a9436..2217229 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.10.0 -Release: 2%{?dist} +Release: 3%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -25,7 +25,7 @@ Patch1: man-db-2.10.0-fix-override-dir-handling.patch Patch2: man-db-2.9.1-snap.patch # https://gitlab.com/cjwatson/man-db/-/issues/3 -Patch3: man-db-2.10.0-skip-mandb-symlink-target-timestamp-test.patch +Patch3: man-db-2.10.0-fix-mandb-symlink-target-timestamp-test.patch Obsoletes: man < 2.0 Provides: man = %{version} @@ -236,6 +236,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Feb 08 2022 Nikola Forró - 2.10.0-3 +- backport upstream fixes for the unstable test + * Tue Feb 08 2022 Nikola Forró - 2.10.0-2 - skip unstable test From 293922b07ae4359ba3dbdff6580e92255da8ca20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Fri, 11 Feb 2022 13:01:06 +0100 Subject: [PATCH 57/83] update to 2.10.1 - resolves #2053020 --- .gitignore | 1 + ...-mandb-symlink-target-timestamp-test.patch | 33 ------------------- man-db-2.10.0-fix-override-dir-handling.patch | 8 ++--- man-db.spec | 11 ++++--- sources | 2 +- 5 files changed, 12 insertions(+), 43 deletions(-) delete mode 100644 man-db-2.10.0-fix-mandb-symlink-target-timestamp-test.patch diff --git a/.gitignore b/.gitignore index a2988ac..75b19e4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /man-db-2.9.3.tar.xz /man-db-2.9.4.tar.xz /man-db-2.10.0.tar.xz +/man-db-2.10.1.tar.xz diff --git a/man-db-2.10.0-fix-mandb-symlink-target-timestamp-test.patch b/man-db-2.10.0-fix-mandb-symlink-target-timestamp-test.patch deleted file mode 100644 index a3c4257..0000000 --- a/man-db-2.10.0-fix-mandb-symlink-target-timestamp-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b86431ba72c3a21484fb221db6b6a82a78cc4bd8 Mon Sep 17 00:00:00 2001 -From: Colin Watson -Date: Fri, 4 Feb 2022 16:13:09 +0000 -Subject: [PATCH] Fix mandb-symlink-target-timestamp test - -* src/tests/mandb-symlink-target-timestamp: Fix handling of the case -where the nanosecond part of a timestamp starts with a zero. - -* src/tests/mandb-symlink-target-timestamp: Fix handling of the case -where the nanosecond part of a timestamp is exactly 0 (probably because -the filesystem doesn't support nanosecond resolution). ---- - src/tests/mandb-symlink-target-timestamp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/tests/mandb-symlink-target-timestamp b/src/tests/mandb-symlink-target-timestamp -index 1c87d3d..bc1baf1 100755 ---- a/src/tests/mandb-symlink-target-timestamp -+++ b/src/tests/mandb-symlink-target-timestamp -@@ -21,8 +21,8 @@ write_page test 1 "$tmpdir/usr/share/man/man1/test.1.gz" \ - ln -s test.1.gz "$tmpdir/usr/share/man/man1/test-link.1.gz" - run $MANDB -C "$tmpdir/manpath.config" -u -q "$tmpdir/usr/share/man" - cat >"$tmpdir/1.exp" < "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test.1.gz" | tr . ' ') A - - gz test(1)" --test-link -> "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test-link.1.gz" | tr . ' ') B - - gz test(1)" -+test -> "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test.1.gz" | sed 's/\.0*\([0-9]\)/ \1/') A - - gz test(1)" -+test-link -> "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test-link.1.gz" | sed 's/\.0*\([0-9]\)/ \1/') B - - gz test(1)" - EOF - run $ACCESSDB "$tmpdir/usr/share/man/index$db_ext" | \ - grep -v '^\$' >"$tmpdir/1.out" --- -2.34.1 - diff --git a/man-db-2.10.0-fix-override-dir-handling.patch b/man-db-2.10.0-fix-override-dir-handling.patch index 1412557..aee2f9c 100644 --- a/man-db-2.10.0-fix-override-dir-handling.patch +++ b/man-db-2.10.0-fix-override-dir-handling.patch @@ -1,4 +1,4 @@ -From 28ca281040720168679bc23baeaa767b64f29201 Mon Sep 17 00:00:00 2001 +From b8483c4db97f6f879fe5e532a2ec66e9363033c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Tue, 27 Aug 2019 17:53:03 +0200 Subject: [PATCH] man(1): Fix override dir handling @@ -26,10 +26,10 @@ Tested-by: Nikola Forró 2 files changed, 53 insertions(+), 32 deletions(-) diff --git a/src/man.c b/src/man.c -index c91abf1..262e916 100644 +index f16fae8..29c8671 100644 --- a/src/man.c +++ b/src/man.c -@@ -2725,6 +2725,32 @@ static bool duplicate_candidates (struct candidate *left, +@@ -2728,6 +2728,32 @@ static bool duplicate_candidates (struct candidate *left, return ret; } @@ -62,7 +62,7 @@ index c91abf1..262e916 100644 static int compare_candidates (const struct candidate *left, const struct candidate *right) { -@@ -2814,6 +2840,13 @@ static int compare_candidates (const struct candidate *left, +@@ -2817,6 +2843,13 @@ static int compare_candidates (const struct candidate *left, if (cmp) return cmp; diff --git a/man-db.spec b/man-db.spec index 2217229..710a155 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,8 +3,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.10.0 -Release: 3%{?dist} +Version: 2.10.1 +Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -24,9 +24,6 @@ Patch1: man-db-2.10.0-fix-override-dir-handling.patch # https://lists.gnu.org/archive/html/man-db-devel/2020-02/msg00000.html Patch2: man-db-2.9.1-snap.patch -# https://gitlab.com/cjwatson/man-db/-/issues/3 -Patch3: man-db-2.10.0-fix-mandb-symlink-target-timestamp-test.patch - Obsoletes: man < 2.0 Provides: man = %{version} Provides: man-pages-reader = %{version} @@ -236,6 +233,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Feb 11 2022 Nikola Forró - 2.10.1-1 +- update to 2.10.1 + resolves #2053020 + * Tue Feb 08 2022 Nikola Forró - 2.10.0-3 - backport upstream fixes for the unstable test diff --git a/sources b/sources index 632527b..c5ffd32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.10.0.tar.xz) = de9c9f3dd9e6a578eb99aca0d04ce5c98cf6733e83e3be5299b6cafc4aad202896429a263a34111529eccdf07c353438afdade278818fc5d884471df7a4816c9 +SHA512 (man-db-2.10.1.tar.xz) = 25a3c4e3d7b171faf0771885a7a7d502c4af801881777231c79d7ee9768c2e48e44afbf5603af13f5ac63e6981cfdb8e36ba8a33d5f926d8122635cf45fcff7a From d94aa53b87bebe8c5d45dc835b4341751ac60327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Fri, 18 Mar 2022 10:22:31 +0100 Subject: [PATCH 58/83] update to 2.10.2 - resolves: #2065447 --- .gitignore | 1 + man-db-2.10.0-fix-override-dir-handling.patch | 202 ------------------ man-db-2.8.3-change-owner-of-man-cache.patch | 19 -- man-db-2.9.1-snap.patch | 13 -- man-db.spec | 18 +- sources | 2 +- 6 files changed, 9 insertions(+), 246 deletions(-) delete mode 100644 man-db-2.10.0-fix-override-dir-handling.patch delete mode 100644 man-db-2.8.3-change-owner-of-man-cache.patch delete mode 100644 man-db-2.9.1-snap.patch diff --git a/.gitignore b/.gitignore index 75b19e4..36994c7 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /man-db-2.9.4.tar.xz /man-db-2.10.0.tar.xz /man-db-2.10.1.tar.xz +/man-db-2.10.2.tar.xz diff --git a/man-db-2.10.0-fix-override-dir-handling.patch b/man-db-2.10.0-fix-override-dir-handling.patch deleted file mode 100644 index aee2f9c..0000000 --- a/man-db-2.10.0-fix-override-dir-handling.patch +++ /dev/null @@ -1,202 +0,0 @@ -From b8483c4db97f6f879fe5e532a2ec66e9363033c9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nikola=20Forr=C3=B3?= -Date: Tue, 27 Aug 2019 17:53:03 +0200 -Subject: [PATCH] man(1): Fix override dir handling -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Previously, override dir was affecting only some cases -of manpath determination. - -Apply it only when all paths has been gathered instead. -(Depending on the definition of when the override dir applies, -this might not be correct). - -Also look for override dir when sorting candidates. - -Fixes src/tests/man-9 failing when --with-override-dir=od -is passed to ./configure. - -Reported-by: Nikola Forró -Tested-by: Nikola Forró ---- - src/man.c | 33 +++++++++++++++++++++++++++++++++ - src/manp.c | 52 ++++++++++++++++++++-------------------------------- - 2 files changed, 53 insertions(+), 32 deletions(-) - -diff --git a/src/man.c b/src/man.c -index f16fae8..29c8671 100644 ---- a/src/man.c -+++ b/src/man.c -@@ -2728,6 +2728,32 @@ static bool duplicate_candidates (struct candidate *left, - return ret; - } - -+static int cand1_differs_by_override_dir (const struct candidate *left, -+ const struct candidate *right) -+{ -+ size_t ov_len, pre_ov_len; -+ -+ ov_len = strlen (OVERRIDE_DIR); -+ if (!ov_len) -+ return 0; -+ -+ if (!STREQ (left->source->name, right->source->name)) -+ return 0; -+ -+ pre_ov_len = strlen(right->path); -+ if (!STRNEQ (left->path, right->path, pre_ov_len)) -+ return 0; -+ -+ if (left->path[pre_ov_len] != '/') -+ return 0; -+ pre_ov_len++; -+ -+ if (STREQ (left->path + pre_ov_len, OVERRIDE_DIR)) -+ return 1; -+ -+ return 0; -+} -+ - static int compare_candidates (const struct candidate *left, - const struct candidate *right) - { -@@ -2817,6 +2843,13 @@ static int compare_candidates (const struct candidate *left, - if (cmp) - return cmp; - -+ /* Sort override dir first -+ */ -+ if (cand1_differs_by_override_dir(left, right)) -+ return -1; -+ if (cand1_differs_by_override_dir(right, left)) -+ return 1; -+ - /* Try comparing based on language. We used to prefer to display a - * page in the user's preferred language than a page from a better - * section, but that attracted objections, so now we prefer to get -diff --git a/src/manp.c b/src/manp.c -index 80b309a..4e3bff0 100644 ---- a/src/manp.c -+++ b/src/manp.c -@@ -911,23 +911,6 @@ static char *def_path (enum config_flag flag) - return manpath; - } - --/* -- * If specified with configure, append OVERRIDE_DIR to dir param and add it -- * to list. -- */ --static void insert_override_dir (gl_list_t list, const char *dir) --{ -- char *override_dir = NULL; -- -- if (!strlen (OVERRIDE_DIR)) -- return; -- -- if ((override_dir = xasprintf ("%s/%s", dir, OVERRIDE_DIR))) { -- add_dir_to_list (list, override_dir); -- free (override_dir); -- } --} -- - /* - * For each directory in the user's path, see if it is one of the - * directories listed in the man_db.config file. If so, and it is -@@ -976,7 +959,6 @@ char *get_manpath_from_path (const char *path, int mandatory) - if (!manpath_map_found) - debug ("is in the config file\n"); - manpath_map_found = true; -- insert_override_dir (tmplist, config_item->cont); - add_dir_to_list (tmplist, config_item->cont); - } - -@@ -998,8 +980,6 @@ char *get_manpath_from_path (const char *path, int mandatory) - - GL_LIST_FOREACH (config, config_item) { - if (config_item->flag == MANDATORY) { -- insert_override_dir (tmplist, -- config_item->key); - add_dir_to_list (tmplist, config_item->key); - } - } -@@ -1084,7 +1064,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) - if (subdir) { - newpath = xasprintf ("%.*s/man", (int) (subdir - path), path); - if (is_directory (newpath) == 1) { -- insert_override_dir (list, newpath); - add_dir_to_list (list, newpath); - } - free (newpath); -@@ -1092,7 +1071,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) - - newpath = xasprintf ("%s/man", path); - if (is_directory (newpath) == 1) { -- insert_override_dir (list, newpath); - add_dir_to_list (list, newpath); - } - free (newpath); -@@ -1101,7 +1079,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) - newpath = xasprintf ("%.*s/share/man", - (int) (subdir - path), path); - if (is_directory (newpath) == 1) { -- insert_override_dir (list, newpath); - add_dir_to_list (list, newpath); - } - free (newpath); -@@ -1109,7 +1086,6 @@ static void add_man_subdirs (gl_list_t list, const char *path) - - newpath = xasprintf ("%s/share/man", path); - if (is_directory (newpath) == 1) { -- insert_override_dir (list, newpath); - add_dir_to_list (list, newpath); - } - free (newpath); -@@ -1205,7 +1181,9 @@ gl_list_t create_pathlist (const char *manp) - const struct canonicalized_path *cp; - - /* Expand the manpath into a list of (path, canonicalized path) -- * pairs for easier handling. add_dir_to_path_list only adds items -+ * pairs for easier handling. For each entry, add corresponding -+ * OVERRIDE_DIR. -+ * add_dir_to_path_list only adds items - * if they do not have the same canonicalized path as an existing - * item, thereby eliminating duplicates due to symlinks. - */ -@@ -1214,15 +1192,25 @@ gl_list_t create_pathlist (const char *manp) - (GL_LINKEDHASH_LIST, canonicalized_path_equals, - canonicalized_path_hash, canonicalized_path_free, false); - for (p = manp;; p = end + 1) { -+ char *element, *element_override; -+ ssize_t p_len; -+ - end = strchr (p, ':'); -- if (end) { -- char *element = xstrndup (p, end - p); -- add_dir_to_path_list (canonicalized_list, element); -- free (element); -- } else { -- add_dir_to_path_list (canonicalized_list, p); -- break; -+ p_len = end ? end - p : (ssize_t)strlen(p); -+ -+ element = xstrndup (p, p_len); -+ -+ if (strlen(OVERRIDE_DIR)) { -+ element_override = xasprintf("%s/%s", element, OVERRIDE_DIR); -+ add_dir_to_path_list (canonicalized_list, element_override); -+ free (element_override); - } -+ -+ add_dir_to_path_list (canonicalized_list, element); -+ free (element); -+ -+ if (!end) -+ break; - } - - list = new_string_list (GL_ARRAY_LIST, false); --- -2.34.1 - diff --git a/man-db-2.8.3-change-owner-of-man-cache.patch b/man-db-2.8.3-change-owner-of-man-cache.patch deleted file mode 100644 index 2e196a7..0000000 --- a/man-db-2.8.3-change-owner-of-man-cache.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 99dd120b952a2a27fa31ae005149e6aaaed28755 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nikola=20Forr=C3=B3?= -Date: Fri, 6 Apr 2018 11:52:33 +0200 -Subject: [PATCH] Set owner of man cache to root - ---- - init/systemd/man-db.conf.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/init/systemd/man-db.conf.in b/init/systemd/man-db.conf.in -index 7a461e8..cac2b52 100644 ---- a/init/systemd/man-db.conf.in -+++ b/init/systemd/man-db.conf.in -@@ -1 +1 @@ --d /var/cache/man 0755 @cache_top_owner@ @cache_top_owner@ 1w -+d /var/cache/man 0755 root root 1w --- -2.13.6 - diff --git a/man-db-2.9.1-snap.patch b/man-db-2.9.1-snap.patch deleted file mode 100644 index bb6f759..0000000 --- a/man-db-2.9.1-snap.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/man_db.conf.in b/src/man_db.conf.in -index 2942000..6365ca0 100644 ---- a/src/man_db.conf.in -+++ b/src/man_db.conf.in -@@ -69,7 +69,7 @@ MANDB_MAP /usr/local/man /var/cache/man/oldlocal - MANDB_MAP /usr/local/share/man /var/cache/man/local - MANDB_MAP /usr/X11R6/man /var/cache/man/X11R6 - MANDB_MAP /opt/man /var/cache/man/opt --MANDB_MAP /snap/man /var/cache/man/snap -+MANDB_MAP /var/lib/snapd/snap/man /var/cache/man/snap - # - #--------------------------------------------------------- - # Program definitions. These are commented out by default as the value diff --git a/man-db.spec b/man-db.spec index 710a155..48b9745 100644 --- a/man-db.spec +++ b/man-db.spec @@ -1,9 +1,8 @@ %global cache /var/cache/man -%global gnulib_ver 20140202 Summary: Tools for searching and reading man pages Name: man-db -Version: 2.10.1 +Version: 2.10.2 Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib @@ -15,20 +14,12 @@ Source1: man-db.crondaily Source2: man-db.sysconfig Source3: man-db-cache-update.service Source4: man-db-restart-cache-update.service -Patch0: man-db-2.8.3-change-owner-of-man-cache.patch - -# http://lists.nongnu.org/archive/html/man-db-devel/2017-01/msg00013.html -Patch1: man-db-2.10.0-fix-override-dir-handling.patch - -# change snap system directory from /snap to /var/lib/snapd/snap -# https://lists.gnu.org/archive/html/man-db-devel/2020-02/msg00000.html -Patch2: man-db-2.9.1-snap.patch Obsoletes: man < 2.0 Provides: man = %{version} Provides: man-pages-reader = %{version} # FPC exception for gnulib - copylib - https://fedorahosted.org/fpc/ticket/174 -Provides: bundled(gnulib) = %{gnulib_ver} +Provides: bundled(gnulib) Requires: coreutils, grep, groff-base, gzip, less BuildRequires: make @@ -69,6 +60,7 @@ This package provides periodic update of man-db cache. --disable-setuid --disable-cache-owner \ --with-systemdsystemunitdir=no \ --with-browser=elinks --with-lzip=lzip \ + --with-snapdir=/var/lib/snapd/snap \ --with-override-dir=overrides %make_build CC="%{__cc} %{optflags}" @@ -233,6 +225,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Mar 18 2022 Nikola Forró - 2.10.2-1 +- update to 2.10.2 + resolves: #2065447 + * Fri Feb 11 2022 Nikola Forró - 2.10.1-1 - update to 2.10.1 resolves #2053020 diff --git a/sources b/sources index c5ffd32..0d9213b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.10.1.tar.xz) = 25a3c4e3d7b171faf0771885a7a7d502c4af801881777231c79d7ee9768c2e48e44afbf5603af13f5ac63e6981cfdb8e36ba8a33d5f926d8122635cf45fcff7a +SHA512 (man-db-2.10.2.tar.xz) = 5ad7a7b601aadf4d2d7cc068881fffe3d91dc85fcf4c17e66fbe6e2b04bb1c46f5ba5d4bc7f6ab3f39e00065be39061b101d3064c12b1e89f0fee61c088611bf From 5315502a1bfe3b2d10eaef4862fbf78878cbba44 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 20:27:14 +0000 Subject: [PATCH 59/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 48b9745..e6e51cf 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.10.2 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -225,6 +225,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.10.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Mar 18 2022 Nikola Forró - 2.10.2-1 - update to 2.10.2 resolves: #2065447 From f7b8fceb7144e88dc4af5938102942e18b21cb94 Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Sat, 15 Oct 2022 17:41:25 +0000 Subject: [PATCH 60/83] Rebase to version 2.11.0 Resolves: #2135043 --- .gitignore | 1 + man-db.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 36994c7..af3bcbe 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /man-db-2.10.0.tar.xz /man-db-2.10.1.tar.xz /man-db-2.10.2.tar.xz +/man-db-2.11.0.tar.xz diff --git a/man-db.spec b/man-db.spec index e6e51cf..ded6b6d 100644 --- a/man-db.spec +++ b/man-db.spec @@ -2,8 +2,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.10.2 -Release: 2%{?dist} +Version: 2.11.0 +Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -225,6 +225,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Oct 14 2022 Lukas Javorsky - 2.11.0-1 +- Rebase to version 2.11.0 + * Thu Jul 21 2022 Fedora Release Engineering - 2.10.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 0d9213b..8c957fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.10.2.tar.xz) = 5ad7a7b601aadf4d2d7cc068881fffe3d91dc85fcf4c17e66fbe6e2b04bb1c46f5ba5d4bc7f6ab3f39e00065be39061b101d3064c12b1e89f0fee61c088611bf +SHA512 (man-db-2.11.0.tar.xz) = 0790dd6109e537f7dffb29258efd929d79274150755cab6bb8d6f239ad32df3a2006e00f61988808dc280fd3c1493a969e75cb8c4aab653f805bae8b73d9c910 From 4b6ff0aef0ae0f7921d7381b6a5017ee9c28be7f Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Fri, 18 Nov 2022 13:05:36 +0000 Subject: [PATCH 61/83] Rebase to version 2.11.1 Added Korean translations Resolves: #2142761 --- .gitignore | 1 + man-db.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index af3bcbe..a6bee79 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /man-db-2.10.1.tar.xz /man-db-2.10.2.tar.xz /man-db-2.11.0.tar.xz +/man-db-2.11.1.tar.xz diff --git a/man-db.spec b/man-db.spec index ded6b6d..cd1cbf3 100644 --- a/man-db.spec +++ b/man-db.spec @@ -2,7 +2,7 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.11.0 +Version: 2.11.1 Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib @@ -210,6 +210,7 @@ fi %lang(id) %{_datadir}/man/id/man*/* %lang(it) %{_datadir}/man/it/man*/* %lang(ja) %{_datadir}/man/ja/man*/* +%lang(ko) %{_datadir}/man/ko/man*/* %lang(nl) %{_datadir}/man/nl/man*/* %lang(pl) %{_datadir}/man/pl/man*/* %lang(pt) %{_datadir}/man/pt/man*/* @@ -225,6 +226,11 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Nov 18 2022 Lukas Javorsky - 2.11.1-1 +- Rebase to version 2.11.1 +- Add Korean translations +- Resolves: #2142761 + * Fri Oct 14 2022 Lukas Javorsky - 2.11.0-1 - Rebase to version 2.11.0 diff --git a/sources b/sources index 8c957fa..c98580a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.11.0.tar.xz) = 0790dd6109e537f7dffb29258efd929d79274150755cab6bb8d6f239ad32df3a2006e00f61988808dc280fd3c1493a969e75cb8c4aab653f805bae8b73d9c910 +SHA512 (man-db-2.11.1.tar.xz) = 249d65d01d83feac2503bfc1fba6d018ea0f7485c1112f1bfb4849ef7fbc3c1a50b97ab0844a7792d83bb1084a89abb4fa309ce1bc2bdf1183fe35b9e4f06263 From 8898ace03ad1202048676670105500321bc7ff06 Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Mon, 9 Jan 2023 14:10:26 +0000 Subject: [PATCH 62/83] Rebase to version 2.11.2 Resolves: #2159148 --- .gitignore | 1 + man-db.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a6bee79..c5fff0b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /man-db-2.10.2.tar.xz /man-db-2.11.0.tar.xz /man-db-2.11.1.tar.xz +/man-db-2.11.2.tar.xz diff --git a/man-db.spec b/man-db.spec index cd1cbf3..da2e251 100644 --- a/man-db.spec +++ b/man-db.spec @@ -2,7 +2,7 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.11.1 +Version: 2.11.2 Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib @@ -226,6 +226,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Mon Jan 09 2023 Lukas Javorsky - 2.11.2-1 +- Rebase to version 2.11.2 + * Fri Nov 18 2022 Lukas Javorsky - 2.11.1-1 - Rebase to version 2.11.1 - Add Korean translations diff --git a/sources b/sources index c98580a..d4da7c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.11.1.tar.xz) = 249d65d01d83feac2503bfc1fba6d018ea0f7485c1112f1bfb4849ef7fbc3c1a50b97ab0844a7792d83bb1084a89abb4fa309ce1bc2bdf1183fe35b9e4f06263 +SHA512 (man-db-2.11.2.tar.xz) = edb71cce7249c7b7f2f524e92f682047a77ed9ae8856763dfc8e18e239444651ff4c505e697f5a8b1be3b85678e714fbb1a520defe72a4eb685bc2cecc0e4391 From 0a36348a416079ccf78a67ada233cf0dc0d151b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:53:28 +0000 Subject: [PATCH 63/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index da2e251..022be92 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.11.2 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -226,6 +226,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.11.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 09 2023 Lukas Javorsky - 2.11.2-1 - Rebase to version 2.11.2 From 05a0b1d04bd38bc697c9a04fad198eab34eb2ff4 Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Thu, 23 Mar 2023 11:39:47 +0000 Subject: [PATCH 64/83] migrated to SPDX license --- man-db.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 022be92..949b747 100644 --- a/man-db.spec +++ b/man-db.spec @@ -6,7 +6,7 @@ Version: 2.11.2 Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib -License: GPLv2+ and GPLv3+ +License: GPL-2.0-or-later AND GPL-3.0-or-later URL: http://www.nongnu.org/man-db/ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz From 75e961c75ee57dac17027ff64e1d52c4f7c12377 Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Mon, 10 Jul 2023 08:49:11 +0000 Subject: [PATCH 65/83] Add Recommends to package glibc-gconv-extra When glibc-gconv-extra package is missing, `mandb -c` returns warnings if man pages on the system attempt to utilize the ISO 8859-2 charset. Adding only recommends because some packages that want's the minimal footprint may accept to have these warnings. Resolves: #2182414 --- man-db.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 949b747..29316d7 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.11.2 -Release: 2%{?dist} +Release: 3%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -27,6 +27,7 @@ BuildRequires: gcc BuildRequires: systemd BuildRequires: gdbm-devel, gettext, groff, less, libpipeline-devel, zlib-devel BuildRequires: po4a, perl-interpreter, perl-version +Recommends: glibc-gconv-extra Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -226,6 +227,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Mon Jul 10 2023 Lukas Javorsky - 2.11.2-3 +- Add Recommends to package glibc-gconv-extra +- Justification in BZ#2182414 + * Thu Jan 19 2023 Fedora Release Engineering - 2.11.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 923262b0f6bf732049f78367c7aad0941fa21225 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 13:41:52 +0000 Subject: [PATCH 66/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 29316d7..504841d 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.11.2 -Release: 3%{?dist} +Release: 4%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -227,6 +227,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 2.11.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jul 10 2023 Lukas Javorsky - 2.11.2-3 - Add Recommends to package glibc-gconv-extra - Justification in BZ#2182414 From 751637c9397bd592a16135fb2adc55d916034254 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 24 Jul 2023 08:26:03 -0400 Subject: [PATCH 67/83] Fix build for groff 1.23 This includes a series of upstream fixes needed for the tests to pass with groff 1.23. These should be included in the next release. --- man-db-2.11.2-groff-1.23.patch | 209 +++++++++++++++++++++++++++++++++ man-db.spec | 4 + 2 files changed, 213 insertions(+) create mode 100644 man-db-2.11.2-groff-1.23.patch diff --git a/man-db-2.11.2-groff-1.23.patch b/man-db-2.11.2-groff-1.23.patch new file mode 100644 index 0000000..776b721 --- /dev/null +++ b/man-db-2.11.2-groff-1.23.patch @@ -0,0 +1,209 @@ +From bbf7701c4f8269090a12791f3c9bde80d45c8765 Mon Sep 17 00:00:00 2001 +From: "G. Branden Robinson" +Date: Wed, 19 Jul 2023 01:58:07 -0500 +Subject: [PATCH 17/30] Improve lexgrog(1) portability + +This fixes a test failure in man1/lexgrog.1 when building against groff +1.23.0. + +Borrow code from groff 1.23.0's "an-ext.tmac" file (licensed as +permissively as a decadent society) to implement `EX` and `EE` extension +macros from Ninth Edition Research Unix (1986) (and groff) to get +monospaced code displays in a more portable way. There is no way to +portably change font families in pure man(7) itself, and the names of +troff typefaces aren't very portable either. There is also no portable +way to test for the _existence_ of a font. FTW. + +("Portable" here largely means "to AT&T device-independent troff +implementations", for which there has been no official source since the +mid-1990s.[1] Several AT&T Unix System V licensees/descendants have +continued to ship their own vendored versions, but these have enjoyed +little or no development for the past 3 decades.) + +* Define a string `mC` to store the name of a presumed monospaced roman + typeface. Use "CW", which is portable to AT&T device-independent + troff of the early 1980s before it occurred to anyone that Courier + might someday be available in italic and bold styles (and budget + available to purchase them). +* Define `mC` as "CR" if using a typesetting device and the formatter is + groff, or claims groff compatibility by the setting the `.g` register. + This is reasonably portable to modern implementations given + traditional troff font naming practices and the pervasive influence of + Adobe Software and the "base fonts" of its PostScript and PDF + specifications. +* If not typesetting (i.e., if using nroff), define `mC` as "R", which + is certain to be available. +* Define `EX` and `EE` macros as groff does, if the formatter does not + set the `.g` register. +* Migrate from `ft CW` and `nf` requests to `EX` macro calls. +* Migrate from `ft P` and `fi` requests to `EE` macro calls. +* Replace an inline use of `\f(CW` with a change to inline bold. There + is to date no portable way to inline a font family change. + +Test passes now. Tested as-is and with the `EX` and `EE` macro +definitions forcibly enabled. + +[1] https://groups.google.com/g/comp.text/c/COkqrii4W0E/m/7HarA8Ha2dAJ +--- + man/man1/lexgrog.man1 | 57 ++++++++++++++++++++++++++++++++----------- + 1 file changed, 43 insertions(+), 14 deletions(-) + +diff --git a/man/man1/lexgrog.man1 b/man/man1/lexgrog.man1 +index 37b9d287..f9f708f8 100644 +--- a/man/man1/lexgrog.man1 ++++ b/man/man1/lexgrog.man1 +@@ -5,6 +5,41 @@ + .\" You may distribute under the terms of the GNU General Public + .\" License as specified in the file docs/COPYING.GPLv2 that comes with the + .\" man-db distribution. ++.\" ++.ds mC CW ++.if t .if \n(.g .ds mC CR ++.if n .ds mC R ++. ++.nr mE 0 \" in an example (EX/EE)? ++. ++.if \n(.g \{\ ++.de EX ++. br ++. if !\\n(mE \{\ ++. nr mF \\n(.f ++. nr mP \\n(PD ++. nr PD 1v ++. nf ++. ft \\*(mC ++. nr mE 1 ++. \} ++.. ++.\} ++. ++. ++.\" End example. ++.if \n(.g \{\ ++.de EE ++. br ++. if \\n(mE \{\ ++. ft \\n(mF ++. nr PD \\n(mP ++. fi ++. nr mE 0 ++. \} ++.. ++.\} ++. + .pc + .TH LEXGROG 1 "%date%" "%version%" "Manual pager utils" + .SH NAME +@@ -133,12 +168,10 @@ macro set, a correct + section looks something like this: + .PP + .RS +-.ft CW +-.nf ++.EX + \&.SH NAME + foo \e\- program to do something +-.fi +-.ft P ++.EE + .RE + .PP + Some manual pagers require the \(oq\e\-\(cq to be exactly as shown; +@@ -157,18 +190,16 @@ If several features with different descriptions are being documented in the + same manual page, the following form is therefore used: + .PP + .RS +-.ft CW +-.nf ++.EX + \&.SH NAME + foo, bar \e\- programs to do something + \&.br + baz \e\- program to do nothing +-.fi +-.ft P ++.EE + .RE + .PP +-(A macro which starts a new paragraph, like \f(CW.PP\fP, may be used instead +-of the break macro \f(CW.br\fP.) ++(A macro which starts a new paragraph, like \fB.PP\fP, may be used instead ++of the break macro \fB.br\fP.) + .PP + When using the BSD-derived + .I mdoc +@@ -177,13 +208,11 @@ macro set, a correct + section looks something like this: + .PP + .RS +-.ft CW +-.nf ++.EX + \&.Sh NAME + \&.Nm foo + \&.Nd program to do something +-.fi +-.ft P ++.EE + .RE + + There are several common reasons why whatis parsing fails. +-- +2.41.0 + +From 043c3cb83ce179e4c49528742df24b3b53923c4d Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Wed, 19 Jul 2023 23:14:20 +0100 +Subject: [PATCH 18/30] Avoid translation fallout from lexgrog(1) fix + +* man/man1/lexgrog.man1: Protect `.ds mC CW` with `.if !'po4a'hide'`, to +avoid "CW" showing up as a string for translation. +--- + man/man1/lexgrog.man1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/man1/lexgrog.man1 b/man/man1/lexgrog.man1 +index f9f708f8..5a5f4206 100644 +--- a/man/man1/lexgrog.man1 ++++ b/man/man1/lexgrog.man1 +@@ -6,7 +6,7 @@ + .\" License as specified in the file docs/COPYING.GPLv2 that comes with the + .\" man-db distribution. + .\" +-.ds mC CW ++.if !'po4a'hide' .ds mC CW + .if t .if \n(.g .ds mC CR + .if n .ds mC R + . +-- +2.41.0 + +From b12ffb9df7a6a8956b08206c36be70fac78508bd Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Thu, 20 Jul 2023 00:18:59 +0100 +Subject: [PATCH 19/30] Update warning regex for groff 1.23.0 + +Part of https://gitlab.com/man-db/man-db/-/issues/25. + +* man/check-man: groff 1.23.0 says "cannot break line" rather than +"can't break line"; update regular expression. +--- + man/check-man | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/check-man b/man/check-man +index a58b7f9d..f8985a0d 100755 +--- a/man/check-man ++++ b/man/check-man +@@ -31,7 +31,7 @@ errors="$(LC_ALL=C MANWIDTH=80 MAN_KEEP_FORMATTING=1 "$top_builddir/libtool" \ + # Indeed, even for other languages we're going to get "cannot adjust line" + # if %manpath_config_file% expands to something long. Hmm. We'll just ignore + # this across the board for now. +-errors="$(echo "$errors" | $EGREP -v "(cannot adjust line|can't break line)")" || true ++errors="$(echo "$errors" | $EGREP -v "(cannot adjust line|(can't|cannot) break line)")" || true + + if [ "$code" != 0 ]; then + echo "man -E UTF-8 -l $1 failed with exit status $code and error output:" +-- +2.41.0 + diff --git a/man-db.spec b/man-db.spec index 504841d..3866787 100644 --- a/man-db.spec +++ b/man-db.spec @@ -15,6 +15,10 @@ Source2: man-db.sysconfig Source3: man-db-cache-update.service Source4: man-db-restart-cache-update.service +# https://gitlab.com/man-db/man-db/-/issues/25 +# https://gitlab.com/man-db/man-db/-/issues/26 +Patch0: man-db-2.11.2-groff-1.23.patch + Obsoletes: man < 2.0 Provides: man = %{version} Provides: man-pages-reader = %{version} From 4de9a52cd338b5e4b62e4574f8d1c6cc9f3e8780 Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Tue, 25 Jul 2023 07:50:29 +0000 Subject: [PATCH 68/83] Release bump after added Patch0 from yselkowitz --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 3866787..b15a175 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.11.2 -Release: 4%{?dist} +Release: 5%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -231,6 +231,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Jul 25 2023 Lukas Javorsky - 2.11.2-5 +- Release bump after added Patch0 from yselkowitz + * Thu Jul 20 2023 Fedora Release Engineering - 2.11.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e10f5e2a91febf213b685924b594b5f6fbb449ed Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Wed, 27 Sep 2023 07:51:58 +0000 Subject: [PATCH 69/83] Rebase to version 2.12.0 Patch0 was upstreamed Resolves: #2240403 --- .gitignore | 1 + man-db.spec | 12 ++++++------ sources | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index c5fff0b..2202d83 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /man-db-2.11.0.tar.xz /man-db-2.11.1.tar.xz /man-db-2.11.2.tar.xz +/man-db-2.12.0.tar.xz diff --git a/man-db.spec b/man-db.spec index b15a175..986878f 100644 --- a/man-db.spec +++ b/man-db.spec @@ -2,8 +2,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.11.2 -Release: 5%{?dist} +Version: 2.12.0 +Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -15,10 +15,6 @@ Source2: man-db.sysconfig Source3: man-db-cache-update.service Source4: man-db-restart-cache-update.service -# https://gitlab.com/man-db/man-db/-/issues/25 -# https://gitlab.com/man-db/man-db/-/issues/26 -Patch0: man-db-2.11.2-groff-1.23.patch - Obsoletes: man < 2.0 Provides: man = %{version} Provides: man-pages-reader = %{version} @@ -231,6 +227,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Wed Sep 27 2023 Lukas Javorsky - 2.12.0-1 +- Rebase to version 2.12.0 +- Patch0 was upstreamed + * Tue Jul 25 2023 Lukas Javorsky - 2.11.2-5 - Release bump after added Patch0 from yselkowitz diff --git a/sources b/sources index d4da7c3..f5f396b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-db-2.11.2.tar.xz) = edb71cce7249c7b7f2f524e92f682047a77ed9ae8856763dfc8e18e239444651ff4c505e697f5a8b1be3b85678e714fbb1a520defe72a4eb685bc2cecc0e4391 +SHA512 (man-db-2.12.0.tar.xz) = 4b644a508cf10ef6d27b6325b08f8a89e0695bbc1409bf420efd27649c6851860cc472c4d86063f7b71dccd01fb158faa82afa1e2b91c9a20154acf66b0349bf From 9cd9dd71489879e2b4ccca0daeeeee5b67f347a5 Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Fri, 29 Sep 2023 08:44:09 +0000 Subject: [PATCH 70/83] Add GPG verify on the package --- .gitignore | 1 + man-db.spec | 18 +++++++++++++----- sources | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2202d83..2414e97 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /man-db-2.11.1.tar.xz /man-db-2.11.2.tar.xz /man-db-2.12.0.tar.xz +/man-db-2.12.0.tar.xz.asc diff --git a/man-db.spec b/man-db.spec index 986878f..09030be 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,17 +3,20 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.12.0 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPL-2.0-or-later AND GPL-3.0-or-later URL: http://www.nongnu.org/man-db/ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz -Source1: man-db.crondaily -Source2: man-db.sysconfig -Source3: man-db-cache-update.service -Source4: man-db-restart-cache-update.service +Source1: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz.asc +Source2: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xac0a4ff12611b6fccf01c111393587d97d86500b + +Source3: man-db.crondaily +Source4: man-db.sysconfig +Source5: man-db-cache-update.service +Source6: man-db-restart-cache-update.service Obsoletes: man < 2.0 Provides: man = %{version} @@ -27,6 +30,7 @@ BuildRequires: gcc BuildRequires: systemd BuildRequires: gdbm-devel, gettext, groff, less, libpipeline-devel, zlib-devel BuildRequires: po4a, perl-interpreter, perl-version +BuildRequires: gnupg2 Recommends: glibc-gconv-extra Requires(post): %{_sbindir}/update-alternatives @@ -53,6 +57,7 @@ BuildArch: noarch This package provides periodic update of man-db cache. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 %build @@ -227,6 +232,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Sep 29 2023 Lukas Javorsky - 2.12.0-2 +- Add GPG verify on the package + * Wed Sep 27 2023 Lukas Javorsky - 2.12.0-1 - Rebase to version 2.12.0 - Patch0 was upstreamed diff --git a/sources b/sources index f5f396b..f496404 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (man-db-2.12.0.tar.xz) = 4b644a508cf10ef6d27b6325b08f8a89e0695bbc1409bf420efd27649c6851860cc472c4d86063f7b71dccd01fb158faa82afa1e2b91c9a20154acf66b0349bf +SHA512 (man-db-2.12.0.tar.xz.asc) = 20ee61dacc33acee92c1c7d9b63df538c8dd884775ae00c3cb984158424a57a6d6906cacd2dc2b914fb3a293dc37b98f757d361b56c6706236867f3462f9996b From 6d98edec09543be5e5bfcc8a5f43987ad665e98f Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Mon, 2 Oct 2023 12:01:03 +0000 Subject: [PATCH 71/83] Rename the GPG key to correct name --- man-db.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/man-db.spec b/man-db.spec index 09030be..6a3a348 100644 --- a/man-db.spec +++ b/man-db.spec @@ -57,6 +57,8 @@ BuildArch: noarch This package provides periodic update of man-db cache. %prep +# Rename the GPG key to correct name +mv lookup 0xac0a4ff12611b6fccf01c111393587d97d86500b %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 From 955f3e8d084dfd40d34257e606d50d88243f7575 Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Mon, 2 Oct 2023 12:37:56 +0000 Subject: [PATCH 72/83] Fix the troublesome URL for GPG key --- .gitignore | 1 + man-db.spec | 6 +++--- sources | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2414e97..e0f75db 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /man-db-2.11.2.tar.xz /man-db-2.12.0.tar.xz /man-db-2.12.0.tar.xz.asc +/0xac0a4ff12611b6fccf01c111393587d97d86500b diff --git a/man-db.spec b/man-db.spec index 6a3a348..519f0ae 100644 --- a/man-db.spec +++ b/man-db.spec @@ -11,7 +11,9 @@ URL: http://www.nongnu.org/man-db/ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz Source1: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz.asc -Source2: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xac0a4ff12611b6fccf01c111393587d97d86500b +# Man-db GPG key is stored in a different name which makes it hard to fetch +# It was downloaded here: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xac0a4ff12611b6fccf01c111393587d97d86500b +Source2: 0xac0a4ff12611b6fccf01c111393587d97d86500b Source3: man-db.crondaily Source4: man-db.sysconfig @@ -57,8 +59,6 @@ BuildArch: noarch This package provides periodic update of man-db cache. %prep -# Rename the GPG key to correct name -mv lookup 0xac0a4ff12611b6fccf01c111393587d97d86500b %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 diff --git a/sources b/sources index f496404..3e58160 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (man-db-2.12.0.tar.xz) = 4b644a508cf10ef6d27b6325b08f8a89e0695bbc1409bf420efd27649c6851860cc472c4d86063f7b71dccd01fb158faa82afa1e2b91c9a20154acf66b0349bf SHA512 (man-db-2.12.0.tar.xz.asc) = 20ee61dacc33acee92c1c7d9b63df538c8dd884775ae00c3cb984158424a57a6d6906cacd2dc2b914fb3a293dc37b98f757d361b56c6706236867f3462f9996b +SHA512 (0xac0a4ff12611b6fccf01c111393587d97d86500b) = 6509ce7ccd1b60b71e180e6ea9c6b63788d55c27f013e03609e649ef1e5b4f28b5358a7a7160e192b20c09e16ba5b24c111bd8275f8218029febe872a016448e From df711152ef4c6b9980356e5adffe7691a20de30c Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Tue, 10 Oct 2023 07:34:18 +0000 Subject: [PATCH 73/83] Fix the Source numbering in installation Resolves: BZ#2242757 --- man-db.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/man-db.spec b/man-db.spec index 519f0ae..974a93b 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.12.0 -Release: 2%{?dist} +Release: 3%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -100,18 +100,18 @@ install -d -m 0755 $RPM_BUILD_ROOT%{cache} # install cron script for man-db creation/update mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily -install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/man-db.cron +install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/man-db.cron # config for cron script mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig -install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/man-db +install -D -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/man-db # config for tmpfiles.d install -D -p -m 0644 init/systemd/man-db.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/. # man-db-cache-update.service and man-db-restart-cache-update.service -install -D -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/man-db-cache-update.service -install -D -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/man-db-restart-cache-update.service +install -D -p -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/man-db-cache-update.service +install -D -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/man-db-restart-cache-update.service %find_lang %{name} %find_lang %{name}-gnulib @@ -234,6 +234,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Tue Oct 10 2023 Lukas Javorsky - 2.12.0-3 +- Fix the Source numbering in installation +- Resolves: BZ#2242757 + * Fri Sep 29 2023 Lukas Javorsky - 2.12.0-2 - Add GPG verify on the package From e8d5ff504e2c8936276f28c749b104207328ebfa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 06:51:30 +0000 Subject: [PATCH 74/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 974a93b..6feaa4f 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.12.0 -Release: 3%{?dist} +Release: 4%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -234,6 +234,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 2.12.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Oct 10 2023 Lukas Javorsky - 2.12.0-3 - Fix the Source numbering in installation - Resolves: BZ#2242757 From fa547dece9277ed38bee2d9ad5c2fb208e0fb3f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 05:42:56 +0000 Subject: [PATCH 75/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 6feaa4f..690cc8a 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.12.0 -Release: 4%{?dist} +Release: 5%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -234,6 +234,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 2.12.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 2.12.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 736fc6804d9bd41b665e7759138cba79b07a6801 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 29 Jan 2024 10:59:29 +0000 Subject: [PATCH 76/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 690cc8a..298f557 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.12.0 -Release: 5%{?dist} +Release: 6%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -234,6 +234,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Mon Jan 29 2024 Fedora Release Engineering - 2.12.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 2.12.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 17d44d57206ef511feda0cd9b72ab0182c529be0 Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Mon, 8 Apr 2024 10:46:46 +0000 Subject: [PATCH 77/83] Rebase to version 2.12.1 --- .gitignore | 2 ++ man-db.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e0f75db..061c9c9 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ /man-db-2.12.0.tar.xz /man-db-2.12.0.tar.xz.asc /0xac0a4ff12611b6fccf01c111393587d97d86500b +/man-db-2.12.1.tar.xz +/man-db-2.12.1.tar.xz.asc diff --git a/man-db.spec b/man-db.spec index 298f557..a375a19 100644 --- a/man-db.spec +++ b/man-db.spec @@ -2,8 +2,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.12.0 -Release: 6%{?dist} +Version: 2.12.1 +Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -234,6 +234,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Mon Apr 08 2024 Lukas Javorsky - 2.12.1-1 +- Rebase to version 2.12.1 + * Mon Jan 29 2024 Fedora Release Engineering - 2.12.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 3e58160..6d3b82a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (man-db-2.12.0.tar.xz) = 4b644a508cf10ef6d27b6325b08f8a89e0695bbc1409bf420efd27649c6851860cc472c4d86063f7b71dccd01fb158faa82afa1e2b91c9a20154acf66b0349bf -SHA512 (man-db-2.12.0.tar.xz.asc) = 20ee61dacc33acee92c1c7d9b63df538c8dd884775ae00c3cb984158424a57a6d6906cacd2dc2b914fb3a293dc37b98f757d361b56c6706236867f3462f9996b +SHA512 (man-db-2.12.1.tar.xz) = 0f79f4205ce116c3148dc6caf561c1b7d793aac234188ef8edd1b1f5aaaebcca32c65ef403dff65896920535077fb63ddc2e9cb293efdb6ef3037c33916aa329 +SHA512 (man-db-2.12.1.tar.xz.asc) = 3b3702312aa0cc1e0f2eb3f91734816cb6b3eb548e5108b9ecf7cca84647ca031c01f3f512359812be795ad1d1bd45bece8b594957f8ff9703c38917e94c2bf8 SHA512 (0xac0a4ff12611b6fccf01c111393587d97d86500b) = 6509ce7ccd1b60b71e180e6ea9c6b63788d55c27f013e03609e649ef1e5b4f28b5358a7a7160e192b20c09e16ba5b24c111bd8275f8218029febe872a016448e From 5bc523e8ce390eb2bcb5b611444fb2d01051353b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Wed, 8 May 2024 12:49:56 +0200 Subject: [PATCH 78/83] Add Packit configuration --- .packit.yaml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..774fcc5 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,30 @@ +specfile_path: man-db.spec + +upstream_package_name: man-db +downstream_package_name: man-db + +upstream_project_url: https://gitlab.com/man-db/man-db + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + + - job: koji_build + trigger: commit + allowed_pr_authors: + - packit + - all_admins + allowed_committers: + - all_admins + dist_git_branches: + - fedora-all + + - job: bodhi_update + trigger: commit + allowed_builders: + - packit + - all_admins + dist_git_branches: + - fedora-branched # rawhide updates are created automatically From 863a7fe5e18300dc4267861bc12535a4b656338b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 16:41:25 +0000 Subject: [PATCH 79/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index a375a19..8d78e49 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.12.1 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -234,6 +234,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Apr 08 2024 Lukas Javorsky - 2.12.1-1 - Rebase to version 2.12.1 From 988da013eaa1cfe3d41d2c06517bf33b04da74e8 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 29 Aug 2024 12:27:07 +0000 Subject: [PATCH 80/83] Update to 2.13.0 upstream release - Resolves: rhbz#2308476 Upstream tag: 2.13.0 Upstream commit: 3312d1c1 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ README.packit | 3 +++ man-db.spec | 8 ++++++-- sources | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 061c9c9..014f7ec 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ /0xac0a4ff12611b6fccf01c111393587d97d86500b /man-db-2.12.1.tar.xz /man-db-2.12.1.tar.xz.asc +/man-db-2.13.0.tar.xz +/man-db-2.13.0.tar.xz.asc diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..3331d79 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.100.3.post1.dev9+g7a8deb2b. diff --git a/man-db.spec b/man-db.spec index 8d78e49..e1c41b3 100644 --- a/man-db.spec +++ b/man-db.spec @@ -2,8 +2,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.12.1 -Release: 2%{?dist} +Version: 2.13.0 +Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -234,6 +234,10 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Thu Aug 29 2024 Packit - 2.13.0-1 +- Update to version 2.13.0 +- Resolves: rhbz#2308476 + * Thu Jul 18 2024 Fedora Release Engineering - 2.12.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 6d3b82a..cc5ff27 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (man-db-2.12.1.tar.xz) = 0f79f4205ce116c3148dc6caf561c1b7d793aac234188ef8edd1b1f5aaaebcca32c65ef403dff65896920535077fb63ddc2e9cb293efdb6ef3037c33916aa329 -SHA512 (man-db-2.12.1.tar.xz.asc) = 3b3702312aa0cc1e0f2eb3f91734816cb6b3eb548e5108b9ecf7cca84647ca031c01f3f512359812be795ad1d1bd45bece8b594957f8ff9703c38917e94c2bf8 +SHA512 (man-db-2.13.0.tar.xz) = 612ce39bb1e11aa7797e8e3a26f06a7154c48a13b2d74217c2c6701e0d33fa8f77ae2b8c9ee84353e364d16918f884115f2dfbf3cd743edd4ed32b763b87f723 +SHA512 (man-db-2.13.0.tar.xz.asc) = 483fb32f731f6135f9843faec4148048321aa8ac8a38ea6fac463f1addba47c827be6e1a6daefc11ca6cc33630dc939162e91620df5f9a2e443cadd607dbd8bd SHA512 (0xac0a4ff12611b6fccf01c111393587d97d86500b) = 6509ce7ccd1b60b71e180e6ea9c6b63788d55c27f013e03609e649ef1e5b4f28b5358a7a7160e192b20c09e16ba5b24c111bd8275f8218029febe872a016448e From d6ad9bb2de7afb20a612569658285e3ef938eeb7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 16:49:45 +0000 Subject: [PATCH 81/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index e1c41b3..f1cec98 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.13.0 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -234,6 +234,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 2.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Aug 29 2024 Packit - 2.13.0-1 - Update to version 2.13.0 - Resolves: rhbz#2308476 From 58fdc092376ed74f26aecc8543296ffacb64f859 Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Mon, 5 May 2025 11:12:11 +0000 Subject: [PATCH 82/83] Rebase to version 2.13.1 and add Ukrainian lang Resolves: BZ#2363668 --- .gitignore | 2 ++ man-db.spec | 8 ++++++-- sources | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 014f7ec..292c7d2 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ /man-db-2.12.1.tar.xz.asc /man-db-2.13.0.tar.xz /man-db-2.13.0.tar.xz.asc +/man-db-2.13.1.tar.xz +/man-db-2.13.1.tar.xz.asc diff --git a/man-db.spec b/man-db.spec index f1cec98..e4dcc8b 100644 --- a/man-db.spec +++ b/man-db.spec @@ -2,8 +2,8 @@ Summary: Tools for searching and reading man pages Name: man-db -Version: 2.13.0 -Release: 2%{?dist} +Version: 2.13.1 +Release: 1%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -229,11 +229,15 @@ fi %lang(sv) %{_datadir}/man/sv/man*/* %lang(tr) %{_datadir}/man/tr/man*/* %lang(zh_CN) %{_datadir}/man/zh_CN/man*/* +%lang(uk) %{_datadir}/man/uk/man*/* %files cron %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Mon May 05 2025 Lukas Javorsky - 2.13.1-1 +- Rebase to version 2.13.1 + * Fri Jan 17 2025 Fedora Release Engineering - 2.13.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index cc5ff27..3118843 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (man-db-2.13.0.tar.xz) = 612ce39bb1e11aa7797e8e3a26f06a7154c48a13b2d74217c2c6701e0d33fa8f77ae2b8c9ee84353e364d16918f884115f2dfbf3cd743edd4ed32b763b87f723 -SHA512 (man-db-2.13.0.tar.xz.asc) = 483fb32f731f6135f9843faec4148048321aa8ac8a38ea6fac463f1addba47c827be6e1a6daefc11ca6cc33630dc939162e91620df5f9a2e443cadd607dbd8bd +SHA512 (man-db-2.13.1.tar.xz) = 9b39f512fe940e648ca7f47803f42e473064253b67eb96995d28da30fd322de31a4466bf821e9391e6041af2318a6d2c2d74102b73f4b42a63966b41d2df0578 +SHA512 (man-db-2.13.1.tar.xz.asc) = 0d7f5b58430ce779261f68517c212b0517485300d8ea3d6a8232b0ac6c892671346ce7a4f4c6621b512516ca4c70bc09d5d828ed54a2a27c30ca70d3c77f7cdd SHA512 (0xac0a4ff12611b6fccf01c111393587d97d86500b) = 6509ce7ccd1b60b71e180e6ea9c6b63788d55c27f013e03609e649ef1e5b4f28b5358a7a7160e192b20c09e16ba5b24c111bd8275f8218029febe872a016448e From 5d1055fdbd880cfbfc4f9d8bf98cd616caf77515 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:14:38 +0000 Subject: [PATCH 83/83] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- man-db.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index e4dcc8b..970167c 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.13.1 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -235,6 +235,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 2.13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon May 05 2025 Lukas Javorsky - 2.13.1-1 - Rebase to version 2.13.1