Development September 2016

development@lists.ipfire.org

11 participants
97 discussions

[PATCH] next: fix rootfile
by Matthias Fischer 23 Sep '16

23 Sep '16

Similar to: http://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=e4ee7f0317547aacd36b9b5d… 'next' wouldn't build without this. It was always: "tar: etc/issue#usr/bin/dumpsexp: Cannot stat: No such file or directory..." Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/core/105/filelists/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/core/105/filelists/files b/config/rootfiles/core/105/filelists/files index 95f6e10..409e5fe 100644 --- a/config/rootfiles/core/105/filelists/files +++ b/config/rootfiles/core/105/filelists/files @@ -1,2 +1,2 @@ etc/system-release -etc/issue \ No newline at end of file +etc/issue -- 2.9.3

1 0

[PATCH] intltool: Update to 0.51.0.
by Stefan Schantl 23 Sep '16

23 Sep '16

This is an update to the latest available major version. * Changed URL to project home page. * Changed download URL for the source code. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- intltool/intltool.nm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/intltool/intltool.nm b/intltool/intltool.nm index fde1b3a..1f0311c 100644 --- a/intltool/intltool.nm +++ b/intltool/intltool.nm @@ -4,23 +4,22 @@ ############################################################################### name = intltool -version = 0.40.6 +version = 0.51.0 release = 1 arch = noarch groups = Localization/Tools -url = http://www.gnome.org/ +url = https://launchpad.net/intltool license = GPLv2 with exceptions summary = Utility for internationalizing various kinds of data files. description - This tool automatically extracts translatable strings from oaf, glade, \ - bonobo ui, nautilus theme, .desktop, and other data files and puts \ + This tool automatically extracts translatable strings from oaf, glade, + bonobo ui, nautilus theme, .desktop, and other data files and puts them in the po files. end -source_dl = http://ftp.gnome.org/pub/gnome/sources/intltool/0.40/ -sources = %{thisapp}.tar.bz2 +source_dl = http://edge.launchpad.net/intltool/trunk/%{version}/+download/ build requires -- 2.7.4

1 0

[PATCH] squid 3.5.21: latest patch
by Matthias Fischer 22 Sep '16

22 Sep '16

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/squid | 1 + src/patches/squid/squid-3.5-14084.patch | 49 +++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 src/patches/squid/squid-3.5-14084.patch diff --git a/lfs/squid b/lfs/squid index 9677c2b..7ea4ce7 100644 --- a/lfs/squid +++ b/lfs/squid @@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14082.patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14083.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14084.patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.21-fix-max-file-descriptors.patch cd $(DIR_APP) && autoreconf -vfi diff --git a/src/patches/squid/squid-3.5-14084.patch b/src/patches/squid/squid-3.5-14084.patch new file mode 100644 index 0000000..e51a2d1 --- /dev/null +++ b/src/patches/squid/squid-3.5-14084.patch @@ -0,0 +1,49 @@ +------------------------------------------------------------ +revno: 14084 +revision-id: squid3(a)treenet.co.nz-20160921020936-2tn38o3ed7ssydfw +parent: squid3(a)treenet.co.nz-20160916185004-ql4nhzwswotza6zw +fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4228 +author: Alex Rousskov <rousskov(a)measurement-factory.com> +committer: Amos Jeffries <squid3(a)treenet.co.nz> +branch nick: 3.5 +timestamp: Wed 2016-09-21 14:09:36 +1200 +message: + Bug 4228: ./configure bug/typo in r14394. + + The bug resulted in "test: too many arguments" error messages when + running ./configure and effectively replaced AC_MSG_ERROR() with + AC_MSG_WARN() for missing but required Heimdal and GNU GSS Kerberos + libraries. +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3(a)treenet.co.nz-20160921020936-2tn38o3ed7ssydfw +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# testament_sha1: 83ad02c71a6f6161e87dbdc13ed6a11f5bd2a079 +# timestamp: 2016-09-21 02:51:01 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# base_revision_id: squid3(a)treenet.co.nz-20160916185004-\ +# ql4nhzwswotza6zw +# +# Begin patch +=== modified file 'configure.ac' +--- configure.ac 2016-09-08 18:55:14 +0000 ++++ configure.ac 2016-09-21 02:09:36 +0000 +@@ -1778,7 +1778,7 @@ + SQUID_CHECK_KRB5_FUNCS + fi + if test "x$KRB5LIBS" = "x"; then +- if test test "x$with_heimdal_krb5" = "xyes"; then ++ if test "x$with_heimdal_krb5" = "xyes"; then + AC_MSG_ERROR([Required Heimdal Kerberos library not found]) + else + AC_MSG_WARN([Heimdal Kerberos library not found]) +@@ -1848,7 +1848,7 @@ + SQUID_DEFINE_BOOL(HAVE_KRB5,$squid_cv_working_krb5,[KRB5 support]) + fi + if test "x$KRB5LIBS" = "x"; then +- if test test "x$with_gnugss" = "xyes"; then ++ if test "x$with_gnugss" = "xyes"; then + AC_MSG_ERROR([Required GNU GSS Kerberos library not found]) + else + AC_MSG_WARN([GNU GSS Kerberos library not found]) + -- 2.9.3

1 0

[PATCH] xfsprogs: Update to 4.7.0.
by Stefan Schantl 22 Sep '16

22 Sep '16

This is an major update to the latest stable version. * Drop dependency to e2fsprogs. * Add dependency to libatt-devel * Cleanup build instructions and package. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- xfsprogs/xfsprogs.nm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/xfsprogs/xfsprogs.nm b/xfsprogs/xfsprogs.nm index 2dded35..5041e50 100644 --- a/xfsprogs/xfsprogs.nm +++ b/xfsprogs/xfsprogs.nm @@ -4,7 +4,7 @@ ############################################################################### name = xfsprogs -version = 3.2.2 +version = 4.7.0 release = 1 groups = System/Filesystems @@ -20,10 +20,10 @@ source_dl = ftp://oss.sgi.com/projects/xfs/cmd_tars/ build requires - e2fsprogs-devel gettext libacl-devel - libblkid-devel + libattr-devel + libblkid-devel >= 2.17 libtool libuuid-devel readline-devel @@ -34,11 +34,19 @@ build --enable-readline=yes \ --enable-blkid=yes - make_build_targets += V=1 DEBUG=-DNDEBUG + make_build_targets += \ + V=1 DEBUG=-DNDEBUG - install - make install install-dev install-qa V=1 DIST_ROOT=%{BUILDROOT} \ - PKG_ROOT_SBIN_DIR=%{sbindir} PKG_ROOT_LIB_DIR=%{libdir} + make_install_targets += \ + install-dev V=1 DIST_ROOT=%{BUILDROOT} \ + PKG_ROOT_SBIN_DIR=%{sbindir} PKG_ROOT_LIB_DIR=%{libdir} + + install_cmds + # Fix file permission. + chmod 0755 %{BUILDROOT}/%{libdir}/libhandle.so.*.*.* + + # Remove unneeded doc location. + rm -rvf %{BUILDROOT}/%{datadir}/doc/xfsprogs/ end end -- 2.7.4

2 1

[PATCH] Fix in dns.cgi
by Jonatan Schlag 22 Sep '16

22 Sep '16

We have only one english wiki, so the link to the list of public dns servers can point directly to the right page. (The link was also not correct). Fixes: #11191 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- html/cgi-bin/dns.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi index c628953..314107d 100644 --- a/html/cgi-bin/dns.cgi +++ b/html/cgi-bin/dns.cgi @@ -91,7 +91,7 @@ print <<END <table border="0" width='100%'> <tr> - <td colspan="2">$Lang::tr{'dns desc'} <img src="/images/dns_link.png" border="0" align="absmiddle"/><a href="http://wiki.ipfire.org/$Lang::tr{'lang'}/configuration/dns_list" target="_blank">$Lang::tr{'dns list'}</a></td> + <td colspan="2">$Lang::tr{'dns desc'} <img src="/images/dns_link.png" border="0" align="absmiddle"/><a href="http://wiki.ipfire.org/en/dns/public-servers" target="_blank">$Lang::tr{'dns list'}</a></td> </tr> <tr> <td colspan="2"> </td> -- 2.1.4

1 0

[PATCH] monit addon: update to 5.19.0
by Dirk Wagner 22 Sep '16

22 Sep '16

See changelog https://mmonit.com/monit/changes for details. Signed-off-by: Dirk Wagner <dirk.wagner(a)ipfire.org> --- lfs/monit | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/monit b/lfs/monit index 453ad03..2735e15 100644 --- a/lfs/monit +++ b/lfs/monit @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# 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 = 5.14 +VER = 5.19.0 THISAPP = monit-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = monit -PAK_VER = 7 +PAK_VER = 8 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1b3ae1eb08a0914402a8764e5689c1c5 +$(DL_FILE)_MD5 = 51ee50dd71e1bb9fe9a128bc88456b77 install : $(TARGET) -- 2.1.4

1 0

[PATCH] asterisk addon: update to 11.23.1
by Dirk Wagner 22 Sep '16

22 Sep '16

Changelog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-11-current Signed-off-by: Dirk Wagner <dirk.wagner(a)ipfire.org> --- config/rootfiles/packages/asterisk | 19 +++++++++---------- lfs/asterisk | 15 +++++++-------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk index 1d5c2a0..d1a3097 100644 --- a/config/rootfiles/packages/asterisk +++ b/config/rootfiles/packages/asterisk @@ -835,16 +835,16 @@ var/lib/asterisk/sounds/digits/de/xh-8x.gsm var/lib/asterisk/sounds/digits/de/xh-9x.gsm var/lib/asterisk/sounds/digits/de/yesterday.gsm var/lib/asterisk/sounds/en -var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.27 -var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.4.15 +var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.5 +var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.5 var/lib/asterisk/sounds/en/1-for-am-2-for-pm.gsm var/lib/asterisk/sounds/en/1-yes-2-no.gsm -#var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.27 -#var/lib/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.15 -#var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.27 -#var/lib/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.15 -#var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.27 -#var/lib/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.15 +#var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.5 +#var/lib/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.5 +#var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.5 +#var/lib/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.5 +#var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.5 +#var/lib/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.5 var/lib/asterisk/sounds/en/OfficeSpace.gsm var/lib/asterisk/sounds/en/Randulo-allison.gsm var/lib/asterisk/sounds/en/SIP_Test_Failure.gsm @@ -922,7 +922,6 @@ var/lib/asterisk/sounds/en/astcc-account-number-invalid.gsm var/lib/asterisk/sounds/en/astcc-balance-of-account-is.gsm var/lib/asterisk/sounds/en/astcc-card-number-invalid.gsm var/lib/asterisk/sounds/en/astcc-digit-account-number.gsm -var/lib/asterisk/sounds/en/astcc-followed-by-pound.gsm var/lib/asterisk/sounds/en/astcc-followed-by-the-hash-key.gsm var/lib/asterisk/sounds/en/astcc-followed-by-the-pound-key.gsm var/lib/asterisk/sounds/en/astcc-login12pound.gsm @@ -2064,6 +2063,7 @@ var/lib/asterisk/sounds/en/please-hold-minion-connect.gsm var/lib/asterisk/sounds/en/please-hold-while-minion.gsm var/lib/asterisk/sounds/en/please-try-again-later.gsm var/lib/asterisk/sounds/en/please-try-again.gsm +var/lib/asterisk/sounds/en/please-try-call-later.gsm var/lib/asterisk/sounds/en/please-try.gsm var/lib/asterisk/sounds/en/please-wait-connect-oncall-eng.gsm var/lib/asterisk/sounds/en/pls-ent-num-transfer.gsm @@ -2080,7 +2080,6 @@ var/lib/asterisk/sounds/en/pls-rcrd-name-at-tone.gsm var/lib/asterisk/sounds/en/pls-stay-on-line.gsm var/lib/asterisk/sounds/en/pls-try-again.gsm var/lib/asterisk/sounds/en/pls-try-area-code.gsm -var/lib/asterisk/sounds/en/pls-try-call-later.gsm var/lib/asterisk/sounds/en/pls-try-manually.gsm var/lib/asterisk/sounds/en/pls-wait-connect-call.gsm var/lib/asterisk/sounds/en/plugh.gsm diff --git a/lfs/asterisk b/lfs/asterisk index e81c4a7..a0276bc 100755 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -20,7 +20,7 @@ include Config -VER = 11.21.1 +VER = 11.23.1 THISAPP = asterisk-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -28,7 +28,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = asterisk -PAK_VER = 19 +PAK_VER = 20 DEPS = "libsrtp" @@ -37,18 +37,17 @@ DEPS = "libsrtp" ############################################################################### objects = $(DL_FILE) \ - srtp-1.4.2.tar.gz \ asterisk-1.4-de-prompts.tar.gz \ - asterisk-extra-sounds-en-gsm-1.4.15.tar.gz \ + asterisk-extra-sounds-en-gsm-1.5.tar.gz \ asterisk-moh-opsound-gsm-2.03.tar.gz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -asterisk-extra-sounds-en-gsm-1.4.15.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz +asterisk-extra-sounds-en-gsm-1.5.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.5.tar.gz asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz -$(DL_FILE)_MD5 = 9594c3cdcf6dc16c719b5abb00dbdd8f -asterisk-extra-sounds-en-gsm-1.4.15.tar.gz_MD5 = 5099fc65f49008e33ba7fb043a4ec995 +$(DL_FILE)_MD5 = 8dadfcda24eac2f6df431c71f5f01947 +asterisk-extra-sounds-en-gsm-1.5.tar.gz_MD5 = 49f2baefc7aad424f30ff18d883501d2 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c @@ -112,7 +111,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) menuselect.makeopts # add additional sounds - cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz $(DIR_APP)/sounds/ + cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.5.tar.gz $(DIR_APP)/sounds/ cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-moh-opsound-gsm-2.03.tar.gz $(DIR_APP)/sounds/ # Fix wrong cpu optimization (march=armv5tel) -- 2.1.4

1 0

[PATCH] nano: Update to 2.7.0
by Matthias Fischer 20 Sep '16

20 Sep '16

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/nano | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/nano b/lfs/nano index 5dcf484..9534b5b 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@ include Config -VER = 2.6.3 +VER = 2.7.0 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 11 +PAK_VER = 12 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1213c7f17916e65afefc95054c1f90f9 +$(DL_FILE)_MD5 = 0805c5b8c75d4fde053e4b1431270f91 install : $(TARGET) -- 2.9.3

1 0

[PATCH] squid 3.5.21: latest patches
by Matthias Fischer 20 Sep '16

20 Sep '16

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/squid | 2 + src/patches/squid/squid-3.5-14082.patch | 414 ++++++++++++++++++++++++++++++++ src/patches/squid/squid-3.5-14083.patch | 48 ++++ 3 files changed, 464 insertions(+) create mode 100644 src/patches/squid/squid-3.5-14082.patch create mode 100644 src/patches/squid/squid-3.5-14083.patch diff --git a/lfs/squid b/lfs/squid index ae8e1e9..9677c2b 100644 --- a/lfs/squid +++ b/lfs/squid @@ -70,6 +70,8 @@ $(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/squid-3.5-14082.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14083.patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.21-fix-max-file-descriptors.patch cd $(DIR_APP) && autoreconf -vfi diff --git a/src/patches/squid/squid-3.5-14082.patch b/src/patches/squid/squid-3.5-14082.patch new file mode 100644 index 0000000..cef06c8 --- /dev/null +++ b/src/patches/squid/squid-3.5-14082.patch @@ -0,0 +1,414 @@ +------------------------------------------------------------ +revno: 14082 +revision-id: squid3(a)treenet.co.nz-20160916115328-0fpefy6pbtfq40cd +parent: squid3(a)treenet.co.nz-20160908185514-e3zlew29xywz6c0o +author: Eduard Bagdasaryan <eduard.bagdasaryan(a)measurement-factory.com>, Alex Rousskov <rousskov(a)measurement-factory.com> +committer: Amos Jeffries <squid3(a)treenet.co.nz> +branch nick: 3.5 +timestamp: Fri 2016-09-16 23:53:28 +1200 +message: + Fix logged request size (%http::>st) and other size-related %codes. + + The %[http::]>st logformat code should log the actual number of + [dechunked] bytes received from the client. However, for requests with + Content-Length, Squid was logging the sum of the request header size and + the Content-Length header field value instead. The logged value was + wrong when the client sent fewer than Content-Length body bytes. + + Also: + + * Fixed %http::>h and %http::<h format codes for icap_log. The old code + was focusing on preserving the "request header" (i.e. not "response + header") meaning of the %http::>h logformat code, but since ICAP + services deal with (and log) both HTTP requests and responses, that + focus on the HTTP message kind actually complicates ICAP logging + configuration and will eventually require introduction of new %http + logformat codes that would be meaningless in access.log context. + + - In ICAP context, %http::>h should log to-be-adapted HTTP message + headers embedded in an ICAP request (HTTP request headers in REQMOD; + HTTP response headers in RESPMOD). Before this change, %http::>h + logged constant/"FYI" HTTP request headers in RESPMOD. + + - Similarly, %http::<h should log adapted HTTP message headers + embedded in an ICAP response (HTTP request headers in regular + REQMOD; HTTP response headers in RESPMOD and during request + satisfaction in REQMOD). Before this change, %http::<h logged "-" in + REQMOD. + + In other words, in ICAP logging context, the ">" and "<" characters + should indicate ICAP message kind (where the being-logged HTTP message + is embedded), not HTTP message kind, even for %http codes. + + TODO: %http::>h code logs "-" in RESPMOD because AccessLogEntry does + not store virgin HTTP response headers. + + * Correctly initialize ICAP ALE HTTP fields related to HTTP message + sizes for icap_log, including %http::>st, %http::<st, %http::>sh, and + %http::>sh format codes. + + * Initialize HttpMsg::hdr_sz in HTTP header parsing code. Among other + uses, this field is needed to initialize HTTP fields inside ICAP ALE. + + * Synced default icap_log format documentation with the current code. +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3(a)treenet.co.nz-20160916115328-0fpefy6pbtfq40cd +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# testament_sha1: 45a920a9aa3c53cab1b2bfb8af66bcd558fa96d5 +# timestamp: 2016-09-16 12:51:02 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# base_revision_id: squid3(a)treenet.co.nz-20160908185514-\ +# e3zlew29xywz6c0o +# +# Begin patch +=== modified file 'src/adaptation/icap/ModXact.cc' +--- src/adaptation/icap/ModXact.cc 2016-01-01 00:14:27 +0000 ++++ src/adaptation/icap/ModXact.cc 2016-09-16 11:53:28 +0000 +@@ -1259,31 +1259,32 @@ + + void Adaptation::Icap::ModXact::finalizeLogInfo() + { +- HttpRequest * request_ = NULL; +- HttpRequest * adapted_request_ = NULL; +- HttpReply * reply_ = NULL; +- request_ = (virgin.cause? virgin.cause: dynamic_cast<HttpRequest*>(virgin.header)); ++ HttpRequest *adapted_request_ = NULL; ++ HttpReply *adapted_reply_ = NULL; ++ HttpRequest *virgin_request_ = (virgin.cause ? virgin.cause : dynamic_cast<HttpRequest*>(virgin.header)); + if (!(adapted_request_ = dynamic_cast<HttpRequest*>(adapted.header))) { +- adapted_request_ = request_; +- reply_ = dynamic_cast<HttpReply*>(adapted.header); ++ // if the request was not adapted, use virgin request to simplify ++ // the code further below ++ adapted_request_ = virgin_request_; ++ adapted_reply_ = dynamic_cast<HttpReply*>(adapted.header); + } + +- Adaptation::Icap::History::Pointer h = (request_ ? request_->icapHistory() : NULL); ++ Adaptation::Icap::History::Pointer h = (virgin_request_ ? virgin_request_->icapHistory() : NULL); + Must(h != NULL); // ICAPXaction::maybeLog calls only if there is a log + al.icp.opcode = ICP_INVALID; + al.url = h->log_uri.termedBuf(); + const Adaptation::Icap::ServiceRep &s = service(); + al.icap.reqMethod = s.cfg().method; + +- al.cache.caddr = request_->client_addr; ++ al.cache.caddr = virgin_request_->client_addr; + +- al.request = request_; ++ al.request = virgin_request_; + HTTPMSGLOCK(al.request); + al.adapted_request = adapted_request_; + HTTPMSGLOCK(al.adapted_request); + +- if (reply_) { +- al.reply = reply_; ++ if (adapted_reply_) { ++ al.reply = adapted_reply_; + HTTPMSGLOCK(al.reply); + } else + al.reply = NULL; +@@ -1296,25 +1297,29 @@ + al.cache.ssluser = h->ssluser.termedBuf(); + #endif + al.cache.code = h->logType; +- // XXX: should use icap-specific counters instead ? +- al.http.clientRequestSz.payloadData = h->req_sz; ++ ++ const HttpMsg *virgin_msg = dynamic_cast<HttpReply*>(virgin.header); ++ if (!virgin_msg) ++ virgin_msg = virgin_request_; ++ assert(virgin_msg != virgin.cause); ++ al.http.clientRequestSz.header = virgin_msg->hdr_sz; ++ al.http.clientRequestSz.payloadData = virgin_msg->body_pipe->producedSize(); + + // leave al.icap.bodyBytesRead negative if no body + if (replyHttpHeaderSize >= 0 || replyHttpBodySize >= 0) { + const int64_t zero = 0; // to make max() argument types the same +- al.icap.bodyBytesRead = +- max(zero, replyHttpHeaderSize) + max(zero, replyHttpBodySize); ++ const uint64_t headerSize = max(zero, replyHttpHeaderSize); ++ const uint64_t bodySize = max(zero, replyHttpBodySize); ++ al.icap.bodyBytesRead = headerSize + bodySize; ++ al.http.clientReplySz.header = headerSize; ++ al.http.clientReplySz.payloadData = bodySize; + } + +- if (reply_) { +- al.http.code = reply_->sline.status(); +- al.http.content_type = reply_->content_type.termedBuf(); +- if (replyHttpBodySize >= 0) { +- // XXX: should use icap-specific counters instead ? +- al.http.clientReplySz.payloadData = replyHttpBodySize; +- al.http.clientReplySz.header = reply_->hdr_sz; ++ if (adapted_reply_) { ++ al.http.code = adapted_reply_->sline.status(); ++ al.http.content_type = adapted_reply_->content_type.termedBuf(); ++ if (replyHttpBodySize >= 0) + al.cache.highOffset = replyHttpBodySize; +- } + //don't set al.cache.objectSize because it hasn't exist yet + + Packer p; +@@ -1323,7 +1328,7 @@ + mb.init(); + packerToMemInit(&p, &mb); + +- reply_->header.packInto(&p); ++ adapted_reply_->header.packInto(&p); + al.headers.reply = xstrdup(mb.buf); + + packerClean(&p); + +=== modified file 'src/cf.data.pre' +--- src/cf.data.pre 2016-05-06 06:36:08 +0000 ++++ src/cf.data.pre 2016-09-16 11:53:28 +0000 +@@ -4427,13 +4427,35 @@ + ICAP transaction log lines will correspond to a single access + log line. + +- ICAP log uses logformat codes that make sense for an ICAP +- transaction. Header-related codes are applied to the HTTP header +- embedded in an ICAP server response, with the following caveats: +- For REQMOD, there is no HTTP response header unless the ICAP +- server performed request satisfaction. For RESPMOD, the HTTP +- request header is the header sent to the ICAP server. For +- OPTIONS, there are no HTTP headers. ++ ICAP log supports many access.log logformat %codes. In ICAP context, ++ HTTP message-related %codes are applied to the HTTP message embedded ++ in an ICAP message. Logformat "%http::>..." codes are used for HTTP ++ messages embedded in ICAP requests while "%http::<..." codes are used ++ for HTTP messages embedded in ICAP responses. For example: ++ ++ http::>h To-be-adapted HTTP message headers sent by Squid to ++ the ICAP service. For REQMOD transactions, these are ++ HTTP request headers. For RESPMOD, these are HTTP ++ response headers, but Squid currently cannot log them ++ (i.e., %http::>h will expand to "-" for RESPMOD). ++ ++ http::<h Adapted HTTP message headers sent by the ICAP ++ service to Squid (i.e., HTTP request headers in regular ++ REQMOD; HTTP response headers in RESPMOD and during ++ request satisfaction in REQMOD). ++ ++ ICAP OPTIONS transactions do not embed HTTP messages. ++ ++ Several logformat codes below deal with ICAP message bodies. An ICAP ++ message body, if any, typically includes a complete HTTP message ++ (required HTTP headers plus optional HTTP message body). When ++ computing HTTP message body size for these logformat codes, Squid ++ either includes or excludes chunked encoding overheads; see ++ code-specific documentation for details. ++ ++ For Secure ICAP services, all size-related information is currently ++ computed before/after TLS encryption/decryption, as if TLS was not ++ in use at all. + + The following format codes are also available for ICAP logs: + +@@ -4447,19 +4469,16 @@ + icap::rm ICAP request method (REQMOD, RESPMOD, or + OPTIONS). Similar to existing rm. + +- icap::>st Bytes sent to the ICAP server (TCP payload +- only; i.e., what Squid writes to the socket). +- +- icap::<st Bytes received from the ICAP server (TCP +- payload only; i.e., what Squid reads from +- the socket). +- +- icap::<bs Number of message body bytes received from the +- ICAP server. ICAP message body, if any, usually +- includes encapsulated HTTP message headers and +- possibly encapsulated HTTP message body. The +- HTTP body part is dechunked before its size is +- computed. ++ icap::>st The total size of the ICAP request sent to the ICAP ++ server (ICAP headers + ICAP body), including chunking ++ metadata (if any). ++ ++ icap::<st The total size of the ICAP response received from the ++ ICAP server (ICAP headers + ICAP body), including ++ chunking metadata (if any). ++ ++ icap::<bs The size of the ICAP response body received from the ++ ICAP server, excluding chunking metadata (if any). + + icap::tr Transaction response time (in + milliseconds). The timer starts when +@@ -4489,9 +4508,9 @@ + The default ICAP log format, which can be used without an explicit + definition, is called icap_squid: + +-logformat icap_squid %ts.%03tu %6icap::tr %>a %icap::to/%03icap::Hs %icap::<size %icap::rm %icap::ru% %un -/%icap::<A - ++logformat icap_squid %ts.%03tu %6icap::tr %>A %icap::to/%03icap::Hs %icap::<st %icap::rm %icap::ru %un -/%icap::<A - + +- See also: logformat, log_icap, and %adapt::<last_h ++ See also: logformat and %adapt::<last_h + DOC_END + + NAME: logfile_daemon + +=== modified file 'src/client_side.cc' +--- src/client_side.cc 2016-06-18 13:36:07 +0000 ++++ src/client_side.cc 2016-09-16 11:53:28 +0000 +@@ -555,8 +555,6 @@ + aLogEntry->http.method = request->method; + aLogEntry->http.version = request->http_ver; + aLogEntry->hier = request->hier; +- if (request->content_length > 0) // negative when no body or unknown length +- aLogEntry->http.clientRequestSz.payloadData += request->content_length; // XXX: actually adaptedRequest payload size ?? + aLogEntry->cache.extuser = request->extacl_user.termedBuf(); + + // Adapted request, if any, inherits and then collects all the stats, but +@@ -593,6 +591,9 @@ + al->cache.objectSize = loggingEntry()->contentLen(); // payload duplicate ?? with or without TE ? + + al->http.clientRequestSz.header = req_sz; ++ // the virgin request is saved to al->request ++ if (al->request && al->request->body_pipe != NULL) ++ al->http.clientRequestSz.payloadData = al->request->body_pipe->producedSize(); + al->http.clientReplySz.header = out.headers_sz; + // XXX: calculate without payload encoding or headers !! + al->http.clientReplySz.payloadData = out.size - out.headers_sz; // pretend its all un-encoded data for now. +@@ -2744,6 +2745,7 @@ + request->my_addr = conn->clientConnection->local; + request->myportname = conn->port->name; + request->http_ver = http_ver; ++ request->hdr_sz = http->req_sz; + + // Link this HttpRequest to ConnStateData relatively early so the following complex handling can use it + // TODO: this effectively obsoletes a lot of conn->FOO copying. That needs cleaning up later. + +=== modified file 'src/format/Format.cc' +--- src/format/Format.cc 2016-04-07 04:43:45 +0000 ++++ src/format/Format.cc 2016-09-16 11:53:28 +0000 +@@ -309,6 +309,38 @@ + *p = '\0'; + } + ++/// XXX: Misnamed. TODO: Split <h (and this function) to distinguish received ++/// headers from sent headers rather than failing to distinguish requests from responses. ++/// \retval HttpReply sent to the HTTP client (access.log and default context). ++/// \retval HttpReply received (encapsulated) from the ICAP server (icap.log context). ++/// \retval HttpRequest received (encapsulated) from the ICAP server (icap.log context). ++static const HttpMsg * ++actualReplyHeader(const AccessLogEntry::Pointer &al) ++{ ++ const HttpMsg *msg = al->reply; ++#if USE_ADAPTATION ++ // al->icap.reqMethod is methodNone in access.log context ++ if (!msg && al->icap.reqMethod == Adaptation::methodReqmod) ++ msg = al->adapted_request; ++#endif ++ return msg; ++} ++ ++/// XXX: Misnamed. See actualReplyHeader(). ++/// \return HttpRequest or HttpReply for %http::>h. ++static const HttpMsg * ++actualRequestHeader(const AccessLogEntry::Pointer &al) ++{ ++#if USE_ADAPTATION ++ // al->icap.reqMethod is methodNone in access.log context ++ if (al->icap.reqMethod == Adaptation::methodRespmod) { ++ // XXX: for now AccessLogEntry lacks virgin response headers ++ return NULL; ++ } ++#endif ++ return al->request; ++} ++ + void + Format::Format::assemble(MemBuf &mb, const AccessLogEntry::Pointer &al, int logSequenceNumber) const + { +@@ -547,8 +579,8 @@ + + case LFT_REQUEST_HEADER: + +- if (al->request) +- sb = al->request->header.getByName(fmt->data.header.header); ++ if (const HttpMsg *msg = actualRequestHeader(al)) ++ sb = msg->header.getByName(fmt->data.header.header); + + out = sb.termedBuf(); + +@@ -567,15 +599,15 @@ + + break; + +- case LFT_REPLY_HEADER: +- if (al->reply) +- sb = al->reply->header.getByName(fmt->data.header.header); ++ case LFT_REPLY_HEADER: { ++ if (const HttpMsg *msg = actualReplyHeader(al)) ++ sb = msg->header.getByName(fmt->data.header.header); + + out = sb.termedBuf(); + + quote = 1; +- +- break; ++ } ++ break; + + #if USE_ADAPTATION + case LFT_ADAPTATION_SUM_XACT_TIMES: +@@ -757,8 +789,8 @@ + break; + #endif + case LFT_REQUEST_HEADER_ELEM: +- if (al->request) +- sb = al->request->header.getByNameListMember(fmt->data.header.header, fmt->data.header.element, fmt->data.header.separator); ++ if (const HttpMsg *msg = actualRequestHeader(al)) ++ sb = msg->header.getByNameListMember(fmt->data.header.header, fmt->data.header.element, fmt->data.header.separator); + + out = sb.termedBuf(); + +@@ -776,18 +808,27 @@ + + break; + +- case LFT_REPLY_HEADER_ELEM: +- if (al->reply) +- sb = al->reply->header.getByNameListMember(fmt->data.header.header, fmt->data.header.element, fmt->data.header.separator); ++ case LFT_REPLY_HEADER_ELEM: { ++ if (const HttpMsg *msg = actualReplyHeader(al)) ++ sb = msg->header.getByNameListMember(fmt->data.header.header, fmt->data.header.element, fmt->data.header.separator); + + out = sb.termedBuf(); + + quote = 1; +- +- break; ++ } ++ break; + + case LFT_REQUEST_ALL_HEADERS: +- out = al->headers.request; ++#if USE_ADAPTATION ++ if (al->icap.reqMethod == Adaptation::methodRespmod) { ++ // XXX: since AccessLogEntry::Headers lacks virgin response ++ // headers, do nothing for now ++ out = NULL; ++ } else ++#endif ++ { ++ out = al->headers.request; ++ } + + quote = 1; + +@@ -802,6 +843,10 @@ + + case LFT_REPLY_ALL_HEADERS: + out = al->headers.reply; ++#if USE_ADAPTATION ++ if (!out && al->icap.reqMethod == Adaptation::methodReqmod) ++ out = al->headers.adapted_request; ++#endif + + quote = 1; + + diff --git a/src/patches/squid/squid-3.5-14083.patch b/src/patches/squid/squid-3.5-14083.patch new file mode 100644 index 0000000..1f2b24c --- /dev/null +++ b/src/patches/squid/squid-3.5-14083.patch @@ -0,0 +1,48 @@ +------------------------------------------------------------ +revno: 14083 +revision-id: squid3(a)treenet.co.nz-20160916185004-ql4nhzwswotza6zw +parent: squid3(a)treenet.co.nz-20160916115328-0fpefy6pbtfq40cd +author: Eduard Bagdasaryan <eduard.bagdasaryan(a)measurement-factory.com> +committer: Amos Jeffries <squid3(a)treenet.co.nz> +branch nick: 3.5 +timestamp: Sat 2016-09-17 06:50:04 +1200 +message: + Fix potential ICAP null pointer dereference after rev.14082 + + Adjusted Adaptation::Icap::ModXact::finalizeLogInfo(), fixing possible + "Null pointer dereference". + + Detected by Coverity Scan. Issue 1372977 +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3(a)treenet.co.nz-20160916185004-ql4nhzwswotza6zw +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# testament_sha1: 900564075422fd0beeb1a82e5d4f1073b02bb326 +# timestamp: 2016-09-16 18:50:59 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# base_revision_id: squid3(a)treenet.co.nz-20160916115328-\ +# 0fpefy6pbtfq40cd +# +# Begin patch +=== modified file 'src/adaptation/icap/ModXact.cc' +--- src/adaptation/icap/ModXact.cc 2016-09-16 11:53:28 +0000 ++++ src/adaptation/icap/ModXact.cc 2016-09-16 18:50:04 +0000 +@@ -1261,7 +1261,7 @@ + { + HttpRequest *adapted_request_ = NULL; + HttpReply *adapted_reply_ = NULL; +- HttpRequest *virgin_request_ = (virgin.cause ? virgin.cause : dynamic_cast<HttpRequest*>(virgin.header)); ++ HttpRequest *virgin_request_ = const_cast<HttpRequest*>(&virginRequest()); + if (!(adapted_request_ = dynamic_cast<HttpRequest*>(adapted.header))) { + // if the request was not adapted, use virgin request to simplify + // the code further below +@@ -1269,7 +1269,7 @@ + adapted_reply_ = dynamic_cast<HttpReply*>(adapted.header); + } + +- Adaptation::Icap::History::Pointer h = (virgin_request_ ? virgin_request_->icapHistory() : NULL); ++ Adaptation::Icap::History::Pointer h = virgin_request_->icapHistory(); + Must(h != NULL); // ICAPXaction::maybeLog calls only if there is a log + al.icp.opcode = ICP_INVALID; + al.url = h->log_uri.termedBuf(); + -- 2.9.3

1 0

[PATCH] unicode-ucd: Update to Version 9.0.0
by Alexander Marx 19 Sep '16

19 Sep '16

Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- unicode-ucd/unicode-ucd.nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unicode-ucd/unicode-ucd.nm b/unicode-ucd/unicode-ucd.nm index 520edec..17e922d 100644 --- a/unicode-ucd/unicode-ucd.nm +++ b/unicode-ucd/unicode-ucd.nm @@ -4,7 +4,7 @@ ############################################################################### name = unicode-ucd -version = 6.1.0 +version = 9.0.0 release = 1 arch = noarch -- 2.6.3

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development September 2016