[man-pages] - dropped some outdated patches, few patches updated

pschiffe pschiffe at fedoraproject.org
Wed Jan 16 15:34:08 UTC 2013 

commit b8accc49b797b7d702e910c0dca1d5d831e0469a
Author: Peter Schiffer <pschiffe at redhat.com>
Date:   Wed Jan 16 16:33:39 2013 +0100

    - dropped some outdated patches, few patches updated

 man-pages-2.46-nscd.patch          |   12 ----
 man-pages-3.22-nsswitch.conf.patch |   15 -----
 man-pages-3.35-printf.patch        |   15 -----
 man-pages-3.42-getdents.patch      |   15 -----
 man-pages-3.42-nscd-conf.patch     |  112 ++++++++++--------------------------
 man-pages-3.42-unimplemented.patch |    7 +--
 man-pages.spec                     |   50 +++++++---------
 7 files changed, 52 insertions(+), 174 deletions(-)
---
diff --git a/man-pages-3.42-nscd-conf.patch b/man-pages-3.42-nscd-conf.patch
index 5dbb5ce..118fbaf 100644
--- a/man-pages-3.42-nscd-conf.patch
+++ b/man-pages-3.42-nscd-conf.patch
@@ -1,7 +1,7 @@
-diff -ur man-pages-3.42.orig/man5/nscd.conf.5 man-pages-3.42/man5/nscd.conf.5
---- man-pages-3.42.orig/man5/nscd.conf.5	2012-08-14 00:39:40.000000000 +0200
-+++ man-pages-3.42/man5/nscd.conf.5	2012-09-10 15:38:22.700012862 +0200
-@@ -34,48 +34,91 @@
+diff -ur man-pages-3.45.orig/man5/nscd.conf.5 man-pages-3.45/man5/nscd.conf.5
+--- man-pages-3.45.orig/man5/nscd.conf.5	2012-12-20 18:17:28.000000000 +0100
++++ man-pages-3.45/man5/nscd.conf.5	2013-01-14 20:21:50.135787846 +0100
+@@ -34,7 +34,8 @@
  comment; following characters, up to the end of the line,
  are not interpreted by nscd.
  
@@ -10,53 +10,42 @@ diff -ur man-pages-3.42.orig/man5/nscd.conf.5 man-pages-3.42/man5/nscd.conf.5
 +or \fInetgroup\fP.
  
  .B logfile
--.I debug-file-name
-+.I <file>
- .RS
- Specifies name of the file to which debug info should be written.
- .RE
- 
- .B debug-level
--.I value
-+.I <level>
+ .I debug-file-name
+@@ -46,6 +47,7 @@
+ .I value
  .RS
  Sets the desired debug level.
 +The default is 0.
  .RE
  
  .B threads
--.I number
-+.I <number>
- .RS
- This is the number of threads that are started to wait for
- requests.
+@@ -56,6 +58,13 @@
  At least five threads will always be created.
  .RE
  
 +.B max-threads
-+.I <number>
++.I number
 +.RS
-+Specifies the maximum number of threads. The default is 32.
++Specifies the maximum number of threads.
++The default is 32.
 +.RE
 +
  .B server-user
--.I user
-+.I <user>
+ .I user
  .RS
- If this option is set, nscd will run as this user and not as root.
- If a separate cache for every user is used (\-S parameter), this
+@@ -64,6 +73,40 @@
  option is ignored.
  .RE
  
 +.B stat-user
-+.I <user>
++.I user
 +.RS
 +Specifies the user who is allowed to request statistics.
 +.RE
 +
 +.B reload-count
 +unlimited |
-+.I <number>
++.I number
 +.RS
 +Limit on the number of times a cached entry gets reloaded without being used
 +before it gets removed.
@@ -71,7 +60,7 @@ diff -ur man-pages-3.42.orig/man5/nscd.conf.5 man-pages-3.42/man5/nscd.conf.5
 +.RE
 +
 +.B restart-interval
-+.I <time>
++.I time
 +.RS
 +Sets the restart interval to
 +.I time
@@ -83,10 +72,9 @@ diff -ur man-pages-3.42.orig/man5/nscd.conf.5 man-pages-3.42/man5/nscd.conf.5
 +.RE
 +
  .B enable-cache
--.I service
-+.I <service>
+ .I service
  .I <yes|no>
- .RS
+@@ -71,6 +114,7 @@
  Enables or disables the specified
  .I service
  cache.
@@ -94,33 +82,7 @@ diff -ur man-pages-3.42.orig/man5/nscd.conf.5 man-pages-3.42/man5/nscd.conf.5
  .RE
  
  .B positive-time-to-live
