From patchwork Thu May 18 04:14:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Apolinarski X-Patchwork-Id: 1107 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.ipfire.org (Postfix) with ESMTP id B4DB6621CB for ; Wed, 17 May 2017 20:14:47 +0200 (CEST) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 3AC1727B2; Wed, 17 May 2017 20:14:47 +0200 (CEST) Received: from mail-wr0-x22f.google.com (mail-wr0-x22f.google.com [IPv6:2a00:1450:400c:c0c::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPS id 7049627AE for ; Wed, 17 May 2017 20:14:42 +0200 (CEST) Received: by mail-wr0-x22f.google.com with SMTP id l50so17007722wrc.3 for ; Wed, 17 May 2017 11:14:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L/kk/6hFj1qxpYFbe4yo65lAJfBWk/lbr7SUwj6XAjI=; b=uJ02toXq3Gpvin73ksQ0w/PNrNkD9lrhRx3WxQ/1JPd10wAlIxlzKkaJr66vARhl7T 5Oj32rzmw42SIy0Dh14sYiWoP6wy4TkH2AYvbwTMPEuyr74WhYLQPu+fS+NpzTyIsfbC Fb49ILuzHZ2E+ytN+2hlyWYDl/kXENYpM3ZRpwNytXX55AwRAiEMerKIV0CeHcByQBtg QfkXDXGiraXBZzsjuwKEWs39qPrDltCW47Px5rIvZgK8nKBaWCvxTCybFJjflVkp5Cn1 2mjqgQYh7gSGuSHzame2BuhHSMA1vODjgHOkfSlu9OWbKvsi6XNUO6yNnL4hKd59SEbd vBBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=L/kk/6hFj1qxpYFbe4yo65lAJfBWk/lbr7SUwj6XAjI=; b=fULGc+fmPQceFD2reRbM+wyVBgVR7A13/7DYXO59nVd0QHzdYugYelVEuDbseioGE0 avfWEMhNCPzNjJ5YEKcZjPAOVKvG+HZOc6EUaH0pWv3dImis4NPJAApIRFAUYs8XjMh9 0d8XPyjSIBegZfoaHm0OQ+Wvfc/y7hzTezgi3YiT3y4prPANy7sNxJw9Zu/0YvWk81oF Z8c10XEHGctb67H35vy14uVBMyBl5hKqsMPF4FIH2s9XcwPn9JdAOcStygnrdpt8m2Je RttiMWSCdFAECvp/ur7wwWHS4lxGQNm0KSloIoLwoQ3vmyr2nsf+18Mo21bVob86gqZZ vOzQ== X-Gm-Message-State: AODbwcC23ysOj028qKSN+O/UVklLeocONRkzi2zjhG8ddHc8trFOCxmF mQaMUG0tKblL9UZ9tpM= X-Received: by 10.223.138.137 with SMTP id y9mr76847wry.26.1495044880303; Wed, 17 May 2017 11:14:40 -0700 (PDT) Received: from gentoo-modula.duisburg.apolinarski.de (x4db5b2c0.dyn.telefonica.de. [77.181.178.192]) by smtp.gmail.com with ESMTPSA id u200sm17654523wmd.16.2017.05.17.11.14.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 May 2017 11:14:39 -0700 (PDT) From: Wolfgang Apolinarski To: development@lists.ipfire.org Subject: [PATCH v2 2/2] Update to apache 2.4.25 Date: Wed, 17 May 2017 20:14:22 +0200 Message-Id: <1495044862-3194-2-git-send-email-wolfgang.apolinarski@googlemail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1495044862-3194-1-git-send-email-wolfgang.apolinarski@googlemail.com> References: <1492873424-2200-2-git-send-email-wolfgang.apolinarski@googlemail.com> <1495044862-3194-1-git-send-email-wolfgang.apolinarski@googlemail.com> X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wolfgang Apolinarski Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Updated to apache 2.4 - Updated the htpasswd generation to use the more secure bcrypt algorithm --- config/httpd/httpd.conf | 4 +- config/httpd/loadmodule.conf | 6 +- config/httpd/server-tuning.conf | 10 +- config/httpd/ssl-global.conf | 5 - config/httpd/vhosts.d/ipfire-interface-ssl.conf | 20 +- config/httpd/vhosts.d/ipfire-interface.conf | 18 +- config/httpd/vhosts.d/nagios.conf | 14 +- config/httpd/vhosts.d/openmailadmin.conf | 3 +- config/icinga/icinga.conf | 6 - config/nagiosql/nagios.conf | 17 +- config/owncloud/owncloud.conf | 3 +- config/php/php.ini | 2 +- config/phpSANE/phpSANE.conf | 3 +- config/rootfiles/common/apache2 | 593 +++++++++++++++++------- config/rootfiles/common/php | 7 +- lfs/apache2 | 26 +- src/setup/passwords.c | 2 +- 17 files changed, 482 insertions(+), 257 deletions(-)