gentoo resync : 25.03.2022

1 files changed, 48 insertions, 6 deletions

diff --git a/app-containers/reg/files/reg-0.16.0-config.patch b/app-containers/reg/files/reg-0.16.1-config.patch
index 3ec1bf44d032..717861dfab38 100644
--- a/app-containers/reg/files/reg-0.16.0-config.patch
+++ b/app-containers/reg/files/reg-0.16.1-config.patch
@@ -1,20 +1,22 @@
-From 0ab86b565f437b9dede5d3a7cef56690d8d19bbb Mon Sep 17 00:00:00 2001
+From ce4b2828ec800f0d1782b97b9400bd71154e5bbf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
 Date: Tue, 18 Sep 2018 15:42:24 +0200
-Subject: [PATCH 2/2] server: Read config from file
+Subject: [PATCH] server: Read config from file
 
 ---
  README.md          |   4 ++
  config.yml.example |  37 ++++++++++++++++
+ go.mod             |   1 +
+ go.sum             |   4 ++
  server.go          | 107 +++++++++++++++++++++++++++++++--------------
- 3 files changed, 114 insertions(+), 34 deletions(-)
+ 5 files changed, 119 insertions(+), 34 deletions(-)
  create mode 100644 config.yml.example
 
 diff --git a/README.md b/README.md
-index 3b1b661f..5e0f0175 100644
+index 3c93191a..23b1b33c 100644
 --- a/README.md
 +++ b/README.md
-@@ -228,6 +228,7 @@ Flags:
+@@ -212,6 +212,7 @@ Flags:
    -u, --username       username for the registry (default: <none>)
    --listen-address     address to listen on (default: <none>)
    --asset-path         Path to assets and templates (default: <none>)
@@ -22,7 +24,7 @@ index 3b1b661f..5e0f0175 100644
    -f, --force-non-ssl  force allow use of non-ssl (default: false)
    --once               generate the templates once and then exit (default: false)
    --skip-ping          skip pinging the registry while establishing connection (default: false)
-@@ -243,6 +244,9 @@ Flags:
+@@ -227,6 +228,9 @@ Flags:
    -p, --password       password for the registry (default: <none>)
  ```
  
@@ -75,6 +77,43 @@ index 00000000..9d4be25f
 +# force-nonssl: false
 +## Clair Server:
 +# clair:
+diff --git a/go.mod b/go.mod
+index 4e7583e8..914297a8 100644
+--- a/go.mod
++++ b/go.mod
+@@ -35,5 +35,6 @@ require (
+ 	github.com/sirupsen/logrus v1.4.2
+ 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
+ 	google.golang.org/grpc v1.23.1
++	gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7
+ 	gotest.tools v2.2.0+incompatible // indirect
+ )
+diff --git a/go.sum b/go.sum
+index 71f46e16..ff078b3f 100644
+--- a/go.sum
++++ b/go.sum
+@@ -54,8 +54,10 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL
+ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+ github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
+ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
++github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
++github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+ github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
+ github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
+@@ -115,8 +117,10 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA
+ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+ google.golang.org/grpc v1.23.1 h1:q4XQuHFC6I28BKZpo6IYyb3mNO+l7lSOxRuYTCiDfXk=
+ google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
++gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
++gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7 h1:+t9dhfO+GNOIGJof6kPOAenx7YgrZMTdRPV+EsnPabk=
+ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
+ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
+ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 diff --git a/server.go b/server.go
 index fcd4cd71..0c84d85d 100644
 --- a/server.go
@@ -252,3 +291,6 @@ index fcd4cd71..0c84d85d 100644
  	}
  	return server.ListenAndServe()
  }
+-- 
+2.34.1
+