Skip to content

Commit d739a5b

Browse files
jslobodzianjslobodzian
committed
Merge branch '1.0-dev' into 1.0
2 parents c858b3d + 3495f1f commit d739a5b

File tree

102 files changed

+2395
-626
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+2395
-626
lines changed

‎.github/workflows/cgmanifest.json

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
2-
"Registrations": [
3-
{
4-
"Component": {
5-
"Type": "git",
6-
"Git": {
7-
"RepositoryUrl": "https://github.com/rpm-software-management/spec-cleaner",
8-
"CommitHash": "f24cd83e5e2775b061696d4fd7fcf47f63514b50"
9-
}
2+
"$schema": "https://json.schemastore.org/component-detection-manifest.json",
3+
"Registrations": [
4+
{
5+
"Component": {
6+
"Type": "git",
7+
"Git": {
8+
"RepositoryUrl": "https://github.com/rpm-software-management/spec-cleaner",
9+
"CommitHash": "f24cd83e5e2775b061696d4fd7fcf47f63514b50"
1010
}
1111
}
12-
],
13-
"Version": 1
14-
}
12+
}
13+
],
14+
"Version": 1
15+
}

‎SPECS-SIGNED/kernel-signed/kernel-signed.spec

+11-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
12-
Version: 5.10.131.1
13-
Release: 1%{?dist}
12+
Version: 5.10.134.1
13+
Release: 2%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Mariner
@@ -147,6 +147,15 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
147147
%endif
148148

149149
%changelog
150+
* Thu Sep 01 2022 Chris Co <[email protected]> - 5.10.134.1-2
151+
- Bump release number to match kernel release
152+
153+
* Tue Aug 23 2022 CBL-Mariner Servicing Account <[email protected]> - 5.10.134.1-1
154+
- Upgrade to 5.10.134.1
155+
156+
* Wed Aug 17 2022 Rachel Menge <[email protected]> - 5.10.133.1-1
157+
- Update source to 5.10.133.1
158+
150159
* Sun Jul 24 2022 Rachel Menge <[email protected]> - 5.10.131.1-1
151160
- Update source to 5.10.131.1
152161

