Skip to content

Commit 04a1c7a

Browse files
piepie62WinterMute
authored andcommitted
Update 3ds-curl to 7.67.0 (#122)
1 parent 8eaabf3 commit 04a1c7a

File tree

2 files changed

+24
-15
lines changed

2 files changed

+24
-15
lines changed

3ds/curl/3ds-curl.patch

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
diff --git a/lib/connect.c b/lib/connect.c
2-
index 3edb71eb7..b81a7db87 100644
3-
--- a/lib/connect.c
4-
+++ b/lib/connect.c
5-
@@ -109,6 +109,9 @@ static void
1+
diff -NBaur curl-7.67.0.new/lib/connect.c curl-7.67.0/lib/connect.c
2+
--- curl-7.67.0.new/lib/connect.c 2019-12-03 10:36:21.885160000 -0700
3+
+++ curl-7.67.0/lib/connect.c 2019-12-03 10:37:27.499231800 -0700
4+
@@ -111,6 +111,9 @@
65
tcpkeepalive(struct Curl_easy *data,
76
curl_socket_t sockfd)
87
{
@@ -12,15 +11,15 @@ index 3edb71eb7..b81a7db87 100644
1211
int optval = data->set.tcp_keepalive?1:0;
1312

1413
/* only set IDLE and INTVL if setting KEEPALIVE is successful */
15-
@@ -160,6 +163,7 @@ tcpkeepalive(struct Curl_easy *data,
14+
@@ -162,6 +165,7 @@
1615
#endif
1716
#endif
1817
}
1918
+#endif
2019
}
2120

2221
static CURLcode
23-
@@ -484,7 +488,7 @@ static CURLcode bindlocal(struct connectdata *conn,
22+
@@ -494,7 +498,7 @@
2423
static bool verifyconnect(curl_socket_t sockfd, int *error)
2524
{
2625
bool rc = TRUE;
@@ -29,11 +28,10 @@ index 3edb71eb7..b81a7db87 100644
2928
int err = 0;
3029
curl_socklen_t errSize = sizeof(err);
3130

32-
diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
33-
index 95a3f1050..ff7fb3669 100644
34-
--- a/lib/curl_addrinfo.c
35-
+++ b/lib/curl_addrinfo.c
36-
@@ -151,9 +151,11 @@ Curl_getaddrinfo_ex(const char *nodename,
31+
diff -NBaur curl-7.67.0.new/lib/curl_addrinfo.c curl-7.67.0/lib/curl_addrinfo.c
32+
--- curl-7.67.0.new/lib/curl_addrinfo.c 2019-12-03 10:36:22.042114000 -0700
33+
+++ curl-7.67.0/lib/curl_addrinfo.c 2019-12-03 10:37:27.500256100 -0700
34+
@@ -151,9 +151,11 @@
3735
if((ai->ai_addr == NULL) || !(ai->ai_addrlen > 0))
3836
continue;
3937

@@ -45,3 +43,14 @@ index 95a3f1050..ff7fb3669 100644
4543

4644
ca = malloc(sizeof(Curl_addrinfo));
4745
if(!ca) {
46+
diff -NBaur curl-7.67.0.new/lib/socketpair.c curl-7.67.0/lib/socketpair.c
47+
--- curl-7.67.0.new/lib/socketpair.c 2019-12-03 10:36:21.848108500 -0700
48+
+++ curl-7.67.0/lib/socketpair.c 2019-12-03 10:37:27.505455900 -0700
49+
@@ -40,6 +40,7 @@
50+
#ifdef HAVE_NETINET_IN_H
51+
#include <netinet/in.h> /* IPPROTO_TCP */
52+
#endif
53+
+#include <arpa/inet.h>
54+
#ifndef INADDR_LOOPBACK
55+
#define INADDR_LOOPBACK 0x7f000001
56+
#endif /* !INADDR_LOOPBACK */

3ds/curl/PKGBUILD

100644100755
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Contributor: Elouan Martinet <exa@elou.world>
33

44
pkgname=3ds-curl
5-
pkgver=7.65.0
5+
pkgver=7.67.0
66
pkgrel=1
77
pkgdesc='Library for transferring data with URLs. (for Nintendo 3DS homebrew development)'
88
arch=('any')
@@ -16,8 +16,8 @@ source=("https://curl.haxx.se/download/curl-${pkgver}.tar.gz"
1616
'3ds-curl.patch'
1717
)
1818

19-
sha256sums=('2a65f4f858a1fa949c79f926ddc2204c2be353ccbad014e95cd322d4a87d82ad'
20-
'937dc6fc621ce29cb14bf1083b232dd1c795618ad2a5c4b53ad399be189ef873')
19+
sha256sums=('52af3361cf806330b88b4fe6f483b6844209d47ae196ac46da4de59bb361ab02'
20+
'ab2a696769c6e1fb92c7193ec236569ea1b633565d67c3f671965f8259265537')
2121
groups=('3ds-portlibs')
2222

2323
build() {

0 commit comments

Comments
 (0)