From bd3973caf37a336da2fe121bd5bdb05b0ee11075 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Fri, 11 Nov 2011 18:28:39 +0100
Subject: [PATCH] - resolves: #751620   update to 3.35 - resolves: #723578  
 typo in readlink(3p)

---
 .gitignore                                    |  4 ++--
 man-pages-3.23-printf.patch                   | 11 ---------
 man-pages-3.32-snprintf.patch                 | 17 --------------
 ...te.patch => man-pages-3.35-fallocate.patch | 17 +++++++-------
 man-pages-3.35-printf.patch                   | 15 ++++++++++++
 man-pages-3.35-readlink3p.patch               | 12 ++++++++++
 man-pages-posix-2003-awk.patch                |  7 +++---
 man-pages.spec                                | 23 ++++++++++++-------
 sources                                       |  4 +---
 9 files changed, 56 insertions(+), 54 deletions(-)
 delete mode 100644 man-pages-3.23-printf.patch
 delete mode 100644 man-pages-3.32-snprintf.patch
 rename man-pages-3.32-fallocate.patch => man-pages-3.35-fallocate.patch (50%)
 create mode 100644 man-pages-3.35-printf.patch
 create mode 100644 man-pages-3.35-readlink3p.patch

diff --git a/.gitignore b/.gitignore
index f9f95d3..2971677 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-man-pages-posix-2003-a.tar.bz2
+/man-pages-posix-2003-a.tar.bz2
 /man-pages-additional-20101006.tar.bz2
