From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] apache: Update to 2.4.28
Date: Mon, 09 Oct 2017 14:51:01 +0100
Message-ID: <1507557061.4045.6.camel@ipfire.org>
In-Reply-To: <20171008143721.1528-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4513021319377319945=="
List-Id: <development.lists.ipfire.org>

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

Hi,

thanks. It missed the removal of the patches, but I did that myself :)

-Michael

On Sun, 2017-10-08 at 16:37 +0200, Matthias Fischer wrote:
> For details see:
> http://apache.mirror.digionline.de//httpd/CHANGES_2.4.28
>=20
> Second try, based on current 'next'.
>=20
> I sent a similar patch a few days ago, but somehow it didn't find its way.
>=20
> Best,
> Matthias
>=20
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
>  lfs/apache2 | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
>=20
> diff --git a/lfs/apache2 b/lfs/apache2
> index 138ede8de..4276a8880 100644
> --- a/lfs/apache2
> +++ b/lfs/apache2
> @@ -1,7 +1,7 @@
>  ##########################################################################=
###
> ##
>  #                                                                         =
  =20
>  #
>  # IPFire.org - A linux based
> firewall                                         #
> -# Copyright (C) 2007-2014   IPFire Team  <info(a)ipfire.org>              =
    =20
>  #
> +# Copyright (C) 2007-2017   IPFire Team  <info(a)ipfire.org>              =
    =20
>  #
>  #                                                                         =
  =20
>  #
>  # 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-2017-9798-fix.patch
>  	### Add IPFire's layout, too
>  	echo "# IPFire layout" >> $(DIR_APP)/config.layout
>  	echo "<Layout IPFire>" >> $(DIR_APP)/config.layout

--===============4513021319377319945==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl
Mnlwa3R4Z0hudy8yK1FDUWNGQWxuYmZzVUFDZ2tRZ0hudy8yK1EKQ1FmaGpCQUFudHlaT0ZuVTAz
cVFGUmtSTVJaUXdWSzdISkRjVmNsc254cTFKYzRVVXNWUjZndXd2U3RRRVpJVApFcWpWZk04VExk
Mkpmc0ZiSHBWU0NWbll3L0o3L3lrbU9helh0MGUrcTJjMkYzRGttSUFFdEdkSStiRTNWYVhWCjlY
bk9FZkNzdGxxNzJzeTFJNklUamN0UDFLVzh2Uk5kS2xPTER2R1FLSXFIb1pHV0lVVDVJRG44TFFq
UnVqbjUKYWc5QTY4YTRIemY5N1htM3NTNElIb1ByT3AyclgzQnF4ZWUzMXVEM3hGa2h2SVVLdWth
OHBpMFJhMFNuM05LcApzUGNYbnJ6ZXNnVHJvYlE0V2d0bks5TkNuNENMcWpiY2l3c3ZzZGdLUlpL
NnZNa1VLUmNBRG43bmJiUCtMNkt2Cko4L2hjU1dDMExiSHUwOWhqVzJZR09Kd0JYNDFrVDRpMkVH
cnlTeEZvMUd1dDRTYmlFcjhYdkd5ajN0c1Z3bkwKWkFiUGE1M3Z1eGJlaW1mMzNMQ2l6cG9VaTB1
a3VoVXVteHB1RVQ3WlMvclVGZ0JZc0RBLzJGYlAzcGllVkJJRwp3ZG1zQWh3eUszRVdNaGN1bXNK
YmpHMGVOWk9KaktnNldxc3FVNDJES0FodHh6cG5nanF0NjJwTUZhUTdKNHh5CmFhWmlld0pRRjhV
Ym4rWkRQS3ZYVnZLeVBnMHo4ZkFwaXdteWQ4REFIZmRnWFRVbVFTUG9SVS9paUU5K1ovQzEKMjNl
OG5YemI0b2ZsVGcvUFpkb0V0TWdjTFRCVlBKRFhZUkVzRjUxclB4V2pONi9HVzkyQ0d0SWQ3S2N2
Ni9xbApyNTVPeWVLYmNNM1EzRExSRG9XTjgxQmRjZlVRZGt3MzQ5OG1WN0V1ZmtEeEg4YXhoVEE9
Cj1MdnVsCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo=

--===============4513021319377319945==--