* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. cad9257ae28d7c869f17ce0678820863db574589
@ 2018-01-23 13:24 git
0 siblings, 0 replies; only message in thread
From: git @ 2018-01-23 13:24 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 16488 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 cad9257ae28d7c869f17ce0678820863db574589 (commit)
via adf3f4f4fe1a067544661a884c50c12b0eb89c65 (commit)
via fb55a868c6bc2414d049ffa286d670d30907bce1 (commit)
via eb03c511fd47e29b8198f6b62aab6ef16f89f43b (commit)
via 101765c0fd828f285ba60b1e6068faaa45589a68 (commit)
from 1f91201011552f88f81013cdf57f29cabdf2b613 (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 cad9257ae28d7c869f17ce0678820863db574589
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Jan 23 13:21:36 2018 +0000
core118: Ship LZ4
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit adf3f4f4fe1a067544661a884c50c12b0eb89c65
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Mon Jan 22 19:04:59 2018 +0100
LZ4: New compression library.
New lossless data compression algorithm.
Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fb55a868c6bc2414d049ffa286d670d30907bce1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Jan 23 13:09:37 2018 +0000
core118: Ship updated squid
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit eb03c511fd47e29b8198f6b62aab6ef16f89f43b
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Mon Jan 22 17:49:52 2018 +0100
squid 3.5.27: Patch for SA 2018:2
As announced, here is the second patch for 'squid 3.5.27'.
For details about this and the previous patch (2018_1) regarding "ESI Response
processing" and "HTTP message processing", see:
http://squid-web-proxy-cache.1019090.n4.nabble.com/squid-announce-ADVISORY-SQUID-2018-1-Denial-of-Service-issue-in-ESI-Response-processing-tp4684618.html
http://squid-web-proxy-cache.1019090.n4.nabble.com/squid-announce-ADVISORY-SQUID-2018-2-Denial-of-Service-issue-in-HTTP-Message-processing-td4684617.html
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 101765c0fd828f285ba60b1e6068faaa45589a68
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Jan 20 18:50:51 2018 +0100
squid 3.5.27: Patch for SA 2018:1
http://www.squid-cache.org/Versions/v3/3.5/changesets/
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/lz4 | 17 ++++++++++
config/rootfiles/core/118/filelists/lz4 | 1 +
.../{oldcore/100 => core/118}/filelists/squid | 0
config/rootfiles/core/118/update.sh | 2 ++
lfs/{iftop => lz4} | 16 ++++------
lfs/squid | 6 ++--
make.sh | 1 +
src/patches/lz4-1.8.1.2_mod_install_path.patch | 36 ++++++++++++++++++++++
src/patches/squid/SQUID-2018_1.patch | 28 +++++++++++++++++
src/patches/squid/SQUID-2018_2.patch | 23 ++++++++++++++
.../squid-3.5.27-fix-max-file-descriptors.patch | 0
11 files changed, 118 insertions(+), 12 deletions(-)
create mode 100644 config/rootfiles/common/lz4
create mode 120000 config/rootfiles/core/118/filelists/lz4
copy config/rootfiles/{oldcore/100 => core/118}/filelists/squid (100%)
copy lfs/{iftop => lz4} (91%)
create mode 100644 src/patches/lz4-1.8.1.2_mod_install_path.patch
create mode 100644 src/patches/squid/SQUID-2018_1.patch
create mode 100644 src/patches/squid/SQUID-2018_2.patch
rename src/patches/{ => squid}/squid-3.5.27-fix-max-file-descriptors.patch (100%)
Difference in files:
diff --git a/config/rootfiles/common/lz4 b/config/rootfiles/common/lz4
new file mode 100644
index 000000000..0902a47fe
--- /dev/null
+++ b/config/rootfiles/common/lz4
@@ -0,0 +1,17 @@
+usr/bin/lz4
+#usr/bin/lz4c
+#usr/bin/lz4cat
+#usr/bin/unlz4
+#usr/include/lz4.h
+#usr/include/lz4frame.h
+#usr/include/lz4frame_static.h
+#usr/include/lz4hc.h
+#usr/lib/liblz4.a
+#usr/lib/liblz4.so
+usr/lib/liblz4.so.1
+usr/lib/liblz4.so.1.8.1
+#usr/lib/pkgconfig/liblz4.pc
+#usr/share/man/man1/lz4.1
+#usr/share/man/man1/lz4c.1
+#usr/share/man/man1/lz4cat.1
+#usr/share/man/man1/unlz4.1
diff --git a/config/rootfiles/core/118/filelists/lz4 b/config/rootfiles/core/118/filelists/lz4
new file mode 120000
index 000000000..65c31802e
--- /dev/null
+++ b/config/rootfiles/core/118/filelists/lz4
@@ -0,0 +1 @@
+../../../common/lz4
\ No newline at end of file
diff --git a/config/rootfiles/core/118/filelists/squid b/config/rootfiles/core/118/filelists/squid
new file mode 120000
index 000000000..2dc8372a0
--- /dev/null
+++ b/config/rootfiles/core/118/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/118/update.sh b/config/rootfiles/core/118/update.sh
index 0cd6c108b..b30d7b3ac 100644
--- a/config/rootfiles/core/118/update.sh
+++ b/config/rootfiles/core/118/update.sh
@@ -33,6 +33,7 @@ done
# Stop services
/etc/init.d/snort stop
+/etc/init.d/squid stop
/etc/init.d/unbound stop
# Delete files
@@ -58,6 +59,7 @@ ldconfig
# Start services
/etc/init.d/unbound start
/etc/init.d/apache restart
+/etc/init.d/squid start
/etc/init.d/snort start
# This update need a reboot...
diff --git a/lfs/lz4 b/lfs/lz4
new file mode 100644
index 000000000..06d192e3c
--- /dev/null
+++ b/lfs/lz4
@@ -0,0 +1,83 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2018 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.8.1.2
+
+THISAPP = lz4-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = lz4
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 343538e69ba752a386c669b1a28111e2
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lz4-1.8.1.2_mod_install_path.patch
+
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/squid b/lfs/squid
index 08583d0b9..3390f96d5 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -70,7 +70,9 @@ $(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 -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.27-fix-max-file-descriptors.patch
+ 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) && autoreconf -vfi
cd $(DIR_APP)/libltdl && autoreconf -vfi
diff --git a/make.sh b/make.sh
index 3f10ffaec..530186c2e 100755
--- a/make.sh
+++ b/make.sh
@@ -1282,6 +1282,7 @@ buildipfire() {
lfsmake2 wireless
lfsmake2 pakfire
lfsmake2 spandsp
+ lfsmake2 lz4
lfsmake2 lzo
lfsmake2 openvpn
lfsmake2 pammysql
diff --git a/src/patches/lz4-1.8.1.2_mod_install_path.patch b/src/patches/lz4-1.8.1.2_mod_install_path.patch
new file mode 100644
index 000000000..8b9646e1c
--- /dev/null
+++ b/src/patches/lz4-1.8.1.2_mod_install_path.patch
@@ -0,0 +1,36 @@
+diff -Nur lz4-1.8.1.2.orig/lib/Makefile lz4-1.8.1.2/lib/Makefile
+--- lz4-1.8.1.2.orig/lib/Makefile 2018-01-21 07:24:41.881357925 +0000
++++ lz4-1.8.1.2/lib/Makefile 2018-01-21 07:25:44.823444081 +0000
+@@ -120,7 +120,7 @@
+ # directory variables : GNU conventions prefer lowercase
+ # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html
+ # support both lower and uppercase (BSD), use uppercase in script
+-prefix ?= /usr/local
++prefix ?= /usr
+ PREFIX ?= $(prefix)
+ exec_prefix ?= $(PREFIX)
+ libdir ?= $(exec_prefix)/lib
+diff -Nur lz4-1.8.1.2.orig/NEWS lz4-1.8.1.2/NEWS
+--- lz4-1.8.1.2.orig/NEWS 2018-01-21 07:24:41.809360114 +0000
++++ lz4-1.8.1.2/NEWS 2018-01-21 07:26:00.838957106 +0000
+@@ -96,7 +96,7 @@
+ New : lz4 cli supports long commands (suggested by Takayuki Matsuoka)
+ New : lz4frame & lz4cli frame content size support
+ New : lz4frame supports skippable frames, as requested by Sergey Cherepanov
+-Changed: Default "make install" directory is /usr/local, as notified by Ron Johnson
++Changed: Default "make install" directory is /usr, as notified by Ron Johnson
+ New : lz4 cli supports "pass-through" mode, requested by Neil Wilson
+ New : datagen can generate sparse files
+ New : scan-build tests, thanks to kind help by Takayuki Matsuoka
+diff -Nur lz4-1.8.1.2.orig/programs/Makefile lz4-1.8.1.2/programs/Makefile
+--- lz4-1.8.1.2.orig/programs/Makefile 2018-01-21 07:24:41.881357925 +0000
++++ lz4-1.8.1.2/programs/Makefile 2018-01-21 07:26:24.562235766 +0000
+@@ -121,7 +121,7 @@
+ # directory variables : GNU conventions prefer lowercase
+ # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html
+ # support both lower and uppercase (BSD), use uppercase in script
+-prefix ?= /usr/local
++prefix ?= /usr
+ PREFIX ?= $(prefix)
+ exec_prefix ?= $(PREFIX)
+ bindir ?= $(exec_prefix)/bin
diff --git a/src/patches/squid/SQUID-2018_1.patch b/src/patches/squid/SQUID-2018_1.patch
new file mode 100644
index 000000000..9392219a9
--- /dev/null
+++ b/src/patches/squid/SQUID-2018_1.patch
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 000000000..9ecd8a5b7
--- /dev/null
+++ b/src/patches/squid/SQUID-2018_2.patch
@@ -0,0 +1,23 @@
+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-3.5.27-fix-max-file-descriptors.patch b/src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch
similarity index 100%
rename from src/patches/squid-3.5.27-fix-max-file-descriptors.patch
rename to src/patches/squid/squid-3.5.27-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-01-23 13:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-23 13:24 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. cad9257ae28d7c869f17ce0678820863db574589 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox