From patchwork Fri Mar 30 23:53:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Apolinarski X-Patchwork-Id: 1717 Return-Path: Received: from mail01.ipfire.org (mail01.ipfire.org [IPv6:2001:470:7183:25::1]) by web02.i.ipfire.org (Postfix) with ESMTP id EDFD560329 for ; Fri, 30 Mar 2018 14:53:40 +0200 (CEST) X-Virus-Scanned: ClamAV at mail01.ipfire.org X-Spam-Flag: NO X-Spam-Score: -0.6 X-Spam-Level: X-Spam-Status: No, score=-0.6 tagged_above=-999 required=5 tests=[ALL_TRUSTED=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, KAM_NUMSUBJECT=0.5] autolearn=disabled Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 156DA1108883; Fri, 30 Mar 2018 13:53:29 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ipfire.org; s=201801; t=1522414410; x=1525006410; bh=vT7ICIUtTvx/9LZv6hi1HomSZPDJHa0vylVhEMHyFgI=; h=From:To:Subject:Date:Message-Id:Sender:From:To:Cc:Date: Content-Type:Message-ID:In-Reply-To:Subject:Reply-To:Sender; b=q9g0GQ2YXbB9/QXt6NRcdrGGC/JHSeKgfJVDAPS8D2X1ueFSF6/T+xwGtAxeSM8/3 rpsNcEYEnfNJqi/v25MPxSjD3LkKzrCqxsux+EQMnu996E6+3+BkiwPNtn7Ls/0vxx J+NygK8WnGJ+1FdwwaWDiJ5EWNZgNVhCPpjy6cJTWx2rm/Jpg0SuvEp2qcyo9rXA/G sEX7VE+C/0MTH/Rnw1C2wVnLfVYgX9yLG7UEk9FnrLoxvK2PHUCRs2pFxk5esV4HMw dSPETKrAt0WB8TBwyR3jfLYaw3nD055S1+vNS17bKhgvTU8b41AZo0gUL4obyyzpTo XcYDl3FMMGi1w== X-Virus-Scanned: ClamAV at mail01.ipfire.org Received: from gentoo-modula.duisburg.apolinarski.de (x4e306ef8.dyn.telefonica.de [78.48.110.248]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 879D01108883; Fri, 30 Mar 2018 13:53:11 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ipfire.org; s=201801; t=1522414391; x=1525006391; bh=vT7ICIUtTvx/9LZv6hi1HomSZPDJHa0vylVhEMHyFgI=; h=From:To:Cc:Subject:Date:Message-Id:From:To:Cc:Date:Content-Type: Message-ID:In-Reply-To:Subject:Reply-To:Sender; b=bD0AhFe4oMFPVy8xVFRWSj+nRasPdfLtNSHO2cJJL5YIcz1cHKN45pfzKD0Qp0ddq j8Ha7F9APUS9+HD4TTXLmVqfDFEqGSclRggDksdelVC5zl2u8m1DmNHnlQR9mx1+Ga B5vcYCZiDSWgr6/sOgSUijsyZcNlLtjkY5+dj070HaHC+EIAO9/1zK2b5mqEfTQfis g3hqq5OU4BMvSIFwQ3keBn3FRhAB+T2sMD0q20voZ9QuLfGVKmT5Pn4R1wMpQsS2+j smROl9nvn1lPhlZz87vyqPwNSdy+filunI0pMwt3y28MZMxiIhVrscNFLJGed+WILr CxVNlw6eofixA== From: Wolfgang Apolinarski To: development@lists.ipfire.org Subject: [PATCH] Updated Apache 2.4 Date: Fri, 30 Mar 2018 14:53:04 +0200 Message-Id: <20180330125304.8724-1-wolfgang.apolinarski@ipfire.org> X-Mailer: git-send-email 2.13.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - 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 @@ -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 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)