‎SPECS/audit/audit.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Summary: Kernel Audit Tool
55
Name: audit
66
Version: 3.0
7-
Release: 16%{?dist}
7+
Release: 17%{?dist}
88
Source0: https://people.redhat.com/sgrubb/audit/%{name}-%{version}-alpha8.tar.gz
99
Patch0: refuse-manual-stop.patch
1010
License: GPLv2+
@@ -166,6 +166,9 @@ make %{?_smp_mflags} check
166166
%{python3_sitelib}/*
167167

168168
%changelog
169+
* Wed Aug 17 2022 Olivia Crain <[email protected]> - 3.0-17
170+
- Bump to rebuild with golang 1.18.5-1
171+
169172
* Tue Jun 07 2022 Andrew Phelps <[email protected]> - 3.0-16
170173
- Bumping release to rebuild with golang 1.18.3
171174
* Fri Apr 29 2022 chalamalasetty <[email protected]> - 3.0-15

‎SPECS/blobfuse/blobfuse.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: FUSE adapter - Azure Storage Blobs
22
Name: blobfuse
33
Version: 1.3.6
4-
Release: 10%{?dist}
4+
Release: 11%{?dist}
55
License: MIT
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
4747
%{_bindir}/blobfuse
4848

4949
%changelog
50+
* Wed Aug 17 2022 Olivia Crain <[email protected]> - 1.3.6-11
51+
- Bump to rebuild with golang 1.18.5-1
52+
5053
* Tue Jun 07 2022 Andrew Phelps <[email protected]> - 1.3.6-10
5154
- Bumping release to rebuild with golang 1.18.3
5255

‎SPECS/ceph/ceph.signatures.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"ceph-16.2.0.tar.gz": "dfeee542536607220dc2ca49f47c41127c8562dea234a886625e0f7ee1524904"
3+
"ceph-16.2.10.tar.gz": "df8dbe9d45779825fb4097d94a72847e7405089c0999541e62779f2705bf02d5"
44
}
55
}

‎SPECS/ceph/ceph.spec

+12-7
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
Summary: User space components of the Ceph file system
1515
Name: ceph
16-
Version: 16.2.0
17-
Release: 4%{?dist}
16+
Version: 16.2.10
17+
Release: 1%{?dist}
1818
License: LGPLv2 and LGPLv3 and CC-BY-SA and GPLv2 and Boost and BSD and MIT and Public Domain and GPLv3 and ASL-2.0
1919
URL: https://ceph.io/
2020
Vendor: Microsoft Corporation
@@ -951,7 +951,7 @@ chmod 0600 %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
951951
install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
952952

953953
# sudoers.d
954-
install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
954+
install -m 0600 -D sudoers.d/ceph-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-smartctl
955955

956956
#set up placeholder directories
957957
mkdir -p %{buildroot}%{_sysconfdir}/ceph
@@ -973,7 +973,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
973973
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
974974

975975
# prometheus alerts
976-
install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildroot}/etc/prometheus/ceph/ceph_default_alerts.yml
976+
install -m 644 -D monitoring/ceph-mixin/prometheus_alerts.yml %{buildroot}/etc/prometheus/ceph/ceph_default_alerts.yml
977977

978978
%clean
979979
rm -rf %{buildroot}
@@ -1031,6 +1031,7 @@ rm -rf %{buildroot}
10311031
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-mgr
10321032
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd
10331033
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
1034+
%{_sysconfdir}/sudoers.d/ceph-smartctl
10341035

10351036
%post base
10361037
/sbin/ldconfig
@@ -1252,6 +1253,7 @@ fi
12521253
%{_datadir}/ceph/mgr/localpool
12531254
%{_datadir}/ceph/mgr/mds_autoscaler
12541255
%{_datadir}/ceph/mgr/mirroring
1256+
%{_datadir}/ceph/mgr/nfs
12551257
%{_datadir}/ceph/mgr/orchestrator
12561258
%{_datadir}/ceph/mgr/osd_perf_query
12571259
%{_datadir}/ceph/mgr/osd_support
@@ -1475,7 +1477,6 @@ fi
14751477
%{_unitdir}/[email protected]
14761478
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/osd
14771479
%config(noreplace) %{_sysctldir}/90-ceph-osd.conf
1478-
%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
14791480

14801481
%post osd
14811482
%systemd_post ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target
@@ -1793,16 +1794,20 @@ exit 0
17931794
%endif
17941795

17951796
%files grafana-dashboards
1797+
%attr(0755,root,root) %dir %{_sysconfdir}/grafana
1798+
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards
17961799
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
17971800
%config %{_sysconfdir}/grafana/dashboards/ceph-dashboard/*
1798-
%doc monitoring/grafana/dashboards/README
1799-
%doc monitoring/grafana/README.md
18001801

18011802
%files prometheus-alerts
18021803
%attr(0755,root,root) %dir %{_sysconfdir}/prometheus/ceph
18031804
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
18041805

18051806
%changelog
1807+
* Tue Sep 06 2022 Suresh Babu Chalamalasetty <[email protected]> 16.2.10-1
1808+
- Upgrade to 16.2.10 to fix CVE-2022-0670.
1809+
- Update SPEC file to sync with latest version changes.
1810+
18061811
* Thu Feb 17 2022 Andrew Phelps <[email protected]> 16.2.0-4
18071812
- Use _topdir instead of hard-coded value /usr/src/mariner
18081813

‎SPECS/clamav/clamav.spec

+49-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: Open source antivirus engine
44
Name: clamav
55
Version: 0.103.6
6-
Release: 1%{?dist}
6+
Release: 2%{?dist}
77
License: ASL 2.0 AND BSD AND bzip2-1.0.4 AND GPLv2 AND LGPLv2+ AND MIT AND Public Domain AND UnRar
88
Vendor: Microsoft Corporation
99
Distribution: Mariner
@@ -14,11 +14,14 @@ Source0: %{url}/downloads/production/%{name}-%{version}.tar.gz
1414
BuildRequires: flex-devel
1515
BuildRequires: libtool
1616
BuildRequires: openssl-devel
17+
BuildRequires: sed
1718
# Required to produce systemd files
1819
BuildRequires: systemd-devel
1920
BuildRequires: zlib-devel
2021
Requires: openssl
2122
Requires: zlib
23+
Requires(pre): shadow-utils
24+
Requires(postun): shadow-utils
2225

2326
%description
2427
ClamAV® is an open source (GPL) anti-virus engine used in a variety of situations
@@ -30,24 +33,58 @@ line scanner and an advanced tool for automatic database updates.
3033
%setup -q
3134

3235
%build
33-
%configure
36+
%configure \
37+
--with-dbdir=%{_sharedstatedir}/clamav
3438

3539
make %{?_smp_mflags}
3640

3741
%install
3842
make install DESTDIR=%{buildroot}
43+
mkdir -p %{buildroot}%{_sharedstatedir}/clamav
44+
45+
### freshclam config processing (from Fedora)
46+
sed -ri \
47+
-e 's!^Example!#Example!' \
48+
-e 's!^#?(UpdateLogFile )!#\1!g;' %{buildroot}%{_sysconfdir}/freshclam.conf.sample
49+
50+
mv %{buildroot}%{_sysconfdir}/freshclam.conf{.sample,}
51+
# Can contain HTTPProxyPassword (bugz#1733112)
52+
chmod 600 %{buildroot}%{_sysconfdir}/freshclam.conf
3953

4054
%check
4155
make %{?_smp_mflags} check
4256

43-
%post -p /sbin/ldconfig
44-
%postun -p /sbin/ldconfig
57+
%pre
58+
if ! getent group clamav >/dev/null; then
59+
groupadd -r clamav
60+
fi
61+
if ! getent passwd clamav >/dev/null; then
62+
useradd -g clamav -d %{_sharedstatedir}/clamav\
63+
-s /bin/false -M -r clamav
64+
fi
65+
66+
%post
67+
/sbin/ldconfig
68+
touch %{_var}/log/freshclam.log
69+
chown clamav:clamav %{_var}/log/freshclam.log
70+
chmod 600 %{_var}/log/freshclam.log
71+
72+
%postun
73+
/sbin/ldconfig
74+
if getent passwd clamav >/dev/null; then
75+
userdel clamav
76+
fi
77+
if getent group clamav >/dev/null; then
78+
groupdel clamav
79+
fi
80+
rm -f %{_var}/log/freshclam.log
4581

4682
%files
4783
%defattr(-,root,root)
4884
%license COPYING COPYING.bzip2 COPYING.file COPYING.getopt COPYING.LGPL COPYING.llvm COPYING.lzma COPYING.pcre COPYING.regex COPYING.unrar COPYING.YARA COPYING.zlib
4985
%{_bindir}/*
5086
%{_sysconfdir}/*.sample
87+
%{_sysconfdir}/freshclam.conf
5188
%{_includedir}/*.h
5289
%{_libdir}/*.la
5390
%{_libdir}/*.so
@@ -58,8 +95,16 @@ make %{?_smp_mflags} check
5895
%{_mandir}/man1/*
5996
%{_mandir}/man5/*
6097
%{_mandir}/man8/*
98+
%dir %attr(-,clamav,clamav) %{_sharedstatedir}/clamav
99+
%ghost %attr(-,clamav,clamav) %{_var}/log/freshclam.log
61100

62101
%changelog
102+
*Fri Jul 22 2022 Olivia Crain <[email protected]> - 0.103.6-2
103+
- Fix freshclam DB download (backport of Tom Fay's 2.0 changes)
104+
- Create/delete clamav user and group on preinstall/postuninstall
105+
- Move database directory to %%{_sharedstatedir} from %%{_datadir}
106+
- Give ownership of %%{_sharedstatedir}/clamav, %%{_var}/log/freshclam.log to clamav user
107+
63108
* Tue May 31 2022 Olivia Crain <[email protected]> - 0.103.6-1
64109
- Upgrade to latest LTS patch to fix CVE-2022-20770, CVE-2022-20771,
65110
CVE-2022-20785, CVE-2022-20792, CVE-2022-20796

‎SPECS/cni/cni.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: Container Network Interface (CNI) plugins
44
Name: cni
55
Version: 0.9.1
6-
Release: 7%{?dist}
6+
Release: 8%{?dist}
77
License: ASL 2.0
88
URL: https://github.com/containernetworking/plugins
99
#Source0: https://github.com/containernetworking/plugins/archive/refs/tags/v0.9.1.tar.gz
@@ -42,6 +42,9 @@ install -vpm 0755 -t %{buildroot}%{_default_cni_plugins_dir} bin/*
4242
%{_default_cni_plugins_dir}/*
4343

4444
%changelog
45+
* Wed Aug 17 2022 Olivia Crain <[email protected]> - 0.9.1-8
46+
- Bump to rebuild with golang 1.18.5-1
47+
4548
* Tue Jun 07 2022 Andrew Phelps <[email protected]> - 0.9.1-7
4649
- Bumping release to rebuild with golang 1.18.3
4750

‎SPECS/coredns/coredns-1.8.0.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: Fast and flexible DNS server
44
Name: coredns
55
Version: 1.8.0
6-
Release: 7%{?dist}
6+
Release: 8%{?dist}
77
License: Apache License 2.0
88
Vendor: Microsoft Corporation
99
Distribution: Mariner
@@ -61,6 +61,9 @@ rm -rf %{buildroot}/*
6161
%{_bindir}/%{name}
6262

6363
%changelog
64+
* Wed Aug 17 2022 Olivia Crain <[email protected]> - 1.8.0-8
65+
- Bump to rebuild with golang 1.18.5-1
66+
6467
* Tue Jun 07 2022 Andrew Phelps <[email protected]> - 1.8.0-7
6568
- Bumping release to rebuild with golang 1.18.3
6669

‎SPECS/coredns/coredns-1.8.4.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: Fast and flexible DNS server
44
Name: coredns
55
Version: 1.8.4
6-
Release: 6%{?dist}
6+
Release: 7%{?dist}
77
License: Apache License 2.0
88
Vendor: Microsoft Corporation
99
Distribution: Mariner
@@ -61,6 +61,9 @@ rm -rf %{buildroot}/*
6161
%{_bindir}/%{name}
6262

6363
%changelog
64+
* Wed Aug 17 2022 Olivia Crain <[email protected]> - 1.8.4-7
65+
- Bump to rebuild with golang 1.18.5-1
66+
6467
* Tue Jun 07 2022 Andrew Phelps <[email protected]> - 1.8.4-6
6568
- Bumping release to rebuild with golang 1.18.3
6669

‎SPECS/coredns/coredns-1.8.6.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: Fast and flexible DNS server
44
Name: coredns
55
Version: 1.8.6
6-
Release: 3%{?dist}
6+
Release: 4%{?dist}
77
License: Apache License 2.0
88
Vendor: Microsoft Corporation
99
Distribution: Mariner
@@ -61,6 +61,9 @@ rm -rf %{buildroot}/*
6161
%{_bindir}/%{name}
6262

6363
%changelog
64+
* Wed Aug 17 2022 Olivia Crain <[email protected]> - 1.8.6-4
65+
- Bump to rebuild with golang 1.18.5-1
66+
6467
* Tue Jun 07 2022 Andrew Phelps <[email protected]> - 1.8.6-3
6568
- Bumping release to rebuild with golang 1.18.3
6669

‎SPECS/cri-tools/cri-tools.spec

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: CRI tools
44
Name: cri-tools
55
Version: 1.22.0
6-
Release: 7%{?dist}
6+
Release: 8%{?dist}
77
License: ASL 2.0
88
URL: https://github.com/kubernetes-sigs/cri-tools
99
#Source0: https://github.com/kubernetes-sigs/cri-tools/archive/v%{version}.tar.gz
@@ -55,6 +55,9 @@ install -p -m 644 -t %{buildroot}%{_docdir}/%{name} ./docs/crictl.md
5555
rm -rf %{buildroot}/*
5656

5757
%changelog
58+
* Wed Aug 17 2022 Olivia Crain <[email protected]> - 1.22.0-8
59+
- Bump to rebuild with golang 1.18.5-1
60+
5861
* Tue Jun 07 2022 Andrew Phelps <[email protected]> - 1.22.0-7
5962
- Bumping release to rebuild with golang 1.18.3
6063

0 commit comments

Comments
 (0)