From 13c172d3b4697055e78ea9cec9dc114833ef3a52 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Sun, 15 Dec 2024 01:23:15 +0300 Subject: [PATCH 1/8] Update card --- .github/images/card.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/images/card.svg b/.github/images/card.svg index fe29130e..aa2398f4 100644 --- a/.github/images/card.svg +++ b/.github/images/card.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 6da45f11cbc500d51a2bfa4fc4a23b3f818d0c06 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Mon, 16 Dec 2024 16:01:55 +0300 Subject: [PATCH 2/8] Update card --- .github/images/card.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/images/card.svg b/.github/images/card.svg index aa2398f4..c54f42eb 100644 --- a/.github/images/card.svg +++ b/.github/images/card.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 2acadd5dbc11ebc0b33c13c74059ba9ab6494b38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 03:16:34 +0000 Subject: [PATCH 3/8] Bump github.com/essentialkaos/ek/v13 in the all group Bumps the all group with 1 update: [github.com/essentialkaos/ek/v13](https://github.com/essentialkaos/ek). Updates `github.com/essentialkaos/ek/v13` from 13.15.1 to 13.15.2 - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v13.15.1...v13.15.2) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v13 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index aee005a2..d6d190f5 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.8 require ( github.com/ProtonMail/go-crypto v1.1.3 github.com/essentialkaos/check v1.4.1 - github.com/essentialkaos/ek/v13 v13.15.1 + github.com/essentialkaos/ek/v13 v13.15.2 github.com/klauspost/compress v1.17.11 github.com/mattn/go-sqlite3 v1.14.24 github.com/sassoftware/go-rpmutils v0.4.0 diff --git a/go.sum b/go.sum index dcf3e4e8..94d72d3a 100644 --- a/go.sum +++ b/go.sum @@ -11,8 +11,8 @@ github.com/essentialkaos/check v1.4.1 h1:SuxXzrbokPGTPWxGRnzy0hXvtb44mtVrdNxgPa1 github.com/essentialkaos/check v1.4.1/go.mod h1:xQOYwFvnxfVZyt5Qvjoa1SxcRqu5VyP77pgALr3iu+M= github.com/essentialkaos/depsy v1.3.1 h1:00k9QcMsdPM4IzDaEFHsTHBD/zoM0oxtB5+dMUwbQa8= github.com/essentialkaos/depsy v1.3.1/go.mod h1:B5+7Jhv2a2RacOAxIKU2OeJp9QfZjwIpEEPI5X7auWM= -github.com/essentialkaos/ek/v13 v13.15.1 h1:11m8g8SaW2B7N6y9q3c/5p9qMi7ElwXUD8HxKc2fE+Q= -github.com/essentialkaos/ek/v13 v13.15.1/go.mod h1:FnKbXv0qaoT7Ocqg0oAhlkgQZKVQFAP32wKEmrf7xNw= +github.com/essentialkaos/ek/v13 v13.15.2 h1:EnhQ+JvJVpEn8TNT0G2EupoQw+9R2hPrAFl/jjwPkC0= +github.com/essentialkaos/ek/v13 v13.15.2/go.mod h1:ez9V1qvfXvjI6gqT24fZfkdVefHzYi6bm/c2NrD7B3s= github.com/essentialkaos/go-linenoise/v3 v3.6.1 h1:VzjakaWNAPfattl/HSIJveWYpfrxAYHzUl8u6DdOjtY= github.com/essentialkaos/go-linenoise/v3 v3.6.1/go.mod h1:hpxke5G2eXvFhVnDAiGU9ArH3MTDGGc13afObIbuaJQ= github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= From f17f5aa13342d5d6956f7565e65404fbf153714f Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Sat, 21 Dec 2024 02:45:12 +0300 Subject: [PATCH 4/8] Downgrade go-crypto to 1.0.0 due to invalid signature with newer versions --- cli/cli.go | 2 +- common/rep.spec | 5 ++++- go.mod | 2 +- go.sum | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 51 insertions(+), 5 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index 76e42acd..66b493a5 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -49,7 +49,7 @@ import ( // App info const ( APP = "rep" - VER = "3.5.1" + VER = "3.5.2" DESC = "DNF/YUM repository management utility" ) diff --git a/common/rep.spec b/common/rep.spec index 373a241c..69c7c898 100644 --- a/common/rep.spec +++ b/common/rep.spec @@ -15,7 +15,7 @@ Summary: DNF/YUM repository management utility Name: rep -Version: 3.5.1 +Version: 3.5.2 Release: 0%{?dist} Group: Applications/System License: Apache 2.0 @@ -109,6 +109,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Sat Dec 21 2024 Anton Novojilov - 3.5.2-0 +- Downgraded go-crypto to 1.0.0 due to invalid signature with newer versions + * Fri Sep 13 2024 Anton Novojilov - 3.5.1-0 - Code refactoring - Dependencies update diff --git a/go.mod b/go.mod index aee005a2..e3314603 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/essentialkaos/rep/v3 go 1.22.8 require ( - github.com/ProtonMail/go-crypto v1.1.3 + github.com/ProtonMail/go-crypto v1.0.0 github.com/essentialkaos/check v1.4.1 github.com/essentialkaos/ek/v13 v13.15.1 github.com/klauspost/compress v1.17.11 diff --git a/go.sum b/go.sum index dcf3e4e8..8b052281 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,9 @@ github.com/DataDog/zstd v1.5.6 h1:LbEglqepa/ipmmQJUDnSsfvA8e8IStVcGaFWDuxvGOY= github.com/DataDog/zstd v1.5.6/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= -github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk= -github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= +github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78= +github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= +github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= github.com/cloudflare/circl v1.5.0 h1:hxIWksrX6XN5a1L2TI/h53AGPhNHoUBo+TD1ms9+pys= github.com/cloudflare/circl v1.5.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -37,11 +39,52 @@ github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 22064bfecf2f4574d746a95ae55584869bfc81df Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Sat, 21 Dec 2024 02:47:30 +0300 Subject: [PATCH 5/8] Fix CI --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0430de9..48ed8837 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,6 @@ jobs: pkg-config \ libglib2.0-dev \ liblzma-dev \ - libsqlite0-dev \ libsqlite3-dev \ librpm-dev \ libzstd-dev \ From 3dfbabadba71b042cd8a050abaec7461fc8e8442 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Sat, 21 Dec 2024 03:04:30 +0300 Subject: [PATCH 6/8] Fix formatting for warning about re-signing all packages --- cli/cmd_resign.go | 3 ++- common/rep.spec | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cli/cmd_resign.go b/cli/cmd_resign.go index 78b49274..7e580625 100644 --- a/cli/cmd_resign.go +++ b/cli/cmd_resign.go @@ -10,6 +10,7 @@ package cli import ( "github.com/essentialkaos/ek/v13/fmtc" "github.com/essentialkaos/ek/v13/fmtutil" + "github.com/essentialkaos/ek/v13/fmtutil/panel" "github.com/essentialkaos/ek/v13/options" "github.com/essentialkaos/ek/v13/path" "github.com/essentialkaos/ek/v13/pluralize" @@ -27,7 +28,7 @@ import ( // cmdSign is 'resign' command handler func cmdResign(ctx *context, args options.Arguments) bool { if !options.GetB(OPT_FORCE) { - terminal.Warn("Command can take a lot of time", + panel.Warn("Command can take a lot of time", `This command will re-sign all packages in the repo. Re-sign process requires rewriting {*}every{!} package in repository and can take a lot of time (depending on how many packages you have and how big they are).`) diff --git a/common/rep.spec b/common/rep.spec index 69c7c898..4bb79c08 100644 --- a/common/rep.spec +++ b/common/rep.spec @@ -111,6 +111,7 @@ rm -rf %{buildroot} %changelog * Sat Dec 21 2024 Anton Novojilov - 3.5.2-0 - Downgraded go-crypto to 1.0.0 due to invalid signature with newer versions +- Fixed formatting for warning about re-signing all packages * Fri Sep 13 2024 Anton Novojilov - 3.5.1-0 - Code refactoring From 2cb9e01731fa2047d20e41a0c6d4113059b0d7e3 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Mon, 23 Dec 2024 00:02:39 +0300 Subject: [PATCH 7/8] Minor UI improvement --- cli/cmd_resign.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cli/cmd_resign.go b/cli/cmd_resign.go index 7e580625..a39cfe92 100644 --- a/cli/cmd_resign.go +++ b/cli/cmd_resign.go @@ -28,10 +28,13 @@ import ( // cmdSign is 'resign' command handler func cmdResign(ctx *context, args options.Arguments) bool { if !options.GetB(OPT_FORCE) { - panel.Warn("Command can take a lot of time", + panel.Warn( + "Command can take a lot of time", `This command will re-sign all packages in the repo. Re-sign process requires rewriting {*}every{!} package in repository and can take a lot of time (depending on -how many packages you have and how big they are).`) +how many packages you have and how big they are).`, + panel.INDENT_INNER, + ) fmtc.NewLine() From a248ac51b5af98385235600da7793eccb43e4171 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Mon, 23 Dec 2024 11:12:11 +0300 Subject: [PATCH 8/8] Add go-crypto to dependabot ingore --- .github/dependabot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 605744aa..b7c55708 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -20,6 +20,8 @@ updates: update-types: - "minor" - "patch" + ignore: + - dependency-name: "github.com/ProtonMail/go-crypto" - package-ecosystem: "github-actions" directory: "/"