Skip to content

Commit 3d04526

Browse files
jslobodzianjslobodzian
authored
Sync 3.0-dev to 3.0 as of e19b003 (#13848)
2 parents da84812 + e19b003 commit 3d04526

File tree

52 files changed

+811
-172
lines changed

Some content is hidden

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

52 files changed

+811
-172
lines changed

‎SPECS-EXTENDED/kyotocabinet/kyotocabinet-1.2.78-random-failures.patch

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎SPECS-EXTENDED/kyotocabinet/kyotocabinet.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"kyotocabinet-1.2.78.tar.gz": "494c6383a94bd7a64425223a770821128e99ebae68b598714e782b566772b3af"
3+
"kyotocabinet-1.2.80.tar.gz": "4c85d736668d82920bfdbdb92ac3d66b7db1108f09581a769dd9160a02def349"
44
}
55
}

‎SPECS-EXTENDED/kyotocabinet/kyotocabinet.spec

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ Vendor: Microsoft Corporation
22
Distribution: Azure Linux
33
Summary: A straightforward implementation of DBM
44
Name: kyotocabinet
5-
Version: 1.2.78
6-
Release: 2%{?dist}
7-
License: GPLv3
5+
Version: 1.2.80
6+
Release: 7%{?dist}
7+
License: GPL-3.0-only
88
URL: https://dbmx.net/%{name}/
99
Source: https://dbmx.net/%{name}/pkg/%{name}-%{version}.tar.gz
1010
Patch0: kyotocabinet-1.2.76-cflags.patch
1111
Patch1: kyotocabinet-1.2.76-8-byte-atomics.patch
12-
Patch2: kyotocabinet-1.2.78-random-failures.patch
1312
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
1413
BuildRequires: gcc-c++, zlib-devel, lzo-devel, xz-devel
1514

@@ -51,10 +50,7 @@ The kyotocabinet-apidocs package contains API documentation for developing
5150
applications that use Kyoto Cabinet.
5251

5352
%prep
54-
%setup -q
55-
%patch 0 -p1 -b .cflags
56-
%patch 1 -p1 -b .8-byte-atomics
57-
%patch 2 -p1 -b .random-failures
53+
%autosetup -p1
5854

