head 1.2; access; symbols pkgsrc-2014Q4:1.1.0.30 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.28 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.26 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.24 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.22 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.20 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.18 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.16 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.14 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.12 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.10 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.8 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.6 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.4 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.2 pkgsrc-2011Q2-base:1.1; locks; strict; comment @# @; 1.2 date 2015.03.11.01.31.02; author mef; state dead; branches; next 1.1; commitid EbYrPx68BnkTX7dy; 1.1 date 2011.05.25.09.29.05; author drochner; state Exp; branches; next ; desc @@ 1.2 log @(pkgsrc) - Drop patch-ah, seems to have included - License from gnu-gpl-v2 to gnu-gpl-v3 (upstream) - Update 1.1.0 to 1.1.1 --------------------- 2013-04-26 Werner Koch Release 1.1.1. 2013-04-26 Andre Heinecke (wk) * configure.ac (strcasecmp): Check otherwise jnlib would defines it. * configure.ac (sigset_t): Add check. * configure.ac (LBER_LIBS): Add check. 2010-11-16 Werner Koch Change the license to GPLv3+. * COPYING: Replace by GPLv3 version. @ text @$NetBSD: patch-ah,v 1.1 2011/05/25 09:29:05 drochner Exp $ --- src/http.c.orig 2009-08-07 14:23:33.000000000 +0000 +++ src/http.c @@@@ -98,6 +98,16 @@@@ struct srventry }; #endif/*!USE_DNS_SRV*/ +#ifdef HAVE_PTH +# define my_select(a,b,c,d,e) pth_select ((a), (b), (c), (d), (e)) +# define my_connect(a,b,c) pth_connect ((a), (b), (c)) +# define my_accept(a,b,c) pth_accept ((a), (b), (c)) +#else +# define my_select(a,b,c,d,e) select ((a), (b), (c), (d), (e)) +# define my_connect(a,b,c) connect ((a), (b), (c)) +# define my_accept(a,b,c) accept ((a), (b), (c)) +#endif + #ifdef HAVE_W32_SYSTEM #define sock_close(a) closesocket(a) @@@@ -1333,14 +1343,14 @@@@ start_server () FD_ZERO (&rfds); FD_SET (fd, &rfds); - if (select (fd + 1, &rfds, NULL, NULL, NULL) <= 0) + if (my_select (fd + 1, &rfds, NULL, NULL, NULL) <= 0) continue; /* ignore any errors */ if (!FD_ISSET (fd, &rfds)) continue; addrlen = sizeof peer; - client = accept (fd, (struct sockaddr *) &peer, &addrlen); + client = my_accept (fd, (struct sockaddr *) &peer, &addrlen); if (client == -1) continue; /* oops */ @@@@ -1406,7 +1416,7 @@@@ connect_server (const char *server, unsi addr.sin_port = htons(port); memcpy (&addr.sin_addr,&inaddr,sizeof(inaddr)); - if (!connect (sock,(struct sockaddr *)&addr,sizeof(addr)) ) + if (!my_connect (sock,(struct sockaddr *)&addr,sizeof(addr)) ) return sock; sock_close(sock); return -1; @@@@ -1474,7 +1484,7 @@@@ connect_server (const char *server, unsi return -1; } - if (connect (sock, ai->ai_addr, ai->ai_addrlen)) + if (my_connect (sock, ai->ai_addr, ai->ai_addrlen)) last_errno = errno; else connected = 1; @@@@ -1528,7 +1538,7 @@@@ connect_server (const char *server, unsi for (i = 0; host->h_addr_list[i] && !connected; i++) { memcpy (&addr.sin_addr, host->h_addr_list[i], host->h_length); - if (connect (sock, (struct sockaddr *) &addr, sizeof (addr))) + if (my_connect (sock, (struct sockaddr *) &addr, sizeof (addr))) last_errno = errno; else { @@@@ -1594,7 +1604,7 @@@@ cookie_read (void *cookie, void *buffer, tv.tv_sec = 0; tv.tv_usec = 50000; - select (0, NULL, NULL, NULL, &tv); + my_select (0, NULL, NULL, NULL, &tv); goto again; } if (nread == GNUTLS_E_REHANDSHAKE) @@@@ -1649,7 +1659,7 @@@@ cookie_write (void *cookie, const void * tv.tv_sec = 0; tv.tv_usec = 50000; - select (0, NULL, NULL, NULL, &tv); + my_select (0, NULL, NULL, NULL, &tv); continue; } log_info ("TLS network write failed: %s\n", @ 1.1 log @add patch from upstream to make network connections (to fetch CRLs) non-blocking. Blocking can be considered a DOS problem because other requests are not served in that time. (SA44680, no CVE entry) bump PKGREV @ text @d1 1 a1 1 $NetBSD$ @