Accepting request 229876 from devel:libraries:c_c++
- remove the useless BuildRequires that were meant for debugging only (forwarded request 229687 from vitezslav_cizek) OBS-URL: https://build.opensuse.org/request/show/229876 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/curl?expand=0&rev=90
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
bfbe985c02
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6929640f1e22901cbc853c67c78f25d9e7be0934771a3c3b3582846520678593
|
||||
size 2271674
|
||||
@ -1,7 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iEYEABECAAYFAlLoqVAACgkQeOEcayedXJHXgACfXucGEK+4gBtUjRNJlPdBThPs
|
||||
lQkAoJRfmKWAlAvMtBuXofIEog9D2y9z
|
||||
=Wgsv
|
||||
-----END PGP SIGNATURE-----
|
||||
3
curl-7.36.0.tar.lzma
Normal file
3
curl-7.36.0.tar.lzma
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:94126649f4f12d3332ca1185559ec5faca6929227e794387b7b82b73714b388a
|
||||
size 2276862
|
||||
7
curl-7.36.0.tar.lzma.asc
Normal file
7
curl-7.36.0.tar.lzma.asc
Normal file
@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iEYEABECAAYFAlMyeZEACgkQeOEcayedXJFTpACfaOmp5/t6thzl/LLM4L6/AO70
|
||||
i5oAoJLzbaqGU31OhelQxcyrRX2gDubB
|
||||
=++7u
|
||||
-----END PGP SIGNATURE-----
|
||||
34
curl-mkhelp.patch
Normal file
34
curl-mkhelp.patch
Normal file
@ -0,0 +1,34 @@
|
||||
From 38d582ff541353d738858299d4a2b78bafac03ed Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Stenberg <daniel@haxx.se>
|
||||
Date: Wed, 26 Mar 2014 13:22:10 +0100
|
||||
Subject: [PATCH] mkhelp: generate code for --disable-manual as well
|
||||
|
||||
This allows configure --disable-manual to run and build without having
|
||||
to regenerate the src/tool_hugehelp.c file which otherwise is necessary
|
||||
since we ship tarballs with that file present.
|
||||
|
||||
Reported-by: Remi Gacogne
|
||||
Bug: http://curl.haxx.se/bug/view.cgi?id=1350
|
||||
---
|
||||
src/mkhelp.pl | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/mkhelp.pl b/src/mkhelp.pl
|
||||
index 444b669..7ed86f7 100644
|
||||
--- a/src/mkhelp.pl
|
||||
+++ b/src/mkhelp.pl
|
||||
@@ -256,6 +256,10 @@
|
||||
|
||||
sub foot {
|
||||
print <<FOOT
|
||||
+#else /* !USE_MANUAL */
|
||||
+/* built-in manual is disabled, blank function */
|
||||
+#include "tool_hugehelp.h"
|
||||
+void hugehelp(void) {}
|
||||
#endif /* USE_MANUAL */
|
||||
FOOT
|
||||
;
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
Index: curl-7.19.7/tests/data/test172
|
||||
===================================================================
|
||||
--- curl-7.19.7.orig/tests/data/test172 2008-11-19 22:12:35.000000000 +0100
|
||||
+++ curl-7.19.7/tests/data/test172 2014-02-04 15:05:46.817554144 +0100
|
||||
@@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/we/want/172 -b
|
||||
|
||||
.%HOSTIP TRUE /silly/ FALSE 0 ismatch this
|
||||
.%HOSTIP TRUE / FALSE 0 partmatch present
|
||||
-%HOSTIP FALSE /we/want/ FALSE 1391252187 nodomain value
|
||||
+%HOSTIP FALSE /we/want/ FALSE 2139150993 nodomain value
|
||||
</file>
|
||||
</client>
|
||||
|
||||
43
curl-test815.patch
Normal file
43
curl-test815.patch
Normal file
@ -0,0 +1,43 @@
|
||||
From f82e0edc171b33528bc4f59036505d98ecf1d816 Mon Sep 17 00:00:00 2001
|
||||
From: Dan Fandrich <dan@coneharvesters.com>
|
||||
Date: Wed, 26 Mar 2014 22:02:31 +0100
|
||||
Subject: [PATCH] test815/816: Use authentication for both URLs
|
||||
|
||||
The improved connection reuse logic would otherwise create a new
|
||||
connection for each one, which isn't supported by the test
|
||||
server, nor expected by the test.
|
||||
---
|
||||
tests/data/test815 | 2 +-
|
||||
tests/data/test816 | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/data/test815 b/tests/data/test815
|
||||
index c006c6d..5c5ef79 100644
|
||||
--- a/tests/data/test815
|
||||
+++ b/tests/data/test815
|
||||
@@ -26,7 +26,7 @@ imap
|
||||
IMAP STORE - delete message (CUSTOMREQUEST)
|
||||
</name>
|
||||
<command>
|
||||
-imap://%HOSTIP:%IMAPPORT/815 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/815 -X CLOSE
|
||||
+imap://%HOSTIP:%IMAPPORT/815 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/815 -X CLOSE -u user:secret
|
||||
</command>
|
||||
</client>
|
||||
|
||||
diff --git a/tests/data/test816 b/tests/data/test816
|
||||
index 386f877..b8b1a9d 100644
|
||||
--- a/tests/data/test816
|
||||
+++ b/tests/data/test816
|
||||
@@ -29,7 +29,7 @@ imap
|
||||
IMAP STORE - delete message with confirmation (CUSTOMREQUEST)
|
||||
</name>
|
||||
<command>
|
||||
-imap://%HOSTIP:%IMAPPORT/816 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/816 -X EXPUNGE
|
||||
+imap://%HOSTIP:%IMAPPORT/816 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/816 -X EXPUNGE -u user:secret
|
||||
</command>
|
||||
</client>
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
||||
26
curl.changes
26
curl.changes
@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 11 06:51:54 UTC 2014 - vcizek@suse.com
|
||||
|
||||
- remove the useless BuildRequires that were meant for debugging only
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 9 11:40:19 UTC 2014 - vcizek@suse.com
|
||||
|
||||
- update to 7.36
|
||||
* fixes CVE-2014-0138 (bnc#868627) and CVE-2014-0139 (bnc#868629)
|
||||
* NEW FEATURES:
|
||||
ntlm: Added support for NTLMv2
|
||||
tool: Added support for URL specific options
|
||||
openssl: add ALPN support
|
||||
gtls: add ALPN support
|
||||
nss: add ALPN and NPN support
|
||||
added CURLOPT_EXPECT_100_TIMEOUT_MS
|
||||
tool: add --no-alpn and --no-npn
|
||||
added CURLOPT_SSL_ENABLE_NPN and CURLOPT_SSL_ENABLE_ALPN
|
||||
http2: build with current nghttp2 version
|
||||
openssl: info message with SSL version used
|
||||
* dropped curl-test172_cookie_expiration.patch (upstream)
|
||||
* added patches to make it build:
|
||||
- curl-mkhelp.patch
|
||||
- curl-test815.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 13 13:53:08 CET 2014 - kukuk@suse.de
|
||||
|
||||
|
||||
11
curl.spec
11
curl.spec
@ -21,7 +21,7 @@
|
||||
%bcond_without testsuite
|
||||
|
||||
Name: curl
|
||||
Version: 7.35.0
|
||||
Version: 7.36.0
|
||||
Release: 0
|
||||
Summary: A Tool for Transferring Data from URLs
|
||||
License: BSD-3-Clause and MIT
|
||||
@ -34,7 +34,8 @@ Source4: %{name}.keyring
|
||||
Patch: libcurl-ocloexec.patch
|
||||
Patch1: dont-mess-with-rpmoptflags.diff
|
||||
Patch3: curl-secure-getenv.patch
|
||||
Patch4: curl-test172_cookie_expiration.patch
|
||||
Patch4: curl-mkhelp.patch
|
||||
Patch5: curl-test815.patch
|
||||
# Use rpmbuild -D 'VERIFY_SIG 1' to verify signature during build or run one-shot check by "gpg-offline --verify --package=curl curl-*.asc".
|
||||
%if 0%{?VERIFY_SIG}
|
||||
BuildRequires: gpg-offline
|
||||
@ -102,6 +103,12 @@ user interaction or any kind of interactivity.
|
||||
%patch1
|
||||
%patch3
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
# temporary workaround to fix build of 7.36.0
|
||||
# http://curl.haxx.se/mail/tracker-2014-03/0083.html
|
||||
# removes tool_hugehelp.c to regenerate it later
|
||||
rm src/tool_hugehelp.c
|
||||
|
||||
%build
|
||||
# curl complains if macro definition is contained in CFLAGS
|
||||
# see m4/xc-val-flgs.m4
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user