Development June 2017

development@lists.ipfire.org

9 participants
62 discussions

[PATCH] freeradius 3.0.14: rootfile update
by Matthias Fischer 04 Jun '17

04 Jun '17

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/packages/freeradius | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/packages/freeradius b/config/rootfiles/packages/freeradius index 9bcd3a4ff..7cf776064 100644 --- a/config/rootfiles/packages/freeradius +++ b/config/rootfiles/packages/freeradius @@ -46,6 +46,7 @@ etc/raddb #etc/raddb/mods-available/logintime #etc/raddb/mods-available/mac2ip #etc/raddb/mods-available/mac2vlan +#etc/raddb/mods-available/moonshot-targeted-ids #etc/raddb/mods-available/mschap #etc/raddb/mods-available/ntlm_auth #etc/raddb/mods-available/opendirectory @@ -163,12 +164,23 @@ etc/raddb #etc/raddb/mods-config/sql/main/sqlite #etc/raddb/mods-config/sql/main/sqlite/queries.conf #etc/raddb/mods-config/sql/main/sqlite/schema.sql +#etc/raddb/mods-config/sql/moonshot-targeted-ids +#etc/raddb/mods-config/sql/moonshot-targeted-ids/mysql +#etc/raddb/mods-config/sql/moonshot-targeted-ids/mysql/queries.conf +#etc/raddb/mods-config/sql/moonshot-targeted-ids/mysql/schema.sql +#etc/raddb/mods-config/sql/moonshot-targeted-ids/postgresql +#etc/raddb/mods-config/sql/moonshot-targeted-ids/postgresql/queries.conf +#etc/raddb/mods-config/sql/moonshot-targeted-ids/postgresql/schema.sql +#etc/raddb/mods-config/sql/moonshot-targeted-ids/sqlite +#etc/raddb/mods-config/sql/moonshot-targeted-ids/sqlite/queries.conf +#etc/raddb/mods-config/sql/moonshot-targeted-ids/sqlite/schema.sql #etc/raddb/mods-config/unbound #etc/raddb/mods-enabled #etc/raddb/mods-enabled/always #etc/raddb/mods-enabled/attr_filter #etc/raddb/mods-enabled/cache_eap #etc/raddb/mods-enabled/chap +#etc/raddb/mods-enabled/date #etc/raddb/mods-enabled/detail #etc/raddb/mods-enabled/detail.log #etc/raddb/mods-enabled/dhcp @@ -205,6 +217,7 @@ etc/raddb #etc/raddb/policy.d/dhcp #etc/raddb/policy.d/eap #etc/raddb/policy.d/filter +#etc/raddb/policy.d/moonshot-targeted-ids #etc/raddb/policy.d/operator-name #etc/raddb/proxy.conf #etc/raddb/radiusd.conf @@ -311,6 +324,7 @@ usr/bin/smbencrypt #usr/include/freeradius/rfc7155.h #usr/include/freeradius/rfc7268.h #usr/include/freeradius/rfc7499.h +#usr/include/freeradius/rfc7930.h #usr/include/freeradius/sha1.h #usr/include/freeradius/stats.h #usr/include/freeradius/sysutmp.h @@ -376,6 +390,9 @@ usr/lib/freeradius/rlm_dynamic_clients.so #usr/lib/freeradius/rlm_eap.a #usr/lib/freeradius/rlm_eap.la usr/lib/freeradius/rlm_eap.so +#usr/lib/freeradius/rlm_eap_fast.a +#usr/lib/freeradius/rlm_eap_fast.la +usr/lib/freeradius/rlm_eap_fast.so #usr/lib/freeradius/rlm_eap_gtc.a #usr/lib/freeradius/rlm_eap_gtc.la usr/lib/freeradius/rlm_eap_gtc.so @@ -641,7 +658,6 @@ usr/sbin/radmin #usr/share/doc/freeradius/schemas/ldap/openldap/freeradius.schema #usr/share/doc/freeradius/schemas/logstash #usr/share/doc/freeradius/schemas/logstash/README -#usr/share/doc/freeradius/schemas/logstash/kibana3-dashboard.json #usr/share/doc/freeradius/schemas/logstash/kibana4-dashboard.json #usr/share/doc/freeradius/schemas/logstash/log-courier.conf #usr/share/doc/freeradius/schemas/logstash/logstash-radius.conf @@ -660,6 +676,7 @@ usr/share/freeradius #usr/share/freeradius/dictionary.acc #usr/share/freeradius/dictionary.acme #usr/share/freeradius/dictionary.actelis +#usr/share/freeradius/dictionary.adtran #usr/share/freeradius/dictionary.aerohive #usr/share/freeradius/dictionary.airespace #usr/share/freeradius/dictionary.alcatel @@ -694,6 +711,7 @@ usr/share/freeradius #usr/share/freeradius/dictionary.cablelabs #usr/share/freeradius/dictionary.cabletron #usr/share/freeradius/dictionary.camiant +#usr/share/freeradius/dictionary.checkpoint #usr/share/freeradius/dictionary.chillispot #usr/share/freeradius/dictionary.cisco #usr/share/freeradius/dictionary.cisco.asa @@ -702,12 +720,14 @@ usr/share/freeradius #usr/share/freeradius/dictionary.cisco.vpn5000 #usr/share/freeradius/dictionary.citrix #usr/share/freeradius/dictionary.clavister +#usr/share/freeradius/dictionary.cnergee #usr/share/freeradius/dictionary.colubris #usr/share/freeradius/dictionary.columbia_university #usr/share/freeradius/dictionary.compat #usr/share/freeradius/dictionary.compatible #usr/share/freeradius/dictionary.cosine #usr/share/freeradius/dictionary.dante +#usr/share/freeradius/dictionary.dellemc #usr/share/freeradius/dictionary.dhcp #usr/share/freeradius/dictionary.digium #usr/share/freeradius/dictionary.dlink @@ -756,6 +776,7 @@ usr/share/freeradius #usr/share/freeradius/dictionary.meraki #usr/share/freeradius/dictionary.merit #usr/share/freeradius/dictionary.meru +#usr/share/freeradius/dictionary.microsemi #usr/share/freeradius/dictionary.microsoft #usr/share/freeradius/dictionary.mikrotik #usr/share/freeradius/dictionary.motorola @@ -813,11 +834,13 @@ usr/share/freeradius #usr/share/freeradius/dictionary.rfc7155 #usr/share/freeradius/dictionary.rfc7268 #usr/share/freeradius/dictionary.rfc7499 +#usr/share/freeradius/dictionary.rfc7930 #usr/share/freeradius/dictionary.riverbed #usr/share/freeradius/dictionary.riverstone #usr/share/freeradius/dictionary.roaringpenguin #usr/share/freeradius/dictionary.ruckus #usr/share/freeradius/dictionary.ruggedcom +#usr/share/freeradius/dictionary.sangoma #usr/share/freeradius/dictionary.sg #usr/share/freeradius/dictionary.shasta #usr/share/freeradius/dictionary.shiva @@ -859,6 +882,8 @@ usr/share/freeradius #usr/share/freeradius/dictionary.zeus #usr/share/freeradius/dictionary.zte #usr/share/freeradius/dictionary.zyxel +#usr/share/man/man1/dhcpclient.1 +#usr/share/man/man1/rad_counter.1 #usr/share/man/man1/radclient.1 #usr/share/man/man1/radeapclient.1 #usr/share/man/man1/radlast.1 -- 2.13.0

1 0

[PATCH] cyrus-imapd 2.5.11: rootfile update
by Matthias Fischer 04 Jun '17

04 Jun '17

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/packages/cyrus-imapd | 42 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/config/rootfiles/packages/cyrus-imapd b/config/rootfiles/packages/cyrus-imapd index 67d6f7916..a8c156e5c 100644 --- a/config/rootfiles/packages/cyrus-imapd +++ b/config/rootfiles/packages/cyrus-imapd @@ -119,27 +119,27 @@ usr/lib/libcyrus_sieve.so.0.0.0 #usr/lib/perl5/site_perl/5.12.3/Cyrus/Annotator usr/lib/perl5/site_perl/5.12.3/Cyrus/Annotator/Daemon.pm usr/lib/perl5/site_perl/5.12.3/Cyrus/Annotator/Message.pm -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/IMAP -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/IMAP.pm -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/IMAP/Admin.pm -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/IMAP/IMSP.pm -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/IMAP/Shell.pm -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/SIEVE -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/SIEVE/managesieve.pm -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/Annotator -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/Annotator/Daemon -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/Annotator/Daemon/.packlist -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/IMAP -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/IMAP/.packlist -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/IMAP/IMAP.bs -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/IMAP/IMAP.so -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/SIEVE -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/SIEVE/managesieve -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/.packlist -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.bs -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.so +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/IMAP +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/IMAP.pm +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/IMAP/Admin.pm +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/IMAP/IMSP.pm +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/IMAP/Shell.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/SIEVE +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/SIEVE/managesieve.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/Annotator +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/Annotator/Daemon +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/Annotator/Daemon/.packlist +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/IMAP +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/IMAP/.packlist +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/IMAP/IMAP.bs +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/IMAP/IMAP.so +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/.packlist +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.bs +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.so #usr/lib/pkgconfig/libcyrus.pc #usr/lib/pkgconfig/libcyrus_min.pc #usr/lib/pkgconfig/libcyrus_sieve.pc -- 2.13.0

