After 24 hours from 1.20.3, upstream released the 1.20.4.
And after 40 minutes, there was a patch submitted to
ports@. :D
Best regards,
Luca De Pandis
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/kubectl/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 5 Feb 2021 19:54:49 -0000 1.5
+++ Makefile 18 Feb 2021 20:14:21 -0000
@@ -4,9 +4,9 @@ COMMENT = command line tool for control
GH_ACCOUNT = kubernetes
GH_PROJECT = kubernetes
-VERSION = 1.20.2
-GH_TAGNAME = v${VERSION}
-PKGNAME = kubectl-${VERSION}
+V = 1.20.4
+GH_TAGNAME = v${V}
+PKGNAME = kubectl-${V}
CATEGORIES = sysutils
@@ -22,5 +22,16 @@ MODULES = lang/go
GO_PKGNAME = k8s.io/kubernetes
WRKSRC = ${MODGO_WORKSPACE}/src/${GO_PKGNAME}
ALL_TARGET = ${GO_PKGNAME}/cmd/kubectl
+
+MODGO_LDFLAGS += \
+ -X ${GO_PKGNAME}/vendor/k8s.io/component-base/version.gitMajor=${V:R:R}
\
+ -X ${GO_PKGNAME}/vendor/k8s.io/component-base/version.gitMinor=${V:R:E}
\
+ -X ${GO_PKGNAME}/vendor/k8s.io/component-base/version.gitVersion=v${V} \
+ -X ${GO_PKGNAME}/vendor/k8s.io/component-base/version.buildDate="" \
+ -X
${GO_PKGNAME}/vendor/k8s.io/component-base/version.gitTreeState=clean \
+ -X ${GO_PKGNAME}/vendor/k8s.io/client-go/pkg/version.gitVersion=v${V} \
+ -X k8s.io/client-go/pkg/version.buildDate="" \
+ -X ${GO_PKGNAME}/vendor/k8s.io/client-go/pkg/version.gitTreeState=clean
\
+ -X ${GO_PKGNAME}/vendor/k8s.io/component-base/version.gitVersion=v${V}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/kubectl/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 5 Feb 2021 19:54:49 -0000 1.5
+++ distinfo 18 Feb 2021 20:14:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (kubernetes-1.20.2.tar.gz) =
uDwHgO+xgtko3GPUZIioR/Fh8E5AqUuWv1JH3Wcezfw=
-SIZE (kubernetes-1.20.2.tar.gz) = 34428927
+SHA256 (kubernetes-1.20.4.tar.gz) =
P+SRuQ9gsbiYlVYyWrrVNAlWi5bicbAOXSP94Y89vkQ=
+SIZE (kubernetes-1.20.4.tar.gz) = 34447775
On Thu, Feb 18, 2021 at 09:21:46AM +0100, Luca De Pandis wrote:
> Hi,
> below the updated port of kubectl.
>
> Other notable changes:
> - Added LDFLAGS to display correct version and to remove
> the fake build date.
> - Changed $VERSION to $V to avoid breaching the 80 character
> limit.
>
> Passed both portcheck and port-lib-depends-check.
>
> Please, could you test and if ok commit it?
>
>
> Best regards,
> Luca De Pandis
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/kubectl/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 Makefile
> --- Makefile 5 Feb 2021 19:54:49 -0000 1.5
> +++ Makefile 18 Feb 2021 08:07:32 -0000
> @@ -4,9 +4,9 @@ COMMENT = command line tool for control
>
> GH_ACCOUNT = kubernetes
> GH_PROJECT = kubernetes
> -VERSION = 1.20.2
> -GH_TAGNAME = v${VERSION}
> -PKGNAME = kubectl-${VERSION}
> +V = 1.20.3
> +GH_TAGNAME = v${V}
> +PKGNAME = kubectl-${V}
>
> CATEGORIES = sysutils
>
> @@ -22,5 +22,16 @@ MODULES = lang/go
> GO_PKGNAME = k8s.io/kubernetes
> WRKSRC = ${MODGO_WORKSPACE}/src/${GO_PKGNAME}
> ALL_TARGET = ${GO_PKGNAME}/cmd/kubectl
> +
> +MODGO_LDFLAGS += \
> + -X ${GO_PKGNAME}/vendor/k8s.io/component-base/version.gitMajor=${V:R:R}
> \
> + -X ${GO_PKGNAME}/vendor/k8s.io/component-base/version.gitMinor=${V:R:E}
> \
> + -X ${GO_PKGNAME}/vendor/k8s.io/component-base/version.gitVersion=v${V} \
> + -X ${GO_PKGNAME}/vendor/k8s.io/component-base/version.buildDate="" \
> + -X
> ${GO_PKGNAME}/vendor/k8s.io/component-base/version.gitTreeState=clean \
> + -X ${GO_PKGNAME}/vendor/k8s.io/client-go/pkg/version.gitVersion=v${V} \
> + -X k8s.io/client-go/pkg/version.buildDate="" \
> + -X ${GO_PKGNAME}/vendor/k8s.io/client-go/pkg/version.gitTreeState=clean
> \
> + -X ${GO_PKGNAME}/vendor/k8s.io/component-base/version.gitVersion=v${V}
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/kubectl/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 distinfo
> --- distinfo 5 Feb 2021 19:54:49 -0000 1.5
> +++ distinfo 18 Feb 2021 08:07:32 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (kubernetes-1.20.2.tar.gz) =
> uDwHgO+xgtko3GPUZIioR/Fh8E5AqUuWv1JH3Wcezfw=
> -SIZE (kubernetes-1.20.2.tar.gz) = 34428927
> +SHA256 (kubernetes-1.20.3.tar.gz) =
> lLXtDZDLkLcAAE/+3oVey63bWLkA2Mb1eZnN/44HJtA=
> +SIZE (kubernetes-1.20.3.tar.gz) = 34445041
