Attachment #253262 for bug #280619

Lines 1-7 Link Here

(-)b/0001-added-security-openbao-as-UID-GID-482.patch (-1 / +1 lines)
1	From 0989edb30253aeeb2ab4a6fef548c33a1118dde4 Mon Sep 17 00:00:00 2001	1	From 0989edb30253aeeb2ab4a6fef548c33a1118dde4 Mon Sep 17 00:00:00 2001
2	From: Charlie Root <jake@metalrip.com>	2	From: Charlie Root <jake@metalrip.com>
3	Date: Fri, 30 Aug 2024 22:55:05 -0400	3	Date: Fri, 30 Aug 2024 22:55:05 -0400
4	Subject: [PATCH 1/2] added security/openbao as UID/GID 482	4	Subject: [PATCH 1/3] added security/openbao as UID/GID 482
5		5
6	---	6	---
7	GIDs \| 2 +-	7	GIDs \| 2 +-

Lines 1-7 Link Here

(-)b/0002-added-SOURCEDATE-use-variables-for-user-groups.patch (-1 / +1 lines)
1	From fe35a731df6edccafdcc8b164d1e6822069ffc3b Mon Sep 17 00:00:00 2001	1	From fe35a731df6edccafdcc8b164d1e6822069ffc3b Mon Sep 17 00:00:00 2001
2	From: Charlie Root <jake@metalrip.com>	2	From: Charlie Root <jake@metalrip.com>
3	Date: Sun, 1 Sep 2024 12:37:23 -0400	3	Date: Sun, 1 Sep 2024 12:37:23 -0400
4	Subject: [PATCH 2/2] added SOURCEDATE; use variables for user/groups	4	Subject: [PATCH 2/3] added SOURCEDATE; use variables for user/groups
5		5
6	---	6	---
7	...dded-security-openbao-as-UID-GID-482.patch \| 246 ++++++++++++++++++	7	...dded-security-openbao-as-UID-GID-482.patch \| 246 ++++++++++++++++++




From e082d6d0e393877d163bab1e4a4065c38f5c0dd5 Mon Sep 17 00:00:00 2001
From: Charlie Root <jake@metalrip.com>
Date: Sun, 1 Sep 2024 13:29:41 -0400
Subject: [PATCH 3/3] fixed go command using GO_CMD

---
 ...dded-security-openbao-as-UID-GID-482.patch |   2 +-
 ...CEDATE-use-variables-for-user-groups.patch | 346 ++++++++++++++++++
 security/openbao/Makefile                     |   6 +-
 3 files changed, 350 insertions(+), 4 deletions(-)
 create mode 100644 0002-added-SOURCEDATE-use-variables-for-user-groups.patch

diff --git a/0001-added-security-openbao-as-UID-GID-482.patch b/0001-added-security-openbao-as-UID-GID-482.patch
index bb1cea9c02c2..57c1b1d8090f 100644
--- a/0001-added-security-openbao-as-UID-GID-482.patch
+++ b/0001-added-security-openbao-as-UID-GID-482.patch
@@ -1,7 +1,7 @@
 From 0989edb30253aeeb2ab4a6fef548c33a1118dde4 Mon Sep 17 00:00:00 2001
 From: Charlie Root <jake@metalrip.com>
 Date: Fri, 30 Aug 2024 22:55:05 -0400
-Subject: [PATCH] added security/openbao as UID/GID 482
+Subject: [PATCH 1/2] added security/openbao as UID/GID 482
 
 ---
  GIDs                                  |  2 +-
