Skip to content

Commit 056418e

Browse files
ranjan-duttaranjan-dutta
committed
Merge tag '3.0.20250423-3.0' into 3.0-dev
build tag "3.0.20250423-3.0" * tag '3.0.20250423-3.0': (6844 commits) Update Conda to 24.3.0 and bring missing runtime deps (#12648) [AUTOPATCHER-CORE] Bugfix: 56213770, 56248605, upgrade cifs-utils to 7.3 (#13116) kata(-cc): upgrade kata-containers(-cc) to 3.2.0.azl5 (#13246) [AUTO-CHERRYPICK] Patch `prometheus` for CVE-2025-30204 [High] - branch 3.0-dev (#13233) [AUTO-CHERRYPICK] Upgrade libxslt to fix CVE-2024-55549 and CVE-2025-24855 [High] - branch 3.0-dev (#13243) Prepare April 2025 Update (#13244) [AUTOPATCHER-CORE] Upgrade tzdata to 2025a upgrade to version 2025a (#11994) [AUTO-CHERRYPICK] Patch `pytorch` for CVE-2021-22569, CVE-2024-7776 [High] - branch 3.0-dev (#13239) [AUTO-CHERRYPICK] Upgrade `libreswan` to 4.15 for CVE-2024-3652, CVE-2024-2357, CVE-2023-30570 [High] - branch 3.0-dev (#13238) [AUTO-CHERRYPICK] Patch `telegraf` for CVE-2025-30204 [High] - branch 3.0-dev (#13236) [AUTO-CHERRYPICK] Patch `keda` for CVE-2025-30204, CVE-2025-29923 [High] - branch 3.0-dev (#13235) [AUTO-CHERRYPICK] Patch `flannel` for CVE-2025-30204 [High] - branch 3.0-dev (#13234) [AUTO-CHERRYPICK] Patch `kubernetes` for CVE-2025-30204 [High] - branch 3.0-dev (#13232) [AUTO-CHERRYPICK] Patch `coredns` for CVE-2025-30204 [High] - branch 3.0-dev (#13231) [AUTO-CHERRYPICK] Patch `application-gateway-kubernetes-ingress` for CVE-2025-30204 [High] - branch 3.0-dev (#13230) [AUTO-CHERRYPICK] Patch `packer` for CVE-2025-30204 [High] - branch 3.0-dev (#13229) [AUTO-CHERRYPICK] Patch cert-manager for CVE-2025-30204 [High] - branch 3.0-dev (#13228) [AUTO-CHERRYPICK] Patch `azcopy` for CVE-2025-30204 [High] - branch 3.0-dev (#13227) [AUTO-CHERRYPICK] [AUTOPATCHER-CORE] Upgrade mariadb to 10.11.11 for CVE-2025-21490 - branch 3.0-dev (#13226) [AUTO-CHERRYPICK] [AUTOPATCHER-CORE] Upgrade libdwarf to 0.9.2 for CVE-2024-2002 [High] - branch 3.0-dev (#13225) ...
2 parents 801e0e1 + 39cc18a commit 056418e

File tree

391 files changed

+54002
-2089
lines changed

Some content is hidden

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

391 files changed

+54002
-2089
lines changed

‎.github/workflows/check-entangled-specs.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,9 @@ jobs:
3333
- name: Get Python dependencies
3434
run: python3 -m pip install -r toolkit/scripts/requirements.txt
3535

36-
- name: Run entanglement checking script
36+
# Run unit test for check_entangled_specs.py before invoking it
37+
- name: Unit test for spec entanglement check
38+
run: PYTHONPATH=toolkit/scripts python3 toolkit/scripts/tests/test_check_entangled_specs.py
39+
40+
- name: Run spec entanglement checking script
3741
run: python3 toolkit/scripts/check_entangled_specs.py .

‎LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSES-AND-NOTICES/SPECS/data/licenses.json‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@
215215
"enchant2",
216216
"enscript",
217217
"environment-modules",
218+
"erofs-utils",
218219
"evemu",
219220
"execstack",
220221
"exempi",
@@ -931,7 +932,7 @@
931932
"microcode_ctl",
932933
"microdnf",
933934
"minicom",
934-
"minizip",
935+
"minizip-ng",
935936
"mksh",
936937
"mobile-broadband-provider-info",
937938
"mock",
@@ -1614,6 +1615,7 @@
16141615
"pkgconf",
16151616
"plexus-cipher",
16161617
"plexus-containers",
1618+
"plexus-pom",
16171619
"plexus-sec-dispatcher",
16181620
"plotutils",
16191621
"pmdk-convert",
@@ -1664,6 +1666,7 @@
16641666
"python-aiohttp",
16651667
"python-alsa",
16661668
"python-apscheduler",
1669+
"python-archspec",
16671670
"python-argcomplete",
16681671
"python-argparse-manpage",
16691672
"python-astroid",
@@ -1676,6 +1679,7 @@
16761679
"python-betamax",
16771680
"python-blinker",
16781681
"python-blivet",
1682+
"python-boltons",
16791683
"python-breathe",
16801684
"python-cached_property",
16811685
"python-cbor2",
@@ -1685,7 +1689,9 @@
16851689
"python-cmd2",
16861690
"python-colorama",
16871691
"python-CommonMark",
1692+
"python-conda-libmamba-solver",
16881693
"python-conda-package-handling",
1694+
"python-conda-package-streaming",
16891695
"python-configshell",
16901696
"python-cpuinfo",
16911697
"python-cups",
@@ -1770,6 +1776,7 @@
17701776
"python-mccabe",
17711777
"python-mdurl",
17721778
"python-memcached",
1779+
"python-menuinst",
17731780
"python-mimeparse",
17741781
"python-mock",
17751782
"python-monotonic",
@@ -1806,6 +1813,7 @@
18061813
"python-pymongo",
18071814
"python-PyMySQL",
18081815
"python-pyperclip",
1816+
"python-pyproject-api",
18091817
"python-pyproject-metadata",
18101818
"python-pyroute2",
18111819
"python-pyrsistent",
@@ -1919,6 +1927,7 @@
19191927
"python-yubico",
19201928
"python-zipp",
19211929
"python-zmq",
1930+
"python-zstandard",
19221931
"python-zstd",
19231932
"python3-mallard-ducktype",
19241933
"python3-pytest-asyncio",
@@ -2528,11 +2537,27 @@
25282537
"NVIDIA": {
25292538
"license": "[ASL 2.0 License and spec specific licenses](http://www.apache.org/licenses/LICENSE-2.0)",
25302539
"specs": [
2540+
"fwctl-signed",
2541+
"ibarr",
2542+
"ibsim",
2543+
"iser-signed",
2544+
"isert-signed",
2545+
"knem-modules-signed",
25312546
"libnvidia-container",
2547+
"mlnx-ethtool",
2548+
"mlnx-iproute2",
25322549
"mlnx-nfsrdma-signed",
25332550
"mlnx-tools",
2551+
"mlx-steering-dump",
2552+
"multiperf",
25342553
"nvidia-container-toolkit",
2535-
"ofed-scripts"
2554+
"ofed-docs",
2555+
"ofed-scripts",
2556+
"perftest",
2557+
"rshim",
2558+
"sockperf",
2559+
"srp-signed",
2560+
"xpmem-modules-signed"
25362561
]
25372562
},
25382563
"NVIDIA (BSD)": {
@@ -2649,7 +2674,6 @@
26492674
"patterns-ceph-containers",
26502675
"plexus-classworlds",
26512676
"plexus-interpolation",
2652-
"plexus-pom",
26532677
"plexus-utils",
26542678
"proj",
26552679
"psl-make-dafsa",

‎SPECS-EXTENDED/flite/flite-2.2-lto.patch‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff -up flite-2.2/lang/cmu_grapheme_lex/cmu_grapheme_lex.h.lto flite-2.2/lang/cmu_grapheme_lex/cmu_grapheme_lex.h
2+
--- flite-2.2/lang/cmu_grapheme_lex/cmu_grapheme_lex.h.lto 2020-08-13 02:17:09.000000000 +0200
3+
+++ flite-2.2/lang/cmu_grapheme_lex/cmu_grapheme_lex.h 2021-10-06 00:06:41.891126362 +0200
4+
@@ -44,7 +44,7 @@ extern "C" {
5+
cst_lexicon *cmu_grapheme_lex_init(void);
6+
7+
extern const int num_unicode_sampa_mapping;
8+
-extern const char * const unicode_sampa_mapping[16663][5];
9+
+extern const char * const unicode_sampa_mapping[16798][5];
10+
11+
#ifdef __cplusplus
12+
} /* extern "C" */
13+
diff -up flite-2.2/lang/cmulex/cmu_lex.c.lto flite-2.2/lang/cmulex/cmu_lex.c
14+
--- flite-2.2/lang/cmulex/cmu_lex.c.lto 2020-08-13 02:17:09.000000000 +0200
15+
+++ flite-2.2/lang/cmulex/cmu_lex.c 2021-10-06 00:05:48.817719935 +0200
16+
@@ -46,7 +46,7 @@ extern const int cmu_lex_entry[];
17+
extern const unsigned char cmu_lex_data[];
18+
extern const int cmu_lex_num_entries;
19+
extern const int cmu_lex_num_bytes;
20+
-extern const char * const cmu_lex_phone_table[54];
21+
+extern const char * const cmu_lex_phone_table[57];
22+
extern const char * const cmu_lex_phones_huff_table[];
23+
extern const char * const cmu_lex_entries_huff_table[];
24+

‎SPECS-EXTENDED/flite/flite-2.2-texinfo-7.0.patch‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
diff -up flite-2.2/doc/flite.texi.ti7 flite-2.2/doc/flite.texi
2+
--- flite-2.2/doc/flite.texi.ti7 2020-08-13 02:17:09.000000000 +0200
3+
+++ flite-2.2/doc/flite.texi 2023-02-21 21:47:30.474291637 +0100
4+
@@ -971,7 +971,7 @@ utterance. Please note that the @file{i
5+
is not set by anyone at all. The previous sentence exists in the
6+
documentation so that I can point at it, when user's fail to read it.
7+
8+
-@node Converting FestVox Voices, , APIs, top
9+
+@node Converting FestVox Voices, , APIs, Top
10+
@chapter Converting FestVox Voices
11+
12+
As of 1.2 initial scripts have been added to aid the conversion of
13+
diff -up flite-2.2/doc/Makefile.ti7 flite-2.2/doc/Makefile
14+
--- flite-2.2/doc/Makefile.ti7 2020-08-13 02:17:09.000000000 +0200
15+
+++ flite-2.2/doc/Makefile 2023-02-21 21:49:04.185913824 +0100
16+
@@ -54,6 +54,9 @@ flite.html: flite.texi
17+
@ if [ -d html/flite ] ; \
18+
then mv html/flite/*.html html ; \
19+
rmdir html/flite; fi
20+
+ @ if [ -d html/flite_html ] ; \
21+
+ then mv html/flite_html/*.html html ; \
22+
+ rmdir html/flite_html; fi
23+
@ for i in html/*.html ; \
24+
do \
25+
sed 's/<BODY>/<BODY bgcolor="#ffffff">/' $$i >ttt.html; \

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"Signatures": {
3-
"README-ALSA.txt": "903d5832b51548b1a7921285fd94adfc295ba070f2bc9d07d4a7a846f28d0835",
4-
"flite-1.3-release.tar.gz": "922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b"
3+
"flite-2.2.tar.gz": "ab1555fe5adc3f99f1d4a1a0eb1596d329fd6d74f1464a0097c81f53c0cf9e5c"
54
}
65
}

‎SPECS-EXTENDED/flite/flite.spec‎

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,30 @@
11
%bcond_with docs
22

33
Name: flite
4-
Version: 1.3
5-
Release: 36%{?dist}
4+
Version: 2.2
5+
Release: 1%{?dist}
66
Summary: Small, fast speech synthesis engine (text-to-speech)
77
License: MIT
88
Vendor: Microsoft Corporation
99
Distribution: Azure Linux
1010
URL: http://www.speech.cs.cmu.edu/flite/
1111

12-
Source0: http://www.speech.cs.cmu.edu/flite/packed/%{name}-%{version}/%{name}-%{version}-release.tar.gz
13-
Source1: README-ALSA.txt
14-
Patch0: flite-1.3-sharedlibs.patch
15-
Patch1: flite-1.3-doc_texinfo.patch
16-
Patch2: flite-1.3-alsa_support.patch
17-
Patch3: flite-1.3-implicit_dso_linking.patch
18-
Patch4: 0001-auserver.c-Only-write-audio-data-to-a-file-in-debug-.patch
19-
Patch5: flite-0001-Fixed-texi2html-ambiguity.patch
20-
21-
%if %{with docs}
22-
BuildRequires: texi2html
12+
Source0: https://github.com/festvox/flite/archive/refs/tags/v2.2.tar.gz#/%{name}-%{version}.tar.gz
13+
14+
Patch0: flite-2.2-lto.patch
15+
# fixes build with texinfo-7.0+, see https://lists.gnu.org/archive/html/bug-texinfo/2022-11/msg00036.html
16+
Patch1: flite-2.2-texinfo-7.0.patch
2317
# texi2pdf
18+
2419
# WARNING see explanation about PDF doc below.
2520
#BuildRequires: texinfo-tex
26-
%endif
2721

2822
BuildRequires: gcc
2923
BuildRequires: autoconf automake libtool
3024
BuildRequires: ed alsa-lib-devel
25+
BuildRequires: make
26+
BuildRequires: pulseaudio-libs-devel
27+
BuildRequires: texinfo
3128

3229

3330
%description
@@ -46,42 +43,36 @@ Development files for Flite, a small, fast speech synthesis engine.
4643

4744

4845
%prep
49-
%setup -q -n %{name}-%{version}-release
50-
%patch 0 -p1 -b .flite-1.3-sharedlibs
51-
%patch 1 -p1 -b .flite-1.3-doc_texinfo
52-
%patch 2 -p1 -b .flite-1.3-alsa_support
53-
%patch 3 -p1 -b .flite-1.3-implicit_dso_linking
54-
%patch 4 -p1
55-
%patch 5 -p1
56-
cp -p %{SOURCE1} .
57-
46+
%setup -q
47+
%patch -P0 -p1 -b .lto
48+
%patch -P1 -p1 -b .ti7
5849

5950
%build
6051
autoreconf -vif
6152
%configure --enable-shared --with-audio=alsa
62-
# This package fails parallel make (thus cannot be built using "_smp_flags")
6353
make
64-
%if %{with docs}
54+
6555
# Build documentation
6656
cd doc
6757
# WARNING "make doc" provides a huge PDF file. It was decided not to produce/package it.
6858
#make doc
6959
make flite.html
70-
%endif
71-
72-
%install
73-
make install INSTALLBINDIR=%{buildroot}%{_bindir} INSTALLLIBDIR=%{buildroot}%{_libdir} INSTALLINCDIR=%{buildroot}%{_includedir}/flite
7460

7561

76-
%ldconfig_scriptlets
62+
%install
63+
%make_install
64+
rm %{buildroot}%{_libdir}/libflite*.a
7765

66+
%if %{with check}
67+
%check
68+
LD_LIBRARY_PATH=%{buildroot}%{_libdir} make -C testsuite do_thread_test
69+
%endif
7870

7971
%files
8072
%license COPYING
81-
%doc ACKNOWLEDGEMENTS README README-ALSA.txt
82-
%if %{with docs}
73+
%doc ACKNOWLEDGEMENTS
8374
%doc doc/html
84-
%endif
75+
%doc README.md
8576
%{_libdir}/*.so.*
8677
%{_bindir}/*
8778

@@ -92,6 +83,10 @@ make install INSTALLBINDIR=%{buildroot}%{_bindir} INSTALLLIBDIR=%{buildroot}%{_l
9283

9384

9485
%changelog
86+
* Fri Nov 29 2024 Jyoti Kanase <v-jykanase@microsoft.com> - 2.2-1
87+
- Update to 2.2
88+
- License verified
89+
9590
* Mon Jun 14 2021 Thomas Crain <thcrain@microsoft.com> - 1.3-36
9691
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
9792
- Conditionally build documentation, and turn off documentation building by default

‎SPECS-EXTENDED/glassfish-annotation-api/glassfish-annotation-api-build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<property name="build.outputDir" value="${build.dir}/classes"/>
2020
<property name="build.srcDir.0" value="src/main/java"/>
2121

22-
<property name="compiler.source" value="1.6"/>
23-
<property name="compiler.target" value="1.6"/>
22+
<property name="compiler.source" value="1.8"/>
23+
<property name="compiler.target" value="1.8"/>
2424

2525
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
2626

‎SPECS-EXTENDED/glassfish-annotation-api/glassfish-annotation-api.signatures.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"Signatures": {
33
"LICENSE": "1b087ad282cb3cd0a11e4e160318eab4ff0995aae7d22e6ac0d30367e196c6e3",
44
"glassfish-annotation-api-1.3.2.tar.gz": "88bc56ca4fe7c1b0b2825ffc3bc449bf97d6193e5d5fe534fbb6c83286d6b2fb",
5-
"glassfish-annotation-api-build.xml": "33b450cc3b2b696a060900c5ed7dddc431ec0c96325d573089415a5f4c4ef046"
5+
"glassfish-annotation-api-build.xml": "da40140b99f03b34cb36f35311203a6f97e9e88d46833fe11d412451b82cab87"
66
}
77
}
8+

‎SPECS-EXTENDED/glassfish-annotation-api/glassfish-annotation-api.spec‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Distribution: Azure Linux
2222
%global artifactId javax.annotation-api
2323
Name: glassfish-annotation-api
2424
Version: 1.3.2
25-
Release: 3%{?dist}
25+
Release: 4%{?dist}
2626
Summary: Common Annotations API Specification (JSR 250)
2727
License: CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0
2828
Group: Development/Libraries/Java
@@ -76,6 +76,10 @@ install -pdm 0755 target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
7676
%{_javadocdir}/%{name}
7777

7878
%changelog
79+
* Fri Feb 28 2025 Durga Jagadeesh Palli <v-dpalli@microsoft.com> - 1.3.2-4
80+
- Build error fix, bump up the java source version from 1.6 to 1.8.
81+
- License verified
82+
7983
* Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.3.2-3
8084
- Converting the 'Release' tag to the '[number].[distribution]' format.
8185

0 commit comments

Comments
 (0)