mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-fs/cifs-utils: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mm1ke@gentoo.org>
This commit is contained in:
@@ -1,22 +0,0 @@
|
||||
Fixed an inverted race condition when installing with MAKEOPTS="-j1"
|
||||
|
||||
jer found this:
|
||||
install-root_sbinPROGRAMS is called from install-data-am but
|
||||
install-exec-hook is called from install-exec-am
|
||||
|
||||
So moving the failing ln call into install-data-hook for now...
|
||||
|
||||
--- cifs-utils-6.12/Makefile.am
|
||||
+++ cifs-utils-6.12/Makefile.am
|
||||
@@ -117,10 +117,8 @@
|
||||
|
||||
SUBDIRS = contrib
|
||||
|
||||
-install-exec-hook: install-sbinPROGRAMS
|
||||
+install-data-hook: install-sbinPROGRAMS
|
||||
(cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
|
||||
-
|
||||
-install-data-hook:
|
||||
if CONFIG_MAN
|
||||
( cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
|
||||
endif
|
||||
@@ -1,80 +0,0 @@
|
||||
https://marc.info/?l=linux-cifs&m=165604639613381&w=2
|
||||
|
||||
From c267ecf6a1c2152e640897d30cc0e8f637a8ef76 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Fri, 24 Jun 2022 05:25:23 +0100
|
||||
Subject: [PATCH 1/2] getcifsacl, setcifsacl: add missing <linux/limits.h>
|
||||
include for XATTR_SIZE_MAX
|
||||
|
||||
Needed to build on musl. It only works on glibc because of transitive includes
|
||||
(which could break in future).
|
||||
|
||||
Example failure:
|
||||
```
|
||||
getcifsacl.c: In function 'getcifsacl':
|
||||
getcifsacl.c:429:24: error: 'XATTR_SIZE_MAX' undeclared (first use in this function)
|
||||
429 | if (bufsize >= XATTR_SIZE_MAX) {
|
||||
| ^~~~~~~~~~~~~~
|
||||
```
|
||||
|
||||
Bug: https://bugs.gentoo.org/842195
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
--- a/getcifsacl.c
|
||||
+++ b/getcifsacl.c
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
#include <ctype.h>
|
||||
+#include <linux/limits.h>
|
||||
#include <sys/xattr.h>
|
||||
#include "cifsacl.h"
|
||||
#include "idmap_plugin.h"
|
||||
--- a/setcifsacl.c
|
||||
+++ b/setcifsacl.c
|
||||
@@ -48,6 +48,7 @@
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
#include <ctype.h>
|
||||
+#include <linux/limits.h>
|
||||
#include <sys/xattr.h>
|
||||
|
||||
#include "cifsacl.h"
|
||||
From d1a36cc4caa541d1f0f9a3426a5202b680cf7ff8 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Fri, 24 Jun 2022 05:26:54 +0100
|
||||
Subject: [PATCH 2/2] getcifsacl, setcifsacl: add missing <endian.h> include
|
||||
for le32toh
|
||||
|
||||
Needed to fix build on musl libc. It only works by chance on glibc
|
||||
because of transitive includes (which could break at any time).
|
||||
|
||||
Example failure:
|
||||
```
|
||||
getcifsacl.c: In function 'print_ace':
|
||||
getcifsacl.c:284:16: warning: implicit declaration of function 'le16toh' [-Wimplicit-function-declaration]
|
||||
284 | size = le16toh(pace->size);
|
||||
| ^~~~~~~
|
||||
```
|
||||
|
||||
Bug: https://bugs.gentoo.org/842195
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
--- a/getcifsacl.c
|
||||
+++ b/getcifsacl.c
|
||||
@@ -23,6 +23,7 @@
|
||||
#include "config.h"
|
||||
#endif /* HAVE_CONFIG_H */
|
||||
|
||||
+#include <endian.h>
|
||||
#include <string.h>
|
||||
#include <getopt.h>
|
||||
#include <stdint.h>
|
||||
--- a/setcifsacl.c
|
||||
+++ b/setcifsacl.c
|
||||
@@ -38,6 +38,7 @@
|
||||
#include "config.h"
|
||||
#endif /* HAVE_CONFIG_H */
|
||||
|
||||
+#include <endian.h>
|
||||
#include <string.h>
|
||||
#include <getopt.h>
|
||||
#include <stdint.h>
|
||||
@@ -1,63 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
Don't clobber toolchain defaults.
|
||||
|
||||
https://bugs.gentoo.org/890278
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1,4 +1,4 @@
|
||||
-AM_CFLAGS = -Wall -Wextra -D_FORTIFY_SOURCE=2 $(PIE_CFLAGS) $(RELRO_CFLAGS)
|
||||
+AM_CFLAGS = -Wall -Wextra $(PIE_CFLAGS) $(RELRO_CFLAGS)
|
||||
ACLOCAL_AMFLAGS = -I aclocal
|
||||
|
||||
root_sbindir = $(ROOTSBINDIR)
|
||||
Reference in New Issue
Block a user