Hello community, here is the log from the commit of package curl for openSUSE:Factory checked in at 2014-11-24 11:14:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/curl (Old) and /work/SRC/openSUSE:Factory/.curl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "curl" Changes: -------- --- /work/SRC/openSUSE:Factory/curl/curl.changes 2014-10-29 21:09:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.curl.new/curl.changes 2014-11-24 11:14:28.000000000 +0100 @@ -1,0 +2,23 @@ +Fri Nov 14 15:29:07 UTC 2014 - [email protected] + +- update to 7.39.0: +- changes: + SSLv3 is disabled by default + CURLOPT_COOKIELIST: Added "RELOAD" command + build: Added WinIDN build configuration options to Visual Studio projects + ssh: improve key file search + SSL: public key pinning. Use CURLOPT_PINNEDPUBLICKEY and --pinnedpubkey + vtls: remove QsoSSL support, use gskit! + mk-ca-bundle: added SHA-384 signature algorithm + docs: added many examples for libcurl opts and other doc improvements + build: Added VC ssh2 target to main Makefile + MinGW: Added support to build with nghttp2 + NetWare: Added support to build with nghttp2 + build: added Watcom support to build with WinSSL + build: Added optional specific version generation of VC project files + ... and a bunch of bugfixes +- refreshed libcurl-ocloexec.patch +- removed gpg-offline verification +- spec-cleaned curl.spec + +------------------------------------------------------------------- Old: ---- curl-7.38.0.tar.lzma curl-7.38.0.tar.lzma.asc New: ---- curl-7.39.0.tar.lzma curl-7.39.0.tar.lzma.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ curl.spec ++++++ --- /var/tmp/diff_new_pack.tdYynD/_old 2014-11-24 11:14:29.000000000 +0100 +++ /var/tmp/diff_new_pack.tdYynD/_new 2014-11-24 11:14:29.000000000 +0100 @@ -19,9 +19,8 @@ %bcond_without openssl %bcond_with mozilla_nss %bcond_without testsuite - Name: curl -Version: 7.38.0 +Version: 7.39.0 Release: 0 Summary: A Tool for Transferring Data from URLs License: BSD-3-Clause and MIT @@ -31,38 +30,34 @@ Source2: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma.asc Source3: baselibs.conf Source4: %{name}.keyring -Patch: libcurl-ocloexec.patch +Patch0: libcurl-ocloexec.patch Patch1: dont-mess-with-rpmoptflags.diff Patch3: curl-secure-getenv.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 -%endif +BuildRequires: krb5-mini-devel BuildRequires: libidn-devel +BuildRequires: libssh2-devel BuildRequires: libtool BuildRequires: lzma BuildRequires: openldap2-devel BuildRequires: pkg-config BuildRequires: zlib-devel +Requires: libcurl4 = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with openssl} BuildRequires: openssl-devel %endif %if %{with mozilla_nss} BuildRequires: mozilla-nss-devel %endif -BuildRequires: krb5-mini-devel -BuildRequires: libssh2-devel #BuildRequires: openssh %if 0%{?_with_stunnel:1} # used by the testsuite BuildRequires: stunnel %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build # bug437293 %ifarch ppc64 Obsoletes: curl-64bit %endif -Requires: libcurl4 = %{version} %description Curl is a client to get documents and files from or send documents to a @@ -94,11 +89,8 @@ user interaction or any kind of interactivity. %prep -%if 0%{?VERIFY_SIG} -%gpg_verify %{S:2} -%endif %setup -q -%patch +%patch0 %patch1 %patch3 @@ -106,7 +98,7 @@ # curl complains if macro definition is contained in CFLAGS # see m4/xc-val-flgs.m4 CPPFLAGS="-D_FORTIFY_SOURCE=2" -CFLAGS=$(echo $RPM_OPT_FLAGS | sed 's/-D_FORTIFY_SOURCE=2//') +CFLAGS=$(echo %{optflags} | sed 's/-D_FORTIFY_SOURCE=2//') export CPPFLAGS CFLAGS autoreconf -fi # local hack to make curl-config --libs stop printing libraries it depends on @@ -117,14 +109,14 @@ --enable-ipv6 \ %if %{with openssl} --with-ssl \ - --with-ca-path=/etc/ssl/certs/ \ + --with-ca-path=%{_sysconfdir}/ssl/certs/ \ %else --without-ssl \ %if %{with mozilla_nss} --with-nss \ %endif %endif - --with-gssapi=/usr/lib/mit \ + --with-gssapi=%{_libexecdir}/mit \ --with-libssh2\ --enable-hidden-symbols \ --disable-static \ @@ -136,10 +128,9 @@ make %{?_smp_mflags} %if %{with testsuite} - %check cd tests -make +make %{?_smp_mflags} # make sure the testsuite runs don't race on MP machines in autobuild if test -z "$BUILD_INCARNATION" -a -r /.buildenv; then . /.buildenv @@ -158,10 +149,10 @@ %endif %install -%{makeinstall} -rm $RPM_BUILD_ROOT%_libdir/libcurl.la -install -d $RPM_BUILD_ROOT/usr/share/aclocal -install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/usr/share/aclocal/ +make DESTDIR=%{buildroot} install %{?_smp_mflags} +rm %{buildroot}%{_libdir}/libcurl.la +install -d %{buildroot}%{_datadir}/aclocal +install -m 644 docs/libcurl/libcurl.m4 %{buildroot}%{_datadir}/aclocal/ %post -n libcurl4 -p /sbin/ldconfig @@ -172,7 +163,7 @@ %doc README RELEASE-NOTES %doc docs/{BUGS,FAQ,FEATURES,MANUAL,RESOURCES,TODO,TheArtOfHttpScripting} %doc lib/README.curl_off_t -%{_prefix}/bin/curl +%{_bindir}/curl %doc %{_mandir}/man1/curl.1%{ext_man} %files -n libcurl4 @@ -181,10 +172,10 @@ %files -n libcurl-devel %defattr(-,root,root) -%{_prefix}/bin/curl-config -%{_prefix}/include/curl -%dir %{_prefix}/share/aclocal -%{_prefix}/share/aclocal/libcurl.m4 +%{_bindir}/curl-config +%{_includedir}/curl +%dir %{_datadir}/aclocal +%{_datadir}/aclocal/libcurl.m4 %{_libdir}/libcurl.so %{_libdir}/pkgconfig/libcurl.pc %{_mandir}/man1/curl-config.1%{ext_man} ++++++ libcurl-ocloexec.patch ++++++ --- /var/tmp/diff_new_pack.tdYynD/_old 2014-11-24 11:14:29.000000000 +0100 +++ /var/tmp/diff_new_pack.tdYynD/_new 2014-11-24 11:14:29.000000000 +0100 @@ -9,9 +9,9 @@ Index: lib/cookie.c =================================================================== ---- lib/cookie.c.orig 2014-02-04 16:25:31.256657224 +0100 -+++ lib/cookie.c 2014-02-04 16:25:32.638671791 +0100 -@@ -882,7 +882,7 @@ struct CookieInfo *Curl_cookie_init(stru +--- lib/cookie.c.orig 2014-11-14 16:22:55.236645676 +0100 ++++ lib/cookie.c 2014-11-14 16:22:56.345659444 +0100 +@@ -914,7 +914,7 @@ struct CookieInfo *Curl_cookie_init(stru fp = NULL; } else @@ -20,7 +20,7 @@ c->newsession = newsession; /* new session? */ -@@ -1226,7 +1226,7 @@ static int cookie_output(struct CookieIn +@@ -1262,7 +1262,7 @@ static int cookie_output(struct CookieIn use_stdout=TRUE; } else { @@ -31,18 +31,18 @@ } Index: lib/file.c =================================================================== ---- lib/file.c.orig 2014-02-04 16:25:31.257657234 +0100 -+++ lib/file.c 2014-02-04 16:25:32.638671791 +0100 -@@ -232,7 +232,7 @@ static CURLcode file_connect(struct conn - fd = open_readonly(actual_path, O_RDONLY|O_BINARY); - file->path = actual_path; - #else +--- lib/file.c.orig 2014-11-14 16:22:55.236645676 +0100 ++++ lib/file.c 2014-11-14 16:23:47.405293344 +0100 +@@ -240,7 +240,7 @@ static CURLcode file_connect(struct conn + /* binary zeroes indicate foul play */ + return CURLE_URL_MALFORMAT; + - 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 */ -@@ -330,7 +330,7 @@ static CURLcode file_upload(struct conne +@@ -338,7 +338,7 @@ static CURLcode file_upload(struct conne else mode = MODE_DEFAULT|O_TRUNC; @@ -53,9 +53,9 @@ return CURLE_WRITE_ERROR; Index: lib/formdata.c =================================================================== ---- lib/formdata.c.orig 2014-02-04 16:25:31.257657234 +0100 -+++ lib/formdata.c 2014-02-04 16:25:32.639671801 +0100 -@@ -1297,7 +1297,7 @@ CURLcode Curl_getformdata(struct Session +--- lib/formdata.c.orig 2014-11-14 16:22:55.237645688 +0100 ++++ lib/formdata.c 2014-11-14 16:22:56.346659457 +0100 +@@ -1261,7 +1261,7 @@ CURLcode Curl_getformdata(struct Session FILE *fileread; fileread = strequal("-", file->contents)? @@ -64,7 +64,7 @@ /* * VMS: This only allows for stream files on VMS. Stream files are -@@ -1458,7 +1458,7 @@ static size_t readfromfile(struct Form * +@@ -1420,7 +1420,7 @@ static size_t readfromfile(struct Form * else { if(!form->fp) { /* this file hasn't yet been opened */ @@ -75,8 +75,8 @@ } Index: lib/hostip6.c =================================================================== ---- lib/hostip6.c.orig 2014-02-04 16:25:31.277657445 +0100 -+++ lib/hostip6.c 2014-02-04 16:25:32.639671801 +0100 +--- lib/hostip6.c.orig 2014-11-14 16:22:55.237645688 +0100 ++++ lib/hostip6.c 2014-11-14 16:22:56.346659457 +0100 @@ -39,7 +39,7 @@ #ifdef HAVE_PROCESS_H #include <process.h> @@ -97,8 +97,8 @@ ipv6_works = 0; Index: lib/if2ip.c =================================================================== ---- lib/if2ip.c.orig 2014-02-04 16:25:31.277657445 +0100 -+++ lib/if2ip.c 2014-02-04 16:25:32.639671801 +0100 +--- lib/if2ip.c.orig 2014-11-14 16:22:55.238645701 +0100 ++++ lib/if2ip.c 2014-11-14 16:22:56.346659457 +0100 @@ -171,7 +171,7 @@ if2ip_result_t Curl_if2ip(int af, unsign if(len >= sizeof(req.ifr_name)) return IF2IP_NOT_FOUND; @@ -110,9 +110,9 @@ Index: lib/netrc.c =================================================================== ---- lib/netrc.c.orig 2014-02-04 16:25:32.639671801 +0100 -+++ lib/netrc.c 2014-02-04 16:26:01.737978525 +0100 -@@ -99,7 +99,7 @@ int Curl_parsenetrc(const char *host, +--- lib/netrc.c.orig 2014-11-14 16:22:55.238645701 +0100 ++++ lib/netrc.c 2014-11-14 16:22:56.346659457 +0100 +@@ -111,7 +111,7 @@ int Curl_parsenetrc(const char *host, netrc_alloc = TRUE; } @@ -123,9 +123,9 @@ if(file) { Index: lib/connect.c =================================================================== ---- lib/connect.c.orig 2014-02-04 16:25:31.277657445 +0100 -+++ lib/connect.c 2014-02-04 16:25:32.761673087 +0100 -@@ -1298,7 +1298,7 @@ CURLcode Curl_socket(struct connectdata +--- lib/connect.c.orig 2014-11-14 16:22:55.238645701 +0100 ++++ lib/connect.c 2014-11-14 16:22:56.346659457 +0100 +@@ -1306,7 +1306,7 @@ CURLcode Curl_socket(struct connectdata (struct curl_sockaddr *)addr); else /* opensocket callback not set, so simply create the socket now */ @@ -136,9 +136,9 @@ /* no socket, no connection */ Index: configure.ac =================================================================== ---- configure.ac.orig 2014-02-04 16:25:31.278657455 +0100 -+++ configure.ac 2014-02-04 16:25:32.762673098 +0100 -@@ -182,6 +182,7 @@ AC_CANONICAL_HOST +--- configure.ac.orig 2014-11-14 16:22:55.239645713 +0100 ++++ configure.ac 2014-11-14 16:22:56.347659469 +0100 +@@ -181,6 +181,7 @@ AC_CANONICAL_HOST dnl Get system canonical name AC_DEFINE_UNQUOTED(OS, "${host}", [cpu-machine-OS]) @@ -146,7 +146,7 @@ dnl Checks for programs. dnl Our curl_off_t internal and external configure settings -@@ -194,6 +195,7 @@ dnl Our configure and build reentrant se +@@ -193,6 +194,7 @@ dnl Our configure and build reentrant se CURL_CONFIGURE_THREAD_SAFE CURL_CONFIGURE_REENTRANT -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
