pool/curl
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 102533 from devel:libraries:c_c++

Browse Source 
- Update to version curl 7.24.0
- refresh patches to fix broken build (forwarded request 102532 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/102533
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/curl?expand=0&rev=69
This commit is contained in:
Stephan Kulow 2012-02-03 09:22:09 +00:00 committed by Git OBS Bridge
commit ee9edde0ed
6 changed files with 69 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
curl-7.23.1.tar.lzma
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eff6cfd9d561f0d5e08abd99112dc13b2593560c748a78801366f4604c9062cb
size 1937159

3
curl-7.24.0.tar.lzma Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cd683ee8be137ed8a8e97d42fd3cc94f88f63d478b83d4abe38e31b6281e2268
size 1973811

12
curl.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Feb 2 18:47:10 UTC 2012 - crrodriguez@opensuse.org
- Update to version curl 7.24.0
- refresh patches to fix broken build
-------------------------------------------------------------------
Wed Jan 18 13:49:56 CET 2012 - dmueller@suse.de
- use the rpmoptflags unconditionally, don't do own compiler flag
magic. Fixes debuginfo package built
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 28 10:30:28 UTC 2011 - mmarek@suse.cz Wed Dec 28 10:30:28 UTC 2011 - mmarek@suse.cz

23
curl.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package curl # spec file for package curl
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -21,7 +21,12 @@
%bcond_without testsuite %bcond_without testsuite
Name: curl Name: curl
BuildRequires: libidn-devel lzma openldap2-devel pkg-config zlib-devel BuildRequires: libidn-devel
BuildRequires: libtool
BuildRequires: lzma
BuildRequires: openldap2-devel
BuildRequires: pkg-config
BuildRequires: zlib-devel
%if %{with openssl} %if %{with openssl}
BuildRequires: openssl-devel BuildRequires: openssl-devel
%endif %endif
@ -29,27 +34,29 @@ BuildRequires: openssl-devel
BuildRequires: mozilla-nss-devel BuildRequires: mozilla-nss-devel
%endif %endif
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: libssh2-devel openssh BuildRequires: libssh2-devel
BuildRequires: openssh
BuildRequires: libcares-devel BuildRequires: libcares-devel
%if 0%{?_with_stunnel:1} %if 0%{?_with_stunnel:1}
# used by the testsuite # used by the testsuite
BuildRequires: stunnel BuildRequires: stunnel
%endif %endif
Version: 7.23.1 Version: 7.24.0
Release: 1 Release: 0
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: curl-64bit Obsoletes: curl-64bit
%endif %endif
# #
Summary: A Tool for Transferring Data from URLs
License: BSD-3-Clause ; MIT License: BSD-3-Clause ; MIT
Group: Productivity/Networking/Web/Utilities Group: Productivity/Networking/Web/Utilities
Summary: A Tool for Transferring Data from URLs
Url: http://curl.haxx.se/ Url: http://curl.haxx.se/
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
Source2: baselibs.conf Source2: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch: libcurl-ocloexec.patch Patch: libcurl-ocloexec.patch
Patch1: dont-mess-with-rpmoptflags.diff
%description %description
Curl is a client to get documents and files from or send documents to a Curl is a client to get documents and files from or send documents to a
@ -81,9 +88,11 @@ user interaction or any kind of interactivity.
%prep %prep
%setup -q %setup -q
%patch -p1 %patch
%patch1
%build %build
autoreconf -fi
# local hack to make curl-config --libs stop printing libraries it depends on # local hack to make curl-config --libs stop printing libraries it depends on
# (currently, libtool sets link_all_deplibs=(yes|unknown) everywhere, # (currently, libtool sets link_all_deplibs=(yes|unknown) everywhere,
# will hopefully change in the future) # will hopefully change in the future)

13
dont-mess-with-rpmoptflags.diff Normal file
View File

@ -0,0 +1,13 @@
--- configure.ac.orig
+++ configure.ac
@@ -279,10 +279,6 @@ dnl platform/compiler/architecture speci
dnl **********************************************************************
CURL_CHECK_COMPILER
-CURL_SET_COMPILER_BASIC_OPTS
-CURL_SET_COMPILER_DEBUG_OPTS
-CURL_SET_COMPILER_OPTIMIZE_OPTS
-CURL_SET_COMPILER_WARNING_OPTS
if test "$compiler_id" = "INTEL_UNIX_C"; then
#

90
libcurl-ocloexec.patch
View File

@ -7,24 +7,9 @@ To make it portable you have to test O_CLOEXEC support at *runtime*
compile time is not enough. compile time is not enough.
diff --git a/lib/connect.c b/lib/connect.c --- lib/cookie.c.orig
index 2a1876e..4a72f6a 100644 +++ lib/cookie.c
--- a/lib/connect.c @@ -736,7 +736,7 @@ struct CookieInfo *Curl_cookie_init(stru
+++ b/lib/connect.c
@@ -881,7 +881,7 @@ singleipconnect(struct connectdata *conn,
(struct curl_sockaddr *)&addr);
else
/* opensocket callback not set, so simply create the socket now */
- sockfd = socket(addr.family, addr.socktype, addr.protocol);
+ sockfd = socket(addr.family, addr.socktype | SOCK_CLOEXEC, addr.protocol);
if(sockfd == CURL_SOCKET_BAD)
/* no socket, no connection */
diff --git a/lib/cookie.c b/lib/cookie.c
index 41ccdbe..35cfca3 100644
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -736,7 +736,7 @@ struct CookieInfo *Curl_cookie_init(struct SessionHandle *data,
fp = NULL; fp = NULL;
} }
else else
@ -33,7 +18,7 @@ index 41ccdbe..35cfca3 100644
c->newsession = newsession; /* new session? */ c->newsession = newsession; /* new session? */
@@ -1060,7 +1060,7 @@ static int cookie_output(struct CookieInfo *c, const char *dumphere) @@ -1060,7 +1060,7 @@ static int cookie_output(struct CookieIn
use_stdout=TRUE; use_stdout=TRUE;
} }
else { else {
@ -42,11 +27,9 @@ index 41ccdbe..35cfca3 100644
if(!out) if(!out)
return 1; /* failure */ return 1; /* failure */
} }
diff --git a/lib/file.c b/lib/file.c --- lib/file.c.orig
index 4447c73..7e15b21 100644 +++ lib/file.c
--- a/lib/file.c @@ -249,7 +249,7 @@ static CURLcode file_connect(struct conn
+++ b/lib/file.c
@@ -249,7 +249,7 @@ static CURLcode file_connect(struct connectdata *conn, bool *done)
fd = open_readonly(actual_path, O_RDONLY|O_BINARY); fd = open_readonly(actual_path, O_RDONLY|O_BINARY);
file->path = actual_path; file->path = actual_path;
#else #else
@ -55,7 +38,7 @@ index 4447c73..7e15b21 100644
file->path = real_path; file->path = real_path;
#endif #endif
file->freepath = real_path; /* free this when done */ file->freepath = real_path; /* free this when done */
@@ -336,7 +336,7 @@ static CURLcode file_upload(struct connectdata *conn) @@ -336,7 +336,7 @@ static CURLcode file_upload(struct conne
return CURLE_FILE_COULDNT_READ_FILE; /* fix: better error code */ return CURLE_FILE_COULDNT_READ_FILE; /* fix: better error code */
if(data->state.resume_from) if(data->state.resume_from)
@ -64,7 +47,7 @@ index 4447c73..7e15b21 100644
else { else {
int fd; int fd;
@@ -344,7 +344,7 @@ static CURLcode file_upload(struct connectdata *conn) @@ -344,7 +344,7 @@ static CURLcode file_upload(struct conne
fd = open(file->path, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, fd = open(file->path, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY,
conn->data->set.new_file_perms); conn->data->set.new_file_perms);
#else #else
@ -73,7 +56,7 @@ index 4447c73..7e15b21 100644
conn->data->set.new_file_perms); conn->data->set.new_file_perms);
#endif #endif
if(fd < 0) { if(fd < 0) {
@@ -352,7 +352,7 @@ static CURLcode file_upload(struct connectdata *conn) @@ -352,7 +352,7 @@ static CURLcode file_upload(struct conne
return CURLE_WRITE_ERROR; return CURLE_WRITE_ERROR;
} }
close(fd); close(fd);
@ -82,11 +65,9 @@ index 4447c73..7e15b21 100644
} }
if(!fp) { if(!fp) {
diff --git a/lib/formdata.c b/lib/formdata.c --- lib/formdata.c.orig
index cbef511..187c88b 100644 +++ lib/formdata.c
--- a/lib/formdata.c @@ -1207,7 +1207,7 @@ CURLcode Curl_getformdata(struct Session
+++ b/lib/formdata.c
@@ -1156,7 +1156,7 @@ CURLcode Curl_getformdata(struct SessionHandle *data,
FILE *fileread; FILE *fileread;
fileread = strequal("-", file->contents)? fileread = strequal("-", file->contents)?
@ -95,7 +76,7 @@ index cbef511..187c88b 100644
/* /*
* VMS: This only allows for stream files on VMS. Stream files are * VMS: This only allows for stream files on VMS. Stream files are
@@ -1292,7 +1292,7 @@ static size_t readfromfile(struct Form *form, char *buffer, @@ -1338,7 +1338,7 @@ static size_t readfromfile(struct Form *
else { else {
if(!form->fp) { if(!form->fp) {
/* this file hasn't yet been opened */ /* this file hasn't yet been opened */
@ -104,23 +85,8 @@ index cbef511..187c88b 100644
if(!form->fp) if(!form->fp)
return (size_t)-1; /* failure */ return (size_t)-1; /* failure */
} }
diff --git a/lib/ftp.c b/lib/ftp.c --- lib/hostip6.c.orig
index 05f6f45..11abaa3 100644 +++ lib/hostip6.c
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -907,7 +907,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
if(ai->ai_socktype == 0)
ai->ai_socktype = conn->socktype;
- portsock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+ portsock = socket(ai->ai_family, ai->ai_socktype | SOCK_CLOEXEC, ai->ai_protocol);
if(portsock == CURL_SOCKET_BAD) {
error = SOCKERRNO;
continue;
diff --git a/lib/hostip6.c b/lib/hostip6.c
index 8241cb4..ac8d3d2 100644
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
#ifdef HAVE_PROCESS_H #ifdef HAVE_PROCESS_H
#include <process.h> #include <process.h>
@ -139,11 +105,9 @@ index 8241cb4..ac8d3d2 100644
if(s == CURL_SOCKET_BAD) if(s == CURL_SOCKET_BAD)
/* an ipv6 address was requested but we can't get/use one */ /* an ipv6 address was requested but we can't get/use one */
ipv6_works = 0; ipv6_works = 0;
diff --git a/lib/if2ip.c b/lib/if2ip.c --- lib/if2ip.c.orig
index 4924f73..76c94ec 100644 +++ lib/if2ip.c
--- a/lib/if2ip.c @@ -153,7 +153,7 @@ char *Curl_if2ip(int af, const char *int
+++ b/lib/if2ip.c
@@ -125,7 +125,7 @@ char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size)
if(len >= sizeof(req.ifr_name)) if(len >= sizeof(req.ifr_name))
return NULL; return NULL;
@ -152,10 +116,8 @@ index 4924f73..76c94ec 100644
if(CURL_SOCKET_BAD == dummy) if(CURL_SOCKET_BAD == dummy)
return NULL; return NULL;
diff --git a/lib/netrc.c b/lib/netrc.c --- lib/netrc.c.orig
index 6764b97..a605883 100644 +++ lib/netrc.c
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -110,7 +110,7 @@ int Curl_parsenetrc(const char *host, @@ -110,7 +110,7 @@ int Curl_parsenetrc(const char *host,
netrc_alloc = TRUE; netrc_alloc = TRUE;
} }
@ -165,11 +127,9 @@ index 6764b97..a605883 100644
if(file) { if(file) {
char *tok; char *tok;
char *tok_buf; char *tok_buf;
diff --git a/lib/ssluse.c b/lib/ssluse.c --- lib/ssluse.c.orig
index af70fe0..54f07a4 100644 +++ lib/ssluse.c
--- a/lib/ssluse.c @@ -436,7 +436,7 @@ int cert_stuff(struct connectdata *conn,
+++ b/lib/ssluse.c
@@ -431,7 +431,7 @@ int cert_stuff(struct connectdata *conn,
STACK_OF(X509) *ca = NULL; STACK_OF(X509) *ca = NULL;
int i; int i;
@ -178,7 +138,7 @@ index af70fe0..54f07a4 100644
if(!f) { if(!f) {
failf(data, "could not open PKCS12 file '%s'", cert_file); failf(data, "could not open PKCS12 file '%s'", cert_file);
return 0; return 0;
@@ -2280,7 +2280,7 @@ static CURLcode servercert(struct connectdata *conn, @@ -2316,7 +2316,7 @@ static CURLcode servercert(struct connec
/* e.g. match issuer name with provided issuer certificate */ /* e.g. match issuer name with provided issuer certificate */
if(data->set.str[STRING_SSL_ISSUERCERT]) { if(data->set.str[STRING_SSL_ISSUERCERT]) {