davfs2: update to 1.7.2

CONTRIBUTING.md

@@ -163,7 +163,7 @@ When you make changes to your pull request, please *do not close and reopen your
 #### Continuous Integration
 
 Pull requests are automatically submitted for Continuous Integration (CI) testing to ensure packages build and pass their tests (on native builds) on various combinations of C library and architecture.
-Packages that take longer than 120 minutes or need more than 14G of storage to complete their build (for example, Firefox or the Linux kernel) will fail CI and should include `[ci skip]` in the PR title or body (the comment field when the PR is being opened) to avoid wasting CI builder time.
+Packages expected to take longer than several hours or need more than 14G of storage to complete their build (for example, Firefox or the Linux kernel) will fail CI and should include `[ci skip]` in the PR title or body (the comment field when the PR is being opened) to avoid spurious failures and wasted CI builder time.
 Use your best judgment on build times based on your local building experience. If you skip CI when submitting a PR, please build and cross-build for a variety of architectures locally, with both glibc and musl, and note your local results in PR comments.
 Make sure to cover 64-bit and 32-bit architectures.
 

Manual.md

@@ -100,7 +100,7 @@ pkgname=foo
 version=1.0
 revision=1
 build_style=gnu-configure
-short_desc="A short description max 72 chars"
+short_desc="Package description, no more than 72 characters"
 maintainer="name <email>"
 license="GPL-3.0-or-later"
 homepage="http://www.foo.org"
@@ -367,7 +367,7 @@ The following variables are defined by `xbps-src` and can be used on any templat
 
 - `makejobs` Set to `-jX` if `XBPS_MAKEJOBS` is defined, to allow parallel jobs with `GNU make`.
 
-- `sourcepkg`  Set to the to main package name, can be used to match the main package
+- `sourcepkg`  Set to the main package name, can be used to match the main package
 rather than additional binary package names.
 
 - `CHROOT_READY`  Set if the target chroot (masterdir) is ready for chroot builds.
@@ -1107,7 +1107,10 @@ additional paths to be searched when linking target binaries to be introspected.
 - `meson` creates a cross file, `${XBPS_WRAPPERDIR}/meson/xbps_meson.cross`, which configures
 meson for cross builds. This is particularly useful for building packages that wrap meson
 invocations (e.g., `python3-pep517` packages that use a meson backend) and is added by default
-for packages that use the `meson` build style.
+for packages that use the `meson` build style. It also sets `$MESON_PACKAGE_CACHE_DIR` to
+`$XBPS_SRCDISTDIR/$pkgname-$version/` so libraries specified as meson wraps can be added to
+distfiles and will be automatically used by meson. See also `common/scripts/gen-wrap-distfiles.py`
+for a script that generates distfiles entries for wraps.
 
 - `numpy` configures the environment for cross-compilation of python packages that provide
 compiled extensions linking to NumPy C libraries. If the `meson` build helper is also

common/build-helper/meson.sh

@@ -1,6 +1,9 @@
 # This build helper writes a Meson cross-file, allowing other build styles
 # to properly drive cross-builds in Meson when appropriate
 
+# allows meson to automatically unpack wrapped dependencies specified in distfiles
+export MESON_PACKAGE_CACHE_DIR="${XBPS_SRCDISTDIR}/${pkgname}-${version}/"
+
 # Action is only taken for cross builds
 [ -z "$CROSS_BUILD" ] && return 0
 

common/build-style/void-cross.sh

@@ -98,9 +98,17 @@ _void_cross_build_bootstrap_gcc() {
 		_void_cross_apply_patch "$f"
 	done
 	if [ -f ${wrksrc}/.musl_version ]; then
+		local musl_version
 		for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
 			_void_cross_apply_patch "$f"
 		done
+		musl_version=$(cat "${wrksrc}/.musl_version")
+		case "$musl_version" in
+		1.1.*)
+			sed -i '/define LIBDRUNTIME_MUSL_PRE_TIME64/s/0/1/' \
+				gcc/config/linux-d.cc
+			;;
+		esac
 	fi
 	cd ..
 
