pagure pushed to tests/selinux (main). "test if definitions of
policy interfaces are correct (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-11-15 20:30:15 UTC
From 8d1a0ebb57f66075bd94cb4fe239c9921a6da5bc Mon Sep 17 00:00:00 2001
From: Milos Malik <mmalik(a)redhat.com>
Date: Nov 15 2023 20:16:35 +0000
Subject: test if definitions of policy interfaces are correct
A recent testing of the sepolgen-ifgen tool revealed that certain
policy interface definitions are not correct. The TC reproduces
the situation.
Even though the problem exists (unnoticed) for some time already,
I believe that we should ship valid and correctly defined policy
interfaces.
The TC covers RHEL-2616.
---
diff --git a/selinux-policy/interface-definitions/main.fmf b/selinux-policy/interface-definitions/main.fmf
new file mode 100644
index 0000000..0c2b9a3
--- /dev/null
+++ b/selinux-policy/interface-definitions/main.fmf
@@ -0,0 +1,26 @@
+summary: Are all policy interfaces defined correctly?
+contact: Milos Malik <mmalik(a)redhat.com>
+component:
+ - selinux-policy
+ - policycoreutils
+recommend:
+ - /usr/bin/sepolgen-ifgen
+ - selinux-policy
+ - selinux-policy-targeted
+test: ./runtest.sh
+framework: beakerlib
+duration: 10m
+enabled: true
+tag:
+ - NoRHEL4
+ - NoRHEL5
+ - targeted
+link:
+ - verifies: https://issues.redhat.com/browse/RHEL-2616
+ - verifies: https://issues.redhat.com/browse/RHEL-16185
+adjust:
+ - enabled: false
+ when: distro == rhel-4, rhel-5
+ because: decision was made not to fix the problem there
+extra-nitrate: TC#0615941
+id: a6785475-8446-47cc-9167-f2d6ad52d58e
diff --git a/selinux-policy/interface-definitions/runtest.sh b/selinux-policy/interface-definitions/runtest.sh
new file mode 100755
index 0000000..6d80041
--- /dev/null
+++ b/selinux-policy/interface-definitions/runtest.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+rlJournalStart
+ rlPhaseStartSetup
+ rlAssertRpm selinux-policy
+ rlAssertRpm policycoreutils
+ rlPhaseEnd
+
+ rlPhaseStartTest "RHEL-2616 + RHEL-16185"
+ rlRun "sepolgen-ifgen -v -d 2>/dev/null | sort | uniq > output.txt"
+ rlRun "grep -i missing output.txt" 1
+ rlPhaseEnd
+
+ rlPhaseStartCleanup
+ rm -f output.txt
+ rlPhaseEnd
+rlJournalEnd
+
https://src.fedoraproject.org/tests/selinux/c/8d1a0ebb57f66075bd94cb4fe23...
5Â months, 1Â week
kkeithle pushed to rpms/libarrow (rawhide). "Arrow 14.0.1, rebuild
for f40-build-side-76708, liborc (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-11-15 20:26:16 UTC
From 7855b1be8989a1e0d366356b35735aad8379ea0b Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Nov 15 2023 20:26:04 +0000
Subject: Arrow 14.0.1, rebuild for f40-build-side-76708, liborc
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
---
diff --git a/libarrow.spec b/libarrow.spec
index d025285..d256550 100644
--- a/libarrow.spec
+++ b/libarrow.spec
@@ -31,7 +31,7 @@
Name: libarrow
Version: 14.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A toolbox for accelerated data interchange and in-memory processing
License: Apache-2.0
URL: https://arrow.apache.org/
@@ -868,6 +868,9 @@ export LD_LIBRARY_PATH='%{buildroot}%{_libdir}'
#--------------------------------------------------------------------
%changelog
+* Wed Nov 15 2023 Kaleb S. KEITHLEY <kkeithle [at] redhat.com> - 14.0.1-2
+- Arrow 14.0.1, rebuild for f40-build-side-76708, liborc
+
* Thu Nov 9 2023 Kaleb S. KEITHLEY <kkeithle [at] redhat.com> - 14.0.1-1
- Arrow 14.0.1 GA, rhbz#2248695
https://src.fedoraproject.org/rpms/libarrow/c/7855b1be8989a1e0d366356b357...
5Â months, 1Â week
samfeifer pushed to rpms/grafana (f39). "Fix additional AVC denials
found when testing"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-11-15 20:23:49 UTC
From f71f22a242e7048af41ca44f899c547d77b7092b Mon Sep 17 00:00:00 2001
From: Sam Feifer <sfeifer(a)redhat.com>
Date: Nov 15 2023 20:22:58 +0000
Subject: Fix additional AVC denials found when testing
---
diff --git a/grafana.spec b/grafana.spec
index 68b4084..ded63dd 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -25,7 +25,7 @@ end}
Name: grafana
Version: 9.2.10
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Metrics dashboard and graph editor
License: AGPL-3.0-only
URL: https://grafana.org
@@ -1004,6 +1004,9 @@ fi
%{_datadir}/selinux/*/grafana.pp
%changelog
+* Wed Nov 15 2023 Sam Feifer <sfeifer(a)redhat.com> - 9.2.10-10
+- Fix additional AVC denial found when testing
+
* Wed Nov 15 2023 Sam Feifer <sfeifer(a)redhat.com> - 9.2.10-9
- Fix AVC denials found when testing
- Stop commented out gotest macro from expanding
diff --git a/grafana.te b/grafana.te
index 8cc35b4..acc6189 100644
--- a/grafana.te
+++ b/grafana.te
@@ -96,13 +96,14 @@ optional_policy(`
')
optional_policy(`
- require {
- type usr_t;
- class file { execute };
- }
- allow grafana_t usr_t:file execute;
+ require {
+ type usr_t;
+ class file { execute execute_no_trans };
+ }
+ allow grafana_t usr_t:file { execute execute_no_trans };
')
+
manage_dirs_pattern(grafana_t, grafana_conf_t, grafana_conf_t)
manage_files_pattern(grafana_t, grafana_conf_t, grafana_conf_t)
https://src.fedoraproject.org/rpms/grafana/c/f71f22a242e7048af41ca44f899c...
5Â months, 1Â week
samfeifer pushed to rpms/grafana (rawhide). "Fix additional AVC
denials found when testing"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-11-15 20:23:41 UTC
From f71f22a242e7048af41ca44f899c547d77b7092b Mon Sep 17 00:00:00 2001
From: Sam Feifer <sfeifer(a)redhat.com>
Date: Nov 15 2023 20:22:58 +0000
Subject: Fix additional AVC denials found when testing
---
diff --git a/grafana.spec b/grafana.spec
index 68b4084..ded63dd 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -25,7 +25,7 @@ end}
Name: grafana
Version: 9.2.10
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Metrics dashboard and graph editor
License: AGPL-3.0-only
URL: https://grafana.org
@@ -1004,6 +1004,9 @@ fi
%{_datadir}/selinux/*/grafana.pp
%changelog
+* Wed Nov 15 2023 Sam Feifer <sfeifer(a)redhat.com> - 9.2.10-10
+- Fix additional AVC denial found when testing
+
* Wed Nov 15 2023 Sam Feifer <sfeifer(a)redhat.com> - 9.2.10-9
- Fix AVC denials found when testing
- Stop commented out gotest macro from expanding
diff --git a/grafana.te b/grafana.te
index 8cc35b4..acc6189 100644
--- a/grafana.te
+++ b/grafana.te
@@ -96,13 +96,14 @@ optional_policy(`
')
optional_policy(`
- require {
- type usr_t;
- class file { execute };
- }
- allow grafana_t usr_t:file execute;
+ require {
+ type usr_t;
+ class file { execute execute_no_trans };
+ }
+ allow grafana_t usr_t:file { execute execute_no_trans };
')
+
manage_dirs_pattern(grafana_t, grafana_conf_t, grafana_conf_t)
manage_files_pattern(grafana_t, grafana_conf_t, grafana_conf_t)
https://src.fedoraproject.org/rpms/grafana/c/f71f22a242e7048af41ca44f899c...
5Â months, 1Â week
rcritten pushed to rpms/freeipa-healthcheck (rawhide). "Fix some
issues uncovered by freeIPA CI (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-11-15 20:18:51 UTC
From 59da07cf2fd302db45e0395ea70be7dd6adb4292 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten(a)redhat.com>
Date: Nov 15 2023 20:17:16 +0000
Subject: Fix some issues uncovered by freeIPA CI
If a specific service status is requested that relies on dirsrv the
dependency on dirsrv is not validated which can result in a connection
error.
The ods exporter check is temporarily removed until the upstream bug
is fixed.
---
diff --git a/0002-Don-t-fail-if-a-service-name-cannot-be-looked-up-in-.patch b/0002-Don-t-fail-if-a-service-name-cannot-be-looked-up-in-.patch
new file mode 100644
index 0000000..5233083
--- /dev/null
+++ b/0002-Don-t-fail-if-a-service-name-cannot-be-looked-up-in-.patch
@@ -0,0 +1,44 @@
+From 35ff77300758c12110132d6d638802d5b223bd6d Mon Sep 17 00:00:00 2001
+From: Rob Crittenden <rcritten(a)redhat.com>
+Date: Mon, 13 Nov 2023 14:09:16 -0500
+Subject: [PATCH] Don't fail if a service name cannot be looked up in LDAP
+
+A new method was introduced to handle more IPA services. This
+requires looking some of them up in LDAP. dirsrv not running
+was not being caught so raised an error instead.
+
+Fixes: https://github.com/freeipa/freeipa-healthcheck/issues/312
+
+Signed-off-by: Rob Crittenden <rcritten(a)redhat.com>
+---
+ src/ipahealthcheck/meta/services.py | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/ipahealthcheck/meta/services.py b/src/ipahealthcheck/meta/services.py
+index 10fa83f..9838128 100644
+--- a/src/ipahealthcheck/meta/services.py
++++ b/src/ipahealthcheck/meta/services.py
+@@ -25,10 +25,18 @@ class IPAServiceCheck(ServiceCheck):
+ def get_service_name(self, role):
+ """Roles define broad services. Translate a role name into
+ an individual service name.
++
++ Returns a string on success, None if the service is not
++ configured or cannot be determined.
+ """
+ conn = api.Backend.ldap2
+- if not api.Backend.ldap2.isconnected():
+- api.Backend.ldap2.connect()
++ try:
++ if not api.Backend.ldap2.isconnected():
++ api.Backend.ldap2.connect()
++ except errors.NetworkError:
++ logger.debug("Service '%s' is not running", self.service_name)
++ return None
++
+ dn = DN(
+ ("cn", role), ("cn", api.env.host),
+ ("cn", "masters"), ("cn", "ipa"), ("cn", "etc"),
+--
+2.41.0
+
diff --git a/0003-Temporarily-disable-the-ipa-ods-exporter-service-sta.patch b/0003-Temporarily-disable-the-ipa-ods-exporter-service-sta.patch
new file mode 100644
index 0000000..2795766
--- /dev/null
+++ b/0003-Temporarily-disable-the-ipa-ods-exporter-service-sta.patch
@@ -0,0 +1,44 @@
+From d1cb1997737c938bbc61d547aae277e308e78fce Mon Sep 17 00:00:00 2001
+From: Rob Crittenden <rcritten(a)redhat.com>
+Date: Tue, 14 Nov 2023 20:32:54 -0500
+Subject: [PATCH] Temporarily disable the ipa-ods-exporter service status check
+
+There is a bug in this service such that it will almost always
+report as down. Rather than spamming users with this error give
+time for it to be fixed in IPA upstream.
+
+See https://pagure.io/freeipa/issue/9463
+
+Signed-off-by: Rob Crittenden <rcritten(a)redhat.com>
+---
+ src/ipahealthcheck/meta/services.py | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/src/ipahealthcheck/meta/services.py b/src/ipahealthcheck/meta/services.py
+index 9838128..b8973cb 100644
+--- a/src/ipahealthcheck/meta/services.py
++++ b/src/ipahealthcheck/meta/services.py
+@@ -202,20 +202,6 @@ class ods_enforcerd(IPAServiceCheck):
+ return super().check()
+
+
+-@registry
+-class ipa_ods_exporter(IPAServiceCheck):
+- requires = ('dirsrv',)
+-
+- def check(self, instance=''):
+- self.service_name = self.get_service_name('DNSKeyExporter')
+-
+- if self.service_name is None:
+- # No service name means it is not configured
+- return ()
+-
+- return super().check()
+-
+-
+ @registry
+ class ipa_dnskeysyncd(IPAServiceCheck):
+ requires = ('dirsrv',)
+--
+2.40.1
+
diff --git a/freeipa-healthcheck.spec b/freeipa-healthcheck.spec
index 95df1fd..3ea789d 100644
--- a/freeipa-healthcheck.spec
+++ b/freeipa-healthcheck.spec
@@ -17,7 +17,7 @@
Name: %{prefix}-healthcheck
Version: 0.16
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Health check tool for %{productname}
BuildArch: noarch
License: GPL-3.0-or-later
@@ -26,6 +26,8 @@ Source0: https://github.com/freeipa/freeipa-healthcheck/archive/%{version
Source1: ipahealthcheck.conf
Patch0001: 0001-Remove-ipaclustercheck.patch
+Patch0002: 0002-Don-t-fail-if-a-service-name-cannot-be-looked-up-in-.patch
+Patch0003: 0003-Temporarily-disable-the-ipa-ods-exporter-service-sta.patch
Requires: %{name}-core = %{version}-%{release}
Requires: %{prefix}-server
@@ -155,6 +157,10 @@ PYTHONPATH=src PATH=$PATH:$RPM_BUILD_ROOT/usr/bin pytest-3 tests/test_*
%changelog
+* Tue Nov 14 2023 Rob Crittenden <rcritten(a)redhat.com> - 0.16-2
+- Don't fail if a service name cannot be looked up in LDAP
+- Disable the ipa-ods-exporter service check
+
* Wed Nov 8 2023 Rob Crittenden <rcritten(a)redhat.com> - 0.16-1
- Update to 0.16 release
- This fixes pki-healthcheck
https://src.fedoraproject.org/rpms/freeipa-healthcheck/c/59da07cf2fd302db...
5Â months, 1Â week
fweimer pushed to rpms/cpio (rawhide). "Backport upstream patch for
C99 compatibility issue"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-11-15 20:18:37 UTC
From fadb60f99b2f6692944d0c70dde70bd103577fa7 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer(a)redhat.com>
Date: Nov 15 2023 19:32:47 +0000
Subject: Backport upstream patch for C99 compatibility issue
---
diff --git a/cpio-configure-c99.patch b/cpio-configure-c99.patch
new file mode 100644
index 0000000..2327888
--- /dev/null
+++ b/cpio-configure-c99.patch
@@ -0,0 +1,40 @@
+commit 8179be21e664cedb2e9d238cc2f6d04965e97275
+Author: Sergey Poznyakoff <gray(a)gnu.org>
+Date: Thu May 11 10:18:44 2023 +0300
+
+ configure: Include needed header for major/minor macros
+
+ This helps in avoiding the warning about implicit function declaration
+ which is elevated as error with newer compilers e.g. clang 16
+
+ Signed-off-by: Khem Raj <raj.khem(a)gmail.com>
+
+diff --git a/configure.ac b/configure.ac
+index de479e7454e5d035..c60102972282b63b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,8 +43,22 @@ AC_TYPE_UID_T
+ AC_CHECK_TYPE(gid_t, int)
+
+ AC_HEADER_DIRENT
+-AX_COMPILE_CHECK_RETTYPE([major], [0])
+-AX_COMPILE_CHECK_RETTYPE([minor], [0])
++AX_COMPILE_CHECK_RETTYPE([major], [0], [
++#include <sys/types.h>
++#ifdef MAJOR_IN_MKDEV
++# include <sys/mkdev.h>
++#endif
++#ifdef MAJOR_IN_SYSMACROS
++# include <sys/sysmacros.h>
++#endif])
++AX_COMPILE_CHECK_RETTYPE([minor], [0], [
++#include <sys/types.h>
++#ifdef MAJOR_IN_MKDEV
++# include <sys/mkdev.h>
++#endif
++#ifdef MAJOR_IN_SYSMACROS
++# include <sys/sysmacros.h>
++#endif])
+
+ AC_CHECK_FUNCS([fchmod fchown])
+ # This is needed for mingw build
diff --git a/cpio.spec b/cpio.spec
index 172944e..2b78709 100644
--- a/cpio.spec
+++ b/cpio.spec
@@ -1,7 +1,7 @@
Summary: A GNU archiving program
Name: cpio
Version: 2.14
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPL-3.0-or-later
URL: https://www.gnu.org/software/cpio/
Source0: https://ftp.gnu.org/gnu/cpio/cpio-%{version}.tar.bz2
@@ -45,6 +45,7 @@ Patch8: cpio-2.11-crc-fips-nit.patch
# Upstream patch
# https://www.mail-archive.com/bug-cpio@gnu.org/msg00605.html
Patch11: cpio-2.14-restore-access-and-modification-times-of-symlinks.patch
+Patch12: cpio-configure-c99.patch
Provides: bundled(gnulib)
Provides: bundled(paxutils)
@@ -109,6 +110,9 @@ make check || {
%{_infodir}/*.info*
%changelog
+* Wed Nov 15 2023 Florian Weimer <fweimer(a)redhat.com> - 2.14-5
+- Backport upstream patch for C99 compatibility issue
+
* Wed Jul 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.14-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
https://src.fedoraproject.org/rpms/cpio/c/fadb60f99b2f6692944d0c70dde70bd...
5Â months, 1Â week
marcdeop pushed to rpms/itinerary (f39). "23.08.3"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-11-15 20:11:07 UTC
From 3c7fa7b52de09e30a9ee6212254791609d21251e Mon Sep 17 00:00:00 2001
From: Marc Deop i Argemà <marcdeop(a)fedoraproject.org>
Date: Nov 15 2023 20:00:20 +0000
Subject: 23.08.3
---
diff --git a/.gitignore b/.gitignore
index 3753e23..7396673 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/itinerary-23.08.2.tar.xz
+/itinerary-23.08.3.tar.xz
diff --git a/itinerary.spec b/itinerary.spec
index 9f5be44..6735a70 100644
--- a/itinerary.spec
+++ b/itinerary.spec
@@ -1,5 +1,5 @@
Name: itinerary
-Version: 23.08.2
+Version: 23.08.3
Release: 1%{?dist}
Summary: Itinerary and boarding pass management application
@@ -87,5 +87,8 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%{_datadir}/qlogging-categories5/org_kde_itinerary.categories
%changelog
+* Wed Nov 15 2023 Marc Deop i Argemà <marcdeop(a)fedoraproject.org> - 23.08.3-1
+- 23.08.3
+
* Sat Oct 14 2023 Steve Cossette <farchord(a)gmail.com> - 23.08.2-1
- Initial Release
diff --git a/sources b/sources
index 636e67b..ad08ad7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (itinerary-23.08.2.tar.xz) = 3dac64d355a5fa1a0d6b0874c537dc9eec5e210baedf065fde57018a82fcdb2d368eb61888cce73baa694be647e3c9ca18e04244d1499a231333ec34a750464d
+SHA512 (itinerary-23.08.3.tar.xz) = cb8763b8aebc224b888962be9f26d05a24173deabc031df8b72adb0e985382da1f0c85ccab94fa96d16fc44eca59f4f79f5dd3d4367734110ec130d2682d84bf
https://src.fedoraproject.org/rpms/itinerary/c/3c7fa7b52de09e30a9ee621225...
5Â months, 1Â week
pagure pushed to rpms/receptor (rawhide). "disable flaky
TestCreatePing test (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-11-15 19:57:59 UTC
From 0642375a99c79381abfa9a4b58a4ee312750ea1b Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell(a)gtmx.me>
Date: Nov 15 2023 17:00:33 +0000
Subject: disable flaky TestCreatePing test
[skip changelog]
---
diff --git a/receptor.spec b/receptor.spec
index e466dbd..3cf07b9 100644
--- a/receptor.spec
+++ b/receptor.spec
@@ -248,6 +248,10 @@ exit 0
%if %{with check}
%check
+# Disable flaky tests
+for test in "TestCreatePing"; do
+ awk -i inplace '/^func.*'"$test"'\(/ { print; print "\tt.Skip(\"disabled failing test\")"; next}1' $(grep -rl $test)
+done
export PATH="%{gobuilddir}/bin:$PATH"
# Disable various test relying on Kube and network
%gocheck -t tests/functional/mesh
https://src.fedoraproject.org/rpms/receptor/c/0642375a99c79381abfa9a4b58a...
5Â months, 1Â week
pagure pushed to rpms/receptor (rawhide). "properly rebase
0001-Bump-quic-go-to-0.37.4.patch (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-11-15 19:57:59 UTC
From abec2028d08dcfd3d786c58a3ac35c539d4c3184 Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell(a)gtmx.me>
Date: Nov 04 2023 05:02:00 +0000
Subject: properly rebase 0001-Bump-quic-go-to-0.37.4.patch
- Remove old patch
- Fix quic.Dial call
[skip changelog]
---
diff --git a/0001-Bump-quic-go-to-0.37.4.patch b/0001-Bump-quic-go-to-0.37.4.patch
deleted file mode 100644
index 67fd4e2..0000000
--- a/0001-Bump-quic-go-to-0.37.4.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From c7924757ee4a58230d9ba697496ef1f834d7508f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com>
-Date: Sat, 12 Aug 2023 09:12:34 +0200
-Subject: [PATCH] Bump quic-go to 0.37.4
-
-This is necessary to run on Go 1.21.
-
-Fix #815.
----
- go.mod | 11 +++++------
- go.sum | 22 ++++++++++------------
- pkg/netceptor/conn.go | 4 ++--
- 3 files changed, 17 insertions(+), 20 deletions(-)
-
-diff --git a/go.mod b/go.mod
-index 1734118..d5b7f1a 100644
---- a/go.mod
-+++ b/go.mod
-@@ -15,12 +15,12 @@ require (
- github.com/minio/highwayhash v1.0.2
- github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
- github.com/prep/socketpair v0.0.0-20171228153254-c2c6a7f821c2
-- github.com/quic-go/quic-go v0.34.0
-+ github.com/quic-go/quic-go v0.37.4
- github.com/rogpeppe/go-internal v1.10.0
- github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
- github.com/stretchr/testify v1.8.1
- github.com/vishvananda/netlink v1.1.0
-- golang.org/x/net v0.9.0
-+ golang.org/x/net v0.10.0
- gopkg.in/yaml.v2 v2.4.0
- k8s.io/api v0.27.1
- k8s.io/apimachinery v0.27.1
-@@ -50,10 +50,9 @@ require (
- github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
- github.com/modern-go/reflect2 v1.0.2 // indirect
- github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-- github.com/onsi/ginkgo/v2 v2.9.4 // indirect
-+ github.com/onsi/ginkgo/v2 v2.9.5 // indirect
- github.com/pmezard/go-difflib v1.0.0 // indirect
-- github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
-- github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
-+ github.com/quic-go/qtls-go1-20 v0.3.1 // indirect
- github.com/spf13/pflag v1.0.5 // indirect
- github.com/vishvananda/netns v0.0.4 // indirect
- golang.org/x/crypto v0.8.0 // indirect
-@@ -64,7 +63,7 @@ require (
- golang.org/x/term v0.8.0 // indirect
- golang.org/x/text v0.9.0 // indirect
- golang.org/x/time v0.3.0 // indirect
-- golang.org/x/tools v0.8.0 // indirect
-+ golang.org/x/tools v0.9.1 // indirect
- google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/protobuf v1.30.0 // indirect
- gopkg.in/inf.v0 v0.9.1 // indirect
-diff --git a/go.sum b/go.sum
-index afc5207..3bf6f35 100644
---- a/go.sum
-+++ b/go.sum
-@@ -124,8 +124,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
- github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
- github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
- github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
--github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE=
--github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM=
-+github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
-+github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
- github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
- github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
- github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
-@@ -135,12 +135,10 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
- github.com/prep/socketpair v0.0.0-20171228153254-c2c6a7f821c2 h1:vzKDZ0uNPcOdITzZT5d4Tn2YOalCMqIhYzVNq/oRjlw=
- github.com/prep/socketpair v0.0.0-20171228153254-c2c6a7f821c2/go.mod h1:E/IaW35yb7xPACTLciISfz5w+jqPwmnXwDdmilSl/Nc=
- github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
--github.com/quic-go/qtls-go1-19 v0.3.2 h1:tFxjCFcTQzK+oMxG6Zcvp4Dq8dx4yD3dDiIiyc86Z5U=
--github.com/quic-go/qtls-go1-19 v0.3.2/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
--github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8GEa3E=
--github.com/quic-go/qtls-go1-20 v0.2.2/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
--github.com/quic-go/quic-go v0.34.0 h1:OvOJ9LFjTySgwOTYUZmNoq0FzVicP8YujpV0kB7m2lU=
--github.com/quic-go/quic-go v0.34.0/go.mod h1:+4CVgVppm0FNjpG3UcX8Joi/frKOH7/ciD5yGcwOO1g=
-+github.com/quic-go/qtls-go1-20 v0.3.1 h1:O4BLOM3hwfVF3AcktIylQXyl7Yi2iBNVy5QsV+ySxbg=
-+github.com/quic-go/qtls-go1-20 v0.3.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
-+github.com/quic-go/quic-go v0.37.4 h1:ke8B73yMCWGq9MfrCCAw0Uzdm7GaViC3i39dsIdDlH4=
-+github.com/quic-go/quic-go v0.37.4/go.mod h1:YsbH1r4mSHPJcLF4k4zruUkLBqctEMBDR6VPvcYjIsU=
- github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
- github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
- github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
-@@ -201,8 +199,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R
- golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
- golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
- golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
--golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
--golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
-+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
-+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
- golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
- golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
- golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g=
-@@ -249,8 +247,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
- golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
- golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
- golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
--golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
--golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
-+golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
-+golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
- golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
- golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
- golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-diff --git a/pkg/netceptor/conn.go b/pkg/netceptor/conn.go
-index 1f2ec13..8c482b9 100644
---- a/pkg/netceptor/conn.go
-+++ b/pkg/netceptor/conn.go
-@@ -37,7 +37,7 @@ type acceptResult struct {
- type Listener struct {
- s *Netceptor
- pc *PacketConn
-- ql quic.Listener
-+ ql *quic.Listener
- acceptChan chan *acceptResult
- doneChan chan struct{}
- doneOnce *sync.Once
-@@ -319,7 +319,7 @@ func (s *Netceptor) DialContext(ctx context.Context, node string, service string
- doneChan := make(chan struct{}, 1)
- go monitorUnreachable(pc, doneChan, rAddr, ccancel)
- _ = os.Setenv("QUIC_GO_DISABLE_RECEIVE_BUFFER_WARNING", "1")
-- qc, err := quic.DialContext(cctx, pc, rAddr, s.nodeID, tlscfg, cfg)
-+ qc, err := quic.Dial(cctx, pc, rAddr, tlscfg, cfg)
- if err != nil {
- close(okChan)
- pcClose()
---
-2.41.0
-
diff --git a/golang-1.21.patch b/golang-1.21.patch
index 36367df..93b9b13 100644
--- a/golang-1.21.patch
+++ b/golang-1.21.patch
@@ -400,7 +400,7 @@ index 2d24569..6e9f72f 100644
go monitorUnreachable(pc, doneChan, rAddr, ccancel)
_ = os.Setenv("QUIC_GO_DISABLE_RECEIVE_BUFFER_WARNING", "1")
- qc, err := quic.DialContext(cctx, pc, rAddr, s.nodeID, tlscfg, cfg)
-+ qc, err := quic.Dial(cctx, pc, rAddr, s.nodeID, tlscfg, cfg)
++ qc, err := quic.Dial(cctx, pc, rAddr, tlscfg, cfg)
if err != nil {
close(okChan)
pcClose()
https://src.fedoraproject.org/rpms/receptor/c/abec2028d08dcfd3d786c58a3ac...
5Â months, 1Â week