Skip to content

Commit 2240600

Browse files
authored
Upgrade: tang version to 15 (#13797)
1 parent ed00b25 commit 2240600

File tree

3 files changed

+36
-82
lines changed

3 files changed

+36
-82
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Signatures": {
3-
"tang-14.tar.gz": "0b56702a8ac19ff320d7e13a49682efba32403933c84ab1dae0b26ddcc4e3fe5",
3+
"tang-15.tar.xz": "eaf4a2abfea3d05f454a8841e98332be1e1e2432744c70bb7765651ed82c3f7c",
44
"tang.sysusers": "df52060d0ee8eadd72154925ed7b7420d42f0f9b3281bae1e02caee9f900e8fd"
55
}
66
}

SPECS-EXTENDED/tang/tang.spec

Lines changed: 33 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,41 @@
11
Summary: Network Presence Binding Daemon
22
Name: tang
3-
Version: 14
4-
Release: 1%{?dist}
3+
Version: 15
4+
Release: 7%{?dist}
55
License: GPL-3.0-or-later
66
Vendor: Microsoft Corporation
77
Distribution: Azure Linux
88
URL: https://github.com/latchset/%{name}
9-
Source0: https://github.com/latchset/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
9+
Source0: https://github.com/latchset/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
1010
Source1: tang.sysusers
11+
1112
BuildRequires: asciidoc
1213
BuildRequires: coreutils
1314
BuildRequires: curl
1415
BuildRequires: gcc
1516
BuildRequires: git-core
1617
BuildRequires: grep
17-
BuildRequires: http-parser-devel >= 2.7.1-3
1818
BuildRequires: iproute
1919
BuildRequires: jose >= 8
2020
BuildRequires: libjose-devel >= 8
2121
BuildRequires: libjose-openssl-devel >= 8
2222
BuildRequires: libjose-zlib-devel >= 8
2323
BuildRequires: meson
24+
BuildRequires: llhttp-devel
2425
BuildRequires: pkgconfig
2526
BuildRequires: sed
2627
BuildRequires: socat
2728
BuildRequires: systemd
2829
BuildRequires: systemd-devel
30+
BuildRequires: systemd-rpm-macros
31+
32+
%{?systemd_ordering}
2933
Requires: coreutils
30-
Requires: grep
3134
Requires: jose >= 8
35+
Requires: llhttp
36+
Requires: grep
3237
Requires: sed
3338
Requires(pre): shadow-utils
34-
%{?systemd_requires}
3539

3640
%description
3741
Tang is a small daemon for binding data to the presence of a third party.
@@ -46,22 +50,32 @@ Tang is a small daemon for binding data to the presence of a third party.
4650
%install
4751
%meson_install
4852
install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/tang.conf
49-
echo "User=%{name}" >> %{buildroot}/%{_unitdir}/%{name}d@.service
50-
mkdir -p %{buildroot}/%{_localstatedir}/db/%{name}
53+
%{__mkdir_p} $RPM_BUILD_ROOT/%{_localstatedir}/db/%{name}
5154

5255
%check
5356
%meson_test
5457

5558
%pre
56-
getent group %{name} >/dev/null || groupadd -r %{name}
57-
getent passwd %{name} >/dev/null || \
58-
useradd -r -g %{name} -d %{_localstatedir}/cache/%{name} -s %{_sbindir}/nologin \
59-
-c "Tang Network Presence Daemon user" %{name}
59+
%sysusers_create_compat %{SOURCE1}
6060
exit 0
6161

6262
%post
6363
%systemd_post %{name}d.socket
6464

