From a712d04fa2fa33e08c79d4c099734c1118a844fae72239d4f1252deef86cdc8e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 18 Jan 2012 12:50:45 +0000 Subject: [PATCH 1/3] - use the rpmoptflags unconditionally, don't do own compiler flag magic. Fixes debuginfo package built OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=67 --- curl.changes | 6 ++++++ curl.spec | 18 ++++++++++++------ dont-mess-with-rpmoptflags.diff | 13 +++++++++++++ 3 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 dont-mess-with-rpmoptflags.diff diff --git a/curl.changes b/curl.changes index 7b17c16..6761ee4 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/curl.spec b/curl.spec index 2b387ae..07b620d 100644 --- a/curl.spec +++ b/curl.spec @@ -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 @@ -15,13 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %bcond_without openssl %bcond_with mozilla_nss %bcond_without testsuite Name: curl -BuildRequires: libidn-devel lzma openldap2-devel pkg-config zlib-devel +BuildRequires: libidn-devel +BuildRequires: lzma +BuildRequires: openldap2-devel +BuildRequires: pkg-config +BuildRequires: zlib-devel %if %{with openssl} BuildRequires: openssl-devel %endif @@ -29,27 +32,29 @@ BuildRequires: openssl-devel 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 +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 @@ -82,6 +87,7 @@ user interaction or any kind of interactivity. %prep %setup -q %patch -p1 +%patch1 %build # local hack to make curl-config --libs stop printing libraries it depends on diff --git a/dont-mess-with-rpmoptflags.diff b/dont-mess-with-rpmoptflags.diff new file mode 100644 index 0000000..4c5e33c --- /dev/null +++ b/dont-mess-with-rpmoptflags.diff @@ -0,0 +1,13 @@ +--- configure.ac ++++ configure.ac +@@ -227,10 +227,6 @@ + dnl ********************************************************************** + + CURL_CHECK_COMPILER +-CURL_SET_COMPILER_BASIC_OPTS +-CURL_SET_COMPILER_DEBUG_OPTS +-CURL_SET_COMPILER_OPTIMIZE_OPTS +-CURL_SET_COMPILER_WARNING_OPTS + + case $host in + # From 89283317dbb3c90e3ff2c4f45f0dc1eb105cd1c7baf34b130283a0706c18d993 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 18 Jan 2012 12:51:12 +0000 Subject: [PATCH 2/3] fix OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=68 --- curl.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/curl.spec b/curl.spec index 07b620d..ae03104 100644 --- a/curl.spec +++ b/curl.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without openssl %bcond_with mozilla_nss %bcond_without testsuite @@ -90,6 +91,7 @@ user interaction or any kind of interactivity. %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) From c6966aed7dc828a0c5c2522f491ffb375131894cd8bdcf983852f24652f57291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Thu, 2 Feb 2012 18:50:23 +0000 Subject: [PATCH 3/3] Accepting request 102532 from home:elvigia:branches:devel:libraries:c_c++ - Update to version curl 7.24.0 - refresh patches to fix broken build OBS-URL: https://build.opensuse.org/request/show/102532 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=69 --- curl-7.23.1.tar.lzma | 3 -- curl-7.24.0.tar.lzma | 3 ++ curl.changes | 6 +++ curl.spec | 5 +- dont-mess-with-rpmoptflags.diff | 6 +-- libcurl-ocloexec.patch | 90 +++++++++------------------------ 6 files changed, 40 insertions(+), 73 deletions(-) delete mode 100644 curl-7.23.1.tar.lzma create mode 100644 curl-7.24.0.tar.lzma diff --git a/curl-7.23.1.tar.lzma b/curl-7.23.1.tar.lzma deleted file mode 100644 index 98bcb54..0000000 --- a/curl-7.23.1.tar.lzma +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eff6cfd9d561f0d5e08abd99112dc13b2593560c748a78801366f4604c9062cb -size 1937159 diff --git a/curl-7.24.0.tar.lzma b/curl-7.24.0.tar.lzma new file mode 100644 index 0000000..9ea1396 --- /dev/null +++ b/curl-7.24.0.tar.lzma @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd683ee8be137ed8a8e97d42fd3cc94f88f63d478b83d4abe38e31b6281e2268 +size 1973811 diff --git a/curl.changes b/curl.changes index 6761ee4..21bafa9 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/curl.spec b/curl.spec index ae03104..83af0c9 100644 --- a/curl.spec +++ b/curl.spec @@ -22,6 +22,7 @@ Name: curl BuildRequires: libidn-devel +BuildRequires: libtool BuildRequires: lzma BuildRequires: openldap2-devel BuildRequires: pkg-config @@ -40,7 +41,7 @@ BuildRequires: libcares-devel # used by the testsuite BuildRequires: stunnel %endif -Version: 7.23.1 +Version: 7.24.0 Release: 0 # bug437293 %ifarch ppc64 @@ -87,7 +88,7 @@ user interaction or any kind of interactivity. %prep %setup -q -%patch -p1 +%patch %patch1 %build diff --git a/dont-mess-with-rpmoptflags.diff b/dont-mess-with-rpmoptflags.diff index 4c5e33c..b5d045b 100644 --- a/dont-mess-with-rpmoptflags.diff +++ b/dont-mess-with-rpmoptflags.diff @@ -1,6 +1,6 @@ ---- configure.ac +--- configure.ac.orig +++ configure.ac -@@ -227,10 +227,6 @@ +@@ -279,10 +279,6 @@ dnl platform/compiler/architecture speci dnl ********************************************************************** CURL_CHECK_COMPILER @@ -9,5 +9,5 @@ -CURL_SET_COMPILER_OPTIMIZE_OPTS -CURL_SET_COMPILER_WARNING_OPTS - case $host in + if test "$compiler_id" = "INTEL_UNIX_C"; then # diff --git a/libcurl-ocloexec.patch b/libcurl-ocloexec.patch index 75d121a..72f97de 100644 --- a/libcurl-ocloexec.patch +++ b/libcurl-ocloexec.patch @@ -7,24 +7,9 @@ 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, +--- lib/cookie.c.orig ++++ lib/cookie.c +@@ -736,7 +736,7 @@ struct CookieInfo *Curl_cookie_init(stru fp = NULL; } else @@ -33,7 +18,7 @@ index 41ccdbe..35cfca3 100644 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 @@ index 41ccdbe..35cfca3 100644 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 @@ index 4447c73..7e15b21 100644 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 @@ index 4447c73..7e15b21 100644 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 @@ index 4447c73..7e15b21 100644 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 @@ index 4447c73..7e15b21 100644 } 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 @@ index cbef511..187c88b 100644 /* * 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 @@ index cbef511..187c88b 100644 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 @@ -139,11 +105,9 @@ index 8241cb4..ac8d3d2 100644 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 @@ index 4924f73..76c94ec 100644 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 @@ index 6764b97..a605883 100644 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 @@ index af70fe0..54f07a4 100644 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]) {