[man-pages] - resolves: #797857 update to 3.40

Fri Apr 27 13:44:00 UTC 2012

commit e33511b9fdccde2c396fa49a781aabe4518cd4e5
Author: Peter Schiffer <pschiffe at redhat.com>
Date:   Fri Apr 27 15:43:36 2012 +0200

    - resolves: #797857
      update to 3.40

 .gitignore                         |    2 +-
 man-pages-2.48-passwd.patch        |   16 +++++-----------
 man-pages-3.22-nsswitch.conf.patch |   20 +++++++++-----------
 man-pages-3.26-rcmd.patch          |   11 -----------
 man-pages-3.35-fallocate.patch     |   24 ------------------------
 man-pages.spec                     |   13 ++++++-------
 sources                            |    4 +---
 7 files changed, 22 insertions(+), 68 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 2971677..af4b15b 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.35.tar.gz
+/man-pages-3.40.tar.gz
diff --git a/man-pages-2.48-passwd.patch b/man-pages-2.48-passwd.patch
index 1e66850..6e2f431 100644
--- a/man-pages-2.48-passwd.patch
+++ b/man-pages-2.48-passwd.patch
@@ -1,13 +1,7 @@
-diff -up man-pages-3.30/man5/passwd.5.pom man-pages-3.30/man5/passwd.5
---- man-pages-3.30/man5/passwd.5.pom	2010-11-01 15:55:41.000000000 +0100
-+++ man-pages-3.30/man5/passwd.5	2010-11-05 09:33:57.000000000 +0100
-@@ -45,11 +45,20 @@ hardware was too slow to crack a well-ch
- basic assumption used to be that of a friendly user-community.
- These days many people run some version of the shadow password suite, where
- .I /etc/passwd
--has asterisks (*) instead of encrypted passwords,
-+has "x" instead of encrypted passwords,
- and the encrypted passwords are in
+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
@@ -21,5 +15,5 @@ diff -up man-pages-3.30/man5/passwd.5.pom man-pages-3.30/man5/passwd.5
 +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
+ 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.22-nsswitch.conf.patch b/man-pages-3.22-nsswitch.conf.patch
index 073daf0..8fa408b 100644
--- a/man-pages-3.22-nsswitch.conf.patch
+++ b/man-pages-3.22-nsswitch.conf.patch
@@ -1,15 +1,13 @@
-diff -up man-pages-3.22/man5/nsswitch.conf.5.pom man-pages-3.22/man5/nsswitch.conf.5
---- man-pages-3.22/man5/nsswitch.conf.5.pom	2009-07-25 08:53:42.000000000 +0200
-+++ man-pages-3.22/man5/nsswitch.conf.5	2009-09-16 09:45:54.000000000 +0200
-@@ -50,9 +50,11 @@ file.
- The following databases are available in the NSS:
- .TP
- .B aliases
--Mail aliases, used by
-+Mail aliases, provides a system-wide mechanism to redirect mail for local
+diff -up man-pages-3.40/man5/nsswitch.conf.5.orig man-pages-3.40/man5/nsswitch.conf.5
+--- man-pages-3.40/man5/nsswitch.conf.5.orig	2012-04-27 00:58:39.000000000 +0200
++++ man-pages-3.40/man5/nsswitch.conf.5	2012-04-27 14:25:22.453203872 +0200
+@@ -46,6 +46,11 @@ The following databases are understood b
+ Mail aliases, used by
+ .BR getaliasent (3)
+ and related functions.
++It provides a system-wide mechanism to redirect mail for local
 +recipients. Used by mail transfer agents such as Postfix or
- .BR sendmail (8).
--Presently ignored.
++.BR sendmail (8).
 +Note: On Linux, not like on other Unices, Sendmail uses its own aliases
 +resolution system independent on `/etc/nsswitch.conf'.
  .TP
diff --git a/man-pages.spec b/man-pages.spec
index 0c5c15d..3a068e9 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -3,8 +3,8 @@
 
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
-Version: 3.35
-Release: 2%{?dist}
+Version: 3.40
+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/
@@ -25,7 +25,6 @@ Patch59: man-pages-3.23-ld.so.patch
 Patch60: man-pages-3.22-sched_setaffinity.patch
 Patch63: man-pages-3.24-getnameinfo.patch
 Patch67: man-pages-3.24-mmap64.patch
-Patch68: man-pages-3.26-rcmd.patch
 Patch69: man-pages-3.27-sd.patch
 Patch70: man-pages-3.29-uri.patch
 Patch71: man-pages-posix-2003-awk.patch
@@ -43,8 +42,6 @@ Patch78: man-pages-2.39-gai.conf.patch
 Patch79: man-pages-3.32-spellch.patch
 #resolves: #681781
 Patch80: man-pages-3.35-printf.patch
-#resolves: #680214
-Patch81: man-pages-3.35-fallocate.patch
 #resolves: #698149
 Patch82: man-pages-3.32-host.patch
 #resolves: #705888 
@@ -78,7 +75,6 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release}
 %patch60 -p1
 %patch63 -p1
 %patch67 -p1
-%patch68 -p1
 %patch69 -p1
 %patch70 -p1
 %patch71 -p1
@@ -90,7 +86,6 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release}
 %patch78 -p1
 %patch79 -p1
 %patch80 -p1
-%patch81 -p1
 %patch82 -p1
 %patch83 -p1
 %patch84 -p1
@@ -149,6 +144,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*/*
 
 %changelog
+* Fri Apr 27 2012 Peter Schiffer <pschiffe at redhat.com> - 3.40-1
+- resolves: #797857
+  update to 3.40
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.35-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 21cdcde..ab97c54 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2
-6cea268fa2debf9b6440ee5c37cd4bc8  man-pages-additional-20101006.tar.bz2
-e41432ee35a49036bbaf8d4598506e9c  man-pages-3.35.tar.gz
+41f40b4890c2f463840ed7070e68ab3a  man-pages-3.40.tar.gz
