[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b4285088a121f71048870061de2c388d747ae3a2

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b4285088a121f71048870061de2c388d747ae3a2

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 4595 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, next has been updated
       via  b4285088a121f71048870061de2c388d747ae3a2 (commit)
       via  06232b041a8da29dacb7655bd431e5eec6e782b3 (commit)
       via  33f7d610fbd518d5809f273fb6fca927fcf25e01 (commit)
      from  22f7be0d4d9d676d002cf0736edbc174f31cd238 (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 b4285088a121f71048870061de2c388d747ae3a2
Author: Erik Kapfer <ummeegge(a)ipfire.org>
Date:   Sat Feb 2 08:46:12 2019 +0100

    update.sh: Delete .rnd files
    
    Since RANDFILE has been disabled in OpenSSL configurations, .rnd files are not needed anymore.
    
    Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 06232b041a8da29dacb7655bd431e5eec6e782b3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Feb 3 21:42:43 2019 +0000

    core128: Ship updated apr
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 33f7d610fbd518d5809f273fb6fca927fcf25e01
Author: Wolfgang Apolinarski <wolfgang.apolinarski(a)ipfire.org>
Date:   Sun Feb 3 15:11:58 2019 +0100

    Updated apr, stabilized apache build
    
    - Updated apr to 1.6.5
    - Stabilized apache build (rebuild)
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/common/apr                              | 2 +-
 config/rootfiles/{oldcore/114 => core/128}/filelists/apr | 0
 config/rootfiles/core/128/update.sh                      | 8 +++++++-
 lfs/apache2                                              | 2 +-
 lfs/apr                                                  | 4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)
 copy config/rootfiles/{oldcore/114 => core/128}/filelists/apr (100%)

Difference in files:
diff --git a/config/rootfiles/common/apr b/config/rootfiles/common/apr
index dfde82400..0fb0d7d37 100644
--- a/config/rootfiles/common/apr
+++ b/config/rootfiles/common/apr
@@ -44,7 +44,7 @@ usr/bin/apr-1-config
 #usr/lib/libapr-1.la
 #usr/lib/libapr-1.so
 usr/lib/libapr-1.so.0
-usr/lib/libapr-1.so.0.6.3
+usr/lib/libapr-1.so.0.6.5
 #usr/lib/pkgconfig/apr-1.pc
 #usr/share/apr-1
 #usr/share/apr-1/build
diff --git a/config/rootfiles/core/128/filelists/apr b/config/rootfiles/core/128/filelists/apr
new file mode 120000
index 000000000..87dd1974f
--- /dev/null
+++ b/config/rootfiles/core/128/filelists/apr
@@ -0,0 +1 @@
+../../../common/apr
\ No newline at end of file
diff --git a/config/rootfiles/core/128/update.sh b/config/rootfiles/core/128/update.sh
index 8eacdd9eb..71824266b 100644
--- a/config/rootfiles/core/128/update.sh
+++ b/config/rootfiles/core/128/update.sh
@@ -36,7 +36,13 @@ done
 # Remove files
 rm -vf \
 	/usr/lib{,/sse2}/libcrypto.so.10 \
-	/usr/lib{,/sse2}/libssl.so.10
+	/usr/lib{,/sse2}/libssl.so.10 \
+	/home/nobody/.rnd \
+	/var/ipfire/ovpn/ca/.rnd \
+	/var/tmp/.rnd \
+	/.rnd \
+	/root/.rnd
+
 
 # Extract files
 extract_files
diff --git a/lfs/apache2 b/lfs/apache2
index bedbb7f87..be5ffd9ec 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -101,7 +101,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	echo "</Layout>" >> $(DIR_APP)/config.layout
 
 	cd $(DIR_APP) && ./configure --enable-layout=IPFire \
-				--enable-ssl --enable-mods-shared=all --enable-proxy --with-mpm=event
+				--enable-ssl --enable-mods-shared=all --enable-proxy --with-mpm=event --disable-lua --disable-md
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	chown -v root:root /usr/lib/apache/httpd.exp \
diff --git a/lfs/apr b/lfs/apr
index e384ab3c0..c5d342d2c 100644
--- a/lfs/apr
+++ b/lfs/apr
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 1.6.3
+VER        = 1.6.5
 
 THISAPP    = apr-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 12f2a349483ad6f12db49ba01fbfdbfa
+$(DL_FILE)_MD5 = ad4add8efdfe87330b88e5e788241775
 
 install : $(TARGET)
 


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