Attachment 197388 Details for Bug 231334 – Proper DESTDIR/etc validation checks

[patch] Proper DESTDIR/etc validation checks

uid-gid-validation.patch (text/plain), 1.22 KB, created by ota on 2018-09-23 01:49:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ota

Created: 2018-09-23 01:49:34 UTC

Size: 1.22 KB

patch

obsolete

>Index: Makefile.inc1
>===================================================================
>--- Makefile.inc1	(revision 338817)
>+++ Makefile.inc1	(working copy)
>@@ -837,7 +837,7 @@
> DB_FROM_SRC=	yes
> .endif
> 
>-.if defined(DB_FROM_SRC)
>+.if defined(DB_FROM_SRC) || defined(DESTDIR)
> INSTALLFLAGS+=	-N ${.CURDIR}/etc
> MTREEFLAGS+=	-N ${.CURDIR}/etc
> .endif
>@@ -853,7 +853,7 @@
> .if defined(BUILD_PKGS)
> INSTALLFLAGS+=	-h sha256
> .endif
>-.if defined(DB_FROM_SRC) || defined(NO_ROOT)
>+.if defined(DB_FROM_SRC) || defined(NO_ROOT) || defined(DESTDIR)
> IMAKE_INSTALL=	INSTALL="install ${INSTALLFLAGS}"
> IMAKE_MTREE=	MTREE_CMD="mtree ${MTREEFLAGS}"
> .endif
>@@ -1187,13 +1187,13 @@
> _installcheck_world: __installcheck_UGID
> __installcheck_UGID: .PHONY
> .for uid in ${CHECK_UIDS}
>-	@if ! `id -u ${uid} >/dev/null 2>&1`; then \
>+	@if ! `grep "^${uid}:" ${DESTDIR}/etc/passwd > /dev/null 2>&1`; then \
> 		echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \
> 		false; \
> 	fi
> .endfor
> .for gid in ${CHECK_GIDS}
>-	@if ! `find / -prune -group ${gid} >/dev/null 2>&1`; then \
>+	@if ! `grep "^${gid}:" ${DESTDIR}/etc/group > /dev/null 2>&1`; then \
> 		echo "ERROR: Required ${gid} group is missing, see /usr/src/UPDATING."; \
> 		false; \
> 	fi

Actions: View | Diff

Attachments on bug 231334: 197388