Compare revisions

Anton Bambura · Oliver Smith · Anton Bambura · Oliver Smith · Anton Bambura · Oliver Smith
--- a/.ci/testcases/test_provides.py
+++ b/.ci/testcases/test_provides.py
+#!/usr/bin/env python3
+# Copyright 2022 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+import glob
+import logging
+import os
+import pytest
+import sys
+
+import add_pmbootstrap_to_import_path
+import pmb.parse
+import pmb.parse._apkbuild
+
+
+def apkbuild_check_provides(path, apkbuild, version, pkgname, subpkgname=None):
+    """
+    Verify that a package or subpackage is using provides correctly.
+
+    :param path: to the APKBUILD for the error message
+    :param apkbuild: either the full return of pmb.parse.apkbuild() or a
+                     subpackage of it (apkbuild["subpackages"][$subpkgname])
+    :param version: like 1.0.0-r3 so we can check against it
+    :param pkgname: package name
+    :param subpkgname: subpackage name, if we are looking at a subpackage
+    :returns: list of error strings
+    """
+    name = pkgname
+    if subpkgname:
+        name = f"{pkgname}:{subpkgname}"
+
+    logging.info(f"{name}: checking provides")
+    ret = []
+
+    if not apkbuild["provides"]:
+        return ret
+
+    for provide in apkbuild["provides"]:
+        # Having provides entries without version is valid if the
+        # provider_priorty is also set (pma#1766)
+        if apkbuild["provider_priority"]:
+            continue
+        # Otherwise the version =$pkgver-r$pkgrel needs to be set. pmbootstrap
+        # already replaces the variables, so we check against the inserted
+        # values here.
+        if not provide.endswith(f"={version}"):
+            provide_no_ver = provide.split("=", 1)[0]
+
+            error = f"error in {path}:\n"
+            if subpkgname:
+                error += f"in subpackage:\n  {subpkgname}\n"
+            else:
+                error += f"in package:\n  {pkgname}\n"
+            error += f"broken provides entry:\n  {provide_no_ver}\n"
+            error += "\n"
+            error += "This provides entry needs to be changed to"
+            error += f" '{provide_no_ver}=$pkgver-r$pkgrel'"
+            error += " (do not replace the variables, without '').\n"
+            error += "\n"
+            error += "If you know what you are doing and didn't add the"
+            error += " version on purpose, you also need to set a"
+            error += " provider_priority (pma#1766).\n"
+            error += "Reference:"
+            error += " https://wiki.alpinelinux.org/wiki/APKBUILD_Reference#provides"
+            ret += [error]
+    return ret
+
+
+def test_provides(args):
+    errors = []
+    for path in glob.iglob(f"{args.aports}/**/APKBUILD", recursive=True):
+        apkbuild = pmb.parse.apkbuild(path)
+        pkgname = apkbuild["pkgname"]
+        version = f"{apkbuild['pkgver']}-r{apkbuild['pkgrel']}"
+        path_rel = os.path.relpath(path, args.aports)
+        errors += apkbuild_check_provides(path_rel, apkbuild, version, pkgname)
+
+        for subpkg, subpkg_data in apkbuild["subpackages"].items():
+            if not subpkg_data:
+                # default packaging function like -doc
+                continue
+            errors += apkbuild_check_provides(path_rel, subpkg_data, version,
+                                              pkgname, subpkg)
+
+    if errors:
+        for error in errors:
+            logging.error(error)
+        raise RuntimeError(f"test_provides failed with {len(errors)} errors")
--- a/cross/gcc-aarch64/0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
+++ b/cross/gcc-aarch64/0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
+From 7b8400f902ef25ea71ed460716c1afedca357a61 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 2 Nov 2022 12:31:36 +0100
+Subject: [PATCH] libphobos: fix undefined reference to `__cmsg_nxthdr' with
+ musl
+
+Ported fix from upstream.
+
+Upstream: https://github.com/dlang/dmd/commit/54544260a848c8ebad5582e27ac1e09627cdfb17
+Bug-URL: https://issues.dlang.org/show_bug.cgi?id=23157
+---
+ .../libdruntime/core/sys/posix/sys/socket.d   | 36 +++++++++++++++++--
+ 1 file changed, 33 insertions(+), 3 deletions(-)
+
+diff --git a/libphobos/libdruntime/core/sys/posix/sys/socket.d b/libphobos/libdruntime/core/sys/posix/sys/socket.d
+index c1309a68c9c..e3b536d87e7 100644
+--- a/libphobos/libdruntime/core/sys/posix/sys/socket.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/socket.d
+@@ -188,10 +188,40 @@ version (linux)
+ 
+     extern (D) inout(ubyte)*   CMSG_DATA( return scope inout(cmsghdr)* cmsg ) pure nothrow @nogc { return cast(ubyte*)( cmsg + 1 ); }
+ 
+-    private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
+-    extern (D)  inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
+    version (CRuntime_Musl)
+     {
+-        return __cmsg_nxthdr(msg, cmsg);
+        extern (D)
+        {
+            private size_t __CMSG_LEN(inout(cmsghdr)* cmsg) pure nothrow @nogc
+            {
+                return (cmsg.cmsg_len + size_t.sizeof -1) & cast(size_t)(~(size_t.sizeof - 1));
+            }
+
+            private inout(cmsghdr)* __CMSG_NEXT(inout(cmsghdr)* cmsg) pure nothrow @nogc
+            {
+                return cmsg + __CMSG_LEN(cmsg);
+            }
+
+            private inout(msghdr)* __MHDR_END(inout(msghdr)* mhdr) pure nothrow @nogc
+            {
+                return cast(inout(msghdr)*)(mhdr.msg_control + mhdr.msg_controllen);
+            }
+
+            inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
+            {
+                return cmsg.cmsg_len < cmsghdr.sizeof ||
+                    __CMSG_LEN(cmsg) + cmsghdr.sizeof >= __MHDR_END(msg) - cast(inout(msghdr)*)(cmsg)
+                        ? cast(inout(cmsghdr)*) null : cast(inout(cmsghdr)*) __CMSG_NEXT(cmsg);
+            }
+        }
+    }
+    else
+    {
+        private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
+        extern (D)  inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
+        {
+            return __cmsg_nxthdr(msg, cmsg);
+        }
+     }
+ 
+     extern (D) inout(cmsghdr)* CMSG_FIRSTHDR( inout(msghdr)* mhdr ) pure nothrow @nogc
+-- 
+2.38.1
+
--- a/cross/gcc-aarch64/APKBUILD
+++ b/cross/gcc-aarch64/APKBUILD
@@ -10,7 +10,7 @@ LANG_JAVA=false
 LANG_GO=false
 LANG_FORTRAN=false
 LANG_ADA=false
-options="!strip !tracedeps"
+options="!strip"

 # abuild doesn't try to tries to install "build-base-$CTARGET_ARCH"
 # when this variable matches "no*"
@@ -24,7 +24,6 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-aarch64
-# FIXME WHEN UPGRADING: remove !tracedeps from options when upgrading to properly fix pma#1732 (we only have a workaround for now)
 _pkgbase=12.2.1 # must match gcc/BASE-VER
 _pkgsnap=20220924
 pkgver=${_pkgbase}_git${_pkgsnap}
@@ -33,7 +32,7 @@ pkgver=${_pkgbase}_git${_pkgsnap}
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -259,6 +258,7 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-
 	0051-libgo-Explicitly-define-SYS_timer_settime-for-32-bit.patch
 	0052-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
 	0053-libgo-make-match.sh-POSIX-shell-compatible.patch
+	0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
 	"

 # we build out-of-tree
@@ -810,4 +810,5 @@ c33ca2553642c2dbd1c65cd97046548f08775785a3db06d761e3bbe61398c37bc382fe132c0c3fa2
 c82d7c8d340a76df3d796565a79b0ccc04ddffef39927620e1f3719bf2dc1db101ba13aef24b46c5bc95b7bf1e31c8bda4ab0936ba4c9c5e5047ba08826c982c  0051-libgo-Explicitly-define-SYS_timer_settime-for-32-bit.patch
 eb403d8ea665fd5dc2c11faf43b055e6a3bf480a397ceee3e0ca1e38ec7d2392315f2694ed9a34ffbc99e464f2873fbbf91be8646ea4dea5d3636e3ea22fefa0  0052-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
 22fb6edf1ed0387e2b93839ffe6e82a7fee420950af90e91199c3488d966702fdeb1a3396d22be0c73a4051525da9349c93d070a0d83b724c83f2b268da6483f  0053-libgo-make-match.sh-POSIX-shell-compatible.patch
+9b74d0a0e4140b597708a295bcf51b93944782698470e2ba9bc0f0d4a830fc418da9624eccc85f3d65ff6d50b8ebf40cecd34d5b045db9e6c29614e981e93f92  0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
 "
--- a/cross/gcc-armhf/0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
+++ b/cross/gcc-armhf/0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
+From 7b8400f902ef25ea71ed460716c1afedca357a61 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 2 Nov 2022 12:31:36 +0100
+Subject: [PATCH] libphobos: fix undefined reference to `__cmsg_nxthdr' with
+ musl
+
+Ported fix from upstream.
+
+Upstream: https://github.com/dlang/dmd/commit/54544260a848c8ebad5582e27ac1e09627cdfb17
+Bug-URL: https://issues.dlang.org/show_bug.cgi?id=23157
+---
+ .../libdruntime/core/sys/posix/sys/socket.d   | 36 +++++++++++++++++--
+ 1 file changed, 33 insertions(+), 3 deletions(-)
+
+diff --git a/libphobos/libdruntime/core/sys/posix/sys/socket.d b/libphobos/libdruntime/core/sys/posix/sys/socket.d
+index c1309a68c9c..e3b536d87e7 100644
+--- a/libphobos/libdruntime/core/sys/posix/sys/socket.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/socket.d
+@@ -188,10 +188,40 @@ version (linux)
+ 
+     extern (D) inout(ubyte)*   CMSG_DATA( return scope inout(cmsghdr)* cmsg ) pure nothrow @nogc { return cast(ubyte*)( cmsg + 1 ); }
+ 
+-    private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
+-    extern (D)  inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
+    version (CRuntime_Musl)
+     {
+-        return __cmsg_nxthdr(msg, cmsg);
+        extern (D)
+        {
+            private size_t __CMSG_LEN(inout(cmsghdr)* cmsg) pure nothrow @nogc
+            {
+                return (cmsg.cmsg_len + size_t.sizeof -1) & cast(size_t)(~(size_t.sizeof - 1));
+            }
+
+            private inout(cmsghdr)* __CMSG_NEXT(inout(cmsghdr)* cmsg) pure nothrow @nogc
+            {
+                return cmsg + __CMSG_LEN(cmsg);
+            }
+
+            private inout(msghdr)* __MHDR_END(inout(msghdr)* mhdr) pure nothrow @nogc
+            {
+                return cast(inout(msghdr)*)(mhdr.msg_control + mhdr.msg_controllen);
+            }
+
+            inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
+            {
+                return cmsg.cmsg_len < cmsghdr.sizeof ||
+                    __CMSG_LEN(cmsg) + cmsghdr.sizeof >= __MHDR_END(msg) - cast(inout(msghdr)*)(cmsg)
+                        ? cast(inout(cmsghdr)*) null : cast(inout(cmsghdr)*) __CMSG_NEXT(cmsg);
+            }
+        }
+    }
+    else
+    {
+        private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
+        extern (D)  inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
+        {
+            return __cmsg_nxthdr(msg, cmsg);
+        }
+     }
+ 
+     extern (D) inout(cmsghdr)* CMSG_FIRSTHDR( inout(msghdr)* mhdr ) pure nothrow @nogc
+-- 
+2.38.1
+
--- a/cross/gcc-armhf/APKBUILD
+++ b/cross/gcc-armhf/APKBUILD
@@ -10,7 +10,7 @@ LANG_JAVA=false
 LANG_GO=false
 LANG_FORTRAN=false
 LANG_ADA=false
