Author: kevans
Date: Wed Aug 26 01:55:37 2020
New Revision: 364793
URL: https://svnweb.freebsd.org/changeset/base/364793
Log:
Partial revert of r364792: caroot: switch to using echo+shell glob
On stable/11, I mistakenly only tested installation of trusted certs.
When the dir is empty, the glob remains unexpanded when it gets added to
FILES.
On stable/11 (but not 12 or head), this ends up being erroneous; it kind of
looks like the glob is being expanded to a single-word empty string rather
than leaving us with an empty FILES. Regardless, this isn't worth fixing on
stable/11, so back it out.
Modified:
stable/11/secure/caroot/blacklisted/Makefile
stable/11/secure/caroot/trusted/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/secure/caroot/blacklisted/Makefile
==============================================================================
--- stable/11/secure/caroot/blacklisted/Makefile Wed Aug 26 00:50:27
2020 (r364792)
+++ stable/11/secure/caroot/blacklisted/Makefile Wed Aug 26 01:55:37
2020 (r364793)
@@ -2,7 +2,7 @@
BINDIR= /usr/share/certs/blacklisted
-BLACKLISTED_CERTS!= echo ${.CURDIR}/*.pem 2> /dev/null || true
+BLACKLISTED_CERTS!= ls ${.CURDIR}/*.pem 2> /dev/null || true
FILES+= ${BLACKLISTED_CERTS}
Modified: stable/11/secure/caroot/trusted/Makefile
==============================================================================
--- stable/11/secure/caroot/trusted/Makefile Wed Aug 26 00:50:27 2020
(r364792)
+++ stable/11/secure/caroot/trusted/Makefile Wed Aug 26 01:55:37 2020
(r364793)
@@ -2,7 +2,7 @@
BINDIR= /usr/share/certs/trusted
-TRUSTED_CERTS!= echo ${.CURDIR}/*.pem 2> /dev/null || true
+TRUSTED_CERTS!= ls ${.CURDIR}/*.pem 2> /dev/null || true
FILES+= ${TRUSTED_CERTS}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
