From 45fa9ece3e09b4991138cd4171a3d2a16f9bdcc2 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Sun, 30 Oct 2016 18:44:39 +0200
Subject: [PATCH] main/apache2: adjust genrsa options
increase key length to 2048 bits
remove 'rand' option (not supported by libressl)
---
main/apache2/APKBUILD | 2 +-
main/apache2/apache2-ssl.post-install | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index f9d3d4677034..34bf8dfe0bf5 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -3,7 +3,7 @@
pkgname=apache2
_pkgreal=httpd
pkgver=2.4.23
-pkgrel=6
+pkgrel=7
pkgdesc="A high performance Unix-based HTTP server"
url="http://httpd.apache.org/"
arch="all"
diff --git a/main/apache2/apache2-ssl.post-install b/main/apache2/apache2-ssl.post-install
index d73b5fc62257..1e8478a8d4e1 100644
--- a/main/apache2/apache2-ssl.post-install
+++ b/main/apache2/apache2-ssl.post-install
@@ -6,9 +6,7 @@ sslcert=$ssldir/server.pem
umask 077
-if [ ! -f ${sslkey} ] ; then
- openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > ${sslkey} 2> /dev/null
-fi
+[ -f $sslkey ] || openssl genrsa 2048 > $sslkey 2>/dev/null
FQDN=`hostname -f`
if [ "x${FQDN}" = "x" ]; then
--
GitLab