-options="!strip !tracedeps"
+options="!strip"

 # abuild doesn't try to tries to install "build-base-$CTARGET_ARCH"
 # when this variable matches "no*"
@@ -24,7 +24,6 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-armhf
-# FIXME WHEN UPGRADING: remove !tracedeps from options when upgrading to properly fix pma#1732 (we only have a workaround for now)
 _pkgbase=12.2.1 # must match gcc/BASE-VER
 _pkgsnap=20220924
 pkgver=${_pkgbase}_git${_pkgsnap}
@@ -33,7 +32,7 @@ pkgver=${_pkgbase}_git${_pkgsnap}
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armhf
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -259,6 +258,7 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-
 	0051-libgo-Explicitly-define-SYS_timer_settime-for-32-bit.patch
 	0052-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
 	0053-libgo-make-match.sh-POSIX-shell-compatible.patch
+	0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
 	"

 # we build out-of-tree
@@ -810,4 +810,5 @@ c33ca2553642c2dbd1c65cd97046548f08775785a3db06d761e3bbe61398c37bc382fe132c0c3fa2
 c82d7c8d340a76df3d796565a79b0ccc04ddffef39927620e1f3719bf2dc1db101ba13aef24b46c5bc95b7bf1e31c8bda4ab0936ba4c9c5e5047ba08826c982c  0051-libgo-Explicitly-define-SYS_timer_settime-for-32-bit.patch
 eb403d8ea665fd5dc2c11faf43b055e6a3bf480a397ceee3e0ca1e38ec7d2392315f2694ed9a34ffbc99e464f2873fbbf91be8646ea4dea5d3636e3ea22fefa0  0052-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
 22fb6edf1ed0387e2b93839ffe6e82a7fee420950af90e91199c3488d966702fdeb1a3396d22be0c73a4051525da9349c93d070a0d83b724c83f2b268da6483f  0053-libgo-make-match.sh-POSIX-shell-compatible.patch
