Skip to content

Commit 666e1f1

Browse files
[AUTOPATCHER-CORE] Bugfix: 56213770, 56248605, upgrade cifs-utils to 7.3 (#13116)
1 parent 4524ea4 commit 666e1f1

File tree

3 files changed

+22
-11
lines changed

3 files changed

+22
-11
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Signatures": {
3-
"cifs-utils-7.0.tar.bz2": "0defaab85bd3ea46ffc45ab41fb0d0ad54d05ae2cfaa7e503de86d4f12bc8161"
4-
}
2+
"Signatures": {
3+
"cifs-utils-7.3.tar.bz2": "c4e1eb5f4ad880d96e16d95a1cdbc7ec978ab51c5b6d8a20ae09dac638f36dd5"
4+
}
55
}

SPECS/cifs-utils/cifs-utils.spec

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: cifs client utils
22
Name: cifs-utils
3-
Version: 7.0
4-
Release: 2%{?dist}
3+
Version: 7.3
4+
Release: 1%{?dist}
55
License: GPLv3
66
Vendor: Microsoft Corporation
77
Distribution: Azure Linux
@@ -12,6 +12,7 @@ BuildRequires: keyutils-devel
1212
BuildRequires: libcap-ng-devel
1313
BuildRequires: libtalloc-devel
1414
BuildRequires: pam-devel
15+
BuildRequires: krb5-devel
1516
Requires: libcap-ng
1617

1718
%description
@@ -43,15 +44,19 @@ Provides header files needed for Cifs-Utils development.
4344

4445
%build
4546
autoreconf -fiv
46-
# Disabling 'cifsupcall' to not introduce a dependency on 'krb5'.
4747
%configure \
4848
--prefix=%{_prefix} \
49-
ROOTSBINDIR=%{_sbindir} \
50-
--disable-cifsupcall
49+
ROOTSBINDIR=%{_sbindir}
5150
%make_build
5251

5352
%install
54-
%make_install
53+
#%make_install
54+
rm -rf %{buildroot}
55+
make install DESTDIR=%{buildroot}
56+
mkdir -p %{buildroot}%{_sysconfdir}/%{name}
57+
mkdir -p %{buildroot}%{_sysconfdir}/request-key.d
58+
install -m 644 contrib/request-key.d/cifs.idmap.conf %{buildroot}%{_sysconfdir}/request-key.d
59+
install -m 644 contrib/request-key.d/cifs.spnego.conf %{buildroot}%{_sysconfdir}/request-key.d
5560

5661
%check
5762
make %{?_smp_mflags} check
@@ -64,6 +69,9 @@ make %{?_smp_mflags} check
6469
%{_bindir}/smbinfo
6570
%{_sbindir}/mount.cifs
6671
%{_sbindir}/mount.smb3
72+
%{_sbindir}/cifs.upcall
73+
%config(noreplace) %{_sysconfdir}/request-key.d/cifs.idmap.conf
74+
%config(noreplace) %{_sysconfdir}/request-key.d/cifs.spnego.conf
6775

6876
%files -n pam_cifscreds
6977
%{_libdir}/security/pam_cifscreds.so
@@ -73,6 +81,9 @@ make %{?_smp_mflags} check
7381
%{_includedir}/cifsidmap.h
7482

7583
%changelog
84+
* Wed Mar 26 2025 CBL-Mariner Servicing Account <[email protected]> - 7.3-1
85+
- Auto-upgrade to 7.3 - Bugfix: 56213770, 56248605
86+
7687
* Fri Feb 07 2025 Pawel Winogrodzki <[email protected]> - 7.0-2
7788
- Explicitly disable 'cifs-upcall'.
7889

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,8 +1697,8 @@
16971697
"type": "other",
16981698
"other": {
16991699
"name": "cifs-utils",
1700-
"version": "7.0",
1701-
"downloadUrl": "https://download.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-7.0.tar.bz2"
1700+
"version": "7.3",
1701+
"downloadUrl": "https://download.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-7.3.tar.bz2"
17021702
}
17031703
}
17041704
},

0 commit comments

Comments
 (0)