Attachment #229656 for bug #259982

Lines 1-6 Link Here

(-)b/net-mgmt/prometheus2/Makefile (-1 / +1 lines)
1	PORTNAME= prometheus	1	PORTNAME= prometheus
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 2.30.0	3	DISTVERSION= 2.30.3
4	CATEGORIES= net-mgmt	4	CATEGORIES= net-mgmt
5		5
6	MAINTAINER= dor.bsd@xm0.uk	6	MAINTAINER= dor.bsd@xm0.uk

Lines 134-140 GH_TUPLE+= \ Link Here

(-)b/net-mgmt/prometheus2/Makefile.modules (-1 / +1 lines)
134	prometheus:client_golang:v1.11.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \	134	prometheus:client_golang:v1.11.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
135	prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \	135	prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
136	prometheus:common:v0.1.0:prometheus_common_sigv4/vendor/github.com/prometheus/common/sigv4 \	136	prometheus:common:v0.1.0:prometheus_common_sigv4/vendor/github.com/prometheus/common/sigv4 \
137	prometheus:common:v0.30.0:prometheus_common/vendor/github.com/prometheus/common \	137	prometheus:common:v0.30.1:prometheus_common/vendor/github.com/prometheus/common \
138	prometheus:exporter-toolkit:v0.6.1:prometheus_exporter_toolkit/vendor/github.com/prometheus/exporter-toolkit \	138	prometheus:exporter-toolkit:v0.6.1:prometheus_exporter_toolkit/vendor/github.com/prometheus/exporter-toolkit \
139	prometheus:procfs:v0.6.0:prometheus_procfs/vendor/github.com/prometheus/procfs \	139	prometheus:procfs:v0.6.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
140	protocolbuffers:protobuf-go:v1.27.1:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \	140	protocolbuffers:protobuf-go:v1.27.1:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \




TIMESTAMP = 1635860474
SHA256 (prometheus-prometheus-v2.30.3_GH0.tar.gz) = 66a835096e717c11db2ecb5f948c6346868fa1f877196ee2237fb4630df97c06
SIZE (prometheus-prometheus-v2.30.3_GH0.tar.gz) = 6228469
SHA256 (ports-assets-net-mgmt_prometheus2-v2.30.3_GH0.tar.gz) = 66280620a97e7c0a7c068ad5b68465d65261d53cdf217eb13fe19f8f3a953369
SIZE (ports-assets-net-mgmt_prometheus2-v2.30.3_GH0.tar.gz) = 6034598
SHA256 (Azure-azure-sdk-for-go-v57.1.0_GH0.tar.gz) = 3b1214d3ae8568ecba5c03f10b5a1fd700107fe00734d3563e529745ecbc547a
SIZE (Azure-azure-sdk-for-go-v57.1.0_GH0.tar.gz) = 42069618
SHA256 (Azure-go-autorest-446f41b7d65b_GH0.tar.gz) = 883e2603529a907a3da25d5e2389ab6473a80e6d79daf0d9ffc6385494e0da0a

SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
SHA256 (prometheus-common-v0.1.0_GH0.tar.gz) = 5c08a6066883c7043a5cd27a074e763b5de110f65c1ea6ffc8c9360038bb8dd9
SIZE (prometheus-common-v0.1.0_GH0.tar.gz) = 87363
SHA256 (prometheus-common-v0.30.1_GH0.tar.gz) = 629e80ea0bcf9eb988ec696edf1507b134e04f799301c81b2ac7c0bf5fd95545
SIZE (prometheus-common-v0.30.1_GH0.tar.gz) = 145668
SHA256 (prometheus-exporter-toolkit-v0.6.1_GH0.tar.gz) = cfc55484414f9439b9de342d08ff20d87175ad2add174fdf9f1482c393e5e74b
SIZE (prometheus-exporter-toolkit-v0.6.1_GH0.tar.gz) = 49713
SHA256 (prometheus-procfs-v0.6.0_GH0.tar.gz) = 6ad7a23cf4db9fa5dbf2c5d8fbd0fbf5ffe48e3ddb7bf15f9359813d764ce73c




#!/bin/sh
set -e

modules_file="Makefile.modules"

