diff mbox series

apache: Update to 2.4.28

Message ID 20171008143721.1528-1-matthias.fischer@ipfire.org
State Superseded
Headers
Series apache: Update to 2.4.28 |

Commit Message

Matthias Fischer Oct. 9, 2017, 1:37 a.m. UTC 
  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@ipfire.org>
---
 lfs/apache2 | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Michael Tremer Oct. 10, 2017, 12:51 a.m. UTC | #1 
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
> 
> 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@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@ipfire.org>                   
>  #
> +# Copyright (C) 2007-2017   IPFire Team  <info@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 @@
>  
>  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 "<Layout IPFire>" >> $(DIR_APP)/config.layout
diff mbox series

Patch

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@ipfire.org>                    #
+# Copyright (C) 2007-2017   IPFire Team  <info@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 @@ 
 
 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 "<Layout IPFire>" >> $(DIR_APP)/config.layout