+9b74d0a0e4140b597708a295bcf51b93944782698470e2ba9bc0f0d4a830fc418da9624eccc85f3d65ff6d50b8ebf40cecd34d5b045db9e6c29614e981e93f92  0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
 "
--- a/cross/gcc-armv7/0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
+++ b/cross/gcc-armv7/0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
+From 7b8400f902ef25ea71ed460716c1afedca357a61 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 2 Nov 2022 12:31:36 +0100
+Subject: [PATCH] libphobos: fix undefined reference to `__cmsg_nxthdr' with
+ musl
+
+Ported fix from upstream.
+
+Upstream: https://github.com/dlang/dmd/commit/54544260a848c8ebad5582e27ac1e09627cdfb17
+Bug-URL: https://issues.dlang.org/show_bug.cgi?id=23157
+---
+ .../libdruntime/core/sys/posix/sys/socket.d   | 36 +++++++++++++++++--
+ 1 file changed, 33 insertions(+), 3 deletions(-)
+
+diff --git a/libphobos/libdruntime/core/sys/posix/sys/socket.d b/libphobos/libdruntime/core/sys/posix/sys/socket.d
+index c1309a68c9c..e3b536d87e7 100644
+--- a/libphobos/libdruntime/core/sys/posix/sys/socket.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/socket.d
+@@ -188,10 +188,40 @@ version (linux)
+ 
+     extern (D) inout(ubyte)*   CMSG_DATA( return scope inout(cmsghdr)* cmsg ) pure nothrow @nogc { return cast(ubyte*)( cmsg + 1 ); }
+ 
+-    private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
+-    extern (D)  inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
+    version (CRuntime_Musl)
+     {
+-        return __cmsg_nxthdr(msg, cmsg);
+        extern (D)
+        {
+            private size_t __CMSG_LEN(inout(cmsghdr)* cmsg) pure nothrow @nogc
+            {
+                return (cmsg.cmsg_len + size_t.sizeof -1) & cast(size_t)(~(size_t.sizeof - 1));
+            }
+
+            private inout(cmsghdr)* __CMSG_NEXT(inout(cmsghdr)* cmsg) pure nothrow @nogc
+            {
+                return cmsg + __CMSG_LEN(cmsg);
+            }
+
+            private inout(msghdr)* __MHDR_END(inout(msghdr)* mhdr) pure nothrow @nogc
+            {
+                return cast(inout(msghdr)*)(mhdr.msg_control + mhdr.msg_controllen);
+            }
+
+            inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
+            {
+                return cmsg.cmsg_len < cmsghdr.sizeof ||
+                    __CMSG_LEN(cmsg) + cmsghdr.sizeof >= __MHDR_END(msg) - cast(inout(msghdr)*)(cmsg)
+                        ? cast(inout(cmsghdr)*) null : cast(inout(cmsghdr)*) __CMSG_NEXT(cmsg);
+            }
+        }
+    }
+    else
+    {
+        private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
+        extern (D)  inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
+        {
+            return __cmsg_nxthdr(msg, cmsg);
+        }
+     }
+ 
+     extern (D) inout(cmsghdr)* CMSG_FIRSTHDR( inout(msghdr)* mhdr ) pure nothrow @nogc
+-- 
+2.38.1
+
--- a/cross/gcc-armv7/APKBUILD
+++ b/cross/gcc-armv7/APKBUILD
@@ -10,7 +10,7 @@ LANG_JAVA=false
 LANG_GO=false
 LANG_FORTRAN=false
 LANG_ADA=false
-options="!strip !tracedeps"
+options="!strip"

 # abuild doesn't try to tries to install "build-base-$CTARGET_ARCH"
 # when this variable matches "no*"
@@ -24,7 +24,6 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-armv7
-# FIXME WHEN UPGRADING: remove !tracedeps from options when upgrading to properly fix pma#1732 (we only have a workaround for now)
 _pkgbase=12.2.1 # must match gcc/BASE-VER
 _pkgsnap=20220924
 pkgver=${_pkgbase}_git${_pkgsnap}
@@ -33,7 +32,7 @@ pkgver=${_pkgbase}_git${_pkgsnap}
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armv7
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -259,6 +258,7 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-
 	0051-libgo-Explicitly-define-SYS_timer_settime-for-32-bit.patch
 	0052-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
 	0053-libgo-make-match.sh-POSIX-shell-compatible.patch
+	0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
 	"

 # we build out-of-tree
@@ -810,4 +810,5 @@ c33ca2553642c2dbd1c65cd97046548f08775785a3db06d761e3bbe61398c37bc382fe132c0c3fa2
 c82d7c8d340a76df3d796565a79b0ccc04ddffef39927620e1f3719bf2dc1db101ba13aef24b46c5bc95b7bf1e31c8bda4ab0936ba4c9c5e5047ba08826c982c  0051-libgo-Explicitly-define-SYS_timer_settime-for-32-bit.patch
 eb403d8ea665fd5dc2c11faf43b055e6a3bf480a397ceee3e0ca1e38ec7d2392315f2694ed9a34ffbc99e464f2873fbbf91be8646ea4dea5d3636e3ea22fefa0  0052-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
 22fb6edf1ed0387e2b93839ffe6e82a7fee420950af90e91199c3488d966702fdeb1a3396d22be0c73a4051525da9349c93d070a0d83b724c83f2b268da6483f  0053-libgo-make-match.sh-POSIX-shell-compatible.patch
+9b74d0a0e4140b597708a295bcf51b93944782698470e2ba9bc0f0d4a830fc418da9624eccc85f3d65ff6d50b8ebf40cecd34d5b045db9e6c29614e981e93f92  0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
 "
--- a/cross/gcc-riscv64/0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
+++ b/cross/gcc-riscv64/0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
+From 7b8400f902ef25ea71ed460716c1afedca357a61 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 2 Nov 2022 12:31:36 +0100
+Subject: [PATCH] libphobos: fix undefined reference to `__cmsg_nxthdr' with
+ musl
+
+Ported fix from upstream.
+
+Upstream: https://github.com/dlang/dmd/commit/54544260a848c8ebad5582e27ac1e09627cdfb17
+Bug-URL: https://issues.dlang.org/show_bug.cgi?id=23157
+---
+ .../libdruntime/core/sys/posix/sys/socket.d   | 36 +++++++++++++++++--
+ 1 file changed, 33 insertions(+), 3 deletions(-)
+
+diff --git a/libphobos/libdruntime/core/sys/posix/sys/socket.d b/libphobos/libdruntime/core/sys/posix/sys/socket.d
+index c1309a68c9c..e3b536d87e7 100644
+--- a/libphobos/libdruntime/core/sys/posix/sys/socket.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/socket.d
+@@ -188,10 +188,40 @@ version (linux)
+ 
+     extern (D) inout(ubyte)*   CMSG_DATA( return scope inout(cmsghdr)* cmsg ) pure nothrow @nogc { return cast(ubyte*)( cmsg + 1 ); }
+ 
+-    private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
+-    extern (D)  inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
+    version (CRuntime_Musl)
+     {
+-        return __cmsg_nxthdr(msg, cmsg);
+        extern (D)
+        {
+            private size_t __CMSG_LEN(inout(cmsghdr)* cmsg) pure nothrow @nogc
+            {
+                return (cmsg.cmsg_len + size_t.sizeof -1) & cast(size_t)(~(size_t.sizeof - 1));
+            }
+
+            private inout(cmsghdr)* __CMSG_NEXT(inout(cmsghdr)* cmsg) pure nothrow @nogc
+            {
+                return cmsg + __CMSG_LEN(cmsg);
+            }
+
+            private inout(msghdr)* __MHDR_END(inout(msghdr)* mhdr) pure nothrow @nogc
+            {
+                return cast(inout(msghdr)*)(mhdr.msg_control + mhdr.msg_controllen);
+            }
+
+            inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
+            {
+                return cmsg.cmsg_len < cmsghdr.sizeof ||
+                    __CMSG_LEN(cmsg) + cmsghdr.sizeof >= __MHDR_END(msg) - cast(inout(msghdr)*)(cmsg)
+                        ? cast(inout(cmsghdr)*) null : cast(inout(cmsghdr)*) __CMSG_NEXT(cmsg);
+            }
+        }
+    }
+    else
+    {
+        private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
+        extern (D)  inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
+        {
+            return __cmsg_nxthdr(msg, cmsg);
+        }
+     }
+ 
+     extern (D) inout(cmsghdr)* CMSG_FIRSTHDR( inout(msghdr)* mhdr ) pure nothrow @nogc
+-- 
+2.38.1
+
--- a/cross/gcc-riscv64/APKBUILD
+++ b/cross/gcc-riscv64/APKBUILD
@@ -32,7 +32,7 @@ pkgver=${_pkgbase}_git${_pkgsnap}
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-riscv64
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -258,6 +258,7 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-
 	0051-libgo-Explicitly-define-SYS_timer_settime-for-32-bit.patch
 	0052-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
 	0053-libgo-make-match.sh-POSIX-shell-compatible.patch
+	0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
 	"

 # we build out-of-tree
@@ -809,4 +810,5 @@ c33ca2553642c2dbd1c65cd97046548f08775785a3db06d761e3bbe61398c37bc382fe132c0c3fa2
 c82d7c8d340a76df3d796565a79b0ccc04ddffef39927620e1f3719bf2dc1db101ba13aef24b46c5bc95b7bf1e31c8bda4ab0936ba4c9c5e5047ba08826c982c  0051-libgo-Explicitly-define-SYS_timer_settime-for-32-bit.patch
 eb403d8ea665fd5dc2c11faf43b055e6a3bf480a397ceee3e0ca1e38ec7d2392315f2694ed9a34ffbc99e464f2873fbbf91be8646ea4dea5d3636e3ea22fefa0  0052-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
 22fb6edf1ed0387e2b93839ffe6e82a7fee420950af90e91199c3488d966702fdeb1a3396d22be0c73a4051525da9349c93d070a0d83b724c83f2b268da6483f  0053-libgo-make-match.sh-POSIX-shell-compatible.patch
+9b74d0a0e4140b597708a295bcf51b93944782698470e2ba9bc0f0d4a830fc418da9624eccc85f3d65ff6d50b8ebf40cecd34d5b045db9e6c29614e981e93f92  0054-libphobos-fix-undefined-reference-to-__cmsg_nxthdr-w.patch
 "
