Development April 2016

development@lists.ipfire.org

12 participants
112 discussions

[PATCH] compat-cyrus-sasl: New package.
by Stefan Schantl 27 Apr '16

27 Apr '16

As a result of a *.so bump in the latest cyrus-sasl package and binaries wich are still linked against the old version we have to create a compatibility package to cover this bump. Fixes #10892. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- compat-cyrus-sasl/compat-cyrus-sasl.nm | 74 ++++++++++++++++++++++ .../patches/cyrus-sasl-2.1.23-db5.patch | 22 +++++++ 2 files changed, 96 insertions(+) create mode 100644 compat-cyrus-sasl/compat-cyrus-sasl.nm create mode 100644 compat-cyrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch diff --git a/compat-cyrus-sasl/compat-cyrus-sasl.nm b/compat-cyrus-sasl/compat-cyrus-sasl.nm new file mode 100644 index 0000000..38dd9d4 --- /dev/null +++ b/compat-cyrus-sasl/compat-cyrus-sasl.nm @@ -0,0 +1,74 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = compat-cyrus-sasl +version = 2.1.25 +release = 2.1 + +thisapp = cyrus-sasl-%{version} + +groups = System/Libraries +url = http://asg.web.cmu.edu/sasl/sasl-library.html +license = BSD +summary = The Cyrus SASL library. + +description + The cyrus-sasl package contains the Cyrus implementation of SASL. + SASL is the Simple Authentication and Security Layer, a method for + adding authentication support to connection-based protocols. +end + +source_dl = ftp://ftp.cyrusimap.org/cyrus-sasl/ + +build + requires + automake + libdb-devel + openssl-devel + pam-devel + end + + prepare_cmds + # for aarch64 + for i in $(find . -name config.guess -or -name config.sub); do + cp -vf %{datadir}/automake-*/config.{guess,sub} $(dirname ${i}) + done + end + + configure_options += \ + --sysconfdir=/etc \ + --with-configdir=%{libdir}/sasl2:/etc/sasl2 \ + --with-plugindir=%{libdir}/sasl2 \ + --with-dbpath=/var/lib/sasl/sasldb2 \ + --with-saslauthd=/var/run/saslauthd \ + --mandir=/usr/share/man + + PARALLELISMFLAGS = # Disabled + + install + # Only install libraries. + mkdir -pv %{BUILDROOT}%{libdir} + install -m 755 lib/.libs/libsasl2.so.2.0.25 %{BUILDROOT}%{libdir} + ln -svf libsasl2.so.2.0.25 %{BUILDROOT}%{libdir}/libpcre.so.2 + end +end + +packages + package %{name} + provides + cyrus-sasl = %{thisver} + cyrus-sasl-libs = %{thisver} + end + + conflicts + cyrus-sasl <= %{thisver} + cyrus-sasl-libs <= %{thisver} + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/compat-cyrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch b/compat-cyrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch new file mode 100644 index 0000000..ff831cd --- /dev/null +++ b/compat-cyrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch @@ -0,0 +1,22 @@ +--- a/sasldb/db_berkeley.c ++++ b/sasldb/db_berkeley.c +@@ -100,7 +100,7 @@ static int berkeleydb_open(const sasl_ut + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); +--- a/utils/dbconverter-2.c ++++ b/utils/dbconverter-2.c +@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); -- 2.5.5

1 0

[PATCH] Update: man-pages to 4.05
by Sascha Kilian 26 Apr '16

26 Apr '16

Signed-off-by: Sascha Kilian <sascha(a)sakisoft.de> --- lfs/man-pages | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/man-pages b/lfs/man-pages index 2ea81b3..8ad71ca 100644 --- a/lfs/man-pages +++ b/lfs/man-pages @@ -24,10 +24,10 @@ include Config -VER = 2.34 +VER = 4.05 THISAPP = man-pages-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fb8d9f55fef19ea5ab899437159c9420 +$(DL_FILE)_MD5 = 9c32c8487d753f5894f6fba425b12add install : $(TARGET) @@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) -- 1.7.9.5

2 1

[PATCH] Update: hostapd to 2.5
by Sascha Kilian 26 Apr '16

26 Apr '16

Signed-off-by: Sascha Kilian <sascha(a)sakisoft.de> --- lfs/hostapd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/hostapd b/lfs/hostapd index f393d91..5d932bb 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -24,7 +24,7 @@ include Config -VER = 2.4 +VER = 2.5 THISAPP = hostapd-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 04578f3f2c3eb1bec1adf30473813912 +$(DL_FILE)_MD5 = 69f9cec3f76d74f402864a43e4f8624f install : $(TARGET) -- 1.7.9.5

3 3

[PATCH] Fixes for #11098
by Jonatan Schlag 26 Apr '16

26 Apr '16

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- config/rootfiles/packages/nfs | 5 +++-- lfs/nfs | 8 ++++---- src/initscripts/init.d/nfs-server | 12 ++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs index 666512b..08fcca9 100644 --- a/config/rootfiles/packages/nfs +++ b/config/rootfiles/packages/nfs @@ -1,5 +1,6 @@ sbin/mount.nfs sbin/mount.nfs4 +sbin/nfsdcltrack sbin/osd_login sbin/umount.nfs sbin/umount.nfs4 @@ -22,7 +23,6 @@ usr/lib/libnfsidmap/umich_ldap.so #usr/lib/pkgconfig/libnfsidmap.pc usr/sbin/exportfs usr/sbin/mountstats -usr/sbin/nfsdcltrack usr/sbin/nfsiostat usr/sbin/nfsstat usr/sbin/rpc.idmapd @@ -37,6 +37,7 @@ usr/sbin/start-statd #usr/share/man/man5/exports.5 #usr/share/man/man5/idmapd.conf.5 #usr/share/man/man5/nfs.5 +#usr/share/man/man5/nfsmount.conf.5 #usr/share/man/man7/nfsd.7 #usr/share/man/man8/exportfs.8 #usr/share/man/man8/idmapd.8 @@ -61,7 +62,7 @@ usr/sbin/start-statd var/lib/nfs/etab var/lib/nfs/rmtab var/lib/nfs/sm -#var/lib/nfs/sm.bak +var/lib/nfs/sm.bak var/lib/nfs/state var/lib/nfs/xtab etc/rc.d/init.d/nfs-server diff --git a/lfs/nfs b/lfs/nfs index 417f155..b6cef7b 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -24,7 +24,7 @@ include Config -VER = 1.2.7 +VER = 1.3.3 THISAPP = nfs-utils-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nfs -PAK_VER = 6 +PAK_VER = 7 DEPS = "portmap" @@ -48,7 +48,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).tar.gz -$(DL_FILE)_MD5 = 3b5ca797197765dc0c3a4122720c7716 +$(DL_FILE)_MD5 = 9b87d890669eaaec8e97a2b0a35b2665 libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab install : $(TARGET) @@ -94,7 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-gss \ --disable-tirpc \ --disable-nfsv41 \ - --without-tcp-wrappers + --without-tcp-wrappers --disable-ipv6 cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install diff --git a/src/initscripts/init.d/nfs-server b/src/initscripts/init.d/nfs-server index 15284e8..73378d5 100644 --- a/src/initscripts/init.d/nfs-server +++ b/src/initscripts/init.d/nfs-server @@ -13,6 +13,10 @@ case "$1" in start) + boot_mesg "Mounting nfsd virtual filesystem..." + /bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null + evaluate_retval + boot_mesg "Starting NFS mountd..." loadproc /usr/sbin/rpc.mountd @@ -27,10 +31,6 @@ case "$1" in loadproc /usr/sbin/rpc.rquotad fi - boot_mesg "Mounting nfsd virtual filesystem..." - /bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null - evaluate_retval - # Make ceratin that the list is refreshed on # a restart. boot_mesg "Exporting NFS Filesystems..." @@ -43,8 +43,8 @@ case "$1" in killproc /usr/sbin/rpc.statd boot_mesg "Stopping NFS nfsd..." - # nfsd needs HUP.... - killproc nfsd HUP + /usr/sbin/rpc.nfsd 0 + evaluate_retval boot_mesg "Stopping NFS mountd..." killproc /usr/sbin/rpc.mountd -- 2.1.4

2 1

[PATCH] squid 3.4.14: latest patches, sorted options
by Matthias Fischer 26 Apr '16

26 Apr '16