1 0

[PATCH] python 2.7.13: rootfile update
by Matthias Fischer 04 Jun '17

04 Jun '17

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/i586/python | 52 +++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/config/rootfiles/common/i586/python b/config/rootfiles/common/i586/python index a308ae0e4..9248201f9 100644 --- a/config/rootfiles/common/i586/python +++ b/config/rootfiles/common/i586/python @@ -1463,8 +1463,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/ensurepip/__main__.pyc #usr/lib/python2.7/ensurepip/__main__.pyo #usr/lib/python2.7/ensurepip/_bundled -#usr/lib/python2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl #usr/lib/python2.7/ensurepip/_uninstall.py #usr/lib/python2.7/ensurepip/_uninstall.pyc #usr/lib/python2.7/ensurepip/_uninstall.pyo @@ -1718,6 +1718,10 @@ usr/lib/python2.7/httplib.pyc #usr/lib/python2.7/idlelib/dynOptionMenuWidget.pyc #usr/lib/python2.7/idlelib/dynOptionMenuWidget.pyo #usr/lib/python2.7/idlelib/extend.txt +#usr/lib/python2.7/idlelib/help.html +#usr/lib/python2.7/idlelib/help.py +#usr/lib/python2.7/idlelib/help.pyc +#usr/lib/python2.7/idlelib/help.pyo #usr/lib/python2.7/idlelib/help.txt #usr/lib/python2.7/idlelib/idle.bat #usr/lib/python2.7/idlelib/idle.py @@ -1756,12 +1760,18 @@ usr/lib/python2.7/httplib.pyc #usr/lib/python2.7/idlelib/idle_test/test_delegator.py #usr/lib/python2.7/idlelib/idle_test/test_delegator.pyc #usr/lib/python2.7/idlelib/idle_test/test_delegator.pyo +#usr/lib/python2.7/idlelib/idle_test/test_editmenu.py +#usr/lib/python2.7/idlelib/idle_test/test_editmenu.pyc +#usr/lib/python2.7/idlelib/idle_test/test_editmenu.pyo #usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.py #usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyc #usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyo #usr/lib/python2.7/idlelib/idle_test/test_grep.py #usr/lib/python2.7/idlelib/idle_test/test_grep.pyc #usr/lib/python2.7/idlelib/idle_test/test_grep.pyo +#usr/lib/python2.7/idlelib/idle_test/test_helpabout.py +#usr/lib/python2.7/idlelib/idle_test/test_helpabout.pyc +#usr/lib/python2.7/idlelib/idle_test/test_helpabout.pyo #usr/lib/python2.7/idlelib/idle_test/test_hyperparser.py #usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyc #usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyo @@ -1916,7 +1926,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -#usr/lib/python2.7/lib-dynload/Python-2.7.10-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.13-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -2092,9 +2102,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.13.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.10.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.13.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo @@ -2129,9 +2139,6 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib2to3/fixes/fix_buffer.py #usr/lib/python2.7/lib2to3/fixes/fix_buffer.pyc #usr/lib/python2.7/lib2to3/fixes/fix_buffer.pyo -#usr/lib/python2.7/lib2to3/fixes/fix_callable.py -#usr/lib/python2.7/lib2to3/fixes/fix_callable.pyc -#usr/lib/python2.7/lib2to3/fixes/fix_callable.pyo #usr/lib/python2.7/lib2to3/fixes/fix_dict.py #usr/lib/python2.7/lib2to3/fixes/fix_dict.pyc #usr/lib/python2.7/lib2to3/fixes/fix_dict.pyo @@ -2750,6 +2757,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/_mock_backport.py #usr/lib/python2.7/test/_mock_backport.pyc #usr/lib/python2.7/test/_mock_backport.pyo +#usr/lib/python2.7/test/allsans.pem #usr/lib/python2.7/test/audiodata #usr/lib/python2.7/test/audiodata/pluck-pcm16.aiff #usr/lib/python2.7/test/audiodata/pluck-pcm16.au @@ -2784,16 +2792,14 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/badsyntax_future8.py #usr/lib/python2.7/test/badsyntax_future9.py #usr/lib/python2.7/test/badsyntax_nocaret.py -#usr/lib/python2.7/test/buffer_tests.py -#usr/lib/python2.7/test/buffer_tests.pyc -#usr/lib/python2.7/test/buffer_tests.pyo #usr/lib/python2.7/test/capath +#usr/lib/python2.7/test/capath/0e4015b9.0 #usr/lib/python2.7/test/capath/4e1295a3.0 #usr/lib/python2.7/test/capath/5ed36f99.0 #usr/lib/python2.7/test/capath/6e88d7b8.0 #usr/lib/python2.7/test/capath/99d0fa06.0 +#usr/lib/python2.7/test/capath/ce7b8643.0 #usr/lib/python2.7/test/cfgparser.1 -#usr/lib/python2.7/test/check_soundcard.vbs #usr/lib/python2.7/test/cjkencodings #usr/lib/python2.7/test/cjkencodings/big5-utf8.txt #usr/lib/python2.7/test/cjkencodings/big5.txt @@ -2993,7 +2999,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/gdb_sample.pyc #usr/lib/python2.7/test/gdb_sample.pyo #usr/lib/python2.7/test/greyrgb.uue -#usr/lib/python2.7/test/https_svn_python_org_root.pem #usr/lib/python2.7/test/ieee754.txt #usr/lib/python2.7/test/imghdrdata #usr/lib/python2.7/test/imghdrdata/python.bmp @@ -3105,6 +3110,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/ssl_servers.py #usr/lib/python2.7/test/ssl_servers.pyc #usr/lib/python2.7/test/ssl_servers.pyo +#usr/lib/python2.7/test/ssltests.py +#usr/lib/python2.7/test/ssltests.pyc +#usr/lib/python2.7/test/ssltests.pyo #usr/lib/python2.7/test/string_tests.py #usr/lib/python2.7/test/string_tests.pyc #usr/lib/python2.7/test/string_tests.pyo @@ -3319,9 +3327,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_codeop.py #usr/lib/python2.7/test/test_codeop.pyc #usr/lib/python2.7/test/test_codeop.pyo -#usr/lib/python2.7/test/test_coding.py -#usr/lib/python2.7/test/test_coding.pyc -#usr/lib/python2.7/test/test_coding.pyo #usr/lib/python2.7/test/test_coercion.py #usr/lib/python2.7/test/test_coercion.pyc #usr/lib/python2.7/test/test_coercion.pyo @@ -3837,6 +3842,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_optparse.py #usr/lib/python2.7/test/test_optparse.pyc #usr/lib/python2.7/test/test_optparse.pyo +#usr/lib/python2.7/test/test_ordered_dict.py +#usr/lib/python2.7/test/test_ordered_dict.pyc +#usr/lib/python2.7/test/test_ordered_dict.pyo #usr/lib/python2.7/test/test_os.py #usr/lib/python2.7/test/test_os.pyc #usr/lib/python2.7/test/test_os.pyo @@ -3855,15 +3863,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_pep247.py #usr/lib/python2.7/test/test_pep247.pyc #usr/lib/python2.7/test/test_pep247.pyo -#usr/lib/python2.7/test/test_pep263.py -#usr/lib/python2.7/test/test_pep263.pyc -#usr/lib/python2.7/test/test_pep263.pyo #usr/lib/python2.7/test/test_pep277.py #usr/lib/python2.7/test/test_pep277.pyc #usr/lib/python2.7/test/test_pep277.pyo -#usr/lib/python2.7/test/test_pep292.py -#usr/lib/python2.7/test/test_pep292.pyc -#usr/lib/python2.7/test/test_pep292.pyo #usr/lib/python2.7/test/test_pep352.py #usr/lib/python2.7/test/test_pep352.pyc #usr/lib/python2.7/test/test_pep352.pyo @@ -4047,6 +4049,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_sort.py #usr/lib/python2.7/test/test_sort.pyc #usr/lib/python2.7/test/test_sort.pyo +#usr/lib/python2.7/test/test_source_encoding.py +#usr/lib/python2.7/test/test_source_encoding.pyc +#usr/lib/python2.7/test/test_source_encoding.pyo #usr/lib/python2.7/test/test_spwd.py #usr/lib/python2.7/test/test_spwd.pyc #usr/lib/python2.7/test/test_spwd.pyo @@ -4194,6 +4199,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_tuple.py #usr/lib/python2.7/test/test_tuple.pyc #usr/lib/python2.7/test/test_tuple.pyo +#usr/lib/python2.7/test/test_turtle.py +#usr/lib/python2.7/test/test_turtle.pyc +#usr/lib/python2.7/test/test_turtle.pyo #usr/lib/python2.7/test/test_typechecks.py #usr/lib/python2.7/test/test_typechecks.pyc #usr/lib/python2.7/test/test_typechecks.pyo -- 2.13.0

1 0

[PATCH] libgpg-error: Update to 1.27
by Matthias Fischer 03 Jun '17

03 Jun '17

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/libgpg-error | 5 ++++- lfs/libgpg-error | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/libgpg-error b/config/rootfiles/common/libgpg-error index 92ac1f3f9..6945f3495 100644 --- a/config/rootfiles/common/libgpg-error +++ b/config/rootfiles/common/libgpg-error @@ -1,10 +1,11 @@ usr/bin/gpg-error #usr/bin/gpg-error-config #usr/include/gpg-error.h +#usr/include/gpgrt.h #usr/lib/libgpg-error.la #usr/lib/libgpg-error.so usr/lib/libgpg-error.so.0 -usr/lib/libgpg-error.so.0.19.1 +usr/lib/libgpg-error.so.0.22.0 #usr/share/aclocal/gpg-error.m4 #usr/share/common-lisp #usr/share/common-lisp/source @@ -14,6 +15,8 @@ usr/lib/libgpg-error.so.0.19.1 #usr/share/common-lisp/source/gpg-error/gpg-error.asd #usr/share/common-lisp/source/gpg-error/gpg-error.lisp #usr/share/info/gpgrt.info +#usr/share/libgpg-error +#usr/share/libgpg-error/errorref.txt #usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo #usr/share/locale/da/LC_MESSAGES/libgpg-error.mo #usr/share/locale/de/LC_MESSAGES/libgpg-error.mo diff --git a/lfs/libgpg-error b/lfs/libgpg-error index 84af2aa36..ac618dcca 100644 --- a/lfs/libgpg-error +++ b/lfs/libgpg-error @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2017 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.24 +VER = 1.27 THISAPP = libgpg-error-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = feb42198c0aaf3b28eabe8f41a34b983 +$(DL_FILE)_MD5 = 5217ef3e76a7275a2a3b569a12ddc989 install : $(TARGET) -- 2.13.0

1 0

[PATCH] libgcrypt: Update to 1.7.7
by Matthias Fischer 03 Jun '17

03 Jun '17

For details see: https://github.com/gpg/libgcrypt/commits/master Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/libgcrypt | 2 +- lfs/libgcrypt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt index 470634341..725593f8b 100644 --- a/config/rootfiles/common/libgcrypt +++ b/config/rootfiles/common/libgcrypt @@ -6,7 +6,7 @@ #usr/lib/libgcrypt.la #usr/lib/libgcrypt.so usr/lib/libgcrypt.so.20 -usr/lib/libgcrypt.so.20.1.3 +usr/lib/libgcrypt.so.20.1.7 #usr/share/aclocal/libgcrypt.m4 #usr/share/info/gcrypt.info #usr/share/man/man1/hmac256.1 diff --git a/lfs/libgcrypt b/lfs/libgcrypt index 5a060325b..5d5572c99 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2017 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.7.3 +VER = 1.7.7 THISAPP = libgcrypt-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c869e542cc13a1c28d8055487bf7f5c4 +$(DL_FILE)_MD5 = d1769481b1b506a632fd66c5e5f62e41 install : $(TARGET) -- 2.13.0

1 0

[PATCH 1/4] ipv4: new function ipv4_net_is_valid
by Jonatan Schlag 03 Jun '17

03 Jun '17

This function checks if a given network is valid IPv4 network Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/functions/functions.ipv4 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/functions/functions.ipv4 b/src/functions/functions.ipv4 index f63c2b7..e893f5e 100644 --- a/src/functions/functions.ipv4 +++ b/src/functions/functions.ipv4 @@ -51,6 +51,15 @@ ipv4_prefix_is_valid() { return ${EXIT_TRUE} } +ipv4_net_is_valid() { + local net="${1}" + + local prefix="$(ip_get_prefix "${net}")" + local addr="$(ip_split_prefix "${net}")" + + ipv4_prefix_is_valid "${prefix}" && ipv4_is_valid "${addr}" +} + ipv4_netmask_is_valid() { local netmask="${1}" -- 2.6.3

2 4

[PATCH] squid: Update to 3.5.26
by Matthias Fischer 02 Jun '17

02 Jun '17

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/squid | 19 +-- ...=> squid-3.5.26-fix-max-file-descriptors.patch} | 0 src/patches/squid/squid-3.5-14155.patch | 46 ------ src/patches/squid/squid-3.5-14156.patch | 44 ----- src/patches/squid/squid-3.5-14157.patch | 34 ---- src/patches/squid/squid-3.5-14158.patch | 46 ------ src/patches/squid/squid-3.5-14159.patch | 35 ---- src/patches/squid/squid-3.5-14160.patch | 39 ----- src/patches/squid/squid-3.5-14161.patch | 52 ------ src/patches/squid/squid-3.5-14162.patch | 133 --------------- src/patches/squid/squid-3.5-14163.patch | 103 ------------ src/patches/squid/squid-3.5-14164.patch | 103 ------------ src/patches/squid/squid-3.5-14165.patch | 51 ------ src/patches/squid/squid-3.5-14166.patch | 47 ------ src/patches/squid/squid-3.5-14167.patch | 181 --------------------- 15 files changed, 3 insertions(+), 930 deletions(-) rename src/patches/{squid-3.5.25-fix-max-file-descriptors.patch => squid-3.5.26-fix-max-file-descriptors.patch} (100%) delete mode 100644 src/patches/squid/squid-3.5-14155.patch delete mode 100644 src/patches/squid/squid-3.5-14156.patch delete mode 100644 src/patches/squid/squid-3.5-14157.patch delete mode 100644 src/patches/squid/squid-3.5-14158.patch delete mode 100644 src/patches/squid/squid-3.5-14159.patch delete mode 100644 src/patches/squid/squid-3.5-14160.patch delete mode 100644 src/patches/squid/squid-3.5-14161.patch delete mode 100644 src/patches/squid/squid-3.5-14162.patch delete mode 100644 src/patches/squid/squid-3.5-14163.patch delete mode 100644 src/patches/squid/squid-3.5-14164.patch delete mode 100644 src/patches/squid/squid-3.5-14165.patch delete mode 100644 src/patches/squid/squid-3.5-14166.patch delete mode 100644 src/patches/squid/squid-3.5-14167.patch diff --git a/lfs/squid b/lfs/squid index 49db48a65..22659ed84 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.5.25 +VER = 3.5.26 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6b7dd7b42b1adacf08f3155640ea2782 +$(DL_FILE)_MD5 = 510e2c84773879c00d0e7ced997864d9 install : $(TARGET) @@ -70,20 +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/squid-3.5-14155.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14156.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14157.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14158.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14159.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14160.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14161.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14162.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14163.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14164.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14165.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14166.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14167.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.25-fix-max-file-descriptors.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.26-fix-max-file-descriptors.patch cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/src/patches/squid-3.5.25-fix-max-file-descriptors.patch b/src/patches/squid-3.5.26-fix-max-file-descriptors.patch similarity index 100% rename from src/patches/squid-3.5.25-fix-max-file-descriptors.patch rename to src/patches/squid-3.5.26-fix-max-file-descriptors.patch diff --git a/src/patches/squid/squid-3.5-14155.patch b/src/patches/squid/squid-3.5-14155.patch deleted file mode 100644 index d110289f7..000000000 --- a/src/patches/squid/squid-3.5-14155.patch +++ /dev/null @@ -1,46 +0,0 @@ ------------------------------------------------------------- -revno: 14155 -revision-id: squid3(a)treenet.co.nz-20170504061416-ks61dfut8wyml2qu -parent: squid3(a)treenet.co.nz-20170402121452-ox6d8ttzlmbov3xm -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4682 -author: Christos Tsantilas <chtsanti(a)users.sourceforge.net> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Thu 2017-05-04 18:14:16 +1200 -message: - Bug 4682: Fix ssl_bump "bump" action documentation - - Fixes squid documentation to correctly describe the squid behavior when the - "bump" action is selected on step SslBump1. In this case squid selects - the client-first bumping mode. - - This is a Measurement Factory project ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20170504061416-ks61dfut8wyml2qu -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: f3b4861a085e069948da25398782237609037c5f -# timestamp: 2017-05-04 06:16:54 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20170402121452-\ -# ox6d8ttzlmbov3xm -# -# Begin patch -=== modified file 'src/cf.data.pre' ---- src/cf.data.pre 2017-03-31 23:38:31 +0000 -+++ src/cf.data.pre 2017-05-04 06:14:16 +0000 -@@ -2669,8 +2669,11 @@ - This is the default action. - - bump -- Establish a secure connection with the server and, using a -- mimicked server certificate, with the client. -+ When used on step SslBump1, establishes a secure connection -+ with the client first, then connect to the server. -+ When used on step SslBump2 or SslBump3, establishes a secure -+ connection with the server and, using a mimicked server -+ certificate, with the client. - - peek - Receive client (step SslBump1) or server (step SslBump2) - diff --git a/src/patches/squid/squid-3.5-14156.patch b/src/patches/squid/squid-3.5-14156.patch deleted file mode 100644 index 59e58a5d7..000000000 --- a/src/patches/squid/squid-3.5-14156.patch +++ /dev/null @@ -1,44 +0,0 @@ ------------------------------------------------------------- -revno: 14156 -revision-id: squid3(a)treenet.co.nz-20170508110920-73gma737u4x6ce87 -parent: squid3(a)treenet.co.nz-20170504061416-ks61dfut8wyml2qu -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4695 -author: Lubos Uhliarik <luhliari(a)redhat.com> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Mon 2017-05-08 23:09:20 +1200 -message: - Bug 4695: squidpurge: GCC 7 build errors ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20170508110920-73gma737u4x6ce87 -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: a0f0c573b5be3d81cf0f8e65ae52bf27bd08dba5 -# timestamp: 2017-05-08 11:51:08 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20170504061416-\ -# ks61dfut8wyml2qu -# -# Begin patch -=== modified file 'tools/purge/purge.cc' ---- tools/purge/purge.cc 2017-01-01 00:16:45 +0000 -+++ tools/purge/purge.cc 2017-05-08 11:09:20 +0000 -@@ -272,7 +272,7 @@ - snprintf( md5, sizeof(md5), "%-32s", "(no_md5_data_available)" ); - } - -- char timeb[64]; -+ char timeb[256]; - if ( meta && (findings = meta->search( STORE_META_STD )) ) { - StoreMetaStd temp; - // make data aligned, avoid SIGBUS on RISC machines (ARGH!) -@@ -283,7 +283,7 @@ - } else if ( meta && (findings = meta->search( STORE_META_STD_LFS )) ) { - StoreMetaStdLFS temp; - // make data aligned, avoid SIGBUS on RISC machines (ARGH!) -- memcpy( &temp, findings->data, sizeof(StoreMetaStd) ); -+ memcpy( &temp, findings->data, sizeof(StoreMetaStdLFS) ); - snprintf( timeb, sizeof(timeb), "%08lx %08lx %08lx %08lx %04x %5hu ", - (unsigned long)temp.timestamp, (unsigned long)temp.lastref, - (unsigned long)temp.expires, (unsigned long)temp.lastmod, temp.flags, temp.refcount ); - diff --git a/src/patches/squid/squid-3.5-14157.patch b/src/patches/squid/squid-3.5-14157.patch deleted file mode 100644 index 39d298c7d..000000000 --- a/src/patches/squid/squid-3.5-14157.patch +++ /dev/null @@ -1,34 +0,0 @@ ------------------------------------------------------------- -revno: 14157 -revision-id: squid3(a)treenet.co.nz-20170529042116-kp9naxxmdsqicpjv -parent: squid3(a)treenet.co.nz-20170508110920-73gma737u4x6ce87 -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4589 -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Mon 2017-05-29 16:21:16 +1200 -message: - Bug 4589: ssl_crtd: returning zero on failure ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20170529042116-kp9naxxmdsqicpjv -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: ad29dd184416dc47dee80234c541185cca166bb3 -# timestamp: 2017-05-29 04:39:57 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20170508110920-\ -# 73gma737u4x6ce87 -# -# Begin patch -=== modified file 'src/ssl/ssl_crtd.cc' ---- src/ssl/ssl_crtd.cc 2017-01-01 00:16:45 +0000 -+++ src/ssl/ssl_crtd.cc 2017-05-29 04:21:16 +0000 -@@ -350,7 +350,7 @@ - } - } catch (std::runtime_error & error) { - std::cerr << argv[0] << ": " << error.what() << std::endl; -- return 0; -+ return -1; - } - return 0; - } - diff --git a/src/patches/squid/squid-3.5-14158.patch b/src/patches/squid/squid-3.5-14158.patch deleted file mode 100644 index f0ed0f0d6..000000000 --- a/src/patches/squid/squid-3.5-14158.patch +++ /dev/null @@ -1,46 +0,0 @@ ------------------------------------------------------------- -revno: 14158 -revision-id: squid3(a)treenet.co.nz-20170529043611-1hyb93ivtu5wrdwg -parent: squid3(a)treenet.co.nz-20170529042116-kp9naxxmdsqicpjv -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3102 -author: Martin von Gagern <martin.vgagern(a)gmx.net> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Mon 2017-05-29 16:36:11 +1200 -message: - Bug 3102: FTP directory listing drops fist character of file names ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20170529043611-1hyb93ivtu5wrdwg -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: 60a5f01fc9c9967c55c651c31546cb1067325705 -# timestamp: 2017-05-29 04:39:59 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20170529042116-\ -# kp9naxxmdsqicpjv -# -# Begin patch -=== modified file 'src/clients/FtpGateway.cc' ---- src/clients/FtpGateway.cc 2017-02-26 08:50:09 +0000 -+++ src/clients/FtpGateway.cc 2017-05-29 04:36:11 +0000 -@@ -626,10 +626,17 @@ - while (strchr(w_space, *copyFrom)) - ++copyFrom; - } else { -- /* XXX assumes a single space between date and filename -+ /* Handle the following four formats: -+ * "MMM DD YYYY Name" -+ * "MMM DD YYYYName" -+ * "MMM DD YYYY Name" -+ * "MMM DD YYYY Name" -+ * Assuming a single space between date and filename - * suggested by: Nathan.Bailey(a)cc.monash.edu.au and - * Mike Battersby <mike(a)starbug.bofh.asn.au> */ -- copyFrom += strlen(tbuf) + 1; -+ copyFrom += strlen(tbuf); -+ if (strchr(w_space, *copyFrom)) -+ ++copyFrom; - } - - p->name = xstrdup(copyFrom); - diff --git a/src/patches/squid/squid-3.5-14159.patch b/src/patches/squid/squid-3.5-14159.patch deleted file mode 100644 index a50f470c7..000000000 --- a/src/patches/squid/squid-3.5-14159.patch +++ /dev/null @@ -1,35 +0,0 @@ ------------------------------------------------------------- -revno: 14159 -revision-id: squid3(a)treenet.co.nz-20170529043741-9chwfs5onxuip52x -parent: squid3(a)treenet.co.nz-20170529043611-1hyb93ivtu5wrdwg -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3772 -author: Rainer Tammer <rainer.tammer(a)schulergroup.com> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Mon 2017-05-29 16:37:41 +1200 -message: - Bug 3772: message from FTP server gets mangled ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20170529043741-9chwfs5onxuip52x -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: 800db5dab62d996440fd6fccd35e9f1f34f2f0e1 -# timestamp: 2017-05-29 04:40:02 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20170529043611-\ -# 1hyb93ivtu5wrdwg -# -# Begin patch -=== modified file 'src/clients/FtpGateway.cc' ---- src/clients/FtpGateway.cc 2017-05-29 04:36:11 +0000 -+++ src/clients/FtpGateway.cc 2017-05-29 04:37:41 +0000 -@@ -1541,7 +1541,7 @@ - /* Reset cwd_message to only include the last message */ - ftpState->cwd_message.reset(""); - for (wordlist *w = ftpState->ctrl.message; w; w = w->next) { -- ftpState->cwd_message.append(' '); -+ ftpState->cwd_message.append('\n'); - ftpState->cwd_message.append(w->key); - } - ftpState->ctrl.message = NULL; - diff --git a/src/patches/squid/squid-3.5-14160.patch b/src/patches/squid/squid-3.5-14160.patch deleted file mode 100644 index 9f5122c5a..000000000 --- a/src/patches/squid/squid-3.5-14160.patch +++ /dev/null @@ -1,39 +0,0 @@ ------------------------------------------------------------- -revno: 14160 -revision-id: squid3(a)treenet.co.nz-20170529043852-zkf91gxhaqdj0rkn -parent: squid3(a)treenet.co.nz-20170529043741-9chwfs5onxuip52x -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Mon 2017-05-29 16:38:52 +1200 -message: - Add OpenSSL library details to -v output - - This is partially to meet the OpenSSL copyright requirement that binaries - mention when they are using the library, and partially for admin to see - which library their Squid is using when multiple are present in the system. ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20170529043852-zkf91gxhaqdj0rkn -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: c401fe3de5518102ac6a3a4dc7b121ac415c05d4 -# timestamp: 2017-05-29 04:40:04 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20170529043741-\ -# 9chwfs5onxuip52x -# -# Begin patch -=== modified file 'src/main.cc' ---- src/main.cc 2017-02-26 08:52:45 +0000 -+++ src/main.cc 2017-05-29 04:38:52 +0000 -@@ -563,6 +563,10 @@ - printf("Service Name: " SQUIDSBUFPH "\n", SQUIDSBUFPRINT(service_name)); - if (strlen(SQUID_BUILD_INFO)) - printf("%s\n",SQUID_BUILD_INFO); -+#if USE_OPENSSL -+ printf("\nThis binary uses %s. ", SSLeay_version(SSLEAY_VERSION)); -+ printf("For legal restrictions on distribution see https://www.openssl.org/source/license.html\n\n"); -+#endif - printf( "configure options: %s\n", SQUID_CONFIGURE_OPTIONS); - - #if USE_WIN32_SERVICE - diff --git a/src/patches/squid/squid-3.5-14161.patch b/src/patches/squid/squid-3.5-14161.patch deleted file mode 100644 index d3aaa2d35..000000000 --- a/src/patches/squid/squid-3.5-14161.patch +++ /dev/null @@ -1,52 +0,0 @@ ------------------------------------------------------------- -revno: 14161 -revision-id: squid3(a)treenet.co.nz-20170529053359-xtbuev2zwmdfj9mp -parent: squid3(a)treenet.co.nz-20170529043852-zkf91gxhaqdj0rkn -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4682 -author: Christos Tsantilas <chtsanti(a)users.sourceforge.net> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Mon 2017-05-29 17:33:59 +1200 -message: - Bug 4653: %st lies about tunneled traffic volumes - - Squid-5 and squid-4 does not count the "HTTP/1.1 200 Connection Established" - header size for %<st formatting code. - - This is a Measurement Factory project ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20170529053359-xtbuev2zwmdfj9mp -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: c340785d0d5042ae0f783d606f0998d605290ac4 -# timestamp: 2017-05-29 05:51:04 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20170529043852-\ -# zkf91gxhaqdj0rkn -# -# Begin patch -=== modified file 'src/tunnel.cc' ---- src/tunnel.cc 2017-01-01 00:16:45 +0000 -+++ src/tunnel.cc 2017-05-29 05:33:59 +0000 -@@ -836,7 +836,7 @@ - * Call the tunnelStartShoveling to start the blind pump. - */ - static void --tunnelConnectedWriteDone(const Comm::ConnectionPointer &conn, char *buf, size_t size, Comm::Flag flag, int xerrno, void *data) -+tunnelConnectedWriteDone(const Comm::ConnectionPointer &conn, char *, size_t len, Comm::Flag flag, int, void *data) - { - TunnelStateData *tunnelState = (TunnelStateData *)data; - debugs(26, 3, HERE << conn << ", flag=" << flag); -@@ -848,6 +848,11 @@ - return; - } - -+ if (ClientHttpRequest *http = tunnelState->http.get()) { -+ http->out.headers_sz += len; -+ http->out.size += len; -+ } -+ - tunnelStartShoveling(tunnelState); - } - - diff --git a/src/patches/squid/squid-3.5-14162.patch b/src/patches/squid/squid-3.5-14162.patch deleted file mode 100644 index 140aea732..000000000 --- a/src/patches/squid/squid-3.5-14162.patch +++ /dev/null @@ -1,133 +0,0 @@ ------------------------------------------------------------- -revno: 14162 -revision-id: squid3(a)treenet.co.nz-20170529055234-790hfbazjwy0fmk4 -parent: squid3(a)treenet.co.nz-20170529053359-xtbuev2zwmdfj9mp -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4711 -author: Christos Tsantilas <chtsanti(a)users.sourceforge.net> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Mon 2017-05-29 17:52:34 +1200 -message: - Bug 4711: SubjectAlternativeNames is missing in some generated certificates - - Squid may generate certificates which have a Common Name, but do not have - a subjectAltName extension. For example when squid generated certificates - do not mimic an origin certificate or when the certificate adaptation - algorithm sslproxy_cert_adapt/setCommonName is used. - - This is causes problems to some browsers, which validates a certificate using - the SubjectAlternativeNames but ignore the CommonName field. - - This patch fixes squid to always add a SubjectAlternativeNames extension in - generated certificates which do not mimic an origin certificate. - - Squid still will not add a subjectAltName extension when mimicking an origin - server certificate, even if that origin server certificate does not include - the subjectAltName extension. Such origin server may have problems when - talking directly to browsers, and patched Squid is not trying to fix those - problems. - - This is a Measurement Factory project ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20170529055234-790hfbazjwy0fmk4 -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: e3162152cf590c8126eb3d189ea1ab90ba9a5c37 -# timestamp: 2017-05-29 05:54:13 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20170529053359-\ -# xtbuev2zwmdfj9mp -# -# Begin patch -=== modified file 'src/ssl/gadgets.cc' ---- src/ssl/gadgets.cc 2017-01-01 00:16:45 +0000 -+++ src/ssl/gadgets.cc 2017-05-29 05:52:34 +0000 -@@ -339,7 +339,40 @@ - return added; - } - --static bool buildCertificate(Ssl::X509_Pointer & cert, Ssl::CertificateProperties const &properties) -+/// Adds a new subjectAltName extension contining Subject CN or returns false -+/// expects the caller to check for the existing subjectAltName extension -+static bool -+addAltNameWithSubjectCn(Ssl::X509_Pointer &cert) -+{ -+ X509_NAME *name = X509_get_subject_name(cert.get()); -+ if (!name) -+ return false; -+ -+ const int loc = X509_NAME_get_index_by_NID(name, NID_commonName, -1); -+ if (loc < 0) -+ return false; -+ -+ ASN1_STRING *cn_data = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name, loc)); -+ if (!cn_data) -+ return false; -+ -+ char dnsName[1024]; // DNS names are limited to 256 characters -+ const int res = snprintf(dnsName, sizeof(dnsName), "DNS:%*s", cn_data->length, cn_data->data); -+ if (res <= 0 || res >= static_cast<int>(sizeof(dnsName))) -+ return false; -+ -+ X509_EXTENSION *ext = X509V3_EXT_conf_nid(NULL, NULL, NID_subject_alt_name, dnsName); -+ if (!ext) -+ return false; -+ -+ const bool result = X509_add_ext(cert.get(), ext, -1); -+ -+ X509_EXTENSION_free(ext); -+ return result; -+} -+ -+static bool -+buildCertificate(Ssl::X509_Pointer & cert, Ssl::CertificateProperties const &properties) - { - // not an Ssl::X509_NAME_Pointer because X509_REQ_get_subject_name() - // returns a pointer to the existing subject name. Nothing to clean here. -@@ -387,6 +420,8 @@ - } else if (!X509_gmtime_adj(X509_get_notAfter(cert.get()), 60*60*24*356*3)) - return false; - -+ int addedExtensions = 0; -+ bool useCommonNameAsAltName = true; - // mimic the alias and possibly subjectAltName - if (properties.mimicCert.get()) { - unsigned char *alStr; -@@ -396,26 +431,29 @@ - X509_alias_set1(cert.get(), alStr, alLen); - } - -- int addedExtensions = 0; -- - // Mimic subjectAltName unless we used a configured CN: browsers reject - // certificates with CN unrelated to subjectAltNames. - if (!properties.setCommonName) { -- int pos=X509_get_ext_by_NID (properties.mimicCert.get(), OBJ_sn2nid("subjectAltName"), -1); -+ int pos = X509_get_ext_by_NID(properties.mimicCert.get(), NID_subject_alt_name, -1); - X509_EXTENSION *ext=X509_get_ext(properties.mimicCert.get(), pos); - if (ext) { - if (X509_add_ext(cert.get(), ext, -1)) - ++addedExtensions; - } -+ // We want to mimic the server-sent subjectAltName, not enhance it. -+ useCommonNameAsAltName = false; - } - - addedExtensions += mimicExtensions(cert, properties.mimicCert); -- -- // According to RFC 5280, using extensions requires v3 certificate. -- if (addedExtensions) -- X509_set_version(cert.get(), 2); // value 2 means v3 - } - -+ if (useCommonNameAsAltName && addAltNameWithSubjectCn(cert)) -+ ++addedExtensions; -+ -+ // According to RFC 5280, using extensions requires v3 certificate. -+ if (addedExtensions) -+ X509_set_version(cert.get(), 2); // value 2 means v3 -+ - return true; - } - - diff --git a/src/patches/squid/squid-3.5-14163.patch b/src/patches/squid/squid-3.5-14163.patch deleted file mode 100644 index d4e27b7eb..000000000 --- a/src/patches/squid/squid-3.5-14163.patch +++ /dev/null @@ -1,103 +0,0 @@ ------------------------------------------------------------- -revno: 14163 -revision-id: squid3(a)treenet.co.nz-20170529062945-gf7u7dukaumjof74 -parent: squid3(a)treenet.co.nz-20170529055234-790hfbazjwy0fmk4 -author: Ingo Schwarze, Francesco Chemolli <kinkie(a)squid-cache.org> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Mon 2017-05-29 18:29:45 +1200 -message: - Docs: Improve formatting of several manual pages ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20170529062945-gf7u7dukaumjof74 -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: b417bbc7ffb2351fb670e7baa721b9d9b8315024 -# timestamp: 2017-05-29 06:33:51 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20170529055234-\ -# 790hfbazjwy0fmk4 -# -# Begin patch -=== modified file 'helpers/basic_auth/LDAP/basic_ldap_auth.8' ---- helpers/basic_auth/LDAP/basic_ldap_auth.8 2017-03-31 23:47:47 +0000 -+++ helpers/basic_auth/LDAP/basic_ldap_auth.8 2017-05-29 06:29:45 +0000 -@@ -5,9 +5,9 @@ - . - .SH SYNOPSIS - .if !'po4a'hide' .B basic_ldap_auth --.if !'po4a'hide' .B \-b\ \" -+.if !'po4a'hide' .B \-b\ \(dq - base DN --.if !'po4a'hide' .B \"\ [\-u -+.if !'po4a'hide' .B \(dq\ [\-u - attribute - .if !'po4a'hide' .B ]\ [ - options -@@ -20,11 +20,11 @@ - .if !'po4a'hide' .B ]... - .br - .if !'po4a'hide' .B basic_ldap_auth --.if !'po4a'hide' .B \-b\ \" -+.if !'po4a'hide' .B \-b\ \(dq - base DN --.if !'po4a'hide' .B \"\ \-f\ \" -+.if !'po4a'hide' .B \(dq\ \-f\ \(dq - LDAP search filter --.if !'po4a'hide' .B \"\ [ -+.if !'po4a'hide' .B \(dq\ [ - options - .if !'po4a'hide' .B ]\ [ - LDAP server name -@@ -74,7 +74,7 @@ - The search filter can contain up to 15 occurrences of - .B %s - which will be replaced by the username, as in --.B "\"uid\=%s\"" -+.B "\(dquid\=%s\(dq" - for RFC2037 directories. For a detailed description of LDAP search - filter syntax see RFC2254. - .br - -=== modified file 'helpers/basic_auth/RADIUS/basic_radius_auth.8' ---- helpers/basic_auth/RADIUS/basic_radius_auth.8 2017-01-01 00:16:45 +0000 -+++ helpers/basic_auth/RADIUS/basic_radius_auth.8 2017-05-29 06:29:45 +0000 -@@ -9,9 +9,9 @@ - config file - .br - .if !'po4a'hide' .B basic_radius_auth --.if !'po4a'hide' .B "\-h \"" -+.if !'po4a'hide' .B "\-h \(dq" - server name --.if !'po4a'hide' .B "\" [\-p " -+.if !'po4a'hide' .B "\(dq [\-p " - port - .if !'po4a'hide' .B "] [\-i " - identifier - -=== modified file 'helpers/external_acl/file_userip/ext_file_userip_acl.8' ---- helpers/external_acl/file_userip/ext_file_userip_acl.8 2017-01-01 00:16:45 +0000 -+++ helpers/external_acl/file_userip/ext_file_userip_acl.8 2017-05-29 06:29:45 +0000 -@@ -68,7 +68,7 @@ - .B ALL - and - .B NONE --, which mean \"any user on this IP address may authenticate\" or \"no user on this IP address may authenticate\". -+, which mean \(dqany user on this IP address may authenticate\(dq or \(dqno user on this IP address may authenticate\(dq. - . - .SH AUTHOR - This program was written by - -=== modified file 'tools/squidclient/squidclient.1' ---- tools/squidclient/squidclient.1 2017-01-01 00:16:45 +0000 -+++ tools/squidclient/squidclient.1 2017-05-29 06:29:45 +0000 -@@ -86,7 +86,7 @@ - .if !'po4a'hide' .TP - .if !'po4a'hide' .B "\-H 'string'" - Extra headers to send. Use --.B '\\n' -+.B '\en' - for new lines. - . - .if !'po4a'hide' .TP - diff --git a/src/patches/squid/squid-3.5-14164.patch b/src/patches/squid/squid-3.5-14164.patch deleted file mode 100644 index 9e64909c3..000000000 --- a/src/patches/squid/squid-3.5-14164.patch +++ /dev/null @@ -1,103 +0,0 @@ ------------------------------------------------------------- -revno: 14164 -revision-id: squid3(a)treenet.co.nz-20170529063645-qmu68scq9go0wbqr -parent: squid3(a)treenet.co.nz-20170529062945-gf7u7dukaumjof74 -author: Alex Rousskov <rousskov(a)measurement-factory.com> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Mon 2017-05-29 18:36:45 +1200 -message: - Fix xstrndup() documentation, callers. Disclosed implementation bugs. - - xstrndup() does not work like strndup(3), and some callers got confused: - - 1. When n is the str length or less, standard strndup(str,n) copies all - n bytes but our xstrndup(str,n) drops the last one. Thus, all callers - must add one to the desired result length when calling xstrndup(). - Most already do, but it is often hard to see due to low code quality - (e.g., one must remember that MAX_URL is not the maximum URL length). - - 2. xstrndup() also assumes that the source string is 0-terminated. This - dangerous assumption does not contradict many official strndup(3) - descriptions, but that lack of contradiction is actually a recently - fixed POSIX documentation bug (i.e., correct implementations must not - assume 0-termination): http://austingroupbugs.net/view.php?id=1019 - - The OutOfBoundsException bug led to truncated exception messages. - - The ESI bug led to truncated 'literal strings', but I do not know what - that means in terms of user impact. That ESI fix is untested. - - cachemgr.cc bug was masked by the fact that the buffer ends with \n - that is unused and stripped by the custom xstrtok() implementation. - - TODO. Fix xstrndup() implementation (and rename the function so that - fixed callers do not misbehave if carelessly ported to older Squids). ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20170529063645-qmu68scq9go0wbqr -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: 7321050a4405a155a8fe02f7125e446b9516dd51 -# timestamp: 2017-05-29 06:51:18 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20170529062945-\ -# gf7u7dukaumjof74 -# -# Begin patch -=== modified file 'compat/xstring.h' ---- compat/xstring.h 2017-01-01 00:16:45 +0000 -+++ compat/xstring.h 2017-05-29 06:36:45 +0000 -@@ -41,7 +41,10 @@ - char *xstrncpy(char *dst, const char *src, size_t n); - - /** -- * xstrndup() - same as strndup(3). Used for portability. -+ * xstrndup() - Somewhat similar(XXX) to strndup(3): Allocates up to n bytes, -+ * while strndup(3) copies up to n bytes and allocates up to n+1 bytes -+ * to fit the terminating character. Assumes s is 0-terminated (another XXX). -+ * - * Never returns NULL; fatal on error. - * - * Sets errno to EINVAL if a NULL pointer or negative - -=== modified file 'src/SBufExceptions.cc' ---- src/SBufExceptions.cc 2017-01-01 00:16:45 +0000 -+++ src/SBufExceptions.cc 2017-05-29 06:36:45 +0000 -@@ -25,9 +25,7 @@ - explanatoryText.appendf(" in file %s", aFileName); - explanatoryText.appendf(" while accessing position %d in a SBuf long %d", - pos, throwingBuf.length()); -- // we can safely alias c_str as both are local to the object -- // and will not further manipulated. -- message = xstrndup(explanatoryText.c_str(),explanatoryText.length()); -+ message = xstrdup(explanatoryText.c_str()); - } - - OutOfBoundsException::~OutOfBoundsException() throw() - -=== modified file 'src/esi/Expression.cc' ---- src/esi/Expression.cc 2017-01-01 00:16:45 +0000 -+++ src/esi/Expression.cc 2017-05-29 06:36:45 +0000 -@@ -743,7 +743,7 @@ - /* Special case for zero length strings */ - - if (t - s - 1) -- rv.value.string = xstrndup(s + 1, t - s - 1); -+ rv.value.string = xstrndup(s + 1, t - (s + 1) + 1); - else - rv.value.string = static_cast<char *>(xcalloc(1,1)); - - -=== modified file 'tools/cachemgr.cc' ---- tools/cachemgr.cc 2017-01-01 00:16:45 +0000 -+++ tools/cachemgr.cc 2017-05-29 06:36:45 +0000 -@@ -440,7 +440,7 @@ - return; - } - -- buf_copy = x = xstrndup(buf, bufLen); -+ buf_copy = x = xstrndup(buf, bufLen+1); - - a = xstrtok(&x, '\t'); - - diff --git a/src/patches/squid/squid-3.5-14165.patch b/src/patches/squid/squid-3.5-14165.patch deleted file mode 100644 index 317cd8dd3..000000000 --- a/src/patches/squid/squid-3.5-14165.patch +++ /dev/null @@ -1,51 +0,0 @@ ------------------------------------------------------------- -revno: 14165 -revision-id: squid3(a)treenet.co.nz-20170529071037-o91o8xvaqata5y2b -parent: squid3(a)treenet.co.nz-20170529063645-qmu68scq9go0wbqr -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4682 -author: Christos Tsantilas <chtsanti(a)users.sourceforge.net> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Mon 2017-05-29 19:10:37 +1200 -message: - Bug 4682: ignoring http_access deny when client-first bumping mode is used - - Squid fails to identify HTTP requests which are tunneled inside an already - established client-first bumped tunnel, and this is results in ignoring - http_access denied for these requests. - - This is a Measurement Factory project ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20170529071037-o91o8xvaqata5y2b -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: f77b81826612d7248fb774ef1ea00747cd04d479 -# timestamp: 2017-05-29 07:51:03 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20170529063645-\ -# qmu68scq9go0wbqr -# -# Begin patch -=== modified file 'src/client_side_request.cc' ---- src/client_side_request.cc 2017-03-30 13:31:22 +0000 -+++ src/client_side_request.cc 2017-05-29 07:10:37 +0000 -@@ -1424,7 +1424,17 @@ - if (bumpMode != Ssl::bumpEnd) { - debugs(85, 5, HERE << "SslBump already decided (" << bumpMode << - "), " << "ignoring ssl_bump for " << http->getConn()); -- if (!http->getConn()->serverBump()) -+ -+ // We need the following "if" for transparently bumped TLS connection, -+ // because in this case we are running ssl_bump access list before -+ // the doCallouts runs. It can be removed after the bug #4340 fixed. -+ // We do not want to proceed to bumping steps: -+ // - if the TLS connection with the client is already established -+ // because we are accepting normal HTTP requests on TLS port, -+ // or because of the client-first bumping mode -+ // - When the bumping is already started -+ if (!http->getConn()->switchedToHttps() && -+ !http->getConn()->serverBump()) - http->sslBumpNeed(bumpMode); // for processRequest() to bump if needed and not already bumped - http->al->ssl.bumpMode = bumpMode; // inherited from bumped connection - return false; - diff --git a/src/patches/squid/squid-3.5-14166.patch b/src/patches/squid/squid-3.5-14166.patch deleted file mode 100644 index 54aad51b1..000000000 --- a/src/patches/squid/squid-3.5-14166.patch +++ /dev/null @@ -1,47 +0,0 @@ ------------------------------------------------------------- -revno: 14166 -revision-id: squid3(a)treenet.co.nz-20170529125748-qt7yhdloygl4xosg -parent: squid3(a)treenet.co.nz-20170529071037-o91o8xvaqata5y2b -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Tue 2017-05-30 00:57:48 +1200 -message: - Revert r14161 - - Wrong patch and commit message. ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20170529125748-qt7yhdloygl4xosg -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: ddecde537486c58df04564f3818b8ad9929dd186 -# timestamp: 2017-05-29 13:51:06 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20170529071037-\ -# o91o8xvaqata5y2b -# -# Begin patch -=== modified file 'src/tunnel.cc' ---- src/tunnel.cc 2017-05-29 05:33:59 +0000 -+++ src/tunnel.cc 2017-05-29 12:57:48 +0000 -@@ -836,7 +836,7 @@ - * Call the tunnelStartShoveling to start the blind pump. - */ - static void --tunnelConnectedWriteDone(const Comm::ConnectionPointer &conn, char *, size_t len, Comm::Flag flag, int, void *data) -+tunnelConnectedWriteDone(const Comm::ConnectionPointer &conn, char *buf, size_t size, Comm::Flag flag, int xerrno, void *data) - { - TunnelStateData *tunnelState = (TunnelStateData *)data; - debugs(26, 3, HERE << conn << ", flag=" << flag); -@@ -848,11 +848,6 @@ - return; - } - -- if (ClientHttpRequest *http = tunnelState->http.get()) { -- http->out.headers_sz += len; -- http->out.size += len; -- } -- - tunnelStartShoveling(tunnelState); - } - - diff --git a/src/patches/squid/squid-3.5-14167.patch b/src/patches/squid/squid-3.5-14167.patch deleted file mode 100644 index 39c9fd51e..000000000 --- a/src/patches/squid/squid-3.5-14167.patch +++ /dev/null @@ -1,181 +0,0 @@ ------------------------------------------------------------- -revno: 14167 -revision-id: squid3(a)treenet.co.nz-20170529131555-kut221f3geb3aczf -parent: squid3(a)treenet.co.nz-20170529125748-qt7yhdloygl4xosg -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4653 -author: Christos Tsantilas <chtsanti(a)users.sourceforge.net> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.5 -timestamp: Tue 2017-05-30 01:15:55 +1200 -message: - Bug 4653: %st lies about tunneled traffic volumes - - Squid-3.5 counts only the "CONNECT ..." header size for %>st and does not - count the "HTTP/1.1 200" response header for the %<st. - - This is a Measurement Factory project ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20170529131555-kut221f3geb3aczf -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# testament_sha1: dd5783b425c7c7125303a1bd1a5685bc28011754 -# timestamp: 2017-05-29 13:51:09 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 -# base_revision_id: squid3(a)treenet.co.nz-20170529125748-\ -# qt7yhdloygl4xosg -# -# Begin patch -=== modified file 'src/client_side.cc' ---- src/client_side.cc 2017-03-31 00:51:52 +0000 -+++ src/client_side.cc 2017-05-29 13:15:55 +0000 -@@ -4391,7 +4391,7 @@ - // in.buf still has the "CONNECT ..." request data, reset it to SSL hello message - connState->in.buf.append(rbuf.content(), rbuf.contentSize()); - ClientHttpRequest *http = context->http; -- tunnelStart(http, &http->out.size, &http->al->http.code, http->al); -+ tunnelStart(http); - } - } - } - -=== modified file 'src/client_side_reply.cc' ---- src/client_side_reply.cc 2017-01-01 00:16:45 +0000 -+++ src/client_side_reply.cc 2017-05-29 13:15:55 +0000 -@@ -1179,7 +1179,7 @@ - if (curReply->content_length < 0) - return 0; - -- int64_t expectedLength = curReply->content_length + http->out.headers_sz; -+ uint64_t expectedLength = curReply->content_length + http->out.headers_sz; - - if (http->out.size < expectedLength) - return 0; - -=== modified file 'src/client_side_request.cc' ---- src/client_side_request.cc 2017-05-29 07:10:37 +0000 -+++ src/client_side_request.cc 2017-05-29 13:15:55 +0000 -@@ -1522,7 +1522,7 @@ - } - #endif - getConn()->stopReading(); // tunnels read for themselves -- tunnelStart(this, &out.size, &al->http.code, al); -+ tunnelStart(this); - return; - } - - -=== modified file 'src/client_side_request.h' ---- src/client_side_request.h 2017-01-23 02:05:46 +0000 -+++ src/client_side_request.h 2017-05-29 13:15:55 +0000 -@@ -73,7 +73,7 @@ - - struct { - int64_t offset; -- int64_t size; -+ uint64_t size; - size_t headers_sz; - } out; - -@@ -182,7 +182,7 @@ - void clientAccessCheck(ClientHttpRequest *); - - /* ones that should be elsewhere */ --void tunnelStart(ClientHttpRequest *, int64_t *, int *, const AccessLogEntry::Pointer &al); -+void tunnelStart(ClientHttpRequest *); - - #if _USE_INLINE_ - #include "client_side_request.cci" - -=== modified file 'src/tests/stub_tunnel.cc' ---- src/tests/stub_tunnel.cc 2017-01-01 00:16:45 +0000 -+++ src/tests/stub_tunnel.cc 2017-05-29 13:15:55 +0000 -@@ -14,7 +14,7 @@ - #include "FwdState.h" - class ClientHttpRequest; - --void tunnelStart(ClientHttpRequest *, int64_t *, int *, const AccessLogEntryPointer &al) STUB -+void tunnelStart(ClientHttpRequest *) STUB - - void switchToTunnel(HttpRequest *request, Comm::ConnectionPointer &clientConn, Comm::ConnectionPointer &srvConn) STUB - - -=== modified file 'src/tunnel.cc' ---- src/tunnel.cc 2017-05-29 12:57:48 +0000 -+++ src/tunnel.cc 2017-05-29 13:15:55 +0000 -@@ -139,7 +139,7 @@ - int len; - char *buf; - AsyncCall::Pointer writer; ///< pending Comm::Write callback -- int64_t *size_ptr; /* pointer to size in an ConnStateData for logging */ -+ uint64_t *size_ptr; /* pointer to size in an ConnStateData for logging */ - - Comm::ConnectionPointer conn; ///< The currently connected connection. - uint8_t delayedLoops; ///< how many times a read on this connection has been postponed. -@@ -848,6 +848,11 @@ - return; - } - -+ if (ClientHttpRequest *http = tunnelState->http.get()) { -+ http->out.headers_sz += size; -+ http->out.size += size; -+ } -+ - tunnelStartShoveling(tunnelState); - } - -@@ -995,7 +1000,7 @@ - } - - void --tunnelStart(ClientHttpRequest * http, int64_t * size_ptr, int *status_ptr, const AccessLogEntryPointer &al) -+tunnelStart(ClientHttpRequest * http) - { - debugs(26, 3, HERE); - /* Create state structure. */ -@@ -1021,7 +1026,7 @@ - if (ch.fastCheck() == ACCESS_DENIED) { - debugs(26, 4, HERE << "MISS access forbidden."); - err = new ErrorState(ERR_FORWARDING_DENIED, Http::scForbidden, request); -- *status_ptr = Http::scForbidden; -+ http->al->http.code = Http::scForbidden; - errorSend(http->getConn()->clientConnection, err); - return; - } -@@ -1037,12 +1042,13 @@ - #endif - tunnelState->url = xstrdup(url); - tunnelState->request = request; -- tunnelState->server.size_ptr = size_ptr; -- tunnelState->status_ptr = status_ptr; -+ tunnelState->server.size_ptr = &http->out.size; -+ tunnelState->client.size_ptr = &http->al->http.clientRequestSz.payloadData; -+ tunnelState->status_ptr = &http->al->http.code; - tunnelState->logTag_ptr = &http->logType; - tunnelState->client.conn = http->getConn()->clientConnection; - tunnelState->http = http; -- tunnelState->al = al; -+ tunnelState->al = http->al ; - tunnelState->started = squid_curtime; - - comm_add_close_handler(tunnelState->client.conn->fd, -@@ -1053,7 +1059,7 @@ - CommTimeoutCbPtrFun(tunnelTimeout, tunnelState)); - commSetConnTimeout(tunnelState->client.conn, Config.Timeout.lifetime, timeoutCall); - -- peerSelect(&(tunnelState->serverDestinations), request, al, -+ peerSelect(&(tunnelState->serverDestinations), request, tunnelState->al, - NULL, - tunnelPeerSelectComplete, - tunnelState); -@@ -1226,6 +1232,10 @@ - if (context != NULL && context->http != NULL) { - tunnelState->logTag_ptr = &context->http->logType; - tunnelState->server.size_ptr = &context->http->out.size; -+ if (context->http->al != NULL) { -+ tunnelState->al = context->http->al; -+ tunnelState->client.size_ptr = &context->http->al->http.clientRequestSz.payloadData; -+ } - - #if USE_DELAY_POOLS - /* no point using the delayIsNoDelay stuff since tunnel is nice and simple */ - -- 2.13.0

