From 2c4fef985ab8b5c1c739e63f675398355c47faa7 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Wed, 29 Jan 2014 19:05:47 +0100
Subject: [PATCH] Updated to 3.57

- resolves: #1058001
---
 .gitignore                          |  2 +-
 man-pages-3.43-tcp-congestion.patch | 62 -----------------------------
 man-pages.spec                      | 14 ++++---
 sources                             |  2 +-
 4 files changed, 11 insertions(+), 69 deletions(-)
 delete mode 100644 man-pages-3.43-tcp-congestion.patch

diff --git a/.gitignore b/.gitignore
index 65b0726..e79eb34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /man-pages-posix-2003-a.tar.xz
 /man-pages-additional-20131204.tar.xz
-/man-pages-3.56.tar.xz
+/man-pages-3.57.tar.xz
diff --git a/man-pages-3.43-tcp-congestion.patch b/man-pages-3.43-tcp-congestion.patch
deleted file mode 100644
index ca9f6b3..0000000
--- a/man-pages-3.43-tcp-congestion.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -up man-pages-3.45/man7/tcp.7.orig man-pages-3.45/man7/tcp.7
---- man-pages-3.45/man7/tcp.7.orig	2012-12-20 18:17:29.000000000 +0100
-+++ man-pages-3.45/man7/tcp.7	2012-12-21 15:31:18.526858856 +0100
-@@ -867,6 +867,58 @@ socket options are valid on TCP sockets.
- For more information see
- .BR ip (7).
- .TP
-+.BR TCP_CONGESTION " (since Linux 2.6.13)"
-+Get or set the congestion-control algorithm for this socket.
-+The
-+.I optval
-+argument is a pointer to a character-string buffer.
-+
-+For
-+.BR getsockopt ()
-+.I *optlen
-+specifies the amount of space available in the buffer pointed to by
-+.IR optval ,
-+which should be at least 16 bytes (defined by the kernel-internal constant
-+.BR TCP_CA_NAME_MAX ).
-+On return, the buffer pointed to by
-+.I optval
-+is set to a null-terminated string containing the name of the
-+congestion-control algorithm for this socket, and
-+.I *optlen
-+is set to the minimum of its original value and
-+.BR TCP_CA_NAME_MAX .
-+If the value passed in
-+.I *optlen
-+is too small, then the string returned in
-+.I *optval
-+is silently truncated, and no terminating null byte is added.
-+If an empty string is returned, then the socket is using the default
-+congestion-control algorithm, determined as described under
-+.I tcp_congestion_control
-+above.
-+
-+For
-+.BR setsockopt ()
-+.I optlen
-+specifies the length of the congestion-control algorithm name
-+contained in the buffer pointed to by
-+.IR optval ;
-+this length need not include any terminating null byte.
-+The algorithm "reno" is always permitted;
-+other algorithms may be available, depending on kernel configuration.
-+Possible errors from
-+.BR setsockopt ()
-+include:
-+algorithm not found/available
-+.RB ( ENOENT );
-+setting this algorithm requires the
-+.B CAP_NET_ADMIN
-+capability
-+.RB ( EPERM );
-+and failure getting kernel module
-+.RB ( EBUSY ).
-+.I
-+.TP
- .BR TCP_CORK " (since Linux 2.2)"
- .\" precisely: since 2.1.127
- If set, don't send out partial frames.
diff --git a/man-pages.spec b/man-pages.spec
index 868671b..91a241f 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -6,7 +6,7 @@
 
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
-Version: 3.56
+Version: 3.57
 Release: 1%{?dist}
 License: GPL+ and GPLv2+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
@@ -28,14 +28,13 @@ Patch03: man-pages-posix-2003-readlink3p.patch
 
 # Regular man pages
 # resolves: #698149
+# http://thread.gmane.org/gmane.linux.man/3413
 Patch20: man-pages-3.32-host.patch
 # resolves: #650985
+# https://bugzilla.kernel.org/show_bug.cgi?id=53781
 Patch21: man-pages-3.42-close.patch
 # resolves: #392431
 Patch22: man-pages-3.42-connect.patch
-# resolves: #771540
-Patch23: man-pages-3.43-tcp-congestion.patch
-
 
 Autoreq: false
 BuildArch: noarch
@@ -57,7 +56,6 @@ Documentation Project (LDP).
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
-%patch23 -p1
 
 ## Remove man pages we are not going to use ##
 
@@ -81,6 +79,8 @@ rm %{posix_name}/man1p/{admin,delta,get,prs,rmdel,sact,sccs,unget,val,what}.1p
 %{__cp} -r %{additional_name}/man? .
 %{__mv} %{posix_name}/man?p .
 instdir=$RPM_BUILD_ROOT%{_mandir}
+# Not all man pages are in UTF-8
+# https://bugzilla.kernel.org/show_bug.cgi?id=60807
 for sec in 0p 1 1p 2 3 3p 4 5 6 7 8; do
     %{__mkdir} -p $instdir{,/en}/man$sec
     for f in man$sec/*.$sec; do
@@ -120,6 +120,10 @@ cd ..
 %lang(en) %{_mandir}/en/man*/*
 
 %changelog
+* Wed Jan 29 2014 Peter Schiffer <pschiffe@redhat.com> - 3.57-1
+- resolves: #1058001
+  updated to 3.57
+
 * Wed Jan 15 2014 Peter Schiffer <pschiffe@redhat.com> - 3.56-1
 - resolves: #1051765
   updated to 3.56
diff --git a/sources b/sources
index e03a5e3..51b7c11 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 ec0a97ccb2ff9e4c32fac67111dbc99a  man-pages-posix-2003-a.tar.xz
 ff3655a145cfc50eddc1f15f6ef41d81  man-pages-additional-20131204.tar.xz
-888e0c96df95e7649cedfcb26d61f22b  man-pages-3.56.tar.xz
+18bba89745fecdfddad3caaef7cde5f4  man-pages-3.57.tar.xz