apache: Update to 2.4.39

Message ID 20190404071500.18804-1-matthias.fischer@ipfire.org
State Accepted
Commit 5f2e713ec888dfbbcdb609ee61e846c060ded96c
Headers
Series apache: Update to 2.4.39 |

Commit Message

Matthias Fischer April 4, 2019, 6:15 p.m. UTC
  For details see:
http://mirror.checkdomain.de/apache//httpd/CHANGES_2.4.39

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 config/rootfiles/common/apache2 | 1 +
 lfs/apache2                     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
  

Comments

Michael Tremer April 4, 2019, 9:07 p.m. UTC | #1
Hi,

Thanks for submitting this.

Peter has emailed me in private that he wanted to update apache, but hasn’t sent a patch, yet.

I guess that it is okay with him to merge this and save him the work.

Best,
-Michael

> On 4 Apr 2019, at 08:15, Matthias Fischer <matthias.fischer@ipfire.org> wrote:
> 
> For details see:
> http://mirror.checkdomain.de/apache//httpd/CHANGES_2.4.39
> 
> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> ---
> config/rootfiles/common/apache2 | 1 +
> lfs/apache2                     | 6 +++---
> 2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
> index ee09c6cbe..4866fb6bd 100644
> --- a/config/rootfiles/common/apache2
> +++ b/config/rootfiles/common/apache2
> @@ -1646,6 +1646,7 @@ usr/lib/apache/mod_slotmem_plain.so
> usr/lib/apache/mod_slotmem_shm.so
> usr/lib/apache/mod_socache_dbm.so
> usr/lib/apache/mod_socache_memcache.so
> +usr/lib/apache/mod_socache_redis.so
> usr/lib/apache/mod_socache_shmcb.so
> usr/lib/apache/mod_speling.so
> usr/lib/apache/mod_ssl.so
> diff --git a/lfs/apache2 b/lfs/apache2
> index be5ffd9ec..87f639efe 100644
> --- a/lfs/apache2
> +++ b/lfs/apache2
> @@ -1,7 +1,7 @@
> ###############################################################################
> #                                                                             #
> # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
> +# Copyright (C) 2007-2019  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.38
> +VER        = 2.4.39
> 
> THISAPP    = httpd-$(VER)
> DL_FILE    = $(THISAPP).tar.bz2
> @@ -45,7 +45,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = 4a2b87ca55e42017d21f18724c560084
> +$(DL_FILE)_MD5 = 930e217ba2d71e708a3f1521ecae7ec0
> 
> install : $(TARGET)
> 
> -- 
> 2.18.0
>
  
Peter Müller April 5, 2019, 2:06 a.m. UTC | #2
Hello,

yes it is. :-)

@Matthias: Thanks for taking care of this.

Thanks, and best regards,
Peter Müller

Michael Tremer:
> Hi,
> 
> Thanks for submitting this.
> 
> Peter has emailed me in private that he wanted to update apache, but hasn’t sent a patch, yet.
> 
> I guess that it is okay with him to merge this and save him the work.
> 
> Best,
> -Michael
> 
>> On 4 Apr 2019, at 08:15, Matthias Fischer <matthias.fischer@ipfire.org> wrote:
>>
>> For details see:
>> http://mirror.checkdomain.de/apache//httpd/CHANGES_2.4.39
>>
>> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
>> ---
>> config/rootfiles/common/apache2 | 1 +
>> lfs/apache2                     | 6 +++---
>> 2 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
>> index ee09c6cbe..4866fb6bd 100644
>> --- a/config/rootfiles/common/apache2
>> +++ b/config/rootfiles/common/apache2
>> @@ -1646,6 +1646,7 @@ usr/lib/apache/mod_slotmem_plain.so
>> usr/lib/apache/mod_slotmem_shm.so
>> usr/lib/apache/mod_socache_dbm.so
>> usr/lib/apache/mod_socache_memcache.so
>> +usr/lib/apache/mod_socache_redis.so
>> usr/lib/apache/mod_socache_shmcb.so
>> usr/lib/apache/mod_speling.so
>> usr/lib/apache/mod_ssl.so
>> diff --git a/lfs/apache2 b/lfs/apache2
>> index be5ffd9ec..87f639efe 100644
>> --- a/lfs/apache2
>> +++ b/lfs/apache2
>> @@ -1,7 +1,7 @@
>> ###############################################################################
>> #                                                                             #
>> # IPFire.org - A linux based firewall                                         #
>> -# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
>> +# Copyright (C) 2007-2019  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.38
>> +VER        = 2.4.39
>>
>> THISAPP    = httpd-$(VER)
>> DL_FILE    = $(THISAPP).tar.bz2
>> @@ -45,7 +45,7 @@ objects = $(DL_FILE)
>>
>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>
>> -$(DL_FILE)_MD5 = 4a2b87ca55e42017d21f18724c560084
>> +$(DL_FILE)_MD5 = 930e217ba2d71e708a3f1521ecae7ec0
>>
>> install : $(TARGET)
>>
>> -- 
>> 2.18.0
>>
>
  
