CVS commit: pkgsrc/www/curl

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Sep 29 10:45:04 UTC 2023

Modified Files:
        pkgsrc/www/curl: Makefile.common distinfo
        pkgsrc/www/curl/patches: patch-configure

Log Message:
curl: fix libcurl breakage on macOS 14, via upstream

Autoreconfed with upstream m4 changes and relevant hunks extracted manually.
patch-configure can be reverted when curl is updated past 8.4.0.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/curl/Makefile.common
cvs rdiff -u -r1.197 -r1.198 pkgsrc/www/curl/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/curl/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/curl/Makefile.common
diff -u pkgsrc/www/curl/Makefile.common:1.6 pkgsrc/www/curl/Makefile.common:1.7
--- pkgsrc/www/curl/Makefile.common:1.6 Wed Sep 13 08:15:05 2023
+++ pkgsrc/www/curl/Makefile.common     Fri Sep 29 10:45:04 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.6 2023/09/13 08:15:05 adam Exp $
+# $NetBSD: Makefile.common,v 1.7 2023/09/29 10:45:04 tnn Exp $
 # used by www/libcurl-gnutls/Makefile
 
 DISTNAME=      curl-8.3.0
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  https://curl.se/download/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/www/curl/distinfo
diff -u pkgsrc/www/curl/distinfo:1.197 pkgsrc/www/curl/distinfo:1.198
--- pkgsrc/www/curl/distinfo:1.197      Wed Sep 13 08:15:05 2023
+++ pkgsrc/www/curl/distinfo    Fri Sep 29 10:45:04 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.197 2023/09/13 08:15:05 adam Exp $
+$NetBSD: distinfo,v 1.198 2023/09/29 10:45:04 tnn Exp $
 
 BLAKE2s (curl-8.3.0.tar.xz) = f5bf62169d53dffc0fb6b7c1bcfd1c0874a1fafc7afd34d9500a9dd606d8b6d8
 SHA512 (curl-8.3.0.tar.xz) = 6404b4c74fe1185cb482631ca3a143996cb7298d0d8a76bfafd7696e7729c00559999a069bdba782dee3f3eb273fb678a4438cb27d3deca54022878cdff83a51
 Size (curl-8.3.0.tar.xz) = 2641764 bytes
-SHA1 (patch-configure) = ae123a94fa84ef99dfc1dadd596ac86ef0d143fe
+SHA1 (patch-configure) = 5cb9242276732305eeb458f15a27536641ac32ed
 SHA1 (patch-curl-config.in) = a58c777fc1a0a087776e62ed2e2a1e0a339716df

Index: pkgsrc/www/curl/patches/patch-configure
diff -u pkgsrc/www/curl/patches/patch-configure:1.16 pkgsrc/www/curl/patches/patch-configure:1.17
--- pkgsrc/www/curl/patches/patch-configure:1.16        Wed Apr 27 07:51:20 2022
+++ pkgsrc/www/curl/patches/patch-configure     Fri Sep 29 10:45:04 2023
@@ -1,14 +1,15 @@
-$NetBSD: patch-configure,v 1.16 2022/04/27 07:51:20 wiz Exp $
+$NetBSD: patch-configure,v 1.17 2023/09/29 10:45:04 tnn Exp $
 
 - Builtin krb5-config in platforms such as solaris do not support
   the gssapi option, and need an explicit -lgss
 - On Darwin, do not append custom CFLAGS.
 - Do not strip debug flags.
 - Support Minix.
+- macOS 14 libcurl fix: https://github.com/curl/curl/commit/6ab7e1990bd548059f08c471d20537bca13c67b6
 
---- configure.orig     2022-04-25 07:31:45.000000000 +0000
+--- configure.orig     2023-09-13 06:18:50.000000000 +0000
 +++ configure
-@@ -4246,6 +4246,7 @@ printf "%s\n" "$as_me: $xc_bad_var_msg l
+@@ -4284,6 +4284,7 @@ printf "%s\n" "$as_me: $xc_bad_var_msg l
          ;;
      esac
    done
