Hi!

> thanks for sending in this patch. It is important that we follow the apache release closely.
Agreed.

> 
> On Fri, 2018-03-30 at 14:53 +0200, Wolfgang Apolinarski wrote:
> > - Updated Apache from 2.4.29 to 2.4.33
> > - Updated Apr from 1.6.1 to 1.6.3
> > - Updated Apr-Util from 1.6.0 to 1.6.1
> > ---
> >  config/rootfiles/common/apache2 | 6 +++++-
> >  config/rootfiles/common/apr     | 2 +-
> >  config/rootfiles/common/aprutil | 2 +-
> >  lfs/apache2                     | 4 ++--
> >  lfs/apr                         | 6 +++---
> >  lfs/aprutil                     | 6 +++---
> >  6 files changed, 15 insertions(+), 11 deletions(-)
> >
> > diff --git a/config/rootfiles/common/apache2
> > b/config/rootfiles/common/apache2 index b7d471fe9..529faf34e 100644
> > --- a/config/rootfiles/common/apache2
> > +++ b/config/rootfiles/common/apache2
> > @@ -89,7 +89,6 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf
> >  #srv/web/ipfire/htdocs
> >  #srv/web/ipfire/htdocs/index.html
> >  #srv/web/ipfire/html
> > -srv/web/ipfire/html/captive
> >  #srv/web/ipfire/icons
> >  #srv/web/ipfire/icons/README
> >  #srv/web/ipfire/icons/README.html
> 
> Any idea why this captive portal directory has been removed?
> 
> That should be there.

Interesting. I performed a complete rebuild and it fell out of the rootfile. Since I did not monitor all changes in ipfire closely, I supposed that it either had been moved somewhere or removed.

I'm performing a rebuild with the captive portal right now.

> > @@ -910,6 +909,8 @@ srv/web/ipfire/html/captive
> > #srv/web/ipfire/manual/mod/mod_macro.html
> >  #srv/web/ipfire/manual/mod/mod_macro.html.en
> >  #srv/web/ipfire/manual/mod/mod_macro.html.fr
> > +#srv/web/ipfire/manual/mod/mod_md.html
> > +#srv/web/ipfire/manual/mod/mod_md.html.en
> >  #srv/web/ipfire/manual/mod/mod_mime.html
> >  #srv/web/ipfire/manual/mod/mod_mime.html.en
> >  #srv/web/ipfire/manual/mod/mod_mime.html.fr
> > @@ -968,6 +969,8 @@ srv/web/ipfire/html/captive
> > #srv/web/ipfire/manual/mod/mod_proxy_scgi.html
> >  #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en
> >  #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.fr
> > +#srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html
> > +#srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html.en
> >  #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html
> >  #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.en
> >  #srv/web/ipfire/manual/mod/mod_ratelimit.html
> > @@ -1609,6 +1612,7 @@ usr/lib/apache/mod_proxy_hcheck.so
> >  usr/lib/apache/mod_proxy_html.so
> >  usr/lib/apache/mod_proxy_http.so
> >  usr/lib/apache/mod_proxy_scgi.so
> > +usr/lib/apache/mod_proxy_uwsgi.so
> >  usr/lib/apache/mod_proxy_wstunnel.so
> >  usr/lib/apache/mod_ratelimit.so
> >  usr/lib/apache/mod_reflector.so
> 
> Not entirely sure if we need the uwsgi mod, but I do not have any problem with it being around.
Yes, it is not enabled by default and since we deliver all standard modules this one is delivered as well.

> 
> > diff --git a/config/rootfiles/common/apr b/config/rootfiles/common/apr
> > index c71ee01cc..dfde82400 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.2
> > +usr/lib/libapr-1.so.0.6.3
> >  #usr/lib/pkgconfig/apr-1.pc
> >  #usr/share/apr-1
> >  #usr/share/apr-1/build
> > diff --git a/config/rootfiles/common/aprutil
> > b/config/rootfiles/common/aprutil index e9cf3e0da..8bc51ed00 100644
> > --- a/config/rootfiles/common/aprutil
> > +++ b/config/rootfiles/common/aprutil
> > @@ -43,5 +43,5 @@ usr/lib/apr-util-1/apr_crypto_openssl.so
> >  #usr/lib/libaprutil-1.la
> >  #usr/lib/libaprutil-1.so
> >  usr/lib/libaprutil-1.so.0
> > -usr/lib/libaprutil-1.so.0.6.0
> > +usr/lib/libaprutil-1.so.0.6.1
> >  #usr/lib/pkgconfig/apr-util-1.pc
> > diff --git a/lfs/apache2 b/lfs/apache2 index 28855fdc5..69b05341d
> > 100644
> > --- a/lfs/apache2
> > +++ b/lfs/apache2
> > @@ -25,7 +25,7 @@
> >
> >  include Config
> >
> > -VER        = 2.4.29
> > +VER        = 2.4.33
> >
> >  THISAPP    = httpd-$(VER)
> >  DL_FILE    = $(THISAPP).tar.bz2
> > @@ -45,7 +45,7 @@ objects = $(DL_FILE)
> >
> >  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> >
> > -$(DL_FILE)_MD5 = 0c599404ef6b69eee95bcd9fcd094407
> > +$(DL_FILE)_MD5 = 6ef469d3f16fffeb688bc6e0346823e5
> >
> >  install : $(TARGET)
> >
> > diff --git a/lfs/apr b/lfs/apr
> > index 6f667cffc..47c21a325 100644
> > --- a/lfs/apr
> > +++ b/lfs/apr
> > @@ -25,11 +25,11 @@
> >
> >  include Config
> >
> > -VER        = 1.6.2
> > +VER        = 1.6.3
> >
> >  THISAPP    = apr-$(VER)
> >  DL_FILE    = $(THISAPP).tar.bz2
> > -DL_FROM    = http://archive.apache.org/dist/apr
> > +DL_FROM    = $(URL_IPFIRE)
> >  DIR_APP    = $(DIR_SRC)/$(THISAPP)
> >
> >  TARGET     = $(DIR_INFO)/$(THISAPP)
> > @@ -42,7 +42,7 @@ objects = $(DL_FILE)
> >
> >  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> >
> > -$(DL_FILE)_MD5 = e81a851967c79b5ce9bfbc909e4bf735
> > +$(DL_FILE)_MD5 = 12f2a349483ad6f12db49ba01fbfdbfa
> >
> >  install : $(TARGET)
> >
> > diff --git a/lfs/aprutil b/lfs/aprutil index c2f808422..29ec5df43
> > 100644
> > --- a/lfs/aprutil
> > +++ b/lfs/aprutil
> > @@ -25,11 +25,11 @@
> >
> >  include Config
> >
> > -VER        = 1.6.0
> > +VER        = 1.6.1
> >
> >  THISAPP    = apr-util-$(VER)
> >  DL_FILE    = $(THISAPP).tar.bz2
> > -DL_FROM    = http://archive.apache.org/dist/apr
> > +DL_FROM    = $(URL_IPFIRE)
> >  DIR_APP    = $(DIR_SRC)/$(THISAPP)
> >
> >  TARGET     = $(DIR_INFO)/$(THISAPP)
> > @@ -44,7 +44,7 @@ objects = $(DL_FILE)
> >
> >  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> >
> > -$(DL_FILE)_MD5 = 069a9a980776acab05212c5f37ef8368
> > +$(DL_FILE)_MD5 = 8ff5dc36fa39a2a3db1df196d3ed6086
> >
> >  install : $(TARGET)
> >
> 
> Looking good so far.
> 
> Best,
> -Michael