--.I service
--.I value
-+.I <service>
-+.I <value>
- .RS
- Sets the TTL (time-to-live) for positive entries (successful queries)
- in the specified cache for
-@@ -87,8 +130,8 @@
- .RE
- 
- .B negative-time-to-live
--.I service
--.I value
-+.I <service>
-+.I <value>
- .RS
- Sets the TTL (time-to-live) for negative entries (unsuccessful queries)
- in the specified cache for
-@@ -102,16 +145,17 @@
- .RE
- 
- .B suggested-size
--.I service
--.I value
-+.I <service>
-+.I <value>
- .RS
+@@ -108,6 +152,7 @@
  This is the internal hash table size,
  .I value
  should remain a prime number for optimum efficiency.
@@ -128,16 +90,12 @@ diff -ur man-pages-3.42.orig/man5/nscd.conf.5 man-pages-3.42/man5/nscd.conf.5
  .RE
  
  .B check-files
--.I service
-+.I <service>
- .I <yes|no>
- .RS
- Enables or disables checking the file belonging to the specified
-@@ -120,50 +164,14 @@
+@@ -120,46 +165,11 @@
  The files are
  .IR /etc/passwd ,
  .IR /etc/group ,
-+.IR /etc/hosts
++.IR /etc/hosts ,
++.I /etc/services
  and
 -.IR /etc/hosts .
 -.RE
@@ -178,17 +136,12 @@ diff -ur man-pages-3.42.orig/man5/nscd.conf.5 man-pages-3.42/man5/nscd.conf.5
 -if periodic restart is enabled by enabling
 -.B paranoia
 -mode.
-+.IR /etc/services .
++.IR /etc/netgroup .
 +The default is yes.
  .RE
  
  .B persistent
--.I service
-+.I <service>
- .I <yes|no>
- .RS
- Keep the content of the cache for
-@@ -171,10 +179,11 @@
+@@ -171,6 +181,7 @@
  over server restarts; useful when
  .B paranoia
  mode is set.
@@ -196,29 +149,24 @@ diff -ur man-pages-3.42.orig/man5/nscd.conf.5 man-pages-3.42/man5/nscd.conf.5
  .RE
  
  .B shared
--.I service
-+.I <service>
- .I <yes|no>
- .RS
- The memory mapping of the nscd databases for
-@@ -182,7 +191,32 @@
+@@ -182,7 +193,32 @@
  is shared with the clients so
  that they can directly search in them instead of having to ask the
  daemon over the socket each time a lookup is performed.
 +The default is no.
-+.RE
+ .RE
 +
 +.B max-db-size
-+.I <service>
-+.I <bytes>
++.I service
++.I bytes
 +.RS
 +The maximum allowable size of the database files in bytes for the
 +.IR service .
 +The default is 33554432.
- .RE
++.RE
 +
 +.B auto-propagate
-+.I <service>
++.I service
 +.I <yes|no>
 +.RS
 +When set to
diff --git a/man-pages-3.42-unimplemented.patch b/man-pages-3.42-unimplemented.patch
index 6535c7f..26229ff 100644
--- a/man-pages-3.42-unimplemented.patch
+++ b/man-pages-3.42-unimplemented.patch
@@ -18,11 +18,6 @@ diff -urN man-pages-3.42.orig/man2/isastream.2 man-pages-3.42/man2/isastream.2
 +++ man-pages-3.42/man2/isastream.2	2012-09-13 12:13:57.816572775 +0200
 @@ -0,0 +1 @@
 +.so man2/unimplemented.2
-diff -urN man-pages-3.42.orig/man2/multiplexer.2 man-pages-3.42/man2/multiplexer.2
---- man-pages-3.42.orig/man2/multiplexer.2	1970-01-01 01:00:00.000000000 +0100
-+++ man-pages-3.42/man2/multiplexer.2	2012-09-13 12:13:57.818572735 +0200
-@@ -0,0 +1 @@
-+.so man2/unimplemented.2
 diff -urN man-pages-3.42.orig/man2/putmsg.2 man-pages-3.42/man2/putmsg.2
 --- man-pages-3.42.orig/man2/putmsg.2	1970-01-01 01:00:00.000000000 +0100
 +++ man-pages-3.42/man2/putmsg.2	2012-09-13 12:13:57.819572719 +0200
@@ -38,7 +33,7 @@ diff -urN man-pages-3.42.orig/man2/unimplemented.2 man-pages-3.42/man2/unimpleme
 -afs_syscall, break, ftime, getpmsg, gtty, lock, madvise1, mpx, prof, profil,
 -putpmsg, security, stty, tuxcall, ulimit, vserver \- unimplemented system calls
 +afs_syscall, break, fattach, fdetach, ftime, getmsg, getpmsg, gtty, isastream,
