pool/man
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/man?expand=0&rev=12

Browse Source
This commit is contained in:
OBS User unknown 2007-09-20 12:08:33 +00:00 committed by Git OBS Bridge
parent 7aab77e007
commit 0aa4b1741f
3 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
man-db-2.4.3-globbing.dif Normal file
View File

@ -0,0 +1,41 @@
--- src/globbing.c
+++ src/globbing.c 2007-09-19 13:35:04.128822519 +0200
@@ -28,7 +28,9 @@
#endif /* HAVE_CONFIG_H */
/* Need _GNU_SOURCE for FNM_CASEFOLD. */
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
#include <stdio.h>
@@ -340,13 +342,22 @@ char **look_for_file (const char *unesc_
/* allow lookups like "3x foo" to match "../man3/foo.3x" */
if ((layout & LAYOUT_GNU) && CTYPE (isdigit, *sec) && sec[1] != '\0') {
- path = strappend (path, hier, cat ? "/cat" : "/man", "\t",
- NULL);
- *strrchr (path, '\t') = *sec;
- pattern = end_pattern (strappend (pattern, name, NULL), sec);
+ off_t nptr, nsec;
- status = match_in_directory (path, pattern, !match_case,
- &gbuf);
+ path = strappend (path, hier, cat ? "/cat" : "/man", NULL);
+ nptr = strlen(path);
+ path = strappend (path, sec, NULL);
+ nsec = nptr + strlen(sec);
+
+ while (nsec > nptr) {
+ *(path + nsec--) = '\0';
+ if (pattern)
+ *pattern = '\0';
+ pattern = end_pattern (strappend (pattern, name, NULL), sec);
+ status = match_in_directory (path, pattern, !match_case, &gbuf);
+ if ((status == 0) && (gbuf.gl_pathc != 0))
+ break;
+ }
}
/* AIX glob.h doesn't define GLOB_NOMATCH and the manpage is vague

6
man.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 19 13:39:50 CEST 2007 - werner@suse.de
- Be sure that e.g. /usr/share/man/man3p/open.3p.gz is found before
/usr/share/man/man3/open.3pm.gz by "man 3p open" (bug #310498)
-------------------------------------------------------------------
Fri Jul 27 12:50:48 CEST 2007 - mfabian@suse.de

10
man.spec
View File

@ -18,14 +18,14 @@ BuildRequires: gdbm-devel less libbz2-devel libzio-devel zlib-devel
BuildRequires: libzio util-linux
%endif
Version: 2.4.3
Release: 73
Release: 84
Summary: A Program for Displaying man Pages
License: GPL v2 or later
Group: System/Base
PreReq: fileutils fillup
Provides: man_db
Requires: groff >= 1.18 less
Autoreqprov: on
AutoReqProv: on
Source: man-db-%{version}.tar.bz2
Source1: sysconfig.cron-man
Source2: cron.daily.do_mandb
@ -39,6 +39,7 @@ Patch5: man-db-2.4.1-security2.dif
Patch6: man-db-2.4.1-security4.dif
Patch7: man-db-2.4.3-firefox.dif
Patch8: man-db-2.4.3-chinese.dif
Patch9: man-db-2.4.3-globbing.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -61,6 +62,7 @@ Authors:
%patch6 -p0 -b .secu4
%patch7 -p0 -b .firefox
%patch8 -p0 -b .chinese
%patch9 -p0 -b .globbing
%patch -p0
%build
@ -161,8 +163,10 @@ test -d var/catman/ && rm -rf var/catman/ || true
%defattr(-,man,daemon)
/var/cache/man/*
/var/adm/fillup-templates/sysconfig.cron-man
%changelog
* Wed Sep 19 2007 - werner@suse.de
- Be sure that e.g. /usr/share/man/man3p/open.3p.gz is found before
/usr/share/man/man3/open.3pm.gz by "man 3p open" (bug #310498)
* Fri Jul 27 2007 - mfabian@suse.de
- change BuildRequires to make it build in the openSUSE build
service for versions <= 10.2 as well.