Hello community, here is the log from the commit of package curl for openSUSE:Factory checked in at 2012-02-03 10:22:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/curl (Old) and /work/SRC/openSUSE:Factory/.curl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "curl", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/curl/curl.changes 2011-12-31 17:19:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.curl.new/curl.changes 2012-02-03 10:22:12.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Feb 2 18:47:10 UTC 2012 - [email protected] + +- Update to version curl 7.24.0 +- refresh patches to fix broken build + +------------------------------------------------------------------- +Wed Jan 18 13:49:56 CET 2012 - [email protected] + +- use the rpmoptflags unconditionally, don't do own compiler flag + magic. Fixes debuginfo package built + +------------------------------------------------------------------- Old: ---- curl-7.23.1.tar.lzma New: ---- curl-7.24.0.tar.lzma dont-mess-with-rpmoptflags.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ curl.spec ++++++ --- /var/tmp/diff_new_pack.qOjO8o/_old 2012-02-03 10:22:14.000000000 +0100 +++ /var/tmp/diff_new_pack.qOjO8o/_new 2012-02-03 10:22:14.000000000 +0100 @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,12 @@ %bcond_without testsuite 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} BuildRequires: openssl-devel %endif @@ -29,27 +34,29 @@ BuildRequires: mozilla-nss-devel %endif BuildRequires: krb5-devel -BuildRequires: libssh2-devel openssh +BuildRequires: libssh2-devel +BuildRequires: openssh BuildRequires: libcares-devel %if 0%{?_with_stunnel:1} # used by the testsuite BuildRequires: stunnel %endif -Version: 7.23.1 -Release: 1 +Version: 7.24.0 +Release: 0 # bug437293 %ifarch ppc64 Obsoletes: curl-64bit %endif # +Summary: A Tool for Transferring Data from URLs License: BSD-3-Clause ; MIT Group: Productivity/Networking/Web/Utilities -Summary: A Tool for Transferring Data from URLs Url: http://curl.haxx.se/ Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch: libcurl-ocloexec.patch +Patch1: dont-mess-with-rpmoptflags.diff %description Curl is a client to get documents and files from or send documents to a @@ -81,9 +88,11 @@ %prep %setup -q -%patch -p1 +%patch +%patch1 %build +autoreconf -fi # 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) ++++++ dont-mess-with-rpmoptflags.diff ++++++ --- 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 # ++++++ libcurl-ocloexec.patch ++++++ --- /var/tmp/diff_new_pack.qOjO8o/_old 2012-02-03 10:22:14.000000000 +0100 +++ /var/tmp/diff_new_pack.qOjO8o/_new 2012-02-03 10:22:14.000000000 +0100 @@ -7,24 +7,9 @@ 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, +--- lib/cookie.c.orig ++++ lib/cookie.c +@@ -736,7 +736,7 @@ struct CookieInfo *Curl_cookie_init(stru fp = NULL; } else @@ -33,7 +18,7 @@ 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; } else { @@ -42,11 +27,9 @@ 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) +--- lib/file.c.orig ++++ lib/file.c +@@ -249,7 +249,7 @@ static CURLcode file_connect(struct conn fd = open_readonly(actual_path, O_RDONLY|O_BINARY); file->path = actual_path; #else @@ -55,7 +38,7 @@ file->path = real_path; #endif 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 */ if(data->state.resume_from) @@ -64,7 +47,7 @@ else { 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, conn->data->set.new_file_perms); #else @@ -73,7 +56,7 @@ conn->data->set.new_file_perms); #endif 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; } close(fd); @@ -82,11 +65,9 @@ } 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, +--- lib/formdata.c.orig ++++ lib/formdata.c +@@ -1207,7 +1207,7 @@ CURLcode Curl_getformdata(struct Session FILE *fileread; fileread = strequal("-", file->contents)? @@ -95,7 +76,7 @@ /* * 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 { if(!form->fp) { /* this file hasn't yet been opened */ @@ -104,23 +85,8 @@ 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 +--- lib/hostip6.c.orig ++++ lib/hostip6.c @@ -45,7 +45,7 @@ #ifdef HAVE_PROCESS_H #include <process.h> @@ -139,11 +105,9 @@ if(s == CURL_SOCKET_BAD) /* an ipv6 address was requested but we can't get/use one */ ipv6_works = 0; -diff --git a/lib/if2ip.c b/lib/if2ip.c -index 4924f73..76c94ec 100644 ---- a/lib/if2ip.c -+++ b/lib/if2ip.c -@@ -125,7 +125,7 @@ char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size) +--- lib/if2ip.c.orig ++++ lib/if2ip.c +@@ -153,7 +153,7 @@ char *Curl_if2ip(int af, const char *int if(len >= sizeof(req.ifr_name)) return NULL; @@ -152,10 +116,8 @@ if(CURL_SOCKET_BAD == dummy) return NULL; -diff --git a/lib/netrc.c b/lib/netrc.c -index 6764b97..a605883 100644 ---- a/lib/netrc.c -+++ b/lib/netrc.c +--- lib/netrc.c.orig ++++ lib/netrc.c @@ -110,7 +110,7 @@ int Curl_parsenetrc(const char *host, netrc_alloc = TRUE; } @@ -165,11 +127,9 @@ if(file) { char *tok; char *tok_buf; -diff --git a/lib/ssluse.c b/lib/ssluse.c -index af70fe0..54f07a4 100644 ---- a/lib/ssluse.c -+++ b/lib/ssluse.c -@@ -431,7 +431,7 @@ int cert_stuff(struct connectdata *conn, +--- lib/ssluse.c.orig ++++ lib/ssluse.c +@@ -436,7 +436,7 @@ int cert_stuff(struct connectdata *conn, STACK_OF(X509) *ca = NULL; int i; @@ -178,7 +138,7 @@ if(!f) { failf(data, "could not open PKCS12 file '%s'", cert_file); 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 */ if(data->set.str[STRING_SSL_ISSUERCERT]) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