The 'configure'-options were sorted (kind of) to get a better overview. Added latest patches from upstream. Changed '--enable-async-io=8' to '--enable-async-io=16' because of http://www.squid-cache.org/mail-archive/squid-users/200705/0768.html : "The default number of threads is dependent on the number of aufs cache_dir lines, based on a reasonable estimate of how the code behaves." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/squid | 28 ++-- src/patches/squid-3.4-13233.patch | 274 ++++++++++++++++++++++++++++++++++++++ src/patches/squid-3.4-13234.patch | 33 +++++ src/patches/squid-3.4-13235.patch | 97 ++++++++++++++ 4 files changed, 420 insertions(+), 12 deletions(-) create mode 100644 src/patches/squid-3.4-13233.patch create mode 100644 src/patches/squid-3.4-13234.patch create mode 100644 src/patches/squid-3.4-13235.patch diff --git a/lfs/squid b/lfs/squid index 7e41c16..6725a6e 100644 --- a/lfs/squid +++ b/lfs/squid @@ -75,6 +75,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13230.patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13231.patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13232.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13233.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13234.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13235.patch + cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi @@ -85,11 +89,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --mandir=/usr/share/man \ --libexecdir=/usr/lib/squid \ --localstatedir=/var \ - --disable-ipv6 \ --disable-ssl \ - --enable-poll \ --disable-icmp \ --disable-wccp \ + --disable-wccpv2 \ + --disable-kqueue \ + --disable-esi \ + --disable-arch-native \ + --disable-ipv6 \ + --enable-poll \ --enable-ident-lookups \ --enable-storeio="aufs,diskd,ufs" \ --enable-underscores \ @@ -107,26 +115,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-url-rewrite-helpers \ --enable-build-info \ --enable-eui \ - --with-pthreads \ - --with-dl \ - --with-filedescriptors=$$(( 16384 * 64 )) \ - --with-large-files \ - --with-aio \ - --enable-async-io=8 \ + --enable-async-io=16 \ --enable-unlinkd \ --enable-internal-dns \ --enable-epoll \ - --disable-kqueue \ --enable-select \ --enable-cache-digests \ --enable-forw-via-db \ --enable-htcp \ --enable-kill-parent-hack \ - --disable-wccpv2 \ --enable-icap-client \ - --disable-esi \ --enable-zph-qos \ - --disable-arch-native + --with-pthreads \ + --with-dl \ + --with-filedescriptors=$$(( 16384 * 64 )) \ + --with-large-files \ + --with-aio cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/patches/squid-3.4-13233.patch b/src/patches/squid-3.4-13233.patch new file mode 100644 index 0000000..d657838 --- /dev/null +++ b/src/patches/squid-3.4-13233.patch @@ -0,0 +1,274 @@ +------------------------------------------------------------ +revno: 13233 +revision-id: squid3(a)treenet.co.nz-20160420063907-hcnf4qmcg5hbjc11 +parent: squid3(a)treenet.co.nz-20160330141410-t6p2dhzr8ri36fap +committer: Amos Jeffries <squid3(a)treenet.co.nz> +branch nick: 3.4 +timestamp: Wed 2016-04-20 18:39:07 +1200 +message: + cachemgr.cgi: use dynamic MemBuf for internal content generation + + Using a fixed size buffer limits how big content lines can be. Modern + HTTP is fast reaching the point where such limits are problematic. + Also fixes incorrect uses of snprintf() by removing them. +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3(a)treenet.co.nz-20160420063907-hcnf4qmcg5hbjc11 +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 +# testament_sha1: 161e86814f6f14d74557a3fa169b37b6601c08a1 +# timestamp: 2016-04-20 06:50:57 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 +# base_revision_id: squid3(a)treenet.co.nz-20160330141410-\ +# t6p2dhzr8ri36fap +# +# Begin patch +=== modified file 'src/tests/stub_cbdata.cc' +--- src/tests/stub_cbdata.cc 2012-11-01 10:31:28 +0000 ++++ src/tests/stub_cbdata.cc 2016-04-20 06:39:07 +0000 +@@ -5,7 +5,13 @@ + #include "tests/STUB.h" + + void cbdataRegisterWithCacheManager(void) STUB +- ++void *cbdataInternalAlloc(cbdata_type type, const char *, int sz) { ++ return xcalloc(1, sz); ++} ++void *cbdataInternalFree(void *p, const char *, int) { ++ xfree(p); ++ return nullptr; ++} + #if USE_CBDATA_DEBUG + void *cbdataInternalAllocDbg(cbdata_type type, const char *, int) STUB_RETVAL(NULL) + void *cbdataInternalFreeDbg(void *p, const char *, int) STUB_RETVAL(NULL) + +=== modified file 'src/tests/stub_mem.cc' +--- src/tests/stub_mem.cc 2012-08-29 07:29:35 +0000 ++++ src/tests/stub_mem.cc 2016-04-20 06:39:07 +0000 +@@ -5,7 +5,7 @@ + #include "squid.h" + + #define STUB_API "stub_mem.cc" +-#include "STUB.h" ++#include "tests/STUB.h" + #include "Mem.h" + + void + +=== modified file 'tools/Makefile.am' +--- tools/Makefile.am 2014-04-06 04:37:08 +0000 ++++ tools/Makefile.am 2016-04-20 06:39:07 +0000 +@@ -35,15 +35,24 @@ + stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc + cp $(top_srcdir)/src/tests/stub_debug.cc . + ++MemBuf.cc: $(top_srcdir)/src/MemBuf.cc ++ cp $(top_srcdir)/src/MemBuf.cc $@ ++ + time.cc: $(top_srcdir)/src/time.cc + cp $(top_srcdir)/src/time.cc . + ++stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc ++ cp $(top_srcdir)/src/tests/stub_cbdata.cc $@ ++ ++stub_mem.cc: $(top_srcdir)/src/tests/stub_mem.cc ++ cp $(top_srcdir)/src/tests/stub_mem.cc $@ ++ + # stock tools for unit tests - library independent versions of dlink_list + # etc. + # globals.cc is needed by test_tools.cc. + # Neither of these should be disted from here. + TESTSOURCES= test_tools.cc +-CLEANFILES += test_tools.cc stub_debug.cc time.cc ++CLEANFILES += test_tools.cc MemBuf.cc stub_debug.cc time.cc stub_cbdata.cc stub_mem.cc + + ## ##### helper-mux ##### + +@@ -74,7 +83,10 @@ + libexec_PROGRAMS = cachemgr$(CGIEXT) + + cachemgr__CGIEXT__SOURCES = cachemgr.cc \ ++ MemBuf.cc \ ++ stub_cbdata.cc \ + stub_debug.cc \ ++ stub_mem.cc \ + test_tools.cc \ + time.cc + + +=== modified file 'tools/cachemgr.cc' +--- tools/cachemgr.cc 2015-01-09 10:32:57 +0000 ++++ tools/cachemgr.cc 2016-04-20 06:39:07 +0000 +@@ -35,6 +35,7 @@ + #include "getfullhostname.h" + #include "html_quote.h" + #include "ip/Address.h" ++#include "MemBuf.h" + #include "rfc1123.h" + #include "rfc1738.h" + #include "util.h" +@@ -460,8 +461,8 @@ + return url; + } + +-static const char * +-munge_menu_line(const char *buf, cachemgr_request * req) ++static void ++munge_menu_line(MemBuf &out, const char *buf, cachemgr_request * req) + { + char *x; + const char *a; +@@ -469,15 +470,14 @@ + const char *p; + char *a_url; + char *buf_copy; +- static char html[2 * 1024]; +- +- if (strlen(buf) < 1) +- return buf; +- +- if (*buf != ' ') +- return buf; +- +- buf_copy = x = xstrdup(buf); ++ ++ const char bufLen = strlen(buf); ++ if (bufLen < 1 || *buf != ' ') { ++ out.append(buf, bufLen); ++ return; ++ } ++ ++ buf_copy = x = xstrndup(buf, bufLen); + + a = xstrtok(&x, '\t'); + +@@ -489,59 +489,56 @@ + + /* no reason to give a url for a disabled action */ + if (!strcmp(p, "disabled")) +- snprintf(html, sizeof(html), "<LI type=\"circle\">%s (disabled)<A HREF=\"%s\">.</A>\n", d, a_url); ++ out.Printf("<LI type=\"circle\">%s (disabled)<A HREF=\"%s\">.</A>\n", d, a_url); + else + /* disable a hidden action (requires a password, but password is not in squid.conf) */ + if (!strcmp(p, "hidden")) +- snprintf(html, sizeof(html), "<LI type=\"circle\">%s (hidden)<A HREF=\"%s\">.</A>\n", d, a_url); ++ out.Printf("<LI type=\"circle\">%s (hidden)<A HREF=\"%s\">.</A>\n", d, a_url); + else + /* disable link if authentication is required and we have no password */ + if (!strcmp(p, "protected") && !req->passwd) +- snprintf(html, sizeof(html), "<LI type=\"circle\">%s (requires <a href=\"%s\">authentication</a>)<A HREF=\"%s\">.</A>\n", +- d, menu_url(req, "authenticate"), a_url); ++ out.Printf("<LI type=\"circle\">%s (requires <a href=\"%s\">authentication</a>)<A HREF=\"%s\">.</A>\n", ++ d, menu_url(req, "authenticate"), a_url); + else + /* highlight protected but probably available entries */ + if (!strcmp(p, "protected")) +- snprintf(html, sizeof(html), "<LI type=\"square\"><A HREF=\"%s\"><font color=\"#FF0000\">%s</font></A>\n", +- a_url, d); ++ out.Printf("<LI type=\"square\"><A HREF=\"%s\"><font color=\"#FF0000\">%s</font></A>\n", ++ a_url, d); + + /* public entry or unknown type of protection */ + else +- snprintf(html, sizeof(html), "<LI type=\"disk\"><A HREF=\"%s\">%s</A>\n", a_url, d); ++ out.Printf("<LI type=\"disk\"><A HREF=\"%s\">%s</A>\n", a_url, d); + + xfree(a_url); + + xfree(buf_copy); +- +- return html; + } + +-static const char * +-munge_other_line(const char *buf, cachemgr_request * req) ++static void ++munge_other_line(MemBuf &out, const char *buf, cachemgr_request *) + { + static const char *ttags[] = {"td", "th"}; + +- static char html[4096]; + static int table_line_num = 0; + static int next_is_header = 0; + int is_header = 0; + const char *ttag; + char *buf_copy; + char *x, *p; +- int l = 0; + /* does it look like a table? */ + + if (!strchr(buf, '\t') || *buf == '\t') { + /* nope, just text */ +- snprintf(html, sizeof(html), "%s%s", +- table_line_num ? "</table>\n<pre>" : "", html_quote(buf)); ++ if (table_line_num) ++ out.append("</table>\n<pre>", 14); ++ out.Printf("%s", html_quote(buf)); + table_line_num = 0; +- return html; ++ return; + } + + /* start html table */ + if (!table_line_num) { +- l += snprintf(html + l, sizeof(html) - l, "</pre><table cellpadding=\"2\" cellspacing=\"1\">\n"); ++ out.append("</pre><table cellpadding=\"2\" cellspacing=\"1\">\n", 46); + next_is_header = 0; + } + +@@ -551,7 +548,7 @@ + ttag = ttags[is_header]; + + /* record starts */ +- l += snprintf(html + l, sizeof(html) - l, "<tr>"); ++ out.append("<tr>", 4); + + /* substitute '\t' */ + buf_copy = x = xstrdup(buf); +@@ -568,18 +565,17 @@ + ++x; + } + +- l += snprintf(html + l, sizeof(html) - l, "<%s colspan=\"%d\" align=\"%s\">%s</%s>", +- ttag, column_span, +- is_header ? "center" : is_number(cell) ? "right" : "left", +- html_quote(cell), ttag); ++ out.Printf("<%s colspan=\"%d\" align=\"%s\">%s</%s>", ++ ttag, column_span, ++ is_header ? "center" : is_number(cell) ? "right" : "left", ++ html_quote(cell), ttag); + } + + xfree(buf_copy); + /* record ends */ +- snprintf(html + l, sizeof(html) - l, "</tr>\n"); ++ out.append("</tr>\n", 6); + next_is_header = is_header && strstr(buf, "\t\t"); + ++table_line_num; +- return html; + } + + static const char * +@@ -736,14 +732,18 @@ + /* yes, fall through, we do not want to loose the first line */ + + case isBody: ++ { + /* interpret [and reformat] cache response */ +- ++ MemBuf out; ++ out.init(); + if (parse_menu) +- fputs(munge_menu_line(buf, req), stdout); ++ munge_menu_line(out, buf, req); + else +- fputs(munge_other_line(buf, req), stdout); ++ munge_other_line(out, buf, req); + +- break; ++ fputs(out.buf, stdout); ++ } ++ break; + + case isForward: + /* forward: no modifications allowed */ + diff --git a/src/patches/squid-3.4-13234.patch b/src/patches/squid-3.4-13234.patch new file mode 100644 index 0000000..6f701fa --- /dev/null +++ b/src/patches/squid-3.4-13234.patch @@ -0,0 +1,33 @@ +------------------------------------------------------------ +revno: 13234 +revision-id: squid3(a)treenet.co.nz-20160420101437-36eofkldxfku61kj +parent: squid3(a)treenet.co.nz-20160420063907-hcnf4qmcg5hbjc11 +committer: Amos Jeffries <squid3(a)treenet.co.nz> +branch nick: 3.4 +timestamp: Wed 2016-04-20 22:14:37 +1200 +message: + nullptr is a C++11 feature +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3(a)treenet.co.nz-20160420101437-36eofkldxfku61kj +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 +# testament_sha1: 0f9f2a5b29a7ef02befe2a4e2e6357ef4bcffbce +# timestamp: 2016-04-20 10:51:03 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 +# base_revision_id: squid3(a)treenet.co.nz-20160420063907-\ +# hcnf4qmcg5hbjc11 +# +# Begin patch +=== modified file 'src/tests/stub_cbdata.cc' +--- src/tests/stub_cbdata.cc 2016-04-20 06:39:07 +0000 ++++ src/tests/stub_cbdata.cc 2016-04-20 10:14:37 +0000 +@@ -10,7 +10,7 @@ + } + void *cbdataInternalFree(void *p, const char *, int) { + xfree(p); +- return nullptr; ++ return NULL; + } + #if USE_CBDATA_DEBUG + void *cbdataInternalAllocDbg(cbdata_type type, const char *, int) STUB_RETVAL(NULL) + diff --git a/src/patches/squid-3.4-13235.patch b/src/patches/squid-3.4-13235.patch new file mode 100644 index 0000000..e380225 --- /dev/null +++ b/src/patches/squid-3.4-13235.patch @@ -0,0 +1,97 @@ +------------------------------------------------------------ +revno: 13235 +revision-id: squid3(a)treenet.co.nz-20160420111514-4hpxglbn9k15l5sa +parent: squid3(a)treenet.co.nz-20160420101437-36eofkldxfku61kj +committer: Amos Jeffries <squid3(a)treenet.co.nz> +branch nick: 3.4 +timestamp: Wed 2016-04-20 23:15:14 +1200 +message: + Fix several ESI element construction issues + + * Do not wrap active logic in assert(). + + * Fix localbuf array bounds checking. + + * Add Must() conditions to verify array writes will succeed +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3(a)treenet.co.nz-20160420111514-4hpxglbn9k15l5sa +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 +# testament_sha1: e95687b13c98667ab09966e7f94d511ca3e6ad96 +# timestamp: 2016-04-20 11:18:22 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 +# base_revision_id: squid3(a)treenet.co.nz-20160420101437-\ +# 36eofkldxfku61kj +# +# Begin patch +=== modified file 'src/esi/Esi.cc' +--- src/esi/Esi.cc 2013-06-27 15:58:46 +0000 ++++ src/esi/Esi.cc 2016-04-20 11:15:14 +0000 +@@ -991,7 +991,7 @@ + ESIElement::Pointer element; + int specifiedattcount = attrCount * 2; + char *position; +- assert (ellen < sizeof (localbuf)); /* prevent unexpected overruns. */ ++ Must(ellen < sizeof(localbuf)); /* prevent unexpected overruns. */ + + debugs(86, 5, "ESIContext::Start: element '" << el << "' with " << specifiedattcount << " tags"); + +@@ -1005,15 +1005,17 @@ + /* Spit out elements we aren't interested in */ + localbuf[0] = '<'; + localbuf[1] = '\0'; +- assert (xstrncpy (&localbuf[1], el, sizeof(localbuf) - 2)); ++ xstrncpy(&localbuf[1], el, sizeof(localbuf) - 2); + position = localbuf + strlen (localbuf); + + for (i = 0; i < specifiedattcount && attr[i]; i += 2) { ++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 1); + *position = ' '; + ++position; + /* TODO: handle thisNode gracefully */ +- assert (xstrncpy (position, attr[i], sizeof(localbuf) + (position - localbuf))); ++ xstrncpy(position, attr[i], sizeof(localbuf) - (position - localbuf)); + position += strlen (position); ++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 2); + *position = '='; + ++position; + *position = '\"'; +@@ -1022,18 +1024,21 @@ + char ch; + while ((ch = *chPtr++) != '\0') { + if (ch == '\"') { +- assert( xstrncpy(position, """, sizeof(localbuf) + (position-localbuf)) ); ++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 6); ++ xstrncpy(position, """, sizeof(localbuf) - (position-localbuf)); + position += 6; + } else { ++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 1); + *position = ch; + ++position; + } + } +- position += strlen (position); ++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 1); + *position = '\"'; + ++position; + } + ++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 2); + *position = '>'; + ++position; + *position = '\0'; +@@ -1119,11 +1124,11 @@ + switch (ESIElement::IdentifyElement (el)) { + + case ESIElement::ESI_ELEMENT_NONE: +- assert (ellen < sizeof (localbuf)); /* prevent unexpected overruns. */ ++ Must(ellen < sizeof(localbuf) - 3); /* prevent unexpected overruns. */ + /* Add elements we aren't interested in */ + localbuf[0] = '<'; + localbuf[1] = '/'; +- assert (xstrncpy (&localbuf[2], el, sizeof(localbuf) - 3)); ++ xstrncpy(&localbuf[2], el, sizeof(localbuf) - 3); + position = localbuf + strlen (localbuf); + *position = '>'; + ++position; + -- 2.8.1

