CVS commit: pkgsrc/www/curl

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Wed Nov  6 17:05:03 UTC 2024

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

Log Message:
curl: do not add gssapi and ldap to Requires.private:

curl-8.11.0 started to add gssapi and ldap to Requires.private because they are
required for static linking.

However, both security/heimdal-gssapi and databases/openldap-client
builtin.mk-s do not provide any logic to generate fake .pc files in
case builtin does not provide any (like it is the case in NetBSD).

Revert that part like it was in curl<8.11.0 to avoid generating an unusable
libcurl.pc files on such platforms.

Add big FIXME comments because strictly speaking this is not correct
and we should instead provide logic to generate fake .pc in
heimdal-gssapi and openldap-client.

PKGREVISION++


To generate a diff of this commit:
cvs rdiff -u -r1.287 -r1.288 pkgsrc/www/curl/Makefile
cvs rdiff -u -r1.209 -r1.210 pkgsrc/www/curl/distinfo
cvs rdiff -u -r0 -r1.20 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
diff -u pkgsrc/www/curl/Makefile:1.287 pkgsrc/www/curl/Makefile:1.288
--- pkgsrc/www/curl/Makefile:1.287      Wed Nov  6 08:19:26 2024
+++ pkgsrc/www/curl/Makefile    Wed Nov  6 17:05:02 2024
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.287 2024/11/06 08:19:26 wiz Exp $
+# $NetBSD: Makefile,v 1.288 2024/11/06 17:05:02 leot Exp $
 
+PKGREVISION=   1
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=       --with-ssl=${BUILDLINK_PREFIX.openssl}

Index: pkgsrc/www/curl/distinfo
diff -u pkgsrc/www/curl/distinfo:1.209 pkgsrc/www/curl/distinfo:1.210
--- pkgsrc/www/curl/distinfo:1.209      Wed Nov  6 08:19:26 2024
+++ pkgsrc/www/curl/distinfo    Wed Nov  6 17:05:02 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.209 2024/11/06 08:19:26 wiz Exp $
+$NetBSD: distinfo,v 1.210 2024/11/06 17:05:02 leot Exp $
 
 BLAKE2s (curl-8.11.0.tar.xz) = 96155a81073d9094d0237e4dc2699dc7e0e79840f8b6e249c15a1284d4d9815c
 SHA512 (curl-8.11.0.tar.xz) = 3a642d421e0a5c09ecb681bea18498f2c6124e9af4d8afdc074dfb85a9b0211d8972ade9cf00ab44b5dfed9303262cd83551dd3b5e0976d11fc19da3c4a0987e
 Size (curl-8.11.0.tar.xz) = 2750684 bytes
+SHA1 (patch-configure) = cd64c90450b7e675eeed06a8ee8f6d13ea105fa8
 SHA1 (patch-curl-config.in) = 1f84517a0a2060bb4ba96821d32e873f51722a7f

Added files:

Index: pkgsrc/www/curl/patches/patch-configure
diff -u /dev/null pkgsrc/www/curl/patches/patch-configure:1.20
--- /dev/null   Wed Nov  6 17:05:03 2024
+++ pkgsrc/www/curl/patches/patch-configure     Wed Nov  6 17:05:03 2024
@@ -0,0 +1,37 @@
+$NetBSD: patch-configure,v 1.20 2024/11/06 17:05:03 leot Exp $
+
+Revert part of upstream commit f057de5a1a950a90d1920021db152a4b695f1a8a
+and commit 3e7a6fbb8e38f930970a5dcc7a3f27cf6fdc04e8.
+
+Avoid unconditional append of ldap and gssapi related .pc files to
+libcurl.pc. Several platforms (e.g. NetBSD) do not provide such .pc and
+their respective builtin.mk at the moment do not provide any logic to
+generate fake .pc yet.
+
+FIXME: This patch should be reverted and instead the corresponding builtin.mk
+FIXME: files should be instructed to generate such .pc files.
+
+--- configure.orig     2024-11-06 14:43:07.882717533 +0000
++++ configure
+@@ -25042,7 +25042,6 @@ printf "%s\n" "no additional lib require
+       else
+         LIBS="$curl_cv_ldap_LIBS $curl_cv_save_LIBS"
+       fi
+-      LIBCURL_PC_REQUIRES_PRIVATE="ldap $LIBCURL_PC_REQUIRES_PRIVATE"
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $curl_cv_ldap_LIBS" >&5
+ printf "%s\n" "$curl_cv_ldap_LIBS" >&6; }
+       ;;
+@@ -26189,13 +26188,6 @@ printf "%s\n" "found" >&6; }
+         ;;
+     esac
+   fi
+-  if test -n "$gnu_gss"; then
+-    LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE gss"
+-  elif test "x$not_mit" = "x1"; then
+-    LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE heimdal-gssapi"
+-  else
+-    LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE mit-krb5-gssapi"
+-  fi
+ else
+   CPPFLAGS="$save_CPPFLAGS"
+ fi