diff --git a/0002-added-SOURCEDATE-use-variables-for-user-groups.patch b/0002-added-SOURCEDATE-use-variables-for-user-groups.patch
new file mode 100644
index 000000000000..ba1c7c34702c
--- /dev/null
+++ b/0002-added-SOURCEDATE-use-variables-for-user-groups.patch
@@ -0,0 +1,346 @@
+From fe35a731df6edccafdcc8b164d1e6822069ffc3b Mon Sep 17 00:00:00 2001
+From: Charlie Root <jake@metalrip.com>
+Date: Sun, 1 Sep 2024 12:37:23 -0400
+Subject: [PATCH 2/2] added SOURCEDATE; use variables for user/groups
+
+---
+ ...dded-security-openbao-as-UID-GID-482.patch | 246 ++++++++++++++++++
+ security/openbao/Makefile                     |   7 +-
+ security/openbao/distinfo                     |   4 +-
+ security/openbao/files/openbao.in             |   8 +-
+ security/openbao/files/pkg-message.in         |   4 +-
+ 5 files changed, 257 insertions(+), 12 deletions(-)
+ create mode 100644 0001-added-security-openbao-as-UID-GID-482.patch
+
+diff --git a/0001-added-security-openbao-as-UID-GID-482.patch b/0001-added-security-openbao-as-UID-GID-482.patch
+new file mode 100644
+index 000000000000..bb1cea9c02c2
+--- /dev/null
++++ b/0001-added-security-openbao-as-UID-GID-482.patch
+@@ -0,0 +1,246 @@
++From 0989edb30253aeeb2ab4a6fef548c33a1118dde4 Mon Sep 17 00:00:00 2001
++From: Charlie Root <jake@metalrip.com>
++Date: Fri, 30 Aug 2024 22:55:05 -0400
++Subject: [PATCH] added security/openbao as UID/GID 482
++
++---

alertmanager:*:479:
datadog:*:480:
promxy:*:481:
openbao:*:482:
# free: 483
# free: 484
# free: 485




PORTNAME=	openbao
PORTVERSION=	2.0.0
DISTVERSIONPREFIX=	v
DISTVERSION=	2.0.0
CATEGORIES=	security

MAINTAINER=	jake@metalrip.com

LICENSE=	MPL20
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		go

USES=		go:modules
USE_GITHUB=	yes
GITID= 		700fe3f27ab1f0ec39ce20c36f6d9d97c9fe6ac3

USE_RC_SUBR=	${PORTNAME}
SOURCE_DATE_EPOCH=	${TIMEEPOCHNOW:gmtime}

GO_MODULE=	github.com/${PORTNAME}/${PORTNAME}
GO_TARGET=	:${BIN_NAME}
GO_BUILDFLAGS=	-ldflags="-s \
		-X ${GO_MODULE}/version.GitCommit=${GITID} \
		-X ${GO_MODULE}/version.BuildDate=${SOURCE_DATE_EPOCH} \
		-X ${GO_MODULE}/version.fullVersion=${DISTVERSION}"

USE_RC_SUBR=	openbao
SUB_FILES=	pkg-message
SUB_LIST=	GROUP=${GROUPS} USER=${USERS}
USERS=		${PORTNAME}
GROUPS=		${PORTNAME}

PLIST_FILES=	bin/${BIN_NAME}

BIN_NAME=		bao
GITID=			700fe3f27ab1f0ec39ce20c36f6d9d97c9fe6ac3
SOURCE_DATE_EPOCH=	${TIMEEPOCHNOW:gmtime}
TIMEEPOCHNOW=		%Y-%m-%dT%H:%M:%SZ

do-build:
	@cd ${WRKSRC} && ${GO_CMD} mod tidy && ${GO_CMD} mod vendor