2 1

[PATCH 1/9] perl-Coro: Update to 6.49
by Stefan Schantl 26 Apr '16

26 Apr '16

* Update to the latest available version of perl-Coro. * Add missing build and runtime dependencies. Fixes #10877. Signel-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- perl-Coro/perl-Coro.nm | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/perl-Coro/perl-Coro.nm b/perl-Coro/perl-Coro.nm index 5f25160..04ca803 100644 --- a/perl-Coro/perl-Coro.nm +++ b/perl-Coro/perl-Coro.nm @@ -4,8 +4,8 @@ ############################################################################### name = perl-Coro -version = 6.42 -release = 1.1 +version = 6.49 +release = 1 thisapp = Coro-%{version} groups = Development/Libraries @@ -24,8 +24,34 @@ source_dl = http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/ build requires - perl(ExtUtils::MakeMaker) - perl(ExtUtils::ParseXS) + coreutils + findutils + perl(AnyEvent) >= 7 + perl(AnyEvent::AIO) >= 1 + perl(AnyEvent::BDB) >= 1 + perl(AnyEvent::Socket) + perl(AnyEvent::Util) + perl(Canary::Stability) + perl(Carp) + perl(Config) + perl(Errno) + perl(Exporter) + perl(EV) >= 4 + perl(EV::MakeMaker) + perl(Event) >= 1.08 + perl(Event::MakeMaker) + perl(ExtUtils::MakeMaker) >= 6.52 + perl(Guard) >= 0.5 + perl(IO::Socket::INET) + perl(Scalar::Util) + perl(Socket) + perl(Storable) >= 2.15 + perl(XSLoader) + perl(base) + perl(common::sense) + perl(overload) + perl(strict) + perl(warnings) pakfire >= 0.9.26-3.1 end @@ -41,6 +67,10 @@ build make %{PARALLELISMFLAGS} end + test + make test + end + make_install_targets = \ pure_install DESTDIR=%{BUILDROOT} end @@ -58,6 +88,14 @@ packages requires perl(:MODULE_COMPAT_%{perl_version}) + perl(AnyEvent) >= 7 + perl(AnyEvent::AIO) >= 1 + perl(AnyEvent::BDB) >= 1 + perl(EV) >= 4 + perl(Event) >= 1.08 + perl(Guard) >= 0.5 + perl(Storable) >= 2.15 + perl(warnings) end end -- 2.4.11

