Hello community,
here is the log from the commit of package curl for openSUSE:Factory checked in at 2011-12-02 09:26:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/curl (Old)
and /work/SRC/openSUSE:Factory/.curl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "curl", Maintainer is "MMarek@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/curl/curl.changes 2011-10-05 01:45:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.curl.new/curl.changes 2011-12-02 09:26:23.000000000 +0100
@@ -1,0 +2,25 @@
+Wed Nov 30 22:39:35 UTC 2011 - crrodriguez@opensuse.org
+
+- Use O_CLOEXEC in library code.
+
+-------------------------------------------------------------------
+Tue Nov 29 11:51:38 UTC 2011 - jengelh@medozas.de
+
+- Remove redundant/unwanted tags/section (cf. specfile guidelines)
+
+-------------------------------------------------------------------
+Tue Nov 29 08:20:23 UTC 2011 - idoenmez@suse.de
+
+- Use original source tarball
+
+-------------------------------------------------------------------
+Mon Nov 28 12:00:00 UTC 2011 - opensuse@dstoecker.de
+
+- Update to version 7.23.1:
+ + Empty headers can be sent in HTTP requests by terminating with a semicolon
+ + SSL session sharing support added to curl_share_setopt()
+ + Added support to MAIL FROM for the optional SIZE parameter
+ + smtp: Added support for NTLM authentication
+ + curl tool: code split into tool_*.[ch] files
+ + lots of bugfixes
+-------------------------------------------------------------------
Old:
----
curl-7.22.0.tar.lzma
curl-fix-m4.patch
New:
----
curl-7.23.1.tar.lzma
libcurl-ocloexec.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ curl.spec ++++++
--- /var/tmp/diff_new_pack.vBcuqe/_old 2011-12-02 09:26:24.000000000 +0100
+++ /var/tmp/diff_new_pack.vBcuqe/_new 2011-12-02 09:26:24.000000000 +0100
@@ -35,8 +35,7 @@
# used by the testsuite
BuildRequires: stunnel
%endif
-#define cvs_suffix -20090302
-Version: 7.22.0
+Version: 7.23.1
Release: 1
# bug437293
%ifarch ppc64
@@ -47,11 +46,10 @@
Group: Productivity/Networking/Web/Utilities
Summary: A Tool for Transferring Data from URLs
Url: http://curl.haxx.se/
-Source: curl-%version%{?cvs_suffix}.tar.lzma
+Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
Source2: baselibs.conf
-# PATCH-FIX-UPSTREAM curl-fix-m4.patch dimstar@opensuse.org -- Fix m4 to work with -Werror -Wall configure scripts. Simply 'use' x. Patch sent upstream.
-Patch0: curl-fix-m4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Patch: libcurl-ocloexec.patch
%description
Curl is a client to get documents and files from or send documents to a
@@ -60,15 +58,14 @@
without user interaction or any kind of interactivity.
%package -n libcurl4
-License: BSD3c(or similar) ; MIT License (or similar)
-Summary: cURL shared library version 4
+Summary: Version 4 of cURL shared library
Group: Productivity/Networking/Web/Utilities
%description -n libcurl4
-cURL shared library version 4.
+The cURL shared library version 4 for accessing data using different
+network protocols.
%package -n libcurl-devel
-License: BSD3c(or similar) ; MIT License (or similar)
Summary: A Tool for Transferring Data from URLs
Group: Development/Libraries/C and C++
Requires: libcurl4 = %{version} glibc-devel
@@ -83,17 +80,15 @@
user interaction or any kind of interactivity.
%prep
-%setup -q -n curl-%version%{?cvs_suffix}
-%patch0 -p1
+%setup -q
+%patch -p1
%build
# local hack to make curl-config --libs stop printing libraries it depends on
# (currently, libtool sets link_all_deplibs=(yes|unknown) everywhere,
# will hopefully change in the future)
sed -i 's/link_all_deplibs=unknown/link_all_deplibs=no/' configure
-export CFLAGS="%{optflags}"
-./configure \
- --prefix=%{_prefix} \
+%configure \
--enable-ipv6 \
%if %{with openssl}
--with-ssl \
@@ -106,7 +101,6 @@
%endif
--with-gssapi=/usr/lib/mit \
--with-libssh2\
- --libdir=%{_libdir} \
--enable-hidden-symbols \
--disable-static \
--enable-ares
++++++ libcurl-ocloexec.patch ++++++
Open library file descriptors with O_CLOEXEC
This patch is non-portable, it needs linux 2.6.23 and glibc 2.7
or later, different combinations (old linux, new glibc and vice-versa)
will result in a crash.
To make it portable you have to test O_CLOEXEC support at *runtime*
compile time is not enough.
diff --git a/lib/connect.c b/lib/connect.c
index 2a1876e..4a72f6a 100644
--- a/lib/connect.c
+++ 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;
}
else
- fp = file?fopen(file, "r"):NULL;
+ fp = file?fopen(file, "re"):NULL;
c->newsession = newsession; /* new session? */
@@ -1060,7 +1060,7 @@ static int cookie_output(struct CookieInfo *c, const char *dumphere)
use_stdout=TRUE;
}
else {
- out = fopen(dumphere, "w");
+ out = fopen(dumphere, "we");
if(!out)
return 1; /* failure */
}
diff --git a/lib/file.c b/lib/file.c
index 4447c73..7e15b21 100644
--- a/lib/file.c
+++ 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);
file->path = actual_path;
#else
- fd = open_readonly(real_path, O_RDONLY);
+ fd = open_readonly(real_path, O_RDONLY|O_CLOEXEC);
file->path = real_path;
#endif
file->freepath = real_path; /* free this when done */
@@ -336,7 +336,7 @@ static CURLcode file_upload(struct connectdata *conn)
return CURLE_FILE_COULDNT_READ_FILE; /* fix: better error code */
if(data->state.resume_from)
- fp = fopen( file->path, "ab" );
+ fp = fopen( file->path, "abe" );
else {
int fd;
@@ -344,7 +344,7 @@ static CURLcode file_upload(struct connectdata *conn)
fd = open(file->path, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY,
conn->data->set.new_file_perms);
#else
- fd = open(file->path, O_WRONLY|O_CREAT|O_TRUNC,
+ fd = open(file->path, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC,
conn->data->set.new_file_perms);
#endif
if(fd < 0) {
@@ -352,7 +352,7 @@ static CURLcode file_upload(struct connectdata *conn)
return CURLE_WRITE_ERROR;
}
close(fd);
- fp = fopen(file->path, "wb");
+ fp = fopen(file->path, "wbe");
}
if(!fp) {
diff --git a/lib/formdata.c b/lib/formdata.c
index cbef511..187c88b 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -1156,7 +1156,7 @@ CURLcode Curl_getformdata(struct SessionHandle *data,
FILE *fileread;
fileread = strequal("-", file->contents)?
- stdin:fopen(file->contents, "rb"); /* binary read for win32 */
+ stdin:fopen(file->contents, "rbe"); /* binary read for win32 */
/*
* 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,
else {
if(!form->fp) {
/* this file hasn't yet been opened */
- form->fp = fopen(form->data->line, "rb"); /* b is for binary */
+ form->fp = fopen(form->data->line, "rbe"); /* b is for binary */
if(!form->fp)
return (size_t)-1; /* failure */
}
diff --git a/lib/ftp.c b/lib/ftp.c
index 05f6f45..11abaa3 100644
--- 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 @@
#ifdef HAVE_PROCESS_H
#include