diff --git a/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md b/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md index cdcd23f5c96..50147c5c682 100644 --- a/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md +++ b/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md @@ -17,7 +17,7 @@ The Azure Linux SPEC files originated from a variety of sources with varying lic | OpenEuler | [BSD-3 License](https://github.com/pytorch/pytorch/blob/master/LICENSE) | pytorch | | OpenMamba | [Openmamba GPLv2 License](https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt) | bash-completion | | OpenSUSE | Following [openSUSE guidelines](https://en.opensuse.org/openSUSE:Specfile_guidelines#Specfile_Licensing) | ant
ant-junit
antlr
aopalliance
apache-commons-beanutils
apache-commons-cli
apache-commons-codec
apache-commons-collections
apache-commons-collections4
apache-commons-compress
apache-commons-daemon
apache-commons-dbcp
apache-commons-digester
apache-commons-httpclient
apache-commons-io
apache-commons-jexl
apache-commons-lang
apache-commons-lang3
apache-commons-logging
apache-commons-net
apache-commons-pool
apache-commons-pool2
apache-commons-validator
apache-commons-vfs2
apache-parent
args4j
atinject
base64coder
bcel
bea-stax
beust-jcommander
bsf
byaccj
cal10n
cdparanoia
cglib
cni
containerized-data-importer
cpulimit
cri-o
ecj
fillup
flux
gd
geronimo-specs
glassfish-annotation-api
gnu-getopt
gnu-regexp
golang-packaging
guava
hamcrest
hawtjni-runtime
httpcomponents-core
influx-cli
influxdb
jakarta-taglibs-standard
jansi
jarjar
java-cup
java-cup-bootstrap
javacc
javacc-bootstrap
javassist
jboss-interceptors-1.2-api
jdepend
jflex
jflex-bootstrap
jlex
jline
jna
jsch
jsoup
jsr-305
jtidy
junit
junitperf
jzlib
kubevirt
kured
libcontainers-common
libtheora
libva
libvdpau
lynx
multus
objectweb-anttask
objectweb-asm
objenesis
oro
osgi-annotation
osgi-compendium
osgi-core
patterns-ceph-containers
plexus-classworlds
plexus-interpolation
plexus-utils
proj
psl-make-dafsa
publicsuffix
qdox
regexp
relaxngDatatype
rhino
ripgrep
servletapi4
servletapi5
shapelib
slf4j
trilead-ssh2
virtiofsd
xalan-j2
xbean
xcursor-themes
xerces-j2
xml-commons-apis
xml-commons-resolver
xmldb-api
xmlrpc-c
xmlunit
xpp2
xpp3
xz-java | -| Photon | [Photon License](LICENSE-PHOTON.md) and [Photon Notice](NOTICE.APACHE2).
Also see [LICENSE-EXCEPTIONS.PHOTON](LICENSE-EXCEPTIONS.PHOTON). | acl
alsa-lib
alsa-utils
ansible
apr
apr-util
asciidoc
atftp
audit
autoconf
autoconf-archive
autofs
autogen
automake
babel
bash
bc
bcc
bind
binutils
bison
blktrace
boost
btrfs-progs
bubblewrap
build-essential
bzip2
c-ares
cairo
cassandra
cdrkit
check
chkconfig
chrpath
cifs-utils
clang
cloud-init
cloud-utils-growpart
cmake
cni-plugins
core-packages
coreutils
cpio
cppunit
cracklib
crash
crash-gcore-command
createrepo_c
cri-tools
cronie
curl
cyrus-sasl
cyrus-sasl-bootstrap
dbus
dbus-glib
dejagnu
device-mapper-multipath
dialog
diffutils
dkms
dmidecode
dnsmasq
docbook-dtd-xml
docbook-style-xsl
dosfstools
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
emacs
erlang
etcd
ethtool
expat
expect
fcgi
file
filesystem
findutils
flex
fontconfig
fping
freetype
fuse
gawk
gc
gcc
gdb
gdbm
gettext
git
git-lfs
glib
glib-networking
glibc
glibmm
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang
golang-1.23
gperf
gperftools
gpgme
gptfdisk
grep
groff
grub2
gtest
gtk-doc
guile
gzip
haproxy
harfbuzz
haveged
hdparm
http-parser
httpd
i2c-tools
iana-etc
icu
initramfs
initscripts
inotify-tools
intltool
iotop
iperf3
iproute
ipset
iptables
iputils
ipvsadm
ipxe
irqbalance
itstool
jansson
jq
json-c
json-glib
kbd
keepalived
kernel
kernel-64k
kernel-headers
kernel-ipe
kernel-lpg-innovate
kernel-mshv
kernel-rt
kernel-uvm
keyutils
kmod
krb5
less
libaio
libarchive
libassuan
libatomic_ops
libcap
libcap-ng
libconfig
libdb
libdnet
libedit
libestr
libevent
libfastjson
libffi
libgcrypt
libgpg-error
libgssglue
libgudev
libjpeg-turbo
libksba
liblogging
libmbim
libmnl
libmodulemd
libmpc
libmspack
libndp
libnetfilter_conntrack
libnetfilter_cthelper
libnetfilter_cttimeout
libnetfilter_queue
libnfnetlink
libnftnl
libnl3
libnsl2
libpcap
libpipeline
libpng
libpsl
libqmi
librelp
librepo
librsync
libseccomp
libselinux
libsepol
libserf
libsigc++30
libsolv
libsoup
libssh2
libtalloc
libtar
libtasn1
libtiff
libtirpc
libtool
libunistring
libunwind
libusb
libvirt
libwebp
libxml2
libxslt
libyaml
linux-firmware
lldb
lldpad
llvm
lm-sensors
lmdb
log4cpp
logrotate
lshw
lsof
lsscsi
ltrace
lttng-tools
lttng-ust
lvm2
lz4
lzo
m2crypto
m4
make
man-db
man-pages
mariadb
maven
mc
mercurial
meson
mlocate
ModemManager
mpfr
msr-tools
mysql
nano
nasm
ncurses
ndctl
net-snmp
net-tools
nettle
newt
nfs-utils
nghttp2
nginx
ninja-build
nodejs
npth
nspr
nss
nss-altfiles
ntp
numactl
nvme-cli
oniguruma
OpenIPMI
openldap
openscap
openssh
openvswitch
ostree
pam
pango
parted
patch
pciutils
perl-Canary-Stability
perl-CGI
perl-common-sense
perl-Crypt-SSLeay
perl-DBD-SQLite
perl-DBI
perl-DBIx-Simple
perl-Exporter-Tiny
perl-File-HomeDir
perl-File-Which
perl-IO-Socket-SSL
perl-JSON-Any
perl-JSON-XS
perl-libintl-perl
perl-List-MoreUtils
perl-Module-Build
perl-Module-Install
perl-Module-ScanDeps
perl-Net-SSLeay
perl-NetAddr-IP
perl-Object-Accessor
perl-Path-Class
perl-Try-Tiny
perl-Types-Serialiser
perl-WWW-Curl
perl-XML-Parser
perl-YAML
perl-YAML-Tiny
pgbouncer
pinentry
polkit
popt
postgresql
procps-ng
protobuf
protobuf-c
psmisc
pth
pyasn1-modules
pyOpenSSL
pyparsing
pytest
python-appdirs
python-asn1crypto
python-atomicwrites
python-attrs
python-bcrypt
python-certifi
python-cffi
python-chardet
python-configobj
python-constantly
python-coverage
python-cryptography
python-daemon
python-dateutil
python-defusedxml
python-distro
python-docopt
python-docutils
python-ecdsa
python-gevent
python-hyperlink
python-hypothesis
python-idna
python-imagesize
python-incremental
python-iniparse
python-ipaddr
python-jinja2
python-jmespath
python-jsonpatch
python-jsonpointer
python-jsonschema
python-lockfile
python-lxml
python-mako
python-markupsafe
python-mistune
python-msgpack
python-netaddr
python-netifaces
python-ntplib
python-oauthlib
python-packaging
python-pam
python-pbr
python-ply
python-prettytable
python-psutil
python-psycopg2
python-py
python-pyasn1
python-pycodestyle
python-pycparser
python-pycurl
python-pygments
python-pynacl
python-requests
python-setuptools_scm
python-simplejson
python-six
python-snowballstemmer
python-sphinx-theme-alabaster
python-twisted
python-urllib3
python-vcversioner
python-virtualenv
python-wcwidth
python-webob
python-websocket-client
python-werkzeug
python-zope-event
python-zope-interface
python3
pytz
PyYAML
rapidjson
readline
rng-tools
rpcbind
rpcsvc-proto
rpm
rpm-ostree
rrdtool
rsync
rsyslog
ruby
rust
scons
sed
sg3_utils
shadow-utils
slang
snappy
socat
sqlite
sshpass
strace
strongswan
subversion
sudo
swig
syslinux
syslog-ng
sysstat
systemd-bootstrap
systemtap
tar
tboot
tcl
tcpdump
tcsh
tdnf
telegraf
texinfo
tmux
tpm2-abrmd
tpm2-pkcs11
tpm2-pytss
tpm2-tools
tpm2-tss
traceroute
tree
tzdata
unbound
unixODBC
unzip
usbutils
userspace-rcu
utf8proc
util-linux
valgrind
vim
vsftpd
WALinuxAgent
which
wpa_supplicant
xfsprogs
xinetd
xmlsec1
xmlto
xz
zchunk
zeromq
zip
zlib
zsh | +| Photon | [Photon License](LICENSE-PHOTON.md) and [Photon Notice](NOTICE.APACHE2).
Also see [LICENSE-EXCEPTIONS.PHOTON](LICENSE-EXCEPTIONS.PHOTON). | acl
alsa-lib
alsa-utils
ansible
apr
apr-util
asciidoc
atftp
audit
autoconf
autoconf-archive
autofs
autogen
automake
babel
bash
bc
bcc
bind
binutils
bison
blktrace
boost
btrfs-progs
bubblewrap
build-essential
bzip2
c-ares
cairo
cassandra
cdrkit
check
chkconfig
chrpath
cifs-utils
clang
cloud-init
cloud-utils-growpart
cmake
cni-plugins
core-packages
coreutils
cpio
cppunit
cracklib
crash
crash-gcore-command
createrepo_c
cri-tools
cronie
curl
cyrus-sasl
cyrus-sasl-bootstrap
dbus
dbus-glib
dejagnu
device-mapper-multipath
dialog
diffutils
dkms
dmidecode
dnsmasq
docbook-dtd-xml
docbook-style-xsl
dosfstools
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
emacs
erlang
etcd
ethtool
expat
expect
fcgi
file
filesystem
findutils
flex
fontconfig
fping
freetype
fuse
gawk
gc
gcc
gdb
gdbm
gettext
git
git-lfs
glib
glib-networking
glibc
glibmm
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang
golang-1.23
gperf
gperftools
gpgme
gptfdisk
grep
groff
grub2
gtest
gtk-doc
guile
gzip
haproxy
harfbuzz
haveged
hdparm
http-parser
httpd
i2c-tools
iana-etc
icu
initramfs
initscripts
inotify-tools
intltool
iotop
iperf3
iproute
ipset
iptables
iputils
ipvsadm
ipxe
irqbalance
itstool
jansson
jq
json-c
json-glib
kbd
keepalived
kernel
kernel-64k
kernel-headers
kernel-ipe
kernel-lpg-innovate
kernel-mshv
kernel-rt
kernel-uvm
keyutils
kmod
krb5
less
libaio
libarchive
libassuan
libatomic_ops
libcap
libcap-ng
libconfig
libdb
libdnet
libedit
libestr
libevent
libfastjson
libffi
libgcrypt
libgpg-error
libgssglue
libgudev
libjpeg-turbo
libksba
liblogging
libmbim
libmnl
libmodulemd
libmpc
libmspack
libndp
libnetfilter_conntrack
libnetfilter_cthelper
libnetfilter_cttimeout
libnetfilter_queue
libnfnetlink
libnftnl
libnl3
libnsl2
libpcap
libpipeline
libpng
libpsl
libqmi
librelp
librepo
librsync
libseccomp
libselinux
libsepol
libserf
libsigc++30
libsolv
libsoup
libssh2
libtalloc
libtar
libtasn1
libtiff
libtirpc
libtool
libunistring
libunwind
libusb
libvirt
libwebp
libxml2
libxslt
libyaml
linux-firmware
lldb
lldpad
llvm
lm-sensors
lmdb
log4cpp
logrotate
lshw
lsof
lsscsi
ltrace
lttng-tools
lttng-ust
lvm2
lz4
lzo
m2crypto
m4
make
man-db
man-pages
mariadb
maven
mc
mercurial
meson
mlocate
ModemManager
mpfr
msr-tools
mysql
nano
nasm
ncurses
ndctl
net-snmp
net-tools
nettle
newt
nfs-utils
nghttp2
nginx
ninja-build
nodejs
npth
nspr
nss
nss-altfiles
ntp
numactl
nvme-cli
oniguruma
OpenIPMI
openldap
openscap
openssh
openvswitch
ostree
pam
pango
parted
patch
pciutils
perl-Canary-Stability
perl-CGI
perl-common-sense
perl-Crypt-SSLeay
perl-DBD-SQLite
perl-DBI
perl-DBIx-Simple
perl-Exporter-Tiny
perl-File-HomeDir
perl-File-Which
perl-IO-Socket-SSL
perl-JSON-Any
perl-JSON-XS
perl-libintl-perl
perl-List-MoreUtils
perl-Module-Build
perl-Module-Install
perl-Module-ScanDeps
perl-Net-SSLeay
perl-NetAddr-IP
perl-Object-Accessor
perl-Path-Class
perl-Try-Tiny
perl-Types-Serialiser
perl-WWW-Curl
perl-XML-Parser
perl-YAML
perl-YAML-Tiny
pgbouncer
pinentry
polkit
popt
postgresql
procps-ng
protobuf
protobuf-c
psmisc
pth
pyasn1-modules
pyOpenSSL
pyparsing
pytest
python-appdirs
python-asn1crypto
python-atomicwrites
python-attrs
python-bcrypt
python-certifi
python-cffi
python-chardet
python-configobj
python-constantly
python-coverage
python-cryptography
python-daemon
python-dateutil
python-defusedxml
python-distro
python-docopt
python-docutils
python-ecdsa
python-gevent
python-hyperlink
python-hypothesis
python-idna
python-imagesize
python-incremental
python-iniparse
python-ipaddr
python-jinja2
python-jmespath
python-jsonpatch
python-jsonpointer
python-jsonschema
python-lockfile
python-lxml
python-mako
python-markupsafe
python-mistune
python-msgpack
python-netaddr
python-netifaces
python-ntplib
python-oauthlib
python-packaging
python-pam
python-pbr
python-ply
python-prettytable
python-psutil
python-psycopg2
python-py
python-pyasn1
python-pycodestyle
python-pycparser
python-pycurl
python-pygments
python-pynacl
python-requests
python-setuptools_scm
python-simplejson
python-six
python-snowballstemmer
python-sphinx-theme-alabaster
python-twisted
python-urllib3
python-vcversioner
python-virtualenv
python-wcwidth
python-webob
python-websocket-client
python-werkzeug
python-zope-event
python-zope-interface
python3
pytz
PyYAML
rapidjson
readline
rng-tools
rpcbind
rpcsvc-proto
rpm
rpm-ostree
rrdtool
rsync
rsyslog
ruby
rust
rust-1.75
scons
sed
sg3_utils
shadow-utils
slang
snappy
socat
sqlite
sshpass
strace
strongswan
subversion
sudo
swig
syslinux
syslog-ng
sysstat
systemd-bootstrap
systemtap
tar
tboot
tcl
tcpdump
tcsh
tdnf
telegraf
texinfo
tmux
tpm2-abrmd
tpm2-pkcs11
tpm2-pytss
tpm2-tools
tpm2-tss
traceroute
tree
tzdata
unbound
unixODBC
unzip
usbutils
userspace-rcu
utf8proc
util-linux
valgrind
vim
vsftpd
WALinuxAgent
which
wpa_supplicant
xfsprogs
xinetd
xmlsec1
xmlto
xz
zchunk
zeromq
zip
zlib
zsh | | RPM software management source | [GPLv2+ License](https://github.com/rpm-software-management/dnf5/blob/main/COPYING.md) | dnf5 | | Source project | Same as the source project. | python-nocaselist | | Sysbench source | [GPLv2+ License](https://github.com/akopytov/sysbench/blob/master/COPYING) | sysbench | diff --git a/LICENSES-AND-NOTICES/SPECS/data/licenses.json b/LICENSES-AND-NOTICES/SPECS/data/licenses.json index ef81d1027f3..3bbe0da4d8e 100644 --- a/LICENSES-AND-NOTICES/SPECS/data/licenses.json +++ b/LICENSES-AND-NOTICES/SPECS/data/licenses.json @@ -3084,6 +3084,7 @@ "rsyslog", "ruby", "rust", + "rust-1.75", "scons", "sed", "sg3_utils", diff --git a/SPECS-EXTENDED/389-ds-base/389-ds-base.spec b/SPECS-EXTENDED/389-ds-base/389-ds-base.spec index 0b608b1caa9..a8702336305 100644 --- a/SPECS-EXTENDED/389-ds-base/389-ds-base.spec +++ b/SPECS-EXTENDED/389-ds-base/389-ds-base.spec @@ -68,7 +68,7 @@ ExcludeArch: i686 Summary: 389 Directory Server (%{variant}) Name: 389-ds-base Version: 3.1.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-3.0-or-later AND (0BSD OR Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT) AND (CC-BY-4.0 AND MIT) AND (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND (MIT OR CC0-1.0) AND (MIT OR Unlicense) AND 0BSD AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MIT AND ISC AND MPL-2.0 AND PSF-2.0 URL: https://www.port389.org Vendor: Microsoft Corporation @@ -732,6 +732,9 @@ exit 0 %endif %changelog +* Mon Apr 21 2025 Kavya Sree Kaitepalli 3.1.1-3 +- Bump release to build with rust 1.85.0 + * Fri Sep 20 2024 Muhammad Falak 3.1.0-2 - Initial Azure Linux import from Fedora 42 (license: MIT) - License verified diff --git a/SPECS-EXTENDED/ripgrep/ripgrep.spec b/SPECS-EXTENDED/ripgrep/ripgrep.spec index 544c2c754f8..6c4a7396563 100644 --- a/SPECS-EXTENDED/ripgrep/ripgrep.spec +++ b/SPECS-EXTENDED/ripgrep/ripgrep.spec @@ -20,7 +20,7 @@ Name: ripgrep Version: 13.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A search tool that combines ag with grep License: MIT AND Unlicense Vendor: Microsoft Corporation @@ -31,7 +31,7 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Source1: %{name}-%{version}-vendor.tar.xz Source2: cargo_config BuildRequires: cargo -BuildRequires: rust >= 1.31 +BuildRequires: rust BuildRequires: rubygem(asciidoctor) %description @@ -104,6 +104,9 @@ install -Dm 644 complete/_rg %{buildroot}%{_datadir}/zsh/site-functions/_rg %{_datadir}/zsh %changelog +* Mon Apr 21 2025 Kavya Sree Kaitepalli - 13.0.0-6 +- Bump release to build with rust 1.85.0 + * Thu Sep 07 2023 Daniel McIlvaney - 13.0.0-5 - Bump package to rebuild with rust 1.72.0 diff --git a/SPECS-EXTENDED/rust-cbindgen/rust-cbindgen.spec b/SPECS-EXTENDED/rust-cbindgen/rust-cbindgen.spec index a896e1191f3..2764b2fe0d7 100644 --- a/SPECS-EXTENDED/rust-cbindgen/rust-cbindgen.spec +++ b/SPECS-EXTENDED/rust-cbindgen/rust-cbindgen.spec @@ -2,7 +2,7 @@ Summary: Tool for generating C bindings to Rust code Name: rust-cbindgen Version: 0.24.3 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Azure Linux @@ -20,8 +20,8 @@ Source2: cargo_config %global rustflags '-Clink-arg=-Wl,-z,relro,-z,now' %global _description %{expand: A tool for generating C bindings to Rust code.} -BuildRequires: cargo >= 1.45 -BuildRequires: rust >= 1.45 +BuildRequires: cargo +BuildRequires: rust %description %{_description} @@ -96,6 +96,9 @@ RUSTFLAGS=%{rustflags} cargo test --release %endif %changelog +* Mon Apr 21 2025 Kavya Sree Kaitepalli - 0.24.3-2 +- Bump release to build with rust 1.85.0 + * Mon Sep 25 2023 Shweta Bindal - 0.24.3-1 - Initial CBL-Mariner import from Fedora 38 (license: MIT). - License verified diff --git a/SPECS/clamav/clamav.spec b/SPECS/clamav/clamav.spec index 649d34afa5a..40fbf28ccf2 100644 --- a/SPECS/clamav/clamav.spec +++ b/SPECS/clamav/clamav.spec @@ -1,7 +1,7 @@ Summary: Open source antivirus engine Name: clamav Version: 1.0.7 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 AND BSD AND bzip2-1.0.4 AND GPLv2 AND LGPLv2+ AND MIT AND Public Domain AND UnRar Vendor: Microsoft Corporation Distribution: Azure Linux @@ -31,7 +31,7 @@ BuildRequires: pcre2-devel BuildRequires: python3 BuildRequires: python3-pip BuildRequires: python3-pytest -BuildRequires: rust +BuildRequires: rust < 1.85.0 BuildRequires: systemd BuildRequires: systemd-devel BuildRequires: systemd-rpm-macros @@ -136,6 +136,9 @@ fi %dir %attr(-,clamav,clamav) %{_sharedstatedir}/clamav %changelog +* Mon Apr 21 2025 Kavya Sree Kaitepalli - 1.0.7-2 +- Pin rust version + * Fri Oct 18 2024 Archana Choudhary - 1.0.7-1 - Upgrade to version 1.0.7 - Fixes CVE-2024-20506, CVE-2024-20505 diff --git a/SPECS/cloud-hypervisor-cvm/cloud-hypervisor-cvm.spec b/SPECS/cloud-hypervisor-cvm/cloud-hypervisor-cvm.spec index 1190f0b6512..fbc18537230 100644 --- a/SPECS/cloud-hypervisor-cvm/cloud-hypervisor-cvm.spec +++ b/SPECS/cloud-hypervisor-cvm/cloud-hypervisor-cvm.spec @@ -5,7 +5,7 @@ Name: cloud-hypervisor-cvm Summary: Cloud Hypervisor CVM is an open source Virtual Machine Monitor (VMM) that enables running SEV SNP enabled VMs on top of MSHV using the IGVM file format as payload. Version: 38.0.72.2 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 OR BSD-3-clause Vendor: Microsoft Corporation Distribution: Azure Linux @@ -40,8 +40,8 @@ BuildRequires: glibc-devel BuildRequires: openssl-devel %if ! 0%{?using_rustup} -BuildRequires: rust >= 1.62.0 -BuildRequires: cargo >= 1.62.0 +BuildRequires: rust < 1.85.0 +BuildRequires: cargo < 1.85.0 %endif Requires: bash @@ -148,6 +148,9 @@ cargo build --release --target=%{rust_musl_target} %{cargo_pkg_feature_opts} %{c %license LICENSE-BSD-3-Clause %changelog +* Mon Apr 21 2025 Kavya Sree Kaitepalli - 38.0.72.2-4 +- Pin rust version + * Sun Feb 16 2025 Kanishk Bansal - 38.0.72.2-3 - Patch CVE-2024-12797 diff --git a/SPECS/flux/flux.spec b/SPECS/flux/flux.spec index 4516d7ea43b..528704ddcce 100644 --- a/SPECS/flux/flux.spec +++ b/SPECS/flux/flux.spec @@ -22,7 +22,7 @@ Summary: Influx data language Name: flux Version: 0.194.5 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Azure Linux @@ -43,9 +43,9 @@ Patch1: disable-static-library.patch # Fixed upstream in 1.195.0, https://github.com/influxdata/flux/pull/5484. Patch2: fix-build-warnings.patch Patch3: fix-unsigned-char.patch -BuildRequires: cargo >= 1.45 +BuildRequires: cargo < 1.85.0 BuildRequires: kernel-headers -BuildRequires: rust >= 1.45 +BuildRequires: rust < 1.85.0 %description Flux is a lightweight scripting language for querying databases (like InfluxDB) @@ -144,6 +144,9 @@ RUSTFLAGS=%{rustflags} cargo test --release %{_includedir}/influxdata/flux.h %changelog +* Mon Apr 21 2025 Kavya Sree Kaitepalli - 0.194.5-3 +- Pin rust version + * Mon Apr 14 2025 Tobias Brick - 0.194.5-2 - Add missing EOF for inline patch call. - Fix build warnings rather than suppressing them. diff --git a/SPECS/influxdb/influxdb.spec b/SPECS/influxdb/influxdb.spec index a32ab9614af..5dd0f6d9397 100644 --- a/SPECS/influxdb/influxdb.spec +++ b/SPECS/influxdb/influxdb.spec @@ -18,7 +18,7 @@ Summary: Scalable datastore for metrics, events, and real-time analytics Name: influxdb Version: 2.7.5 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Azure Linux @@ -68,7 +68,7 @@ BuildRequires: clang BuildRequires: golang BuildRequires: kernel-headers BuildRequires: protobuf-devel -BuildRequires: rust >= 1.60.0 +BuildRequires: rust < 1.85.0 BuildRequires: systemd-rpm-macros BuildRequires: tzdata # IMPORTANT: when upgrading this, make sure the flux version matches what is required by go.mod file in the soure code of influxdb. @@ -153,6 +153,9 @@ go test ./... %{_tmpfilesdir}/influxdb.conf %changelog +* Mon Apr 21 2025 Kavya Sree Kaitepalli - 2.7.5-3 +- Pin rust version + * Mon Mar 03 2025 Kanishk Bansal - 2.7.5-2 - Fix CVE-2025-22868, CVE-2025-27144 with an upstream patch diff --git a/SPECS/kata-containers-cc/kata-containers-cc.spec b/SPECS/kata-containers-cc/kata-containers-cc.spec index 0df89c7b17b..6fd2b7f1c8d 100644 --- a/SPECS/kata-containers-cc/kata-containers-cc.spec +++ b/SPECS/kata-containers-cc/kata-containers-cc.spec @@ -3,7 +3,7 @@ Name: kata-containers-cc Version: 3.2.0.azl5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kata Confidential Containers package developed for Confidential Containers on AKS License: ASL 2.0 URL: https://github.com/microsoft/kata-containers @@ -17,7 +17,7 @@ ExclusiveArch: x86_64 BuildRequires: azurelinux-release BuildRequires: golang BuildRequires: protobuf-compiler -BuildRequires: rust +BuildRequires: rust < 1.85.0 BuildRequires: libseccomp-devel BuildRequires: openssl-devel BuildRequires: clang @@ -150,6 +150,9 @@ fi %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr/lib/systemd/system/kata-agent.service %changelog +* Mon Apr 21 2025 Kavya Sree Kaitepalli - 3.2.0.azl5-2 +- Pin rust version + * Fri Mar 28 2025 CBL-Mariner Servicing Account - 3.2.0.azl5-1 - Auto-upgrade to 3.2.0.azl5 diff --git a/SPECS/kata-containers/kata-containers.spec b/SPECS/kata-containers/kata-containers.spec index 88dc1d11e98..d43cf63750d 100644 --- a/SPECS/kata-containers/kata-containers.spec +++ b/SPECS/kata-containers/kata-containers.spec @@ -2,7 +2,7 @@ Name: kata-containers Version: 3.2.0.azl5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kata Containers package developed for Pod Sandboxing on AKS License: ASL 2.0 URL: https://github.com/microsoft/kata-containers @@ -16,7 +16,7 @@ ExclusiveArch: x86_64 BuildRequires: azurelinux-release BuildRequires: golang BuildRequires: protobuf-compiler -BuildRequires: rust +BuildRequires: rust < 1.85.0 BuildRequires: libseccomp-devel BuildRequires: openssl-devel BuildRequires: clang @@ -112,6 +112,9 @@ popd %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr/lib/systemd/system/kata-agent.service %changelog +* Mon Apr 21 2025 Kavya Sree Kaitepalli - 3.2.0.azl5-2 +- Pin rust version + * Fri Mar 28 2025 CBL-Mariner Servicing Account - 3.2.0.azl5-1 - Auto-upgrade to 3.2.0.azl5 diff --git a/SPECS/librsvg2/librsvg2.spec b/SPECS/librsvg2/librsvg2.spec index 8233fc0ca52..c7dbc0abaf5 100644 --- a/SPECS/librsvg2/librsvg2.spec +++ b/SPECS/librsvg2/librsvg2.spec @@ -8,7 +8,7 @@ Summary: An SVG library based on cairo Name: librsvg2 Version: 2.58.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Vendor: Microsoft Corporation Distribution: Azure Linux @@ -31,7 +31,7 @@ BuildRequires: gobject-introspection-devel BuildRequires: harfbuzz-devel >= 2.0.0 BuildRequires: make BuildRequires: pkgconfig -BuildRequires: rust +BuildRequires: rust < 1.85.0 BuildRequires: vala BuildRequires: vala-devel BuildRequires: vala-tools @@ -125,6 +125,9 @@ rm -vrf %{buildroot}%{_docdir} %{_bindir}/rsvg-convert %changelog +* Mon Apr 21 2025 Kavya Sree Kaitepalli - 2.58.1-2 +- Pin rust version + * Tue Jun 04 2024 Nicolas Guibourge - 2.58.1-1 - Upgrade to 2.58.1 diff --git a/SPECS/mesa/mesa.spec b/SPECS/mesa/mesa.spec index 26d92cf0c70..3e1e9f1af83 100644 --- a/SPECS/mesa/mesa.spec +++ b/SPECS/mesa/mesa.spec @@ -67,7 +67,7 @@ Name: mesa Summary: Mesa graphics libraries Version: 24.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Vendor: Microsoft Corporation Distribution: Azure Linux @@ -144,7 +144,7 @@ BuildRequires: llvm-devel >= 7.0.0 %if 0%{?with_opencl} || 0%{?with_nvk} BuildRequires: clang-devel BuildRequires: bindgen -BuildRequires: rust +BuildRequires: rust < 1.85.0 BuildRequires: pkgconfig(libclc) BuildRequires: pkgconfig(SPIRV-Tools) BuildRequires: pkgconfig(LLVMSPIRVLib) @@ -741,6 +741,9 @@ popd %endif %changelog +* Mon Apr 21 2025 Kavya Sree Kaitepalli - 24.0.1-2 +- Pin rust version + * Thu Feb 29 2024 Vince Perri - 24.0.1-1 - Upgrade to 24.0.1 based on Fedora 40. - License verified. diff --git a/SPECS/netavark/netavark.spec b/SPECS/netavark/netavark.spec index 042dd2383eb..5b8a4ff1502 100644 --- a/SPECS/netavark/netavark.spec +++ b/SPECS/netavark/netavark.spec @@ -11,7 +11,7 @@ Name: netavark Version: 1.10.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCI network stack License: ASL 2.0 and BSD and MIT Vendor: Microsoft Corporation @@ -19,11 +19,11 @@ Distribution: Azure Linux URL: https://github.com/containers/%{name} Source0: %{url}/archive/%{built_tag}/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{url}/releases/download/%{built_tag}/%{name}-%{built_tag}-vendor.tar.gz -BuildRequires: cargo +BuildRequires: cargo < 1.85.0 BuildRequires: make BuildRequires: protobuf-c BuildRequires: protobuf-compiler -BuildRequires: rust +BuildRequires: rust < 1.85.0 BuildRequires: git BuildRequires: go-md2man Recommends: aardvark-dns >= 1.10.3-1 @@ -225,6 +225,9 @@ popd %{_unitdir}/%{name}-firewalld-reload.service %changelog +* Mon Apr 21 2025 Kavya Sree Kaitepalli - 1.10.3-2 +- Pin rust version + * Thu Feb 22 2024 Mitch Zhu - 1.10.3-1 - upgrade to v1.10.3 diff --git a/SPECS/rpm-ostree/rpm-ostree.spec b/SPECS/rpm-ostree/rpm-ostree.spec index 47b6b44689a..d9ef817c98c 100644 --- a/SPECS/rpm-ostree/rpm-ostree.spec +++ b/SPECS/rpm-ostree/rpm-ostree.spec @@ -1,7 +1,7 @@ Summary: Commit RPMs to an OSTree repository Name: rpm-ostree Version: 2024.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Vendor: Microsoft Corporation Distribution: Azure Linux @@ -15,7 +15,7 @@ BuildRequires: autoconf BuildRequires: autogen BuildRequires: automake BuildRequires: bubblewrap -BuildRequires: cargo +BuildRequires: cargo < 1.85.0 BuildRequires: check BuildRequires: cppunit-devel BuildRequires: createrepo_c @@ -45,7 +45,7 @@ BuildRequires: polkit-devel BuildRequires: popt-devel BuildRequires: python3-devel BuildRequires: python3-pygments -BuildRequires: rust +BuildRequires: rust < 1.85.0 BuildRequires: sqlite-devel BuildRequires: systemd-devel BuildRequires: which @@ -177,6 +177,9 @@ make check %{_datadir}/gir-1.0/*-1.0.gir %changelog +* Mon Apr 21 2025 Kavya Sree Kaitepalli - 2024.4-2 +- Pin rust version + * Fri Apr 05 2024 Betty Lakes - 2024.4-1 - Upgrade to 2024.4 and remove libgsystem dependency diff --git a/SPECS/rust/Ignore_failing_ci_tests.patch b/SPECS/rust/Ignore_failing_ci_tests.patch new file mode 100644 index 00000000000..1c87e6ce63a --- /dev/null +++ b/SPECS/rust/Ignore_failing_ci_tests.patch @@ -0,0 +1,45 @@ +From 12051f0e3d8e9015ea12cde503a3d24d78e934b0 Mon Sep 17 00:00:00 2001 +From: kavyasree +Date: Wed, 26 Feb 2025 15:53:42 +0530 +Subject: [PATCH] Ignoring_failing_ci_tests + +--- + src/bootstrap/src/core/builder/tests.rs | 1 + + src/bootstrap/src/core/config/tests.rs | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs +index 21694cf46..7b701f48e 100644 +--- a/src/bootstrap/src/core/builder/tests.rs ++++ b/src/bootstrap/src/core/builder/tests.rs +@@ -202,6 +202,7 @@ fn alias_and_path_for_library() { + ]); + } + ++#[ignore] + #[test] + fn ci_rustc_if_unchanged_logic() { + let config = Config::parse_inner( +diff --git a/src/bootstrap/src/core/config/tests.rs b/src/bootstrap/src/core/config/tests.rs +index 24f932a17..51ab892f1 100644 +--- a/src/bootstrap/src/core/config/tests.rs ++++ b/src/bootstrap/src/core/config/tests.rs +@@ -20,6 +20,7 @@ pub(crate) fn parse(config: &str) -> Config { + ) + } + ++#[ignore] + #[test] + fn download_ci_llvm() { + let config = parse(""); +@@ -433,6 +434,7 @@ fn jobs_precedence() { + assert_eq!(config.jobs, Some(123)); + } + ++#[ignore] + #[test] + fn check_rustc_if_unchanged_paths() { + let config = parse(""); +-- +2.34.1 + diff --git a/SPECS/rust/generate_source_tarball-1.75 b/SPECS/rust/generate_source_tarball-1.75 new file mode 100644 index 00000000000..766034aa69e --- /dev/null +++ b/SPECS/rust/generate_source_tarball-1.75 @@ -0,0 +1,121 @@ +#!/bin/bash +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. + +# Quit on failure +set -e + +PKG_VERSION="" +SRC_TARBALL="" +OUT_FOLDER="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +# parameters: +# +# --srcTarball : src tarball file +# this file contains the 'initial' source code of the component +# and should be replaced with the new/modified src code +# --outFolder : folder where to copy the new tarball(s) +# --pkgVersion : package version +# +PARAMS="" +while (( "$#" )); do + case "$1" in + --srcTarball) + if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then + SRC_TARBALL=$2 + shift 2 + else + echo "Error: Argument for $1 is missing" >&2 + exit 1 + fi + ;; + --outFolder) + if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then + OUT_FOLDER=$2 + shift 2 + else + echo "Error: Argument for $1 is missing" >&2 + exit 1 + fi + ;; + --pkgVersion) + if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then + PKG_VERSION=$2 + shift 2 + else + echo "Error: Argument for $1 is missing" >&2 + exit 1 + fi + ;; + -*|--*=) # unsupported flags + echo "Error: Unsupported flag $1" >&2 + exit 1 + ;; + *) # preserve positional arguments + PARAMS="$PARAMS $1" + shift + ;; + esac +done + +echo "--srcTarball -> $SRC_TARBALL" +echo "--outFolder -> $OUT_FOLDER" +echo "--pkgVersion -> $PKG_VERSION" + +if [ -z "$PKG_VERSION" ]; then + echo "--pkgVersion parameter cannot be empty" + exit 1 +fi + +echo "-- create temp folder" +tmpdir=$(mktemp -d) +function cleanup { + echo "+++ cleanup -> remove $tmpdir" + rm -rf $tmpdir +} +trap cleanup EXIT + +src_folder="$tmpdir/srcFolder" +src_root="$src_folder/rustc-$PKG_VERSION-src" +temp_cache="$tmpdir/cacheFolder" +mkdir -p $src_folder +mkdir -p $temp_cache + +pushd $src_folder > /dev/null +echo "Unpacking source tarball..." +tar -xf $SRC_TARBALL +popd > /dev/null + +pushd $src_root > /dev/null +echo "Fetching dependencies to a temporary cache" +# The build environment's rust may not have all the features required to run +# cargo fetch, so we need to use the bootstrap mode that disables some features. +export RUSTC_BOOTSTRAP=1 +CARGO_HOME=$src_root/.cargo cargo fetch +echo "Compressing the cache." +tar --sort=name --mtime="2021-04-26 00:00Z" \ + --owner=0 --group=0 --numeric-owner \ + --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime -cf \ + "$OUT_FOLDER/rustc-$PKG_VERSION-src-cargo.tar.gz" .cargo +popd > /dev/null + +pushd $OUT_FOLDER > /dev/null +echo "get additional src tarballs" +CONFIG_FILE="$src_root/src/stage0.json" +RUST_RELEASE_DATE=$(cat $CONFIG_FILE | jq -r '.compiler.date') +RUST_STAGE0_VERSION=$(cat $CONFIG_FILE | jq -r '.compiler.version') +wget https://static.rust-lang.org/dist/$RUST_RELEASE_DATE/cargo-$RUST_STAGE0_VERSION-x86_64-unknown-linux-gnu.tar.xz +wget https://static.rust-lang.org/dist/$RUST_RELEASE_DATE/rustc-$RUST_STAGE0_VERSION-x86_64-unknown-linux-gnu.tar.xz +wget https://static.rust-lang.org/dist/$RUST_RELEASE_DATE/rust-std-$RUST_STAGE0_VERSION-x86_64-unknown-linux-gnu.tar.xz +wget https://static.rust-lang.org/dist/$RUST_RELEASE_DATE/cargo-$RUST_STAGE0_VERSION-aarch64-unknown-linux-gnu.tar.xz +wget https://static.rust-lang.org/dist/$RUST_RELEASE_DATE/rustc-$RUST_STAGE0_VERSION-aarch64-unknown-linux-gnu.tar.xz +wget https://static.rust-lang.org/dist/$RUST_RELEASE_DATE/rust-std-$RUST_STAGE0_VERSION-aarch64-unknown-linux-gnu.tar.xz + + +popd > /dev/null +echo "==========================" +echo "release date: $RUST_RELEASE_DATE" +echo "stage0 version: $RUST_STAGE0_VERSION" +echo " " +echo "Rust additional src tarballs are available at $OUT_FOLDER" +ls -ls $OUT_FOLDER diff --git a/SPECS/rust/generate_source_tarball.sh b/SPECS/rust/generate_source_tarball.sh index 766034aa69e..aa408644660 100755 --- a/SPECS/rust/generate_source_tarball.sh +++ b/SPECS/rust/generate_source_tarball.sh @@ -101,9 +101,10 @@ popd > /dev/null pushd $OUT_FOLDER > /dev/null echo "get additional src tarballs" -CONFIG_FILE="$src_root/src/stage0.json" -RUST_RELEASE_DATE=$(cat $CONFIG_FILE | jq -r '.compiler.date') -RUST_STAGE0_VERSION=$(cat $CONFIG_FILE | jq -r '.compiler.version') +CONFIG_FILE="$src_root/src/stage0" +RUST_RELEASE_DATE=$(grep "^compiler_date=" $CONFIG_FILE | cut -d '=' -f 2) +RUST_STAGE0_VERSION=$(grep "^compiler_version=" $CONFIG_FILE | cut -d '=' -f 2) + wget https://static.rust-lang.org/dist/$RUST_RELEASE_DATE/cargo-$RUST_STAGE0_VERSION-x86_64-unknown-linux-gnu.tar.xz wget https://static.rust-lang.org/dist/$RUST_RELEASE_DATE/rustc-$RUST_STAGE0_VERSION-x86_64-unknown-linux-gnu.tar.xz wget https://static.rust-lang.org/dist/$RUST_RELEASE_DATE/rust-std-$RUST_STAGE0_VERSION-x86_64-unknown-linux-gnu.tar.xz diff --git a/SPECS/rust/rust-1.75.signatures.json b/SPECS/rust/rust-1.75.signatures.json new file mode 100644 index 00000000000..b04eb3fd8a0 --- /dev/null +++ b/SPECS/rust/rust-1.75.signatures.json @@ -0,0 +1,12 @@ +{ + "Signatures": { + "cargo-1.74.0-aarch64-unknown-linux-gnu.tar.xz": "a18dc9132cf76ccba90bcbb53b56a4d37ebfb34845f61e79f7b5d4710a269647", + "cargo-1.74.0-x86_64-unknown-linux-gnu.tar.xz": "f219386d4569c40b660518e99267afff428c13bf980bda7a614c8d4038d013f6", + "rust-std-1.74.0-aarch64-unknown-linux-gnu.tar.xz": "c5ad01692bc08ce6f4db2ac815be63498b45013380c71f22b3d33bf3be767270", + "rust-std-1.74.0-x86_64-unknown-linux-gnu.tar.xz": "548413213012e2f62b08ed8a913a51210ae7402619027224580176031f2789ea", + "rustc-1.74.0-aarch64-unknown-linux-gnu.tar.xz": "a49bb365481913ead305658e7e9dc621da7895036b840fb57b1bc85c721d07e6", + "rustc-1.74.0-x86_64-unknown-linux-gnu.tar.xz": "7d464be2ae0d6ce69f056d1ea9a8ce2b3b1d537418caea216fdd303903972181", + "rustc-1.75.0-src-cargo.tar.gz": "8b41ba09a0e998fce6bafa69c93c8c5384b29b38438104db7c98e348b4759979", + "rustc-1.75.0-src.tar.xz": "4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340" + } +} \ No newline at end of file diff --git a/SPECS/rust/rust-1.75.spec b/SPECS/rust/rust-1.75.spec new file mode 100644 index 00000000000..525a8236bcc --- /dev/null +++ b/SPECS/rust/rust-1.75.spec @@ -0,0 +1,330 @@ +# Prevent librustc_driver from inadvertently being listed as a requirement +%global __requires_exclude ^librustc_driver- + +# Release date and version of stage 0 compiler can be found in "src/stage0.json" inside the extracted "Source0". +# Look for "date:" and "rustc:". +%define release_date 2023-11-16 +%define stage0_version 1.74.0 + +Summary: Rust Programming Language +Name: rust +Version: 1.75.0 +Release: 13%{?dist} +License: (ASL 2.0 OR MIT) AND BSD AND CC-BY-3.0 +Vendor: Microsoft Corporation +Distribution: Azure Linux +Group: Applications/System +URL: https://www.rust-lang.org/ +# Notes: +# - rust source official repo is https://github.com/rust-lang/rust +# - cargo source official repo is https://github.com/rust-lang/cargo +# - crates.io source official repo is https://github.com/rust-lang/crates.io +Source0: https://static.rust-lang.org/dist/rustc-%{version}-src.tar.xz +# Note: the rust-%%{version}-cargo.tar.gz file contains a cache created by capturing the contents downloaded into $CARGO_HOME. +# To update the cache, leverage the: generate_source_tarball.sh +# +# An example run for rust 1.68.2: +# - Download Rust Source (1.68.2): +# wget https://static.rust-lang.org/dist/rustc-1.68.2-src.tar.xz +# - Create a directory to store the output from the script: +# mkdir rustOutputDir +# - Get prereqs for the script (for a mariner container): +# tdnf -y install rust wget jq tar ca-certificates +# - Run the script: +# ./generate_source_tarball --srcTarball path/to/rustc-1.68.2-src.tar.xz --outFolder path/to/rustOutputDir --pkgVersion 1.68.2 +# + +Source1: rustc-%{version}-src-cargo.tar.gz +Source2: https://static.rust-lang.org/dist/%{release_date}/cargo-%{stage0_version}-x86_64-unknown-linux-gnu.tar.xz +Source3: https://static.rust-lang.org/dist/%{release_date}/rustc-%{stage0_version}-x86_64-unknown-linux-gnu.tar.xz +Source4: https://static.rust-lang.org/dist/%{release_date}/rust-std-%{stage0_version}-x86_64-unknown-linux-gnu.tar.xz +Source5: https://static.rust-lang.org/dist/%{release_date}/cargo-%{stage0_version}-aarch64-unknown-linux-gnu.tar.xz +Source6: https://static.rust-lang.org/dist/%{release_date}/rustc-%{stage0_version}-aarch64-unknown-linux-gnu.tar.xz +Source7: https://static.rust-lang.org/dist/%{release_date}/rust-std-%{stage0_version}-aarch64-unknown-linux-gnu.tar.xz +Patch0: CVE-2023-45853.patch +Patch1: CVE-2024-32884.patch +Patch2: CVE-2024-31852.patch + +BuildRequires: binutils +BuildRequires: cmake +# make sure rust relies on curl from CBL-Mariner (instead of using its vendored flavor) +BuildRequires: curl-devel +BuildRequires: git +BuildRequires: glibc +# make sure rust relies on libgit2 from CBL-Mariner (instead of using its vendored flavor) +BuildRequires: libgit2-devel +# make sure rust relies on nghttp2 from CBL-Mariner (instead of using its vendored flavor) +BuildRequires: nghttp2-devel +BuildRequires: ninja-build +# make sure rust relies on openssl from CBL-Mariner (instead of using its vendored flavor) +BuildRequires: openssl-devel +BuildRequires: python3 +# make sure rust depends on system zlib +BuildRequires: zlib-devel +%if 0%{?with_check} +BuildRequires: glibc-static >= 2.38-9%{?dist} +%endif +# rustc uses a C compiler to invoke the linker, and links to glibc in most cases +Requires: binutils +Requires: curl +Requires: gcc +Requires: glibc-devel +Requires: libgit2 +Requires: nghttp2 +Requires: openssl +Provides: cargo = %{version}-%{release} + +%description +Rust Programming Language + +%package doc +Summary: Rust documentation. +BuildArch: noarch + +%description doc +Documentation package for Rust. + +%prep +# Setup .cargo directory +mkdir -p $HOME +pushd $HOME +tar -xf %{SOURCE1} --no-same-owner +popd +%autosetup -p1 -n rustc-%{version}-src + +# Setup build/cache directory +BUILD_CACHE_DIR="build/cache/%{release_date}" +mkdir -pv "$BUILD_CACHE_DIR" +%ifarch x86_64 +cp %{SOURCE2} "$BUILD_CACHE_DIR" +cp %{SOURCE3} "$BUILD_CACHE_DIR" +cp %{SOURCE4} "$BUILD_CACHE_DIR" +%endif +%ifarch aarch64 +cp %{SOURCE5} "$BUILD_CACHE_DIR" +cp %{SOURCE6} "$BUILD_CACHE_DIR" +cp %{SOURCE7} "$BUILD_CACHE_DIR" +%endif + +%build +# Disable symbol generation +export CFLAGS="`echo " %{build_cflags} " | sed 's/ -g//'`" +export CXXFLAGS="`echo " %{build_cxxflags} " | sed 's/ -g//'`" + +sh ./configure \ + --prefix=%{_prefix} \ + --enable-extended \ + --enable-profiler \ + --tools="cargo,clippy,rustfmt,rust-analyzer-proc-macro-srv,rust-demangler" \ + --release-channel="stable" \ + --release-description="Azure Linux %{version}-%{release}" + +# SUDO_USER=root bypasses a check in the python bootstrap that +# makes rust refuse to pull sources from the internet +USER=root SUDO_USER=root %make_build + +%check +# We expect to generate dynamic CI contents in this folder, but it will fail since the .github folder is not included +# with the published sources. +mkdir -p .github/workflows +./x.py run src/tools/expand-yaml-anchors + +ln -s %{_topdir}/BUILD/rustc-%{version}-src/build/x86_64-unknown-linux-gnu/stage2-tools-bin/rustfmt %{_topdir}/BUILD/rustc-%{version}-src/build/x86_64-unknown-linux-gnu/stage0/bin/ +ln -s %{_topdir}/BUILD/rustc-%{version}-src/vendor/ /root/vendor +# remove rustdoc ui flaky test issue-98690.rs (which is tagged with 'unstable-options') +rm -v ./tests/rustdoc-ui/issue-98690.* +%make_build check + +%install +USER=root SUDO_USER=root %make_install +mv %{buildroot}%{_docdir}/%{name}/LICENSE-THIRD-PARTY . +rm %{buildroot}%{_docdir}/%{name}/{COPYRIGHT,LICENSE-APACHE,LICENSE-MIT} +rm %{buildroot}%{_docdir}/%{name}/html/.lock +rm %{buildroot}%{_docdir}/%{name}/*.old +rm %{buildroot}%{_bindir}/*.old + +%ldconfig_scriptlets + +%files +%license LICENSE-APACHE LICENSE-MIT LICENSE-THIRD-PARTY COPYRIGHT +%{_bindir}/rustc +%{_bindir}/rustdoc +%{_bindir}/rust-lldb +%{_libdir}/lib*.so +%{_libdir}/rustlib/* +%{_libexecdir}/rust-analyzer-proc-macro-srv +%{_bindir}/rust-gdb +%{_bindir}/rust-gdbgui +%{_bindir}/rust-demangler +%{_bindir}/cargo +%{_bindir}/cargo-clippy +%{_bindir}/cargo-fmt +%{_bindir}/clippy-driver +%{_bindir}/rustfmt +%{_datadir}/zsh/* +%{_sysconfdir}/bash_completion.d/cargo + +%files doc +%license LICENSE-APACHE LICENSE-MIT LICENSE-THIRD-PARTY COPYRIGHT +%doc %{_docdir}/%{name}/html/* +%doc %{_docdir}/%{name}/README.md +%doc CONTRIBUTING.md README.md RELEASES.md +%doc src/tools/clippy/CHANGELOG.md +%doc src/tools/rustfmt/Configurations.md +%{_mandir}/man1/* + +%changelog +* Sun Apr 20 2025 Kavya Sree Kaitepalli - 1.75.0-13 +- Support rust 1.75 version +- Add explicit build dependency on zlib + +* Thu Feb 27 2025 Chris Co - 1.75.0-12 +- Bump to rebuild with updated glibc + +* Mon Aug 26 2024 Rachel Menge - 1.75.0-11 +- Update to build dep latest glibc-static version + +* Wed Aug 21 2024 Chris Co - 1.75.0-10 +- Bump to rebuild with updated glibc + +* Fri Aug 09 2024 corvus-callidus <108946721+corvus-callidus@users.noreply.github.com> - 1.75.0-9 +- Patch CVE-2024-32884 and CVE-2024-31852 + +* Wed May 29 2024 Neha Agarwal - 1.75.0-8 +- Bump release to build with new llvm to fix CVE-2024-31852 + +* Wed May 22 2024 Suresh Babu Chalamalasetty - 1.75.0-7 +- update to build dep latest glibc-static version + +* Mon May 13 2024 Chris Co - 1.75.0-6 +- Update to build dep latest glibc-static version + +* Mon Apr 01 2024 Muhammad Falak - 1.75.0-5 +- Enable profiler support + +* Mon Mar 11 2024 Dan Streetman - 1.75.0-4 +- update to build dep latest glibc-static version + +* Thu Feb 29 2024 Pawel Winogrodzki - 1.75.0-3 +- Updating naming for 3.0 version of Azure Linux. + +* Tue Feb 27 2024 Dan Streetman - 1.75.0-2 +- updated glibc-static buildrequires release + +* Mon Jan 29 2024 Muhammad Falak - 1.75.0-1 +- Bump version to 1.75.0 + +* Tue Nov 07 2023 Andrew Phelps - 1.72.0-6 +- Bump release to rebuild against glibc 2.38-1 + +* Mon Oct 30 2023 Rohit Rawat - 1.72.0-5 +- Patch CVE-2023-45853 in vendor/libz-sys/src/zlib + +* Tue Oct 10 2023 Daniel McIlvaney - 1.72.2-4 +- Explicitly call './x.py' instead of 'x.py' + +* Wed Oct 04 2023 Minghe Ren - 1.72.2-3 +- Bump release to rebuild against glibc 2.35-6 + +* Tue Oct 03 2023 Mandeep Plaha - 1.72.2-2 +- Bump release to rebuild against glibc 2.35-5 + +* Wed Sep 06 2023 Daniel McIlvaney - 1.72.2-1 +- Bump to version 1.72.2 to address CVE-2023-38497, CVE-2023-40030 + +* Tue Aug 22 2023 Rachel Menge - 1.68.2-5 +- Bump release to rebuild against openssl 1.1.1k-26 + +* Wed Jul 05 2023 Andrew Phelps - 1.68.2-4 +- Bump release to rebuild against glibc 2.35-4 + +* Wed Jun 21 2023 Jonathan Behrens - 1.68.2-3 +- Include "cargo-clippy" tool in the package. + +* Wed May 17 2023 Tobias Brick - 1.68.2-2 +- Fix CVE-2023-27477 by patching cranelift vulnerability that is exposed in rust + +* Tue Mar 28 2023 Muhammad Falak - 1.68.2-1 +- Bump version to 1.68.2 to revoke leaked github keys + +* Mon Mar 13 2023 Nicolas Guibourge - 1.68.0-1 +- Updating to version 1.68.0 + +* Thu Nov 24 2022 Pawel Winogrodzki - 1.62.1-4 +- Split out separate 'doc' subpackage to reduce default package size. +- Updated license information. + +* Tue Nov 01 2022 Pawel Winogrodzki - 1.62.1-3 +- Adding missing test dependency on "glibc-static". + +* Wed Aug 31 2022 Olivia Crain - 1.62.1-2 +- Breaking change: Configure as a stable release, which disables unstable features +- Add runtime requirements on gcc, binutils, glibc-devel +- Package ASL 2.0 license, additional copyright information +- Fix licensing info- dual-licensed, not multiply-licensed +- License verified + +* Thu Aug 18 2022 Chris Co - 1.62.1-1 +- Updating to version 1.62.1 + +* Mon Mar 07 2022 Pawel Winogrodzki - 1.59.0-1 +- Updating to version 1.59.0 to fix CVE-2022-21658. +- Updating build instructions to fix tests. + +* Thu Mar 03 2022 Bala - 1.56.1-2 +- Build rustfmt tool as it is required to run PTest +- Create softlink for rustfmt in stage0 + +* Wed Nov 24 2021 Pawel Winogrodzki - 1.56.1-1 +- Updating to version 1.56.1. +- Switching to building with Python 3. + +* Mon May 17 2021 Thomas Crain - 1.47.0-5 +- Add provides for 'cargo' from the base package + +* Tue May 04 2021 Thomas Crain - 1.47.0-4 +- Remove XZ support detection in bootstrap + +* Mon Apr 26 2021 Thomas Crain - 1.47.0-3 +- Patch CVE-2020-36317, CVE-2021-28875, CVE-2021-28876, CVE-2021-28877, CVE-2021-28878 +- Redo patch for CVE-2021-28879 with regards to patches listed above + +* Mon Apr 19 2021 Thomas Crain - 1.47.0-2 +- Patch CVE-2021-28879 + +* Wed Feb 24 2021 Andrew Phelps - 1.47.0-1 +- Update version to 1.47.0 + +* Wed Jan 06 2021 Thomas Crain - 1.39.0-8 +- Add python-xml BR for package test +- Add ignore-linker-output-non-utf8-test patch to skip faulty test + +* Wed Aug 12 2020 Mateusz Malisz - 1.39.0-7 +- Add patch for the build to not fail on file not found error. + +* Fri Jun 12 2020 Henry Beberman - 1.39.0-6 +- Temporarily disable generation of debug symbols. + +* Thu May 28 2020 Chris Co - 1.39.0-5 +- Update source checkout and prep steps + +* Sat May 09 2020 Nick Samson - 1.39.0-4 +- Added %%license line automatically + +* Mon May 4 2020 Nicolas Guibourge - 1.39.0-3 +- Fix build issue when building from Docker + +* Tue Apr 21 2020 Andrew Phelps - 1.39.0-2 +- Support building offline. + +* Thu Mar 19 2020 Henry Beberman - 1.39.0-1 +- Update to 1.39.0. Fix URL. Fix Source0 URL. License verified. + +* Thu Feb 27 2020 Henry Beberman - 1.34.2-3 +- Set SUDO_USER and USER to allow rust to hydrate as root + +* Wed Sep 25 2019 Saravanan Somasundaram - 1.34.2-2 +- Initial CBL-Mariner import from Photon (license: Apache2). + +* Wed May 15 2019 Ankit Jain - 1.34.2-1 +- Initial build. First version diff --git a/SPECS/rust/rust.signatures.json b/SPECS/rust/rust.signatures.json index b04eb3fd8a0..6f1467ab9c5 100644 --- a/SPECS/rust/rust.signatures.json +++ b/SPECS/rust/rust.signatures.json @@ -1,12 +1,12 @@ { "Signatures": { - "cargo-1.74.0-aarch64-unknown-linux-gnu.tar.xz": "a18dc9132cf76ccba90bcbb53b56a4d37ebfb34845f61e79f7b5d4710a269647", - "cargo-1.74.0-x86_64-unknown-linux-gnu.tar.xz": "f219386d4569c40b660518e99267afff428c13bf980bda7a614c8d4038d013f6", - "rust-std-1.74.0-aarch64-unknown-linux-gnu.tar.xz": "c5ad01692bc08ce6f4db2ac815be63498b45013380c71f22b3d33bf3be767270", - "rust-std-1.74.0-x86_64-unknown-linux-gnu.tar.xz": "548413213012e2f62b08ed8a913a51210ae7402619027224580176031f2789ea", - "rustc-1.74.0-aarch64-unknown-linux-gnu.tar.xz": "a49bb365481913ead305658e7e9dc621da7895036b840fb57b1bc85c721d07e6", - "rustc-1.74.0-x86_64-unknown-linux-gnu.tar.xz": "7d464be2ae0d6ce69f056d1ea9a8ce2b3b1d537418caea216fdd303903972181", - "rustc-1.75.0-src-cargo.tar.gz": "8b41ba09a0e998fce6bafa69c93c8c5384b29b38438104db7c98e348b4759979", - "rustc-1.75.0-src.tar.xz": "4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340" + "cargo-1.84.0-aarch64-unknown-linux-gnu.tar.xz": "68d4ad239b6d1e810e7b8591636dc408cb2c1e89661329fed906febf9c0a9d98", + "cargo-1.84.0-x86_64-unknown-linux-gnu.tar.xz": "6c2371488db92a09cd50a1b4045c022f3cf2c643285b3b21105ab5f9b64fd6b6", + "rust-std-1.84.0-aarch64-unknown-linux-gnu.tar.xz": "023f0b6153b23ac0e9686c2ab95bc393ee3e295b166bb36de3b4dfb53e3913e0", + "rust-std-1.84.0-x86_64-unknown-linux-gnu.tar.xz": "770237080b9310d126350c3bd70820bd91064c2e96c29ab5f2e002b31b5bd067", + "rustc-1.84.0-aarch64-unknown-linux-gnu.tar.xz": "9f5650aece53e083b933a57e5a8e0e2db4479f52ec897d5b6d0f77be6cd50498", + "rustc-1.84.0-x86_64-unknown-linux-gnu.tar.xz": "a1737d86f80b31a6d48a6726726275dc068ecb930c9635b13aa59999486de837", + "rustc-1.85.0-src-cargo.tar.gz": "aebfabef6090c81fff583d6172fbb4cf1d42d203df7ce6a9bba349abc3fc086c", + "rustc-1.85.0-src.tar.xz": "d542c397217b5ba5bac7eb274f5ca62d031f61842c3ba4cc5328c709c38ea1e7" } } \ No newline at end of file diff --git a/SPECS/rust/rust.spec b/SPECS/rust/rust.spec index 7668ae757f9..497a7b66774 100644 --- a/SPECS/rust/rust.spec +++ b/SPECS/rust/rust.spec @@ -1,15 +1,15 @@ # Prevent librustc_driver from inadvertently being listed as a requirement %global __requires_exclude ^librustc_driver- -# Release date and version of stage 0 compiler can be found in "src/stage0.json" inside the extracted "Source0". +# Release date and version of stage 0 compiler can be found in "src/stage0" inside the extracted "Source0". # Look for "date:" and "rustc:". -%define release_date 2023-11-16 -%define stage0_version 1.74.0 +%define release_date 2025-01-09 +%define stage0_version 1.84.0 Summary: Rust Programming Language Name: rust -Version: 1.75.0 -Release: 12%{?dist} +Version: 1.85.0 +Release: 1%{?dist} License: (ASL 2.0 OR MIT) AND BSD AND CC-BY-3.0 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -41,10 +41,9 @@ Source4: https://static.rust-lang.org/dist/%{release_date}/rust-std-%{sta Source5: https://static.rust-lang.org/dist/%{release_date}/cargo-%{stage0_version}-aarch64-unknown-linux-gnu.tar.xz Source6: https://static.rust-lang.org/dist/%{release_date}/rustc-%{stage0_version}-aarch64-unknown-linux-gnu.tar.xz Source7: https://static.rust-lang.org/dist/%{release_date}/rust-std-%{stage0_version}-aarch64-unknown-linux-gnu.tar.xz -Patch0: CVE-2023-45853.patch -Patch1: CVE-2024-32884.patch -Patch2: CVE-2024-31852.patch - +# These ci tests are expecting rust source to be git repository, since we are using a tarball +# we are missing git metadata so these tests are failing, hence ignoring these tests +Patch0: Ignore_failing_ci_tests.patch BuildRequires: binutils BuildRequires: cmake # make sure rust relies on curl from CBL-Mariner (instead of using its vendored flavor) @@ -59,8 +58,11 @@ BuildRequires: ninja-build # make sure rust relies on openssl from CBL-Mariner (instead of using its vendored flavor) BuildRequires: openssl-devel BuildRequires: python3 +# make sure rust depends on system zlib +BuildRequires: zlib-devel %if 0%{?with_check} BuildRequires: glibc-static >= 2.38-9%{?dist} +BuildRequires: sudo %endif # rustc uses a C compiler to invoke the linker, and links to glibc in most cases Requires: binutils @@ -113,7 +115,7 @@ sh ./configure \ --prefix=%{_prefix} \ --enable-extended \ --enable-profiler \ - --tools="cargo,clippy,rustfmt,rust-analyzer-proc-macro-srv,rust-demangler" \ + --tools="cargo,clippy,rustfmt,rust-analyzer-proc-macro-srv" \ --release-channel="stable" \ --release-description="Azure Linux %{version}-%{release}" @@ -125,21 +127,25 @@ USER=root SUDO_USER=root %make_build # We expect to generate dynamic CI contents in this folder, but it will fail since the .github folder is not included # with the published sources. mkdir -p .github/workflows -./x.py run src/tools/expand-yaml-anchors ln -s %{_topdir}/BUILD/rustc-%{version}-src/build/x86_64-unknown-linux-gnu/stage2-tools-bin/rustfmt %{_topdir}/BUILD/rustc-%{version}-src/build/x86_64-unknown-linux-gnu/stage0/bin/ ln -s %{_topdir}/BUILD/rustc-%{version}-src/vendor/ /root/vendor +# Since mariner has `aarch64-unknown-linux-gnu-gcc` as native compiler in arm64 and a ptest is expecting `aarch64-linux-gnu-gcc` +ln -s /usr/bin/aarch64-unknown-linux-gnu-gcc /usr/bin/aarch64-linux-gnu-gcc # remove rustdoc ui flaky test issue-98690.rs (which is tagged with 'unstable-options') -rm -v ./tests/rustdoc-ui/issue-98690.* -%make_build check - +rm -v ./tests/rustdoc-ui/issues/issue-98690.* +useradd -m -d /home/test test +chown -R test:test . +sudo -u test %make_build check +userdel -r test %install USER=root SUDO_USER=root %make_install -mv %{buildroot}%{_docdir}/%{name}/LICENSE-THIRD-PARTY . -rm %{buildroot}%{_docdir}/%{name}/{COPYRIGHT,LICENSE-APACHE,LICENSE-MIT} -rm %{buildroot}%{_docdir}/%{name}/html/.lock -rm %{buildroot}%{_docdir}/%{name}/*.old -rm %{buildroot}%{_bindir}/*.old +mv %{buildroot}%{_docdir}/cargo/LICENSE-THIRD-PARTY . +rm %{buildroot}%{_docdir}/rustc/{COPYRIGHT,LICENSE-APACHE,LICENSE-MIT} +rm %{buildroot}%{_docdir}/cargo/{LICENSE-APACHE,LICENSE-MIT} +rm %{buildroot}%{_docdir}/clippy/{LICENSE-APACHE,LICENSE-MIT} +rm %{buildroot}%{_docdir}/rustfmt/{LICENSE-APACHE,LICENSE-MIT} +rm %{buildroot}%{_docdir}/docs/html/.lock %ldconfig_scriptlets @@ -153,7 +159,6 @@ rm %{buildroot}%{_bindir}/*.old %{_libexecdir}/rust-analyzer-proc-macro-srv %{_bindir}/rust-gdb %{_bindir}/rust-gdbgui -%{_bindir}/rust-demangler %{_bindir}/cargo %{_bindir}/cargo-clippy %{_bindir}/cargo-fmt @@ -164,14 +169,26 @@ rm %{buildroot}%{_bindir}/*.old %files doc %license LICENSE-APACHE LICENSE-MIT LICENSE-THIRD-PARTY COPYRIGHT -%doc %{_docdir}/%{name}/html/* -%doc %{_docdir}/%{name}/README.md +%doc %{_docdir}/rustc/README.md +%doc %{_docdir}/cargo/* +%doc %{_docdir}/rustfmt/* +%doc %{_docdir}/clippy/* +%doc %{_docdir}/docs/html/* %doc CONTRIBUTING.md README.md RELEASES.md %doc src/tools/clippy/CHANGELOG.md %doc src/tools/rustfmt/Configurations.md %{_mandir}/man1/* %changelog +* Sun Apr 20 2025 Kavya Sree Kaitepalli - 1.85.0-1 +- Upgrade to 1.85.0 +- Drop patches +- Remove expand-yaml-anchors tool in %check +- Remove rust-demangler tool +- Update generate_source_tarball script +- Run %check as test user +- Add explicit build dependency on zlib + * Thu Feb 27 2025 Chris Co - 1.75.0-12 - Bump to rebuild with updated glibc diff --git a/SPECS/virtiofsd/virtiofsd.spec b/SPECS/virtiofsd/virtiofsd.spec index 57879404efc..21cf20c1399 100644 --- a/SPECS/virtiofsd/virtiofsd.spec +++ b/SPECS/virtiofsd/virtiofsd.spec @@ -22,7 +22,7 @@ Name: virtiofsd # Version to be kept in sync with the `asset.virtiofsd.version` field from # https://github.com/microsoft/kata-containers/blob/msft-main/versions.yaml Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: vhost-user virtio-fs device backend written in Rust Group: Development/Libraries/Rust License: Apache-2.0 @@ -39,8 +39,8 @@ Source0: https://gitlab.com/virtio-fs/virtiofsd/-/archive/v%{version}/%{n # Source1: %{name}-%{version}-vendor.tar.gz Source2: cargo_config -BuildRequires: cargo -BuildRequires: rust +BuildRequires: cargo < 1.85.0 +BuildRequires: rust < 1.85.0 BuildRequires: libcap-ng-devel BuildRequires: libseccomp-devel Conflicts: qemu-tools < 8 @@ -73,6 +73,9 @@ cargo test --release %{_datadir}/qemu/vhost-user/50-qemu-virtiofsd.json %changelog +* Mon Apr 21 2025 Kavya Sree Kaitepalli - 1.8.0-2 +- Pin rust version + * Wed Feb 07 2024 Kanika Nema - 1.8.0-1 - Initial CBL-Mariner import from openSUSE Tumbleweed (license: same as "License" tag) - License verified diff --git a/cgmanifest.json b/cgmanifest.json index f734795da5f..03d7ae5a847 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -27529,6 +27529,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "rust", + "version": "1.85.0", + "downloadUrl": "https://static.rust-lang.org/dist/rustc-1.85.0-src.tar.xz" + } + } + }, { "component": { "type": "other",