diff options
Diffstat (limited to 'net-fs/cifs-utils')
| -rw-r--r-- | net-fs/cifs-utils/Manifest | 5 | ||||
| -rw-r--r-- | net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild | 3 | ||||
| -rw-r--r-- | net-fs/cifs-utils/cifs-utils-7.3.ebuild | 2 | ||||
| -rw-r--r-- | net-fs/cifs-utils/files/cifs-utils-7.0-musl.patch | 63 |
4 files changed, 69 insertions, 4 deletions
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest index 094c5e3e15af..c3c277dc3eaa 100644 --- a/net-fs/cifs-utils/Manifest +++ b/net-fs/cifs-utils/Manifest @@ -1,10 +1,11 @@ AUX cifs-utils-6.12-ln_in_destdir.patch 629 BLAKE2B aa901b00c41a58ae21d948b3eece79914dc78782fcd49afc27ba8d7fa061f8aec43d187ce1302d67b5e5fc2cce113906545b9ae9920704f29ad3758a71079994 SHA512 354e33c91b0678e08ba9dabd989a5afdb2e558fa71dc427b283f9b987f94908d9b696c95a7e608e13f26497a52e7e8bf973290a84b2024ac9bc817ba512adf26 AUX cifs-utils-6.15-musl.patch 2215 BLAKE2B 251be73f341d4573aa509915e364680fc6d85ed720ad5682812cd6ba418a64bd7c397bd742cd999cea52fda0e07d668e796383f034c5ccb1639764f93d050e9e SHA512 902deb413bbc7f34d9933fcae9c48c73bb2fb2aaca22b5ef3efd394bb2d550456548c08087db41a96a60f3e1ed945127ba242dc980b286dbf3abad1b0694c605 AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672b37a0e8ac0b999aa7aaf180ac051f6745ee68373948b266ad359e1ba3b58552eda6314b5a4339673bd04656ab6090 SHA512 e3364e05fba6aff57ea2f09b530692f4f5ec95213e91794388fff9382d210db9bacb28dae1440d3b35a570c0b3bc21084a067e0ce8333febd5246c52aa9260ae +AUX cifs-utils-7.0-musl.patch 1662 BLAKE2B bc288651e15f91d28d5806f5aa60bfdf53df41af26fe87238b9b24d5fbd2655fcedf534902f97ccfd18fbb4ce93b2168baa50e0cb3ddeb9aecc995a470b2af5d SHA512 83a2dfd488e3d3abaa5ac7ae0a634a1ee0495d05af4a61d3d9f4c0985df97bf591ff43bd61d77c694c0717fce6bd99f0a81013638d30c305c2d2b07645a1998e AUX cifs-utils-7.0-no-clobber-fortify-source.patch 315 BLAKE2B e67a4ca264bbc4372b8a80b1da562ec31b6869c5dae065edc9e37a127de50e08e588bdcce1a5a1505df9b6bc128aee3bd34fd991a5330ae13e93880345a7a0d1 SHA512 75b729fb09df77ec77d2a028f15acbaea5e7ccec185dad72789d13c3dd0b8b48f6654e2f28b7f22f2117cf0b60d2b869a5c4f554d8d3ed4e83a0d3bd5e8abe40 AUX cifs-utils-7.3-no-clobber-fortify-source.patch 320 BLAKE2B a82b16c594fa23cce107c28451a3263ca25a4b995e229f316c3808c6f69d8f8a8f56d1e973fe77a926fdebb9fe4669c6f0686d35ba2025f5a0a5cf4fe6bf688b SHA512 1d3d65d0378017d4c397f1fcb0e8cf86733909fc079d020d04b7b677164b600dd974e9ad72ed6f03286386ee8ee304532216a0361ec44e65da96b577cd03c294 DIST cifs-utils-7.0.tar.bz2 418638 BLAKE2B 514d35f243d0ef7b866068a9a53a4b1704d2856d491d56aa469e8e3919b4030cb920a7f60d08851b0a23d28a020d1ddf7daa8b9ac412f1567a0a60d2f6ee6774 SHA512 4c57741af0c4567a78f352c73caca998881666a5ed36536275cfa775efd66ff1a44ebe539a8ed96c409c5b08a1378266964ce667a27e9fc7f2d43999c63dd0eb DIST cifs-utils-7.3.tar.bz2 423716 BLAKE2B 59cf39ed2bf14d1fff54b6ad3b2fa410dd20b7e49ff9e87a95521d7e72cd4c5fe506f7026db2f42c53f4f79ed8f2492e3aa98b6349b000c7e2457cfea695c94d SHA512 7e341f5f5f53c3d533350cbd58983fddc428921ef8f8da6dea7b58884786b778fcc24ec23d0ebafc944ca54b9978213425fa6270e5c28934efb3383c0b66745a -EBUILD cifs-utils-7.0-r1.ebuild 3714 BLAKE2B 5747e02c3513c2924d4a80e3832c8ed3cec70184d5012d03a8e305ba767db8cc85c18fe7ff1541445ae479e54128f9c3ace835f1d6a8a9fd0bdf408d7f4f5200 SHA512 fcba21b7a960fae167c9df5d8b8e9bc446ac185704125768e0b5d4446b441538348703b9cc94128dfa3925f4173717149ea4f7e12edcc6d387b45f5e231debf7 -EBUILD cifs-utils-7.3.ebuild 3695 BLAKE2B 8aec3d8913a011ba78e53e7190c78ab8ce9a329c822fae146cdaa3586619582c05948cb6c3e64713971c34de46ced6f77d6dcca3a1d6f57067e74b7391763c38 SHA512 8cd8553a47192cd9760e28b8601c7b84b3d6b919a50c5f24676d0aa71a7830073d00721df4d05c46d6a6d6a8d4ee6e6a3e4d5c76c0ba9b0546ec97afbfed48ee +EBUILD cifs-utils-7.0-r1.ebuild 3750 BLAKE2B c1e15b876f4c8b3d0a0709909d7371b6822591aa992b765b1f20b474a5c6a5acdefc8e078db57ba5df1e50570776e40f993ee6b6a0c1c2d026750da7606770d6 SHA512 eb715ab042a123bb1e7bde82d9f2354ba339f172b66808ba41272fa5ec85423dd220d54e6c87bb354d805f044f442721212ab0309062a983adaa7617c1fef24b +EBUILD cifs-utils-7.3.ebuild 3671 BLAKE2B 37c1d88abae01a6cdda5f8af84108bc614e8cfbd7a9c1119238863abce0c060b1b87641a44ef765f1ccfce1f4bd07f0504e3ca6a753885991f39f135361fe7e2 SHA512 123f44b592ddcbf63c0ceb65b8e7e6c4e5733d1c138740de27bb90357364aa1fabeda4f2bd9c7f0ad2216790675a14c18ae9559171a86762098cc39898ca1108 MISC metadata.xml 1052 BLAKE2B 58ff7162bfc8d4fa545f663a484a105fcbd52471e187b4b7f895b7906dfd5f87723927ef2cfaabd784026c5af4508b65b23921dac27e580671b318f3d16ce470 SHA512 74fd58db42397da01aedfeddd70c8a2552533c95a63e58c68a6dfbb22b04b86aa0321f23a9ecfebbf0896a3a06921ef7b583d4d246edefa65bca8a10c0ea4a89 diff --git a/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild b/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild index 6c722804a3b5..427fc00cfa1f 100644 --- a/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild +++ b/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -46,6 +46,7 @@ PATCHES=( "${FILESDIR}/${PN}-6.12-ln_in_destdir.patch" #766594 "${FILESDIR}/${PN}-6.15-musl.patch" "${FILESDIR}/${PN}-7.0-no-clobber-fortify-source.patch" + "${FILESDIR}/${PN}-7.0-musl.patch" ) pkg_setup() { diff --git a/net-fs/cifs-utils/cifs-utils-7.3.ebuild b/net-fs/cifs-utils/cifs-utils-7.3.ebuild index c4340f6f5cc2..c46b5251d347 100644 --- a/net-fs/cifs-utils/cifs-utils-7.3.ebuild +++ b/net-fs/cifs-utils/cifs-utils-7.3.ebuild @@ -43,8 +43,8 @@ REQUIRED_USE=" DOCS="doc/linux-cifs-client-guide.odt" PATCHES=( - "${FILESDIR}/${PN}-6.12-ln_in_destdir.patch" # bug #766594 "${FILESDIR}/${PN}-7.3-no-clobber-fortify-source.patch" + "${FILESDIR}/${PN}-7.0-musl.patch" ) pkg_setup() { diff --git a/net-fs/cifs-utils/files/cifs-utils-7.0-musl.patch b/net-fs/cifs-utils/files/cifs-utils-7.0-musl.patch new file mode 100644 index 000000000000..cca3a9366049 --- /dev/null +++ b/net-fs/cifs-utils/files/cifs-utils-7.0-musl.patch @@ -0,0 +1,63 @@ +https://lore.kernel.org/linux-cifs/CALMA0xaVdk3qwkb-92QqF2+6z+=oxbBWDR1hYEoE2WUc7jVGkw@mail.gmail.com/T/#u + +From abd3d9a2d4f8a5dc4d90daddc7cf0c62d954f03a Mon Sep 17 00:00:00 2001 +From: "Z. Liu" <zhixu.liu@gmail.com> +Date: Fri, 2 May 2025 23:08:41 +0800 +Subject: [PATCH] getcifsacl, setcifsacl: use <libgen.h> for basename + +basename() is defined in <libgen.h> only in musl, while glibc defines it +in <string.h> too, which is not standard behavior. + +Signed-off-by: Z. Liu <zhixu.liu@gmail.com> + +diff --git a/getcifsacl.c b/getcifsacl.c +index 97471e9..6c6356f 100644 +--- a/getcifsacl.c ++++ b/getcifsacl.c +@@ -33,6 +33,7 @@ + #include <stdlib.h> + #include <stddef.h> + #include <errno.h> ++#include <libgen.h> + #include <limits.h> + #include <ctype.h> + #include <linux/limits.h> +diff --git a/setcifsacl.c b/setcifsacl.c +index b199118..3cb603c 100644 +--- a/setcifsacl.c ++++ b/setcifsacl.c +@@ -47,6 +47,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <errno.h> ++#include <libgen.h> + #include <limits.h> + #include <ctype.h> + #include <linux/limits.h> +-- +2.45.2 + +From ae644b56a4446f520a75217f9288775e127ab2c8 Mon Sep 17 00:00:00 2001 +From: "Z. Liu" <zhixu.liu@gmail.com> +Date: Tue, 13 May 2025 07:31:46 +0800 +Subject: [PATCH] cifscreds: use <libgen.h> for basename + +fix another implicit declaration of function 'basename' in musl + +Signed-off-by: Z. Liu <zhixu.liu@gmail.com> + +diff --git a/cifscreds.c b/cifscreds.c +index f552bc8..295059f 100644 +--- a/cifscreds.c ++++ b/cifscreds.c +@@ -29,6 +29,7 @@ + #include <keyutils.h> + #include <getopt.h> + #include <errno.h> ++#include <libgen.h> + #include "cifskey.h" + #include "mount.h" + #include "resolve_host.h" +-- +2.45.2 + |