Compare commits
10 Commits
7506dbca22
...
5915b2283f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5915b2283f | ||
|
|
70032c907d | ||
|
|
4ca2f24436 | ||
|
|
07d48760c9 | ||
|
|
d14e8adfe7 | ||
|
|
debee7b8bf | ||
|
|
d7a08c9a0f | ||
|
|
012800b5a7 | ||
|
|
f66131f905 | ||
|
|
f2eb35dd19 |
43
backport-mandb-Fix-crash-when-processing-stray-cats.patch
Normal file
43
backport-mandb-Fix-crash-when-processing-stray-cats.patch
Normal file
@ -0,0 +1,43 @@
|
||||
From bc2573614d40ccf457991223d6727e29486621f4 Mon Sep 17 00:00:00 2001
|
||||
From: Colin Watson <cjwatson@debian.org>
|
||||
Date: Sun, 1 Jan 2023 17:51:27 +0000
|
||||
Subject: [PATCH] mandb: Fix crash when processing stray cats
|
||||
|
||||
Regression introduced in man-db 2.11.0. Fixes Debian bug #1027487.
|
||||
|
||||
* src/straycats.c (check_for_stray): Pass a basic trace list to
|
||||
`store_descriptions`, since that's required as of commit
|
||||
d3e4b5522ae8152f10db0bb98e6873c9cc17ed59.
|
||||
* NEWS.md: Document this.
|
||||
---
|
||||
src/straycats.c | 9 +++++++--
|
||||
1 files changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/straycats.c b/src/straycats.c
|
||||
index 95e8750a..932230b0 100644
|
||||
--- a/src/straycats.c
|
||||
+++ b/src/straycats.c
|
||||
@@ -251,13 +251,18 @@ static int check_for_stray (MYDBM_FILE dbf)
|
||||
if (find_name_decompressed (decomp,
|
||||
catdir_base,
|
||||
&lg)) {
|
||||
- gl_list_t descs;
|
||||
+ gl_list_t descs, trace;
|
||||
strays++;
|
||||
descs = parse_descriptions
|
||||
(mandir_base, lg.whatis);
|
||||
+ trace = new_string_list (GL_ARRAY_LIST,
|
||||
+ true);
|
||||
+ gl_list_add_last (trace,
|
||||
+ xstrdup (catdir));
|
||||
store_descriptions (dbf, descs, info,
|
||||
NULL, mandir_base,
|
||||
- NULL);
|
||||
+ trace);
|
||||
+ gl_list_free (trace);
|
||||
gl_list_free (descs);
|
||||
} else if (quiet < 2)
|
||||
error (0, 0, _("warning: %s: whatis parse for %s(%s) failed"),
|
||||
--
|
||||
GitLab
|
||||
|
||||
BIN
man-db-2.11.0.tar.xz
Normal file
BIN
man-db-2.11.0.tar.xz
Normal file
Binary file not shown.
Binary file not shown.
44
man-db.spec
44
man-db.spec
@ -1,8 +1,8 @@
|
||||
%global cache /var/cache/man
|
||||
|
||||
Name: man-db
|
||||
Version: 2.9.3
|
||||
Release: 5
|
||||
Version: 2.11.0
|
||||
Release: 2
|
||||
Summary: Online database for using man pages
|
||||
License: GPLv2+ and GPLv3+
|
||||
URL: http://www.nongnu.org/man-db/
|
||||
@ -11,21 +11,24 @@ Source1: man-db.crondaily
|
||||
Source2: man-db.sysconfig
|
||||
Source3: man-db-cache-update.service
|
||||
|
||||
Patch1: backport-mandb-Fix-crash-when-processing-stray-cats.patch
|
||||
|
||||
BuildRequires: gcc systemd gdbm-devel gettext groff less libpipeline-devel zlib-devel
|
||||
BuildRequires: po4a perl-interpreter perl-version make
|
||||
Requires: coreutils grep groff gzip less crontabs
|
||||
BuildRequires: po4a perl-interpreter perl-version make chrpath
|
||||
Requires: coreutils grep groff-base gzip less crontabs
|
||||
|
||||
Provides: man = %{version} man-pages-reader = %{version} bundled(gnulib) = 20140202
|
||||
Obsoletes: man < 2.0
|
||||
Provides: man-db-cron
|
||||
Obsoletes: man-db-cron
|
||||
Obsoletes: man-pages-zh-CN
|
||||
|
||||
%description
|
||||
man-db is an implementation of the standard Unix documentation system accessed using the man command.
|
||||
It uses a Berkeley DB database in place of the traditional flat-text whatis databases.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version}
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
@ -95,8 +98,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) /usr/lib/tmpfiles.d/man-db.conf
|
||||
@ -152,8 +155,35 @@ fi
|
||||
%{_mandir}/pt/man8/*
|
||||
%exclude %{_datadir}/man/man1/zsoelim.1.gz
|
||||
%exclude %{_libdir}/man-db/*.la
|
||||
%{_mandir}/ro/man1/apropos.1.gz
|
||||
%{_mandir}/ro/man1/lexgrog.1.gz
|
||||
%{_mandir}/ro/man1/man-recode.1.gz
|
||||
%{_mandir}/ro/man1/man.1.gz
|
||||
%{_mandir}/ro/man1/manconv.1.gz
|
||||
%{_mandir}/ro/man1/manpath.1.gz
|
||||
%{_mandir}/ro/man1/whatis.1.gz
|
||||
%{_mandir}/ro/man1/zsoelim.1.gz
|
||||
%{_mandir}/ro/man5/manpath.5.gz
|
||||
%{_mandir}/ro/man8/accessdb.8.gz
|
||||
%{_mandir}/ro/man8/catman.8.gz
|
||||
%{_mandir}/ro/man8/mandb.8.gz
|
||||
|
||||
%changelog
|
||||
* Sat Jun 17 2023 yanglongkang <yanglongkang@h-partners.com> - 2.11.0-2
|
||||
- Fix crash when processing stray cats
|
||||
|
||||
* Mon Nov 07 2022 renhongxun <renhongxun@h-partners.com> - 2.11.0-1
|
||||
- upgrade version to 2.11.0
|
||||
|
||||
* Mon Mar 21 2022 fushanqing <fushanqing@kylinos.cn> - 2.9.4-3
|
||||
- change Requires: groff-base
|
||||
|
||||
* Fri Jan 07 2022 shangyibin <shangyibin1@huawei.com> - 2.9.4-2
|
||||
- Fix compilation failed
|
||||
|
||||
* Sun Dec 26 2021 liudabo <liudabo1@huawei.com> - 2.9.4-1
|
||||
- upgrade version to 2.9.4
|
||||
|
||||
* Wed Sep 8 2021 wuchaochao <wuchaochao4@huawei.com> - 2.9.3-5
|
||||
- change Requires: groff
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user