diff --git a/.gitignore b/.gitignore index 59b43b0..a6167b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /man-pages-posix-2003-a.tar.xz -/man-pages-additional-20130212.tar.xz -/man-pages-3.47.tar.xz +/man-pages-additional-20130307.tar.xz +/man-pages-3.48.tar.xz diff --git a/man-pages-3.42-ip-local-port.patch b/man-pages-3.42-ip-local-port.patch deleted file mode 100644 index ef74617..0000000 --- a/man-pages-3.42-ip-local-port.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 --.\" FIXME ip current does an autobind in listen, but I'm not sure --.\" if that should be documented. - When a process wants to receive new incoming packets or connections, it - should bind a socket to a local interface address using - .BR bind (2). --Only one IP socket may be bound to any given local (address, port) pair. -+In this case, only one IP socket may be bound to any given local -+(address, port) pair. - When - .B INADDR_ANY - is specified in the bind call, the socket will be bound to -@@ -106,10 +105,14 @@ is specified in the bind call, the socke - local interfaces. - When - .BR listen (2) --or -+is called on an unbound socket, the socket is automatically bound -+to a random free port with the local address set to -+.BR INADDR_ANY . -+When - .BR connect (2) --are called on an unbound socket, it is automatically bound to a --random free port with the local address set to -+is called on an unbound socket, the socket is automatically bound -+to a random free port or an usable shared port with the local address -+set to - .BR INADDR_ANY . - - A TCP local socket address that has been bound is unavailable for diff --git a/man-pages-3.42-unimplemented.patch b/man-pages-3.42-unimplemented.patch deleted file mode 100644 index b253000..0000000 --- a/man-pages-3.42-unimplemented.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -urN man-pages-3.42.orig/man2/fattach.2 man-pages-3.42/man2/fattach.2 ---- man-pages-3.42.orig/man2/fattach.2 1970-01-01 01:00:00.000000000 +0100 -+++ man-pages-3.42/man2/fattach.2 2012-09-13 12:13:57.000000000 +0200 -@@ -0,0 +1 @@ -+.so man2/unimplemented.2 -diff -urN man-pages-3.42.orig/man2/fdetach.2 man-pages-3.42/man2/fdetach.2 ---- man-pages-3.42.orig/man2/fdetach.2 1970-01-01 01:00:00.000000000 +0100 -+++ man-pages-3.42/man2/fdetach.2 2012-09-13 12:13:57.782573563 +0200 -@@ -0,0 +1 @@ -+.so man2/unimplemented.2 -diff -urN man-pages-3.42.orig/man2/getmsg.2 man-pages-3.42/man2/getmsg.2 ---- man-pages-3.42.orig/man2/getmsg.2 1970-01-01 01:00:00.000000000 +0100 -+++ man-pages-3.42/man2/getmsg.2 2012-09-13 12:13:57.784573518 +0200 -@@ -0,0 +1 @@ -+.so man2/unimplemented.2 -diff -urN man-pages-3.42.orig/man2/isastream.2 man-pages-3.42/man2/isastream.2 ---- man-pages-3.42.orig/man2/isastream.2 1970-01-01 01:00:00.000000000 +0100 -+++ 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/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 -@@ -0,0 +1 @@ -+.so man2/unimplemented.2 -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 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 -+afs_syscall, break, fattach, fdetach, ftime, getmsg, getpmsg, gtty, isastream, -+lock, madvise1, mpx, prof, profil, putmsg, putpmsg, security, -+stty, tuxcall, ulimit, vserver \- unimplemented system calls - .SH SYNOPSIS - Unimplemented system calls. - .SH DESCRIPTION diff --git a/man-pages.spec b/man-pages.spec index a378eaf..339e68a 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -1,12 +1,12 @@ %global posix_version 2003 %global posix_release a %global posix_name man-pages-posix-%{posix_version}-%{posix_release} -%global additional_version 20130212 +%global additional_version 20130307 %global additional_name man-pages-additional-%{additional_version} Summary: Man (manual) pages from the Linux Documentation Project Name: man-pages -Version: 3.47 +Version: 3.48 Release: 1%{?dist} License: GPL+ and GPLv2+ and BSD and MIT and Copyright only and IEEE Group: Documentation @@ -26,21 +26,15 @@ Patch02: man-pages-posix-2003-printf.patch # resolves: #723578 Patch03: man-pages-posix-2003-readlink3p.patch -# Declined by upstream -# resolves #436407, #656245 -Patch20: man-pages-3.42-unimplemented.patch - -# Were not / Waiting to be upstreamed +# Regular man pages # resolves: #698149 -Patch40: man-pages-3.32-host.patch -# resolves: #787567 -Patch41: man-pages-3.42-ip-local-port.patch +Patch20: man-pages-3.32-host.patch # resolves: #650985 -Patch42: man-pages-3.42-close.patch +Patch21: man-pages-3.42-close.patch # resolves: #392431 -Patch43: man-pages-3.42-connect.patch +Patch22: man-pages-3.42-connect.patch # resolves: #771540 -Patch44: man-pages-3.43-tcp-congestion.patch +Patch23: man-pages-3.43-tcp-congestion.patch Autoreq: false @@ -61,12 +55,9 @@ Documentation Project (LDP). %patch03 -p1 %patch20 -p1 - -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 ## Remove man pages we are not going to use ## @@ -129,6 +120,10 @@ cd .. %lang(en) %{_mandir}/en/man*/* %changelog +* Thu Mar 7 2013 Peter Schiffer - 3.48-1 +- resolves: #918417 + updated to 3.48 + * Tue Feb 12 2013 Peter Schiffer - 3.47-1 - resolves: #910268 updated to 3.47 diff --git a/sources b/sources index 3d8a7f6..8e47ad3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ ec0a97ccb2ff9e4c32fac67111dbc99a man-pages-posix-2003-a.tar.xz -3b2d1ff52e9bd4850d23ba4f724616e1 man-pages-additional-20130212.tar.xz -2046259794d3003f4dc4dbe4b688ba2f man-pages-3.47.tar.xz +f036ddcad21e9337f8753fb1a0702c36 man-pages-additional-20130307.tar.xz +16cb409678ad97f936a452f47f806044 man-pages-3.48.tar.xz