@@ -337,7 +345,6 @@ _void_cross_build_musl() {
 }
 
 _void_cross_build_libucontext() {
-	[ -n "$cross_gcc_skip_go" ] && return 0
 	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
 
 	local tgt=$1
@@ -390,7 +397,7 @@ _void_cross_build_gcc() {
 	mkdir -p ${wrksrc}/gcc_build
 	cd ${wrksrc}/gcc_build
 
-	local langs="c,c++,fortran,objc,obj-c++,ada,lto"
+	local langs="c,c++,fortran,objc,obj-c++,ada,lto,d"
 	if [ -z "$cross_gcc_skip_go" ]; then
 		langs+=",go"
 	fi
@@ -477,7 +484,9 @@ _void_cross_test_gcc_ver() {
 	ver=$(cat .gcc_version)
 	if [ -d "gcc-${ver}" ] && [ -f "gcc-${ver}/gcc/BASE-VER" ] && [ -f "gcc-${ver}/gcc/DATESTAMP" ]; then
 		basever="$(cat "gcc-${ver}/gcc/BASE-VER")_$(cat "gcc-${ver}/gcc/DATESTAMP")"
-		mv "gcc-${ver}" "gcc-${basever}"
+		if [ "$ver" != "$basever" ]; then
+			mv "gcc-${ver}" "gcc-${basever}"
+		fi
 		echo ${basever} > ${wrksrc}/.gcc_version
 		return
 	fi
@@ -511,12 +520,12 @@ do_build() {
 	if [ ! -f .musl_version ]; then
 		_void_cross_test_ver glibc
 		libc_ver=$(cat .glibc_version)
+		export GDCFLAGS_FOR_TARGET="$cross_glibc_cflags"
 	else
 		libc_ver=$(cat .musl_version)
-		if [ -z "$cross_gcc_skip_go" ]; then
-			_void_cross_test_ver libucontext
-			libucontext_ver=$(cat .libucontext_version)
-		fi
+		_void_cross_test_ver libucontext
+		libucontext_ver=$(cat .libucontext_version)
+		export GDCFLAGS_FOR_TARGET="$cross_musl_cflags"
 	fi
 
 	local sysroot="/usr/${tgt}"

common/environment/setup/python.sh

@@ -7,7 +7,7 @@ py2_lib="usr/lib/python${py2_ver}"
 py2_sitelib="${py2_lib}/site-packages"
 py2_inc="usr/include/python${py2_ver}"
 
-py3_ver="3.13"
+py3_ver="3.14"
 py3_abiver=""
 py3_lib="usr/lib/python${py3_ver}"
 py3_sitelib="${py3_lib}/site-packages"

common/hooks/pre-configure/02-script-wrapper.sh

@@ -251,7 +251,7 @@ hook() {
 	generic_wrapper3 libetpan-config
 	generic_wrapper3 giblib-config
 	python_wrapper python-config 2.7
-	python_wrapper python3-config 3.13
+	python_wrapper python3-config 3.14
 	apr_apu_wrapper apu-1-config
 	qemu_wrapper llvm-config
 }

common/hooks/pre-pkg/03-restrict-py3-version.sh

@@ -0,0 +1,31 @@
+# vim: set ts=4 sw=4 et:
+#
+# This hook performs the following task:
+# - Identifies any python3 runtime dependencies
+# - If any are found, ensures that the base python3 package is included
+# - Restricts the python3 version to the same minor specified in $py3_ver
+
+hook() {
+    [ -d "${PKGDESTDIR}/${py3_lib}" ] || return 0
+    [ "${pkgname}" = python3 ] && return 0
+
+    local dep rdeps
+    for dep in ${run_depends}; do
+        case "${dep}" in
+            python3 | "python3>"* | "python3<"* | "python3-${py3_ver}"* ) ;;
+            *) rdeps+=( "${dep}" ) ;;
+        esac
+    done
+
+    local minor next_minor
+
+    minor="${py3_ver#3.}"
+    next_minor="$(( "${minor}" + 1 ))" >/dev/null 2>&1 || next_minor=
+
+    if ! [ "${next_minor}" -gt "${minor}" ]; then
+        msg_error 'unable to determine python3 minor bounds from $py3_ver\n'
+    fi
+
+    rdeps+=( "python3>=3.${minor}.0_1<3.${next_minor}.0_1" )
+    run_depends="${rdeps[*]}"
+}

common/hooks/pre-pkg/04-generate-runtime-deps.sh

@@ -49,7 +49,7 @@ parse_shlib_needed() {
     while read -r f; do
         lf=${f#${PKGDESTDIR}}
 	    if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
-		    msg_normal "Skipping dependency scan for ${lf}\n"
+		    msg_normal "Skipping dependency scan for ${lf}\n" >&3
 		    continue
 	    fi
         read -n4 elfmagic < "$f"
@@ -67,6 +67,7 @@ parse_shlib_needed() {
 hook() {
     local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs verify_deps
     local _shlib_dir="${XBPS_STATEDIR}/shlib-provides"
+    local _shlibtmp
 
     local Qt_6_PRIVATE_API=6.10.0
 
@@ -89,7 +90,11 @@ hook() {
         verify_deps+=" ${f}"
     done
 
-    verify_deps=$(parse_shlib_needed <"$depsftmp" | sort | uniq)
+    _shlibtmp=$(mktemp) || exit 1
+    parse_shlib_needed 3>&1 >"$_shlibtmp" <"$depsftmp"
+    rm -f "$depsftmp"
+    verify_deps=$(sort <"$_shlibtmp" | uniq)
+    rm -f "$_shlibtmp"
 
     #
     # Add required run time packages by using required shlibs resolved

common/scripts/gen-wrap-distfiles.py

@@ -0,0 +1,120 @@
+#!/usr/bin/python3
+
+import sys
+from abc import ABC, abstractmethod
+from configparser import ConfigParser
+from dataclasses import dataclass
+from pathlib import Path
+
+@dataclass
+class Wrap(ABC):
+	src_path: Path
+
+	directory: str | None = None
+	patch_url: str | None = None
+	patch_fallback_url: str | None = None
+	patch_filename: str | None = None
+	patch_hash: str | None = None
+	patch_directory: str | None = None
+	diff_files: str | None = None
+	method: str | None = None
+
+	@property
+	@abstractmethod
+	def distfile(self):
+		raise NotImplementedError
+
+	@property
+	@abstractmethod
+	def checksum(self):
+		raise NotImplementedError
+
+	@property
+	@abstractmethod
+	def filename(self):
+		raise NotImplementedError
+
+
+@dataclass
+class WrapFile(Wrap):
+	source_url: str | None = None
+	source_fallback_url: str | None = None
+	source_filename: str | None = None
+	source_hash: str | None = None
+	lead_directory_missing: str | None = None
+
+	@property
+	def distfile(self):
+		if self.source_url:
+			return f"{self.source_url}>{self.filename}"
+		raise ValueError(f"missing source_url in wrap {self.src_path}")
+
+	@property
+	def checksum(self):
+		if self.source_hash:
+			return self.source_hash
+		raise ValueError(f"missing source_hash in wrap {self.src_path}")
+
+	@property
+	def filename(self):
+		if self.source_filename:
+			return self.source_filename
+		raise ValueError(f"missing source_filename in wrap {self.src_path}")
+
+
+def read_wrap(p: Path) -> Wrap:
+	wrap = ConfigParser()
+	with p.open() as f:
+		wrap.read_file(f)
+
+	for sec in wrap.sections():
+		if sec.startswith("wrap-"):
+			break
+	else:
+		raise ValueError(f"missing 'wrap-*' section in wrap {p}")
+
+	match sec:
+		case "wrap-file":
+			cls = WrapFile
+		case "wrap-git":
+			raise NotImplementedError
+		case "wrap-hg":
+			raise NotImplementedError
+		case "wrap-svn":
+			raise NotImplementedError
+		case _:
+			raise NotImplementedError
+
+	return cls(src_path=p, **dict(wrap.items(sec)))
+
+
+def print_list(var: str, contents: list[str]):
+	print(f"""{var}+="
+ {"\n ".join(contents)}
+\"""")
+
+
+if __name__ == "__main__":
+	distfiles = []
+	checksums = []
+	skip_extracts = []
+
+	if len(sys.argv[1:]) < 1:
+		print(f"usage: {sys.argv[0]} <wrap files...>")
+		exit()
+
+	for arg in sys.argv[1:]:
+		wrap_path = Path(arg)
+		if wrap_path.is_file():
+			try:
+				wrap = read_wrap(wrap_path)
+
+				distfiles.append(wrap.distfile)
+				checksums.append(wrap.checksum)
+				skip_extracts.append(wrap.filename)
+			except ValueError as e:
+				print("=> ERROR:", e, file=sys.stderr)
+
+	print_list("distfiles", distfiles)
+	print_list("checksum", checksums)
+	print_list("skip_extraction", skip_extracts)