From c411f65f26582f4c75d2edbf4fa90a708474ace3 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 5 Aug 2022 08:07:19 +0100
Subject: gentoo auto-resync : 05:08:2022 - 08:07:19

---
 sys-apps/Manifest.gz                               | Bin 48176 -> 48180 bytes
 sys-apps/hdparm/Manifest                           |   3 ++-
 sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch |  27 +++++++++++++++++++++
 sys-apps/hdparm/hdparm-9.64.ebuild                 |   1 +
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch

(limited to 'sys-apps')

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0d012fe910fa..5579bc69132b 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 64cb9b3f715c..23fc91b831a1 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,8 +1,9 @@
 AUX hdparm-9.60-build.patch 1153 BLAKE2B c3eb037e0576a066fe2a2c6e00406dcfd3e99e23b468a4fbc0f5ac545d8a1b214168769da94271242b2119d480e34dbcaa734b636231021c03e2a57f585426cc SHA512 d3f76575074806c7981aacdf7a5a4e1e97a2afbcd09e8821cf1c064f8960b397e2ccdd534fb95b91f43f35c481f94463fb1fe485189436bd5de8178823d7c9eb
+AUX hdparm-9.64-glibc-2.36.patch 778 BLAKE2B 4d85e81e38954a0262e2fa9b5601a2fb7c049c2bd9f8ef359fe6bf2fed04c749aa6556ff154c035cda31903b2079aeaec5a29865d15454e5eb903750d54d6f94 SHA512 628052e920c14902db3013d4c7172bfd2970b3fd102f4433d964a37386d8a53ffd58884de4f71f6347f0a287fa005ac8305026650724959b54cac571e113e27a
 AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c1d9e3ba6fe77e013d4044197751696988c5ac7c96e38e9737bc3bd2e270274c94db85228d5c2eb98 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
 DIST hdparm-9.63.tar.gz 140252 BLAKE2B 41ee3dda11f17ec9c125b7d680f07ca2d88c3692e2436b8d2550dbd58546b1dde8e61cdf5312c5b09d687dad81826bd848c8eabcb3e01ab09ac6cfb082699238 SHA512 1d09dc2c79c31f45fa242dd5bf259e84281d1464e49ada9fd53bb6d58cb0458046e534a93f9d6de18478ca5db50b6d36ecbe5b784c0c681a1db29f15fadd525c
 DIST hdparm-9.64.tar.gz 140307 BLAKE2B 0196f3ccec4005c542b834d8426cc6f64694783da3d4a064e898e25d17aab3aa0d9621276607169f2104c9a9804f9020554d836ded9efb16367a8ac4c9c9b146 SHA512 c561825143d8872cc2940bd6ba72162f91792bd63b6a8511058e79cc96feb6a4a9d22275581ef2eefab64a4035587b3a63175ccc58fa46f1059b4680d9d58ec4
 EBUILD hdparm-9.63.ebuild 994 BLAKE2B d018ce0b5ea5343f6cfa431973e1ed2f421fd52747b0a6415360ff18a7c951e7f2b218a271bd8631a55ed333753fcf3647fdb2491d161e648a6981a6f8c2c5dc SHA512 65cde99243246548e77d69ab2a72af7ac77070dd9c5aedbbb77de05ccc79dc681072959c21872f26c3f5e70d8414e0e64b9fc3abe70c2d54fc468d38970ef771
-EBUILD hdparm-9.64.ebuild 1004 BLAKE2B a6853297a8289a130d8adf0e99dfea2222facb232383a4281906b4047efd48f55dde7b6a97a2a1533ccbb58cd11d3a162493d7547f4f7dae50b9f335b9509057 SHA512 c4868f36229233a161f9864da477104b79036b9de36a4dbdd1eb0db6bf3ef802b1f7582b02da4fce4ed81eac4796b0b43b3d05fd978fb98b12e6b39b1d8b59a4
+EBUILD hdparm-9.64.ebuild 1047 BLAKE2B 9b2c1d90911030c8e34c7090af74e441e5894849b3208a9fa3edb896b36bb404746ee857af088a16d831dd83b6fdcefd5a75fc1ceb65f24da744630b9987ed7f SHA512 9f0500c2d948f08190129f4840871a4de4fa4541d2fdc7de60831f0fab33f5dd3c9d165e8d349958b71ac53bfe0e0cfb6ae10f3d418b7803a2444165008d19db
 MISC metadata.xml 334 BLAKE2B 4401fa870e66675b64077c7dc271c1775a3b7148a4c720ac670222d0f61ce634507725e77e5ef2b9efb6d363ca23dc2a884645ab630ffccc8e737b7139e23d47 SHA512 a71c8c705afd12b3609542d13b18697e9c4626c0c41006ccbdacd248c1c621b0fa93a522561494120c0be181d091fc27e466a25af3be25b4f3b4cc14ec5e652a
diff --git a/sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch b/sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch
new file mode 100644
index 000000000000..c235b0f3941c
--- /dev/null
+++ b/sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/863671
+https://sourceforge.net/p/hdparm/patches/52/
+
+From c8fc52968f9e97d29ccf6deb348ec02627d74235 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Jul 2022 13:00:40 -0700
+Subject: [PATCH] hdparm: Remove unused linux/fs.h header
+
+this helps fixing builds with glibc 2.36 where mount.h conflits now with
+kernel mount.h which is included indirectly by linux/fs.h see [1] for
+details
+
+[1] https://sourceware.org/glibc/wiki/Release/2.36
+
+Upstream-Status: Submitted []
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/hdparm.c
++++ b/hdparm.c
+@@ -25,7 +25,6 @@
+ #include <sys/mman.h>
+ #include <sys/user.h>
+ #include <linux/types.h>
+-#include <linux/fs.h>
+ #include <linux/major.h>
+ #include <endian.h>
+ #include <asm/byteorder.h>
+
diff --git a/sys-apps/hdparm/hdparm-9.64.ebuild b/sys-apps/hdparm/hdparm-9.64.ebuild
index 16d39cbe5836..066375abdd74 100644
--- a/sys-apps/hdparm/hdparm-9.64.ebuild
+++ b/sys-apps/hdparm/hdparm-9.64.ebuild
@@ -17,6 +17,7 @@ IUSE="static"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9.60-build.patch
+	"${FILESDIR}"/${PN}-9.64-glibc-2.36.patch
 )
 
 src_prepare() {
-- 
cgit v1.2.3