[v2] Update to Apache 2.4.29

Message ID 20171028105203.21950-1-wolfgang.apolinarski@ipfire.org
State Dropped
Headers
Series [v2] Update to Apache 2.4.29 |

Commit Message

Wolfgang Apolinarski Oct. 28, 2017, 9:52 p.m. UTC
  From: Wolfgang Apolinarski <wolfgang.apolinarski@googlemail.com>

---
 config/rootfiles/common/apache2 | 2 ++
 lfs/apache2                     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
  

Comments

Michael Tremer Oct. 28, 2017, 11:37 p.m. UTC | #1
Hi,

On Sat, 2017-10-28 at 12:52 +0200, Wolfgang Apolinarski wrote:
> From: Wolfgang Apolinarski <wolfgang.apolinarski@googlemail.com>

you use multiple email addresses at the same time. Any reason for that?

And I saw the lua file and I thought that I want to have a look at that
because it seemed to be a rebuild :)

-Michael

> 
> ---
>  config/rootfiles/common/apache2 | 2 ++
>  lfs/apache2                     | 4 ++--
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
> index 040b48214..64faa7926 100644
> --- a/config/rootfiles/common/apache2
> +++ b/config/rootfiles/common/apache2
> @@ -1115,6 +1115,8 @@ srv/web/ipfire/html/captive
>  #srv/web/ipfire/manual/mod/mpmt_os2.html
>  #srv/web/ipfire/manual/mod/mpmt_os2.html.en
>  #srv/web/ipfire/manual/mod/mpmt_os2.html.fr
> +#srv/web/ipfire/manual/mod/overrides.html
> +#srv/web/ipfire/manual/mod/overrides.html.en
>  #srv/web/ipfire/manual/mod/prefork.html
>  #srv/web/ipfire/manual/mod/prefork.html.de
>  #srv/web/ipfire/manual/mod/prefork.html.en
> diff --git a/lfs/apache2 b/lfs/apache2
> index 4276a8880..28855fdc5 100644
> --- a/lfs/apache2
> +++ b/lfs/apache2
> @@ -25,7 +25,7 @@
>  
>  include Config
>  
> -VER        = 2.4.28
> +VER        = 2.4.29
>  
>  THISAPP    = httpd-$(VER)
>  DL_FILE    = $(THISAPP).tar.bz2
> @@ -45,7 +45,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = 49007ffe8e37a0834255b279810edf24
> +$(DL_FILE)_MD5 = 0c599404ef6b69eee95bcd9fcd094407
>  
>  install : $(TARGET)
>
  

Patch

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 040b48214..64faa7926 100644
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -1115,6 +1115,8 @@  srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mpmt_os2.html
 #srv/web/ipfire/manual/mod/mpmt_os2.html.en
 #srv/web/ipfire/manual/mod/mpmt_os2.html.fr
+#srv/web/ipfire/manual/mod/overrides.html
+#srv/web/ipfire/manual/mod/overrides.html.en
 #srv/web/ipfire/manual/mod/prefork.html
 #srv/web/ipfire/manual/mod/prefork.html.de
 #srv/web/ipfire/manual/mod/prefork.html.en
diff --git a/lfs/apache2 b/lfs/apache2
index 4276a8880..28855fdc5 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -25,7 +25,7 @@ 
 
 include Config
 
-VER        = 2.4.28
+VER        = 2.4.29
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -45,7 +45,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 49007ffe8e37a0834255b279810edf24
+$(DL_FILE)_MD5 = 0c599404ef6b69eee95bcd9fcd094407
 
 install : $(TARGET)