@@ -16,7 +17,7 @@ $NetBSD: patch-configure,v 1.16 2022/04/
    if test $xc_bad_var_cflags = yes; then
      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5
  printf "%s\n" "$as_me: using CFLAGS: $CFLAGS" >&6;}
-@@ -8648,7 +8649,7 @@ else $as_nop
+@@ -9169,7 +9170,7 @@ else $as_nop
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -25,7 +26,7 @@ $NetBSD: patch-configure,v 1.16 2022/04/
      # 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`
-@@ -9236,12 +9237,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
+@@ -9757,12 +9758,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -40,7 +41,7 @@ $NetBSD: patch-configure,v 1.16 2022/04/
    ;;
  
  newos6*)
-@@ -13520,14 +13517,13 @@ _LT_EOF
+@@ -14012,14 +14009,13 @@ _LT_EOF
        fi
        ;;
  
@@ -62,7 +63,7 @@ $NetBSD: patch-configure,v 1.16 2022/04/
        ;;
  
      solaris*)
-@@ -14218,15 +14214,13 @@ printf "%s\n" "$lt_cv_irix_exported_symb
+@@ -14710,15 +14706,13 @@ printf "%s\n" "$lt_cv_irix_exported_symb
        esac
        ;;
  
@@ -83,7 +84,7 @@ $NetBSD: patch-configure,v 1.16 2022/04/
        ;;
  
      newsos6)
-@@ -15337,6 +15331,18 @@ fi
+@@ -15829,6 +15823,18 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -102,7 +103,7 @@ $NetBSD: patch-configure,v 1.16 2022/04/
  netbsdelf*-gnu)
    version_type=linux
    need_lib_prefix=no
-@@ -17794,7 +17800,7 @@ squeeze() {
+@@ -18467,7 +18473,7 @@ squeeze() {
  
  
        #
@@ -111,7 +112,7 @@ $NetBSD: patch-configure,v 1.16 2022/04/
      #
      tmp_save_CPPFLAGS="$CPPFLAGS"
      tmp_save_CFLAGS="$CFLAGS"
-@@ -18087,13 +18093,6 @@ printf %s "checking if compiler accepts 
+@@ -18762,13 +18768,6 @@ printf %s "checking if compiler accepts
        tmp_options="$flags_dbg_yes"
      fi
      #
@@ -125,7 +126,7 @@ $NetBSD: patch-configure,v 1.16 2022/04/
      squeeze CPPFLAGS
      squeeze CFLAGS
    fi
-@@ -20853,7 +20852,7 @@ printf "%s\n" "no" >&6; }
+@@ -21585,7 +21584,7 @@ printf "%s\n" "no" >&6; }
    tst_cflags="no"
    case $host_os in
      darwin*)
@@ -134,7 +135,16 @@ $NetBSD: patch-configure,v 1.16 2022/04/
        ;;
    esac
  
-@@ -25252,7 +25251,7 @@ printf "%s\n" "found" >&6; }
+@@ -21661,7 +21660,7 @@ rm -f core conftest.err conftest.$ac_obj
+     if test "x$build_for_macos" != xno; then
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ printf "%s\n" "yes" >&6; }
+-      LDFLAGS="$LDFLAGS -framework CoreFoundation -framework SystemConfiguration"
++      LDFLAGS="$LDFLAGS -framework CoreFoundation -framework CoreServices -framework SystemConfiguration"
+     else
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+@@ -26029,7 +26028,7 @@ printf "%s\n" "found" >&6; }
          LIBS="-lgss $LIBS"
          ;;
       *)
@@ -143,3 +153,12 @@ $NetBSD: patch-configure,v 1.16 2022/04/
          ;;
       esac
    fi
+@@ -26170,7 +26169,7 @@ printf "%s\n" "#define USE_SECTRANSP 1"
+     ssl_msg="Secure Transport"
+     test secure-transport != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
+     SECURETRANSPORT_ENABLED=1
+-    LDFLAGS="$LDFLAGS -framework CoreFoundation -framework Security"
++    LDFLAGS="$LDFLAGS -framework CoreFoundation -framework CoreServices -framework Security"
+   else
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }