--- a/components/cvs/Makefile	Thu Nov 03 22:18:09 2016 -0700
+++ b/components/cvs/Makefile	Fri Nov 04 05:32:50 2016 -0700
@@ -41,6 +41,10 @@
 CFLAGS += -D__ATTRIBUTE_DISABLED
 CONFIGURE_OPTIONS  +=	--with-external-zlib
 
+# Enable adiheap and adistack security extensions
+ADIHEAP_MODE =	$(ADIHEAP_ENABLE)
+ADISTACK_MODE =	$(ADISTACK_ENABLE)
+
 # need gnu grep
 COMPONENT_TEST_ENV += PATH=$(GNUBIN):$(PATH)
 # "check" is not working yet.  It's asking for a password.