* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a580a31c0ff5c596027b4e942869e4e7342f2de6
@ 2018-07-26 13:48 git
0 siblings, 0 replies; only message in thread
From: git @ 2018-07-26 13:48 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 8584 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via a580a31c0ff5c596027b4e942869e4e7342f2de6 (commit)
via 51099ddfd7a497d535662a93362e774ba30fe1ca (commit)
via 64add19dfe8ecef092679871eac1d56560e2b0f5 (commit)
from 4e4c122c58349a9cf7e496b1e61ea3f55e070681 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a580a31c0ff5c596027b4e942869e4e7342f2de6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jul 26 14:46:53 2018 +0100
core123: Ship and restart squid and apache
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 51099ddfd7a497d535662a93362e774ba30fe1ca
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Tue Jul 17 20:50:41 2018 +0200
squid: Update to 3.5.28
For details see:
http://www.squid-cache.org/Versions/v3/3.5/changesets/
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 64add19dfe8ecef092679871eac1d56560e2b0f5
Author: Wolfgang Apolinarski <wolfgang.apolinarski(a)ipfire.org>
Date: Tue Jul 17 20:13:30 2018 +0200
Apache: Update to 2.4.34
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
.../{oldcore/114 => core/123}/filelists/apache2 | 0
.../{oldcore/100 => core/123}/filelists/squid | 0
config/rootfiles/core/123/update.sh | 3 +++
lfs/apache2 | 4 ++--
lfs/squid | 8 +++----
src/patches/squid/SQUID-2018_1.patch | 28 ----------------------
src/patches/squid/SQUID-2018_2.patch | 23 ------------------
...=> squid-3.5.28-fix-max-file-descriptors.patch} | 0
8 files changed, 8 insertions(+), 58 deletions(-)
copy config/rootfiles/{oldcore/114 => core/123}/filelists/apache2 (100%)
copy config/rootfiles/{oldcore/100 => core/123}/filelists/squid (100%)
delete mode 100644 src/patches/squid/SQUID-2018_1.patch
delete mode 100644 src/patches/squid/SQUID-2018_2.patch
rename src/patches/squid/{squid-3.5.27-fix-max-file-descriptors.patch => squid-3.5.28-fix-max-file-descriptors.patch} (100%)
Difference in files:
diff --git a/config/rootfiles/core/123/filelists/apache2 b/config/rootfiles/core/123/filelists/apache2
new file mode 120000
index 000000000..eef95efa7
--- /dev/null
+++ b/config/rootfiles/core/123/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/core/123/filelists/squid b/config/rootfiles/core/123/filelists/squid
new file mode 120000
index 000000000..2dc8372a0
--- /dev/null
+++ b/config/rootfiles/core/123/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/core/123/update.sh
index ee8a5ec0b..cf488ec49 100644
--- a/config/rootfiles/core/123/update.sh
+++ b/config/rootfiles/core/123/update.sh
@@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do
done
# Stop services
+/etc/init.d/squid stop
# Extract files
extract_files
@@ -46,7 +47,9 @@ ldconfig
/usr/local/bin/update-lang-cache
# Start services
+/etc/init.d/apache restart
/etc/init.d/unbound restart
+/etc/init.d/squid start
# This update needs a reboot...
touch /var/run/need_reboot
diff --git a/lfs/apache2 b/lfs/apache2
index 16dd101d7..0e526a575 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -25,7 +25,7 @@
include Config
-VER = 2.4.33
+VER = 2.4.34
THISAPP = httpd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6ef469d3f16fffeb688bc6e0346823e5
+$(DL_FILE)_MD5 = 818adca52f3be187fe45d6822755be95
install : $(TARGET)
diff --git a/lfs/squid b/lfs/squid
index f93097019..cae56407c 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
include Config
-VER = 3.5.27
+VER = 3.5.28
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 39ef8199675d48a314b540f92c00c545
+$(DL_FILE)_MD5 = 9367e0375ea53ba0e99f77054d4402c5
install : $(TARGET)
@@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/SQUID-2018_1.patch
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/SQUID-2018_2.patch
- cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch
+ cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP)/libltdl && autoreconf -vfi
diff --git a/src/patches/squid/SQUID-2018_1.patch b/src/patches/squid/SQUID-2018_1.patch
deleted file mode 100644
index 9392219a9..000000000
--- a/src/patches/squid/SQUID-2018_1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit eb2db98a676321b814fc4a51c4fb7928a8bb45d9 (refs/remotes/origin/v3.5)
-Author: Amos Jeffries <yadij(a)users.noreply.github.com>
-Date: 2018-01-19 13:54:14 +1300
-
- ESI: make sure endofName never exceeds tagEnd (#130)
-
-diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc
-index d86d2d3..db634d9 100644
---- a/src/esi/CustomParser.cc
-+++ b/src/esi/CustomParser.cc
-@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
-
- char * endofName = strpbrk(const_cast<char *>(tag), w_space);
-
-- if (endofName > tagEnd)
-+ if (!endofName || endofName > tagEnd)
- endofName = const_cast<char *>(tagEnd);
-
- *endofName = '\0';
-@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
-
- char * endofName = strpbrk(const_cast<char *>(tag), w_space);
-
-- if (endofName > tagEnd)
-+ if (!endofName || endofName > tagEnd)
- endofName = const_cast<char *>(tagEnd);
-
- *endofName = '\0';
diff --git a/src/patches/squid/SQUID-2018_2.patch b/src/patches/squid/SQUID-2018_2.patch
deleted file mode 100644
index 9ecd8a5b7..000000000
--- a/src/patches/squid/SQUID-2018_2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 8232b83d3fa47a1399f155cb829db829369fbae9 (refs/remotes/origin/v3.5)
-Author: squidadm <squidadm(a)users.noreply.github.com>
-Date: 2018-01-21 08:07:08 +1300
-
- Fix indirect IP logging for transactions without a client connection (#129) (#136)
-
-diff --git a/src/client_side_request.cc b/src/client_side_request.cc
-index be124f3..203f89d 100644
---- a/src/client_side_request.cc
-+++ b/src/client_side_request.cc
-@@ -488,9 +488,9 @@ clientFollowXForwardedForCheck(allow_t answer, void *data)
- * Ensure that the access log shows the indirect client
- * instead of the direct client.
- */
-- ConnStateData *conn = http->getConn();
-- conn->log_addr = request->indirect_client_addr;
-- http->al->cache.caddr = conn->log_addr;
-+ http->al->cache.caddr = request->indirect_client_addr;
-+ if (ConnStateData *conn = http->getConn())
-+ conn->log_addr = request->indirect_client_addr;
- }
- request->x_forwarded_for_iterator.clean();
- request->flags.done_follow_x_forwarded_for = true;
diff --git a/src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch b/src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch
similarity index 100%
rename from src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch
rename to src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2018-07-26 13:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-26 13:48 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a580a31c0ff5c596027b4e942869e4e7342f2de6 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox