diff --git a/.gitignore b/.gitignore index af4b15b..5a23b67 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /man-pages-posix-2003-a.tar.bz2 /man-pages-additional-20101006.tar.bz2 -/man-pages-3.40.tar.gz +/man-pages-3.41.tar.xz diff --git a/man-pages-2.48-passwd.patch b/man-pages-2.48-passwd.patch deleted file mode 100644 index 6e2f431..0000000 --- a/man-pages-2.48-passwd.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up man-pages-3.40/man5/passwd.5.orig man-pages-3.40/man5/passwd.5 ---- man-pages-3.40/man5/passwd.5.orig 2012-04-27 00:58:39.000000000 +0200 -+++ man-pages-3.40/man5/passwd.5 2012-04-27 14:03:10.113106253 +0200 -@@ -50,6 +50,15 @@ and the encrypted passwords are in - .IR /etc/shadow , - which is readable by the superuser only. - .PP -+If the encrypted password, whether in /etc/passwd or in /etc/shadow, is -+an empty string, login is allowed without even asking for a password. -+Note that this functionality may be intentionally disabled in applications, -+or configurable (for example using the "nullok" or "nonull" arguments to -+pam_unix.so). -+.PP -+If the encrypted password in /etc/passwd is "*NP*" (without the quotes), -+the shadow record should be obtained from a NIS+ server. -+.PP - Regardless of whether shadow passwords are used, many system administrators - use an asterisk (*) in the encrypted password field to make sure - that this user can not authenticate him- or herself using a diff --git a/man-pages-3.23-proc.patch b/man-pages-3.23-proc.patch deleted file mode 100644 index 7ad752f..0000000 --- a/man-pages-3.23-proc.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up man-pages-3.32/man5/proc.5.orig man-pages-3.32/man5/proc.5 ---- man-pages-3.32/man5/proc.5.orig 2010-12-03 08:02:02.000000000 +0100 -+++ man-pages-3.32/man5/proc.5 2011-05-27 10:07:56.000000000 +0200 -@@ -1795,6 +1795,10 @@ For further details, see - .I /proc/sys/fs/file-max - This file defines - a system-wide limit on the number of open files for all processes. -+This limit is not applied when a root user (or -+any user with -+.B CAP_SYS_ADMIN -+privileges) is trying to open a file. - (See also - .BR setrlimit (2), - which can be used by a process to set the per-process limit, diff --git a/man-pages-3.23-proc_cgroups.patch b/man-pages-3.23-proc_cgroups.patch deleted file mode 100644 index 6969df4..0000000 --- a/man-pages-3.23-proc_cgroups.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up man-pages-3.32/man5/proc.5.pom man-pages-3.32/man5/proc.5 ---- man-pages-3.32/man5/proc.5.pom 2011-05-27 10:11:52.000000000 +0200 -+++ man-pages-3.32/man5/proc.5 2011-05-27 09:17:37.000000000 +0200 -@@ -94,12 +94,35 @@ to the process at exec time. - The format is one \fIunsigned long\fP ID - plus one \fIunsigned long\fP value for each entry. - The last entry contains two zeros. --.\" FIXME Describe /proc/[pid]/cgroup and --.\" /proc/[pid]/task/[tid]/cgroup --.\" Info in Documentation/cgroups.txt --.\" Added in 2.6.24 --.\" CONFIG_CGROUPS --.\" -+.TP -+.I /proc/[pid]/cgroup " (since Linux 2.6.24)" -+This file describes control groups to which the process/task -+belongs. For each cgroup hierarchy there is one entry of the form -+.nf -+.ft CW -+ -+ 5:cpuacct,cpu,cpuset:/daemons -+(1) (2) (3) -+.ft -+.fi -+.IP -+The numbers in parentheses are labels for the descriptions below: -+.RS 7 -+.TP 5 -+(1) -+hierarchy id number -+.TP -+(2) -+set of subsystems bound to the hierarchy -+.TP -+(3) -+control group in the hierarchy to which the process belongs -+.RE -+.IP -+ -+This file is only present if the -+.B CONFIG_CGROUPS -+kernel configuration option is enabled. - .\" FIXME Describe /proc/[pid]/clear_refs - .\" Added in 2.6.22 - .\" "Clears page referenced bits shown in smaps output" diff --git a/man-pages-3.24-mmap64.patch b/man-pages-3.24-mmap64.patch deleted file mode 100644 index e01e597..0000000 --- a/man-pages-3.24-mmap64.patch +++ /dev/null @@ -1,6 +0,0 @@ -diff -up man-pages-3.24/man3/mmap64.3.pom man-pages-3.24/man3/mmap64.3 ---- man-pages-3.24/man3/mmap64.3.pom 2010-02-26 05:46:32.000000000 +0100 -+++ man-pages-3.24/man3/mmap64.3 2010-06-04 08:35:13.000000000 +0200 -@@ -1 +1 @@ --.so man2/mmap2.2 -+.so man2/mmap.2 diff --git a/man-pages-3.27-sd.patch b/man-pages-3.27-sd.patch deleted file mode 100644 index 5e6f888..0000000 --- a/man-pages-3.27-sd.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up man-pages-3.27/man4/sd.4pom man-pages-3.27/man4/sd.4 ---- man-pages-3.27/man4/sd.4pom 2010-09-23 17:20:13.000000000 +0200 -+++ man-pages-3.27/man4/sd.4 2010-09-23 17:20:48.000000000 +0200 -@@ -118,7 +118,7 @@ Forces a reread of the SCSI disk partiti - No parameter is needed. - - The --.BR scsi (4) -+.BR scsi - .BR ioctl (2) - operations are also supported. - If the diff --git a/man-pages.spec b/man-pages.spec index 9fd4768..de0731b 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -3,12 +3,12 @@ Summary: Man (manual) pages from the Linux Documentation Project Name: man-pages -Version: 3.40 -Release: 2%{?dist} +Version: 3.41 +Release: 1%{?dist} License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE Group: Documentation URL: http://man7.org/linux/man-pages/ -Source0: http://man7.org/linux/man-pages/download/man-pages-%{version}.tar.gz +Source0: http://man7.org/linux/man-pages/download/man-pages-%{version}.tar.xz # POSIX man pages Source1: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-%{posix_version}-%{posix_release}.tar.bz2 # additional man-pages, the source tarball is fedora only @@ -16,21 +16,20 @@ Source1: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-page Source2: man-pages-additional-20101006.tar.bz2 Patch28: man-pages-2.46-nscd.patch Patch36: man-pages-2.63-unimplemented.patch -Patch45: man-pages-2.48-passwd.patch Patch46: man-pages-2.51-nscd-conf.patch +# Declined by upstream Patch53: man-pages-2.78-stream.patch Patch57: man-pages-3.22-nsswitch.conf.patch -Patch58: man-pages-3.23-proc.patch Patch59: man-pages-3.23-ld.so.patch Patch60: man-pages-3.22-sched_setaffinity.patch +# Declined by upstream Patch63: man-pages-3.24-getnameinfo.patch -Patch67: man-pages-3.24-mmap64.patch -Patch69: man-pages-3.27-sd.patch +# Declined by upstream Patch70: man-pages-3.29-uri.patch Patch71: man-pages-posix-2003-awk.patch Patch72: man-pages-posix-2003-man.patch Patch73: man-pages-posix-2003-printf.patch -#Resolves: #647269 +#Resolves: #647269, # Declined by upstream Patch75: man-pages-3.30-prctl.patch #Resolves: #652870 Patch76: man-pages-3.32-strtol.patch @@ -44,8 +43,6 @@ Patch79: man-pages-3.32-spellch.patch Patch80: man-pages-3.35-printf.patch #resolves: #698149 Patch82: man-pages-3.32-host.patch -#resolves: #705888 -Patch83: man-pages-3.23-proc_cgroups.patch #resolves: #723578 Patch84: man-pages-3.35-readlink3p.patch #Resolves: #655961 @@ -66,16 +63,12 @@ mv man-pages-posix-%{posix_version}-%{posix_release}/* ./ rmdir man-pages-posix-%{posix_version}-%{posix_release} %patch28 -p1 %patch36 -p1 -%patch45 -p1 %patch46 -p1 %patch53 -p1 %patch57 -p1 -%patch58 -p1 %patch59 -p1 %patch60 -p1 %patch63 -p1 -%patch67 -p1 -%patch69 -p1 %patch70 -p1 %patch71 -p1 %patch72 -p1 @@ -87,7 +80,6 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release} %patch79 -p1 %patch80 -p1 %patch82 -p1 -%patch83 -p1 %patch84 -p1 ### And now remove those we are not going to use: @@ -144,6 +136,10 @@ rm -rf $RPM_BUILD_ROOT %lang(en) %{_mandir}/en/man*/* %changelog +* Thu May 17 2012 Peter Schiffer - 3.41-1 +- resolves: #820901 + update to 3.41 + * Fri Apr 27 2012 Peter Schiffer - 3.40-2 - related: #797857 fixed broken source file diff --git a/sources b/sources index efd938f..95e626d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 7c78aff03c0a6767ba483d34f19e4b09 man-pages-posix-2003-a.tar.bz2 6cea268fa2debf9b6440ee5c37cd4bc8 man-pages-additional-20101006.tar.bz2 -41f40b4890c2f463840ed7070e68ab3a man-pages-3.40.tar.gz +7395d284fa1b9e112006d736865781b0 man-pages-3.41.tar.xz