From 20fa7b3888eab8a1900e99ee88df6a45eaa4dd3f Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Sat, 19 Apr 2014 16:04:36 +0200 Subject: [PATCH] Step 2: base dep: www/curl --- www/curl/distinfo | 2 + www/curl/patches/patch-lib_connect.c | 11 +++++ www/curl/patches/patch-zz-minix-a | 66 ++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 www/curl/patches/patch-lib_connect.c create mode 100644 www/curl/patches/patch-zz-minix-a diff --git a/www/curl/distinfo b/www/curl/distinfo index 4da53334e..cbc31027b 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -6,4 +6,6 @@ SHA512 (curl-7.50.3.tar.bz2) = 59012f0d9abd38d00e0b2db0cd5d8b513c08000354d31e731 Size (curl-7.50.3.tar.bz2) = 7478393 bytes SHA1 (patch-aa) = 793701d5ecc3343170fb437906c9adb74763cd13 SHA1 (patch-curl-config.in) = d0cc7bb6a5bf0b9257f40dcffce7093cc0098eb7 +SHA1 (patch-lib_connect.c) = afe17a36b02d0694542a2d22b20c4231b966cf57 SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308 +SHA1 (patch-zz-minix-a) = 20a938ef857bb61355d3a45836894805aa317de3 diff --git a/www/curl/patches/patch-lib_connect.c b/www/curl/patches/patch-lib_connect.c new file mode 100644 index 000000000..57f862bbb --- /dev/null +++ b/www/curl/patches/patch-lib_connect.c @@ -0,0 +1,11 @@ +--- lib/connect.c.orig Fri Apr 18 15:48:42 2014 ++++ lib/connect.c Fri Apr 18 15:49:19 2014 +@@ -506,7 +506,7 @@ static bool verifyconnect(curl_socket_t sockfd, int *e + err = 0; + } + #endif +-#ifdef __minix ++#if defined EBADIOCTL && defined __minix + /* Minix 3.1.x doesn't support getsockopt on UDP sockets */ + if(EBADIOCTL == err) { + SET_SOCKERRNO(0); diff --git a/www/curl/patches/patch-zz-minix-a b/www/curl/patches/patch-zz-minix-a new file mode 100644 index 000000000..ae4197f5a --- /dev/null +++ b/www/curl/patches/patch-zz-minix-a @@ -0,0 +1,66 @@ +--- configure.orig Sun Oct 16 16:31:08 2016 ++++ configure Sun Oct 16 16:35:37 2016 +@@ -8481,7 +8481,7 @@ + lt_cv_sys_max_cmd_len=8192; + ;; + +- bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) ++ bitrig* | darwin* | dragonfly* | freebsd* | minix* | netbsd* | openbsd*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +@@ -8947,7 +8947,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd* | netbsdelf*-gnu) ++minix* | netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -13028,7 +13028,7 @@ + fi + ;; + +- netbsd* | netbsdelf*-gnu) ++ minix* | netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -13718,7 +13718,7 @@ + esac + ;; + +- netbsd* | netbsdelf*-gnu) ++ minix* | netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -14844,6 +14844,18 @@ + dynamic_linker='NetBSD ld.elf_so' + ;; + ++minix*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ dynamic_linker='Minix ld.elf_so' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -32014,7 +32026,7 @@ + netbsd[123].*) + tst_tsafe_getaddrinfo="no" + ;; +- netbsd*) ++ minix* | netbsd*) + tst_tsafe_getaddrinfo="yes" + ;; + *bsd*)