1 0

Bugzilla Updates
by Michael Tremer 02 Jun '17

02 Jun '17

Hello fellow developers, I just implemented a few changes into our Bugzilla instance that I have been wanting to do for a long time now. The motivation for this is that most reporters just create a new bug and set the priority and severity to "highest." Of the course the latest bug report is always the most important one. When there is no reaction after a day, some people even complain and refer to the priority being high. Obviously all of this doesn't even help anyone. However, there are a lot of bugs in Bugzilla. And that is first of all a good thing. Every documented problem is something that we can deal better with. Even if we don't resolve it straight away. But there are also quite important bugs that need quicker attention. For this, the priority and severity settings were initially designed, but as pointed out above they are hard to use. So I came up with a new concept. This is not brilliantly new, but at least new for us here at IPFire: Instead of having options for "Priority" from "lowest", "low", "normal", "high", "highest", we can now pick between these options: * Will affect all users * Will affect most users * Will affect an average number of users * Will only affect a few users * Will affect almost no one I think this is self-explanatory and just makes clear what this field is for: Determining how many people are affected by a certain problem. The severity field had "low" to "important" as well, but now has been changed to: * Documentation * Localization * Aesthetic Issue * Balancing * Minor Usability * Major Usability * Crash So this will help us to determine how bad a certain problem is and if there is a way to work around it or not. The combination of both of them really shows us how important a bug is. For example if you have a Crash that affects all users that is quite bad. If you have a Crash that only affects a few users, this has a rather low importance. So far most bugs are a little bit all over the place since I did not always change these fields back to normal levels and now translated them from the original values to the new ones. Hope this all makes sense for you as well. If there are any questions or comments, please email back! Best, -Michael

1 0

[PATCH] ip: rename ip_is_network to ip_net_is_valid
by Jonatan Schlag 02 Jun '17

02 Jun '17

We rename this function to state clear what the function is actually doing. The function checks if a network is valid and not if something is a network or not. Fixes: 11357 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- Makefile.am | 2 +- src/functions/functions.ip | 2 +- src/functions/functions.route | 8 ++++---- test/functions/ip/ip_is_network | 27 --------------------------- test/functions/ip/ip_net_is_valid | 27 +++++++++++++++++++++++++++ 5 files changed, 33 insertions(+), 33 deletions(-) delete mode 100755 test/functions/ip/ip_is_network create mode 100755 test/functions/ip/ip_net_is_valid diff --git a/Makefile.am b/Makefile.am index acf5a71..7a28bb1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -445,7 +445,7 @@ TESTS = \ test/load-library \ test/functions/ip/ip_detect_protocol \ test/functions/ip/ip_get_prefix \ - test/functions/ip/ip_is_network \ + test/functions/ip/ip_net_is_valid \ test/functions/ip/ip_is_valid \ test/functions/ip/ip_network_is_subnet_of \ test/functions/ip/ip_prefix_is_valid \ diff --git a/src/functions/functions.ip b/src/functions/functions.ip index 97750e3..ec108ac 100644 --- a/src/functions/functions.ip +++ b/src/functions/functions.ip @@ -79,7 +79,7 @@ ip_is_valid() { return ${EXIT_FALSE} } -ip_is_network() { +ip_net_is_valid() { local network=${1} assert isset network diff --git a/src/functions/functions.route b/src/functions/functions.route index 1b6369e..86328a0 100644 --- a/src/functions/functions.route +++ b/src/functions/functions.route @@ -56,7 +56,7 @@ route_add() { assert isset network - if ! ip_is_network ${network} && ! ip_is_valid ${network}; then + if ! ip_net_is_valid ${network} && ! ip_is_valid ${network}; then error "The given network is invalid: ${network}" return ${EXIT_ERROR} fi @@ -154,7 +154,7 @@ route_remove() { for _network in $@; do # Validate input - if ! ip_is_network ${_network} && ! ip_is_valid ${_network}; then + if ! ip_net_is_valid ${_network} && ! ip_is_valid ${_network}; then error "Invalid IP address or network: ${_network}" error=${EXIT_ERROR} continue @@ -296,7 +296,7 @@ route_parse_line() { isset network || return ${EXIT_ERROR} # Is network or IP valid? - if ! ip_is_network ${network} && ! ip_is_valid ${network}; then + if ! ip_net_is_valid ${network} && ! ip_is_valid ${network}; then error "The given network is invalid: ${network}" return ${EXIT_ERROR} fi @@ -408,7 +408,7 @@ route_entry_add() { assert isset network - if ! ip_is_network ${network} && ! ip_is_valid ${network}; then + if ! ip_net_is_valid ${network} && ! ip_is_valid ${network}; then error "The given network is invalid: ${network}" return ${EXIT_ERROR} fi diff --git a/test/functions/ip/ip_is_network b/test/functions/ip/ip_is_network deleted file mode 100755 index 9e9a546..0000000 --- a/test/functions/ip/ip_is_network +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -. ${functions} - -. ${testdir}/constants.sh - -failed=0 - -for network in ${VALID_NETWORKS[@]}; do - if ip_is_network ${network}; then - echo "OK: network: ${network} is valid" - else - echo "ERROR: network ${network} is invalid" - failed=1 - fi -done - -for network in ${INVALID_NETWORKS[@]}; do - if ! ip_is_network ${network}; then - echo "OK: network: ${network} is invalid" - else - echo "ERROR: network: ${network} is valid" - failed=1 - fi -done - -exit ${failed} diff --git a/test/functions/ip/ip_net_is_valid b/test/functions/ip/ip_net_is_valid new file mode 100755 index 0000000..4db59e8 --- /dev/null +++ b/test/functions/ip/ip_net_is_valid @@ -0,0 +1,27 @@ +#!/bin/bash + +. ${functions} + +. ${testdir}/constants.sh + +failed=0 + +for network in ${VALID_NETWORKS[@]}; do + if ip_net_is_valid ${network}; then + echo "OK: network: ${network} is valid" + else + echo "ERROR: network ${network} is invalid" + failed=1 + fi +done + +for network in ${INVALID_NETWORKS[@]}; do + if ! ip_net_is_valid ${network}; then + echo "OK: network: ${network} is invalid" + else + echo "ERROR: network: ${network} is valid" + failed=1 + fi +done + +exit ${failed} -- 2.6.3

1 0

[PATCH] man: update the pppoe zone documentation
by Jonatan Schlag 02 Jun '17

02 Jun '17

Fixes: #11375 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- man/network-zone-pppoe.xml | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/man/network-zone-pppoe.xml b/man/network-zone-pppoe.xml index e010676..36c4d0e 100644 --- a/man/network-zone-pppoe.xml +++ b/man/network-zone-pppoe.xml @@ -49,21 +49,6 @@ </para> <variablelist> - <varlistentry> - <term> - <option>--port=<replaceable>PORT</replaceable></option> - </term> - - <listitem> - <para> - This options sets the port, pppd is using to connect to - the modem. - </para> - <para> - This may be a normal ethernet or vlan interface. - </para> - </listitem> - </varlistentry> <varlistentry> <term> @@ -157,6 +142,30 @@ </para> </listitem> </varlistentry> + + <varlistentry> + <term> + <option>--ipv6=[<emphasis>on</emphasis>|off]</option> + </term> + + <listitem> + <para> + By this option, you may enable or disable IPv6 + </para> </listitem> + </varlistentry> + + <varlistentry> + <term> + <option>--prefix-delegation=[<emphasis>on</emphasis>|off]</option> + </term> + + <listitem> + <para> + By this option, you may enable or disable the delegation through your provider of one IPv6 prefix to your system. + </para> + </listitem> + </varlistentry> + </variablelist> </refsect1> -- 2.6.3

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development June 2017