From patchwork Mon Oct 9 01:37:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 1444 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.ipfire.org (Postfix) with ESMTP id 1B6516020E for ; Sun, 8 Oct 2017 16:37:29 +0200 (CEST) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id D8CAF27EA; Sun, 8 Oct 2017 16:37:27 +0200 (CEST) Received: from Devel.localdomain (p5DD83A95.dip0.t-ipconnect.de [93.216.58.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id CF06B27EA for ; Sun, 8 Oct 2017 16:37:25 +0200 (CEST) From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] apache: Update to 2.4.28 Date: Sun, 8 Oct 2017 16:37:21 +0200 Message-Id: <20171008143721.1528-1-matthias.fischer@ipfire.org> X-Mailer: git-send-email 2.14.2 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: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" For details see: http://apache.mirror.digionline.de//httpd/CHANGES_2.4.28 Second try, based on current 'next'. I sent a similar patch a few days ago, but somehow it didn't find its way. Best, Matthias Signed-off-by: Matthias Fischer --- lfs/apache2 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lfs/apache2 b/lfs/apache2 index 138ede8de..4276a8880 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team # +# Copyright (C) 2007-2017 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,7 +25,7 @@ include Config -VER = 2.4.27 +VER = 2.4.28 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 97b6bbfa83c866dbe20ef317e3afd108 +$(DL_FILE)_MD5 = 49007ffe8e37a0834255b279810edf24 install : $(TARGET) @@ -75,8 +75,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/apache-2.4.27-PR61382-fix.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/apache-2.4.27-CVE-2017-9798-fix.patch ### Add IPFire's layout, too echo "# IPFire layout" >> $(DIR_APP)/config.layout echo "" >> $(DIR_APP)/config.layout