--- a/device/community/firmware-bq-picmt/APKBUILD
+++ b/device/community/firmware-bq-picmt/APKBUILD
 pkgname=firmware-bq-picmt
 pkgver=3
-pkgrel=0
+pkgrel=1
 _commit="04cced17ab21d84ea6145e58f0b12fd67ef640d0"
 pkgdesc="Firmware for BQ Aquaris X5"
 url="https://github.com/JonnyMe/picmt-firmware"
@@ -33,7 +33,7 @@ modem() {

 venus() {
 	pkgdesc="BQ Aquaris X5 video firmware"
-	provides="firmware-qcom-msm8916-venus"
+	provides="firmware-qcom-msm8916-venus=$pkgver-r$pkgrel"

 	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
 	# file contents, so it is fine to install venus.mbn to venus.mdt
@@ -42,7 +42,7 @@ venus() {

 wcnss() {
 	pkgdesc="BQ Aquaris X5 WiFi/BT firmware"
-	provides="firmware-qcom-msm8916-wcnss"
+	provides="firmware-qcom-msm8916-wcnss=$pkgver-r$pkgrel"

 	install -Dm644 "$srcdir"/wcnss.mbn "$subpkgdir/$_fwdir"/wcnss.mdt
 }

--- a/device/community/linux-postmarketos-qcom-sdm845/APKBUILD
+++ b/device/community/linux-postmarketos-qcom-sdm845/APKBUILD
@@ -5,7 +5,7 @@

 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
-pkgver=6.0.3
+pkgver=6.1.0_rc3
 pkgrel=0
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
@@ -18,7 +18,7 @@ options="!strip !check !tracedeps
 makedepends="bash bison findutils flex installkernel openssl-dev perl"

 _config="config-$_flavor.$arch"
-_tag="sdm845-6.0.3"
+_tag="sdm845-6.1.0_rc3"

 # Source
 source="
@@ -55,6 +55,6 @@ package() {
 }

 sha512sums="
-0995bcbdf23d40ed0f865fd883d2f7f3a000c3f9455777d905924f722f81311d8a724f73247528b4167abbe3ed0c3ed6abc7fd793d4d9ed1f1ec8d45f964529a  linux-sdm845-6.0.3.tar.gz
-fff994c6cafc385a9c70a332712ef40be2b692899721acefddadfb96efbdc091a50af8c3c66b85b8ea840705672ae284270477ec8ca2f004f7feb3c8620c9655  config-postmarketos-qcom-sdm845.aarch64
+a4096863f06d00edba6af76f89ea24047badba5d1d1363ba31701dd1088aab34c470a5552b8b3db4cb5d21065496ccac9aa59c05e4d15561d4cfb03706d8962e  linux-sdm845-6.1.0_rc3.tar.gz
+b2bcef118e3468187a26aa7ca4a79eea84292f69d7f9fecd943d752bb6d8fee44e1d504732f506350e37c9553881b051d4859e49c2e4f836242f43d881c37abe  config-postmarketos-qcom-sdm845.aarch64
 "
--- a/device/community/linux-postmarketos-qcom-sdm845/config-postmarketos-qcom-sdm845.aarch64
+++ b/device/community/linux-postmarketos-qcom-sdm845/config-postmarketos-qcom-sdm845.aarch64
--- a/device/community/soc-qcom-msm8916/APKBUILD
+++ b/device/community/soc-qcom-msm8916/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=soc-qcom-msm8916
 pkgdesc="Common package for Qualcomm MSM8916 devices"
 pkgver=17
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64 armv7"
@@ -38,6 +38,7 @@ package() {
 # we can investigate how to integrate it properly for upstreaming.
 ucm() {
 	provides="alsa-ucm-conf"
+	provider_priority=1

 	cd "$srcdir/alsa-ucm-conf-$_ucm_commit"
 	mkdir -p "$subpkgdir"/usr/share/alsa

--- a/device/community/soc-qcom-msm8996/APKBUILD
+++ b/device/community/soc-qcom-msm8996/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=soc-qcom-msm8996
 pkgdesc="Common package for Qualcomm MSM8996 devices"
 pkgver=1
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -32,6 +32,7 @@ nonfree_firmware() {

 ucm() {
 	provides="alsa-ucm-conf"
+	provider_priority=1

 	# install audio config files
 	mkdir -p "$subpkgdir"/usr/share/alsa/ucm2

--- a/device/community/soc-qcom-sdm845/APKBUILD
+++ b/device/community/soc-qcom-sdm845/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=soc-qcom-sdm845
 pkgdesc="Common package for Qualcomm SDM845 devices"
 pkgver=11
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -59,6 +59,7 @@ nonfree_firmware() {

 ucm() {
 	provides="alsa-ucm-conf"
+	provider_priority=1

 	# install audio config files
 	mkdir -p "$subpkgdir"/usr/share/alsa/ucm2

--- a/device/main/linux-postmarketos-allwinner/APKBUILD
+++ b/device/main/linux-postmarketos-allwinner/APKBUILD
@@ -7,7 +7,7 @@ _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
 pkgver=6.0.3_git20221022
-pkgrel=1
+pkgrel=2
 _tag="orange-pi-6.0-20221022-2043"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
@@ -48,7 +48,6 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar
 	0011-sunxi-mmc-h6-fix.patch
 	0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
 	"
-subpackages="$pkgname-dev"
 builddir="$srcdir/linux-$_tag"

 case "$CARCH" in
@@ -82,17 +81,6 @@ package() {
 		INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
 }

-dev() {
-	provides="linux-headers"
-	replaces="linux-headers"
-
-	cd $builddir
-
-	# https://github.com/torvalds/linux/blob/master/Documentation/kbuild/headers_install.rst
-	make -j1 headers_install \
-		ARCH="$_carch" \
-		INSTALL_HDR_PATH="$subpkgdir"/usr
-}
 sha512sums="
 476009ec3d0114d486a1c61fdfd6fb2fbaa9d8f9bce384b4f8732f088444d5f044b67dc2270c303c70aaf099cad9fb273671f1d7c81d000eb36a085a688be800  linux-postmarketos-allwinner-orange-pi-6.0-20221022-2043.tar.gz
 eb9cbef2d40eb9d47e94cf85a50df42e02c29a359638443f72c89cdfe25b395058be8139c4437be56bf5e30fdcc32a4dacba55e2fab64e7590af8b9eff5e4bb8  config-postmarketos-allwinner.aarch64

--- a/device/main/linux-purism-librem5/APKBUILD
+++ b/device/main/linux-purism-librem5/APKBUILD
@@ -3,7 +3,7 @@
 # Co-Maintainer: Bhushan Shah <bshah@kde.org>
 pkgname=linux-purism-librem5
 pkgver=6.0.2
-pkgrel=0
+pkgrel=1
 _purismrel=1
 # <kernel ver>.<purism kernel release>
 _purismver=${pkgver}pureos$_purismrel
@@ -29,7 +29,6 @@ makedepends="
 	rsync
 	xz
 	"
-subpackages="$pkgname-dev"
 install="$pkgname.post-upgrade"

 # Source
@@ -71,17 +70,6 @@ package() {

 }

-dev() {
-	provides="linux-headers"
-	replaces="linux-headers"
-
-	cd $builddir
-
-	# https://github.com/torvalds/linux/blob/master/Documentation/kbuild/headers_install.rst
-	make -j1 headers_install \
-		ARCH="$_carch" \
-		INSTALL_HDR_PATH="$subpkgdir"/usr
-}
 sha512sums="
 5fc6d1f6e944bdf3d0d3401ea8b86703547404843be478b9d15764155e46292096234d4c5ae3fc5ad6e61e3916b19763fa4b0120da6718084665a9f8db212aa5  linux-purism-librem5-6.0.2pureos1.tar.gz
 765858ba4ab66468b409f64b43eb6c15f235f5f830f9b7f1a43a41d6fb09bb678baa99777fe59ee750045cd9e0911d59904e07c8dea992435ad7600d7d53a5ff  config-purism-librem5.aarch64

--- a/device/testing/device-google-elm/APKBUILD
+++ b/device/testing/device-google-elm/APKBUILD
@@ -3,12 +3,13 @@
 pkgname=device-google-elm
 pkgdesc="Acer Chromebook R13"
 pkgver=1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	alsa-utils
 	depthcharge-tools
 	linux-postmarketos-mediatek-mt8173
 	postmarketos-base

--- a/device/testing/device-google-hana/APKBUILD
+++ b/device/testing/device-google-hana/APKBUILD
@@ -3,12 +3,13 @@
 pkgname=device-google-hana
 pkgdesc="Google Hana Chromebooks"
 pkgver=1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	alsa-utils
 	depthcharge-tools
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel

--- a/device/testing/linux-sourceparts-pocketpc/APKBUILD
+++ b/device/testing/linux-sourceparts-pocketpc/APKBUILD
@@ -3,7 +3,7 @@ _flavor=sourceparts-pocketpc
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
 pkgver=5.14.6_git20210920
-pkgrel=1
+pkgrel=2
 _tag="81a7953afc5cd1001b727701dc99625ec656160a"
 _wifi_ref="1b6ddd544b4a829ed2b7feb32575359b6443cd3d"
 pkgdesc="Kernel fork for the Pocket P.C."
@@ -36,7 +36,6 @@ source="$pkgname-$_tag.tar.gz::https://github.com/PopcornComputer/PocketPC-Linux
 	0001-rtl8723ds.patch
 	config-$_flavor.aarch64
 	"
-subpackages="$pkgname-dev"
 builddir="$srcdir/PocketPC-Linux-$_tag"

 case "$CARCH" in
@@ -72,17 +71,6 @@ package() {
 		INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
 }

-dev() {
-	provides="linux-headers"
-	replaces="linux-headers"
-
-	cd $builddir
-
-	# https://github.com/torvalds/linux/blob/master/Documentation/kbuild/headers_install.rst
-	make -j1 headers_install \
-		ARCH="$_carch" \
-		INSTALL_HDR_PATH="$subpkgdir"/usr
-}
 sha512sums="
 49e091de60b820c48e19bb9d3602cb0e5c3470b99112ad63da3f112b503569e6bab21738f2be014705212974a3a824c9f91acd98fa33632e7bc8bf2057f51d75  linux-sourceparts-pocketpc-81a7953afc5cd1001b727701dc99625ec656160a.tar.gz
 68001a7fdc022b4ff82e3f1762a00369c2be18a4c9f5ea2074e3e9248678c48525f4bcec47ef0c4678d6a0b6aef031eb52cac9a9811f3291a73e00cb33fb5c85  1b6ddd544b4a829ed2b7feb32575359b6443cd3d.tar.gz
No results found