rpm/traefik
SHA256
1
0
Fork 0
forked from pool/traefik
Code Pull Requests Activity

Accepting request 1171807 from home:weberho:branches:devel:kubic

Browse Source 
- Added allow-node-21.patch to allow building with nodejs21, too
- Update to version 2.11.2
  Important: Read the migration guide at https://doc.traefik.io/traefik/migration/v2/#v2112
  * CVE's:
    * GHSA-7f4j-64p6-5h5v (related to CVE-2023-45288)
    * CVE-2024-28869
  * Bug fixes:
    * [server] Revert LingeringTimeout and change default value for ReadTimeout
    * [server] Set default ReadTimeout value to 60s
- Removed traefik-fix-int-overflow-with-go-generate-10452.patch
- Update to version 2.11.1:
  * Bug fixes:
    * [acme,tls] Enforce handling of ACME-TLS/1 challenges
    * [acme] Update go-acme/lego to v4.16.1
    * [acme] Close created file in ACME local store CheckFile func
    * [docker,http3] Update to quic-go v0.42.0 and docker/cli v24.0.9
    * [docker,marathon,rancher,ecs,tls,nomad] Allow to configure TLSStore default generated certificate with labels
    * [ecs] Adjust ECS network interface detection logi
    * [logs,tls] Fix log when default TLSStore and TLSOptions are defined multiple times
    * [middleware] Allow empty replacement with ReplacePathRegex middleware
    * [plugins] Update Yaegi to v0.16.1
    * [provider,rules] Don't allow routers higher than internal ones
    * [rules] Reserve priority range for internal router
    * [server,tcp] Introduce Lingering Timeout
    * [tcp] Enforce failure for TCP HostSNI with hostname
    * [tracing] Bump Elastic APM to v2.4.8
    * [webui] Fix dashboard exposition through a router
    * [webui] Display IPAllowlist middleware configuration in dashboard
    * [webui] Make text more readable in dark mode
    * [webui] Migrate to Quasar 2.x and Vue.js 3.x
    * [webui] Add a horizontal scroll for the mobile view

OBS-URL: https://build.opensuse.org/request/show/1171807
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/traefik?expand=0&rev=30
This commit is contained in:
Alexandre Vicenzi 2024-05-03 18:47:14 +00:00 committed by Git OBS Bridge
parent 7a702d7548
commit d63c2e7c32
10 changed files with 3955 additions and 14822 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
allow-node-21.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ur traefik-2.11.2-orig/webui/package.json traefik-2.11.2/webui/package.json
--- traefik-2.11.2-orig/webui/package.json 2024-04-11 17:36:03.000000000 +0200
+++ traefik-2.11.2/webui/package.json 2024-05-03 17:13:12.724836490 +0200
@@ -53,7 +53,7 @@
"postcss": "^8.4.14"
},
"engines": {
- "node": "^20 || ^18 || ^16",
+ "node": "^21 || ^20 || ^18 || ^16",
"npm": ">= 6.13.4",
"yarn": ">= 1.21.1"
}

4
node_modules.obscpio
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:03384fea5d9587f8f51e3b622d6f63b9c9f326e68e7b85b7c7e9e7578f5b73c4
size 78943480
oid sha256:fafdc268a5337c74a8f9ac205a64536a735c9dbc69d9be3053a884e3d85eb60a
size 126317360

2131
node_modules.spec.inc
View File

File diff suppressed because it is too large Load Diff

16530
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
traefik-2.11.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:41406d723c4330207952df501d0ff810e8583da3aef649b8d226a91a35fa9eca
size 9130975

3
traefik-2.11.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:16da19eddb64ead57dd1b5e3884b29983e73f762ec41c3b1e89c062f14ad267b
size 9041959

45
traefik-fix-int-overflow-with-go-generate-10452.patch
View File

@ -1,45 +0,0 @@
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

39
traefik.changes
View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Fri May 3 15:14:17 UTC 2024 - Johannes Weberhofer <jweberhofer@weberhofer.at>
- Added allow-node-21.patch to allow building with nodejs21, too
- Update to version 2.11.2
Important: Read the migration guide at https://doc.traefik.io/traefik/migration/v2/#v2112
* CVE's:
* GHSA-7f4j-64p6-5h5v (related to CVE-2023-45288)
* CVE-2024-28869
* Bug fixes:
* [server] Revert LingeringTimeout and change default value for ReadTimeout
* [server] Set default ReadTimeout value to 60s
- Removed traefik-fix-int-overflow-with-go-generate-10452.patch
- Update to version 2.11.1:
* Bug fixes:
* [acme,tls] Enforce handling of ACME-TLS/1 challenges
* [acme] Update go-acme/lego to v4.16.1
* [acme] Close created file in ACME local store CheckFile func
* [docker,http3] Update to quic-go v0.42.0 and docker/cli v24.0.9
* [docker,marathon,rancher,ecs,tls,nomad] Allow to configure TLSStore default generated certificate with labels
* [ecs] Adjust ECS network interface detection logi
* [logs,tls] Fix log when default TLSStore and TLSOptions are defined multiple times
* [middleware] Allow empty replacement with ReplacePathRegex middleware
* [plugins] Update Yaegi to v0.16.1
* [provider,rules] Don't allow routers higher than internal ones
* [rules] Reserve priority range for internal router
* [server,tcp] Introduce Lingering Timeout
* [tcp] Enforce failure for TCP HostSNI with hostname
* [tracing] Bump Elastic APM to v2.4.8
* [webui] Fix dashboard exposition through a router
* [webui] Display IPAllowlist middleware configuration in dashboard
* [webui] Make text more readable in dark mode
* [webui] Migrate to Quasar 2.x and Vue.js 3.x
* [webui] Add a horizontal scroll for the mobile view
-------------------------------------------------------------------
Wed Mar 6 11:13:51 UTC 2024 - Johannes Weberhofer <jweberhofer@weberhofer.at>

6
traefik.spec
View File

@ -25,7 +25,7 @@
%endif
Name: traefik
Version: 2.11.0
Version: 2.11.2
Release: 0
Summary: The Cloud Native Application Proxy
License: MIT
@ -40,8 +40,7 @@ Source5: node_modules.spec.inc
# prepare-sources.sh is used to prepare sources for packaging
Source6: prepare-sources.sh
# PATCH-FIX-UPSTREAM allow packaging on 32bit architectures gh#traefik/traefik#10451
Patch1: traefik-fix-int-overflow-with-go-generate-10452.patch
Patch0: allow-node-21.patch
BuildRequires: go-bindata
BuildRequires: golang-packaging
@ -64,6 +63,7 @@ Pointing Traefik at your orchestrator should be the only configuration step you
%prep
%setup -b0 -a1 -q
%autopatch -p1
cd webui
local-npm-registry %{_sourcedir} install --include=dev --legacy-peer-deps

4
vendor.tar.gz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e982bd33bb1ab2a6d5199d84f256c3852c6b49cbfbfd74cbca3d15d6fd3d9b02
size 22444070
oid sha256:f3aa6f198ca0431d292b19bb3354850e0d82d1f8184975680dc227012487e38d
size 22470288