2 10

[PATCH] sdparm: Update to 1.10
by Matthias Fischer 23 Apr '16

23 Apr '16

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/sdparm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/sdparm b/lfs/sdparm index daa94ff..cd7bbc0 100644 --- a/lfs/sdparm +++ b/lfs/sdparm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2016 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.07 +VER = 1.10 THISAPP = sdparm-$(VER) DL_FILE = $(THISAPP).tgz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c807f9db3dd7af175214be0d7fece494 +$(DL_FILE)_MD5 = bdae64375376ce8fe4bf9521c1db858f install : $(TARGET) -- 2.8.1

1 0

[PATCH] Update: curl to 7.48.0
by Sascha Kilian 22 Apr '16

22 Apr '16

Signed-off-by: Sascha Kilian <sascha(a)sakisoft.de> --- config/rootfiles/common/curl | 2 +- lfs/curl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl index 0fd2819..d929ace 100644 --- a/config/rootfiles/common/curl +++ b/config/rootfiles/common/curl @@ -15,7 +15,7 @@ usr/bin/curl usr/lib/libcurl.so usr/lib/libcurl.so.3 usr/lib/libcurl.so.4 -usr/lib/libcurl.so.4.3.0 +usr/lib/libcurl.so.4.4.0 #usr/lib/pkgconfig/libcurl.pc #usr/share/aclocal/libcurl.m4 #usr/share/man/man1/curl-config.1 diff --git a/lfs/curl b/lfs/curl index 29de280..2fcfa7e 100644 --- a/lfs/curl +++ b/lfs/curl @@ -24,10 +24,10 @@ include Config -VER = 7.43.0 +VER = 7.48.0 THISAPP = curl-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3037f0b6ce03d434618e9db5506ae6be +$(DL_FILE)_MD5 = d42e0fc34a5cace5739631cc040974fe install : $(TARGET) -- 1.7.9.5

1 0

[PATCH] squid 3.5.17: updated and deleted obsolete patches
by Matthias Fischer 22 Apr '16

22 Apr '16

