Attachment 220879 Details for Bug 251685 – Fix dependencies conflict

[patch] Fix dependencies conflict

vuls-deps-fix.diff (text/plain), 3.22 KB, created by Alexandru Ciobanu on 2020-12-24 05:29:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexandru Ciobanu

Created: 2020-12-24 05:29:24 UTC

Size: 3.22 KB

patch

obsolete

>Index: security/vuls/Makefile
>===================================================================
>--- security/vuls/Makefile	(revision 559048)
>+++ security/vuls/Makefile	(working copy)
>@@ -31,7 +31,6 @@
> 		Masterminds:semver:v3.1.0:masterminds_semver_v3/vendor/github.com/Masterminds/semver/v3 \
> 		RackSec:srslog:a4725f04ec91:racksec_srslog/vendor/github.com/RackSec/srslog \
> 		VividCortex:ewma:v1.1.1:vividcortex_ewma/vendor/github.com/VividCortex/ewma \
>-		VividCortex:ewma:v1.1.1:vividcortex_ewma_1/vendor/gopkg.in/VividCortex/ewma.v1 \
> 		aquasecurity:bolt-fixtures:c0f517aea2ed:aquasecurity_bolt_fixtures/vendor/github.com/aquasecurity/bolt-fixtures \
> 		aquasecurity:fanal:6de62ef86882:aquasecurity_fanal/vendor/github.com/aquasecurity/fanal \
> 		aquasecurity:go-dep-parser:ea223f0ef24b:aquasecurity_go_dep_parser/vendor/github.com/aquasecurity/go-dep-parser \
>@@ -45,7 +44,6 @@
> 		cenkalti:backoff:v2.2.1:cenkalti_backoff/vendor/github.com/cenkalti/backoff \
> 		cheggaaa:pb:v1.0.28:cheggaaa_pb_1/vendor/gopkg.in/cheggaaa/pb.v1 \
> 		cheggaaa:pb:v2.0.7:cheggaaa_pb/vendor/github.com/cheggaaa/pb \
>-		cheggaaa:pb:v2.0.7:cheggaaa_pb_2/vendor/gopkg.in/cheggaaa/pb.v2 \
> 		cheggaaa:pb:v3.0.3:cheggaaa_pb_v3 \
> 		d4l3k:messagediff:7e0a312ae40b:d4l3k_messagediff/vendor/github.com/d4l3k/messagediff \
> 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
>Index: security/vuls/distinfo
>===================================================================
>--- security/vuls/distinfo	(revision 559048)
>+++ security/vuls/distinfo	(working copy)
>@@ -1,4 +1,4 @@
>-TIMESTAMP = 1607293013
>+TIMESTAMP = 1608785975
> SHA256 (future-architect-vuls-v0.9.0-92-g101c44c_GH0.tar.gz) = 2c3472b4bbd38888f73191480b71653ec1bae41570c70ddee8318f8db8a4c9ff
> SIZE (future-architect-vuls-v0.9.0-92-g101c44c_GH0.tar.gz) = 983192
> SHA256 (Azure-azure-sdk-for-go-v43.3.0_GH0.tar.gz) = bf5e030b3ebb0a0ac0388ab2cee1b4e4ce2c65d8541f3b176ed64b918f2e00e3
>@@ -21,8 +21,6 @@
> SIZE (RackSec-srslog-a4725f04ec91_GH0.tar.gz) = 18856
> SHA256 (VividCortex-ewma-v1.1.1_GH0.tar.gz) = 3b2d62412b7ba2726a379cc0ae557595c027dc8206d0ef98f13831281b8f2b85
> SIZE (VividCortex-ewma-v1.1.1_GH0.tar.gz) = 6042
>-SHA256 (VividCortex-ewma-v1.1.1_GH0.tar.gz) = 3b2d62412b7ba2726a379cc0ae557595c027dc8206d0ef98f13831281b8f2b85
>-SIZE (VividCortex-ewma-v1.1.1_GH0.tar.gz) = 6042
> SHA256 (aquasecurity-bolt-fixtures-c0f517aea2ed_GH0.tar.gz) = 85090c3ea534154c941db862910a16a7e22dd525f401bee280c872255bca5fe2
> SIZE (aquasecurity-bolt-fixtures-c0f517aea2ed_GH0.tar.gz) = 8424
> SHA256 (aquasecurity-fanal-6de62ef86882_GH0.tar.gz) = c9aec273bdea5fcb6a1d203c187e6257f09ba99fcb3e58ddb7e31f593950e1f9
>@@ -49,8 +47,6 @@
> SIZE (cheggaaa-pb-v1.0.28_GH0.tar.gz) = 11788
> SHA256 (cheggaaa-pb-v2.0.7_GH0.tar.gz) = be0bc91fdbc2ce3c6ee758d3c814cb54f23d837cbc2b59a9e12687901ae81d6f
> SIZE (cheggaaa-pb-v2.0.7_GH0.tar.gz) = 17953
>-SHA256 (cheggaaa-pb-v2.0.7_GH0.tar.gz) = be0bc91fdbc2ce3c6ee758d3c814cb54f23d837cbc2b59a9e12687901ae81d6f
>-SIZE (cheggaaa-pb-v2.0.7_GH0.tar.gz) = 17953
> SHA256 (cheggaaa-pb-v3.0.3_GH0.tar.gz) = 8ee3bf57c4f153b49283f492b79cf662a37f97911d8ab69917ce6d0f04923ea5
> SIZE (cheggaaa-pb-v3.0.3_GH0.tar.gz) = 29708
> SHA256 (d4l3k-messagediff-7e0a312ae40b_GH0.tar.gz) = 39245821a631eeac72b8ae3d44cbae023a88a24107d45b7e09925df3a25b45ff

Flags:

iscandr: maintainer-approval+

Actions: View | Diff

Attachments on bug 251685: 220368 | 220876 | 220879 | 220880 | 221429