Compare commits

...

No commits in common. "c8" and "c9s" have entirely different histories.
c8 ... c9s

11 changed files with 258 additions and 148 deletions

79
.gitignore vendored
View File

@ -1 +1,78 @@
SOURCES/libuv-v1.41.1.tar.gz
*.src.rpm
libuv-v*/
*~
*.swp
/libuv-0.9.3git09b0222.tar.gz
/libuv-0.9.4gitdc559a5.tar.gz
/libuv-0.10.0git5462dab.tar.gz
/libuv-v0.10.3.tar.gz
/libuv-v0.10.4.tar.gz
/libuv-v0.10.5.tar.gz
/libuv-v0.10.7.tar.gz
/libuv-v0.10.8.tar.gz
/libuv-v0.10.9.tar.gz
/libuv-v0.10.11.tar.gz
/libuv-v0.10.12.tar.gz
/libuv-v0.10.13.tar.gz
/libuv-v0.10.14.tar.gz
/libuv-v0.10.15.tar.gz
/libuv-v0.10.17.tar.gz
/libuv-v0.10.18.tar.gz
/libuv-v0.10.19.tar.gz
/libuv-v0.10.20.tar.gz
/libuv-v0.10.21.tar.gz
/libuv-v0.10.23.tar.gz
/libuv-v0.10.25.tar.gz
/libuv-v0.10.27.tar.gz
/libuv-v0.10.28.tar.gz
/libuv-v0.10.29.tar.gz
/libuv-v0.10.33.tar.gz
/libuv-v1.4.0.tar.gz
/libuv-v1.7.5.tar.gz
/libuv-v1.8.0.tar.gz
/libuv-v1.9.0.tar.gz
/libuv-v1.9.1.tar.gz
/libuv-v1.10.0.tar.gz
/libuv-v1.10.1.tar.gz
/libuv-v1.10.2.tar.gz
/libuv-v1.11.0.tar.gz
/libuv-v1.12.0.tar.gz
/libuv-v1.13.1.tar.gz
/libuv-v1.14.0.tar.gz
/libuv-v1.14.1.tar.gz
/libuv-v1.15.0.tar.gz
/libuv-v1.16.0.tar.gz
/libuv-v1.16.1.tar.gz
/libuv-v1.19.0.tar.gz
/libuv-v1.19.1.tar.gz
/libuv-v1.19.2.tar.gz
/libuv-v1.20.0.tar.gz
/libuv-v1.20.2.tar.gz
/libuv-v1.20.3.tar.gz
/libuv-v1.21.0.tar.gz
/libuv-v1.22.0.tar.gz
/libuv-v1.23.0.tar.gz
/libuv-v1.23.2.tar.gz
/libuv-v1.24.1.tar.gz
/libuv-v1.26.0.tar.gz
/libuv-v1.27.0.tar.gz
/libuv-v1.28.0.tar.gz
/libuv-v1.29.0.tar.gz
/libuv-v1.29.1.tar.gz
/libuv-v1.30.0.tar.gz
/libuv-v1.30.1.tar.gz
/libuv-v1.31.0.tar.gz
/libuv-v1.32.0.tar.gz
/libuv-v1.33.0.tar.gz
/libuv-v1.33.1.tar.gz
/libuv-v1.34.0.tar.gz
/libuv-v1.34.1.tar.gz
/libuv-v1.34.2.tar.gz
/libuv-v1.36.0.tar.gz
/libuv-v1.37.0.tar.gz
/libuv-v1.38.0.tar.gz
/libuv-v1.38.1.tar.gz
/libuv-v1.39.0.tar.gz
/libuv-v1.40.0.tar.gz
/libuv-v1.41.0.tar.gz
/libuv-v1.42.0.tar.gz

View File

@ -1 +1 @@
be3d7de877456af49313208b98f6aafdb6db46c0 SOURCES/libuv-v1.41.1.tar.gz
c78715261a1371381c8e2423995829e054daf906 libuv-v1.42.0.tar.gz

2
.package Normal file
View File

@ -0,0 +1,2 @@
[koji]
targets = fedora

View File

