diff options
author | Jakub Bogusz | 2012-10-13 08:21:10 (GMT) |
---|---|---|
committer | Jakub Bogusz | 2012-10-13 08:21:10 (GMT) |
commit | 59f58859d79b055228aec1688db9900bd22e319c (patch) | |
tree | 1f1b9ee687d0b6bf01f5d617c488047ee68b0ffa | |
parent | cb26134f91ceb04682bddf1b6e621d1f9710fb6c (diff) | |
download | curl-auto/th/curl-7.28.0-1.zip curl-auto/th/curl-7.28.0-1.tar.gz |
- updated to 7.28.0auto/ti/curl-7.28.0-1auto/th/curl-7.28.0-1
- removed obsolete gnutls3,gtls,config patches
- dropped fb-changes patch (use curl_multi_wait() introduced in 7.28.0 instead)
-rw-r--r-- | curl-config.patch | 14 | ||||
-rw-r--r-- | curl-gtls.patch | 16 | ||||
-rw-r--r-- | curl.spec | 14 | ||||
-rw-r--r-- | gnutls3.patch | 31 | ||||
-rw-r--r-- | libcurl.fb-changes.diff | 111 |
5 files changed, 3 insertions, 183 deletions
diff --git a/curl-config.patch b/curl-config.patch deleted file mode 100644 index d5dd6e7..0000000 --- a/curl-config.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- curl-7.27.0/curl-config.in.orig 2012-05-25 23:56:17.000000000 +0200 -+++ curl-7.27.0/curl-config.in 2012-10-04 20:50:06.753669995 +0200 -@@ -135,9 +135,9 @@ - CPPFLAG_CURL_STATICLIB="" - fi - if test "X@includedir@" = "X/usr/include"; then -- echo "$(CPPFLAG_CURL_STATICLIB)" -+ echo "${CPPFLAG_CURL_STATICLIB}" - else -- echo "$(CPPFLAG_CURL_STATICLIB)-I@includedir@" -+ echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@" - fi - ;; - diff --git a/curl-gtls.patch b/curl-gtls.patch deleted file mode 100644 index 62cea03..0000000 --- a/curl-gtls.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -urN curl-7.27.0.org/lib/gtls.c curl-7.27.0/lib/gtls.c ---- curl-7.27.0.org/lib/gtls.c 2012-06-26 19:50:16.000000000 +0200 -+++ curl-7.27.0/lib/gtls.c 2012-08-03 23:26:27.828178591 +0200 -@@ -33,9 +33,12 @@ - #ifdef USE_GNUTLS - - #include <gnutls/gnutls.h> -+#include <gnutls/crypto.h> - #include <gnutls/x509.h> - #ifndef USE_GNUTLS_NETTLE - #include <gcrypt.h> -+#else -+#include <nettle/md5.h> - #endif - - #ifdef HAVE_SYS_SOCKET_H @@ -21,19 +21,15 @@ Summary(pt_BR.UTF-8): Busca URL (suporta FTP, TELNET, LDAP, GOPHER, DICT, HTTP e Summary(ru.UTF-8): Утилита для получения файлов с серверов FTP, HTTP и других Summary(uk.UTF-8): Утиліта для отримання файлів з серверів FTP, HTTP та інших Name: curl -Version: 7.27.0 -Release: 2 +Version: 7.28.0 +Release: 1 License: MIT-like Group: Applications/Networking Source0: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma -# Source0-md5: 1b669875527ba4b943a0cdb5b255a02c +# Source0-md5: f8a9f99d9db71d8ce1d2c4ccea3c3850 Patch1: %{name}-ac.patch Patch2: %{name}-pc.patch Patch3: %{name}-krb5flags.patch -Patch4: lib%{name}.fb-changes.diff -Patch5: gnutls3.patch -Patch6: %{name}-gtls.patch -Patch7: %{name}-config.patch URL: http://curl.haxx.se/ BuildRequires: autoconf >= 2.57 BuildRequires: automake @@ -198,10 +194,6 @@ Bibliotecas estáticas para desenvolvimento com o curl. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 %{__rm} -v m4/lt*.m4 m4/libtool.m4 diff --git a/gnutls3.patch b/gnutls3.patch deleted file mode 100644 index 9cb37bb..0000000 --- a/gnutls3.patch +++ /dev/null @@ -1,31 +0,0 @@ -http://curl.haxx.se/mail/lib-2011-10/0176.html - -Curl: [PATCH] gtls: only call gnutls_transport_set_lowat with <gnutls-2.12.0 -From: Tim Harder <radhermit_at_gmail.com> -Date: Wed, 19 Oct 2011 01:08:56 -0700 - -The default lowat level for gnutls-2.12* is set to zero to avoid -unnecessary system calls and the gnutls_transport_set_lowat function has -been totally removed in >=gnutls-3 which causes build failures. -Therefore, the function shouldn't be used except for versions that -require it, <gnutls-2.12.0. - ---- - lib/gtls.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) -diff --git a/lib/gtls.c b/lib/gtls.c -index f75a815..7ca46c8 100644 ---- a/lib/gtls.c -+++ b/lib/gtls.c -@@ -476,8 +476,10 @@ gtls_connect_step1(struct connectdata *conn, - gnutls_transport_set_push_function(session, Curl_gtls_push); - gnutls_transport_set_pull_function(session, Curl_gtls_pull); - -+#if GNUTLS_VERSION_NUMBER < 0x020c00 - /* lowat must be set to zero when using custom push and pull functions. */ - gnutls_transport_set_lowat(session, 0); -+#endif - - /* This might be a reconnect, so we check for a session ID in the cache - to speed up things */ -- -1.7.7 diff --git a/libcurl.fb-changes.diff b/libcurl.fb-changes.diff deleted file mode 100644 index 57701b9..0000000 --- a/libcurl.fb-changes.diff +++ /dev/null @@ -1,111 +0,0 @@ ---- curl-7.21.3/include/curl/multi.h~ 2010-09-18 23:00:21.000000000 +0200 -+++ curl-7.21.3/include/curl/multi.h 2010-12-16 09:17:03.909735667 +0100 -@@ -132,6 +132,17 @@ - fd_set *write_fd_set, - fd_set *exc_fd_set, - int *max_fd); -+ /* Name: curl_multi_select() -+ * -+ * Desc: Calls select() or poll() internally so app can call -+ * curl_multi_perform() as soon as one of them is ready. This is to -+ * fix FD_SETSIZE problem curl_multi_fdset() has. -+ * -+ * Returns: CURLMcode type, general multi error code. -+ */ -+CURL_EXTERN CURLMcode curl_multi_select(CURLM *multi_handle, -+ int timeout_ms, -+ int *ret); - - /* - * Name: curl_multi_perform() ---- curl-7.21.3/lib/multi.c~ 2010-12-15 10:04:43.000000000 +0100 -+++ curl-7.21.3/lib/multi.c 2010-12-16 09:20:29.652705567 +0100 -@@ -42,6 +42,7 @@ - #include "timeval.h" - #include "http.h" - #include "warnless.h" -+#include "select.h" - - #define _MPRINTF_REPLACE /* use our functions only */ - #include <curl/mprintf.h> -@@ -930,6 +931,80 @@ - return CURLM_OK; - } - -+CURLMcode curl_multi_select(CURLM *multi_handle, int timeout_ms, int *ret) { -+ struct Curl_multi *multi=(struct Curl_multi *)multi_handle; -+ struct Curl_one_easy *easy; -+ curl_socket_t sockbunch[MAX_SOCKSPEREASYHANDLE]; -+ int bitmap; -+ int i; -+ unsigned int nfds = 0; -+ struct pollfd *ufds; -+ int nret = -1; -+ -+ if(!GOOD_MULTI_HANDLE(multi)) -+ return CURLM_BAD_HANDLE; -+ -+ easy=multi->easy.next; -+ while(easy != &multi->easy) { -+ bitmap = multi_getsock(easy, sockbunch, MAX_SOCKSPEREASYHANDLE); -+ -+ for(i=0; i< MAX_SOCKSPEREASYHANDLE; i++) { -+ curl_socket_t s = CURL_SOCKET_BAD; -+ -+ if(bitmap & GETSOCK_READSOCK(i)) { -+ ++nfds; -+ s = sockbunch[i]; -+ } -+ if(bitmap & GETSOCK_WRITESOCK(i)) { -+ ++nfds; -+ s = sockbunch[i]; -+ } -+ if(s == CURL_SOCKET_BAD) { -+ break; -+ } -+ } -+ -+ easy = easy->next; /* check next handle */ -+ } -+ -+ ufds = (struct pollfd *)malloc(nfds * sizeof(struct pollfd)); -+ nfds = 0; -+ -+ easy=multi->easy.next; -+ while(easy != &multi->easy) { -+ bitmap = multi_getsock(easy, sockbunch, MAX_SOCKSPEREASYHANDLE); -+ -+ for(i=0; i< MAX_SOCKSPEREASYHANDLE; i++) { -+ curl_socket_t s = CURL_SOCKET_BAD; -+ -+ if(bitmap & GETSOCK_READSOCK(i)) { -+ ufds[nfds].fd = sockbunch[i]; -+ ufds[nfds].events = POLLIN; -+ ++nfds; -+ s = sockbunch[i]; -+ } -+ if(bitmap & GETSOCK_WRITESOCK(i)) { -+ ufds[nfds].fd = sockbunch[i]; -+ ufds[nfds].events = POLLOUT; -+ ++nfds; -+ s = sockbunch[i]; -+ } -+ if(s == CURL_SOCKET_BAD) { -+ break; -+ } -+ } -+ -+ easy = easy->next; /* check next handle */ -+ } -+ -+ nret = Curl_poll(ufds, nfds, timeout_ms); -+ free(ufds); -+ if (ret) { -+ *ret = nret; -+ } -+ return CURLM_OK; -+} -+ - static CURLMcode multi_runsingle(struct Curl_multi *multi, - struct timeval now, - struct Curl_one_easy *easy) |