Weekly portage-stable package updates 2024-10-07

.github/workflows/portage-stable-packages-list

@@ -302,6 +302,7 @@ dev-python/flit-core
 dev-python/gentoo-common
 dev-python/gpep517
 dev-python/hatchling
+dev-python/hatch-vcs
 dev-python/idna
 dev-python/installer
 dev-python/jaraco-context
@@ -553,7 +554,7 @@ sec-policy/selinux-unconfined
 
 sys-apps/acl
 sys-apps/attr
-sys-apps/azure-nvme-utils
+sys-apps/azure-vm-utils
 sys-apps/bubblewrap
 sys-apps/checkpolicy
 sys-apps/config-site

changelog/security/2024-10-15-weekly-updates.md

@@ -0,0 +1,3 @@
+- curl ([CVE-2024-8096](https://nvd.nist.gov/vuln/detail/CVE-2024-8096))
+- libarchive ([CVE-2024-26256](https://nvd.nist.gov/vuln/detail/CVE-2024-26256), [CVE-2024-48957](https://nvd.nist.gov/vuln/detail/CVE-2024-48957), [CVE-2024-48958](https://nvd.nist.gov/vuln/detail/CVE-2024-48958))
+- openssh ([CVE-2024-39894](https://nvd.nist.gov/vuln/detail/CVE-2024-39894))

changelog/updates/2024-10-15-weekly-updates.md

@@ -0,0 +1,41 @@
+- azure: chrony ([4.6](https://gitlab.com/chrony/chrony/-/blob/4.6/NEWS))
+- base, dev: azure-vm-utils ([0.3.0](https://github.com/Azure/azure-vm-utils/releases/tag/v0.3.0))
+- base, dev: binutils-config ([5.5.2](https://gitweb.gentoo.org/proj/binutils-config.git/log/?h=v5.5.2))
+- base, dev: btrfs-progs ([6.10.1](https://github.com/kdave/btrfs-progs/blob/v6.10.1/CHANGES#L26-L38) (includes [6.10](https://github.com/kdave/btrfs-progs/blob/v6.10/CHANGES)))
+- base, dev: c-ares ([1.33.1](https://github.com/c-ares/c-ares/releases/tag/v1.33.1) (includes [1.33.0](https://github.com/c-ares/c-ares/releases/tag/v1.33.0), [1.32.3](https://github.com/c-ares/c-ares/releases/tag/v1.32.3), [1.32.2](https://github.com/c-ares/c-ares/releases/tag/v1.32.2), [1.32.1](https://github.com/c-ares/c-ares/releases/tag/v1.32.1), [1.32.0](https://github.com/c-ares/c-ares/releases/tag/v1.32.0), [1.31.0](https://github.com/c-ares/c-ares/releases/tag/v1.31.0), [1.30.0](https://github.com/c-ares/c-ares/releases/tag/v1.30.0)))
+- base, dev: cracklib ([2.10.2](https://github.com/cracklib/cracklib/releases/tag/v2.10.2) (includes [2.10.1](https://github.com/cracklib/cracklib/releases/tag/v2.10.1), [2.10.0](https://github.com/cracklib/cracklib/releases/tag/v2.10.0)))
+- base, dev: cryptsetup ([2.7.5](https://gitlab.com/cryptsetup/cryptsetup/-/blob/v2.7.5/docs/v2.7.5-ReleaseNotes) (includes [2.7.4](https://gitlab.com/cryptsetup/cryptsetup/-/blob/v2.7.4/docs/v2.7.4-ReleaseNotes), [2.7.3](https://gitlab.com/cryptsetup/cryptsetup/-/blob/v2.7.3/docs/v2.7.3-ReleaseNotes)))
+- base, dev: curl ([8.10.1](https://curl.se/ch/8.10.1.html) (includes [8.10.0](https://curl.se/ch/8.10.0.html)))
+- base, dev: efivar ([39](https://github.com/rhboot/efivar/releases/tag/39))
+- base, dev: gettext ([0.22.5](https://savannah.gnu.org/news/?id=10597))
+- base, dev: git ([2.45.2](https://github.com/git/git/blob/v2.45.2/Documentation/RelNotes/2.45.2.txt) (includes [2.45.1](https://github.com/git/git/blob/v2.45.1/Documentation/RelNotes/2.45.1.txt), [2.45.0](https://github.com/git/git/blob/v2.45.0/Documentation/RelNotes/2.45.0.txt)))
+- base, dev: gnutls ([3.8.7.1](https://gitlab.com/gnutls/gnutls/-/blob/3.8.7/NEWS) (includes [3.8.6](https://gitlab.com/gnutls/gnutls/-/blob/3.8.6/NEWS)))
+- base, dev: gptfdisk ([1.0.10](https://sourceforge.net/p/gptfdisk/code/ci/53ac725a88a616b9f3395500d6e520aa04742fa5/tree/NEWS))
+- base, dev: intel-microcode ([20240910_p20240915](https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20240910))
+- base, dev: kmod ([33](https://github.com/kmod-project/kmod/blob/v33/NEWS))
+- base, dev: libarchive ([3.7.6](https://github.com/libarchive/libarchive/releases/tag/v3.7.6) (includes [3.7.5](https://github.com/libarchive/libarchive/releases/tag/v3.7.5)))
+- base, dev: libassuan ([3.0.0](https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libassuan.git;a=blob;f=NEWS;h=48ece8b1cf8b81bdf835db00079ae247742cd398;hb=0351ecfa4f35ad44684075abec153574986b11bd))
+- base, dev: libgpg-error ([1.50](https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=NEWS;h=b865ecc7197a4f60b1530958fbb25a92bdfdc3de;hb=bb732615daad9bba9026354ae90f0f5292ea4908))
+- base, dev: libnl ([3.10.0](https://lists.infradead.org/pipermail/libnl/2024-July/002440.html))
+- base, dev: libnvme ([1.10](https://github.com/linux-nvme/libnvme/releases/tag/v1.10))
+- base, dev: liburing ([2.7](https://git.kernel.dk/cgit/liburing/tree/CHANGELOG?h=liburing-2.7) (includes [2.6](https://git.kernel.dk/cgit/liburing/tree/CHANGELOG?h=liburing-2.6), [2.5](https://git.kernel.dk/cgit/liburing/tree/CHANGELOG?h=liburing-2.5), [2.4](https://git.kernel.dk/cgit/liburing/tree/CHANGELOG?h=liburing-2.4)))
+- base, dev: nvme-cli ([2.10.2](https://github.com/linux-nvme/nvme-cli/releases/tag/v2.10.2) (includes [2.10.1](https://github.com/linux-nvme/nvme-cli/releases/tag/v2.10.1), [2.10](https://github.com/linux-nvme/nvme-cli/releases/tag/v2.10)))
+- base, dev: oniguruma ([6.9.9](https://github.com/kkos/oniguruma/releases/tag/v6.9.9))
+- base, dev: openssh ([9.8_p1](https://www.openssh.com/txt/release-9.8))
+- base, dev: pinentry ([1.3.1](https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=blob;f=NEWS;h=a07d18953341a4eb65c9873e64c06bc7c642606d;hb=dd8894fa60c1f1c08ecc50ba4657580abc348347))
+- base, dev: pkgconf ([2.3.0](https://github.com/pkgconf/pkgconf/blob/pkgconf-2.3.0/NEWS))
+- base, dev: sqlite ([3.46.1](https://www.sqlite.org/releaselog/3_46_1.html))
+- base, dev: tcpdump ([4.99.5](https://github.com/the-tcpdump-group/tcpdump/blob/tcpdump-4.99.5/CHANGES))
+- base, dev: userspace-rcu ([0.14.1](https://lists.lttng.org/pipermail/lttng-dev/2024-August/030860.html))
+- dev: gnuconfig ([20240728](https://git.savannah.gnu.org/cgit/config.git/log/?id=00b15927496058d23e6258a28d8996f87cf1f191))
+- dev: iperf ([3.17.1](https://github.com/esnet/iperf/releases/tag/3.17.1) (includes [3.17](https://github.com/esnet/iperf/releases/tag/3.17)))
+- dev: libpipeline ([1.5.8](https://gitlab.com/libpipeline/libpipeline/-/blob/dd37cf76496b4b999509bd133657c1fc021e3a5f/NEWS.md))
+- dev: man-db ([2.13.0](https://gitlab.com/man-db/man-db/-/releases/2.13.0))
+- sysext-python: idna ([3.10](https://github.com/kjd/idna/blob/v3.10/HISTORY.rst))
+- sysext-python: more-itertools ([10.5.0](https://github.com/more-itertools/more-itertools/blob/v10.5.0/docs/versions.rst#1050))
+- sysext-python: msgpack ([1.1.0](https://github.com/msgpack/msgpack-python/blob/v1.1.0/ChangeLog.rst#110))
+- sysext-python: platformdirs ([4.3.6](https://github.com/tox-dev/platformdirs/releases/tag/4.3.6))
+- sysext-python: rich ([13.8.1](https://github.com/Textualize/rich/releases/tag/v13.8.1))
+- sysext-python: trove-classifiers ([2024.9.12](https://github.com/pypa/trove-classifiers/releases/tag/2024.9.12))
+- sysext-python: urllib3 ([2.2.3](https://github.com/urllib3/urllib3/releases/tag/2.2.3))
+- vmware: xmlsec ([1.3.4](https://github.com/lsh123/xmlsec/releases/tag/1.3.4))

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild

@@ -153,7 +153,7 @@ RDEPEND="${RDEPEND}
 	sec-policy/selinux-unconfined
 	sys-apps/acl
 	sys-apps/attr
-	sys-apps/azure-nvme-utils
+	sys-apps/azure-vm-utils
 	sys-apps/coreutils
 	sys-apps/checkpolicy
 	sys-apps/dbus

sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-block/open-iscsi

@@ -10,9 +10,3 @@ cros_post_src_install_tmpfiles() {
 		After=systemd-tmpfiles-setup.service
 	EOF
 }
-
-# Masking initiatorname.iscsi.example prevents initiatorname.iscsi from being
-# generated and installed. We want the systemd unit to do this at runtime so
-# that we don't bake the value into Flatcar images.
-INSTALL_MASK+=" ${EPREFIX}/etc/iscsi/initiatorname.iscsi*"
-PKG_INSTALL_MASK+=" ${EPREFIX}/etc/iscsi/initiatorname.iscsi*"

sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-boot/grub

@@ -1,7 +1,7 @@
 # Bump the flatcar version stated here every time we or Gentoo change patches
 # that modify parts of GRUB that are installed to the boot partition. Reset the
 # version back to 1 when the upstream GRUB version changes.
-FLATCAR_VERSION=flatcar1
+FLATCAR_VERSION=flatcar2
 
 # Adjust the version string for Flatcar. This propagates throughout the source.
 cros_pre_src_prepare_adjust_version() {

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords

@@ -13,6 +13,10 @@
 # Keep versions on both arches in sync.
 =app-containers/cri-tools-1.27.0 ~arm64
 
+# Accept unstable for Docker and its CLI.
+=app-containers/docker-27.2.1 ~amd64 ~arm64
+=app-containers/docker-cli-27.2.1 ~amd64 ~arm64
+
 # Needed to address CVE-2024-3727
 =app-containers/podman-5.0.3 ~amd64 ~arm64
 
@@ -34,66 +38,93 @@
 # Needed by arm64-native SDK.
 =app-crypt/efitools-1.9.2-r1 ~arm64
 
+# Keep versions on both arches in sync.
+=app-crypt/gnupg-2.4.5-r2 ~arm64
+=app-crypt/pinentry-1.3.1 ~arm64
+
 # Needed by arm64-native SDK.
 =app-emulation/open-vmdk-1.0 *
 
 # Keep versions on both arches in sync.
+=app-portage/elt-patches-20240912
+=app-shells/bash-5.2_p37 ~arm64
+=dev-build/ninja-1.12.1 ~arm64
 =dev-cpp/abseil-cpp-20230125.3-r4 ~arm64
 
 # Keep versions on both arches in sync.
 =dev-cpp/glog-0.6.0 ~arm64
-=dev-lang/perl-5.40.0 ~arm64
-
-# Needed by arm64-native SDK.
+=dev-db/sqlite-3.46.1 ~arm64
+=dev-lang/tcl-8.6.14 ~arm64
 =dev-lang/yasm-1.3.0-r1 ~arm64
-
-# Keep versions on both arches in sync.
 =dev-libs/ding-libs-0.6.2-r1 ~arm64
 
 # The only available ebuild (from GURU) has ~amd64 and no keyword for arm64 yet.
 =dev-libs/jose-12 **
 
+# Keep versions on both arches in sync.
+=dev-libs/libassuan-3.0.0 ~arm64
+=dev-libs/libgpg-error-1.50 ~arm64
+=dev-libs/libnl-3.10.0 ~arm64
+
 # The only available ebuild (from GURU) has ~amd64 and no keyword for arm64 yet.
 =dev-libs/luksmeta-9-r1 **
 
+# Keep versions on both arches in sync.
+=dev-libs/userspace-rcu-0.14.1 ~arm64
+
 # These seem to be the versions we initially got, but the
 # modifications made to the ebuilds were clobbered, so these are here
 # to keep using the same version. Can be dropped when these or newer
 # get stabilized in Gentoo.
-=dev-libs/yajl-2.1.0-r5 ~amd64 ~arm64
+=dev-libs/yajl-2.1.0-r5 ~arm64
 
 # Keep versions on both arches in sync.
 =dev-util/bpftool-7.5.0-r1 ~arm64
 
 # Catalyst 4 is not stable yet, but earlier versions are masked now.
 dev-util/catalyst ~amd64 ~arm64
 
+# Keep versions on both arches in sync.
+=dev-util/pkgconf-2.3.0 ~arm64
+
 # Needed for the MIT License
 =net-analyzer/netperf-2.7.0_p20210121 ~amd64 ~arm64
 
 # Keep versions on both arches in sync.
+=net-analyzer/tcpdump-4.99.5 ~arm64
+=net-dns/c-ares-1.33.1 ~arm64
 =net-firewall/conntrack-tools-1.4.8 ~arm64
-
-# Required for addressing CVE-2023-0361, CVE-2023-5981, CVE-2024-0567,
-# CVE-2024-0553, CVE-2024-28834 and CVE-2024-28835.
-=net-libs/gnutls-3.8.5-r1 ~amd64 ~arm64
-
-# Keep versions on both arches in sync.
+=net-firewall/ipset-7.22-r2 ~arm64
+=net-libs/gnutls-3.8.7.1-r1 ~arm64
 =net-libs/libnetfilter_cthelper-1.0.1-r1 ~arm64
 =net-libs/libnetfilter_cttimeout-1.0.1 ~arm64
 
 # Needed to address CVE-2023-7256 and CVE-2024-8006.
-=net-libs/libpcap-1.10.5 ~amd64 ~arm64
+=net-libs/libpcap-1.10.5 ~arm64
+
+# Keep versions on both arches in sync.
+=net-misc/chrony-4.6 ~arm64
 
-# Needed to address CVE-2024-6197, CVE-2024-6874 and CVE-2024-7264.
-=net-misc/curl-8.9.1-r1 ~amd64 ~arm64
+# Needed to address CVE-2024-6197, CVE-2024-6874, CVE-2024-7264 and
+# CVE-2024-8096.
+=net-misc/curl-8.10.1 ~amd64 ~arm64
+
+# Keep versions on both arches in sync.
+=net-misc/iperf-3.17.1 ~arm64
+=net-misc/openssh-9.8_p1-r2 ~arm64
 
 # Package has not been stabilised yet.
-=sys-apps/azure-nvme-utils-0.2.0 ~amd64 ~arm64
+=sys-apps/azure-vm-utils-0.3.0 ~amd64 ~arm64
 
 # Keep versions on both arches in sync.
+=sys-apps/bubblewrap-0.10.0 ~arm64
+=sys-apps/dtc-1.7.1 ~arm64
 =sys-apps/kexec-tools-2.0.28 ~arm64
+=sys-apps/kmod-33 ~arm64
+=sys-apps/man-db-2.13.0 ~arm64
+=sys-apps/nvme-cli-2.10.2 ~arm64
 =sys-apps/zram-generator-1.1.2 ~arm64
+=sys-block/open-iscsi-2.1.10-r1 ~arm64
 
 # Upgrade to latest version for secureboot
 =sys-boot/mokutil-0.6.0 ~amd64
@@ -102,14 +133,11 @@ dev-util/catalyst ~amd64 ~arm64
 =sys-cluster/ipvsadm-1.31-r1 ~arm64
 
 # Keep versions on both arches in sync.
+=sys-devel/binutils-config-5.5.2 ~arm64
+=sys-devel/gettext-0.22.5 ~arm64
+=sys-fs/btrfs-progs-6.10.1 ~arm64
+=sys-fs/quota-4.09-r1 ~arm64
+=sys-libs/cracklib-2.10.2 ~arm64
+=sys-libs/efivar-39-r1 ~arm64
+=sys-libs/readline-8.2_p13 ~arm64
 =sys-process/audit-4.0.1-r1 ~arm64
-=virtual/perl-Data-Dumper-2.189.0 ~arm64
-=virtual/perl-Encode-3.210.0-r1 ~arm64
-=virtual/perl-Getopt-Long-2.570.0-r1 ~arm64
-=virtual/perl-Exporter-5.780.0 ~arm64
-=virtual/perl-File-Spec-3.900.0 ~arm64
-=virtual/perl-IO-1.550.0 ~arm64
-
-# Accept unstable for Docker and its CLI.
-=app-containers/docker-27.2.1 ~amd64 ~arm64
-=app-containers/docker-cli-27.2.1 ~amd64 ~arm64

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use

@@ -13,7 +13,8 @@ dev-vcs/git		webdav curl
 
 # Mask support for http3 for now (unavailable on arm64 for now, and
 # I'm not sure we really need it.)
-net-misc/curl		kerberos telnet -http3 -quic -curl_quic_openssl
+# Disable websockets, we never had them, and now they are enabled by default.
+net-misc/curl		kerberos telnet -http3 -quic -curl_quic_openssl -websockets
 net-misc/iputils	arping tracepath
 sys-devel/gettext	-git
 
@@ -39,7 +40,7 @@ net-firewall/ipset -modules
 dev-libs/glib -mime
 
 # keep grub build simple
-sys-boot/grub -multislot -themes -fonts
+sys-boot/grub -multislot -themes -fonts -device-mapper
 
 # disable "high performance ssh" patch, turn on kerberos
 net-misc/openssh -hpn kerberos
@@ -95,8 +96,8 @@ sys-kernel/coreos-firmware -savedconfig
 # Make kmod support kernel modules compressed via lzma(xz)
 sys-apps/kmod lzma
 
-# These (qmanifest and qtegrity) are new tools and they pull even more dependencies.
-app-portage/portage-utils -qmanifest -qtegrity
+# The qmanifest is a new tool and it pulls even more dependencies.
+app-portage/portage-utils -qmanifest
 
 # Disable unnecessary regedit in samba to minimize the package size.
 net-fs/samba -regedit

sdk_container/src/third_party/portage-stable/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild

@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"

sdk_container/src/third_party/portage-stable/app-arch/libarchive/Manifest

@@ -1,2 +1,6 @@
 DIST libarchive-3.7.4.tar.xz 5417660 BLAKE2B 128f72235da61e112201046c0cfe62a8c580cf73b426c4cfe270ae913356f6ad430ba33a663dcd617b082c7baf45ada8d1c9928c45fea16fd57e8020693a60bc SHA512 84bc346ba15861ab10aa54a3d687de955178e4efbe12bf3a49a467181e7f819673949f131f4c8338de8ed6e319a8565af376e5a540380bda08e60dffbc7c8686
 DIST libarchive-3.7.4.tar.xz.asc 659 BLAKE2B 77e705194f6e9a9f97da0ac43c9b3157e1a8a490d26da34079e4ef3f2bcf98d6f6e95567e110287fab0ec26d3fc27e5bbeff7569c9ca138de2caf47af737c6d0 SHA512 82caa18a78661ea717ce93cdcb0806eed48450c20fb4d45cb4c33001f2d4d0fb5a791552acbb24ad8c41772e1d0b66c76c9cb86946bc862109721a0c986f5331
+DIST libarchive-3.7.5.tar.xz 5437940 BLAKE2B e1cf8490b2db64e912bd181391310653b4e3524e74f35557e1ddb8c5eb53dcde307da945d393921acf7549ef0d4a6bf228d8f42ab4d795d06dd2248196a11c85 SHA512 b9cfb0a147bf0f77cca9e2bdea173f47a78dcba5df1d97a8e0e7b14a15039ac6d5467e325423b2a05741848f73ca7ab4fece922153f24f934f9370cb521d20df
+DIST libarchive-3.7.5.tar.xz.asc 659 BLAKE2B 7310b8d7e3f07b8c75910ff3355ffda653402ca2d6db9cdf7d669b9a4ac5f3fb4c4c4482e85184fd68a23c96bce587a95b56efb88ae971399e130e533bd0969a SHA512 7494518b61a58a9aa1e991a2cf6b16340e34d7aa2c25a3c531799785e165541781d1a915437260bc536fe8267140cc69abb2670e8c0576e975a5a2b7ecf8e20d
+DIST libarchive-3.7.6.tar.xz 5458552 BLAKE2B 3251dc4d59867d1c9b43e78ac7735c27670e819a1aba4f4a76372b8509e2427ff24e379f6102a4cc3c92b965d182c8939bb6df4c82d4d1141cdd1db13bf039a2 SHA512 3ca90d665772418b9ac444044511989e81e785a13db3c101851390ba7c2ba0793c799cedb9df990e900ab78c98207f70ecee7e21829578555dde99424950ae2a
+DIST libarchive-3.7.6.tar.xz.asc 659 BLAKE2B 9f6a621dd4aa20f06dff71225723e60a6cee1f2a54ff07d2d19670153105f2f75d6439320f49eb46c28a4416828af7dc4f0d827e46ec9aeb5b703f06eb329d77 SHA512 2840b13f910f47d34daeed9680beb4b3cdde2d7de26ab8453756261c51fb7a39b727454f370b0ee60f8e1646c65544331a22558cbe8faf79a201b1d1346b37c1

sdk_container/src/third_party/portage-stable/app-arch/libarchive/files/libarchive-3.7.5-attr-dep.patch

@@ -0,0 +1,28 @@
+From 44b8e3b676746352cb3e08f76e58510c78209091 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 18 Sep 2024 14:10:58 +0200
+Subject: [PATCH] tar/write.c: Support `sys/xattr.h`
+
+Synchronize the last use of `attr/xattr.h` to support using
+`sys/xattr.h` instead.  The former header is deprecated on GNU/Linux,
+and this replacement makes it possible to build libarchive without
+the `attr` package.
+---
+ tar/write.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tar/write.c b/tar/write.c
+index 1d1139f4c..43cd70233 100644
+--- a/tar/write.c
++++ b/tar/write.c
+@@ -32,7 +32,9 @@
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
+-#ifdef HAVE_ATTR_XATTR_H
++#if HAVE_SYS_XATTR_H
++#include <sys/xattr.h>
++#elif HAVE_ATTR_XATTR_H
+ #include <attr/xattr.h>
+ #endif
+ #ifdef HAVE_ERRNO_H