generate_modules() {
    local outfile="$1"

    env M2T_GITHUB="${M2T_GITHUB}" \
        make gomod-vendor \
        > "${outfile}"
}

# Ensure that the Makefile.modules is fit to use.
process_modules() {
    local infile="$1"

    # Ensure that our GH_TUPLE is += to not override the GH_TUPLE in the main
    # Makefile.
    sed -I '' 's#GH_TUPLE=#GH_TUPLE+=#' "${infile}"

    # This fixes an issue with poudriere where some Go modules aren't in the
    # correct loctaion for some reason. I'm still unsure why this is required.
    # See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258548
    sed -I '' 's#simonpasquier_klog_gokit_v3/vendor/k8s.io/klog/v2#simonpasquier_klog_gokit_v3#' "${infile}"

    echo -e "\t@\${RM} -r \${WRKSRC}/vendor/k8s.io/klog/v2" >> "${infile}"
    echo -e "\t@\${RLN} \${WRKSRC_simonpasquier_klog_gokit_v3} \${WRKSRC}/vendor/k8s.io/klog/v2" >> "${infile}"
}

main() {
    local outfile="$(mktemp)"

    # Download new distfiles
    echo "Makesum part 1"
    make makesum

    # Generate a modules file and process it to what we need
    echo "Generating modules file"
    generate_modules "${outfile}"

    echo "Processing modules file"
    process_modules "${outfile}"

    # Download distfiles again to update with new Go modules
    echo "Makesum part 2"
    make makesum

    # Finally move the new modules file into place
    mv "${outfile}" "${modules_file}"
}

main

Return to bug 259982

Lines 1-8 Link Here

(-)b/net-mgmt/prometheus2/distinfo (-7 / +7 lines)
1	TIMESTAMP = 1632656002	1	TIMESTAMP = 1635860474
2	SHA256 (prometheus-prometheus-v2.30.0_GH0.tar.gz) = 900dc07f54c1251f22d18c2a5751bb1b0192b3d9960406a2c7ea3098a688d53c	2	SHA256 (prometheus-prometheus-v2.30.3_GH0.tar.gz) = 66a835096e717c11db2ecb5f948c6346868fa1f877196ee2237fb4630df97c06
3	SIZE (prometheus-prometheus-v2.30.0_GH0.tar.gz) = 6227471	3	SIZE (prometheus-prometheus-v2.30.3_GH0.tar.gz) = 6228469
4	SHA256 (ports-assets-net-mgmt_prometheus2-v2.30.0_GH0.tar.gz) = f422bab1b693857724117983d1dfab1861877147a074eb1429b57be8e9a53650	4	SHA256 (ports-assets-net-mgmt_prometheus2-v2.30.3_GH0.tar.gz) = 66280620a97e7c0a7c068ad5b68465d65261d53cdf217eb13fe19f8f3a953369
5	SIZE (ports-assets-net-mgmt_prometheus2-v2.30.0_GH0.tar.gz) = 6034456	5	SIZE (ports-assets-net-mgmt_prometheus2-v2.30.3_GH0.tar.gz) = 6034598
6	SHA256 (Azure-azure-sdk-for-go-v57.1.0_GH0.tar.gz) = 3b1214d3ae8568ecba5c03f10b5a1fd700107fe00734d3563e529745ecbc547a	6	SHA256 (Azure-azure-sdk-for-go-v57.1.0_GH0.tar.gz) = 3b1214d3ae8568ecba5c03f10b5a1fd700107fe00734d3563e529745ecbc547a
7	SIZE (Azure-azure-sdk-for-go-v57.1.0_GH0.tar.gz) = 42069618	7	SIZE (Azure-azure-sdk-for-go-v57.1.0_GH0.tar.gz) = 42069618
8	SHA256 (Azure-go-autorest-446f41b7d65b_GH0.tar.gz) = 883e2603529a907a3da25d5e2389ab6473a80e6d79daf0d9ffc6385494e0da0a	8	SHA256 (Azure-go-autorest-446f41b7d65b_GH0.tar.gz) = 883e2603529a907a3da25d5e2389ab6473a80e6d79daf0d9ffc6385494e0da0a
Lines 273-280 SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a2 Link Here
273	SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986	273	SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
274	SHA256 (prometheus-common-v0.1.0_GH0.tar.gz) = 5c08a6066883c7043a5cd27a074e763b5de110f65c1ea6ffc8c9360038bb8dd9	274	SHA256 (prometheus-common-v0.1.0_GH0.tar.gz) = 5c08a6066883c7043a5cd27a074e763b5de110f65c1ea6ffc8c9360038bb8dd9
275	SIZE (prometheus-common-v0.1.0_GH0.tar.gz) = 87363	275	SIZE (prometheus-common-v0.1.0_GH0.tar.gz) = 87363
276	SHA256 (prometheus-common-v0.30.0_GH0.tar.gz) = 867c17dbef42eae180d959ca67f7534051939ffe187ad46c2a80397deb849f50	276	SHA256 (prometheus-common-v0.30.1_GH0.tar.gz) = 629e80ea0bcf9eb988ec696edf1507b134e04f799301c81b2ac7c0bf5fd95545
277	SIZE (prometheus-common-v0.30.0_GH0.tar.gz) = 145566	277	SIZE (prometheus-common-v0.30.1_GH0.tar.gz) = 145668
278	SHA256 (prometheus-exporter-toolkit-v0.6.1_GH0.tar.gz) = cfc55484414f9439b9de342d08ff20d87175ad2add174fdf9f1482c393e5e74b	278	SHA256 (prometheus-exporter-toolkit-v0.6.1_GH0.tar.gz) = cfc55484414f9439b9de342d08ff20d87175ad2add174fdf9f1482c393e5e74b
279	SIZE (prometheus-exporter-toolkit-v0.6.1_GH0.tar.gz) = 49713	279	SIZE (prometheus-exporter-toolkit-v0.6.1_GH0.tar.gz) = 49713
280	SHA256 (prometheus-procfs-v0.6.0_GH0.tar.gz) = 6ad7a23cf4db9fa5dbf2c5d8fbd0fbf5ffe48e3ddb7bf15f9359813d764ce73c	280	SHA256 (prometheus-procfs-v0.6.0_GH0.tar.gz) = 6ad7a23cf4db9fa5dbf2c5d8fbd0fbf5ffe48e3ddb7bf15f9359813d764ce73c

