From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] apache: Update to 2.4.28
Date: Sun, 08 Oct 2017 16:37:21 +0200
Message-ID: <20171008143721.1528-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1335504731705280706=="
List-Id: <development.lists.ipfire.org>

--===============1335504731705280706==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 <matthias.fischer(a)ipfire.org>
---
 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  <info(a)ipfire.org>                =
    #
+# Copyright (C) 2007-2017   IPFire Team  <info(a)ipfire.org>                =
    #
 #                                                                           =
  #
 # 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 @@
=20
 include Config
=20
-VER        =3D 2.4.27
+VER        =3D 2.4.28
=20
 THISAPP    =3D httpd-$(VER)
 DL_FILE    =3D $(THISAPP).tar.bz2
@@ -45,7 +45,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 97b6bbfa83c866dbe20ef317e3afd108
+$(DL_FILE)_MD5 =3D 49007ffe8e37a0834255b279810edf24
=20
 install : $(TARGET)
=20
@@ -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-201=
7-9798-fix.patch
 	### Add IPFire's layout, too
 	echo "# IPFire layout" >> $(DIR_APP)/config.layout
 	echo "<Layout IPFire>" >> $(DIR_APP)/config.layout
--=20
2.14.2


--===============1335504731705280706==--