From 77745ca88bdce1ecc9fac443dc1a13637e902b11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Sun, 17 May 2020 18:42:43 +0700
Subject: [PATCH 1/2] xbps-src: pre-pkg: allow only white-listed directories.

---
 common/hooks/pre-pkg/99-pkglint.sh | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index d2c281e39db..498d39ac585 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -21,13 +21,31 @@ hook() {
 		fi
 	done
 	
-	for f in sys dev home root run var/run tmp usr/local destdir; do
+	for f in var/run usr/local; do
 		if [ -d ${PKGDESTDIR}/${f} ]; then
 			msg_red "${pkgver}: /${f} directory is not allowed, remove it!\n"
 			error=1
 		fi
 	done
 
+	for f in "$PKGDESTDIR"/*; do
+		f="${f##*/}"
+		case "$f" in
+		'*') : empty meta package ;;
+		lib|bin|sbin|lib64|lib32|usr|var|opt|etc|boot|srv) ;;
+		INSTALL|REMOVE|rdeps|shlib-requires|shlib-provides)
+			if [ ! -f "${PKGDESTDIR}/$f" ]; then
+				msg_red "${pkgver}: /${f} is not allowed\n"
+				error=1
+			fi
+			;;
+		*)
+			msg_red "${pkgver}: /${f} directory is not allowed, remove it!\n"
+			error=1
+			;;
+		esac
+	done
+
 	# Check that configuration files really exist.
 	for f in $(expand_destdir "${conf_files}"); do
 		if [ ! -f "${PKGDESTDIR}/${f}" ]; then

From 28c4154d8d0b753b5463454bdd0d9ddf4147f1bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Wed, 20 May 2020 06:12:02 +0700
Subject: [PATCH 2/2] fixup! xbps-src: pre-pkg: allow only white-listed
 directories.

---
 common/hooks/pre-pkg/99-pkglint.sh | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 498d39ac585..5fcdb664683 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -31,7 +31,12 @@ hook() {
 	for f in "$PKGDESTDIR"/*; do
 		f="${f##*/}"
 		case "$f" in
-		'*') : empty meta package ;;
+		'*')	# Forbid empty packages unless build_style=meta
+			if [ "$build_style" != "meta" ]; then
+				msg_red "${pkgver}: PKGDESTDIR is empty and build_style != meta\n"
+				error=1
+			fi
+			;;
 		lib|bin|sbin|lib64|lib32|usr|var|opt|etc|boot|srv) ;;
 		INSTALL|REMOVE|rdeps|shlib-requires|shlib-provides)
 			if [ ! -f "${PKGDESTDIR}/$f" ]; then
@@ -107,14 +112,6 @@ hook() {
 		fi
 	done
 
-	# Forbid empty packages unless build_style=meta
-	if [ "$build_style" != "meta" ]; then
-		if [ "$(find $PKGDESTDIR/* -maxdepth 1 -type d 2>/dev/null)" = "" ]; then
-			msg_red "${pkgver}: PKGDESTDIR is empty and build_style != meta\n"
-			error=1
-		fi
-	fi
-
 	if [ $error -gt 0 ]; then
 		msg_error "${pkgver}: cannot continue with installation!\n"
 	fi