@ -1,10 +1,7 @@
From 2990b945015b067b3dc2ab95dde9587258552295 Mon Sep 17 00:00:00 2001
From 4f0158bccc32c0050c6e6692d6eacd08d5f4f624 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Wed, 5 Jun 2024 14:46:35 +0200
Subject: [PATCH] Fix for CVE-2024-24806
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Date: Wed, 5 Jun 2024 13:40:17 +0200
Subject: [PATCH] Fix CVE-2024-24806
- fix: always zero-terminate idna output
Original-Commit: https://github.com/libuv/libuv/commit/0f2d7e784a256b54b2385043438848047bc2a629
@ -16,7 +13,6 @@ Content-Transfer-Encoding: 8bit
Original-Commit: https://github.com/libuv/libuv/commit/e0327e1d508b8207c9150b6e582f0adf26213c39
Signed-off-by: Jan Staněk <jstanek@redhat.com>
Signed-off-by: rpm-build <rpm-build>
---
src/idna.c | 8 ++++++--
test/test-idna.c | 7 ++++++-
@ -29,22 +25,22 @@ index b44cb16..abbfe87 100644
@@ -273,6 +273,9 @@ long uv__idna_toascii(const char* s, const char* se, char* d, char* de) {
char* ds;
int rc;
+ if (s == se)
+ return UV_EINVAL;
+
ds = d;
si = s;
@@ -307,8 +310,9 @@ long uv__idna_toascii(const char* s, const char* se, char* d, char* de) {
return rc;
}
- if (d < de)
- *d++ = '\0';
+ if (d >= de)
+ return UV_EINVAL;
+ *d++ = '\0';
return d - ds; /* Number of bytes written. */
}
@ -57,20 +53,20 @@ index f4fad96..37da38d 100644
const char* p;
char b[1];
+ char c[1];
/* Single byte. */
p = b;
@@ -112,6 +113,10 @@ TEST_IMPL(utf8_decode1_overrun) {
ASSERT_EQ((unsigned) -1, uv__utf8_decode1(&p, b + 1));
ASSERT_EQ(p, b + 1);
+ b[0] = 0x7F;
+ ASSERT_EQ(UV_EINVAL, uv__idna_toascii(b, b + 0, c, c + 1));
+ ASSERT_EQ(UV_EINVAL, uv__idna_toascii(b, b + 1, c, c + 1));
+
return 0;
}
@@ -145,8 +150,8 @@ TEST_IMPL(idna_toascii) {
/* Illegal inputs. */
F("\xC0\x80\xC1\x80", UV_EINVAL); /* Overlong UTF-8 sequence. */
@ -81,6 +77,6 @@ index f4fad96..37da38d 100644
T(".", ".");
T(".com", ".com");
T("example", "example");
--
--
2.45.1

View File

@ -1,85 +0,0 @@
From a0ea40baa41a201bd3a4777a66c7eae41d2bcbc3 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Wed, 5 Jun 2024 14:40:40 +0200
Subject: [PATCH] Disable failing network tests
Signed-off-by: rpm-build <rpm-build>
---
Makefile.am | 4 ----
test/test-list.h | 12 ------------
2 files changed, 16 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index e8bab49..a190637 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -250,13 +250,11 @@ test_run_tests_SOURCES = test/blackhole-server.c \
test/test-tcp-bind-error.c \
test/test-tcp-bind6-error.c \
test/test-tcp-close-accept.c \
- test/test-tcp-close-while-connecting.c \
test/test-tcp-close.c \
test/test-tcp-close-reset.c \
test/test-tcp-create-socket-early.c \
test/test-tcp-connect-error-after-write.c \
test/test-tcp-connect-error.c \
- test/test-tcp-connect-timeout.c \
test/test-tcp-connect6-error.c \
test/test-tcp-flags.c \
test/test-tcp-open.c \
@@ -293,8 +291,6 @@ test_run_tests_SOURCES = test/blackhole-server.c \
test/test-udp-mmsg.c \
test/test-udp-multicast-interface.c \
test/test-udp-multicast-interface6.c \
- test/test-udp-multicast-join.c \
- test/test-udp-multicast-join6.c \
test/test-udp-multicast-ttl.c \
test/test-udp-open.c \
test/test-udp-options.c \
diff --git a/test/test-list.h b/test/test-list.h
index 7458840..5545b2e 100644
--- a/test/test-list.h
+++ b/test/test-list.h
@@ -127,10 +127,6 @@ TEST_DECLARE (tcp_bind_invalid_flags)
TEST_DECLARE (tcp_bind_writable_flags)
TEST_DECLARE (tcp_listen_without_bind)
TEST_DECLARE (tcp_connect_error_fault)
-TEST_DECLARE (tcp_connect_timeout)
-TEST_DECLARE (tcp_local_connect_timeout)
-TEST_DECLARE (tcp6_local_connect_timeout)
-TEST_DECLARE (tcp_close_while_connecting)
TEST_DECLARE (tcp_close)
TEST_DECLARE (tcp_close_reset_accepted)
TEST_DECLARE (tcp_close_reset_accepted_after_shutdown)
@@ -167,8 +163,6 @@ TEST_DECLARE (udp_send_hang_loop)
TEST_DECLARE (udp_send_immediate)
TEST_DECLARE (udp_send_unreachable)
TEST_DECLARE (udp_mmsg)
-TEST_DECLARE (udp_multicast_join)
-TEST_DECLARE (udp_multicast_join6)
TEST_DECLARE (udp_multicast_ttl)
TEST_DECLARE (udp_multicast_interface)
TEST_DECLARE (udp_multicast_interface6)
@@ -692,10 +686,6 @@ TASK_LIST_START
TEST_ENTRY (tcp_bind_writable_flags)
TEST_ENTRY (tcp_listen_without_bind)
TEST_ENTRY (tcp_connect_error_fault)
- TEST_ENTRY (tcp_connect_timeout)
- TEST_ENTRY (tcp_local_connect_timeout)
- TEST_ENTRY (tcp6_local_connect_timeout)
- TEST_ENTRY (tcp_close_while_connecting)
TEST_ENTRY (tcp_close)
TEST_ENTRY (tcp_close_reset_accepted)
TEST_ENTRY (tcp_close_reset_accepted_after_shutdown)
@@ -744,8 +734,6 @@ TASK_LIST_START
TEST_ENTRY (udp_mmsg)
TEST_ENTRY (udp_multicast_interface)
TEST_ENTRY (udp_multicast_interface6)
- TEST_ENTRY (udp_multicast_join)
- TEST_ENTRY (udp_multicast_join6)
TEST_ENTRY (udp_multicast_ttl)
TEST_ENTRY (udp_sendmmsg_error)
TEST_ENTRY (udp_try_send)
--
2.45.1

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

View File

@ -5,9 +5,9 @@
Name: libuv
Epoch: 1
Version: 1.41.1
Version: 1.42.0
Release: 2%{?dist}
Summary: libuv is a multi-platform support library with a focus on asynchronous I/O.
Summary: Platform layer for node.js
# the licensing breakdown is described in detail in the LICENSE file
License: MIT and BSD and ISC
@ -19,16 +19,13 @@ Source3: libuv.abignore
BuildRequires: autoconf automake libtool
BuildRequires: gcc make
%if %{with tests}
# don't remove network tests
%else
# -- Patches -- #
Patch0001: 0001-Disable-failing-network-tests.patch
%endif
Patch0002: 0002-Fix-for-CVE-2024-24806.patch
Patch0001: 0001-Fix-CVE-2024-24806.patch
%description
libuv is a multi-platform support library with a focus on asynchronous I/O
libuv is a new platform layer for Node. Its purpose is to abstract IOCP on
Windows and libev on Unix systems. We intend to eventually contain all platform
differences in this library.
%package devel
Summary: Development libraries for libuv
@ -61,12 +58,9 @@ mkdir -p %{buildroot}%{_libdir}/libuv/
install -Dm0644 -t %{buildroot}%{_libdir}/libuv/ %{SOURCE3}
%check
# Tests are currently disabled because some require network access
# Working with upstream to split these out
#./run-tests
#./run-benchmarks
make check
%if %{with tests}
%make_build check
%endif
%ldconfig_scriptlets
@ -87,49 +81,166 @@ make check
%{_libdir}/%{name}.a
%changelog
* Wed Jun 05 2024 Jan Staněk <jstanek@redhat.com> - 1:1.41.1-2
- Backport fixes for CVE-2024-24806
Resolves: RHEL-24790
* Wed Jun 05 2024 Jan Staněk <jstanek@redhat.com> - 1:1.42.0-2
- Backport fix for CVE-2024-24806
Resolves: RHEL-24791
* Mon Jul 12 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:1.41.1-1
- Rebase to 1.41.1
- Change description to reflect upstream
- Resolves: RHBZ#1979927
* Fri Sep 17 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:1.42.0-1
- Rebased, resolves CVE-2021-22918
- Resolves: RHBZ#2005319, RHBZ#1979928
* Mon Jan 25 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:1.40.0-1
- Rebase to 1.40.0
- Resolves: RHBZ#1895872
- Ship libuv-devel
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.41.0-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Wed Sep 23 2020 Honza Horak <hhorak@redhat.com> - 1:1.38.0-2
- Fix max path size by not using _POSIX_PATH_MAX
Resolves: #1881870
Fixes: CVE-2020-8252
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.41.0-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jun 09 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:1.38.0-1
- Update, disable failing tests
* Fri Feb 19 2021 Stephen Gallagher <sgallagh@redhat.com> - 1.41.0-1
- Update to 1.41.0
* Thu May 28 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:1.37.0-3
- Run tests
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.40.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon May 11 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:1.37.0-2
- Resolves: RHBZ#1817821
- bump for build
* Mon Sep 28 2020 Stephen Gallagher <sgallagh@redhat.com> - 1.40.0-1
- Update to 1.40.0
* Mon May 04 2020 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:1.37.0-1
- Resolves: RHBZ#1817821
- https://github.com/libuv/libuv/blob/v1.40.0/ChangeLog
* Tue Sep 08 2020 Stephen Gallagher <sgallagh@redhat.com> - 1.39.0-1
- Update to 1.39.0
* Fri Jul 31 2020 Stephen Gallagher <sgallagh@redhat.com> - 1.38.1-1
- Update to 1.38.1
- https://github.com/libuv/libuv/blob/v1.38.1/ChangeLog
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.38.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon May 18 2020 Stephen Gallagher <sgallagh@redhat.com> - 1.38.0-2
- Fix up gating tests
* Mon May 18 2020 Stephen Gallagher <sgallagh@redhat.com> - 1.38.0-1
- Update to 1.38.0
- https://github.com/libuv/libuv/blob/v1.38.0/ChangeLog
* Mon Apr 20 2020 Stephen Gallagher <sgallagh@redhat.com> - 1.37.0-1
- Update to 1.37.0
- Add abidiff ignore file
- https://github.com/libuv/libuv/blob/v1.37.0/ChangeLog
* Mon Oct 08 2018 Jan Staněk <jstanek@redhat.com> - 1:1.23.1-1
- Update to 1.23.1
- Resolves: rhbz#1637000
* Fri Apr 17 2020 Stephen Gallagher <sgallagh@redhat.com> - 1.36.0-3
- Actually add gating.yaml
- Fix build for EPEL 7
* Mon Jul 30 2018 Florian Weimer <fweimer@redhat.com> - 1:1.22.0-2
- Rebuild with fixed binutils
* Fri Apr 17 2020 Stephen Gallagher <sgallagh@redhat.com> - 1.36.0-2
- Add abidiff ignore file and add ABI gating test
* Mon Jul 30 2018 Zuzana Svetlikova ,zsvetlik@redhat.com> - 1.22.0-1
* Thu Apr 16 2020 Stephen Gallagher <sgallagh@redhat.com> - 1.36.0-1
- Update to 1.36.0
- https://github.com/libuv/libuv/blob/v1.36.0/ChangeLog
* Thu Feb 06 2020 Stephen Gallagher <sgallagh@redhat.com> - 1.34.2-1
- Update to 1.34.2
- https://github.com/libuv/libuv/blob/v1.34.2/ChangeLog
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.34.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 13 2020 Stephen Gallagher <sgallagh@redhat.com> - 1.34.1-1
- Update to 1.34.1
- https://github.com/libuv/libuv/blob/v1.34.1/ChangeLog
* Fri Dec 06 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.34.0-1
- Update to 1.34.0
- https://github.com/libuv/libuv/blob/v1.34.0/ChangeLog
* Mon Dec 02 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.33.1-1
- Update to 1.33.1
- Drop upstreamed patch
- https://github.com/libuv/libuv/blob/v1.33.1/ChangeLog
* Mon Oct 21 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.33.0-2
- Add upstream patch to fix aarch64 builds
* Fri Oct 18 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.33.0-1
- Update to 1.33.0
- https://github.com/libuv/libuv/blob/v1.33.0/ChangeLog
* Wed Oct 02 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.32.0-1
- Update to 1.32.0
- https://github.com/libuv/libuv/blob/v1.32.0/ChangeLog
* Wed Aug 21 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.31.0-0
- Update to 1.31.0
- https://github.com/libuv/libuv/blob/v1.31.0/ChangeLog
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.30.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Jul 02 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.30.1-1
- Update to 1.30.1
- https://github.com/libuv/libuv/blob/v1.30.1/ChangeLog
* Thu Jun 27 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.30.0-1
- Update to 1.30.0
- https://github.com/libuv/libuv/blob/v1.30.0/ChangeLog
* Tue May 21 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.29.1-1
- Update to 1.29.1
- https://github.com/libuv/libuv/blob/v1.29.1/ChangeLog
* Wed May 15 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.29.0-1
- Update to 1.29.0
- Drop upstreamed patch
* Fri May 03 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.28.0-2
- Fix regression in uv_fs_poll_stop() (BZ 1703935)
* Tue Apr 23 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.28.0-1
- Update to libuv 1.28.0
- https://github.com/libuv/libuv/blob/v1.28.0/ChangeLog
* Mon Mar 18 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.27.0-1
- Update to libuv 1.27.0
- https://github.com/libuv/libuv/blob/v1.27.0/ChangeLog
* Wed Feb 13 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.26.0-1
- Update to 1.26.0
- https://github.com/libuv/libuv/blob/v1.26.0/ChangeLog
* Fri Jan 18 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.24.1-1
- Update to 1.24.1
- https://github.com/libuv/libuv/blob/v1.24.1/ChangeLog
* Thu Oct 11 2018 Stephen Gallagher <sgallagh@redhat.com> - 1.23.2-1
- Update to 1.23.2
- https://github.com/libuv/libuv/blob/v1.23.2/ChangeLog
* Tue Sep 11 2018 Stephen Gallagher <sgallagh@redhat.com> - 1.23.0-1
- Update to 1.23.0
- https://github.com/libuv/libuv/blob/v1.23.0/ChangeLog
* Mon Jul 16 2018 Stephen Gallagher <sgallagh@redhat.com> - 1.22.0-1
- Update to 1.22.0
- https://github.com/libuv/libuv/blob/v1.22.0/ChangeLog
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.21.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Jul 06 2018 Stephen Gallagher <sgallagh@redhat.com> - 1.21.0-1
- Update to 1.21.0
- https://github.com/libuv/libuv/blob/v1.21.0/ChangeLog
* Wed May 09 2018 Stephen Gallagher <sgallagh@redhat.com> - 1.20.3-1
- Update to 1.20.3
- https://github.com/libuv/libuv/blob/v1.20.3/ChangeLog
* Tue May 01 2018 Stephen Gallagher <sgallagh@redhat.com> - 1.20.2-1
- Update to 1.20.2
- https://github.com/libuv/libuv/blob/v1.20.2/ChangeLog
* Tue Apr 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:1.20.0-1
- Update to 1.20.0
* Mon Feb 26 2018 Stephen Gallagher <sgallagh@redhat.com> - 1.19.2-1
- Update to 1.19.2

2
package.cfg Normal file
View File

@ -0,0 +1,2 @@
[koji]
targets = rawhide fedora epel7

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (libuv-v1.42.0.tar.gz) = cc8ca797ec6e02fff7d4998fd5a509373ae6c674ff0d57960fef3418f59d3b93a655f52913ee5f712e32e3980b29df6315685c8b506790295d97c7c1f94f3425