diff --git a/.github/workflows/go-test-coverage.yml b/.github/workflows/go-test-coverage.yml index 061764311d3..3914ac243e9 100644 --- a/.github/workflows/go-test-coverage.yml +++ b/.github/workflows/go-test-coverage.yml @@ -10,7 +10,7 @@ on: branches: [main, dev, 1.0*, 2.0*, 3.0*, fasttrack/*] env: - EXPECTED_GO_VERSION: "1.23" + EXPECTED_GO_VERSION: "1.21" jobs: build: diff --git a/SPECS/espeak-ng/espeak-ng-1.51-CVE-2023-49990-4.patch b/SPECS/espeak-ng/espeak-ng-1.51-CVE-2023-49990-4.patch deleted file mode 100644 index de77a904643..00000000000 Binary files a/SPECS/espeak-ng/espeak-ng-1.51-CVE-2023-49990-4.patch and /dev/null differ diff --git a/SPECS/espeak-ng/espeak-ng.signatures.json b/SPECS/espeak-ng/espeak-ng.signatures.json index 9ebb83d9f65..95ef9a5377d 100644 --- a/SPECS/espeak-ng/espeak-ng.signatures.json +++ b/SPECS/espeak-ng/espeak-ng.signatures.json @@ -1,5 +1,5 @@ { - "Signatures": { - "espeak-ng-1.51.1.tgz": "0823df5648659dcb67915baaf99118dcc8853639f47cadaa029c174bdd768d20" - } -} \ No newline at end of file + "Signatures": { + "espeak-ng-1.52.0.tgz": "bb4338102ff3b49a81423da8a1a158b420124b055b60fa76cfb4b18677130a23" + } +} diff --git a/SPECS/espeak-ng/espeak-ng.spec b/SPECS/espeak-ng/espeak-ng.spec index 3f6cf3e103b..2dfa2bb57b5 100644 --- a/SPECS/espeak-ng/espeak-ng.spec +++ b/SPECS/espeak-ng/espeak-ng.spec @@ -1,6 +1,6 @@ Summary: Compact text-to-speech synthesizer Name: espeak-ng -Version: 1.51.1 +Version: 1.52.0 Release: 1%{?dist} # Apache2 license applies only to Android APK code- does not apply here # BSD license applies only to Windows code- does not apply here @@ -8,8 +8,7 @@ License: GPLv3 AND Unicode Vendor: Microsoft Corporation Distribution: Azure Linux URL: https://github.com/espeak-ng/espeak-ng -Source0: https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz#/%{name}-%{version}.tgz -Patch0: espeak-ng-1.51-CVE-2023-49990-4.patch +Source0: https://github.com/%{name}/%{name}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tgz BuildRequires: alsa-lib-devel BuildRequires: autoconf BuildRequires: automake @@ -64,8 +63,7 @@ rm -vrf %{buildroot}%{_datadir}/vim/registry %check %make_build check -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license COPYING @@ -73,7 +71,7 @@ rm -vrf %{buildroot}%{_datadir}/vim/registry %license COPYING.BSD2 %license COPYING.UCD %doc README.md -%doc CHANGELOG.md +%doc ChangeLog.md %{_bindir}/speak-ng %{_bindir}/espeak-ng %{_libdir}/libespeak-ng.so.1 @@ -91,6 +89,10 @@ rm -vrf %{buildroot}%{_datadir}/vim/registry %{_datadir}/vim/vimfiles/syntax/espeakrules.vim %changelog +* Thu Apr 17 2025 CBL-Mariner Servicing Account - 1.52.0-1 +- Auto-upgrade to 1.52.0 - remove chrome extension which used unverified function +- Removing patch file for CVE-2023-49990 as it is fixed in newest version. + * Wed Jan 31 2024 Sumedh Sharma - 1.51.1-1 - Bump package version to 1.51.1 - move vim specific builds to sub-package 'vim' diff --git a/cgmanifest.json b/cgmanifest.json index 82916ed9096..5b86beaab52 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -3378,8 +3378,8 @@ "type": "other", "other": { "name": "espeak-ng", - "version": "1.51.1", - "downloadUrl": "https://github.com/espeak-ng/espeak-ng/archive/1.51.1/espeak-ng-1.51.1.tar.gz" + "version": "1.52.0", + "downloadUrl": "https://github.com/espeak-ng/espeak-ng/archive/refs/tags/1.52.0.tar.gz" } } }, diff --git a/toolkit/docs/building/prerequisites-ubuntu.md b/toolkit/docs/building/prerequisites-ubuntu.md index 20cf0ee22f1..821b3c48c5e 100644 --- a/toolkit/docs/building/prerequisites-ubuntu.md +++ b/toolkit/docs/building/prerequisites-ubuntu.md @@ -12,9 +12,9 @@ sudo ./toolkit/docs/building/prerequisites-ubuntu.sh # Also supported is: # make -C toolkit install-prereqs -# Fix go 1.23 link -sudo ln -vsf /usr/lib/go-1.23/bin/go /usr/bin/go -sudo ln -vsf /usr/lib/go-1.23/bin/gofmt /usr/bin/gofmt +# Fix go 1.21 link +sudo ln -vsf /usr/lib/go-1.21/bin/go /usr/bin/go +sudo ln -vsf /usr/lib/go-1.21/bin/gofmt /usr/bin/gofmt # Install and configure Docker. curl -fsSL https://get.docker.com -o get-docker.sh diff --git a/toolkit/docs/building/prerequisites-ubuntu.sh b/toolkit/docs/building/prerequisites-ubuntu.sh index b151c2942c1..c79e5029788 100755 --- a/toolkit/docs/building/prerequisites-ubuntu.sh +++ b/toolkit/docs/building/prerequisites-ubuntu.sh @@ -12,7 +12,7 @@ apt install -y \ gawk \ genisoimage \ git \ - golang-1.23-go \ + golang-1.21-go \ jq \ make \ openssl \ diff --git a/toolkit/tools/go.mod b/toolkit/tools/go.mod index ef8bdcef182..f5860e9fe65 100644 --- a/toolkit/tools/go.mod +++ b/toolkit/tools/go.mod @@ -1,8 +1,8 @@ module github.com/microsoft/azurelinux/toolkit/tools -go 1.23.0 +go 1.21 -toolchain go1.24.2 +toolchain go1.21.6 require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 @@ -23,7 +23,7 @@ require ( github.com/stretchr/testify v1.9.0 github.com/ulikunitz/xz v0.5.10 golang.org/x/sys v0.28.0 - gonum.org/v1/gonum v0.16.0 + gonum.org/v1/gonum v0.15.0 gopkg.in/alecthomas/kingpin.v2 v2.2.6 gopkg.in/ini.v1 v1.67.0 gopkg.in/yaml.v3 v3.0.1 @@ -49,6 +49,7 @@ require ( github.com/rivo/uniseg v0.1.0 // indirect github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9 // indirect golang.org/x/crypto v0.31.0 // indirect + golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect golang.org/x/net v0.33.0 // indirect - golang.org/x/text v0.23.0 // indirect + golang.org/x/text v0.21.0 // indirect ) diff --git a/toolkit/tools/go.sum b/toolkit/tools/go.sum index 5a15ad7a07c..da0e2a5c9cd 100644 --- a/toolkit/tools/go.sum +++ b/toolkit/tools/go.sum @@ -92,6 +92,8 @@ github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9 h1:w8V9v0qVympSF6Gj github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -105,11 +107,11 @@ golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= -golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= -gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= +gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= +gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=