From 7be65fef55b9d54da9537d9a9a55c8a2825c5da9 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sat, 28 Jan 2017 22:56:48 +0100 Subject: [PATCH] security/openssl: @sample openssl.cnf --- .../files/patch-Configurations_unix-Makefile.tmpl | 11 +++++++++++ security/openssl-devel/files/patch-config | 4 ++-- security/openssl-devel/files/pkg-message.in | 3 +-- security/openssl-devel/pkg-plist | 2 +- security/openssl/files/pkg-message.in | 3 +-- security/openssl/pkg-plist | 2 +- 6 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 security/openssl-devel/files/patch-Configurations_unix-Makefile.tmpl diff --git a/security/openssl-devel/files/patch-Configurations_unix-Makefile.tmpl b/security/openssl-devel/files/patch-Configurations_unix-Makefile.tmpl new file mode 100644 index 0000000..3b84fe1 --- /dev/null +++ b/security/openssl-devel/files/patch-Configurations_unix-Makefile.tmpl @@ -0,0 +1,11 @@ +--- Configurations/unix-Makefile.tmpl.orig 2017-01-28 21:48:55 UTC ++++ Configurations/unix-Makefile.tmpl +@@ -339,7 +339,7 @@ install_ssldirs: + @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.dist ++ @mv -f $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.sample + @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; \ diff --git a/security/openssl-devel/files/patch-config b/security/openssl-devel/files/patch-config index f68b1c5..cabef13 100644 --- a/security/openssl-devel/files/patch-config +++ b/security/openssl-devel/files/patch-config @@ -1,6 +1,6 @@ ---- config.orig 2016-02-15 18:08:07 UTC +--- config.orig 2017-01-26 13:10:21 UTC +++ config -@@ -713,14 +713,8 @@ case "$GUESSOS" in +@@ -705,14 +705,8 @@ case "$GUESSOS" in sparc64-*-*bsd*) OUT="BSD-sparc64" ;; ia64-*-*bsd*) OUT="BSD-ia64" ;; amd64-*-*bsd*) OUT="BSD-x86_64" ;; diff --git a/security/openssl-devel/files/pkg-message.in b/security/openssl-devel/files/pkg-message.in index f2dbef6..2ecce52 100644 --- a/security/openssl-devel/files/pkg-message.in +++ b/security/openssl-devel/files/pkg-message.in @@ -1,4 +1,3 @@ -Copy %%PREFIX%%/openssl/openssl.cnf.sample to %%PREFIX%%/openssl/openssl.cnf -and edit it to fit your needs. +Edit %%PREFIX%%/openssl/openssl.cnf to fit your needs. diff --git a/security/openssl-devel/pkg-plist b/security/openssl-devel/pkg-plist index 921ee04..fdb0db0 100644 --- a/security/openssl-devel/pkg-plist +++ b/security/openssl-devel/pkg-plist @@ -3192,6 +3192,6 @@ man/man7/ssl.7.gz man/man7/x509.7.gz %%OPENSSLDIR%%/misc/CA.pl %%OPENSSLDIR%%/misc/tsget -@sample %%OPENSSLDIR%%/openssl.cnf.dist %%OPENSSLDIR%%/openssl.cnf +@sample %%OPENSSLDIR%%/openssl.cnf.sample @dir %%OPENSSLDIR%%/private @dir %%OPENSSLDIR%%/certs diff --git a/security/openssl/files/pkg-message.in b/security/openssl/files/pkg-message.in index f2dbef6..2ecce52 100644 --- a/security/openssl/files/pkg-message.in +++ b/security/openssl/files/pkg-message.in @@ -1,4 +1,3 @@ -Copy %%PREFIX%%/openssl/openssl.cnf.sample to %%PREFIX%%/openssl/openssl.cnf -and edit it to fit your needs. +Edit %%PREFIX%%/openssl/openssl.cnf to fit your needs. diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist index 26a1c2a..fd0e14c 100644 --- a/security/openssl/pkg-plist +++ b/security/openssl/pkg-plist @@ -1704,7 +1704,7 @@ man/man7/des_modes.7.gz %%OPENSSLDIR%%/misc/c_issuer %%OPENSSLDIR%%/misc/c_name %%OPENSSLDIR%%/misc/tsget -%%OPENSSLDIR%%/openssl.cnf.sample +@sample %%OPENSSLDIR%%/openssl.cnf.sample %%PORTDOCS%%%%DOCSDIR%%/openssl.txt @dir %%OPENSSLDIR%%/certs @dir %%OPENSSLDIR%%/private -- 2.10.1 (Apple Git-78)