-/man-pages-3.32.tar.bz2
+/man-pages-3.35.tar.gz
diff --git a/man-pages-3.23-printf.patch b/man-pages-3.23-printf.patch
deleted file mode 100644
index 9347b07..0000000
--- a/man-pages-3.23-printf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up man-pages-3.23/man3/printf.3.pom man-pages-3.23/man3/printf.3
---- man-pages-3.23/man3/printf.3.pom	2009-09-30 03:36:53.000000000 +0200
-+++ man-pages-3.23/man3/printf.3	2010-02-22 11:16:46.000000000 +0100
-@@ -103,6 +103,7 @@ write at most
- bytes (including the trailing null byte (\(aq\e0\(aq)) to
- .IR str .
- .PP
-+The trailing null byte won't be added to str, if the string is truncated.
- The functions
- .BR vprintf (),
- .BR vfprintf (),
diff --git a/man-pages-3.32-snprintf.patch b/man-pages-3.32-snprintf.patch
deleted file mode 100644
index 917524b..0000000
--- a/man-pages-3.32-snprintf.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up man-pages-3.32/man3/printf.3.pom man-pages-3.32/man3/printf.3
---- man-pages-3.32/man3/printf.3.pom	2011-03-25 11:12:33.000000000 +0100
-+++ man-pages-3.32/man3/printf.3	2011-03-25 12:31:17.000000000 +0100
-@@ -108,7 +108,11 @@ write at most
- bytes (including the trailing null byte (\(aq\e0\(aq)) to
- .IR str .
- .PP
--The trailing null byte won't be added to str, if the string is truncated.
-+The trailing null byte is added to 
-+.IR str ,
-+unless
-+.IR size
-+is zero.
- The functions
- .BR vprintf (),
- .BR vfprintf (),
-diff -up man-pages-3.32/man3/snprintf.3.pom man-pages-3.32/man3/snprintf.3
diff --git a/man-pages-3.32-fallocate.patch b/man-pages-3.35-fallocate.patch
similarity index 50%
rename from man-pages-3.32-fallocate.patch
rename to man-pages-3.35-fallocate.patch
index ce7b3dd..7c30551 100644
--- a/man-pages-3.32-fallocate.patch
+++ b/man-pages-3.35-fallocate.patch
@@ -1,7 +1,7 @@
-diff -up man-pages-3.32/man2/fallocate.2.pom man-pages-3.32/man2/fallocate.2
---- man-pages-3.32/man2/fallocate.2.pom	2010-12-03 08:01:59.000000000 +0100
-+++ man-pages-3.32/man2/fallocate.2	2011-04-22 15:01:39.000000000 +0200
-@@ -114,15 +114,15 @@ referred to by
+diff -up man-pages-3.35/man2/fallocate.2.tmp man-pages-3.35/man2/fallocate.2
+--- man-pages-3.35/man2/fallocate.2.tmp	2011-10-04 08:34:42.000000000 +0200
++++ man-pages-3.35/man2/fallocate.2	2011-11-11 16:33:23.627651760 +0100
+@@ -116,15 +116,15 @@ referred to by
  .IR fd .
  .TP
  .B ENOSYS
@@ -17,9 +17,8 @@ diff -up man-pages-3.32/man2/fallocate.2.pom man-pages-3.32/man2/fallocate.2
 -.IR fd .
 +is not supported by kernel or by the file system containing the file
 +referred to by
-+.I fd
++.IR fd
 +or the file system does not support fallocate at all.
- .SH VERSIONS
- .BR fallocate ()
- is available on Linux since kernel 2.6.23.
-diff -up man-pages-3.32/man5/host.conf.5.pom man-pages-3.32/man5/host.conf.5
+ .TP
+ .B EPERM
+ The file referred to by
diff --git a/man-pages-3.35-printf.patch b/man-pages-3.35-printf.patch
new file mode 100644
index 0000000..b652855
--- /dev/null
+++ b/man-pages-3.35-printf.patch
@@ -0,0 +1,15 @@
+diff -up man-pages-3.35/man3/printf.3.tmp man-pages-3.35/man3/printf.3
+--- man-pages-3.35/man3/printf.3.tmp	2011-10-04 08:34:44.000000000 +0200
++++ man-pages-3.35/man3/printf.3	2011-11-11 13:58:11.299687241 +0100
+@@ -107,6 +107,11 @@ write at most
+ .I size
+ bytes (including the terminating null byte (\(aq\e0\(aq)) to
+ .IR str .
++The terminating null byte is added to 
++.IR str ,
++unless
++.IR size
++is zero.
+ .PP
+ The functions
+ .BR vprintf (),
diff --git a/man-pages-3.35-readlink3p.patch b/man-pages-3.35-readlink3p.patch
new file mode 100644
index 0000000..a1a0653
--- /dev/null
+++ b/man-pages-3.35-readlink3p.patch
@@ -0,0 +1,12 @@
+diff -up man-pages-3.35/man3p/readlink.3p.tmp man-pages-3.35/man3p/readlink.3p
+--- man-pages-3.35/man3p/readlink.3p.tmp	2008-06-05 11:22:12.000000000 +0200
++++ man-pages-3.35/man3p/readlink.3p	2011-11-11 17:15:22.632800329 +0100
+@@ -96,7 +96,7 @@ named \fB/modules/pass1\fP.
+ .sp
+ 
+ char buf[1024];
+-ssizet_t len;
++ssize_t len;
+ \&...
+ if ((len = readlink("/modules/pass1", buf, sizeof(buf)-1)) != -1)
+     buf[len] = '\\0';
diff --git a/man-pages-posix-2003-awk.patch b/man-pages-posix-2003-awk.patch
index f1be9b4..cc637d6 100644
--- a/man-pages-posix-2003-awk.patch
+++ b/man-pages-posix-2003-awk.patch
@@ -1,6 +1,6 @@
-diff -up man-pages-3.29/man1p/awk.1p.qqq man-pages-3.29/man1p/awk.1p
---- man-pages-3.29/man1p/awk.1p.qqq	2008-06-05 11:22:12.000000000 +0200
-+++ man-pages-3.29/man1p/awk.1p	2010-10-22 15:45:44.000000000 +0200
+diff -up man-pages-3.35/man1p/awk.1p.tmp man-pages-3.35/man1p/awk.1p
+--- man-pages-3.35/man1p/awk.1p.tmp	2008-06-05 11:22:12.000000000 +0200
++++ man-pages-3.35/man1p/awk.1p	2011-11-11 17:56:08.350534255 +0100
 @@ -2197,7 +2197,7 @@ necessary to use parentheses to enforce 
  .LP
  The \fIawk\fP program specified in the command line is most easily
@@ -10,4 +10,3 @@ diff -up man-pages-3.29/man1p/awk.1p.qqq man-pages-3.29/man1p/awk.1p
  programs commonly contain
  characters that are special to the shell, including double-quotes.
  In the cases where an \fIawk\fP program contains single-quote
-diff -up man-pages-3.29/man1p/.qqq man-pages-3.29/man1p/
diff --git a/man-pages.spec b/man-pages.spec
index bf7f78d..f78b1ae 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.32
-Release: 14%{?dist}
+Version: 3.35
+Release: 1%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
-URL: http://www.kernel.org/pub/linux/docs/manpages/
-Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2
+URL: http://man7.org/linux/man-pages/
+Source0: http://man7.org/linux/man-pages/download/man-pages-%{version}.tar.gz
 # 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
@@ -23,7 +23,6 @@ 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
-Patch62: man-pages-3.23-printf.patch
 Patch63: man-pages-3.24-getnameinfo.patch
 Patch67: man-pages-3.24-mmap64.patch
 Patch68: man-pages-3.26-rcmd.patch
@@ -43,13 +42,15 @@ Patch78: man-pages-2.39-gai.conf.patch
 #Resolves: #675544
 Patch79: man-pages-3.32-spellch.patch
 #resolves: #681781
-Patch80: man-pages-3.32-snprintf.patch
+Patch80: man-pages-3.35-printf.patch
 #resolves: #680214
-Patch81: man-pages-3.32-fallocate.patch
+Patch81: man-pages-3.35-fallocate.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
 Conflicts: quota < 3.17-14
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,7 +76,6 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release}
 %patch58 -p1
 %patch59 -p1
 %patch60 -p1
-%patch62 -p1
 %patch63 -p1
 %patch67 -p1
 %patch68 -p1
@@ -93,6 +93,7 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release}
 %patch81 -p1
 %patch82 -p1
 %patch83 -p1
+%patch84 -p1
 
 ### And now remove those we are not going to use:
 
@@ -148,6 +149,12 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*/*
 
 %changelog
+* Fri Nov 11 2011 Peter Schiffer <pschiffe@redhat.com> - 3.35-1
+- resolves: #751620
+  update to 3.35
+- resolves: #723578
+  typo in readlink(3p)
+
 * Fri May 27 2011 Ivana Hutarova Varekova <varekova@redhat.com> - 3.32-14
 - resolves: #705888
   the man page for proc is missing an explanation for /proc/[pid]/cgroup
diff --git a/sources b/sources
index 8462ba8..5d8c820 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2
-6cea268fa2debf9b6440ee5c37cd4bc8  man-pages-additional-20101006.tar.bz2
-1278c5289660e42a597fefd30d9bdcf0  man-pages-3.32.tar.bz2
+e41432ee35a49036bbaf8d4598506e9c  man-pages-3.35.tar.gz