ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

* Curl 7.18.1.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=11691
This commit is contained in:
Eelco Dolstra 2008-04-23 09:30:09 +00:00
parent 09ab596e0f
commit 6aae26a1d8
2 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pkgs/tools/networking/curl/connect-timeout.patch
View File

@ -1,6 +1,6 @@
diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c
*** curl-7.17.1-orig/lib/connect.c 2007-10-22 16:30:17.000000000 +0200 *** curl-7.18.1-orig/lib/connect.c 2008-02-07 23:25:04.000000000 +0100
--- curl-7.17.1/lib/connect.c 2007-12-19 18:30:32.000000000 +0100 --- curl-7.18.1/lib/connect.c 2008-04-23 11:25:30.000000000 +0200
*************** ***************
*** 99,105 **** *** 99,105 ****
singleipconnect(struct connectdata *conn, singleipconnect(struct connectdata *conn,
@ -9,7 +9,7 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
! bool *connected); ! bool *connected);
/* /*
* Curl_nonblock() set the given socket to either blocking or non-blocking * Curl_timeleft() returns the amount of milliseconds left allowed for the
--- 99,106 ---- --- 99,106 ----
singleipconnect(struct connectdata *conn, singleipconnect(struct connectdata *conn,
const Curl_addrinfo *ai, /* start connecting to this */ const Curl_addrinfo *ai, /* start connecting to this */
@ -18,10 +18,10 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
! bool *timed_out); ! bool *timed_out);
/* /*
* Curl_nonblock() set the given socket to either blocking or non-blocking * Curl_timeleft() returns the amount of milliseconds left allowed for the
*************** ***************
*** 492,497 **** *** 552,557 ****
--- 493,499 ---- --- 553,559 ----
{ {
curl_socket_t sockfd; curl_socket_t sockfd;
Curl_addrinfo *ai; Curl_addrinfo *ai;
@ -30,24 +30,24 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
/* first close the failed socket */ /* first close the failed socket */
sclose(conn->sock[sockindex]); sclose(conn->sock[sockindex]);
*************** ***************
*** 505,511 **** *** 565,571 ****
ai = conn->ip_addr->ai_next; ai = conn->ip_addr->ai_next;
while (ai) { while(ai) {
! sockfd = singleipconnect(conn, ai, 0L, connected); ! sockfd = singleipconnect(conn, ai, 0L, connected);
if(sockfd != CURL_SOCKET_BAD) { if(sockfd != CURL_SOCKET_BAD) {
/* store the new socket descriptor */ /* store the new socket descriptor */
conn->sock[sockindex] = sockfd; conn->sock[sockindex] = sockfd;
--- 507,513 ---- --- 567,573 ----
ai = conn->ip_addr->ai_next; ai = conn->ip_addr->ai_next;
while (ai) { while(ai) {
! sockfd = singleipconnect(conn, ai, 0L, connected, &timed_out); ! sockfd = singleipconnect(conn, ai, 0L, connected, &timed_out);
if(sockfd != CURL_SOCKET_BAD) { if(sockfd != CURL_SOCKET_BAD) {
/* store the new socket descriptor */ /* store the new socket descriptor */
conn->sock[sockindex] = sockfd; conn->sock[sockindex] = sockfd;
*************** ***************
*** 669,675 **** *** 720,726 ****
singleipconnect(struct connectdata *conn, singleipconnect(struct connectdata *conn,
const Curl_addrinfo *ai, const Curl_addrinfo *ai,
long timeout_ms, long timeout_ms,
@ -55,7 +55,7 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
{ {
char addr_buf[128]; char addr_buf[128];
int rc; int rc;
--- 671,678 ---- --- 722,729 ----
singleipconnect(struct connectdata *conn, singleipconnect(struct connectdata *conn,
const Curl_addrinfo *ai, const Curl_addrinfo *ai,
long timeout_ms, long timeout_ms,
@ -65,8 +65,8 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
char addr_buf[128]; char addr_buf[128];
int rc; int rc;
*************** ***************
*** 689,694 **** *** 740,745 ****
--- 692,699 ---- --- 743,750 ----
struct curl_sockaddr *addr=(struct curl_sockaddr*)&addr_storage; struct curl_sockaddr *addr=(struct curl_sockaddr*)&addr_storage;
const void *iptoprint; const void *iptoprint;
@ -76,7 +76,7 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
addr->socktype=conn->socktype; addr->socktype=conn->socktype;
addr->protocol=ai->ai_protocol; addr->protocol=ai->ai_protocol;
*************** ***************
*** 790,797 **** *** 841,848 ****
infof(data, "connected\n"); infof(data, "connected\n");
return sockfd; return sockfd;
} }
@ -85,7 +85,7 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
else { else {
data->state.os_errno = error; data->state.os_errno = error;
infof(data, "%s\n", Curl_strerror(conn, error)); infof(data, "%s\n", Curl_strerror(conn, error));
--- 795,804 ---- --- 846,855 ----
infof(data, "connected\n"); infof(data, "connected\n");
return sockfd; return sockfd;
} }
@ -97,26 +97,26 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
data->state.os_errno = error; data->state.os_errno = error;
infof(data, "%s\n", Curl_strerror(conn, error)); infof(data, "%s\n", Curl_strerror(conn, error));
*************** ***************
*** 822,829 **** *** 872,879 ****
int num_addr;
Curl_addrinfo *ai; Curl_addrinfo *ai;
Curl_addrinfo *curr_addr; Curl_addrinfo *curr_addr;
int timeout_set = 0;
- struct timeval after; - struct timeval after;
struct timeval before = Curl_tvnow(); struct timeval before = Curl_tvnow();
/************************************************************* /*************************************************************
--- 829,836 ---- --- 879,886 ----
int num_addr;
Curl_addrinfo *ai; Curl_addrinfo *ai;
Curl_addrinfo *curr_addr; Curl_addrinfo *curr_addr;
int timeout_set = 0;
+ bool timed_out; + bool timed_out;
struct timeval before = Curl_tvnow(); struct timeval before = Curl_tvnow();
/************************************************************* /*************************************************************
*************** ***************
*** 891,909 **** *** 915,933 ****
curr_addr = curr_addr->ai_next, aliasindex++) { curr_addr = curr_addr->ai_next, aliasindex++) {
/* start connecting to the IP curr_addr points to */ /* start connecting to the IP curr_addr points to */
@ -135,8 +135,8 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
- before = after; - before = after;
} /* end of connect-to-each-address loop */ } /* end of connect-to-each-address loop */
if (sockfd == CURL_SOCKET_BAD) { if(sockfd == CURL_SOCKET_BAD) {
--- 898,914 ---- --- 922,938 ----
curr_addr = curr_addr->ai_next, aliasindex++) { curr_addr = curr_addr->ai_next, aliasindex++) {
/* start connecting to the IP curr_addr points to */ /* start connecting to the IP curr_addr points to */
@ -153,4 +153,4 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
} }
} /* end of connect-to-each-address loop */ } /* end of connect-to-each-address loop */
if (sockfd == CURL_SOCKET_BAD) { if(sockfd == CURL_SOCKET_BAD) {

20
pkgs/tools/networking/curl/default.nix
View File

@ -4,20 +4,25 @@ assert zlibSupport -> zlib != null;
assert sslSupport -> openssl != null; assert sslSupport -> openssl != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "curl-7.17.1"; name = "curl-7.18.1";
src = fetchurl { src = fetchurl {
url = http://curl.haxx.se/download/curl-7.17.1.tar.bz2; url = http://curl.haxx.se/download/curl-7.18.1.tar.bz2;
sha256 = "0yz50r75jhfr2ya6wqi6n90bn4ij30299pjglmlckzq6jp28wrkz"; sha256 = "0v5fpr4bsdlg262nsgrijlfhp3vgr1ypir1rrkmhxcsnpv4frw6c";
}; };
buildInputs = buildInputs =
stdenv.lib.optional zlibSupport zlib ++ stdenv.lib.optional zlibSupport zlib ++
stdenv.lib.optional sslSupport openssl; stdenv.lib.optional sslSupport openssl;
configureFlags = "
configureFlags = ''
${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"} ${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"}
"; '';
CFLAGS = if stdenv ? isDietLibC then "-DHAVE_INET_NTOA_R_2_ARGS=1" else ""; CFLAGS = if stdenv ? isDietLibC then "-DHAVE_INET_NTOA_R_2_ARGS=1" else "";
CXX = "g++"; CXX = "g++";
CXXCPP = "g++ -E"; CXXCPP = "g++ -E";
inherit sslSupport openssl; inherit sslSupport openssl;
patches = [ patches = [
@ -30,4 +35,9 @@ stdenv.mkDerivation {
considered non-transient so it won't retry. */ considered non-transient so it won't retry. */
./connect-timeout.patch ./connect-timeout.patch
]; ];
meta = {
description = "A command line tool for transferring files with URL syntax";
homepage = http://curl.haxx.se/;
};
} }