do-install:
	@echo "Installing ${PORTNAME} as ${BIN_NAME}"
	${MKDIR} ${STAGEDIR}${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/bin/${BIN_NAME} ${STAGEDIR}${PREFIX}/bin

.include <bsd.port.mk>
- 

Return to bug 280619

Added Link Here

(-)b/GIDs (-1 / +58 lines)
1	From e082d6d0e393877d163bab1e4a4065c38f5c0dd5 Mon Sep 17 00:00:00 2001
2	From: Charlie Root <jake@metalrip.com>
3	Date: Sun, 1 Sep 2024 13:29:41 -0400
4	Subject: [PATCH 3/3] fixed go command using GO_CMD
5
6	---
7	...dded-security-openbao-as-UID-GID-482.patch \| 2 +-
8	...CEDATE-use-variables-for-user-groups.patch \| 346 ++++++++++++++++++
9	security/openbao/Makefile \| 6 +-
10	3 files changed, 350 insertions(+), 4 deletions(-)
11	create mode 100644 0002-added-SOURCEDATE-use-variables-for-user-groups.patch
12
13	diff --git a/0001-added-security-openbao-as-UID-GID-482.patch b/0001-added-security-openbao-as-UID-GID-482.patch
14	index bb1cea9c02c2..57c1b1d8090f 100644
15	--- a/0001-added-security-openbao-as-UID-GID-482.patch
16	+++ b/0001-added-security-openbao-as-UID-GID-482.patch
17	@@ -1,7 +1,7 @@
18	From 0989edb30253aeeb2ab4a6fef548c33a1118dde4 Mon Sep 17 00:00:00 2001
19	From: Charlie Root <jake@metalrip.com>
20	Date: Fri, 30 Aug 2024 22:55:05 -0400
21	-Subject: [PATCH] added security/openbao as UID/GID 482
22	+Subject: [PATCH 1/2] added security/openbao as UID/GID 482
23
24	---
25	GIDs \| 2 +-
26	diff --git a/0002-added-SOURCEDATE-use-variables-for-user-groups.patch b/0002-added-SOURCEDATE-use-variables-for-user-groups.patch
27	new file mode 100644
28	index 000000000000..ba1c7c34702c
29	--- /dev/null
30	+++ b/0002-added-SOURCEDATE-use-variables-for-user-groups.patch
31	@@ -0,0 +1,346 @@
32	+From fe35a731df6edccafdcc8b164d1e6822069ffc3b Mon Sep 17 00:00:00 2001
33	+From: Charlie Root <jake@metalrip.com>
34	+Date: Sun, 1 Sep 2024 12:37:23 -0400
35	+Subject: [PATCH 2/2] added SOURCEDATE; use variables for user/groups
36	+
37	+---
38	+ ...dded-security-openbao-as-UID-GID-482.patch \| 246 ++++++++++++++++++
39	+ security/openbao/Makefile \| 7 +-
40	+ security/openbao/distinfo \| 4 +-
41	+ security/openbao/files/openbao.in \| 8 +-
42	+ security/openbao/files/pkg-message.in \| 4 +-
43	+ 5 files changed, 257 insertions(+), 12 deletions(-)
44	+ create mode 100644 0001-added-security-openbao-as-UID-GID-482.patch
45	+
46	+diff --git a/0001-added-security-openbao-as-UID-GID-482.patch b/0001-added-security-openbao-as-UID-GID-482.patch
47	+new file mode 100644
48	+index 000000000000..bb1cea9c02c2
49	+--- /dev/null
50	++++ b/0001-added-security-openbao-as-UID-GID-482.patch
51	+@@ -0,0 +1,246 @@
52	++From 0989edb30253aeeb2ab4a6fef548c33a1118dde4 Mon Sep 17 00:00:00 2001
53	++From: Charlie Root <jake@metalrip.com>
54	++Date: Fri, 30 Aug 2024 22:55:05 -0400
55	++Subject: [PATCH] added security/openbao as UID/GID 482
56	++
57	++---
Added Link Here
422	alertmanager:*:479:	422	alertmanager:*:479:
423	datadog:*:480:	423	datadog:*:480:
424	promxy:*:481:	424	promxy:*:481:
425	openbao:*:482	425	openbao:*:482:
426	# free: 483	426	# free: 483
427	# free: 484	427	# free: 484
428	# free: 485	428	# free: 485

Lines 1-6 Link Here

(-)b/security/openbao/Makefile (-19 / +18 lines)
1	PORTNAME= openbao	1	PORTNAME= openbao
2	PORTVERSION= 2.0.0
3	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
		3	DISTVERSION= 2.0.0
4	CATEGORIES= security	4	CATEGORIES= security
5		5
6	MAINTAINER= jake@metalrip.com	6	MAINTAINER= jake@metalrip.com
Lines 10-38 WWW= https://openbao.org/ Link Here
10	LICENSE= MPL20	10	LICENSE= MPL20
11	LICENSE_FILE= ${WRKSRC}/LICENSE	11	LICENSE_FILE= ${WRKSRC}/LICENSE
12		12
13	BIN_NAME= bao	13	USES= go
14
15	USES= go:modules
16	USE_GITHUB= yes	14	USE_GITHUB= yes
17	GITID= 700fe3f27ab1f0ec39ce20c36f6d9d97c9fe6ac3
18		15
19	TIMEEPOCHNOW= %Y-%m-%dT%H:%M:%SZ	16	USE_RC_SUBR= ${PORTNAME}
20	SOURCE_DATE_EPOCH= ${TIMEEPOCHNOW:gmtime}
21		17
22	GO_BUILDFLAGS= -ldflags="\	18	GO_MODULE= github.com/${PORTNAME}/${PORTNAME}
23	-s \	19	GO_TARGET= :${BIN_NAME}
24	-X github.com/openbao/openbao/version.GitCommit=${GITID} \	20	GO_BUILDFLAGS= -ldflags="-s \
25	-X github.com/openbao/openbao/version.BuildDate=${SOURCE_DATE_EPOCH} \	21	-X ${GO_MODULE}/version.GitCommit=${GITID} \
26	-X github.com/openbao/openbao/version.fullVersion=${PORTVERSION}"	22	-X ${GO_MODULE}/version.BuildDate=${SOURCE_DATE_EPOCH} \
		23	-X ${GO_MODULE}/version.fullVersion=${DISTVERSION}"
27		24
28	USE_RC_SUBR= openbao
29	SUB_FILES= pkg-message	25	SUB_FILES= pkg-message
30	SUB_LIST= GROUP=${GROUPS} USER=${USERS}	26	SUB_LIST= GROUP=${GROUPS} USER=${USERS}
31	USERS= ${PORTNAME}	27	USERS= ${PORTNAME}
32	GROUPS= ${PORTNAME}	28	GROUPS= ${PORTNAME}
33		29
34	PLIST_FILES= bin/${BIN_NAME}	30	PLIST_FILES= bin/${BIN_NAME}
35	GO_TARGET= :${BIN_NAME}	31
		32	BIN_NAME= bao
		33	GITID= 700fe3f27ab1f0ec39ce20c36f6d9d97c9fe6ac3
		34	SOURCE_DATE_EPOCH= ${TIMEEPOCHNOW:gmtime}
		35	TIMEEPOCHNOW= %Y-%m-%dT%H:%M:%SZ
36		36
37	do-build:	37	do-build:
38	@cd ${WRKSRC} && ${GO_CMD} mod tidy && ${GO_CMD} mod vendor	38	@cd ${WRKSRC} && ${GO_CMD} mod tidy && ${GO_CMD} mod vendor
Lines 41-46 do-build: Link Here
41	do-install:	41	do-install:
42	@echo "Installing ${PORTNAME} as ${BIN_NAME}"	42	@echo "Installing ${PORTNAME} as ${BIN_NAME}"
43	${MKDIR} ${STAGEDIR}${PREFIX}/bin	43	${MKDIR} ${STAGEDIR}${PREFIX}/bin
44	${INSTALL_PROGRAM} ${WRKSRC}/bin/${BIN_NAME} ${STAGEDIR}${PREFIX}/bin/${BIN_NAME}	44	${INSTALL_PROGRAM} ${WRKSRC}/bin/${BIN_NAME} ${STAGEDIR}${PREFIX}/bin
45		45
46	.include <bsd.port.mk>	46	.include <bsd.port.mk>
47	-