From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: AW: [PATCH v2] Updated Apache 2.4
Date: Tue, 17 Apr 2018 13:50:28 +0100 [thread overview]
Message-ID: <1523969428.1637848.143.camel@ipfire.org> (raw)
In-Reply-To: <003301d3cea1$30532c10$90f98430$@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 6043 bytes --]
Alright. Merged.
On Sat, 2018-04-07 at 20:49 +0200, Wolfgang Apolinarski wrote:
> Hi Michael,
>
> actually the patch should be around 140 lines, the first version had ~150
> lines, the difference is only the captive portal folder.
>
> Best regards
> Wolfgang
>
> > -----Ursprüngliche Nachricht-----
> > Von: Michael Tremer <michael.tremer(a)ipfire.org>
> > Gesendet: Freitag, 6. April 2018 12:29
> > An: Wolfgang Apolinarski <wolfgang.apolinarski(a)ipfire.org>; development(a)list
> > s.ipfire.org
> > Betreff: Re: [PATCH v2] Updated Apache 2.4
> >
> > Hi,
> >
> > 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.
> >
> > Best,
> > -Michael
> >
> > 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(-)
> > >
> > > 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 @@
> > >
> > > 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)
> > >
>
>
prev parent reply other threads:[~2018-04-17 12:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-30 12:53 [PATCH] " Wolfgang Apolinarski
2018-04-05 12:27 ` Michael Tremer
2018-04-06 5:11 ` [PATCH v2] " Wolfgang Apolinarski
2018-04-06 10:29 ` Michael Tremer
2018-04-07 18:49 ` AW: " Wolfgang Apolinarski
2018-04-17 12:50 ` Michael Tremer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1523969428.1637848.143.camel@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox