mention all option listed in 'curl --help' in curl.1 man page

This commit is contained in:
Kamil Dudka 2013-07-09 16:05:20 +02:00
parent ad17697486
commit 233f010767
2 changed files with 137 additions and 1 deletions

View File

@ -0,0 +1,129 @@
From dff4fdaf76ed8ad9d11991e3ad4106a162e8a371 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 9 Jul 2013 14:59:01 +0200
Subject: [PATCH 1/4] curl.1: document the --time-cond option in the man page
[upstream commit 3a0e931fc715a80004958794a96b12cf90503f99]
---
docs/curl.1 | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/docs/curl.1 b/docs/curl.1
index 3da4354..a130740 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -1413,6 +1413,9 @@ default 512 bytes will be used.
If this option is used several times, the last one will be used.
(Added in 7.20.0)
+.IP " -z, --time-cond TIME"
+Transfer based on a time condition. TIME may to be preceded by -, +, or =.
+See the corresponding sections 14.24, 14.28, and 14.29 of RFC 2068.
.IP "--tlsauthtype <authtype>"
Set TLS authentication type. Currently, the only supported option is "SRP",
for TLS-SRP (RFC 5054). If \fI--tlsuser\fP and \fI--tlspassword\fP are
--
1.7.1
From c3536d01f24f8e1fe886f4f74301e4fc7f7c26ae Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 9 Jul 2013 14:59:01 +0200
Subject: [PATCH 2/4] curl.1: document the --post303 option in the man page
[upstream commit 39e85d99feede7cc573902e8ab6b3dd759022d9c]
---
docs/curl.1 | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/docs/curl.1 b/docs/curl.1
index a130740..f944092 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -1043,6 +1043,13 @@ ubiquitous in web browsers, so curl does the conversion by default to maintain
consistency. However, a server may require a POST to remain a POST after such
a redirection. This option is meaningful only when using \fI-L, --location\fP
(Added in 7.19.1)
+.IP "--post303"
+(HTTP) Tells curl to respect RFC 2616/10.3.2 and not convert POST requests
+into GET requests when following a 303 redirection. The non-RFC behaviour is
+ubiquitous in web browsers, so curl does the conversion by default to maintain
+consistency. However, a server may require a POST to remain a POST after such
+a redirection. This option is meaningful only when using \fI-L, --location\fP
+(Added in 7.26.0)
.IP "--proto <protocols>"
Tells curl to use the listed protocols for its initial retrieval. Protocols
are evaluated left to right, are comma separated, and are each a protocol
--
1.7.1
From c7e06409c9d02cedd74a0881aee55c4c95ed7efa Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 9 Jul 2013 14:59:01 +0200
Subject: [PATCH 3/4] curl.1: document the --sasl-ir option in the man page
[upstream commit 20ff820ef2d59fb68d50665ab64fb9d6da323751]
---
docs/curl.1 | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/docs/curl.1 b/docs/curl.1
index f944092..20f87f1 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -1287,6 +1287,9 @@ If this option is used several times, the last one will be used.
Silent or quiet mode. Don't show progress meter or error messages. Makes Curl
mute. It will still output the data you ask for, potentially even to the
terminal/stdout unless you redirect it.
+.IP "--sasl-ir"
+Enable initial response in SASL authentication.
+(Added in 7.31.0)
.IP "-S, --show-error"
When used with \fI-s\fP it makes curl show an error message if it fails.
.IP "--ssl"
--
1.7.1
From 42b23be7ac8601b07bbd2d6a4736fefa9fa8fd6c Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 9 Jul 2013 15:45:36 +0200
Subject: [PATCH 4/4] Revert "curl.1: document the --time-cond option in the man page"
This reverts commit 3a0e931fc715a80004958794a96b12cf90503f99 because
the documentation of --time-cond was duplicated by mistake.
Reported by: Dave Reisner
[upstream commit 45339625bc85b29225a2035a57eceda43206dd1e]
---
docs/curl.1 | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/docs/curl.1 b/docs/curl.1
index 20f87f1..6d71152 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -1423,9 +1423,6 @@ default 512 bytes will be used.
If this option is used several times, the last one will be used.
(Added in 7.20.0)
-.IP " -z, --time-cond TIME"
-Transfer based on a time condition. TIME may to be preceded by -, +, or =.
-See the corresponding sections 14.24, 14.28, and 14.29 of RFC 2068.
.IP "--tlsauthtype <authtype>"
Set TLS authentication type. Currently, the only supported option is "SRP",
for TLS-SRP (RFC 5054). If \fI--tlsuser\fP and \fI--tlspassword\fP are
@@ -1708,7 +1705,7 @@ speed-time seconds it gets aborted. speed-time is set with \fI-y\fP and is 30
if not set.
If this option is used several times, the last one will be used.
-.IP "-z/--time-cond <date expression>|<file>"
+.IP "-z, --time-cond <date expression>|<file>"
(HTTP/FTP) Request a file that has been modified later than the given time and
date, or one that has been modified before that time. The <date expression>
can be all sorts of date strings or if it doesn't match any internal ones, it
--
1.7.1

View File

@ -1,7 +1,7 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl Name: curl
Version: 7.31.0 Version: 7.31.0
Release: 3%{?dist} Release: 4%{?dist}
License: MIT License: MIT
Group: Applications/Internet Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@ -13,6 +13,9 @@ Patch1: 0001-curl-7.31.0-02964ed6.patch
# restore the functionality of 'curl -u :' # restore the functionality of 'curl -u :'
Patch2: 0002-curl-7.31.0-abca89aa.patch Patch2: 0002-curl-7.31.0-abca89aa.patch
# mention all option listed in 'curl --help' in curl.1 man page
Patch3: 0003-curl-7.31.0-3a0e931f.patch
# patch making libcurl multilib ready # patch making libcurl multilib ready
Patch101: 0101-curl-7.31.0-multilib.patch Patch101: 0101-curl-7.31.0-multilib.patch
@ -112,6 +115,7 @@ documentation of the library, too.
# upstream patches # upstream patches
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
# Fedora patches # Fedora patches
%patch101 -p1 %patch101 -p1
@ -233,6 +237,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4 %{_datadir}/aclocal/libcurl.m4
%changelog %changelog
* Tue Jul 09 2013 Kamil Dudka <kdudka@redaht.com> 7.31.0-4
- mention all option listed in 'curl --help' in curl.1 man page
* Tue Jul 01 2013 Kamil Dudka <kdudka@redhat.com> 7.31.0-3 * Tue Jul 01 2013 Kamil Dudka <kdudka@redhat.com> 7.31.0-3
- restore the functionality of 'curl -u :' - restore the functionality of 'curl -u :'