From nobody Mon Mar 27 11:27:16 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PlVsJ3YHSz4287S; Mon, 27 Mar 2023 11:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PlVsJ2wGWz3Kdr; Mon, 27 Mar 2023 11:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679916436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kK3ij5SP/S8gSpeyMSsPlect/MTlP9UNQvebGu8/fmc=; b=Iqu6BSgje3OBykD8mbm1DehUJ/uZ0Z8ePxAUoVEYsHwz3b4RfUZHzr2yWSLyRBXelp5vQt h40+s/mKR3uAw7rLzd2xUsdON8cEG5wQflWZ+ll+8GzQUWF7SMlPES+wg5ITYxxobkyahC qFg070BkAkE+Zr0RHe9pAUP9kwa0TqRiKlnfVLQ1eOvtcOXqT6JAAGTszVg3ZR1rQcEALW v4wJ1mlJu7sNF6vC8FZpMPKvBIg5fDZeM7FAYAS9EIIh2f+1HHnL/+/AErWTaNd7+KnMci w/bJ7NQUWQBj8Yt03fn3114aWRjCtPK80XcFqCXYXGQGubjcld4y2b7jz70KDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679916436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kK3ij5SP/S8gSpeyMSsPlect/MTlP9UNQvebGu8/fmc=; b=AqKh4ZWRdrdw77hr80aSHGCa3ksJadJPpzyc7v7gCl/cS6Gbzo3uWdQ57trml87Ff4ZDgL 4yBhtDdN4s2hgPfffGFUp0rwlDi6m6a0DnKyDclF7f+NjHEdFOKOhCEye3iVNi5Za5r8y7 BWlCKG2kITiDaRtOhby5GE39BI7gfXydwUNGX5j9fmLSk70MdhRM8JUa1XUonV7HO8ao2b OF4kkxGl4RNr7APHzt5Vrv1NaC4Pa1XwGjXTmGtjGh2943vGErxarZ3m5A2HXNppzDTj9O Ef20ygP0/M4vmu6LlWHZ+qxSIOEVBNCNYrw27XPsc1S0CiXGWJHo1nt5B17EGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679916436; a=rsa-sha256; cv=none; b=Lf4LG//M5nAbWCkaVE+V0rludLqpuOTiLR27IBW08WVyXtDn7TO+hvLI2J4uhQCNSBQmBD gE2LlmURAmiCQjBfQffy5ciz92XgGXbO2ZA5waHo/qZ0obvitjuvLzF/hcmSBaDvehP1r3 ht3KIJz4n2dCjZC+17SvTnDW76YWiWn8ytegU26tWzw0GyTIhDf5bwhEO2NDDnltHupYBz lKY20R//YYoM8npQpD75n+okKelpEiJ4I2+sAif2jfTPmKakA4GwTUCZPK8Q8w1X/jQzXq QrDBL90LYrnOSEIFmwh5c3U/a3ksY+hDqxlcHfEbIytfmngMQAVIUwY/clJgUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlVsJ1sb3zKXS; Mon, 27 Mar 2023 11:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RBRGJx058562; Mon, 27 Mar 2023 11:27:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RBRGIe058561; Mon, 27 Mar 2023 11:27:16 GMT (envelope-from git) Date: Mon, 27 Mar 2023 11:27:16 GMT Message-Id: <202303271127.32RBRGIe058561@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 353d4b338f51 - main - net-mgmt/mysqld_exporter: fix build on riscv64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 353d4b338f518d96bade801399b50df04d5f2b85 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=353d4b338f518d96bade801399b50df04d5f2b85 commit 353d4b338f518d96bade801399b50df04d5f2b85 Author: Robert Clausecker AuthorDate: 2023-03-25 01:02:38 +0000 Commit: Robert Clausecker CommitDate: 2023-03-27 11:24:56 +0000 net-mgmt/mysqld_exporter: fix build on riscv64 Bump golang.org/x/sys dependency to a version new enough to support riscv64-freebsd. Remove thus obsoleted patch. Sponsored by: Berliner Linux User Group e.V. Approved by: portmgr (build fix blanket) --- net-mgmt/mysqld_exporter/Makefile | 7 +- net-mgmt/mysqld_exporter/distinfo | 4 +- net-mgmt/mysqld_exporter/files/patch-go.mod | 45 +++++++++ net-mgmt/mysqld_exporter/files/patch-go.sum | 101 +++++++++++++++++++++ ...golang.org_x_sys_unix_ztypes__freebsd__arm64.go | 24 ----- .../mysqld_exporter/files/patch-vendor_modules.txt | 98 ++++++++++++++++++++ 6 files changed, 253 insertions(+), 26 deletions(-) diff --git a/net-mgmt/mysqld_exporter/Makefile b/net-mgmt/mysqld_exporter/Makefile index a21d486c65ab..dc2765aec547 100644 --- a/net-mgmt/mysqld_exporter/Makefile +++ b/net-mgmt/mysqld_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= mysqld_exporter PORTVERSION= 0.12.1 DISTVERSIONPREFIX=v -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net-mgmt MAINTAINER= mr.deadlystorm@gmail.com @@ -14,6 +14,7 @@ USES= go:modules USE_GITHUB= yes GH_ACCOUNT= prometheus +GH_TUPLE= golang:sys:v0.6.0:sys GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} @@ -21,4 +22,8 @@ PLIST_FILES= bin/mysqld_exporter USE_RC_SUBR= mysqld_exporter +pre-patch: + ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys + ${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys + .include diff --git a/net-mgmt/mysqld_exporter/distinfo b/net-mgmt/mysqld_exporter/distinfo index 58c2043fa32b..51d9709cc110 100644 --- a/net-mgmt/mysqld_exporter/distinfo +++ b/net-mgmt/mysqld_exporter/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1585675193 +TIMESTAMP = 1679705787 SHA256 (prometheus-mysqld_exporter-v0.12.1_GH0.tar.gz) = 8fdd21c629963f5275ac772f59e8d32bafc8aee1ae61cf8ae996f30c92cbc360 SIZE (prometheus-mysqld_exporter-v0.12.1_GH0.tar.gz) = 1910780 +SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/net-mgmt/mysqld_exporter/files/patch-go.mod b/net-mgmt/mysqld_exporter/files/patch-go.mod new file mode 100644 index 000000000000..8972c6d4e4f1 --- /dev/null +++ b/net-mgmt/mysqld_exporter/files/patch-go.mod @@ -0,0 +1,45 @@ +--- go.mod.orig 2023-03-25 01:00:23 UTC ++++ go.mod +@@ -1,25 +1,33 @@ + module github.com/prometheus/mysqld_exporter + ++go 1.17 ++ + require ( + github.com/DATA-DOG/go-sqlmock v1.3.3 ++ github.com/go-sql-driver/mysql v1.4.1 ++ github.com/prometheus/client_golang v1.0.0 ++ github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 ++ github.com/prometheus/common v0.6.0 ++ github.com/satori/go.uuid v1.2.0 ++ github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a ++ gopkg.in/alecthomas/kingpin.v2 v2.2.6 ++ gopkg.in/ini.v1 v1.44.0 ++) ++ ++require ( + github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect + github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 // indirect +- github.com/go-sql-driver/mysql v1.4.1 ++ github.com/beorn7/perks v1.0.0 // indirect + github.com/golang/protobuf v1.3.2 // indirect + github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect ++ github.com/jtolds/gls v4.20.0+incompatible // indirect + github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect + github.com/kr/pretty v0.1.0 // indirect +- github.com/prometheus/client_golang v1.0.0 +- github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 +- github.com/prometheus/common v0.6.0 ++ github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/prometheus/procfs v0.0.3 // indirect +- github.com/satori/go.uuid v1.2.0 + github.com/sirupsen/logrus v1.4.2 // indirect + github.com/smartystreets/assertions v1.0.0 // indirect +- github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a +- golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb // indirect ++ golang.org/x/sys v0.6.0 // indirect + google.golang.org/appengine v1.6.1 // indirect +- gopkg.in/alecthomas/kingpin.v2 v2.2.6 + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect +- gopkg.in/ini.v1 v1.44.0 + ) diff --git a/net-mgmt/mysqld_exporter/files/patch-go.sum b/net-mgmt/mysqld_exporter/files/patch-go.sum new file mode 100644 index 000000000000..87677ff57ed0 --- /dev/null +++ b/net-mgmt/mysqld_exporter/files/patch-go.sum @@ -0,0 +1,101 @@ +--- go.sum.orig 2023-03-25 01:00:26 UTC ++++ go.sum +@@ -1,10 +1,8 @@ + github.com/DATA-DOG/go-sqlmock v1.3.3 h1:CWUqKXe0s8A2z6qCgkP4Kru7wC11YoAnoupUKFDnH08= + github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= +-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU= + github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= + github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= + github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY= + github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= + github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 h1:Hs82Z41s6SdL1CELW+XaDYmOH4hkBN4/N9og/AsOv7E= + github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +@@ -20,11 +18,8 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7Fu + github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= + github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= + github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +-github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo= + github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= + github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +-github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= + github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= + github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= + github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +@@ -36,7 +31,6 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvty + github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= + github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= + github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +-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/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= + github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +@@ -54,26 +48,21 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857- + github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= + github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= + github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +-github.com/prometheus/client_golang v0.9.1 h1:K47Rk0v/fkEfwfQet2KWhscE0cJzjgCCDBG2KHZoVno= + github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= + github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM= + github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8= + github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= + github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE= + github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +-github.com/prometheus/common v0.4.1 h1:K0MGApIoQvMw27RTdJkPbr3JZ7DNbtxQNyi5STVM6Kw= + github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= + github.com/prometheus/common v0.6.0 h1:kRhiuYSXR3+uv2IbVbZhUxK5zVD/2pp3Gd2PpvPkpEo= + github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= + github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +-github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs= + github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= + github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE= + github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= + github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= + github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +-github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo= + github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= + github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= + github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +@@ -84,11 +73,9 @@ github.com/smartystreets/goconvey v0.0.0-2019033003261 + github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= + github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= + github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +-github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= + github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= + github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= + github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I= + golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= + golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= + golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +@@ -97,20 +84,19 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go + golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= + golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= + golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= + golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5 h1:mzjBh+S5frKOsOBobWIMAbXavqjmgO17k/2puhcFR94= + golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= + golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb h1:fgwFCsaw9buMuxNd6+DQfAuSFqbNiQZpcgJQAgJsK6k= + golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= ++golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= + golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +@@ -125,5 +111,4 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/ini.v1 v1.44.0 h1:YRJzTUp0kSYWUVFF5XAbDFfyiqwsl0Vb9R8TVP5eRi0= + gopkg.in/ini.v1 v1.44.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +-gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= + gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/net-mgmt/mysqld_exporter/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go b/net-mgmt/mysqld_exporter/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go deleted file mode 100644 index 0e0603b77cee..000000000000 --- a/net-mgmt/mysqld_exporter/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go +++ /dev/null @@ -1,24 +0,0 @@ -From 33540a1f603772f9d4b761f416f5c10dade23e96 Mon Sep 17 00:00:00 2001 -From: Tobias Klauser -Date: Fri, 25 Oct 2019 21:13:51 +0200 -Subject: [PATCH] unix: don't use non-existing uint128 type on freebsd/arm64 - -CL 179099 introduced type FpReg on freebsd, on freebsd/arm64 using a -type uint128. This type doesn't exist in Go. - -Change-Id: Ie7f065f38f2cc2c163abdfa7dddad886b8edbe3b -Reviewed-on: https://go-review.googlesource.com/c/sys/+/203419 -Run-TryBot: Tobias Klauser -TryBot-Result: Gobot Gobot -Reviewed-by: Brad Fitzpatrick ---- vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go.orig 2019-08-18 13:42:05 UTC -+++ vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go -@@ -397,7 +397,7 @@ type Reg struct { - } - - type FpReg struct { -- Fp_q [32]uint128 -+ Fp_q [512]uint8 - Fp_sr uint32 - Fp_cr uint32 - } diff --git a/net-mgmt/mysqld_exporter/files/patch-vendor_modules.txt b/net-mgmt/mysqld_exporter/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..2ef533f9a37d --- /dev/null +++ b/net-mgmt/mysqld_exporter/files/patch-vendor_modules.txt @@ -0,0 +1,98 @@ +--- vendor/modules.txt.orig 2023-03-25 01:01:20 UTC ++++ vendor/modules.txt +@@ -1,60 +1,87 @@ + # github.com/DATA-DOG/go-sqlmock v1.3.3 ++## explicit + github.com/DATA-DOG/go-sqlmock + # github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 ++## explicit + github.com/alecthomas/template + github.com/alecthomas/template/parse + # github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 ++## explicit + github.com/alecthomas/units + # github.com/beorn7/perks v1.0.0 ++## explicit; go 1.12 + github.com/beorn7/perks/quantile + # github.com/go-sql-driver/mysql v1.4.1 ++## explicit + github.com/go-sql-driver/mysql + # github.com/golang/protobuf v1.3.2 ++## explicit + github.com/golang/protobuf/proto + # github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c ++## explicit + github.com/gopherjs/gopherjs/js + # github.com/jtolds/gls v4.20.0+incompatible ++## explicit + github.com/jtolds/gls + # github.com/konsorten/go-windows-terminal-sequences v1.0.2 ++## explicit + github.com/konsorten/go-windows-terminal-sequences ++# github.com/kr/pretty v0.1.0 ++## explicit + # github.com/matttproud/golang_protobuf_extensions v1.0.1 ++## explicit + github.com/matttproud/golang_protobuf_extensions/pbutil + # github.com/prometheus/client_golang v1.0.0 ++## explicit + github.com/prometheus/client_golang/prometheus +-github.com/prometheus/client_golang/prometheus/promhttp + github.com/prometheus/client_golang/prometheus/internal ++github.com/prometheus/client_golang/prometheus/promhttp + # github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 ++## explicit; go 1.9 + github.com/prometheus/client_model/go + # github.com/prometheus/common v0.6.0 +-github.com/prometheus/common/log +-github.com/prometheus/common/version ++## explicit + github.com/prometheus/common/expfmt +-github.com/prometheus/common/model + github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg ++github.com/prometheus/common/log ++github.com/prometheus/common/model ++github.com/prometheus/common/version + # github.com/prometheus/procfs v0.0.3 ++## explicit + github.com/prometheus/procfs + github.com/prometheus/procfs/internal/fs + # github.com/satori/go.uuid v1.2.0 ++## explicit + github.com/satori/go.uuid + # github.com/sirupsen/logrus v1.4.2 ++## explicit + github.com/sirupsen/logrus + # github.com/smartystreets/assertions v1.0.0 ++## explicit; go 1.12 + github.com/smartystreets/assertions + github.com/smartystreets/assertions/internal/go-diff/diffmatchpatch + github.com/smartystreets/assertions/internal/go-render/render + github.com/smartystreets/assertions/internal/oglematchers + # github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a ++## explicit + github.com/smartystreets/goconvey/convey +-github.com/smartystreets/goconvey/convey/reporting + github.com/smartystreets/goconvey/convey/gotest +-# golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb +-golang.org/x/sys/windows +-golang.org/x/sys/windows/svc/eventlog ++github.com/smartystreets/goconvey/convey/reporting ++# golang.org/x/sys v0.6.0 ++## explicit; go 1.17 ++golang.org/x/sys/internal/unsafeheader + golang.org/x/sys/unix ++golang.org/x/sys/windows + golang.org/x/sys/windows/registry ++golang.org/x/sys/windows/svc/eventlog + # google.golang.org/appengine v1.6.1 ++## explicit + google.golang.org/appengine/cloudsql + # gopkg.in/alecthomas/kingpin.v2 v2.2.6 ++## explicit + gopkg.in/alecthomas/kingpin.v2 ++# gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 ++## explicit + # gopkg.in/ini.v1 v1.44.0 ++## explicit + gopkg.in/ini.v1