Support Minix

3 files changed, 114 insertions, 10 deletions

diff --git a/www/curl/distinfo b/www/curl/distinfo
index 24ce0655609..9e67eeedef4 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.147 2018/10/31 08:06:24 leot Exp $
+$NetBSD: distinfo,v 1.148 2018/11/28 01:31:45 sevan Exp $
 
 SHA1 (curl-7.62.0.tar.bz2) = 062a9f50723970cdbf9864781efedeef71e9d68e
 RMD160 (curl-7.62.0.tar.bz2) = 8a9cd8b4d0c3e156226f8829912cec77600c077e
 SHA512 (curl-7.62.0.tar.bz2) = 83ca5c2757745f763316eefdd4c3f0e8a211a7f0db6a708b67ae2133ad41fdf17dd2230f9283a4778c9c866126d407454a090291cd2bf274371d0a214c1c13f5
 Size (curl-7.62.0.tar.bz2) = 3014762 bytes
-SHA1 (patch-configure) = ba8abac55f11a53d07235e57d21ce5b32a421902
+SHA1 (patch-configure) = 9b65a0b9564b7226942d1d1efef576b381a9755e
 SHA1 (patch-curl-config.in) = 363359665985cc14f36ddf47fc3480f1200e3533
+SHA1 (patch-lib_connect.c) = 7c16af83f395b7dc3263db8c0eced139e47c40de
 SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308
diff --git a/www/curl/patches/patch-configure b/www/curl/patches/patch-configure
index 7e9a90f59e9..b91946c85fe 100644
--- a/www/curl/patches/patch-configure
+++ b/www/curl/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2017/11/03 09:40:37 jperkin Exp $
+$NetBSD: patch-configure,v 1.4 2018/11/28 01:31:45 sevan Exp $
 
 builtin krb5-config in platforms such as solaris do not support
 the gssapi option, and need an explicit -lgss
@@ -7,9 +7,11 @@ On Darwin, do not append custom CFLAGS.
 
 Do not strip debug flags.
 
---- configure.orig	2017-10-17 14:31:48.000000000 +0000
+Support Minix.
+
+--- configure.orig	Wed Nov 28 00:16:07 2018
 +++ configure
-@@ -4272,6 +4272,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
+@@ -3744,6 +3744,7 @@ $as_echo "$as_me: $xc_bad_var_msg libraries. Use LIBS 
          ;;
      esac
    done
@@ -17,7 +19,93 @@ Do not strip debug flags.
    if test $xc_bad_var_cflags = yes; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5
  $as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;}
-@@ -17159,7 +17160,7 @@ squeeze() {
+@@ -8089,7 +8090,7 @@ else
+     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`
+@@ -8555,12 +8556,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-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
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+-  fi
++netbsd* | netbsdelf*-gnu | minix*)
++  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+   ;;
+ 
+ newos6*)
+@@ -12761,14 +12758,13 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    netbsd* | netbsdelf*-gnu)
+-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
+-      else
+-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+-      fi
++    netbsd* | netbsdelf*-gnu | minix*)
++      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      output_verbose_link_cmd=func_echo_all
+       ;;
+ 
+     solaris*)
+@@ -13451,15 +13447,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
+       esac
+       ;;
+ 
+-    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
+-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-      fi
+-      hardcode_libdir_flag_spec='-R$libdir'
++    netbsd* | netbsdelf*-gnu | minix*)
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+       hardcode_direct=yes
+       hardcode_shlibpath_var=no
++      output_verbose_link_cmd=func_echo_all
+       ;;
+ 
+     newsos6)
+@@ -14565,6 +14559,18 @@ fi
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++minix*)
++  version_type=linux
++  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
++  ;;
++
+ netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+@@ -17079,7 +17085,7 @@ squeeze() {
  
  
        #
@@ -26,7 +114,7 @@ Do not strip debug flags.
      #
      if test "$compiler_id" = "GNU_C" ||
        test "$compiler_id" = "CLANG"; then
-@@ -17482,13 +17483,6 @@ $as_echo_n "checking if compiler accepts
+@@ -17407,13 +17413,6 @@ $as_echo_n "checking if compiler accepts debug disabli
        tmp_options="$flags_dbg_off"
      fi
      #
@@ -40,7 +128,7 @@ Do not strip debug flags.
      squeeze CPPFLAGS
      squeeze CFLAGS
  
-@@ -19122,7 +19116,7 @@ $as_echo "no" >&6; }
+@@ -19081,7 +19080,7 @@ $as_echo "no" >&6; }
    tst_cflags="no"
    case $host_os in
      darwin*)
@@ -49,7 +137,7 @@ Do not strip debug flags.
        ;;
    esac
  
-@@ -21788,7 +21782,11 @@ $as_echo "yes" >&6; }
+@@ -22013,7 +22012,11 @@ $as_echo "yes" >&6; }
       if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
          GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
       elif test -f "$KRB5CONFIG"; then
@@ -62,7 +150,7 @@ Do not strip debug flags.
       elif test "$GSSAPI_ROOT" != "yes"; then
          GSSAPI_INCS="-I$GSSAPI_ROOT/include"
       fi
-@@ -21961,7 +21959,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
+@@ -22186,7 +22189,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confdefs.h
          LIBS="-lgss $LIBS"
          ;;
       *)
diff --git a/www/curl/patches/patch-lib_connect.c b/www/curl/patches/patch-lib_connect.c
new file mode 100644
index 00000000000..fb2d6834a84
--- /dev/null
+++ b/www/curl/patches/patch-lib_connect.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_connect.c,v 1.3 2018/11/28 01:31:45 sevan Exp $
+
+EBADIOCTL doesn't exist on more recent Minix.
+
+--- lib/connect.c.orig	Mon Nov 19 14:23:45 2018
++++ lib/connect.c
+@@ -522,7 +522,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);