From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: AW: [PATCH v2] Updated Apache 2.4 Date: Tue, 17 Apr 2018 13:50:28 +0100 Message-ID: <1523969428.1637848.143.camel@ipfire.org> In-Reply-To: <003301d3cea1$30532c10$90f98430$@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0116716644618646244==" List-Id: --===============0116716644618646244== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Alright. Merged. On Sat, 2018-04-07 at 20:49 +0200, Wolfgang Apolinarski wrote: > Hi Michael, >=20 > actually the patch should be around 140 lines, the first version had ~150 > lines, the difference is only the captive portal folder. >=20 > Best regards > Wolfgang >=20 > > -----Urspr=C3=BCngliche Nachricht----- > > Von: Michael Tremer > > Gesendet: Freitag, 6. April 2018 12:29 > > An: Wolfgang Apolinarski ; development= (a)list > > s.ipfire.org > > Betreff: Re: [PATCH v2] Updated Apache 2.4 > >=20 > > Hi, > >=20 > > this patch is a lot shorter than the first one, but when you say the > > rootfiles are fine now, I am happy to merge this soon. > >=20 > > Best, > > -Michael > >=20 > > On Fri, 2018-04-06 at 07:11 +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 | 5 +++++ > > > config/rootfiles/common/apr | 2 +- > > > config/rootfiles/common/aprutil | 2 +- > > > lfs/apache2 | 4 ++-- > > > lfs/apr | 6 +++--- > > > lfs/aprutil | 6 +++--- > > > 6 files changed, 15 insertions(+), 10 deletions(-) > > >=20 > > > diff --git a/config/rootfiles/common/apache2 > > > b/config/rootfiles/common/apache2 index b7d471fe9..d10c4f138 100644 > > > --- a/config/rootfiles/common/apache2 > > > +++ b/config/rootfiles/common/apache2 > > > @@ -910,6 +910,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 +970,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 +1613,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 > > > 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 @@ > > >=20 > > > include Config > > >=20 > > > -VER =3D 2.4.29 > > > +VER =3D 2.4.33 > > >=20 > > > THISAPP =3D httpd-$(VER) > > > DL_FILE =3D $(THISAPP).tar.bz2 > > > @@ -45,7 +45,7 @@ objects =3D $(DL_FILE) > > >=20 > > > $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > > >=20 > > > -$(DL_FILE)_MD5 =3D 0c599404ef6b69eee95bcd9fcd094407 > > > +$(DL_FILE)_MD5 =3D 6ef469d3f16fffeb688bc6e0346823e5 > > >=20 > > > install : $(TARGET) > > >=20 > > > diff --git a/lfs/apr b/lfs/apr > > > index 6f667cffc..47c21a325 100644 > > > --- a/lfs/apr > > > +++ b/lfs/apr > > > @@ -25,11 +25,11 @@ > > >=20 > > > include Config > > >=20 > > > -VER =3D 1.6.2 > > > +VER =3D 1.6.3 > > >=20 > > > THISAPP =3D apr-$(VER) > > > DL_FILE =3D $(THISAPP).tar.bz2 > > > -DL_FROM =3D http://archive.apache.org/dist/apr > > > +DL_FROM =3D $(URL_IPFIRE) > > > DIR_APP =3D $(DIR_SRC)/$(THISAPP) > > >=20 > > > TARGET =3D $(DIR_INFO)/$(THISAPP) > > > @@ -42,7 +42,7 @@ objects =3D $(DL_FILE) > > >=20 > > > $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > > >=20 > > > -$(DL_FILE)_MD5 =3D e81a851967c79b5ce9bfbc909e4bf735 > > > +$(DL_FILE)_MD5 =3D 12f2a349483ad6f12db49ba01fbfdbfa > > >=20 > > > install : $(TARGET) > > >=20 > > > diff --git a/lfs/aprutil b/lfs/aprutil index c2f808422..29ec5df43 > > > 100644 > > > --- a/lfs/aprutil > > > +++ b/lfs/aprutil > > > @@ -25,11 +25,11 @@ > > >=20 > > > include Config > > >=20 > > > -VER =3D 1.6.0 > > > +VER =3D 1.6.1 > > >=20 > > > THISAPP =3D apr-util-$(VER) > > > DL_FILE =3D $(THISAPP).tar.bz2 > > > -DL_FROM =3D http://archive.apache.org/dist/apr > > > +DL_FROM =3D $(URL_IPFIRE) > > > DIR_APP =3D $(DIR_SRC)/$(THISAPP) > > >=20 > > > TARGET =3D $(DIR_INFO)/$(THISAPP) > > > @@ -44,7 +44,7 @@ objects =3D $(DL_FILE) > > >=20 > > > $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > > >=20 > > > -$(DL_FILE)_MD5 =3D 069a9a980776acab05212c5f37ef8368 > > > +$(DL_FILE)_MD5 =3D 8ff5dc36fa39a2a3db1df196d3ed6086 > > >=20 > > > install : $(TARGET) > > >=20 >=20 >=20 --===============0116716644618646244==--