Updated filedescriptor patch Deleted obsolete patches for 3.4.14 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/squid | 2 + src/patches/squid-3.4-13228.patch | 35 --------------- src/patches/squid-3.4-13230.patch | 44 ------------------- src/patches/squid-3.4-13231.patch | 48 -------------------- src/patches/squid-3.4-13232.patch | 51 ---------------------- .../squid-3.4.14-fix-max-file-descriptors.patch | 21 --------- .../squid-3.5.17-fix-max-file-descriptors.patch | 21 +++++++++ 7 files changed, 23 insertions(+), 199 deletions(-) delete mode 100644 src/patches/squid-3.4-13228.patch delete mode 100644 src/patches/squid-3.4-13230.patch delete mode 100644 src/patches/squid-3.4-13231.patch delete mode 100644 src/patches/squid-3.4-13232.patch delete mode 100644 src/patches/squid-3.4.14-fix-max-file-descriptors.patch create mode 100644 src/patches/squid-3.5.17-fix-max-file-descriptors.patch diff --git a/lfs/squid b/lfs/squid index 0edebb2..156d4d9 100644 --- a/lfs/squid +++ b/lfs/squid @@ -71,6 +71,8 @@ $(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.17-fix-max-file-descriptors.patch + cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/src/patches/squid-3.4-13228.patch b/src/patches/squid-3.4-13228.patch deleted file mode 100644 index 7f7d16f..0000000 --- a/src/patches/squid-3.4-13228.patch +++ /dev/null @@ -1,35 +0,0 @@ ------------------------------------------------------------- -revno: 13228 -revision-id: squid3(a)treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg -parent: squid3(a)treenet.co.nz-20150801072237-5tzh2dczozz1e8sq -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3696 -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.4 -timestamp: Fri 2015-08-28 06:23:34 -0700 -message: - Bug 3696: crash when client delay pools are activated ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# testament_sha1: d193928c4656282187f2a31bf66d43fd4c247177 -# timestamp: 2015-08-28 13:33:44 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# base_revision_id: squid3(a)treenet.co.nz-20150801072237-\ -# 5tzh2dczozz1e8sq -# -# Begin patch -=== modified file 'src/client_side.cc' ---- src/client_side.cc 2014-06-21 04:24:37 +0000 -+++ src/client_side.cc 2015-08-28 13:23:34 +0000 -@@ -3447,7 +3447,8 @@ - - /* pools require explicit 'allow' to assign a client into them */ - if (pools[pool].access) { -- ch.accessList = pools[pool].access; -+ cbdataReferenceDone(ch.accessList); -+ ch.accessList = cbdataReference(pools[pool].access); - allow_t answer = ch.fastCheck(); - if (answer == ACCESS_ALLOWED) { - - diff --git a/src/patches/squid-3.4-13230.patch b/src/patches/squid-3.4-13230.patch deleted file mode 100644 index 597d135..0000000 --- a/src/patches/squid-3.4-13230.patch +++ /dev/null @@ -1,44 +0,0 @@ ------------------------------------------------------------- -revno: 13230 -revision-id: squid3(a)treenet.co.nz-20160212045316-zwx4r9we4gf27rx3 -parent: squid3(a)treenet.co.nz-20151119051038-vwclso11p68sgvxc -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4431 -author: Marcos Mello <marcosfrm(a)gmail.com> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.4 -timestamp: Fri 2016-02-12 17:53:16 +1300 -message: - Bug 4431: C code is not compiled with CFLAGS ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160212045316-zwx4r9we4gf27rx3 -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# testament_sha1: 53c8d70db04dad826815fb86995cda7e99f1d8e2 -# timestamp: 2016-02-12 05:50:53 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# base_revision_id: squid3(a)treenet.co.nz-20151119051038-\ -# vwclso11p68sgvxc -# -# Begin patch -=== modified file 'acinclude/compiler-flags.m4' ---- acinclude/compiler-flags.m4 2015-01-09 10:30:44 +0000 -+++ acinclude/compiler-flags.m4 2016-02-12 04:53:16 +0000 -@@ -36,7 +36,7 @@ - AC_CACHE_CHECK([whether compiler accepts $2],[$1], - [{ - AC_REQUIRE([AC_PROG_CC]) -- SAVED_FLAGS="$CFLAGS" -+ SAVED_CFLAGS="$CFLAGS" - SAVED_CXXFLAGS="$CXXFLAGS" - CFLAGS="$CFLAGS $2" - CXXFLAGS="$CXXFLAGS $2" -@@ -60,7 +60,7 @@ - AC_CACHE_CHECK([whether compiler requires $2],[$1], - [{ - AC_REQUIRE([AC_PROG_CC]) -- SAVED_FLAGS="$CFLAGS" -+ SAVED_CFLAGS="$CFLAGS" - SAVED_CXXFLAGS="$CXXFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM($3,$4)],[$1=no],[],[$1=no]) - if test "x$1" != "xno" ; then - diff --git a/src/patches/squid-3.4-13231.patch b/src/patches/squid-3.4-13231.patch deleted file mode 100644 index 045ad70..0000000 --- a/src/patches/squid-3.4-13231.patch +++ /dev/null @@ -1,48 +0,0 @@ ------------------------------------------------------------- -revno: 13231 -revision-id: squid3(a)treenet.co.nz-20160220150859-3unryicod1rcx9rm -parent: squid3(a)treenet.co.nz-20160212045316-zwx4r9we4gf27rx3 -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4323 -author: Francesco Chemolli <kinkie(a)squid-cache.org> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.4 -timestamp: Sun 2016-02-21 04:08:59 +1300 -message: - Bug 4323: Netfilter broken cross-includes with Linux 4.2 ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160220150859-3unryicod1rcx9rm -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# testament_sha1: 10fa174d2821207d0bf89ef3013e8f4c3f99f9e3 -# timestamp: 2016-02-20 15:50:56 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# base_revision_id: squid3(a)treenet.co.nz-20160212045316-\ -# zwx4r9we4gf27rx3 -# -# Begin patch -=== modified file 'compat/os/linux.h' ---- compat/os/linux.h 2012-08-28 13:00:30 +0000 -+++ compat/os/linux.h 2016-02-20 15:08:59 +0000 -@@ -22,6 +22,21 @@ - #endif - - /* -+ * Netfilter header madness. (see Bug 4323) -+ * -+ * Netfilter have a history of defining their own versions of network protocol -+ * primitives without sufficient protection against the POSIX defines which are -+ * aways present in Linux. -+ * -+ * netinet/in.h must be included before any other sys header in order to properly -+ * activate include guards in <linux/libc-compat.h> the kernel maintainers added -+ * to workaround it. -+ */ -+#if HAVE_NETINET_IN_H -+#include <netinet/in.h> -+#endif -+ -+/* - * sys/capability.h is only needed in Linux apparently. - * - * HACK: LIBCAP_BROKEN Ugly glue to get around linux header madness colliding with glibc - diff --git a/src/patches/squid-3.4-13232.patch b/src/patches/squid-3.4-13232.patch deleted file mode 100644 index 442c34b..0000000 --- a/src/patches/squid-3.4-13232.patch +++ /dev/null @@ -1,51 +0,0 @@ ------------------------------------------------------------- -revno: 13232 -revision-id: squid3(a)treenet.co.nz-20160330141410-t6p2dhzr8ri36fap -parent: squid3(a)treenet.co.nz-20160220150859-3unryicod1rcx9rm -author: Yuriy M. Kaminskiy <yumkam(a)gmail.com> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.4 -timestamp: Thu 2016-03-31 03:14:10 +1300 -message: - pinger: Fix buffer overflow in Icmp6::Recv ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160330141410-t6p2dhzr8ri36fap -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# testament_sha1: e404755509c03ec58c0c293552a7f2a579810fd3 -# timestamp: 2016-03-30 14:51:02 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# base_revision_id: squid3(a)treenet.co.nz-20160220150859-\ -# 3unryicod1rcx9rm -# -# Begin patch -=== modified file 'src/icmp/Icmp6.cc' ---- src/icmp/Icmp6.cc 2014-09-15 05:06:14 +0000 -+++ src/icmp/Icmp6.cc 2016-03-30 14:14:10 +0000 -@@ -277,7 +277,7 @@ - #define ip6_hops // HOPS!!! (can it be true??) - - ip = (struct ip6_hdr *) pkt; -- pkt += sizeof(ip6_hdr); -+ NP: echo size needs to +sizeof(ip6_hdr); - - debugs(42, DBG_CRITICAL, HERE << "ip6_nxt=" << ip->ip6_nxt << - ", ip6_plen=" << ip->ip6_plen << -@@ -288,7 +288,6 @@ - */ - - icmp6header = (struct icmp6_hdr *) pkt; -- pkt += sizeof(icmp6_hdr); - - if (icmp6header->icmp6_type != ICMP6_ECHO_REPLY) { - -@@ -313,7 +312,7 @@ - return; - } - -- echo = (icmpEchoData *) pkt; -+ echo = (icmpEchoData *) (pkt + sizeof(icmp6_hdr)); - - preply.opcode = echo->opcode; - - diff --git a/src/patches/squid-3.4.14-fix-max-file-descriptors.patch b/src/patches/squid-3.4.14-fix-max-file-descriptors.patch deleted file mode 100644 index 54275b8..0000000 --- a/src/patches/squid-3.4.14-fix-max-file-descriptors.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- configure.ac~ 2016-01-23 01:27:44.078013879 +0000 -+++ configure.ac 2016-01-23 01:28:19.422179243 +0000 -@@ -2573,6 +2573,9 @@ - ;; - esac - -+SQUID_CHECK_DEFAULT_FD_SETSIZE -+SQUID_CHECK_MAXFD -+ - dnl --with-maxfd present for compatibility with Squid-2. - dnl undocumented in ./configure --help to encourage using the Squid-3 directive - AC_ARG_WITH(maxfd,, -@@ -2603,8 +2606,6 @@ - esac - ]) - --SQUID_CHECK_DEFAULT_FD_SETSIZE --SQUID_CHECK_MAXFD - if test "x$squid_filedescriptors_num" != "x"; then - AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num]) - fi diff --git a/src/patches/squid-3.5.17-fix-max-file-descriptors.patch b/src/patches/squid-3.5.17-fix-max-file-descriptors.patch new file mode 100644 index 0000000..b0efa76 --- /dev/null +++ b/src/patches/squid-3.5.17-fix-max-file-descriptors.patch @@ -0,0 +1,21 @@ +--- configure.ac.~ Wed Apr 20 14:26:07 2016 ++++ configure.ac Fri Apr 22 17:20:46 2016 +@@ -3131,6 +3131,9 @@ + ;; + esac + ++SQUID_CHECK_DEFAULT_FD_SETSIZE ++SQUID_CHECK_MAXFD ++ + dnl --with-maxfd present for compatibility with Squid-2. + dnl undocumented in ./configure --help to encourage using the Squid-3 directive + AC_ARG_WITH(maxfd,, +@@ -3161,8 +3164,6 @@ + esac + ]) + +-SQUID_CHECK_DEFAULT_FD_SETSIZE +-SQUID_CHECK_MAXFD + if test "x$squid_filedescriptors_num" != "x"; then + AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num]) + fi -- 2.8.1

1 0

[PATCH] squid: Update to 3.5.17
by Matthias Fischer 22 Apr '16

22 Apr '16

'squid 3.4.14' is rather old and the time could be right to test the current version '3.5.17'. And perhaps this could fix a few problems, reported on the IPFire-Forum. For the records: Building was smooth - test installation is running - 'ipv6' is DISABLED here. Please note: using a similar 'lfs' as in 3.4.14', you get a startup warning in 'cache.log': ***SNIP*** squid BCP 177 violation. IPv6 transport forced OFF by build parameters. ***SNAP*** This warning is triggered if 'squid' was built with configure-option "--disable-ipv6". Details (regarding the initial 3.5.7) see: http://squid-web-proxy-cache.1019090.n4.nabble.com/squid-announce-Squid-3-5… http://blog.gmane.org/gmane.comp.web.squid.general/page=17 http://www.rfc-editor.org/info/rfc6540 ***SNIP*** * IPv6: improve BCP 177 compliance Since early 2012 it has been mandatory for new or upgraded Internet connected machinery and software to support IPv6 ad use it in preference over IPv4. Squid IPv6 behaviour has followed these practices since well before the guidelines became a BCP. Over the years it has also grown into a well-tested and widely used feature. The --disable-ipv6 build option is now deprecated. It is long past time to fix whatever network brokenness you may have that made it look attractive in past years. Squid-3.5.7 and later will perform IPv6 availability tests on startup in all builds. - Where IPv6 is unavailable Squid will continue exactly as it would have had the build option not been used. These Squid can have the build option removed now. - Where IPv6 is detected but --disable-ipv6 prevents use Squid will log "WARNING: BCP 177 violation". Please test whether you can rebuild with IPv6 enabled. ***SNAP*** But: enabling 'ipv6' resulted in errors ('cache.log'): ... 2016/04/22 01:58:54 kid1| DiskThreadsDiskFile::openDone: (2) No such file or directory 2016/04/22 01:58:54 kid1| /var/log/cache/00/00/0000005F ... I tracked this down to corresponding "TCP_SWAPFAIL_MISS/200"-messages in 'access.log', still investigating. Testers are welcome, please take a look at: http://people.ipfire.org/~mfischer/squid/3.5.17/ (two versions!). If anyone wants to know the complete changelog since '3.4.14' - take a look at: https://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/squid/squid-3.5… Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/squid | 238 ++++++++++++++++++++++++++---------------- lfs/squid | 35 +++---- 2 files changed, 162 insertions(+), 111 deletions(-) diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index c8227e3..4e8259a 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -6,8 +6,6 @@ etc/squid/errorpage.css etc/squid/errors etc/squid/mime.conf #etc/squid/mime.conf.default -etc/squid/msntauth.conf -#etc/squid/msntauth.conf.default etc/squid/squid.conf #etc/squid/squid.conf.default #etc/squid/squid.conf.documented @@ -22,7 +20,6 @@ usr/lib/squid/basic_db_auth usr/lib/squid/basic_fake_auth usr/lib/squid/basic_getpwnam_auth usr/lib/squid/basic_ldap_auth -usr/lib/squid/basic_msnt_auth usr/lib/squid/basic_msnt_multi_domain_auth usr/lib/squid/basic_ncsa_auth usr/lib/squid/basic_nis_auth @@ -32,8 +29,9 @@ usr/lib/squid/basic_radius_auth usr/lib/squid/basic_sasl_auth usr/lib/squid/basic_smb_auth usr/lib/squid/basic_smb_auth.sh +usr/lib/squid/basic_smb_lm_auth #usr/lib/squid/cachemgr.cgi -usr/lib/squid/cert_tool +usr/lib/squid/digest_edirectory_auth usr/lib/squid/digest_file_auth usr/lib/squid/digest_ldap_auth usr/lib/squid/diskd @@ -529,6 +527,7 @@ usr/lib/squid/errors/en/error-details.txt #usr/lib/squid/errors/es-pr #usr/lib/squid/errors/es-py #usr/lib/squid/errors/es-sv +#usr/lib/squid/errors/es-us #usr/lib/squid/errors/es-uy #usr/lib/squid/errors/es-ve usr/lib/squid/errors/es/ERR_ACCESS_DENIED @@ -1021,6 +1020,50 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/ja/ERR_WRITE_ERROR #usr/lib/squid/errors/ja/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ja/error-details.txt +#usr/lib/squid/errors/ka +#usr/lib/squid/errors/ka/ERR_ACCESS_DENIED +#usr/lib/squid/errors/ka/ERR_ACL_TIME_QUOTA_EXCEEDED +#usr/lib/squid/errors/ka/ERR_AGENT_CONFIGURE +#usr/lib/squid/errors/ka/ERR_AGENT_WPAD +#usr/lib/squid/errors/ka/ERR_CACHE_ACCESS_DENIED +#usr/lib/squid/errors/ka/ERR_CACHE_MGR_ACCESS_DENIED +#usr/lib/squid/errors/ka/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/ka/ERR_CONFLICT_HOST +#usr/lib/squid/errors/ka/ERR_CONNECT_FAIL +#usr/lib/squid/errors/ka/ERR_DIR_LISTING +#usr/lib/squid/errors/ka/ERR_DNS_FAIL +#usr/lib/squid/errors/ka/ERR_ESI +#usr/lib/squid/errors/ka/ERR_FORWARDING_DENIED +#usr/lib/squid/errors/ka/ERR_FTP_DISABLED +#usr/lib/squid/errors/ka/ERR_FTP_FAILURE +#usr/lib/squid/errors/ka/ERR_FTP_FORBIDDEN +#usr/lib/squid/errors/ka/ERR_FTP_NOT_FOUND +#usr/lib/squid/errors/ka/ERR_FTP_PUT_CREATED +#usr/lib/squid/errors/ka/ERR_FTP_PUT_ERROR +#usr/lib/squid/errors/ka/ERR_FTP_PUT_MODIFIED +#usr/lib/squid/errors/ka/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/ka/ERR_GATEWAY_FAILURE +#usr/lib/squid/errors/ka/ERR_ICAP_FAILURE +#usr/lib/squid/errors/ka/ERR_INVALID_REQ +#usr/lib/squid/errors/ka/ERR_INVALID_RESP +#usr/lib/squid/errors/ka/ERR_INVALID_URL +#usr/lib/squid/errors/ka/ERR_LIFETIME_EXP +#usr/lib/squid/errors/ka/ERR_NO_RELAY +#usr/lib/squid/errors/ka/ERR_ONLY_IF_CACHED_MISS +#usr/lib/squid/errors/ka/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/ka/ERR_READ_ERROR +#usr/lib/squid/errors/ka/ERR_READ_TIMEOUT +#usr/lib/squid/errors/ka/ERR_SECURE_CONNECT_FAIL +#usr/lib/squid/errors/ka/ERR_SHUTTING_DOWN +#usr/lib/squid/errors/ka/ERR_SOCKET_FAILURE +#usr/lib/squid/errors/ka/ERR_TOO_BIG +#usr/lib/squid/errors/ka/ERR_UNSUP_HTTPVERSION +#usr/lib/squid/errors/ka/ERR_UNSUP_REQ +#usr/lib/squid/errors/ka/ERR_URN_RESOLVE +#usr/lib/squid/errors/ka/ERR_WRITE_ERROR +#usr/lib/squid/errors/ka/ERR_ZERO_SIZE_OBJECT +#usr/lib/squid/errors/ka/error-details.txt +#usr/lib/squid/errors/ka-ge #usr/lib/squid/errors/ko #usr/lib/squid/errors/ko-kp #usr/lib/squid/errors/ko-kr @@ -1596,6 +1639,9 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/sl/error-details.txt #usr/lib/squid/errors/sr #usr/lib/squid/errors/sr-cyrl +#usr/lib/squid/errors/sr-cyrl-cs +#usr/lib/squid/errors/sr-cyrl-me +#usr/lib/squid/errors/sr-cyrl-rs #usr/lib/squid/errors/sr-cyrl/ERR_ACCESS_DENIED #usr/lib/squid/errors/sr-cyrl/ERR_ACL_TIME_QUOTA_EXCEEDED #usr/lib/squid/errors/sr-cyrl/ERR_AGENT_CONFIGURE @@ -1640,6 +1686,8 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/sr-cyrl/error-details.txt #usr/lib/squid/errors/sr-latn #usr/lib/squid/errors/sr-latn-cs +#usr/lib/squid/errors/sr-latn-me +#usr/lib/squid/errors/sr-latn-rs #usr/lib/squid/errors/sr-latn/ERR_ACCESS_DENIED #usr/lib/squid/errors/sr-latn/ERR_ACL_TIME_QUOTA_EXCEEDED #usr/lib/squid/errors/sr-latn/ERR_AGENT_CONFIGURE @@ -1682,6 +1730,7 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/sr-latn/ERR_WRITE_ERROR #usr/lib/squid/errors/sr-latn/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/sr-latn/error-details.txt +#usr/lib/squid/errors/sr-rs #usr/lib/squid/errors/sr-sp #usr/lib/squid/errors/sv #usr/lib/squid/errors/sv-fi @@ -1991,97 +2040,104 @@ usr/lib/squid/errors/tr/error-details.txt #usr/lib/squid/errors/vi/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/vi/error-details.txt #usr/lib/squid/errors/zh-cn -#usr/lib/squid/errors/zh-cn/ERR_ACCESS_DENIED -#usr/lib/squid/errors/zh-cn/ERR_ACL_TIME_QUOTA_EXCEEDED -#usr/lib/squid/errors/zh-cn/ERR_AGENT_CONFIGURE -#usr/lib/squid/errors/zh-cn/ERR_AGENT_WPAD -#usr/lib/squid/errors/zh-cn/ERR_CACHE_ACCESS_DENIED -#usr/lib/squid/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED -#usr/lib/squid/errors/zh-cn/ERR_CANNOT_FORWARD -#usr/lib/squid/errors/zh-cn/ERR_CONFLICT_HOST -#usr/lib/squid/errors/zh-cn/ERR_CONNECT_FAIL -#usr/lib/squid/errors/zh-cn/ERR_DIR_LISTING -#usr/lib/squid/errors/zh-cn/ERR_DNS_FAIL -#usr/lib/squid/errors/zh-cn/ERR_ESI -#usr/lib/squid/errors/zh-cn/ERR_FORWARDING_DENIED -#usr/lib/squid/errors/zh-cn/ERR_FTP_DISABLED -#usr/lib/squid/errors/zh-cn/ERR_FTP_FAILURE -#usr/lib/squid/errors/zh-cn/ERR_FTP_FORBIDDEN -#usr/lib/squid/errors/zh-cn/ERR_FTP_NOT_FOUND -#usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_CREATED -#usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_ERROR -#usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_MODIFIED -#usr/lib/squid/errors/zh-cn/ERR_FTP_UNAVAILABLE -#usr/lib/squid/errors/zh-cn/ERR_GATEWAY_FAILURE -#usr/lib/squid/errors/zh-cn/ERR_ICAP_FAILURE -#usr/lib/squid/errors/zh-cn/ERR_INVALID_REQ -#usr/lib/squid/errors/zh-cn/ERR_INVALID_RESP -#usr/lib/squid/errors/zh-cn/ERR_INVALID_URL -#usr/lib/squid/errors/zh-cn/ERR_LIFETIME_EXP -#usr/lib/squid/errors/zh-cn/ERR_NO_RELAY -#usr/lib/squid/errors/zh-cn/ERR_ONLY_IF_CACHED_MISS -#usr/lib/squid/errors/zh-cn/ERR_PRECONDITION_FAILED -#usr/lib/squid/errors/zh-cn/ERR_READ_ERROR -#usr/lib/squid/errors/zh-cn/ERR_READ_TIMEOUT -#usr/lib/squid/errors/zh-cn/ERR_SECURE_CONNECT_FAIL -#usr/lib/squid/errors/zh-cn/ERR_SHUTTING_DOWN -#usr/lib/squid/errors/zh-cn/ERR_SOCKET_FAILURE -#usr/lib/squid/errors/zh-cn/ERR_TOO_BIG -#usr/lib/squid/errors/zh-cn/ERR_UNSUP_HTTPVERSION -#usr/lib/squid/errors/zh-cn/ERR_UNSUP_REQ -#usr/lib/squid/errors/zh-cn/ERR_URN_RESOLVE -#usr/lib/squid/errors/zh-cn/ERR_WRITE_ERROR -#usr/lib/squid/errors/zh-cn/ERR_ZERO_SIZE_OBJECT -#usr/lib/squid/errors/zh-cn/error-details.txt +#usr/lib/squid/errors/zh-hans +#usr/lib/squid/errors/zh-hans-cn +#usr/lib/squid/errors/zh-hans-sg +#usr/lib/squid/errors/zh-hans/ERR_ACCESS_DENIED +#usr/lib/squid/errors/zh-hans/ERR_ACL_TIME_QUOTA_EXCEEDED +#usr/lib/squid/errors/zh-hans/ERR_AGENT_CONFIGURE +#usr/lib/squid/errors/zh-hans/ERR_AGENT_WPAD +#usr/lib/squid/errors/zh-hans/ERR_CACHE_ACCESS_DENIED +#usr/lib/squid/errors/zh-hans/ERR_CACHE_MGR_ACCESS_DENIED +#usr/lib/squid/errors/zh-hans/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/zh-hans/ERR_CONFLICT_HOST +#usr/lib/squid/errors/zh-hans/ERR_CONNECT_FAIL +#usr/lib/squid/errors/zh-hans/ERR_DIR_LISTING +#usr/lib/squid/errors/zh-hans/ERR_DNS_FAIL +#usr/lib/squid/errors/zh-hans/ERR_ESI +#usr/lib/squid/errors/zh-hans/ERR_FORWARDING_DENIED +#usr/lib/squid/errors/zh-hans/ERR_FTP_DISABLED +#usr/lib/squid/errors/zh-hans/ERR_FTP_FAILURE +#usr/lib/squid/errors/zh-hans/ERR_FTP_FORBIDDEN +#usr/lib/squid/errors/zh-hans/ERR_FTP_NOT_FOUND +#usr/lib/squid/errors/zh-hans/ERR_FTP_PUT_CREATED +#usr/lib/squid/errors/zh-hans/ERR_FTP_PUT_ERROR +#usr/lib/squid/errors/zh-hans/ERR_FTP_PUT_MODIFIED +#usr/lib/squid/errors/zh-hans/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/zh-hans/ERR_GATEWAY_FAILURE +#usr/lib/squid/errors/zh-hans/ERR_ICAP_FAILURE +#usr/lib/squid/errors/zh-hans/ERR_INVALID_REQ +#usr/lib/squid/errors/zh-hans/ERR_INVALID_RESP +#usr/lib/squid/errors/zh-hans/ERR_INVALID_URL +#usr/lib/squid/errors/zh-hans/ERR_LIFETIME_EXP +#usr/lib/squid/errors/zh-hans/ERR_NO_RELAY +#usr/lib/squid/errors/zh-hans/ERR_ONLY_IF_CACHED_MISS +#usr/lib/squid/errors/zh-hans/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/zh-hans/ERR_READ_ERROR +#usr/lib/squid/errors/zh-hans/ERR_READ_TIMEOUT +#usr/lib/squid/errors/zh-hans/ERR_SECURE_CONNECT_FAIL +#usr/lib/squid/errors/zh-hans/ERR_SHUTTING_DOWN +#usr/lib/squid/errors/zh-hans/ERR_SOCKET_FAILURE +#usr/lib/squid/errors/zh-hans/ERR_TOO_BIG +#usr/lib/squid/errors/zh-hans/ERR_UNSUP_HTTPVERSION +#usr/lib/squid/errors/zh-hans/ERR_UNSUP_REQ +#usr/lib/squid/errors/zh-hans/ERR_URN_RESOLVE +#usr/lib/squid/errors/zh-hans/ERR_WRITE_ERROR +#usr/lib/squid/errors/zh-hans/ERR_ZERO_SIZE_OBJECT +#usr/lib/squid/errors/zh-hans/error-details.txt +#usr/lib/squid/errors/zh-hant +#usr/lib/squid/errors/zh-hant-hk +#usr/lib/squid/errors/zh-hant-mo +#usr/lib/squid/errors/zh-hant-tw +#usr/lib/squid/errors/zh-hant/ERR_ACCESS_DENIED +#usr/lib/squid/errors/zh-hant/ERR_ACL_TIME_QUOTA_EXCEEDED +#usr/lib/squid/errors/zh-hant/ERR_AGENT_CONFIGURE +#usr/lib/squid/errors/zh-hant/ERR_AGENT_WPAD +#usr/lib/squid/errors/zh-hant/ERR_CACHE_ACCESS_DENIED +#usr/lib/squid/errors/zh-hant/ERR_CACHE_MGR_ACCESS_DENIED +#usr/lib/squid/errors/zh-hant/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/zh-hant/ERR_CONFLICT_HOST +#usr/lib/squid/errors/zh-hant/ERR_CONNECT_FAIL +#usr/lib/squid/errors/zh-hant/ERR_DIR_LISTING +#usr/lib/squid/errors/zh-hant/ERR_DNS_FAIL +#usr/lib/squid/errors/zh-hant/ERR_ESI +#usr/lib/squid/errors/zh-hant/ERR_FORWARDING_DENIED +#usr/lib/squid/errors/zh-hant/ERR_FTP_DISABLED +#usr/lib/squid/errors/zh-hant/ERR_FTP_FAILURE +#usr/lib/squid/errors/zh-hant/ERR_FTP_FORBIDDEN +#usr/lib/squid/errors/zh-hant/ERR_FTP_NOT_FOUND +#usr/lib/squid/errors/zh-hant/ERR_FTP_PUT_CREATED +#usr/lib/squid/errors/zh-hant/ERR_FTP_PUT_ERROR +#usr/lib/squid/errors/zh-hant/ERR_FTP_PUT_MODIFIED +#usr/lib/squid/errors/zh-hant/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/zh-hant/ERR_GATEWAY_FAILURE +#usr/lib/squid/errors/zh-hant/ERR_ICAP_FAILURE +#usr/lib/squid/errors/zh-hant/ERR_INVALID_REQ +#usr/lib/squid/errors/zh-hant/ERR_INVALID_RESP +#usr/lib/squid/errors/zh-hant/ERR_INVALID_URL +#usr/lib/squid/errors/zh-hant/ERR_LIFETIME_EXP +#usr/lib/squid/errors/zh-hant/ERR_NO_RELAY +#usr/lib/squid/errors/zh-hant/ERR_ONLY_IF_CACHED_MISS +#usr/lib/squid/errors/zh-hant/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/zh-hant/ERR_READ_ERROR +#usr/lib/squid/errors/zh-hant/ERR_READ_TIMEOUT +#usr/lib/squid/errors/zh-hant/ERR_SECURE_CONNECT_FAIL +#usr/lib/squid/errors/zh-hant/ERR_SHUTTING_DOWN +#usr/lib/squid/errors/zh-hant/ERR_SOCKET_FAILURE +#usr/lib/squid/errors/zh-hant/ERR_TOO_BIG +#usr/lib/squid/errors/zh-hant/ERR_UNSUP_HTTPVERSION +#usr/lib/squid/errors/zh-hant/ERR_UNSUP_REQ +#usr/lib/squid/errors/zh-hant/ERR_URN_RESOLVE +#usr/lib/squid/errors/zh-hant/ERR_WRITE_ERROR +#usr/lib/squid/errors/zh-hant/ERR_ZERO_SIZE_OBJECT +#usr/lib/squid/errors/zh-hant/error-details.txt #usr/lib/squid/errors/zh-hk #usr/lib/squid/errors/zh-mo #usr/lib/squid/errors/zh-sg #usr/lib/squid/errors/zh-tw -#usr/lib/squid/errors/zh-tw/ERR_ACCESS_DENIED -#usr/lib/squid/errors/zh-tw/ERR_ACL_TIME_QUOTA_EXCEEDED -#usr/lib/squid/errors/zh-tw/ERR_AGENT_CONFIGURE -#usr/lib/squid/errors/zh-tw/ERR_AGENT_WPAD -#usr/lib/squid/errors/zh-tw/ERR_CACHE_ACCESS_DENIED -#usr/lib/squid/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED -#usr/lib/squid/errors/zh-tw/ERR_CANNOT_FORWARD -#usr/lib/squid/errors/zh-tw/ERR_CONFLICT_HOST -#usr/lib/squid/errors/zh-tw/ERR_CONNECT_FAIL -#usr/lib/squid/errors/zh-tw/ERR_DIR_LISTING -#usr/lib/squid/errors/zh-tw/ERR_DNS_FAIL -#usr/lib/squid/errors/zh-tw/ERR_ESI -#usr/lib/squid/errors/zh-tw/ERR_FORWARDING_DENIED -#usr/lib/squid/errors/zh-tw/ERR_FTP_DISABLED -#usr/lib/squid/errors/zh-tw/ERR_FTP_FAILURE -#usr/lib/squid/errors/zh-tw/ERR_FTP_FORBIDDEN -#usr/lib/squid/errors/zh-tw/ERR_FTP_NOT_FOUND -#usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_CREATED -#usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_ERROR -#usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_MODIFIED -#usr/lib/squid/errors/zh-tw/ERR_FTP_UNAVAILABLE -#usr/lib/squid/errors/zh-tw/ERR_GATEWAY_FAILURE -#usr/lib/squid/errors/zh-tw/ERR_ICAP_FAILURE -#usr/lib/squid/errors/zh-tw/ERR_INVALID_REQ -#usr/lib/squid/errors/zh-tw/ERR_INVALID_RESP -#usr/lib/squid/errors/zh-tw/ERR_INVALID_URL -#usr/lib/squid/errors/zh-tw/ERR_LIFETIME_EXP -#usr/lib/squid/errors/zh-tw/ERR_NO_RELAY -#usr/lib/squid/errors/zh-tw/ERR_ONLY_IF_CACHED_MISS -#usr/lib/squid/errors/zh-tw/ERR_PRECONDITION_FAILED -#usr/lib/squid/errors/zh-tw/ERR_READ_ERROR -#usr/lib/squid/errors/zh-tw/ERR_READ_TIMEOUT -#usr/lib/squid/errors/zh-tw/ERR_SECURE_CONNECT_FAIL -#usr/lib/squid/errors/zh-tw/ERR_SHUTTING_DOWN -#usr/lib/squid/errors/zh-tw/ERR_SOCKET_FAILURE -#usr/lib/squid/errors/zh-tw/ERR_TOO_BIG -#usr/lib/squid/errors/zh-tw/ERR_UNSUP_HTTPVERSION -#usr/lib/squid/errors/zh-tw/ERR_UNSUP_REQ -#usr/lib/squid/errors/zh-tw/ERR_URN_RESOLVE -#usr/lib/squid/errors/zh-tw/ERR_WRITE_ERROR -#usr/lib/squid/errors/zh-tw/ERR_ZERO_SIZE_OBJECT -#usr/lib/squid/errors/zh-tw/error-details.txt +usr/lib/squid/ext_delayer_acl usr/lib/squid/ext_edirectory_userip_acl usr/lib/squid/ext_file_userip_acl -usr/lib/squid/ext_kerberos_ldap_group_acl usr/lib/squid/ext_ldap_group_acl usr/lib/squid/ext_session_acl usr/lib/squid/ext_sql_session_acl @@ -2158,12 +2214,15 @@ usr/sbin/updxlrator #usr/share/man/man8/basic_db_auth.8 #usr/share/man/man8/basic_getpwnam_auth.8 #usr/share/man/man8/basic_ldap_auth.8 +#usr/share/man/man8/basic_msnt_multi_domain_auth.8 #usr/share/man/man8/basic_ncsa_auth.8 #usr/share/man/man8/basic_pam_auth.8 +#usr/share/man/man8/basic_pop3_auth.8 #usr/share/man/man8/basic_radius_auth.8 #usr/share/man/man8/basic_sasl_auth.8 #usr/share/man/man8/cachemgr.cgi.8 #usr/share/man/man8/digest_file_auth.8 +#usr/share/man/man8/ext_delayer_acl.8 #usr/share/man/man8/ext_edirectory_userip_acl.8 #usr/share/man/man8/ext_file_userip_acl.8 #usr/share/man/man8/ext_ldap_group_acl.8 @@ -2173,7 +2232,6 @@ usr/sbin/updxlrator #usr/share/man/man8/ext_unix_group_acl.8 #usr/share/man/man8/ext_wbinfo_group_acl.8 #usr/share/man/man8/log_db_daemon.8 -#usr/share/man/man8/negotiate_kerberos_auth.8 #usr/share/man/man8/squid.8 #usr/share/man/man8/storeid_file_rewrite.8 #var/cache/squid diff --git a/lfs/squid b/lfs/squid index 7e41c16..0edebb2 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.4.14 +VER = 3.5.17 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4e7d7d062159484563ef11f69a0df50a +$(DL_FILE)_MD5 = 2dc73cc01e77b1bd16d9070780ae79b1 install : $(TARGET) @@ -70,11 +70,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 -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13228.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4.14-fix-max-file-descriptors.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13230.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13231.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13232.patch + cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi @@ -85,11 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --mandir=/usr/share/man \ --libexecdir=/usr/lib/squid \ --localstatedir=/var \ - --disable-ipv6 \ - --disable-ssl \ --enable-poll \ - --disable-icmp \ - --disable-wccp \ --enable-ident-lookups \ --enable-storeio="aufs,diskd,ufs" \ --enable-underscores \ @@ -107,26 +99,27 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-url-rewrite-helpers \ --enable-build-info \ --enable-eui \ - --with-pthreads \ - --with-dl \ - --with-filedescriptors=$$(( 16384 * 64 )) \ - --with-large-files \ - --with-aio \ --enable-async-io=8 \ --enable-unlinkd \ --enable-internal-dns \ - --enable-epoll \ - --disable-kqueue \ --enable-select \ --enable-cache-digests \ --enable-forw-via-db \ --enable-htcp \ --enable-kill-parent-hack \ + --enable-epoll \ + --enable-zph-qos \ + --disable-ipv6 \ + --disable-icmp \ + --disable-wccp \ + --disable-kqueue \ --disable-wccpv2 \ - --enable-icap-client \ --disable-esi \ - --enable-zph-qos \ - --disable-arch-native + --disable-arch-native \ + --with-pthreads \ + --with-dl \ + --with-large-files \ + --with-aio cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -- 2.8.1

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development April 2016