From 036522ac93afaa04643fda093c84c48dcab60da0 Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Tue, 12 Feb 2013 18:04:47 +0100 Subject: [PATCH] - resolves: #910268 updated to 3.47 --- .gitignore | 4 +- man-pages-3.23-ld.so.patch | 19 --- man-pages-3.32-strtol.patch | 13 -- man-pages-3.42-inet.patch | 12 -- man-pages-3.42-ip-local-port.patch | 10 +- man-pages-3.42-ip.patch | 171 --------------------------- man-pages-3.42-nscd-conf.patch | 184 ----------------------------- man-pages-3.42-nsswitch-conf.patch | 26 ---- man-pages-3.42-proc-file-nr.patch | 28 ----- man-pages-3.42-resolv-conf.patch | 17 --- man-pages-3.42-shmop.patch | 13 -- man-pages-3.42-sysconf.patch | 12 -- man-pages-3.42-unimplemented.patch | 8 +- man-pages-3.42-zdump.patch | 46 -------- man-pages.spec | 63 +++------- sources | 4 +- 16 files changed, 30 insertions(+), 600 deletions(-) delete mode 100644 man-pages-3.23-ld.so.patch delete mode 100644 man-pages-3.32-strtol.patch delete mode 100644 man-pages-3.42-inet.patch delete mode 100644 man-pages-3.42-ip.patch delete mode 100644 man-pages-3.42-nscd-conf.patch delete mode 100644 man-pages-3.42-nsswitch-conf.patch delete mode 100644 man-pages-3.42-proc-file-nr.patch delete mode 100644 man-pages-3.42-resolv-conf.patch delete mode 100644 man-pages-3.42-shmop.patch delete mode 100644 man-pages-3.42-sysconf.patch delete mode 100644 man-pages-3.42-zdump.patch diff --git a/.gitignore b/.gitignore index 6077132..59b43b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /man-pages-posix-2003-a.tar.xz -/man-pages-additional-20130201.tar.xz -/man-pages-3.46.tar.xz +/man-pages-additional-20130212.tar.xz +/man-pages-3.47.tar.xz diff --git a/man-pages-3.23-ld.so.patch b/man-pages-3.23-ld.so.patch deleted file mode 100644 index ecb3c46..0000000 --- a/man-pages-3.23-ld.so.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up man-pages-3.45/man8/ld.so.8.orig man-pages-3.45/man8/ld.so.8 ---- man-pages-3.45/man8/ld.so.8.orig 2012-12-20 18:17:29.000000000 +0100 -+++ man-pages-3.45/man8/ld.so.8 2012-12-21 15:27:18.520544972 +0100 -@@ -374,13 +374,9 @@ This variable is ignored by set-user-ID - (glibc since 2.1) - If set to a nonempty string, - output symbol versioning information about the --program if querying information about the program (i.e., either -+program if - .B LD_TRACE_LOADED_OBJECTS --has been set, or --.B \-\-list --or --.B \-\-verify --options have been given to the dynamic linker). -+variable has been set. - .TP - .B LD_WARN - (ELF only)(glibc since 2.1.3) diff --git a/man-pages-3.32-strtol.patch b/man-pages-3.32-strtol.patch deleted file mode 100644 index f05f132..0000000 --- a/man-pages-3.32-strtol.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up man-pages-3.32/man3/strtol.3.pom man-pages-3.32/man3/strtol.3 ---- man-pages-3.32/man3/strtol.3.pom 2010-12-03 08:02:02.000000000 +0100 -+++ man-pages-3.32/man3/strtol.3 2011-01-21 12:55:58.000000000 +0100 -@@ -158,9 +158,6 @@ and then determine if an error occurred - .I errno - has a nonzero value after the call. - --In locales other than the "C" locale, other strings may also be accepted. --(For example, the thousands separator of the current locale may be --supported.) - .LP - BSD also has - .sp diff --git a/man-pages-3.42-inet.patch b/man-pages-3.42-inet.patch deleted file mode 100644 index c35ce47..0000000 --- a/man-pages-3.42-inet.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur man-pages-3.42.orig/man3/inet.3 man-pages-3.42/man3/inet.3 ---- man-pages-3.42.orig/man3/inet.3 2012-08-14 00:39:38.000000000 +0200 -+++ man-pages-3.42/man3/inet.3 2012-09-12 12:35:46.908363695 +0200 -@@ -286,7 +286,7 @@ - } - - if (inet_aton(argv[1], &addr) == 0) { -- perror("inet_aton"); -+ fprintf(stderr, "Invalid address\\n"); - exit(EXIT_FAILURE); - } - diff --git a/man-pages-3.42-ip-local-port.patch b/man-pages-3.42-ip-local-port.patch index 7cfb19a..ef74617 100644 --- a/man-pages-3.42-ip-local-port.patch +++ b/man-pages-3.42-ip-local-port.patch @@ -1,7 +1,7 @@ -diff -up man-pages-3.45/man7/ip.7.orig man-pages-3.45/man7/ip.7 ---- man-pages-3.45/man7/ip.7.orig 2012-12-21 15:27:18.549544545 +0100 -+++ man-pages-3.45/man7/ip.7 2012-12-21 15:27:18.552544501 +0100 -@@ -98,12 +98,11 @@ For +diff -up man-pages-3.47/man7/ip.7.orig man-pages-3.47/man7/ip.7 +--- man-pages-3.47/man7/ip.7.orig 2013-02-12 04:53:01.000000000 +0100 ++++ man-pages-3.47/man7/ip.7 2013-02-12 17:44:33.778266736 +0100 +@@ -93,12 +93,11 @@ For you may specify a valid IANA IP protocol defined in RFC\ 1700 assigned numbers. .PP @@ -16,7 +16,7 @@ diff -up man-pages-3.45/man7/ip.7.orig man-pages-3.45/man7/ip.7 When .B INADDR_ANY is specified in the bind call, the socket will be bound to -@@ -111,10 +110,14 @@ is specified in the bind call, the socke +@@ -106,10 +105,14 @@ is specified in the bind call, the socke local interfaces. When .BR listen (2) diff --git a/man-pages-3.42-ip.patch b/man-pages-3.42-ip.patch deleted file mode 100644 index 57460e4..0000000 --- a/man-pages-3.42-ip.patch +++ /dev/null @@ -1,171 +0,0 @@ -diff -up man-pages-3.45/man7/ip.7.orig man-pages-3.45/man7/ip.7 ---- man-pages-3.45/man7/ip.7.orig 2012-12-20 18:17:28.000000000 +0100 -+++ man-pages-3.45/man7/ip.7 2012-12-21 15:22:46.735718672 +0100 -@@ -285,6 +285,58 @@ Only valid as a - .BR setsockopt (2). - .\" - .TP -+.BR IP_ADD_SOURCE_MEMBERSHIP " (since Linux 2.5.68)" -+Join a multicast group and allow receiving data only -+from a specified source. -+Argument is an -+.I ip_mreq_source -+structure. -+.sp -+.in +4n -+.nf -+struct ip_mreq_source { -+ struct in_addr imr_multiaddr; /* IP multicast group -+ address */ -+ struct in_addr imr_interface; /* IP address of local -+ interface */ -+ struct in_addr imr_sourceaddr; /* IP address of -+ multicast source */ -+}; -+.fi -+.in -+.sp -+.I ip_mreq_source -+structure is similar to -+.I ip_mreqn -+described at -+.BR IP_ADD_MEMBERSIP . -+.I imr_multiaddr -+contains the address of the multicast group the application -+wants to join or leave. -+.I imr_interface -+is the address of the local interface with which -+the system should join the multicast group. -+Finally -+.I imr_sourceaddr -+field contains address of the source the -+application wants to receive data from. -+.IP -+This option can be used multiple times to allow -+receiving data from more than one source. -+.TP -+.BR IP_BLOCK_SOURCE " (since Linux 2.5.68)" -+Stop receiving multicast data from a specific source in a given -+group. This is valid only after the application has subscribed -+to the multicast group using either -+.BR IP_ADD_MEMBERSHIP -+or -+.BR IP_ADD_SOURCE_MEMBERSHIP . -+.IP -+Argument is an -+.I ip_mreq_source -+structure as described at -+.BR IP_ADD_SOURCE_MEMBERSHIP . -+.TP - .BR IP_DROP_MEMBERSHIP " (since Linux 1.2)" - Leave a multicast group. - Argument is an -@@ -294,6 +346,19 @@ or - structure similar to - .BR IP_ADD_MEMBERSHIP . - .TP -+.BR IP_DROP_SOURCE_MEMBERSHIP " (since Linux 2.5.68)" -+Leave a source-specific group, i.e., stop receiving data from -+a given multicast group that come from a given source). -+If the application has subscribed to multiple sources within -+the same group, data from the remaining sources will still be -+delivered. To stop receiving data from all sources at once use -+.BR IP_LEAVE_GROUP . -+.IP -+Argument is an -+.I ip_mreq_source -+structure as described at -+.BR IP_ADD_SOURCE_MEMBERSHIP . -+.TP - .BR IP_FREEBIND " (since Linux 2.4)" - .\" Precisely: 2.4.0-test10 - If enabled, this boolean option allows binding to an IP address -@@ -323,6 +388,45 @@ and - .B IP_TOS - are ignored. - .TP -+.BR IP_MSFILTER " (since Linux 2.5.68)" -+This option provides access to the advanced full-state filtering API. -+Argument is an -+.I ip_msfilter -+structure. -+.sp -+.in +4n -+.nf -+struct ip_msfilter { -+ struct in_addr imsf_multiaddr; /* IP multicast group -+ address */ -+ struct in_addr imsf_interface; /* IP address of local -+ interface */ -+ uint32_t imsf_fmode; /* Filter-mode */ -+ -+ uint32_t imsf_numsrc; /* Number of sources in -+ the following array */ -+ struct in_addr imsf_slist[1]; /* Array of source -+ addresses */ -+}; -+.fi -+.in -+.sp -+There are two macros, -+.BR MCAST_INCLUDE -+and -+.BR MCAST_EXCLUDE , -+which can be used to specify the filtering mode. -+Additionaly, -+.BR IP_MSFILTER_SIZE (n) -+macro exists to determine how much memory is needed to store -+.I ip_msfilter -+structure with -+.I n -+sources in the source list. -+.IP -+For the full description of multicast source filtering -+refer to RFC 3376. -+.TP - .BR IP_MTU " (since Linux 2.2)" - .\" Precisely: 2.1.124 - Retrieve the current known path MTU of the current socket. -@@ -418,6 +522,17 @@ This is also particularly useful for dia - that wish to deliberately send probe packets larger than - the observed Path MTU. - .TP -+.BR IP_MULTICAST_ALL " (since Linux 2.6.31)" -+Sets the policy for multicast delivery to the socket. Argument is a boolean -+integer that enables or disables multicast delivery from all groups. -+If not set, delivery to the socket is restricted to data from those multicast -+groups that have been explicitly subscribed to via a multicast join operation -+for this socket. The default is 1 which means that a socket which is bound -+to the wildcard address -+.RB ( INADDR_ANY ) -+will receive multicast packets from all -+groups that have been subscribed to on this system. -+.TP - .BR IP_MULTICAST_IF " (since Linux 1.2)" - Set the local device for a multicast socket. - Argument is an -@@ -788,6 +903,16 @@ this option be set on the redirected soc - .BR IP_TTL " (since Linux 1.0)" - Set or retrieve the current time-to-live field that is used in every packet - sent from this socket. -+.TP -+.BR IP_UNBLOCK_SOURCE " (since Linux 2.5.68)" -+Unblock previously blocked multicast source. Returns -+.BR EADDRNOTAVAIL -+when given source is not being blocked. -+.IP -+Argument is an -+.I ip_mreq_source -+structure as described at -+.BR IP_ADD_SOURCE_MEMBERSHIP . - .SS /proc interfaces - The IP protocol - supports a set of -@@ -1022,6 +1147,7 @@ and - .BR socket (7). - .SH NOTES - .BR IP_FREEBIND , -+.BR IP_MSFILTER , - .BR IP_MTU , - .BR IP_MTU_DISCOVER , - .BR IP_RECVORIGDSTADDR , diff --git a/man-pages-3.42-nscd-conf.patch b/man-pages-3.42-nscd-conf.patch deleted file mode 100644 index 118fbaf..0000000 --- a/man-pages-3.42-nscd-conf.patch +++ /dev/null @@ -1,184 +0,0 @@ -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. - --Valid services are \fIpasswd\fP, \fIgroup\fP, or \fIhosts\fP. -+Valid services are \fIpasswd\fP, \fIgroup\fP, \fIhosts\fP, \fIservices\fP -+or \fInetgroup\fP. - - .B logfile - .I debug-file-name -@@ -46,6 +47,7 @@ - .I value - .RS - Sets the desired debug level. -+The default is 0. - .RE - - .B threads -@@ -56,6 +58,13 @@ - At least five threads will always be created. - .RE - -+.B max-threads -+.I number -+.RS -+Specifies the maximum number of threads. -+The default is 32. -+.RE -+ - .B server-user - .I user - .RS -@@ -64,6 +73,40 @@ - option is ignored. - .RE - -+.B stat-user -+.I user -+.RS -+Specifies the user who is allowed to request statistics. -+.RE -+ -+.B reload-count -+unlimited | -+.I number -+.RS -+Limit on the number of times a cached entry gets reloaded without being used -+before it gets removed. -+The default is 5. -+.RE -+ -+.B paranoia -+.I -+.RS -+Enabling paranoia mode causes nscd to restart itself periodically. -+The default is no. -+.RE -+ -+.B restart-interval -+.I time -+.RS -+Sets the restart interval to -+.I time -+seconds -+if periodic restart is enabled by enabling -+.B paranoia -+mode. -+The default is 3600. -+.RE -+ - .B enable-cache - .I service - .I -@@ -71,6 +114,7 @@ - Enables or disables the specified - .I service - cache. -+The default is no. - .RE - - .B positive-time-to-live -@@ -108,6 +152,7 @@ - This is the internal hash table size, - .I value - should remain a prime number for optimum efficiency. -+The default is 211. - .RE - - .B check-files -@@ -120,46 +165,11 @@ - The files are - .IR /etc/passwd , - .IR /etc/group , -+.IR /etc/hosts , -+.I /etc/services - and --.IR /etc/hosts . --.RE -- --.B max-threads --.I threads --.RS --Specifies the maximum number of threads to be started. --.RE -- --.B stat-user --.I username --.RS --Specifies the user who is allowed to request statistics. --.RE -- --.B reload-count --unlimited | --.I number --.RS --Limit on the number of times a cached entry gets reloaded without being used --before it gets removed. --The default is 5. --.RE -- --.B paranoia --.I --.RS --Enabling paranoia mode causes nscd to restart itself periodically. --.RE -- --.B restart-interval --.I time --.RS --Sets the restart interval to --.I time --seconds --if periodic restart is enabled by enabling --.B paranoia --mode. -+.IR /etc/netgroup . -+The default is yes. - .RE - - .B persistent -@@ -171,6 +181,7 @@ - over server restarts; useful when - .B paranoia - mode is set. -+The default is no. - .RE - - .B shared -@@ -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 -+ -+.B max-db-size -+.I service -+.I bytes -+.RS -+The maximum allowable size of the database files in bytes for the -+.IR service . -+The default is 33554432. -+.RE -+ -+.B auto-propagate -+.I service -+.I -+.RS -+When set to -+.IR no " for " passwd " or " group " service, then the " .byname -+requests are not added to -+.IR passwd.byuid " or " group.bygid -+cache. -+This can help with tables containing multiple records for the same id. -+The default is yes. This option is valid only for services -+.IR passwd " and " group ". -+.RE -+ - .SH "SEE ALSO" - .BR nscd (8) - .\" .SH AUTHOR diff --git a/man-pages-3.42-nsswitch-conf.patch b/man-pages-3.42-nsswitch-conf.patch deleted file mode 100644 index 3e7e2c1..0000000 --- a/man-pages-3.42-nsswitch-conf.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ur man-pages-3.42.orig/man5/nsswitch.conf.5 man-pages-3.42/man5/nsswitch.conf.5 ---- man-pages-3.42.orig/man5/nsswitch.conf.5 2012-09-12 13:48:59.000000000 +0200 -+++ man-pages-3.42/man5/nsswitch.conf.5 2012-09-12 13:49:31.884553646 +0200 -@@ -64,6 +64,11 @@ - .BR gethostbyname (3) - and related functions. - .TP -+.B initgroups -+Supplementary group access list, used by -+.BR getgrouplist (3) -+function. -+.TP - .B netgroup - Network-wide list of hosts and users, used for access rules. - C libraries before glibc 2.1 supported netgroups only over NIS. -@@ -245,6 +250,10 @@ - .B return - Return a result now. - Do not call any further lookup functions. -+However, for compatibility reasons, if this is the selected action -+for the `group' database and the `notfound' status, -+and the configuration file does not contain the `initgroups' line, -+the next lookup function is always called, without affecting the search result. - .TP - .B continue - Call the next lookup function. diff --git a/man-pages-3.42-proc-file-nr.patch b/man-pages-3.42-proc-file-nr.patch deleted file mode 100644 index 9365982..0000000 --- a/man-pages-3.42-proc-file-nr.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up man-pages-3.45/man5/proc.5.orig man-pages-3.45/man5/proc.5 ---- man-pages-3.45/man5/proc.5.orig 2012-12-20 18:17:28.000000000 +0100 -+++ man-pages-3.45/man5/proc.5 2012-12-21 15:27:18.562544354 +0100 -@@ -2175,16 +2175,14 @@ can override the - limit. - .TP - .I /proc/sys/fs/file-nr --This (read-only) file gives the number of files presently opened. --It contains three numbers: the number of allocated file handles; --the number of free file handles; and the maximum number of file handles. --The kernel allocates file handles dynamically, but it --doesn't free them again. --If the number of allocated files is close to the --maximum, you should consider increasing the maximum. --When the number of free file handles is --large, you've encountered a peak in your usage of file --handles and you probably don't need to increase the maximum. -+Historically,the kernel was able to allocate file handles -+dynamically, but not to free them again. The three values in -+file-nr denote the number of allocated file handles, the number -+of allocated but unused file handles, and the maximum number of -+file handles. Linux 2.6 always reports 0 as the number of free -+file handles -- this is not an error, it just means that the -+number of allocated file handles exactly matches the number of -+used file handles. - .TP - .I /proc/sys/fs/inode-max - This file contains the maximum number of in-memory inodes. diff --git a/man-pages-3.42-resolv-conf.patch b/man-pages-3.42-resolv-conf.patch deleted file mode 100644 index f67dadf..0000000 --- a/man-pages-3.42-resolv-conf.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up man-pages-3.45/man5/resolv.conf.5.orig man-pages-3.45/man5/resolv.conf.5 ---- man-pages-3.45/man5/resolv.conf.5.orig 2012-12-20 18:17:28.000000000 +0100 -+++ man-pages-3.45/man5/resolv.conf.5 2012-12-21 15:27:18.542544649 +0100 -@@ -245,6 +245,13 @@ cannot handle these queries properly and - This option disables the behavior and makes glibc perform the IPv6 - and IPv4 requests sequentially (at the cost of some slowdown of the - resolving process). -+.TP -+.BR single-request-reopen " (since glibc 2.9)" -+The resolver uses the same socket for the A and AAAA requests. Some hardware -+mistakenly only sends back one reply. When that happens the client sytem will -+sit and wait for the second reply. Turning this option on changes this behavior -+so that if two requests from the same port are not handled correctly it will -+close the socket and open a new one before sending the second request. - .RE - .LP - The \fIdomain\fP and \fIsearch\fP keywords are mutually exclusive. diff --git a/man-pages-3.42-shmop.patch b/man-pages-3.42-shmop.patch deleted file mode 100644 index abd8ae4..0000000 --- a/man-pages-3.42-shmop.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur man-pages-3.42.orig/man2/shmop.2 man-pages-3.42/man2/shmop.2 ---- man-pages-3.42.orig/man2/shmop.2 2012-08-14 00:39:36.000000000 +0200 -+++ man-pages-3.42/man2/shmop.2 2012-09-12 18:28:27.196163793 +0200 -@@ -193,6 +193,9 @@ - .B CAP_IPC_OWNER - capability. - .TP -+.B EIDRM -+\fIshmid\fP points to a removed identifier. -+.TP - .B EINVAL - Invalid - .I shmid diff --git a/man-pages-3.42-sysconf.patch b/man-pages-3.42-sysconf.patch deleted file mode 100644 index 866be69..0000000 --- a/man-pages-3.42-sysconf.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur man-pages-3.42.orig/man3/sysconf.3 man-pages-3.42/man3/sysconf.3 ---- man-pages-3.42.orig/man3/sysconf.3 2012-08-14 00:39:39.000000000 +0200 -+++ man-pages-3.42/man3/sysconf.3 2012-09-18 18:01:37.693536321 +0200 -@@ -295,7 +295,7 @@ - The number of pages of physical memory. - Note that it is possible - for the product of this value and the value of --.B _SC_PAGE_SIZE -+.B _SC_PAGESIZE - to overflow. - .TP - .BR "" " - " _SC_AVPHYS_PAGES diff --git a/man-pages-3.42-unimplemented.patch b/man-pages-3.42-unimplemented.patch index 26229ff..b253000 100644 --- a/man-pages-3.42-unimplemented.patch +++ b/man-pages-3.42-unimplemented.patch @@ -23,12 +23,12 @@ diff -urN man-pages-3.42.orig/man2/putmsg.2 man-pages-3.42/man2/putmsg.2 +++ man-pages-3.42/man2/putmsg.2 2012-09-13 12:13:57.819572719 +0200 @@ -0,0 +1 @@ +.so man2/unimplemented.2 -diff -urN man-pages-3.42.orig/man2/unimplemented.2 man-pages-3.42/man2/unimplemented.2 ---- man-pages-3.42.orig/man2/unimplemented.2 2012-08-14 00:39:36.000000000 +0200 -+++ man-pages-3.42/man2/unimplemented.2 2012-09-13 12:15:02.022137417 +0200 +diff -up man-pages-3.47/man2/unimplemented.2.orig man-pages-3.47/man2/unimplemented.2 +--- man-pages-3.47/man2/unimplemented.2.orig 2013-02-12 04:52:56.000000000 +0100 ++++ man-pages-3.47/man2/unimplemented.2 2013-02-12 17:44:33.772266826 +0100 @@ -26,8 +26,9 @@ .\" - .TH UNIMPLEMENTED 2 2007-07-05 "Linux" "Linux Programmer's Manual" + .TH UNIMPLEMENTED 2 2013-02-12 "Linux" "Linux Programmer's Manual" .SH NAME -afs_syscall, break, ftime, getpmsg, gtty, lock, madvise1, mpx, prof, profil, -putpmsg, security, stty, tuxcall, ulimit, vserver \- unimplemented system calls diff --git a/man-pages-3.42-zdump.patch b/man-pages-3.42-zdump.patch deleted file mode 100644 index 8d6109b..0000000 --- a/man-pages-3.42-zdump.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur man-pages-3.42.orig/man8/zdump.8 man-pages-3.42/man8/zdump.8 ---- man-pages-3.42.orig/man8/zdump.8 2012-08-14 00:39:40.000000000 +0200 -+++ man-pages-3.42/man8/zdump.8 2012-09-18 13:21:47.745750940 +0200 -@@ -6,10 +6,14 @@ - .SH SYNOPSIS - .B zdump - [ -+.B \-\-version -+] [ -+.B \-\-help -+] [ - .B \-v - ] [ - .B \-c --cutoffyear ] [ zonename ... ] -+[loyear,]hiyear ] [ zonename ... ] - .SH DESCRIPTION - .I Zdump - prints the current time in each -@@ -18,6 +22,12 @@ - .PP - These options are available: - .TP -+.B \-\-version -+Output version information and exit. -+.TP -+.B \-\-help -+Output short usage and exit. -+.TP - .B \-v - For each - .I zonename -@@ -34,8 +44,11 @@ - .B isdst=0 - otherwise. - .TP --.BI "\-c " cutoffyear --Cut off the verbose output near the start of the given year. -+.BI "\-c " [loyear,]hiyear -+Cut off the verbose output near the start of the given year(s). -+The output still includes the lowest possible time value -+and one day after it, and the highest possible time value -+preceded by the time value one day before it. - .SH "SEE ALSO" - .BR tzfile (5), - .BR zic (8) diff --git a/man-pages.spec b/man-pages.spec index 22b21e7..a378eaf 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -1,13 +1,13 @@ %global posix_version 2003 %global posix_release a %global posix_name man-pages-posix-%{posix_version}-%{posix_release} -%global additional_version 20130201 +%global additional_version 20130212 %global additional_name man-pages-additional-%{additional_version} Summary: Man (manual) pages from the Linux Documentation Project Name: man-pages -Version: 3.46 -Release: 2%{?dist} +Version: 3.47 +Release: 1%{?dist} License: GPL+ and GPLv2+ and BSD and MIT and Copyright only and IEEE Group: Documentation URL: http://www.kernel.org/doc/man-pages/ @@ -31,38 +31,16 @@ Patch03: man-pages-posix-2003-readlink3p.patch Patch20: man-pages-3.42-unimplemented.patch # Were not / Waiting to be upstreamed -# resolves: #532629 -Patch40: man-pages-3.23-ld.so.patch # resolves: #698149 -Patch41: man-pages-3.32-host.patch -# resolves: #652870 -Patch42: man-pages-3.32-strtol.patch -# resolves: #566303, #835679, #840805 -Patch43: man-pages-3.42-nscd-conf.patch -# resolves: #837090 -Patch44: man-pages-3.42-inet.patch -# resolves: #751429, #786684 -Patch45: man-pages-3.42-nsswitch-conf.patch -# resolves: #717770 -Patch46: man-pages-3.42-resolv-conf.patch -# resolves: #800256 -Patch47: man-pages-3.42-shmop.patch -# resolves: #804003 -Patch48: man-pages-3.42-ip.patch +Patch40: man-pages-3.32-host.patch # resolves: #787567 -Patch49: man-pages-3.42-ip-local-port.patch +Patch41: man-pages-3.42-ip-local-port.patch # resolves: #650985 -Patch50: man-pages-3.42-close.patch -# resolves: #497197 -Patch51: man-pages-3.42-proc-file-nr.patch -# resolves: #517309 -Patch52: man-pages-3.42-zdump.patch +Patch42: man-pages-3.42-close.patch # resolves: #392431 -Patch53: man-pages-3.42-connect.patch -# resolves: #202092 -Patch54: man-pages-3.42-sysconf.patch +Patch43: man-pages-3.42-connect.patch # resolves: #771540 -Patch55: man-pages-3.43-tcp-congestion.patch +Patch44: man-pages-3.43-tcp-congestion.patch Autoreq: false @@ -89,17 +67,6 @@ Documentation Project (LDP). %patch42 -p1 %patch43 -p1 %patch44 -p1 -%patch45 -p1 -%patch46 -p1 -%patch47 -p1 -%patch48 -p1 -%patch49 -p1 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 -%patch53 -p1 -%patch54 -p1 -%patch55 -p1 ## Remove man pages we are not going to use ## @@ -162,6 +129,10 @@ cd .. %lang(en) %{_mandir}/en/man*/* %changelog +* Tue Feb 12 2013 Peter Schiffer - 3.47-1 +- resolves: #910268 + updated to 3.47 + * Fri Feb 1 2013 Peter Schiffer - 3.46-2 - related: #858703 moved killpgrp(8) man page to the amanda-client package @@ -516,11 +487,11 @@ cd .. - add iconv patch (245040) thanks to Josef Kubin -* Wed Jul 20 2007 Ivana Varekova - 2.63-2 +* Fri Jul 20 2007 Ivana Varekova - 2.63-2 - Resolves: #248655 add getent patch (thanks Ville Skyttä) -* Wed Jul 20 2007 Ivana Varekova - 2.63-1 +* Fri Jul 20 2007 Ivana Varekova - 2.63-1 - update to 2.63 * Tue Jun 26 2007 Ivana Varekova - 2.55-3 @@ -669,7 +640,7 @@ cd .. - update to 2.32 - add gai.conf.5 man page (#191656) -* Mon Apr 18 2006 Ivana Varekova 2.29-1 +* Tue Apr 18 2006 Ivana Varekova 2.29-1 - update to 2.29 - fix sigprocmask(2) man page (#189121) @@ -968,7 +939,7 @@ of some syscalls) (see bug 159225) they are no longer part of another package - include man pages for ld* -* Thu Oct 24 2000 Trond Eivind Glomsrød +* Tue Oct 24 2000 Trond Eivind Glomsrød - remove const from iconv function prototype (#19486) * Tue Aug 29 2000 Trond Eivind Glomsrød @@ -991,7 +962,7 @@ of some syscalls) (see bug 159225) * Mon Jun 19 2000 Matt Wilson - defattr before docs in filelist -* Sun Jun 17 2000 Trond Eivind Glomsrød +* Sat Jun 17 2000 Trond Eivind Glomsrød - updated to 1.30 * Tue Jun 06 2000 Trond Eivind Glomsrød diff --git a/sources b/sources index e347008..3d8a7f6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ ec0a97ccb2ff9e4c32fac67111dbc99a man-pages-posix-2003-a.tar.xz -6873cc45b7aadbe49d0d7366cf726733 man-pages-additional-20130201.tar.xz -eba99dc469e526c3de2e91fe0a0ddc43 man-pages-3.46.tar.xz +3b2d1ff52e9bd4850d23ba4f724616e1 man-pages-additional-20130212.tar.xz +2046259794d3003f4dc4dbe4b688ba2f man-pages-3.47.tar.xz