[git.ipfire.org] IPFire 2.x development tree branch, master, updated. d01d68913f643c5d4b9b58a7ecab6d1c4dde5c0c

[Arne Fitzenreiter <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 6056 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  d01d68913f643c5d4b9b58a7ecab6d1c4dde5c0c (commit)
       via  af9aa1556e6329e7af3d8939c51316fe1599295a (commit)
       via  0971726e1372d743f92b7f0e6969ebbaa8718756 (commit)
      from  6fc3f2e685d42d9c6261ca281740ce067ab6e00d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d01d68913f643c5d4b9b58a7ecab6d1c4dde5c0c
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Fri Apr 5 21:55:12 2019 +0200

    wget: Update to 1.20.3
    
    For details see:
    https://fossies.org/linux/wget/ChangeLog
    
    Excerpt from "NEWS":
    
    "2019-04-05  Tim Ruehsen  <tim.ruehsen(a)gmx.de>
    
    Fix a buffer overflow vulnerability
    * src/iri.c(do_conversion): Reallocate the output buffer to a larger
      size if it is already full"
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit af9aa1556e6329e7af3d8939c51316fe1599295a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Apr 4 02:04:28 2019 +0100

    core130: Ship updated apache
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 0971726e1372d743f92b7f0e6969ebbaa8718756
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Thu Apr 4 09:15:00 2019 +0200

    apache: Update to 2.4.39
    
    For details see:
    http://mirror.checkdomain.de/apache//httpd/CHANGES_2.4.39
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/apache2                            |  1 +
 .../rootfiles/{oldcore/114 => core/130}/filelists/apache2  |  0
 config/rootfiles/core/130/update.sh                        | 14 +-------------
 lfs/apache2                                                |  6 +++---
 lfs/wget                                                   |  4 ++--
 5 files changed, 7 insertions(+), 18 deletions(-)
 copy config/rootfiles/{oldcore/114 => core/130}/filelists/apache2 (100%)

Difference in files:
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/config/rootfiles/core/130/filelists/apache2 b/config/rootfiles/core/130/filelists/apache2
new file mode 120000
index 000000000..eef95efa7
--- /dev/null
+++ b/config/rootfiles/core/130/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/core/130/update.sh b/config/rootfiles/core/130/update.sh
index f072e8052..86e42a1d4 100644
--- a/config/rootfiles/core/130/update.sh
+++ b/config/rootfiles/core/130/update.sh
@@ -32,15 +32,7 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
-/etc/init.d/squid stop
-/usr/local/bin/openvpnctrl -k
-/usr/local/bin/openvpnctrl -kn2n
 /usr/local/bin/ipsecctrl D
-/etc/init.d/unbound stop
-
-# Remove files
-rm -vf \
-	/usr/lib/firewall/ipsec-block
 
 # Extract files
 extract_files
@@ -52,12 +44,8 @@ ldconfig
 /usr/local/bin/update-lang-cache
 
 # Start services
-/etc/init.d/firewall restart
-/etc/init.d/unbound start
+/etc/init.d/apache restart
 /usr/local/bin/ipsecctrl S
-/usr/local/bin/openvpnctrl -s
-/usr/local/bin/openvpnctrl -sn2n
-/etc/init.d/squid start
 
 # This update needs a reboot...
 #touch /var/run/need_reboot
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(a)ipfire.org>                     #
+# Copyright (C) 2007-2019  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 @@
 
 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)
 
diff --git a/lfs/wget b/lfs/wget
index ac2fa826c..00ca75033 100644
--- a/lfs/wget
+++ b/lfs/wget
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.20.2
+VER        = 1.20.3
 
 THISAPP    = wget-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2692f6678e93601441306b5c1fc6a77a
+$(DL_FILE)_MD5 = db4e6dc7977cbddcd543b240079a4899
 
 install : $(TARGET)
 


hooks/post-receive
--
IPFire 2.x development tree