SHA256
1
0
forked from pool/traefik
traefik/traefik-fix-int-overflow-with-go-generate-10452.patch

46 lines
1.7 KiB
Diff
Raw Normal View History

Accepting request 1155081 from home:weberho:branches:devel:kubic - configuration changes: * Enhanced default configuration file, including configs for http3 support. * Docker configuration has been disabled per default, file provider has been enabled. The directory for the file provider has been set to /etc/traefik/conf.d * Prepared directories for logging in /var/log/traefik * Enhanced default configuration file, including configs for http3 support. Settings are disabled per default. - packaging general: * Use standard source-download feature, modified _service file and removed _servicedata * packagers can invoke `prepare-sources.sh` to doenload sources and prepare go-packages as well as node_modules for the built process. - frontend packaging: * The frontend will now be packaged on OBS to have reproduceable builds. - Go packaging: * Added upstream patch traefik-fix-int-overflow-with-go-generate-10452.patch to allow packaging on 32bit architectures gh#traefik/traefik#10451 * Enabled CGO because there is no cross compilation needed in OSB (we build packages for every distribution/architecture seperately). PIE can not be used with CGO enabled for most architectures and is reported as failure sinc go 1.22. See https://github.com/golang/go/issues/64875 * Don't use pie-buildmode for ppc64 and s390x architectures - Update to version 2.11.0: * Enhancements: * [middleware] Deprecate IPWhiteList middleware in favor of IPAllowList * [redis] Add Redis Sentinel support * [server] Add KeepAliveMaxTime and KeepAliveMaxRequests features to entrypoints * [sticky-session] Hash WRR sticky cookies * Bug fixes: * [acme] Update go-acme/lego to v4.15.0 * [authentication] Fix NTLM and Kerberos * [file] Fix file watcher * [file] Update github.com/fsnotify/fsnotify to v1.7.0 * [http3] Update quic-go to v0.40.1 * [middleware,tcp] Add missing TCP IPAllowList middleware constructor * [nomad] Update the Nomad API dependency to v1.7.2 * [server] Fix ReadHeaderTimeout for PROXY protocol * [webui] Fixes the Header Button * [webui] Fix URL encode resource's id before calling API endpoints OBS-URL: https://build.opensuse.org/request/show/1155081 OBS-URL: https://build.opensuse.org/package/show/devel:kubic/traefik?expand=0&rev=27
2024-03-05 14:28:36 +01:00
From 86a01a2a2558b05978883703b720a612e95a1b9d Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ldez@users.noreply.github.com>
Date: Sat, 17 Feb 2024 14:01:10 +0100
Subject: [PATCH 1/2] fix: int overflow with go generate
---
pkg/collector/hydratation/hydration.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/collector/hydratation/hydration.go b/pkg/collector/hydratation/hydration.go
index 40736f0462..b0d2b316d1 100644
--- a/pkg/collector/hydratation/hydration.go
+++ b/pkg/collector/hydratation/hydration.go
@@ -56,7 +56,7 @@ func fill(field reflect.Value) error {
case reflect.Int64:
switch field.Type() {
case reflect.TypeOf(types.Duration(time.Second)):
- setTyped(field, int64(defaultNumber*int(time.Second)))
+ setTyped(field, types.Duration(defaultNumber*time.Second))
default:
setTyped(field, int64(defaultNumber))
}
From 6786d3889f1b6affbd3bdb6e86e6b25b5d8ff4d6 Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ldez@users.noreply.github.com>
Date: Sat, 17 Feb 2024 15:17:31 +0100
Subject: [PATCH 2/2] chore: replace deprecated PtrTo with PointerTo
---
pkg/collector/hydratation/hydration.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/collector/hydratation/hydration.go b/pkg/collector/hydratation/hydration.go
index b0d2b316d1..c45cfcfbb1 100644
--- a/pkg/collector/hydratation/hydration.go
+++ b/pkg/collector/hydratation/hydration.go
@@ -98,7 +98,7 @@ func setMap(field reflect.Value) error {
key := reflect.ValueOf(fmt.Sprintf("%s%d", baseKeyName, i))
// generate value
- ptrType := reflect.PtrTo(field.Type().Elem())
+ ptrType := reflect.PointerTo(field.Type().Elem())
ptrValue := reflect.New(ptrType)
if err := fill(ptrValue); err != nil {
return err