5955
%build
6056
%configure --disable-opt --enable-lzo --enable-lzma
@@ -144,8 +140,37 @@ make check
144140
%doc COPYING doc/api/* kyotocabinet.idl
145141

146142
%changelog
147-
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.2.78-2
148-
- Initial CBL-Mariner import from Fedora 33 (license: MIT).
143+
* Mon Apr 07 2025 Aninda Pradhan <v-anipradhan@microsoft.com> - 1.2.80-7
144+
- Initial Azure Linux import from Fedora 41 (license: MIT)
145+
- License Verified
146+
147+
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.80-6
148+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
149+
150+
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.80-5
151+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
152+
153+
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.80-4
154+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
155+
156+
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.80-3
157+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
158+
159+
* Thu May 18 2023 Peng Wu <pwu@redhat.com> - 1.2.80-2
160+
- Migrate to SPDX license
161+
162+
* Mon Apr 17 2023 Peng Wu <pwu@redhat.com> - 1.2.80-1
163+
- Update to 1.2.80
164+
- Resolves: RHBZ#2186606
165+
166+
* Wed Apr 12 2023 Florian Weimer <fweimer@redhat.com> - 1.2.79-3
167+
- Port configure script to C99 (#2186199)
168+
169+
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.79-2
170+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
171+
172+
* Tue Nov 22 2022 Peng Wu <pwu@redhat.com> - 1.2.79-1
173+
- Update to 1.2.79
149174

150175
* Wed Sep 23 2020 Robert Scheck <robert@fedoraproject.org> 1.2.78-1
151176
- Update to 1.2.78 (#1858682)
@@ -273,3 +298,4 @@ make check
273298

274299
* Wed Dec 8 2010 Casey Dahlin <cdahlin@redhat.com> - 1.2.27-1
275300
- Initial packaging
301+

‎SPECS-EXTENDED/lua-json/48.patch

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
From 473d61d262a1c86a69ad9b4882352d122e42f3fa Mon Sep 17 00:00:00 2001
2+
From: Josh <jokajak@gmail.com>
3+
Date: Thu, 20 Jul 2023 15:49:33 -0400
4+
Subject: [PATCH] feat: support lpeg 1.1
5+
6+
This changeset adds support for lpeg 1.1 which updated the lpeg.version from a function to a string.
7+
8+
Therefore we have to check the type of the value.
9+
10+
Refs: #47
11+
---
12+
lua/json/decode/util.lua | 5 ++++-
13+
1 file changed, 4 insertions(+), 1 deletion(-)
14+
15+
diff --git a/lua/json/decode/util.lua b/lua/json/decode/util.lua
16+
index 2493bf3..8b23751 100644
17+
--- a/lua/json/decode/util.lua
18+
+++ b/lua/json/decode/util.lua
19+
@@ -17,6 +17,8 @@ local table_concat = require("table").concat
20+
21+
local merge = require("json.util").merge
22+
23+
+local type = type
24+
+
25+
local _ENV = nil
26+
27+
local function get_invalid_character_info(input, index)
28+
@@ -94,7 +96,8 @@ local unicode_ignored = (unicode_space + comment)^0
29+
30+
-- Parse the lpeg version skipping patch-values
31+
-- LPEG <= 0.7 have no version value... so 0.7 is value
32+
-local DecimalLpegVersion = lpeg.version and tonumber(lpeg.version():match("^(%d+%.%d+)")) or 0.7
33+
+-- LPEG >= 1.1 uses a string for the version instead of function
34+
+local DecimalLpegVersion = lpeg.version and tonumber((type(lpeg.version) == "string" and lpeg.version or lpeg.version()):match("^(%d+%.%d+)")) or 0.7
35+
36+
local function setObjectKeyForceNumber(t, key, value)
37+
key = tonumber(key) or key

‎SPECS-EXTENDED/lua-json/lua-json.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"luajson-1.3.2-7a86bc2.tar.gz": "474e073d8842de1f92faf15a79b90341c03e6b140747453ce738554db6d46972"
3+
"luajson-1.3.4.tar.gz": "aff67d64027f747b4611646fd0421802eda60397da9076e3f7fb17227e542e99"
44
}
55
}

‎SPECS-EXTENDED/lua-json/lua-json.spec

Lines changed: 50 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,26 @@ Distribution: Azure Linux
66
%global shortcommit %(c=%{commit}; echo ${c:0:7})
77

88
Name: lua-json
9-
Version: 1.3.2
10-
Release: 16%{?dist}
9+
Version: 1.3.4
10+
Release: 9%{?dist}
1111
Summary: JSON Parser/Constructor for Lua
1212
License: MIT
1313
URL: https://github.com/harningt/luajson
14-
Source0: https://github.com/harningt/luajson/archive/%{commit}/luajson-%{version}-%{shortcommit}.tar.gz
15-
Patch0: luajson-lua-5.2.patch
14+
Source0: https://github.com/harningt/luajson/archive/%{version}/luajson-%{version}.tar.gz
15+
# Support for lpeg 1.1.0
16+
Patch0: https://github.com/harningt/luajson/pull/48.patch
1617
BuildRequires: lua >= %{luaver}, lua-lpeg >= 0.8.1
1718
# for checks
1819
BuildRequires: lua-filesystem >= 1.4.1, lua-lunit >= 0.4
20+
BuildRequires: make
1921
Requires: lua(abi) >= %{luaver}, lua-lpeg >= 0.8.1
2022
BuildArch: noarch
2123

2224
%description
2325
LuaJSON is a customizable JSON decoder/encoder, using LPEG for parsing.
2426

2527
%prep
26-
%setup -q -n luajson-%{commit}
27-
%patch 0 -p1 -b .lua-52
28+
%autosetup -p1 -n luajson-%{version}
2829

2930
%build
3031

@@ -39,17 +40,52 @@ make check-regression
3940
# grep -q "0 failed, 0 errors" testlog.txt
4041

4142
%files
42-
%license LICENSE
43-
%doc docs/LuaJSON.txt docs/ReleaseNotes-1.0.txt
43+
%doc LICENSE docs/LuaJSON.txt docs/ReleaseNotes-1.0.txt
4444
%{luapkgdir}/*
4545

4646
%changelog
47-
* Mon Feb 28 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.3.2-16
48-
- Fixing run-time dependencies.
49-
- License verified.
47+
* Tue Apr 08 2025 Aninda Pradhan <v-anipradhan@microsoft.com> - 1.3.4-9
48+
- Initial Azure Linux import from Fedora 41 (license: MIT)
49+
- License Verified
5050

51-
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.3.2-15
52-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
51+
* Thu Aug 01 2024 Orion Poplawski <orion@nwra.com> - 1.3.4-8
52+
- Add upstream patch to support lua lpeg 1.1.0 (bz#2302036)
53+
54+
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-7
55+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
56+
57+
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-6
58+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
59+
60+
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-5
61+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
62+
63+
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-4
64+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
65+
66+
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-3
67+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
68+
69+
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-2
70+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
71+
72+
* Sat May 28 2022 Orion Poplawski <orion@nwra.com> - 1.3.4-1
73+
- Update to 1.3.4
74+
75+
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-19
76+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
77+
78+
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-18
79+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
80+
81+
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-17
82+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
83+
84+
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-16
85+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
86+
87+
* Tue Jun 30 2020 Miro Hrončok <mhroncok@redhat.com> - 1.3.2-15
88+
- Rebuilt for Lua 5.4
5389

5490
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-14
5591
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
@@ -110,3 +146,4 @@ make check-regression
110146

111147
* Thu Sep 10 2009 Michel Salim <salimma@fedoraproject.org> - 1.0-1
112148
- Initial package
149+

‎SPECS-EXTENDED/lua-json/luajson-lua-5.2.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
Summary: %{_name} Driver
4646
Name: %{_name}-signed
4747
Version: 24.10
48-
Release: 16%{?dist}
48+
Release: 18%{?dist}
4949
License: GPLv2
5050
Url: http://nvidia.com
5151
Group: System Environment/Base
@@ -117,6 +117,12 @@ fi # 1 : closed
117117

118118

119119
%changelog
120+
* Tue May 13 2025 Siddharth Chintamaneni <sidchintamaneni@gmail.com> - 24.10-18
121+
- Bump release to rebuild for new kernel release
122+
123+
* Tue Apr 29 2025 Siddharth Chintamaneni <sidchintamaneni@gmail.com> - 24.10-17
124+
- Bump release to rebuild for new kernel release
125+
120126
* Fri Apr 25 2025 Chris Co <chrco@microsoft.com> - 24.10-16
121127
- Bump release to rebuild for new kernel release
122128

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
Summary: %{_name} Driver
4242
Name: %{_name}-signed
4343
Version: 24.10
44-
Release: 16%{?dist}
44+
Release: 18%{?dist}
4545
License: GPLv2
4646
Url: http://www.mellanox.com
4747
Group: System Environment/Base
@@ -108,6 +108,12 @@ fi # 1 : closed
108108
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{_name}-*.conf
109109

110110
%changelog
111+
* Tue May 13 2025 Siddharth Chintamaneni <sidchintamaneni@gmail.com> - 24.10-18
112+
- Bump release to rebuild for new kernel release
113+
114+
* Tue Apr 29 2025 Siddharth Chintamaneni <sidchintamaneni@gmail.com> - 24.10-17
115+
- Bump release to rebuild for new kernel release
116+
111117
* Fri Apr 25 2025 Chris Co <chrco@microsoft.com> - 24.10-16
112118
- Bump release to rebuild for new kernel release
113119

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
Summary: %{_name} Driver
4242
Name: %{_name}-signed
4343
Version: 24.10
44-
Release: 16%{?dist}
44+
Release: 18%{?dist}
4545
License: GPLv2
4646
Url: http://www.mellanox.com
4747
Group: System Environment/Base
@@ -107,6 +107,12 @@ fi # 1 : closed
107107
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{_name}-*.conf
108108

109109
%changelog
110+
* Tue May 13 2025 Siddharth Chintamaneni <sidchintamaneni@gmail.com> - 24.10-18
111+
- Bump release to rebuild for new kernel release
112+
113+
* Tue Apr 29 2025 Siddharth Chintamaneni <sidchintamaneni@gmail.com> - 24.10-17
114+
- Bump release to rebuild for new kernel release
115+
110116
* Fri Apr 25 2025 Chris Co <chrco@microsoft.com> - 24.10-16
111117
- Bump release to rebuild for new kernel release
112118

0 commit comments

Comments
 (0)