65+
# Let's make sure any existing keys are readable only
66+
# by the owner/group.
67+
if [ -d /var/db/tang ]; then
68+
for k in /var/db/tang/*.jwk; do
69+
test -e "${k}" || continue
70+
chmod 0440 -- "${k}"
71+
done
72+
for k in /var/db/tang/.*.jwk; do
73+
test -e "${k}" || continue
74+
chmod 0440 -- "${k}"
75+
done
76+
chown tang:tang -R /var/db/tang
77+
fi
78+
6579
%preun
6680
%systemd_preun %{name}d.socket
6781

@@ -83,73 +97,13 @@ exit 0
8397
%{_sysusersdir}/tang.conf
8498

8599
%changelog
86-
* Tue Sep 05 2023 Muhammad Falak R Wani <mwani@microsoft.com> - 14-1
87-
- Upgrade version to address CVE-2023-1672
88-
- Lint spec
100+
* Wed May 14 2025 Archana Shettigar <v-shettigara@microsoft.com> - 15-7
101+
- Initial Azure Linux import from Fedora 41 (license: MIT).
89102
- License verified
90103

91-
* Fri Apr 30 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 7-7
92-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
93-
- Making binaries paths compatible with CBL-Mariner's paths.
94-
95-
* Tue Dec 1 2020 Sergio Correia <scorreia@redhat.com> - 7-6
96-
- Move build system to meson
97-
Upstream commits (fed9020, 590de27)
98-
- Move key handling to tang itself
99-
Upstream commits (6090505, c71df1d, 7119454)
100-
101-
* Tue Feb 25 2020 Sergio Correia <scorreia@redhat.com> - 7-5
102-
- Rebuilt after http-parser update
103-
104-
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7-4
105-
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
106-
107-
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7-3
108-
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
109-
110-
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7-2
111-
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
112-
113-
* Fri Aug 10 2018 Nathaniel McCallum <npmccallum@redhat.com> - 7-1
114-
- New upstream release
115-
- Retire tang-nagios package (now separate upstream)
116-
117-
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6-5
118-
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
119-
120-
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6-4
121-
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
122-
123-
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6-3
124-
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
125-
126-
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6-2
127-
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
128-
129-
* Wed Jun 14 2017 Nathaniel McCallum <npmccallum@redhat.com> - 6-1
130-
- New upstream release
131-
132-
* Wed Jun 14 2017 Nathaniel McCallum <npmccallum@redhat.com> - 5-2
133-
- Fix incorrect dependencies
134-
135-
* Wed Jun 14 2017 Nathaniel McCallum <npmccallum@redhat.com> - 5-1
136-
- New upstream release
137-
138-
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4-3
139-
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
140-
141-
* Mon Nov 14 2016 Nathaniel McCallum <npmccallum@redhat.com> - 4-2
142-
- Fix a race condition in one of the tests
143-
144-
* Thu Nov 10 2016 Nathaniel McCallum <npmccallum@redhat.com> - 4-1
145-
- New upstream release
146-
- Add nagios subpackage
147-
148-
* Wed Oct 26 2016 Nathaniel McCallum <npmccallum@redhat.com> - 3-1
149-
- New upstream release
150-
151-
* Wed Oct 19 2016 Nathaniel McCallum <npmccallum@redhat.com> - 2-1
152-
- New upstream release
104+
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 15-6
105+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
153106

154-
* Tue Aug 23 2016 Nathaniel McCallum <npmccallum@redhat.com> - 1-1
155-
- First release
107+
* Thu May 09 2024 Sergio Correia <scorreia@redhat.com> - 15-5
108+
- RPMAUTOSPEC: unresolvable merge
109+
## END: Generated by rpmautospec

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28826,8 +28826,8 @@
2882628826
"type": "other",
2882728827
"other": {
2882828828
"name": "tang",
28829-
"version": "14",
28830-
"downloadUrl": "https://github.com/latchset/tang/archive/refs/tags/v14.tar.gz"
28829+
"version": "15",
28830+
"downloadUrl": "https://github.com/latchset/tang/releases/download/v15/tang-15.tar.xz"
2883128831
}
2883228832
}
2883328833
},

0 commit comments

Comments
 (0)