Added Link Here

(-)b/net-mgmt/prometheus2/update-port.sh (+53 lines)
1	#!/bin/sh
2	set -e
3
4	modules_file="Makefile.modules"
5
6	generate_modules() {
7	local outfile="$1"
8
9	env M2T_GITHUB="${M2T_GITHUB}" \
10	make gomod-vendor \
11	> "${outfile}"
12	}
13
14	# Ensure that the Makefile.modules is fit to use.
15	process_modules() {
16	local infile="$1"
17
18	# Ensure that our GH_TUPLE is += to not override the GH_TUPLE in the main
19	# Makefile.
20	sed -I '' 's#GH_TUPLE=#GH_TUPLE+=#' "${infile}"
21
22	# This fixes an issue with poudriere where some Go modules aren't in the
23	# correct loctaion for some reason. I'm still unsure why this is required.
24	# See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258548
25	sed -I '' 's#simonpasquier_klog_gokit_v3/vendor/k8s.io/klog/v2#simonpasquier_klog_gokit_v3#' "${infile}"
26
27	echo -e "\t@\${RM} -r \${WRKSRC}/vendor/k8s.io/klog/v2" >> "${infile}"
28	echo -e "\t@\${RLN} \${WRKSRC_simonpasquier_klog_gokit_v3} \${WRKSRC}/vendor/k8s.io/klog/v2" >> "${infile}"
29	}
30
31	main() {
32	local outfile="$(mktemp)"
33
34	# Download new distfiles
35	echo "Makesum part 1"
36	make makesum
37
38	# Generate a modules file and process it to what we need
39	echo "Generating modules file"
40	generate_modules "${outfile}"
41
42	echo "Processing modules file"
43	process_modules "${outfile}"
44
45	# Download distfiles again to update with new Go modules
46	echo "Makesum part 2"
47	make makesum
48
49	# Finally move the new modules file into place
50	mv "${outfile}" "${modules_file}"
51	}
52
53	main