cifs-utils: Make automake treat /sbin as exec, not data
(cherry picked from commit 57dd75d12f9c4eb329d7c2268e28d86e9e44daec)
This commit is contained in:
parent
a058496567
commit
c11b0f5289
@ -0,0 +1,37 @@
|
||||
From 25d6552c7d8b9fe2ca9dbf85c74c9330e4dd7770 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Parks <danielrparks@ti.com>
|
||||
Date: Fri, 3 Jun 2022 15:34:59 -0500
|
||||
Subject: [PATCH] cifs-utils: Make automake treat /sbin as exec, not data
|
||||
|
||||
Otherwise, $(DESTDIR)/sbin doesn't get created until install-data on a
|
||||
-j1 build and install-exec-hook can fail because it might not exist.
|
||||
|
||||
Steps to reproduce this bug:
|
||||
$ autoreconf -i
|
||||
$ ./configure
|
||||
$ mkdir image
|
||||
$ make DESTDIR=image install -j1
|
||||
|
||||
Signed-off-by: Daniel Parks <danielrparks@ti.com>
|
||||
---
|
||||
Makefile.am | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index a15392d..1a22266 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1,8 +1,8 @@
|
||||
AM_CFLAGS = -Wall -Wextra -D_FORTIFY_SOURCE=2 $(PIE_CFLAGS) $(RELRO_CFLAGS)
|
||||
ACLOCAL_AMFLAGS = -I aclocal
|
||||
|
||||
-root_sbindir = $(ROOTSBINDIR)
|
||||
-root_sbin_PROGRAMS = mount.cifs
|
||||
+root_exec_sbindir = $(ROOTSBINDIR)
|
||||
+root_exec_sbin_PROGRAMS = mount.cifs
|
||||
mount_cifs_SOURCES = mount.cifs.c mtab.c resolve_host.c util.c
|
||||
mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) $(RT_LDADD)
|
||||
include_HEADERS = cifsidmap.h
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: cifs-utils
|
||||
Version: 7.0
|
||||
Release: 2
|
||||
Release: 3
|
||||
Summary: Utilities for doing and managing mounts of the Linux CIFS filesystem
|
||||
License: GPLv3+
|
||||
URL: http://linux-cifs.samba.org/cifs-utils/
|
||||
@ -13,6 +13,7 @@ Obsoletes: pam_cifscreds
|
||||
Requires: keyutils
|
||||
|
||||
Patch0: 0001-cifs.upcall-fix-UAF-in-get_cachename_from_process_en.patch
|
||||
Patch1: 0002-cifs-utils-Make-automake-treat-sbin-as-exec-not-data.patch
|
||||
|
||||
%description
|
||||
The in-kernel CIFS filesystem is generally the preferred method for mounting
|
||||
@ -77,6 +78,9 @@ install -m 644 contrib/request-key.d/cifs.spnego.conf %{buildroot}%{_sysconfdir}
|
||||
%{_mandir}/man8/*
|
||||
|
||||
%changelog
|
||||
* Fri Jun 21 2024 liuh <liuhuan01@kylinos.cn> - 7.0-3
|
||||
- sync patch from community
|
||||
|
||||
* Tue Apr 9 2024 liuh <liuhuan01@kylinos.cn> - 7.0-2
|
||||
- sync patch from community
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user