rpm/man
SHA256
1
0
Fork 0
forked from pool/man
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
OBS User unknown 2008-01-10 01:13:07 +00:00 committed by Git OBS Bridge
parent 3b6fcdb221
commit 27ac5bcd2f
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
man-db-2.5.0.dif
View File

@ -1849,7 +1849,7 @@
if (catpath) {
database = mkdbname (catpath);
--- src/wrapper.c
+++ src/wrapper.c 2007-12-10 16:05:45.493435000 +0100
+++ src/wrapper.c 2008-01-07 13:06:01.941835371 +0100
@@ -25,6 +25,7 @@
#include <stdio.h>
#include <unistd.h>
@ -1882,7 +1882,7 @@
struct passwd *pwd;
argc = argc; /* not used */
@@ -83,57 +85,49 @@ int main (int argc, char **argv)
@@ -83,57 +85,56 @@ int main (int argc, char **argv)
program_name = xstrdup (basename (argv[0]));
ruid = getuid ();
@ -1937,6 +1937,13 @@
+ if (ruid == 0) {
+ ruid = pwd->pw_uid;
+ rgid = pwd->pw_gid;
+ } else {
+#ifndef MAN_CATS
+ /* No permissions required to create files
+ * under the sub directories of /var/chache/man */
+ pwd->pw_uid = ruid;
+ pwd->pw_gid = rgid;
+#endif
+ }
+ if (setregid (rgid, pwd->pw_gid)) {
+ fprintf (stderr, _("%s: Failed su to user %s\n"), wlp->prog, wlp->user);

6
man.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 7 13:08:16 CET 2008 - werner@suse.de
- Remove suid root from wrapper as we do not cache manual page
anymore (bug #351988)
-------------------------------------------------------------------
Thu Dec 13 17:07:08 CET 2007 - werner@suse.de

13
man.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package man (Version 2.5.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -23,7 +23,7 @@ BuildRequires: gettext-runtime gettext-tools
BuildRequires: gettext gettext-devel
%endif
Version: 2.5.0
Release: 2
Release: 7
Summary: A Program for Displaying man Pages
License: GPL v2 or later
Group: System/Base
@ -172,8 +172,8 @@ test -d var/catman/ && rm -rf var/catman/ || true
%{_bindir}/apropos
%{_bindir}/catman
%{_bindir}/lexgrog
%attr(4755,root,root) %{_bindir}/man
%attr(4755,root,root) %{_bindir}/mandb
%attr(0755,root,root) %{_bindir}/man
%attr(0755,root,root) %{_bindir}/mandb
%{_bindir}/manpath
%{_bindir}/whatis
%{_bindir}/zsoelim
@ -222,11 +222,14 @@ test -d var/catman/ && rm -rf var/catman/ || true
%doc %{_mandir}/man1/*.1.gz
%doc %{_mandir}/man5/*.5.gz
%doc %{_mandir}/man8/*.8.gz
%defattr(-,man,daemon)
%defattr(-,man,man)
%{_localstatedir}/cache/man/*
%{_localstatedir}/adm/fillup-templates/sysconfig.cron-man
%changelog
* Mon Jan 07 2008 - werner@suse.de
- Remove suid root from wrapper as we do not cache manual page
anymore (bug #351988)
* Thu Dec 13 2007 - werner@suse.de
- Add workaround for gettext 0.17
* Mon Dec 10 2007 - werner@suse.de