CVS commit: pkgsrc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jun  3 09:06:11 UTC 2026

Modified Files:
        pkgsrc/lang/rust: cargo.mk
        pkgsrc/mk/fetch: sites.mk

Log Message:
cargo.mk: switch to static.crates.io to avoid rate limit and setting custom user agent


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/lang/rust/cargo.mk
cvs rdiff -u -r1.202 -r1.203 pkgsrc/mk/fetch/sites.mk

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

Modified files:

Index: pkgsrc/lang/rust/cargo.mk
diff -u pkgsrc/lang/rust/cargo.mk:1.46 pkgsrc/lang/rust/cargo.mk:1.47
--- pkgsrc/lang/rust/cargo.mk:1.46      Sun May  3 13:55:03 2026
+++ pkgsrc/lang/rust/cargo.mk   Wed Jun  3 09:06:11 2026
@@ -1,4 +1,4 @@
-# $NetBSD: cargo.mk,v 1.46 2026/05/03 13:55:03 wiz Exp $
+# $NetBSD: cargo.mk,v 1.47 2026/06/03 09:06:11 adam Exp $
 #
 # Common logic that can be used by packages that depend on cargo crates
 # from crates.io. This lets existing pkgsrc infrastructure fetch and verify
@@ -31,7 +31,7 @@
 #
 # will fetch https://github.com/foo/bar/ revision 12345
 
-MASTER_SITES?= -${MASTER_SITE_CRATESIO}${PKGBASE}/${PKGVERSION_NOREV}/download
+MASTER_SITES?= ${MASTER_SITE_CRATESIO}${PKGBASE}/
 
 CHECK_SSP_SUPPORTED=   no
 
@@ -58,13 +58,7 @@ SUBST_SED.gitcrate+=         -E -e 's!git.*gith
 
 .for crate in ${CARGO_CRATE_DEPENDS}
 DISTFILES+=                    ${crate}.crate
-.  if ${crate:M*+*}
-# E.g., for `curl-sys-0.4.75+curl-8.10.0', we use the URL:
-# https://crates.io/api/v1/crates/curl-sys/0.4.77+curl-8.10.1/download
-SITES.${crate}.crate+=         -${MASTER_SITE_CRATESIO}${crate:C/-[0-9]+\.[0-9.]+.*$//}/${crate:C/^.*-([0-9]+\.[0-9.]+.*\+.*)$/\1/}/download
-.  else
-SITES.${crate}.crate+=         -${MASTER_SITE_CRATESIO}${crate:C/-[0-9]+\.[0-9.]+.*$//}/${crate:C/^.*-([0-9]+\.[0-9.]+.*)$/\1/}/download
-.  endif
+SITES.${crate}.crate+=         -${MASTER_SITE_CRATESIO}${crate:C/-[0-9]+\.[0-9.]+.*$//}/${crate}.crate
 EXTRACT_DIR.${crate}.crate?=   ${CARGO_VENDOR_DIR}
 .endfor
 

Index: pkgsrc/mk/fetch/sites.mk
diff -u pkgsrc/mk/fetch/sites.mk:1.202 pkgsrc/mk/fetch/sites.mk:1.203
--- pkgsrc/mk/fetch/sites.mk:1.202      Tue Jan  6 14:32:43 2026
+++ pkgsrc/mk/fetch/sites.mk    Wed Jun  3 09:06:11 2026
@@ -1,4 +1,4 @@
-# $NetBSD: sites.mk,v 1.202 2026/01/06 14:32:43 wiz Exp $
+# $NetBSD: sites.mk,v 1.203 2026/06/03 09:06:11 adam Exp $
 #
 # This Makefile fragment defines read-only MASTER_SITE_* variables
 # representing some well-known master distribution sites for software.
@@ -191,7 +191,7 @@ MASTER_SITE_HASKELL_HACKAGE+=       \
        https://hackage.haskell.org/package/
 
 MASTER_SITE_CRATESIO+= \
-       https://crates.io/api/v1/crates/
+       https://static.crates.io/crates/
 
 # The primary backup site.
 MASTER_SITE_BACKUP?=   \