Updated apr to 1.6.5 Changed build settings for apache, such that rebuilds do not change the rootfile (new modules) - Last time, I re-ordered the build to create those modules, this patch instead disables the modules such that they are not created when a rebuild is performed
Wolfgang Apolinarski (1): Updated apr, stabilized apache build
config/rootfiles/common/apr | 2 +- lfs/apache2 | 2 +- lfs/apr | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
- Updated apr to 1.6.5 - Stabilized apache build (rebuild) --- config/rootfiles/common/apr | 2 +- lfs/apache2 | 2 +- lfs/apr | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
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/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)
Thanks. This is really nice and clean.
We can enable those modules in case someone needs them but if not, we can ship a smaller codebase!
Best, -Michael
On 3 Feb 2019, at 14:11, Wolfgang Apolinarski wolfgang.apolinarski@ipfire.org wrote:
- Updated apr to 1.6.5
- Stabilized apache build (rebuild)
config/rootfiles/common/apr | 2 +- lfs/apache2 | 2 +- lfs/apr | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
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/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-mddiff --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)
-- 2.13.0
-
Michael Tremer -
Wolfgang Apolinarski