-+lock, madvise1, mpx, multiplexer, prof, profil, putmsg, putpmsg, security,
++lock, madvise1, mpx, prof, profil, putmsg, putpmsg, security,
 +stty, tuxcall, ulimit, vserver \- unimplemented system calls
  .SH SYNOPSIS
  Unimplemented system calls.
diff --git a/man-pages.spec b/man-pages.spec
index 1ef3f70..25487ed 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -7,7 +7,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
 Version: 3.45
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL+ and GPLv2+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
 URL: http://www.kernel.org/doc/man-pages/
@@ -27,49 +27,42 @@ Patch02: man-pages-posix-2003-printf.patch
 Patch03: man-pages-posix-2003-readlink3p.patch
 
 # Declined by upstream
-# resolves #436407, #656245 + multiplexer.2
+# resolves #436407, #656245
 Patch20: man-pages-3.42-unimplemented.patch
 
 # Were not / Waiting to be upstreamed
-Patch40: man-pages-2.46-nscd.patch
-# resolves: #522761
-Patch41: man-pages-3.22-nsswitch.conf.patch
 # resolves: #532629
-Patch42: man-pages-3.23-ld.so.patch
+Patch40: man-pages-3.23-ld.so.patch
 # resolves: #698149
-Patch43: man-pages-3.32-host.patch
+Patch41: man-pages-3.32-host.patch
 # resolves: #652870
-Patch44: man-pages-3.32-strtol.patch
-# resolves: #681781
-Patch45: man-pages-3.35-printf.patch
+Patch42: man-pages-3.32-strtol.patch
 # resolves: #566303, #835679, #840805
-Patch46: man-pages-3.42-nscd-conf.patch
+Patch43: man-pages-3.42-nscd-conf.patch
 # resolves: #837090
-Patch47: man-pages-3.42-inet.patch
+Patch44: man-pages-3.42-inet.patch
 # resolves: #751429, #786684
-Patch48: man-pages-3.42-nsswitch-conf.patch
+Patch45: man-pages-3.42-nsswitch-conf.patch
 # resolves: #717770
-Patch49: man-pages-3.42-resolv-conf.patch
+Patch46: man-pages-3.42-resolv-conf.patch
 # resolves: #800256
-Patch50: man-pages-3.42-shmop.patch
+Patch47: man-pages-3.42-shmop.patch
 # resolves: #804003
-Patch51: man-pages-3.42-ip.patch
+Patch48: man-pages-3.42-ip.patch
 # resolves: #787567
-Patch52: man-pages-3.42-ip-local-port.patch
-# resolves: #809490
-Patch53: man-pages-3.42-getdents.patch
+Patch49: man-pages-3.42-ip-local-port.patch
 # resolves: #650985
-Patch54: man-pages-3.42-close.patch
+Patch50: man-pages-3.42-close.patch
 # resolves: #497197
-Patch55: man-pages-3.42-proc-file-nr.patch
+Patch51: man-pages-3.42-proc-file-nr.patch
 # resolves: #517309
-Patch56: man-pages-3.42-zdump.patch
+Patch52: man-pages-3.42-zdump.patch
 # resolves: #392431
-Patch57: man-pages-3.42-connect.patch
+Patch53: man-pages-3.42-connect.patch
 # resolves: #202092
-Patch58: man-pages-3.42-sysconf.patch
+Patch54: man-pages-3.42-sysconf.patch
 # resolves: #771540
-Patch59: man-pages-3.43-tcp-congestion.patch
+Patch55: man-pages-3.43-tcp-congestion.patch
 
 
 Autoreq: false
@@ -107,10 +100,6 @@ Documentation Project (LDP).
 %patch53 -p1
 %patch54 -p1
 %patch55 -p1
-%patch56 -p1
-%patch57 -p1
-%patch58 -p1
-%patch59 -p1
 
 ## Remove man pages we are not going to use ##
 
@@ -173,6 +162,9 @@ cd ..
 %lang(en) %{_mandir}/en/man*/*
 
 %changelog
+* Wed Jan 16 2013 Peter Schiffer <pschiffe at redhat.com> - 3.45-2
+- dropped some outdated patches, few patches updated
+
 * Fri Dec 21 2012 Peter Schiffer <pschiffe at redhat.com> - 3.45-1
 - resolves: #889446
   updated to 3.45

More information about the scm-commits mailing list