Matthias Fischer April 5, 2019, 6:41 a.m. UTC | #3
Hi,

On 04.04.2019 17:06, Peter Müller wrote:
> Hello,
> 
> yes it is. :-)
> 
> @Matthias: Thanks for taking care of this.

No problem - you're welcome! ;-)

> Thanks, and best regards,
> Peter Müller
> 
> Michael Tremer:
>> Hi,
>> 
>> Thanks for submitting this.
>> 
>> Peter has emailed me in private that he wanted to update apache, but hasn’t sent a patch, yet.
>> 
>> I guess that it is okay with him to merge this and save him the work.
>> 
>> Best,
>> -Michael
>> 
>>> On 4 Apr 2019, at 08:15, Matthias Fischer <matthias.fischer@ipfire.org> wrote:
>>>
>>> For details see:
>>> http://mirror.checkdomain.de/apache//httpd/CHANGES_2.4.39
>>>
>>> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
>>> ---
>>> config/rootfiles/common/apache2 | 1 +
>>> lfs/apache2                     | 6 +++---
>>> 2 files changed, 4 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
>>> index ee09c6cbe..4866fb6bd 100644
>>> --- a/config/rootfiles/common/apache2
>>> +++ b/config/rootfiles/common/apache2
>>> @@ -1646,6 +1646,7 @@ usr/lib/apache/mod_slotmem_plain.so
>>> usr/lib/apache/mod_slotmem_shm.so
>>> usr/lib/apache/mod_socache_dbm.so
>>> usr/lib/apache/mod_socache_memcache.so
>>> +usr/lib/apache/mod_socache_redis.so
>>> usr/lib/apache/mod_socache_shmcb.so
>>> usr/lib/apache/mod_speling.so
>>> usr/lib/apache/mod_ssl.so
>>> diff --git a/lfs/apache2 b/lfs/apache2
>>> index be5ffd9ec..87f639efe 100644
>>> --- a/lfs/apache2
>>> +++ b/lfs/apache2
>>> @@ -1,7 +1,7 @@
>>> ###############################################################################
>>> #                                                                             #
>>> # IPFire.org - A linux based firewall                                         #
>>> -# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
>>> +# Copyright (C) 2007-2019  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.38
>>> +VER        = 2.4.39
>>>
>>> THISAPP    = httpd-$(VER)
>>> DL_FILE    = $(THISAPP).tar.bz2
>>> @@ -45,7 +45,7 @@ objects = $(DL_FILE)
>>>
>>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>>
>>> -$(DL_FILE)_MD5 = 4a2b87ca55e42017d21f18724c560084
>>> +$(DL_FILE)_MD5 = 930e217ba2d71e708a3f1521ecae7ec0
>>>
>>> install : $(TARGET)
>>>
>>> -- 
>>> 2.18.0
>>>
>> 
>
  

Patch

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index ee09c6cbe..4866fb6bd 100644
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -1646,6 +1646,7 @@  usr/lib/apache/mod_slotmem_plain.so
 usr/lib/apache/mod_slotmem_shm.so
 usr/lib/apache/mod_socache_dbm.so
 usr/lib/apache/mod_socache_memcache.so
+usr/lib/apache/mod_socache_redis.so
 usr/lib/apache/mod_socache_shmcb.so
 usr/lib/apache/mod_speling.so
 usr/lib/apache/mod_ssl.so
diff --git a/lfs/apache2 b/lfs/apache2
index be5ffd9ec..87f639efe 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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.38
+VER        = 2.4.39
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -45,7 +45,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4a2b87ca55e42017d21f18724c560084
+$(DL_FILE)_MD5 = 930e217ba2d71e708a3f1521ecae7ec0
 
 install : $(TARGET)