Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 400EC84CFC for ; Wed, 31 May 2023 18:37:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id U7Bd_xh4qN71 for ; Wed, 31 May 2023 18:37:52 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id AD7BC84CEB for ; Wed, 31 May 2023 18:37:52 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9C4F4FA87; Wed, 31 May 2023 18:37:52 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1685558272189700" MIME-Version: 1.0 Date: Wed, 31 May 2023 18:37:52 +0000 From: "nikita" Subject: CVS commit: pkgsrc/www To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: nikita@netbsd.org X-Mailer: log_accum Message-Id: <20230531183752.9C4F4FA87@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1685558272189700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nikita Date: Wed May 31 18:37:52 UTC 2023 Modified Files: pkgsrc/www: Makefile Added Files: pkgsrc/www/libcurl-gnutls: DESCR Makefile PLIST buildlink3.mk distinfo options.mk pkgsrc/www/libcurl-gnutls/patches: patch-configure patch-curl-config.in Log Message: import libcurl-gnutls as www/libcurl-gnutls version 8.1.1 To generate a diff of this commit: cvs rdiff -u -r1.1711 -r1.1712 pkgsrc/www/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/www/libcurl-gnutls/DESCR \ pkgsrc/www/libcurl-gnutls/Makefile pkgsrc/www/libcurl-gnutls/PLIST \ pkgsrc/www/libcurl-gnutls/buildlink3.mk \ pkgsrc/www/libcurl-gnutls/distinfo pkgsrc/www/libcurl-gnutls/options.mk cvs rdiff -u -r0 -r1.1 pkgsrc/www/libcurl-gnutls/patches/patch-configure \ pkgsrc/www/libcurl-gnutls/patches/patch-curl-config.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1685558272189700 Content-Disposition: inline Content-Length: 14380 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/Makefile diff -u pkgsrc/www/Makefile:1.1711 pkgsrc/www/Makefile:1.1712 --- pkgsrc/www/Makefile:1.1711 Wed May 10 22:47:51 2023 +++ pkgsrc/www/Makefile Wed May 31 18:37:52 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1711 2023/05/10 22:47:51 markd Exp $ +# $NetBSD: Makefile,v 1.1712 2023/05/31 18:37:52 nikita Exp $ # COMMENT= Packages related to the World Wide Web @@ -201,6 +201,7 @@ SUBDIR+= kjsembed SUBDIR+= kore SUBDIR+= lariza SUBDIR+= lhs +SUBDIR+= libcurl-gnutls SUBDIR+= libecap SUBDIR+= libghttp SUBDIR+= libgtkhtml Added files: Index: pkgsrc/www/libcurl-gnutls/DESCR diff -u /dev/null pkgsrc/www/libcurl-gnutls/DESCR:1.1 --- /dev/null Wed May 31 18:37:52 2023 +++ pkgsrc/www/libcurl-gnutls/DESCR Wed May 31 18:37:52 2023 @@ -0,0 +1,8 @@ +Curl is a command line tool for transferring files with URL syntax, supporting +FTP, FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP. Curl supports +HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, +proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate, +kerberos...), file transfer resume, proxy tunneling and a busload of other +useful tricks. + +This is the library build against GnuTLS. Index: pkgsrc/www/libcurl-gnutls/Makefile diff -u /dev/null pkgsrc/www/libcurl-gnutls/Makefile:1.1 --- /dev/null Wed May 31 18:37:52 2023 +++ pkgsrc/www/libcurl-gnutls/Makefile Wed May 31 18:37:52 2023 @@ -0,0 +1,68 @@ +# $NetBSD: Makefile,v 1.1 2023/05/31 18:37:52 nikita Exp $ + +DISTNAME= curl-8.1.1 +PKGNAME= ${DISTNAME:S/curl/libcurl-gnutls/} +CATEGORIES= www +MASTER_SITES= https://curl.se/download/ +EXTRACT_SUFX= .tar.xz + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://curl.se/ +COMMENT= Client that groks URLs (build against gnuTLS) +# not completely, but near enough +LICENSE= mit + +BUILD_DEFS+= IPV6_READY + +TEST_DEPENDS+= ${PYPKGPREFIX}-impacket-[0-9]*:../../net/py-impacket +TOOL_DEPENDS+= patchelf-[0-9]*:../../devel/patchelf + +PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-impacket + +USE_TOOLS+= nroff perl +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-gnutls=${BUILDLINK_PREFIX.gnutls} +# Some systems use bundles instead of directories; this needs configuring +# because curl doesn't use default validation. +.if !empty(SSLCERTBUNDLE) +CONFIGURE_ARGS+= --with-ca-bundle=${SSLCERTBUNDLE} +.else +CONFIGURE_ARGS+= --with-ca-path=${SSLCERTS} +.endif +CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} +CONFIGURE_ARGS+= --without-libpsl +PKGCONFIG_OVERRIDE= libcurl.pc.in +TEST_TARGET= check + +SUBST_CLASSES+= python +SUBST_STAGE.python= pre-configure +SUBST_MESSAGE.python= Adjust hard-coded python invocations +SUBST_FILES.python= tests/data/test1451 +SUBST_SED.python= -e 's,python,${PYTHONBIN},g' + +REPLACE_PERL+= tests/*.pl tests/*/*.pl +REPLACE_PYTHON+= tests/*.py + +PYTHON_FOR_BUILD_ONLY= test + +INSTALLATION_DIRS+= lib + +do-install: + cd ${WRKSRC} && \ + ${PREFIX}/bin/patchelf \ + --set-soname 'libcurl-gnutls.so.4' \ + lib/.libs/libcurl.so.4.* + ${INSTALL} ${WRKSRC}/lib/.libs/libcurl.so.4.8.0 ${DESTDIR}${PREFIX}/lib/libcurl-gnutls.so.4.8.0 + cd ${DESTDIR}${PREFIX}/lib && \ + ${LN} -s libcurl-gnutls.so.4.8.0 libcurl-gnutls.so && \ + ${LN} -s libcurl-gnutls.so.4.8.0 libcurl-gnutls.so.4 + +.include "options.mk" + +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../lang/python/application.mk" +.include "../../security/gnutls/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/libcurl-gnutls/PLIST diff -u /dev/null pkgsrc/www/libcurl-gnutls/PLIST:1.1 --- /dev/null Wed May 31 18:37:52 2023 +++ pkgsrc/www/libcurl-gnutls/PLIST Wed May 31 18:37:52 2023 @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST,v 1.1 2023/05/31 18:37:52 nikita Exp $ +lib/libcurl-gnutls.so +lib/libcurl-gnutls.so.4 +lib/libcurl-gnutls.so.4.8.0 Index: pkgsrc/www/libcurl-gnutls/buildlink3.mk diff -u /dev/null pkgsrc/www/libcurl-gnutls/buildlink3.mk:1.1 --- /dev/null Wed May 31 18:37:52 2023 +++ pkgsrc/www/libcurl-gnutls/buildlink3.mk Wed May 31 18:37:52 2023 @@ -0,0 +1,38 @@ +# $NetBSD: buildlink3.mk,v 1.1 2023/05/31 18:37:52 nikita Exp $ + +BUILDLINK_TREE+= libcurl-gnutls + +.if !defined(LIBCURL_GNUTLS_BUILDLINK3_MK) +LIBCURL_GNUTLS_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.libcurl-gnutls+= libcurl-gnutls>=7.12.3 +BUILDLINK_ABI_DEPENDS.libcurl-gnutls+= libcurl-gnutls>=8.0.1nb1 +BUILDLINK_PKGSRCDIR.libcurl-gnutls?= ../../www/libcurl-gnutls + +pkgbase:= libcurl-gnutls +.include "../../mk/pkg-build-options.mk" +.if ${PKG_BUILD_OPTIONS.libcurl-gnutls:Mlibssh2} +. include "../../security/libssh2/buildlink3.mk" +.endif +.if ${PKG_BUILD_OPTIONS.libcurl-gnutls:Mgssapi} +. include "../../mk/krb5.buildlink3.mk" +.endif +.if ${PKG_BUILD_OPTIONS.libcurl-gnutls:Mldap} +. include "../../databases/openldap-client/buildlink3.mk" +.endif +.if ${PKG_BUILD_OPTIONS.libcurl-gnutls:Mrtmp} +. include "../../net/rtmpdump/buildlink3.mk" +.endif +.if ${PKG_BUILD_OPTIONS.libcurl-gnutls:Midn} +. include "../../devel/libidn2/buildlink3.mk" +.endif +.if ${PKG_BUILD_OPTIONS.libcurl-gnutls:Mhttp2} +. include "../../www/nghttp2/buildlink3.mk" +.endif + +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../security/gnutls/buildlink3.mk" +.endif # LIBCURL_GNUTLS_BUILDLINK3_MK + +BUILDLINK_TREE+= -libcurl-gnutls Index: pkgsrc/www/libcurl-gnutls/distinfo diff -u /dev/null pkgsrc/www/libcurl-gnutls/distinfo:1.1 --- /dev/null Wed May 31 18:37:52 2023 +++ pkgsrc/www/libcurl-gnutls/distinfo Wed May 31 18:37:52 2023 @@ -0,0 +1,7 @@ +$NetBSD: distinfo,v 1.1 2023/05/31 18:37:52 nikita Exp $ + +BLAKE2s (curl-8.1.1.tar.xz) = f371264eb96fafea3a254ce2d26c3b1733776a8908141a8ad49be39d62055447 +SHA512 (curl-8.1.1.tar.xz) = d034b1ab9c00e8a0acf7ba6c6344734945d45666b4f38394f5456fcd9b22623146a897270861b7411412ca25c912e1bbf24eb139a6dfc1a8c00d098b3b925399 +Size (curl-8.1.1.tar.xz) = 2613348 bytes +SHA1 (patch-configure) = ae123a94fa84ef99dfc1dadd596ac86ef0d143fe +SHA1 (patch-curl-config.in) = a58c777fc1a0a087776e62ed2e2a1e0a339716df Index: pkgsrc/www/libcurl-gnutls/options.mk diff -u /dev/null pkgsrc/www/libcurl-gnutls/options.mk:1.1 --- /dev/null Wed May 31 18:37:52 2023 +++ pkgsrc/www/libcurl-gnutls/options.mk Wed May 31 18:37:52 2023 @@ -0,0 +1,63 @@ +# $NetBSD: options.mk,v 1.1 2023/05/31 18:37:52 nikita Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.libcurl-gnutls +PKG_SUPPORTED_OPTIONS= inet6 libssh2 gssapi ldap rtmp idn http2 +PKG_SUGGESTED_OPTIONS= http2 inet6 idn +PKG_OPTIONS_LEGACY_OPTS= libidn:idn + +# Kerberos is built in - no additional dependency +PKG_SUGGESTED_OPTIONS.NetBSD+= gssapi + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Minet6) +CONFIGURE_ARGS+= --enable-ipv6 +.else +CONFIGURE_ARGS+= --disable-ipv6 +.endif + +.if !empty(PKG_OPTIONS:Mlibssh2) +CONFIGURE_ARGS+= --with-libssh2=${BUILDLINK_PREFIX.libssh2} +. include "../../security/libssh2/buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-libssh2 +.endif + +.if !empty(PKG_OPTIONS:Mgssapi) +.include "../../mk/krb5.buildlink3.mk" +CONFIGURE_ARGS+= --with-gssapi=${KRB5BASE} +CONFIGURE_ARGS+= --with-gssapi-includes=${KRB5BASE}/include/gssapi +.else +CONFIGURE_ARGS+= --without-gssapi +.endif + +.if !empty(PKG_OPTIONS:Mldap) +.include "../../databases/openldap-client/buildlink3.mk" +CONFIGURE_ARGS+= --enable-ldap +CONFIGURE_ARGS+= --enable-ldaps +.else +CONFIGURE_ARGS+= --disable-ldap +.endif + +.if !empty(PKG_OPTIONS:Mrtmp) +.include "../../net/rtmpdump/buildlink3.mk" +CONFIGURE_ARGS+= --with-librtmp +.else +CONFIGURE_ARGS+= --without-librtmp +.endif + +.if !empty(PKG_OPTIONS:Midn) +.include "../../devel/libidn2/buildlink3.mk" +CONFIGURE_ARGS+= --with-libidn2 +.else +CONFIGURE_ARGS+= --without-libidn2 +.endif + +.if !empty(PKG_OPTIONS:Mhttp2) +USE_TOOLS+= pkg-config +CONFIGURE_ARGS+= --with-nghttp2=${BUILDLINK_PREFIX.nghttp2} +TEST_DEPENDS+= nghttp2-tools-[0-9]*:../../www/nghttp2-tools +.include "../../www/nghttp2/buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-nghttp2 +.endif Index: pkgsrc/www/libcurl-gnutls/patches/patch-configure diff -u /dev/null pkgsrc/www/libcurl-gnutls/patches/patch-configure:1.1 --- /dev/null Wed May 31 18:37:52 2023 +++ pkgsrc/www/libcurl-gnutls/patches/patch-configure Wed May 31 18:37:52 2023 @@ -0,0 +1,145 @@ +$NetBSD: patch-configure,v 1.1 2023/05/31 18:37:52 nikita 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. + +--- configure.orig 2022-04-25 07:31:45.000000000 +0000 ++++ configure +@@ -4246,6 +4246,7 @@ printf "%s\n" "$as_me: $xc_bad_var_msg l + ;; + esac + done ++ xc_bad_var_cflags=no + 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 + lt_cv_sys_max_cmd_len=8192; + ;; + +- bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) ++ bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | 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` +@@ -9236,12 +9237,8 @@ linux* | k*bsd*-gnu | kopensolaris*-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*) +@@ -13520,14 +13517,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*) +@@ -14218,15 +14214,13 @@ printf "%s\n" "$lt_cv_irix_exported_symb + 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) +@@ -15337,6 +15331,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 +@@ -17794,7 +17800,7 @@ squeeze() { + + + # +- if test "$compiler_id" != "unknown"; then ++ if false; then + # + tmp_save_CPPFLAGS="$CPPFLAGS" + tmp_save_CFLAGS="$CFLAGS" +@@ -18087,13 +18093,6 @@ printf %s "checking if compiler accepts + tmp_options="$flags_dbg_yes" + fi + # +- if test "$flags_prefer_cppflags" = "yes"; then +- CPPFLAGS="$tmp_CPPFLAGS $tmp_options" +- CFLAGS="$tmp_CFLAGS" +- else +- CPPFLAGS="$tmp_CPPFLAGS" +- CFLAGS="$tmp_CFLAGS $tmp_options" +- fi + squeeze CPPFLAGS + squeeze CFLAGS + fi +@@ -20853,7 +20852,7 @@ printf "%s\n" "no" >&6; } + tst_cflags="no" + case $host_os in + darwin*) +- tst_cflags="yes" ++ tst_cflags="no" + ;; + esac + +@@ -25252,7 +25251,7 @@ printf "%s\n" "found" >&6; } + LIBS="-lgss $LIBS" + ;; + *) +- LIBS="-lgssapi $LIBS" ++ LIBS="-lgssapi -lkrb5 $LIBS" + ;; + esac + fi Index: pkgsrc/www/libcurl-gnutls/patches/patch-curl-config.in diff -u /dev/null pkgsrc/www/libcurl-gnutls/patches/patch-curl-config.in:1.1 --- /dev/null Wed May 31 18:37:52 2023 +++ pkgsrc/www/libcurl-gnutls/patches/patch-curl-config.in Wed May 31 18:37:52 2023 @@ -0,0 +1,18 @@ +$NetBSD: patch-curl-config.in,v 1.1 2023/05/31 18:37:52 nikita Exp $ + +- make "curl-config --libs" return proper ldflags for shared libraries + +--- curl-config.in.orig 2020-08-16 22:28:40.000000000 +0000 ++++ curl-config.in +@@ -161,9 +161,9 @@ while test $# -gt 0; do + CURLLIBDIR="" + fi + if test "X@ENABLE_SHARED@" = "Xno"; then +- echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ ++ echo @LDFLAGS@ ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ + else +- echo ${CURLLIBDIR}-lcurl ++ echo @LDFLAGS@ ${CURLLIBDIR}-lcurl + fi + ;; + --ssl-backends) --_----------=_1685558272189700--