Commit cb926df2 authored Aug 01, 2016 by Richard Levitte

Don't overwrite existing installed openssl.cnf



Instead, install the new one as openssl.cnf.dist (openssl.cnf-dist on
VMS), and only install it as openssl.cnf if that file doesn't already
exist.

Also, don't install with exec privileges on VMS.

Reviewed-by: Rich Salz <rsalz@openssl.org>

parent 66c2eb8b

Configurations/descrip.mms.tmpl

+5 −2

Original line number	Diff line number	Diff line
		@@ -375,7 +375,10 @@ install_ssldirs : check_INSTALLTOP
		CREATE/DIR/PROT=(S:RWED,O:RWE,G,W) OSSL_DATAROOT:[MISC]
		COPY/PROT=W:RE $(MISC_SCRIPTS) OSSL_DATAROOT:[MISC]
		@ ! Install configuration file
		COPY/PROT=W:RE {- sourcefile("apps", "openssl-vms.cnf") -} -
		COPY/PROT=W:R {- sourcefile("apps", "openssl-vms.cnf") -} -
		ossl_dataroot:[000000]openssl.cnf-dist
		IF F$SEARCH("OSSL_DATAROOT:[000000]openssl.cnf") .EQS. "" THEN -
		COPY/PROT=W:R {- sourcefile("apps", "openssl-vms.cnf") -} -
		ossl_dataroot:[000000]openssl.cnf

		install_shared : check_INSTALLTOP

Configurations/unix-Makefile.tmpl

+7 −2

Original line number	Diff line number	Diff line
		@@ -346,10 +346,15 @@ install_ssldirs:
		mv -f $(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new \
		$(DESTDIR)$(OPENSSLDIR)/misc/$$fn; \
		done
		@echo "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf"
		@echo "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist"
		@cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new
		@chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new
		@mv -f $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new $(DESTDIR)$(OPENSSLDIR)/openssl.cnf
		@mv -f $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist
		@if ! [ -f "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf" ]; then \
		echo "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \
		cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \
		chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \
		fi

		install_dev:
		@[ -n "$(INSTALLTOP)" ] \|\| (echo INSTALLTOP should not be empty; exit 1)

Configurations/windows-makefile.tmpl

+4 −1

Original line number	Diff line number	Diff line
		@@ -257,7 +257,10 @@ install_ssldirs:
		@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(OPENSSLDIR)\private"
		@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(OPENSSLDIR)\misc"
		@"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\apps\openssl.cnf" \
		"$(OPENSSLDIR)"
		"$(OPENSSLDIR)\openssl.cnf.dist"
		@IF NOT EXIST "$(OPENSSLDIR)\openssl.cnf" \
		"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\apps\openssl.cnf" \
		"$(OPENSSLDIR)\openssl.cnf"
		@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(MISC_SCRIPTS) \
		"$(OPENSSLDIR)\misc"