mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 12:16:41 +02:00
net-fs/cifs-utils: Sync with Gentoo
It's from Gentoo commit 59b53bbd1dd1f58636eec45ef5d12f563f40b9ca.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
8c224c8270
commit
7608191132
@ -1,2 +1,3 @@
|
||||
DIST cifs-utils-7.0.tar.bz2 418638 BLAKE2B 514d35f243d0ef7b866068a9a53a4b1704d2856d491d56aa469e8e3919b4030cb920a7f60d08851b0a23d28a020d1ddf7daa8b9ac412f1567a0a60d2f6ee6774 SHA512 4c57741af0c4567a78f352c73caca998881666a5ed36536275cfa775efd66ff1a44ebe539a8ed96c409c5b08a1378266964ce667a27e9fc7f2d43999c63dd0eb
|
||||
DIST cifs-utils-7.3.tar.bz2 423716 BLAKE2B 59cf39ed2bf14d1fff54b6ad3b2fa410dd20b7e49ff9e87a95521d7e72cd4c5fe506f7026db2f42c53f4f79ed8f2492e3aa98b6349b000c7e2457cfea695c94d SHA512 7e341f5f5f53c3d533350cbd58983fddc428921ef8f8da6dea7b58884786b778fcc24ec23d0ebafc944ca54b9978213425fa6270e5c28934efb3383c0b66745a
|
||||
DIST cifs-utils-7.4.tar.bz2 389033 BLAKE2B 57e03bb050b2345229dd4e0de22ac7baae7dcf080fba54c1dc339d8ecc6e60254e30feaa160568f8465698769ee513447c77de3bf8b0cd9c234ec4590e8e4270 SHA512 36fb64ed531e983752be243be488392ba52c3797ac638147a75998b8965448009e95d7ccda187c7d50d753b0ddb87a464a83044064b099d49fffe03a0b6ba739
|
||||
|
||||
@ -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() {
|
||||
|
||||
@ -44,6 +44,7 @@ DOCS="doc/linux-cifs-client-guide.odt"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-7.3-no-clobber-fortify-source.patch"
|
||||
"${FILESDIR}/${PN}-7.0-musl.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
|
||||
144
sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-7.4.ebuild
vendored
Normal file
144
sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-7.4.ebuild
vendored
Normal file
@ -0,0 +1,144 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
|
||||
inherit autotools bash-completion-r1 flag-o-matic linux-info pam python-single-r1
|
||||
|
||||
DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
|
||||
HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils https://git.samba.org/cifs-utils.git/?p=cifs-utils.git"
|
||||
SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
|
||||
IUSE="+acl +ads +caps creds pam +python systemd"
|
||||
|
||||
RDEPEND="
|
||||
sys-libs/talloc
|
||||
ads? (
|
||||
sys-apps/keyutils:=
|
||||
virtual/krb5
|
||||
)
|
||||
caps? ( sys-libs/libcap-ng )
|
||||
creds? ( sys-apps/keyutils:= )
|
||||
pam? (
|
||||
sys-apps/keyutils:=
|
||||
sys-libs/pam
|
||||
)
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="dev-python/docutils"
|
||||
PDEPEND="
|
||||
acl? ( >=net-fs/samba-4.0.0_alpha1 )
|
||||
"
|
||||
|
||||
REQUIRED_USE="
|
||||
python? ( ${PYTHON_REQUIRED_USE} )
|
||||
"
|
||||
|
||||
DOCS="doc/linux-cifs-client-guide.odt"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-7.3-no-clobber-fortify-source.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
linux-info_pkg_setup
|
||||
|
||||
if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
|
||||
ewarn "You must enable CIFS support in your kernel config, "
|
||||
ewarn "to be able to mount samba shares. You can find it at"
|
||||
ewarn
|
||||
ewarn " File systems"
|
||||
ewarn " Network File Systems"
|
||||
ewarn " CIFS support"
|
||||
ewarn
|
||||
ewarn "and recompile your kernel ..."
|
||||
fi
|
||||
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if has_version app-crypt/heimdal ; then
|
||||
# bug #612584
|
||||
eapply "${FILESDIR}/${PN}-6.7-heimdal.patch"
|
||||
fi
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# bug #927809
|
||||
filter-flags -fno-semantic-interposition
|
||||
|
||||
local myeconfargs=(
|
||||
--enable-man
|
||||
--enable-smbinfo
|
||||
$(use_enable acl cifsacl cifsidmap)
|
||||
$(use_enable ads cifsupcall)
|
||||
$(use_with caps libcap)
|
||||
$(use_with caps libcap-ng)
|
||||
$(use_enable creds cifscreds)
|
||||
$(use_enable pam)
|
||||
$(use_with pam pamdir $(getpam_mod_dir))
|
||||
$(use_enable python pythontools)
|
||||
# mount.cifs can get passwords from systemd
|
||||
$(use_enable systemd)
|
||||
)
|
||||
|
||||
ROOTSBINDIR="${EPREFIX}"/sbin econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# remove empty directories
|
||||
find "${ED}" -type d -empty -delete || die
|
||||
|
||||
if use acl ; then
|
||||
dodir /etc/cifs-utils
|
||||
dosym ../../usr/$(get_libdir)/cifs-utils/idmapwb.so \
|
||||
/etc/cifs-utils/idmap-plugin
|
||||
dodir /etc/request-key.d
|
||||
echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \
|
||||
> "${ED}/etc/request-key.d/cifs.idmap.conf"
|
||||
fi
|
||||
|
||||
if use ads ; then
|
||||
dodir /etc/request-key.d
|
||||
echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \
|
||||
> "${ED}/etc/request-key.d/cifs.upcall.conf"
|
||||
echo 'create cifs.spnego * * /usr/sbin/cifs.upcall %k' \
|
||||
> "${ED}/etc/request-key.d/cifs.spnego.conf"
|
||||
fi
|
||||
|
||||
dobashcomp bash-completion/smbinfo
|
||||
use python && python_fix_shebang "${ED}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Inform about set-user-ID bit of mount.cifs
|
||||
ewarn "setuid use flag was dropped due to multiple security implications"
|
||||
ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
|
||||
ewarn "You are free to set setuid flags by yourself"
|
||||
|
||||
# Inform about upcall usage
|
||||
if use acl ; then
|
||||
einfo "The cifs.idmap utility has been enabled by creating the"
|
||||
einfo "configuration file /etc/request-key.d/cifs.idmap.conf"
|
||||
einfo "This enables you to get and set CIFS acls."
|
||||
fi
|
||||
|
||||
if use ads ; then
|
||||
einfo "The cifs.upcall utility has been enabled by creating the"
|
||||
einfo "configuration file /etc/request-key.d/cifs.upcall.conf"
|
||||
einfo "This enables you to mount DFS shares."
|
||||
fi
|
||||
}
|
||||
63
sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/files/cifs-utils-7.0-musl.patch
vendored
Normal file
63
sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/files/cifs-utils-7.0-musl.patch
vendored
Normal file
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user