IPFire-SCM December 2018

ipfire-scm@lists.ipfire.org

1 participants
37 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 086bb132ec3155b9221cee5acf307fabfb7515b6
by Michael Tremer 19 Dec '18

19 Dec '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 086bb132ec3155b9221cee5acf307fabfb7515b6 (commit) via 4af8d6964beb8abc822bada4b8dc1474a098514e (commit) from 909549b1d6af51a8b18d4fc799370b32bf7861ce (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 086bb132ec3155b9221cee5acf307fabfb7515b6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Dec 19 18:55:23 2018 +0000 ipvsadm: Update to 1.29 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4af8d6964beb8abc822bada4b8dc1474a098514e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Dec 19 15:42:23 2018 +0000 pcre: Enable JIT This is now possible because we no longer run grsecurity-enabled kernels. The performance of PCRE increases dramatically and applications like the IDS benefit hugely: https://blog.inliniac.net/2011/10/12/suricata-and-pcre-performance/ Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/101 => core/127}/filelists/pcre | 0 lfs/ipvsadm | 8 ++++---- lfs/pcre | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) copy config/rootfiles/{oldcore/101 => core/127}/filelists/pcre (100%) Difference in files: diff --git a/config/rootfiles/core/127/filelists/pcre b/config/rootfiles/core/127/filelists/pcre new file mode 120000 index 000000000..b390d9a36 --- /dev/null +++ b/config/rootfiles/core/127/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/lfs/ipvsadm b/lfs/ipvsadm index db245b997..6345237f0 100644 --- a/lfs/ipvsadm +++ b/lfs/ipvsadm @@ -24,15 +24,15 @@ include Config -VER = 1.26 +VER = 1.29 THISAPP = ipvsadm-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipvsadm -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = eac3ba3f62cd4dea2da353aeddd353a8 +$(DL_FILE)_MD5 = 12f0d3b4d436e941d0c4dbe358144bfd install : $(TARGET) diff --git a/lfs/pcre b/lfs/pcre index 66b34cc30..dc6621f1c 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --prefix=/usr \ --disable-static \ --enable-utf8 \ - --disable-jit \ + --enable-jit \ --enable-pcre16 \ --enable-pcre32 \ --enable-pcregrep-libz \ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0c55b410c662bf766ba8ca6133279630bf153410
by Michael Tremer 18 Dec '18

18 Dec '18

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 909549b1d6af51a8b18d4fc799370b32bf7861ce
by Michael Tremer 18 Dec '18

18 Dec '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 909549b1d6af51a8b18d4fc799370b32bf7861ce (commit) via 452e537092ba0310dab68e5aeaac4c96fbc4a409 (commit) via a2bcb4135bc7b64a54c06f12a0e577830ecf3ebf (commit) via 27801da08916e6826f99c2c51461d53f403aaf5b (commit) via cab2314ac41105e678be25ba379f58ec43f2ee9e (commit) via a38eb040bfcad9372bca895029d974b587aa011b (commit) from 57c04aa49db6b93dee562477ce9fec5141c787a6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 909549b1d6af51a8b18d4fc799370b32bf7861ce Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Thu Dec 13 17:02:44 2018 +0000 Update libvirt to version 4.10 This partially fixes #11941 as libvirt now states clearly that seccomp needs to be disabled Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 452e537092ba0310dab68e5aeaac4c96fbc4a409 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Dec 18 22:32:07 2018 +0000 core127: Ship updated squid Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a2bcb4135bc7b64a54c06f12a0e577830ecf3ebf Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Dec 13 18:40:24 2018 +0100 squid: Update to 4.4 (stable) For details see: http://www.squid-cache.org/Versions/v4/changesets/ In July 2018, 'squid 4' was "released for production use", see: https://wiki.squid-cache.org/Squid-4 "The features have been set and large code changes are reserved for later versions." I've tested almost all 4.x-versions and patch series before with good results. Right now, 4.4 is running here with no seen problems together with 'squidclamav', 'squidguard' and 'privoxy'. I too would declare this version stable. Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 27801da08916e6826f99c2c51461d53f403aaf5b Author: erik.kapfer <ummeegge(a)ipfire.org> Date: Fri Dec 14 12:43:00 2018 +0100 unbound: Add TFO support for unbound For further informations, see https://tools.ietf.org/html/rfc7413 Signed-off-by: erik.kapfer <ummeegge(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cab2314ac41105e678be25ba379f58ec43f2ee9e Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Dec 14 21:20:15 2018 +0100 bind: Update to 9.11.5-P1 For details see: http://ftp.isc.org/isc/bind9/9.11.5-P1/RELEASE-NOTES-bind-9.11.5-P1.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a38eb040bfcad9372bca895029d974b587aa011b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Dec 18 22:28:59 2018 +0000 sqlite: Update to 3.26.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/bind | 2 +- config/rootfiles/common/squid | 64 +++- .../{oldcore/125 => core/127}/filelists/sqlite | 0 .../{oldcore/100 => core/127}/filelists/squid | 0 config/rootfiles/core/127/update.sh | 2 + config/rootfiles/packages/libvirt | 397 ++++++++++++--------- lfs/bind | 4 +- lfs/libvirt | 4 +- lfs/sqlite | 4 +- lfs/squid | 15 +- lfs/unbound | 2 + ...tion_via_D_in_ERR_SECURE_CONNECT_FAIL_306.patch | 72 ---- ..._netdb_exchange_with_a_TLS_cache_peer_307.patch | 91 +++++ ..._memory_leak_when_parsing_SNMP_packet_313.patch | 22 -- ..._tarball_format_formally_to_make_dist_325.patch | 22 ++ .../03_The_handshake_logformat_code_331.patch | 132 +++++++ ...ch => squid-4.4-fix-max-file-descriptors.patch} | 4 +- 17 files changed, 552 insertions(+), 285 deletions(-) copy config/rootfiles/{oldcore/125 => core/127}/filelists/sqlite (100%) copy config/rootfiles/{oldcore/100 => core/127}/filelists/squid (100%) delete mode 100644 src/patches/squid/01_Certificate_fields_injection_via_D_in_ERR_SECURE_CONNECT_FAIL_306.patch create mode 100644 src/patches/squid/01_Fix_netdb_exchange_with_a_TLS_cache_peer_307.patch delete mode 100644 src/patches/squid/02_Fix_memory_leak_when_parsing_SNMP_packet_313.patch create mode 100644 src/patches/squid/02_Maintenance_add_xz_tarball_format_formally_to_make_dist_325.patch create mode 100644 src/patches/squid/03_The_handshake_logformat_code_331.patch rename src/patches/squid/{squid-3.5.28-fix-max-file-descriptors.patch => squid-4.4-fix-max-file-descriptors.patch} (92%) Difference in files: diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index 7ddfab332..bbe0e0741 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -270,7 +270,7 @@ usr/lib/libbind9.so.161.0.0 #usr/lib/libdns.la #usr/lib/libdns.so usr/lib/libdns.so.1104 -usr/lib/libdns.so.1104.0.0 +usr/lib/libdns.so.1104.0.1 #usr/lib/libisc.la #usr/lib/libisc.so usr/lib/libisc.so.1100 diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index 4e8259a6d..6c8998f93 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -20,7 +20,6 @@ usr/lib/squid/basic_db_auth usr/lib/squid/basic_fake_auth usr/lib/squid/basic_getpwnam_auth usr/lib/squid/basic_ldap_auth -usr/lib/squid/basic_msnt_multi_domain_auth usr/lib/squid/basic_ncsa_auth usr/lib/squid/basic_nis_auth usr/lib/squid/basic_pam_auth @@ -29,7 +28,6 @@ usr/lib/squid/basic_radius_auth usr/lib/squid/basic_sasl_auth usr/lib/squid/basic_smb_auth usr/lib/squid/basic_smb_auth.sh -usr/lib/squid/basic_smb_lm_auth #usr/lib/squid/cachemgr.cgi usr/lib/squid/digest_edirectory_auth usr/lib/squid/digest_file_auth @@ -69,6 +67,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/af/ERR_NO_RELAY #usr/lib/squid/errors/af/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/af/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/af/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/af/ERR_READ_ERROR #usr/lib/squid/errors/af/ERR_READ_TIMEOUT #usr/lib/squid/errors/af/ERR_SECURE_CONNECT_FAIL @@ -128,6 +127,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/ar/ERR_NO_RELAY #usr/lib/squid/errors/ar/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/ar/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/ar/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/ar/ERR_READ_ERROR #usr/lib/squid/errors/ar/ERR_READ_TIMEOUT #usr/lib/squid/errors/ar/ERR_SECURE_CONNECT_FAIL @@ -172,6 +172,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/az/ERR_NO_RELAY #usr/lib/squid/errors/az/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/az/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/az/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/az/ERR_READ_ERROR #usr/lib/squid/errors/az/ERR_READ_TIMEOUT #usr/lib/squid/errors/az/ERR_SECURE_CONNECT_FAIL @@ -216,6 +217,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/bg/ERR_NO_RELAY #usr/lib/squid/errors/bg/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/bg/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/bg/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/bg/ERR_READ_ERROR #usr/lib/squid/errors/bg/ERR_READ_TIMEOUT #usr/lib/squid/errors/bg/ERR_SECURE_CONNECT_FAIL @@ -229,6 +231,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/bg/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/bg/error-details.txt #usr/lib/squid/errors/ca +#usr/lib/squid/errors/ca-es #usr/lib/squid/errors/ca/ERR_ACCESS_DENIED #usr/lib/squid/errors/ca/ERR_ACL_TIME_QUOTA_EXCEEDED #usr/lib/squid/errors/ca/ERR_AGENT_CONFIGURE @@ -259,6 +262,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/ca/ERR_NO_RELAY #usr/lib/squid/errors/ca/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/ca/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/ca/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/ca/ERR_READ_ERROR #usr/lib/squid/errors/ca/ERR_READ_TIMEOUT #usr/lib/squid/errors/ca/ERR_SECURE_CONNECT_FAIL @@ -303,6 +307,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/cs/ERR_NO_RELAY #usr/lib/squid/errors/cs/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/cs/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/cs/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/cs/ERR_READ_ERROR #usr/lib/squid/errors/cs/ERR_READ_TIMEOUT #usr/lib/squid/errors/cs/ERR_SECURE_CONNECT_FAIL @@ -347,6 +352,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/da/ERR_NO_RELAY #usr/lib/squid/errors/da/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/da/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/da/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/da/ERR_READ_ERROR #usr/lib/squid/errors/da/ERR_READ_TIMEOUT #usr/lib/squid/errors/da/ERR_SECURE_CONNECT_FAIL @@ -395,6 +401,7 @@ usr/lib/squid/errors/de/ERR_LIFETIME_EXP usr/lib/squid/errors/de/ERR_NO_RELAY usr/lib/squid/errors/de/ERR_ONLY_IF_CACHED_MISS usr/lib/squid/errors/de/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/de/ERR_PROTOCOL_UNKNOWN usr/lib/squid/errors/de/ERR_READ_ERROR usr/lib/squid/errors/de/ERR_READ_TIMEOUT usr/lib/squid/errors/de/ERR_SECURE_CONNECT_FAIL @@ -439,6 +446,7 @@ usr/lib/squid/errors/de/error-details.txt #usr/lib/squid/errors/el/ERR_NO_RELAY #usr/lib/squid/errors/el/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/el/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/el/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/el/ERR_READ_ERROR #usr/lib/squid/errors/el/ERR_READ_TIMEOUT #usr/lib/squid/errors/el/ERR_SECURE_CONNECT_FAIL @@ -455,6 +463,7 @@ usr/lib/squid/errors/de/error-details.txt #usr/lib/squid/errors/en-au #usr/lib/squid/errors/en-bz #usr/lib/squid/errors/en-ca +#usr/lib/squid/errors/en-cn #usr/lib/squid/errors/en-gb #usr/lib/squid/errors/en-ie #usr/lib/squid/errors/en-in @@ -497,6 +506,7 @@ usr/lib/squid/errors/en/ERR_LIFETIME_EXP usr/lib/squid/errors/en/ERR_NO_RELAY usr/lib/squid/errors/en/ERR_ONLY_IF_CACHED_MISS usr/lib/squid/errors/en/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/en/ERR_PROTOCOL_UNKNOWN usr/lib/squid/errors/en/ERR_READ_ERROR usr/lib/squid/errors/en/ERR_READ_TIMEOUT usr/lib/squid/errors/en/ERR_SECURE_CONNECT_FAIL @@ -530,6 +540,7 @@ usr/lib/squid/errors/en/error-details.txt #usr/lib/squid/errors/es-us #usr/lib/squid/errors/es-uy #usr/lib/squid/errors/es-ve +#usr/lib/squid/errors/es-xl usr/lib/squid/errors/es/ERR_ACCESS_DENIED usr/lib/squid/errors/es/ERR_ACL_TIME_QUOTA_EXCEEDED usr/lib/squid/errors/es/ERR_AGENT_CONFIGURE @@ -560,6 +571,7 @@ usr/lib/squid/errors/es/ERR_LIFETIME_EXP usr/lib/squid/errors/es/ERR_NO_RELAY usr/lib/squid/errors/es/ERR_ONLY_IF_CACHED_MISS usr/lib/squid/errors/es/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/es/ERR_PROTOCOL_UNKNOWN usr/lib/squid/errors/es/ERR_READ_ERROR usr/lib/squid/errors/es/ERR_READ_TIMEOUT usr/lib/squid/errors/es/ERR_SECURE_CONNECT_FAIL @@ -604,6 +616,7 @@ usr/lib/squid/errors/es/error-details.txt #usr/lib/squid/errors/et/ERR_NO_RELAY #usr/lib/squid/errors/et/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/et/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/et/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/et/ERR_READ_ERROR #usr/lib/squid/errors/et/ERR_READ_TIMEOUT #usr/lib/squid/errors/et/ERR_SECURE_CONNECT_FAIL @@ -649,6 +662,7 @@ usr/lib/squid/errors/es/error-details.txt #usr/lib/squid/errors/fa/ERR_NO_RELAY #usr/lib/squid/errors/fa/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/fa/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/fa/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/fa/ERR_READ_ERROR #usr/lib/squid/errors/fa/ERR_READ_TIMEOUT #usr/lib/squid/errors/fa/ERR_SECURE_CONNECT_FAIL @@ -693,6 +707,7 @@ usr/lib/squid/errors/es/error-details.txt #usr/lib/squid/errors/fi/ERR_NO_RELAY #usr/lib/squid/errors/fi/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/fi/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/fi/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/fi/ERR_READ_ERROR #usr/lib/squid/errors/fi/ERR_READ_TIMEOUT #usr/lib/squid/errors/fi/ERR_SECURE_CONNECT_FAIL @@ -742,6 +757,7 @@ usr/lib/squid/errors/fr/ERR_LIFETIME_EXP usr/lib/squid/errors/fr/ERR_NO_RELAY usr/lib/squid/errors/fr/ERR_ONLY_IF_CACHED_MISS usr/lib/squid/errors/fr/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/fr/ERR_PROTOCOL_UNKNOWN usr/lib/squid/errors/fr/ERR_READ_ERROR usr/lib/squid/errors/fr/ERR_READ_TIMEOUT usr/lib/squid/errors/fr/ERR_SECURE_CONNECT_FAIL @@ -786,6 +802,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/he/ERR_NO_RELAY #usr/lib/squid/errors/he/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/he/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/he/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/he/ERR_READ_ERROR #usr/lib/squid/errors/he/ERR_READ_TIMEOUT #usr/lib/squid/errors/he/ERR_SECURE_CONNECT_FAIL @@ -830,6 +847,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/hu/ERR_NO_RELAY #usr/lib/squid/errors/hu/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/hu/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/hu/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/hu/ERR_READ_ERROR #usr/lib/squid/errors/hu/ERR_READ_TIMEOUT #usr/lib/squid/errors/hu/ERR_SECURE_CONNECT_FAIL @@ -875,6 +893,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/hy/ERR_NO_RELAY #usr/lib/squid/errors/hy/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/hy/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/hy/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/hy/ERR_READ_ERROR #usr/lib/squid/errors/hy/ERR_READ_TIMEOUT #usr/lib/squid/errors/hy/ERR_SECURE_CONNECT_FAIL @@ -919,6 +938,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/id/ERR_NO_RELAY #usr/lib/squid/errors/id/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/id/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/id/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/id/ERR_READ_ERROR #usr/lib/squid/errors/id/ERR_READ_TIMEOUT #usr/lib/squid/errors/id/ERR_SECURE_CONNECT_FAIL @@ -964,6 +984,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/it/ERR_NO_RELAY #usr/lib/squid/errors/it/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/it/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/it/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/it/ERR_READ_ERROR #usr/lib/squid/errors/it/ERR_READ_TIMEOUT #usr/lib/squid/errors/it/ERR_SECURE_CONNECT_FAIL @@ -1008,6 +1029,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/ja/ERR_NO_RELAY #usr/lib/squid/errors/ja/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/ja/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/ja/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/ja/ERR_READ_ERROR #usr/lib/squid/errors/ja/ERR_READ_TIMEOUT #usr/lib/squid/errors/ja/ERR_SECURE_CONNECT_FAIL @@ -1021,6 +1043,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/ja/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ja/error-details.txt #usr/lib/squid/errors/ka +#usr/lib/squid/errors/ka-ge #usr/lib/squid/errors/ka/ERR_ACCESS_DENIED #usr/lib/squid/errors/ka/ERR_ACL_TIME_QUOTA_EXCEEDED #usr/lib/squid/errors/ka/ERR_AGENT_CONFIGURE @@ -1051,6 +1074,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/ka/ERR_NO_RELAY #usr/lib/squid/errors/ka/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/ka/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/ka/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/ka/ERR_READ_ERROR #usr/lib/squid/errors/ka/ERR_READ_TIMEOUT #usr/lib/squid/errors/ka/ERR_SECURE_CONNECT_FAIL @@ -1063,7 +1087,6 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/ka/ERR_WRITE_ERROR #usr/lib/squid/errors/ka/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ka/error-details.txt -#usr/lib/squid/errors/ka-ge #usr/lib/squid/errors/ko #usr/lib/squid/errors/ko-kp #usr/lib/squid/errors/ko-kr @@ -1097,6 +1120,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/ko/ERR_NO_RELAY #usr/lib/squid/errors/ko/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/ko/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/ko/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/ko/ERR_READ_ERROR #usr/lib/squid/errors/ko/ERR_READ_TIMEOUT #usr/lib/squid/errors/ko/ERR_SECURE_CONNECT_FAIL @@ -1141,6 +1165,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/lt/ERR_NO_RELAY #usr/lib/squid/errors/lt/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/lt/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/lt/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/lt/ERR_READ_ERROR #usr/lib/squid/errors/lt/ERR_READ_TIMEOUT #usr/lib/squid/errors/lt/ERR_SECURE_CONNECT_FAIL @@ -1185,6 +1210,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/lv/ERR_NO_RELAY #usr/lib/squid/errors/lv/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/lv/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/lv/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/lv/ERR_READ_ERROR #usr/lib/squid/errors/lv/ERR_READ_TIMEOUT #usr/lib/squid/errors/lv/ERR_SECURE_CONNECT_FAIL @@ -1229,6 +1255,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/ms/ERR_NO_RELAY #usr/lib/squid/errors/ms/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/ms/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/ms/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/ms/ERR_READ_ERROR #usr/lib/squid/errors/ms/ERR_READ_TIMEOUT #usr/lib/squid/errors/ms/ERR_SECURE_CONNECT_FAIL @@ -1273,6 +1300,7 @@ usr/lib/squid/errors/nl/ERR_LIFETIME_EXP usr/lib/squid/errors/nl/ERR_NO_RELAY usr/lib/squid/errors/nl/ERR_ONLY_IF_CACHED_MISS usr/lib/squid/errors/nl/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/nl/ERR_PROTOCOL_UNKNOWN usr/lib/squid/errors/nl/ERR_READ_ERROR usr/lib/squid/errors/nl/ERR_READ_TIMEOUT usr/lib/squid/errors/nl/ERR_SECURE_CONNECT_FAIL @@ -1316,6 +1344,7 @@ usr/lib/squid/errors/nl/error-details.txt #usr/lib/squid/errors/oc/ERR_NO_RELAY #usr/lib/squid/errors/oc/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/oc/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/oc/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/oc/ERR_READ_ERROR #usr/lib/squid/errors/oc/ERR_READ_TIMEOUT #usr/lib/squid/errors/oc/ERR_SECURE_CONNECT_FAIL @@ -1360,6 +1389,7 @@ usr/lib/squid/errors/pl/ERR_LIFETIME_EXP usr/lib/squid/errors/pl/ERR_NO_RELAY usr/lib/squid/errors/pl/ERR_ONLY_IF_CACHED_MISS usr/lib/squid/errors/pl/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/pl/ERR_PROTOCOL_UNKNOWN usr/lib/squid/errors/pl/ERR_READ_ERROR usr/lib/squid/errors/pl/ERR_READ_TIMEOUT usr/lib/squid/errors/pl/ERR_SECURE_CONNECT_FAIL @@ -1404,6 +1434,7 @@ usr/lib/squid/errors/pl/error-details.txt #usr/lib/squid/errors/pt-br/ERR_NO_RELAY #usr/lib/squid/errors/pt-br/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/pt-br/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/pt-br/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/pt-br/ERR_READ_ERROR #usr/lib/squid/errors/pt-br/ERR_READ_TIMEOUT #usr/lib/squid/errors/pt-br/ERR_SECURE_CONNECT_FAIL @@ -1418,6 +1449,7 @@ usr/lib/squid/errors/pl/error-details.txt #usr/lib/squid/errors/pt-br/error-details.txt #usr/lib/squid/errors/pt-bz #usr/lib/squid/errors/pt-pt +#usr/lib/squid/errors/pt-xl #usr/lib/squid/errors/pt/ERR_ACCESS_DENIED #usr/lib/squid/errors/pt/ERR_ACL_TIME_QUOTA_EXCEEDED #usr/lib/squid/errors/pt/ERR_AGENT_CONFIGURE @@ -1448,6 +1480,7 @@ usr/lib/squid/errors/pl/error-details.txt #usr/lib/squid/errors/pt/ERR_NO_RELAY #usr/lib/squid/errors/pt/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/pt/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/pt/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/pt/ERR_READ_ERROR #usr/lib/squid/errors/pt/ERR_READ_TIMEOUT #usr/lib/squid/errors/pt/ERR_SECURE_CONNECT_FAIL @@ -1493,6 +1526,7 @@ usr/lib/squid/errors/pl/error-details.txt #usr/lib/squid/errors/ro/ERR_NO_RELAY #usr/lib/squid/errors/ro/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/ro/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/ro/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/ro/ERR_READ_ERROR #usr/lib/squid/errors/ro/ERR_READ_TIMEOUT #usr/lib/squid/errors/ro/ERR_SECURE_CONNECT_FAIL @@ -1537,6 +1571,7 @@ usr/lib/squid/errors/ru/ERR_LIFETIME_EXP usr/lib/squid/errors/ru/ERR_NO_RELAY usr/lib/squid/errors/ru/ERR_ONLY_IF_CACHED_MISS usr/lib/squid/errors/ru/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/ru/ERR_PROTOCOL_UNKNOWN usr/lib/squid/errors/ru/ERR_READ_ERROR usr/lib/squid/errors/ru/ERR_READ_TIMEOUT usr/lib/squid/errors/ru/ERR_SECURE_CONNECT_FAIL @@ -1581,6 +1616,7 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/sk/ERR_NO_RELAY #usr/lib/squid/errors/sk/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/sk/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/sk/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/sk/ERR_READ_ERROR #usr/lib/squid/errors/sk/ERR_READ_TIMEOUT #usr/lib/squid/errors/sk/ERR_SECURE_CONNECT_FAIL @@ -1625,6 +1661,7 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/sl/ERR_NO_RELAY #usr/lib/squid/errors/sl/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/sl/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/sl/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/sl/ERR_READ_ERROR #usr/lib/squid/errors/sl/ERR_READ_TIMEOUT #usr/lib/squid/errors/sl/ERR_SECURE_CONNECT_FAIL @@ -1672,6 +1709,7 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/sr-cyrl/ERR_NO_RELAY #usr/lib/squid/errors/sr-cyrl/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/sr-cyrl/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/sr-cyrl/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/sr-cyrl/ERR_READ_ERROR #usr/lib/squid/errors/sr-cyrl/ERR_READ_TIMEOUT #usr/lib/squid/errors/sr-cyrl/ERR_SECURE_CONNECT_FAIL @@ -1718,6 +1756,7 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/sr-latn/ERR_NO_RELAY #usr/lib/squid/errors/sr-latn/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/sr-latn/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/sr-latn/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/sr-latn/ERR_READ_ERROR #usr/lib/squid/errors/sr-latn/ERR_READ_TIMEOUT #usr/lib/squid/errors/sr-latn/ERR_SECURE_CONNECT_FAIL @@ -1765,6 +1804,7 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/sv/ERR_NO_RELAY #usr/lib/squid/errors/sv/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/sv/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/sv/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/sv/ERR_READ_ERROR #usr/lib/squid/errors/sv/ERR_READ_TIMEOUT #usr/lib/squid/errors/sv/ERR_SECURE_CONNECT_FAIL @@ -1808,6 +1848,7 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/templates/ERR_NO_RELAY #usr/lib/squid/errors/templates/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/templates/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/templates/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/templates/ERR_READ_ERROR #usr/lib/squid/errors/templates/ERR_READ_TIMEOUT #usr/lib/squid/errors/templates/ERR_SECURE_CONNECT_FAIL @@ -1852,6 +1893,7 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/th/ERR_NO_RELAY #usr/lib/squid/errors/th/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/th/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/th/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/th/ERR_READ_ERROR #usr/lib/squid/errors/th/ERR_READ_TIMEOUT #usr/lib/squid/errors/th/ERR_SECURE_CONNECT_FAIL @@ -1896,6 +1938,7 @@ usr/lib/squid/errors/tr/ERR_LIFETIME_EXP usr/lib/squid/errors/tr/ERR_NO_RELAY usr/lib/squid/errors/tr/ERR_ONLY_IF_CACHED_MISS usr/lib/squid/errors/tr/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/tr/ERR_PROTOCOL_UNKNOWN usr/lib/squid/errors/tr/ERR_READ_ERROR usr/lib/squid/errors/tr/ERR_READ_TIMEOUT usr/lib/squid/errors/tr/ERR_SECURE_CONNECT_FAIL @@ -1940,6 +1983,7 @@ usr/lib/squid/errors/tr/error-details.txt #usr/lib/squid/errors/uk/ERR_NO_RELAY #usr/lib/squid/errors/uk/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/uk/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/uk/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/uk/ERR_READ_ERROR #usr/lib/squid/errors/uk/ERR_READ_TIMEOUT #usr/lib/squid/errors/uk/ERR_SECURE_CONNECT_FAIL @@ -1983,6 +2027,7 @@ usr/lib/squid/errors/tr/error-details.txt #usr/lib/squid/errors/uz/ERR_NO_RELAY #usr/lib/squid/errors/uz/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/uz/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/uz/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/uz/ERR_READ_ERROR #usr/lib/squid/errors/uz/ERR_READ_TIMEOUT #usr/lib/squid/errors/uz/ERR_SECURE_CONNECT_FAIL @@ -2027,6 +2072,7 @@ usr/lib/squid/errors/tr/error-details.txt #usr/lib/squid/errors/vi/ERR_NO_RELAY #usr/lib/squid/errors/vi/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/vi/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/vi/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/vi/ERR_READ_ERROR #usr/lib/squid/errors/vi/ERR_READ_TIMEOUT #usr/lib/squid/errors/vi/ERR_SECURE_CONNECT_FAIL @@ -2073,6 +2119,7 @@ usr/lib/squid/errors/tr/error-details.txt #usr/lib/squid/errors/zh-hans/ERR_NO_RELAY #usr/lib/squid/errors/zh-hans/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/zh-hans/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/zh-hans/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/zh-hans/ERR_READ_ERROR #usr/lib/squid/errors/zh-hans/ERR_READ_TIMEOUT #usr/lib/squid/errors/zh-hans/ERR_SECURE_CONNECT_FAIL @@ -2119,6 +2166,7 @@ usr/lib/squid/errors/tr/error-details.txt #usr/lib/squid/errors/zh-hant/ERR_NO_RELAY #usr/lib/squid/errors/zh-hant/ERR_ONLY_IF_CACHED_MISS #usr/lib/squid/errors/zh-hant/ERR_PRECONDITION_FAILED +#usr/lib/squid/errors/zh-hant/ERR_PROTOCOL_UNKNOWN #usr/lib/squid/errors/zh-hant/ERR_READ_ERROR #usr/lib/squid/errors/zh-hant/ERR_READ_TIMEOUT #usr/lib/squid/errors/zh-hant/ERR_SECURE_CONNECT_FAIL @@ -2144,7 +2192,7 @@ usr/lib/squid/ext_sql_session_acl usr/lib/squid/ext_time_quota_acl usr/lib/squid/ext_unix_group_acl usr/lib/squid/ext_wbinfo_group_acl -usr/lib/squid/helper-mux.pl +usr/lib/squid/helper-mux usr/lib/squid/icons usr/lib/squid/icons/SN.png usr/lib/squid/icons/silk @@ -2203,18 +2251,19 @@ usr/lib/squid/log_file_daemon usr/lib/squid/mib.txt usr/lib/squid/negotiate_wrapper_auth usr/lib/squid/ntlm_fake_auth -usr/lib/squid/ntlm_smb_lm_auth +usr/lib/squid/security_fake_certverify usr/lib/squid/storeid_file_rewrite usr/lib/squid/unlinkd usr/lib/squid/url_fake_rewrite usr/lib/squid/url_fake_rewrite.sh +usr/lib/squid/url_lfs_rewrite usr/sbin/squid usr/sbin/updxlrator +#usr/share/man/man1/purge.1 #usr/share/man/man1/squidclient.1 #usr/share/man/man8/basic_db_auth.8 #usr/share/man/man8/basic_getpwnam_auth.8 #usr/share/man/man8/basic_ldap_auth.8 -#usr/share/man/man8/basic_msnt_multi_domain_auth.8 #usr/share/man/man8/basic_ncsa_auth.8 #usr/share/man/man8/basic_pam_auth.8 #usr/share/man/man8/basic_pop3_auth.8 @@ -2231,9 +2280,12 @@ usr/sbin/updxlrator #usr/share/man/man8/ext_time_quota_acl.8 #usr/share/man/man8/ext_unix_group_acl.8 #usr/share/man/man8/ext_wbinfo_group_acl.8 +#usr/share/man/man8/helper-mux.8 #usr/share/man/man8/log_db_daemon.8 +#usr/share/man/man8/security_fake_certverify.8 #usr/share/man/man8/squid.8 #usr/share/man/man8/storeid_file_rewrite.8 +#usr/share/man/man8/url_lfs_rewrite.8 #var/cache/squid var/ipfire/proxy/errorpage-ipfire.css var/ipfire/proxy/errorpage-squid.css diff --git a/config/rootfiles/core/127/filelists/sqlite b/config/rootfiles/core/127/filelists/sqlite new file mode 120000 index 000000000..4ea569766 --- /dev/null +++ b/config/rootfiles/core/127/filelists/sqlite @@ -0,0 +1 @@ +../../../common/sqlite \ No newline at end of file diff --git a/config/rootfiles/core/127/filelists/squid b/config/rootfiles/core/127/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/127/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/127/update.sh b/config/rootfiles/core/127/update.sh index 0c928e89a..624ebe492 100644 --- a/config/rootfiles/core/127/update.sh +++ b/config/rootfiles/core/127/update.sh @@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do done # Stop services +/etc/init.d/squid stop # Remove files @@ -46,6 +47,7 @@ ldconfig # Start services /etc/init.d/unbound restart +/etc/init.d/squid start # Finish /etc/init.d/fireinfo start diff --git a/config/rootfiles/packages/libvirt b/config/rootfiles/packages/libvirt index 30b9d1329..633febf05 100644 --- a/config/rootfiles/packages/libvirt +++ b/config/rootfiles/packages/libvirt @@ -62,19 +62,19 @@ usr/bin/virt-xml-validate #usr/lib/libvirt-admin.la #usr/lib/libvirt-admin.so usr/lib/libvirt-admin.so.0 -usr/lib/libvirt-admin.so.0.4006.0 +usr/lib/libvirt-admin.so.0.4010.0 #usr/lib/libvirt-lxc.la #usr/lib/libvirt-lxc.so usr/lib/libvirt-lxc.so.0 -usr/lib/libvirt-lxc.so.0.4006.0 +usr/lib/libvirt-lxc.so.0.4010.0 #usr/lib/libvirt-qemu.la #usr/lib/libvirt-qemu.so usr/lib/libvirt-qemu.so.0 -usr/lib/libvirt-qemu.so.0.4006.0 +usr/lib/libvirt-qemu.so.0.4010.0 #usr/lib/libvirt.la #usr/lib/libvirt.so usr/lib/libvirt.so.0 -usr/lib/libvirt.so.0.4006.0 +usr/lib/libvirt.so.0.4010.0 #usr/lib/libvirt/connection-driver #usr/lib/libvirt/connection-driver/libvirt_driver_interface.la usr/lib/libvirt/connection-driver/libvirt_driver_interface.so @@ -120,171 +120,171 @@ usr/sbin/virtlogd #usr/share/augeas/lenses/tests/test_virtlogd.aug #usr/share/augeas/lenses/virtlockd.aug #usr/share/augeas/lenses/virtlogd.aug -#usr/share/doc/libvirt-4.6.0 -#usr/share/doc/libvirt-4.6.0/html -#usr/share/doc/libvirt-4.6.0/html/32favicon.png -#usr/share/doc/libvirt-4.6.0/html/404.html -#usr/share/doc/libvirt-4.6.0/html/acl.html -#usr/share/doc/libvirt-4.6.0/html/aclpolkit.html -#usr/share/doc/libvirt-4.6.0/html/api.html -#usr/share/doc/libvirt-4.6.0/html/api_extension.html -#usr/share/doc/libvirt-4.6.0/html/apps.html -#usr/share/doc/libvirt-4.6.0/html/architecture.gif -#usr/share/doc/libvirt-4.6.0/html/architecture.html -#usr/share/doc/libvirt-4.6.0/html/auditlog.html -#usr/share/doc/libvirt-4.6.0/html/auth.html -#usr/share/doc/libvirt-4.6.0/html/bindings.html -#usr/share/doc/libvirt-4.6.0/html/bugs.html -#usr/share/doc/libvirt-4.6.0/html/cgroups.html -#usr/share/doc/libvirt-4.6.0/html/compiling.html -#usr/share/doc/libvirt-4.6.0/html/contact.html -#usr/share/doc/libvirt-4.6.0/html/contribute.html -#usr/share/doc/libvirt-4.6.0/html/csharp.html -#usr/share/doc/libvirt-4.6.0/html/dbus.html -#usr/share/doc/libvirt-4.6.0/html/devguide.html -#usr/share/doc/libvirt-4.6.0/html/docs.html -#usr/share/doc/libvirt-4.6.0/html/downloads.html -#usr/share/doc/libvirt-4.6.0/html/drivers.html -#usr/share/doc/libvirt-4.6.0/html/drvbhyve.html -#usr/share/doc/libvirt-4.6.0/html/drvesx.html -#usr/share/doc/libvirt-4.6.0/html/drvhyperv.html -#usr/share/doc/libvirt-4.6.0/html/drvlxc.html -#usr/share/doc/libvirt-4.6.0/html/drvnodedev.html -#usr/share/doc/libvirt-4.6.0/html/drvopenvz.html -#usr/share/doc/libvirt-4.6.0/html/drvphyp.html -#usr/share/doc/libvirt-4.6.0/html/drvqemu.html -#usr/share/doc/libvirt-4.6.0/html/drvremote.html -#usr/share/doc/libvirt-4.6.0/html/drvtest.html -#usr/share/doc/libvirt-4.6.0/html/drvuml.html -#usr/share/doc/libvirt-4.6.0/html/drvvbox.html -#usr/share/doc/libvirt-4.6.0/html/drvvirtuozzo.html -#usr/share/doc/libvirt-4.6.0/html/drvvmware.html -#usr/share/doc/libvirt-4.6.0/html/drvxen.html -#usr/share/doc/libvirt-4.6.0/html/errors.html -#usr/share/doc/libvirt-4.6.0/html/firewall.html -#usr/share/doc/libvirt-4.6.0/html/fonts -#usr/share/doc/libvirt-4.6.0/html/fonts/LICENSE.md -#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-bold-italic.woff -#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-bold.woff -#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-italic.woff -#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-light-italic.woff -#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-light.woff -#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-mono-bold.woff -#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-mono-light.woff -#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-mono-regular.woff -#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-mono-semibold.woff -#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-regular.woff -#usr/share/doc/libvirt-4.6.0/html/fonts/stylesheet.css -#usr/share/doc/libvirt-4.6.0/html/format.html -#usr/share/doc/libvirt-4.6.0/html/formatcaps.html -#usr/share/doc/libvirt-4.6.0/html/formatdomain.html -#usr/share/doc/libvirt-4.6.0/html/formatdomaincaps.html -#usr/share/doc/libvirt-4.6.0/html/formatnetwork.html -#usr/share/doc/libvirt-4.6.0/html/formatnode.html -#usr/share/doc/libvirt-4.6.0/html/formatnwfilter.html -#usr/share/doc/libvirt-4.6.0/html/formatsecret.html -#usr/share/doc/libvirt-4.6.0/html/formatsnapshot.html -#usr/share/doc/libvirt-4.6.0/html/formatstorage.html -#usr/share/doc/libvirt-4.6.0/html/formatstorageencryption.html -#usr/share/doc/libvirt-4.6.0/html/generic.css -#usr/share/doc/libvirt-4.6.0/html/goals.html -#usr/share/doc/libvirt-4.6.0/html/governance.html -#usr/share/doc/libvirt-4.6.0/html/hacking.html -#usr/share/doc/libvirt-4.6.0/html/hooks.html -#usr/share/doc/libvirt-4.6.0/html/html -#usr/share/doc/libvirt-4.6.0/html/html/home.png -#usr/share/doc/libvirt-4.6.0/html/html/index.html -#usr/share/doc/libvirt-4.6.0/html/html/left.png -#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-common.html -#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-domain-snapshot.html -#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-domain.html -#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-event.html -#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-host.html -#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-interface.html -#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-network.html -#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-nodedev.html -#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-nwfilter.html -#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-secret.html -#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-storage.html -#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-stream.html -#usr/share/doc/libvirt-4.6.0/html/html/libvirt-virterror.html -#usr/share/doc/libvirt-4.6.0/html/html/right.png -#usr/share/doc/libvirt-4.6.0/html/html/up.png -#usr/share/doc/libvirt-4.6.0/html/hvsupport.html -#usr/share/doc/libvirt-4.6.0/html/index.html -#usr/share/doc/libvirt-4.6.0/html/internals -#usr/share/doc/libvirt-4.6.0/html/internals.html -#usr/share/doc/libvirt-4.6.0/html/internals/command.html -#usr/share/doc/libvirt-4.6.0/html/internals/eventloop.html -#usr/share/doc/libvirt-4.6.0/html/internals/locking.html -#usr/share/doc/libvirt-4.6.0/html/internals/oomtesting.html -#usr/share/doc/libvirt-4.6.0/html/internals/rpc.html -#usr/share/doc/libvirt-4.6.0/html/java.html -#usr/share/doc/libvirt-4.6.0/html/libvirt-daemon-arch.png -#usr/share/doc/libvirt-4.6.0/html/libvirt-driver-arch.png -#usr/share/doc/libvirt-4.6.0/html/libvirt-object-model.png -#usr/share/doc/libvirt-4.6.0/html/libvirt.css -#usr/share/doc/libvirt-4.6.0/html/locking-lockd.html -#usr/share/doc/libvirt-4.6.0/html/locking-sanlock.html -#usr/share/doc/libvirt-4.6.0/html/locking.html -#usr/share/doc/libvirt-4.6.0/html/logging.html -#usr/share/doc/libvirt-4.6.0/html/logos -#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-dark-256.png -#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-dark-800.png -#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-dark.svg -#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-light-256.png -#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-light-800.png -#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-light.svg -#usr/share/doc/libvirt-4.6.0/html/logos/logo-base.svg -#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-128.png -#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-192.png -#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-256.png -#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-96.png -#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-powered-128.png -#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-powered-192.png -#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-powered-256.png -#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-powered-96.png -#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-powered.svg -#usr/share/doc/libvirt-4.6.0/html/logos/logo-square.svg -#usr/share/doc/libvirt-4.6.0/html/main.css -#usr/share/doc/libvirt-4.6.0/html/migration-managed-direct.png -#usr/share/doc/libvirt-4.6.0/html/migration-managed-p2p.png -#usr/share/doc/libvirt-4.6.0/html/migration-native.png -#usr/share/doc/libvirt-4.6.0/html/migration-tunnel.png -#usr/share/doc/libvirt-4.6.0/html/migration-unmanaged-direct.png -#usr/share/doc/libvirt-4.6.0/html/migration.html -#usr/share/doc/libvirt-4.6.0/html/mobile.css -#usr/share/doc/libvirt-4.6.0/html/news-2005.html -#usr/share/doc/libvirt-4.6.0/html/news-2006.html -#usr/share/doc/libvirt-4.6.0/html/news-2007.html -#usr/share/doc/libvirt-4.6.0/html/news-2008.html -#usr/share/doc/libvirt-4.6.0/html/news-2009.html -#usr/share/doc/libvirt-4.6.0/html/news-2010.html -#usr/share/doc/libvirt-4.6.0/html/news-2011.html -#usr/share/doc/libvirt-4.6.0/html/news-2012.html -#usr/share/doc/libvirt-4.6.0/html/news-2013.html -#usr/share/doc/libvirt-4.6.0/html/news-2014.html -#usr/share/doc/libvirt-4.6.0/html/news-2015.html -#usr/share/doc/libvirt-4.6.0/html/news-2016.html -#usr/share/doc/libvirt-4.6.0/html/news.html -#usr/share/doc/libvirt-4.6.0/html/node.gif -#usr/share/doc/libvirt-4.6.0/html/nss.html -#usr/share/doc/libvirt-4.6.0/html/pci-hotplug.html -#usr/share/doc/libvirt-4.6.0/html/php.html -#usr/share/doc/libvirt-4.6.0/html/platforms.html -#usr/share/doc/libvirt-4.6.0/html/python.html -#usr/share/doc/libvirt-4.6.0/html/remote.html -#usr/share/doc/libvirt-4.6.0/html/secureusage.html -#usr/share/doc/libvirt-4.6.0/html/securityprocess.html -#usr/share/doc/libvirt-4.6.0/html/storage.html -#usr/share/doc/libvirt-4.6.0/html/support.html -#usr/share/doc/libvirt-4.6.0/html/testapi.html -#usr/share/doc/libvirt-4.6.0/html/testsuites.html -#usr/share/doc/libvirt-4.6.0/html/testtck.html -#usr/share/doc/libvirt-4.6.0/html/todo.html -#usr/share/doc/libvirt-4.6.0/html/uri.html -#usr/share/doc/libvirt-4.6.0/html/virshcmdref.html -#usr/share/doc/libvirt-4.6.0/html/windows.html +#usr/share/doc/libvirt-4.10.0 +#usr/share/doc/libvirt-4.10.0/html +#usr/share/doc/libvirt-4.10.0/html/32favicon.png +#usr/share/doc/libvirt-4.10.0/html/404.html +#usr/share/doc/libvirt-4.10.0/html/acl.html +#usr/share/doc/libvirt-4.10.0/html/aclpolkit.html +#usr/share/doc/libvirt-4.10.0/html/api.html +#usr/share/doc/libvirt-4.10.0/html/api_extension.html +#usr/share/doc/libvirt-4.10.0/html/apps.html +#usr/share/doc/libvirt-4.10.0/html/architecture.gif +#usr/share/doc/libvirt-4.10.0/html/architecture.html +#usr/share/doc/libvirt-4.10.0/html/auditlog.html +#usr/share/doc/libvirt-4.10.0/html/auth.html +#usr/share/doc/libvirt-4.10.0/html/bindings.html +#usr/share/doc/libvirt-4.10.0/html/bugs.html +#usr/share/doc/libvirt-4.10.0/html/cgroups.html +#usr/share/doc/libvirt-4.10.0/html/compiling.html +#usr/share/doc/libvirt-4.10.0/html/contact.html +#usr/share/doc/libvirt-4.10.0/html/contribute.html +#usr/share/doc/libvirt-4.10.0/html/csharp.html +#usr/share/doc/libvirt-4.10.0/html/dbus.html +#usr/share/doc/libvirt-4.10.0/html/devguide.html +#usr/share/doc/libvirt-4.10.0/html/docs.html +#usr/share/doc/libvirt-4.10.0/html/downloads.html +#usr/share/doc/libvirt-4.10.0/html/drivers.html +#usr/share/doc/libvirt-4.10.0/html/drvbhyve.html +#usr/share/doc/libvirt-4.10.0/html/drvesx.html +#usr/share/doc/libvirt-4.10.0/html/drvhyperv.html +#usr/share/doc/libvirt-4.10.0/html/drvlxc.html +#usr/share/doc/libvirt-4.10.0/html/drvnodedev.html +#usr/share/doc/libvirt-4.10.0/html/drvopenvz.html +#usr/share/doc/libvirt-4.10.0/html/drvphyp.html +#usr/share/doc/libvirt-4.10.0/html/drvqemu.html +#usr/share/doc/libvirt-4.10.0/html/drvremote.html +#usr/share/doc/libvirt-4.10.0/html/drvtest.html +#usr/share/doc/libvirt-4.10.0/html/drvuml.html +#usr/share/doc/libvirt-4.10.0/html/drvvbox.html +#usr/share/doc/libvirt-4.10.0/html/drvvirtuozzo.html +#usr/share/doc/libvirt-4.10.0/html/drvvmware.html +#usr/share/doc/libvirt-4.10.0/html/drvxen.html +#usr/share/doc/libvirt-4.10.0/html/errors.html +#usr/share/doc/libvirt-4.10.0/html/firewall.html +#usr/share/doc/libvirt-4.10.0/html/fonts +#usr/share/doc/libvirt-4.10.0/html/fonts/LICENSE.md +#usr/share/doc/libvirt-4.10.0/html/fonts/overpass-bold-italic.woff +#usr/share/doc/libvirt-4.10.0/html/fonts/overpass-bold.woff +#usr/share/doc/libvirt-4.10.0/html/fonts/overpass-italic.woff +#usr/share/doc/libvirt-4.10.0/html/fonts/overpass-light-italic.woff +#usr/share/doc/libvirt-4.10.0/html/fonts/overpass-light.woff +#usr/share/doc/libvirt-4.10.0/html/fonts/overpass-mono-bold.woff +#usr/share/doc/libvirt-4.10.0/html/fonts/overpass-mono-light.woff +#usr/share/doc/libvirt-4.10.0/html/fonts/overpass-mono-regular.woff +#usr/share/doc/libvirt-4.10.0/html/fonts/overpass-mono-semibold.woff +#usr/share/doc/libvirt-4.10.0/html/fonts/overpass-regular.woff +#usr/share/doc/libvirt-4.10.0/html/fonts/stylesheet.css +#usr/share/doc/libvirt-4.10.0/html/format.html +#usr/share/doc/libvirt-4.10.0/html/formatcaps.html +#usr/share/doc/libvirt-4.10.0/html/formatdomain.html +#usr/share/doc/libvirt-4.10.0/html/formatdomaincaps.html +#usr/share/doc/libvirt-4.10.0/html/formatnetwork.html +#usr/share/doc/libvirt-4.10.0/html/formatnode.html +#usr/share/doc/libvirt-4.10.0/html/formatnwfilter.html +#usr/share/doc/libvirt-4.10.0/html/formatsecret.html +#usr/share/doc/libvirt-4.10.0/html/formatsnapshot.html +#usr/share/doc/libvirt-4.10.0/html/formatstorage.html +#usr/share/doc/libvirt-4.10.0/html/formatstorageencryption.html +#usr/share/doc/libvirt-4.10.0/html/generic.css +#usr/share/doc/libvirt-4.10.0/html/goals.html +#usr/share/doc/libvirt-4.10.0/html/governance.html +#usr/share/doc/libvirt-4.10.0/html/hacking.html +#usr/share/doc/libvirt-4.10.0/html/hooks.html +#usr/share/doc/libvirt-4.10.0/html/html +#usr/share/doc/libvirt-4.10.0/html/html/home.png +#usr/share/doc/libvirt-4.10.0/html/html/index.html +#usr/share/doc/libvirt-4.10.0/html/html/left.png +#usr/share/doc/libvirt-4.10.0/html/html/libvirt-libvirt-common.html +#usr/share/doc/libvirt-4.10.0/html/html/libvirt-libvirt-domain-snapshot.html +#usr/share/doc/libvirt-4.10.0/html/html/libvirt-libvirt-domain.html +#usr/share/doc/libvirt-4.10.0/html/html/libvirt-libvirt-event.html +#usr/share/doc/libvirt-4.10.0/html/html/libvirt-libvirt-host.html +#usr/share/doc/libvirt-4.10.0/html/html/libvirt-libvirt-interface.html +#usr/share/doc/libvirt-4.10.0/html/html/libvirt-libvirt-network.html +#usr/share/doc/libvirt-4.10.0/html/html/libvirt-libvirt-nodedev.html +#usr/share/doc/libvirt-4.10.0/html/html/libvirt-libvirt-nwfilter.html +#usr/share/doc/libvirt-4.10.0/html/html/libvirt-libvirt-secret.html +#usr/share/doc/libvirt-4.10.0/html/html/libvirt-libvirt-storage.html +#usr/share/doc/libvirt-4.10.0/html/html/libvirt-libvirt-stream.html +#usr/share/doc/libvirt-4.10.0/html/html/libvirt-virterror.html +#usr/share/doc/libvirt-4.10.0/html/html/right.png +#usr/share/doc/libvirt-4.10.0/html/html/up.png +#usr/share/doc/libvirt-4.10.0/html/hvsupport.html +#usr/share/doc/libvirt-4.10.0/html/index.html +#usr/share/doc/libvirt-4.10.0/html/internals +#usr/share/doc/libvirt-4.10.0/html/internals.html +#usr/share/doc/libvirt-4.10.0/html/internals/command.html +#usr/share/doc/libvirt-4.10.0/html/internals/eventloop.html +#usr/share/doc/libvirt-4.10.0/html/internals/locking.html +#usr/share/doc/libvirt-4.10.0/html/internals/oomtesting.html +#usr/share/doc/libvirt-4.10.0/html/internals/rpc.html +#usr/share/doc/libvirt-4.10.0/html/java.html +#usr/share/doc/libvirt-4.10.0/html/libvirt-daemon-arch.png +#usr/share/doc/libvirt-4.10.0/html/libvirt-driver-arch.png +#usr/share/doc/libvirt-4.10.0/html/libvirt-object-model.png +#usr/share/doc/libvirt-4.10.0/html/libvirt.css +#usr/share/doc/libvirt-4.10.0/html/locking-lockd.html +#usr/share/doc/libvirt-4.10.0/html/locking-sanlock.html +#usr/share/doc/libvirt-4.10.0/html/locking.html +#usr/share/doc/libvirt-4.10.0/html/logging.html +#usr/share/doc/libvirt-4.10.0/html/logos +#usr/share/doc/libvirt-4.10.0/html/logos/logo-banner-dark-256.png +#usr/share/doc/libvirt-4.10.0/html/logos/logo-banner-dark-800.png +#usr/share/doc/libvirt-4.10.0/html/logos/logo-banner-dark.svg +#usr/share/doc/libvirt-4.10.0/html/logos/logo-banner-light-256.png +#usr/share/doc/libvirt-4.10.0/html/logos/logo-banner-light-800.png +#usr/share/doc/libvirt-4.10.0/html/logos/logo-banner-light.svg +#usr/share/doc/libvirt-4.10.0/html/logos/logo-base.svg +#usr/share/doc/libvirt-4.10.0/html/logos/logo-square-128.png +#usr/share/doc/libvirt-4.10.0/html/logos/logo-square-192.png +#usr/share/doc/libvirt-4.10.0/html/logos/logo-square-256.png +#usr/share/doc/libvirt-4.10.0/html/logos/logo-square-96.png +#usr/share/doc/libvirt-4.10.0/html/logos/logo-square-powered-128.png +#usr/share/doc/libvirt-4.10.0/html/logos/logo-square-powered-192.png +#usr/share/doc/libvirt-4.10.0/html/logos/logo-square-powered-256.png +#usr/share/doc/libvirt-4.10.0/html/logos/logo-square-powered-96.png +#usr/share/doc/libvirt-4.10.0/html/logos/logo-square-powered.svg +#usr/share/doc/libvirt-4.10.0/html/logos/logo-square.svg +#usr/share/doc/libvirt-4.10.0/html/main.css +#usr/share/doc/libvirt-4.10.0/html/migration-managed-direct.png +#usr/share/doc/libvirt-4.10.0/html/migration-managed-p2p.png +#usr/share/doc/libvirt-4.10.0/html/migration-native.png +#usr/share/doc/libvirt-4.10.0/html/migration-tunnel.png +#usr/share/doc/libvirt-4.10.0/html/migration-unmanaged-direct.png +#usr/share/doc/libvirt-4.10.0/html/migration.html +#usr/share/doc/libvirt-4.10.0/html/mobile.css +#usr/share/doc/libvirt-4.10.0/html/news-2005.html +#usr/share/doc/libvirt-4.10.0/html/news-2006.html +#usr/share/doc/libvirt-4.10.0/html/news-2007.html +#usr/share/doc/libvirt-4.10.0/html/news-2008.html +#usr/share/doc/libvirt-4.10.0/html/news-2009.html +#usr/share/doc/libvirt-4.10.0/html/news-2010.html +#usr/share/doc/libvirt-4.10.0/html/news-2011.html +#usr/share/doc/libvirt-4.10.0/html/news-2012.html +#usr/share/doc/libvirt-4.10.0/html/news-2013.html +#usr/share/doc/libvirt-4.10.0/html/news-2014.html +#usr/share/doc/libvirt-4.10.0/html/news-2015.html +#usr/share/doc/libvirt-4.10.0/html/news-2016.html +#usr/share/doc/libvirt-4.10.0/html/news.html +#usr/share/doc/libvirt-4.10.0/html/node.gif +#usr/share/doc/libvirt-4.10.0/html/nss.html +#usr/share/doc/libvirt-4.10.0/html/pci-hotplug.html +#usr/share/doc/libvirt-4.10.0/html/php.html +#usr/share/doc/libvirt-4.10.0/html/platforms.html +#usr/share/doc/libvirt-4.10.0/html/python.html +#usr/share/doc/libvirt-4.10.0/html/remote.html +#usr/share/doc/libvirt-4.10.0/html/secureusage.html +#usr/share/doc/libvirt-4.10.0/html/securityprocess.html +#usr/share/doc/libvirt-4.10.0/html/storage.html +#usr/share/doc/libvirt-4.10.0/html/support.html +#usr/share/doc/libvirt-4.10.0/html/testapi.html +#usr/share/doc/libvirt-4.10.0/html/testsuites.html +#usr/share/doc/libvirt-4.10.0/html/testtck.html +#usr/share/doc/libvirt-4.10.0/html/todo.html +#usr/share/doc/libvirt-4.10.0/html/uri.html +#usr/share/doc/libvirt-4.10.0/html/virshcmdref.html +#usr/share/doc/libvirt-4.10.0/html/windows.html #usr/share/gtk-doc/html/libvirt #usr/share/gtk-doc/html/libvirt/general.html #usr/share/gtk-doc/html/libvirt/home.png @@ -301,7 +301,64 @@ usr/share/libvirt/api/libvirt-admin-api.xml usr/share/libvirt/api/libvirt-api.xml usr/share/libvirt/api/libvirt-lxc-api.xml usr/share/libvirt/api/libvirt-qemu-api.xml -usr/share/libvirt/cpu_map.xml +#usr/share/libvirt/cpu_map +usr/share/libvirt/cpu_map/index.xml +usr/share/libvirt/cpu_map/ppc64_POWER6.xml +usr/share/libvirt/cpu_map/ppc64_POWER7.xml +usr/share/libvirt/cpu_map/ppc64_POWER8.xml +usr/share/libvirt/cpu_map/ppc64_POWER9.xml +usr/share/libvirt/cpu_map/ppc64_POWERPC_e5500.xml +usr/share/libvirt/cpu_map/ppc64_POWERPC_e6500.xml +usr/share/libvirt/cpu_map/ppc64_vendors.xml +usr/share/libvirt/cpu_map/x86_486.xml +usr/share/libvirt/cpu_map/x86_Broadwell-IBRS.xml +usr/share/libvirt/cpu_map/x86_Broadwell-noTSX-IBRS.xml +usr/share/libvirt/cpu_map/x86_Broadwell-noTSX.xml +usr/share/libvirt/cpu_map/x86_Broadwell.xml +usr/share/libvirt/cpu_map/x86_Conroe.xml +usr/share/libvirt/cpu_map/x86_EPYC-IBRS.xml +usr/share/libvirt/cpu_map/x86_EPYC.xml +usr/share/libvirt/cpu_map/x86_Haswell-IBRS.xml +usr/share/libvirt/cpu_map/x86_Haswell-noTSX-IBRS.xml +usr/share/libvirt/cpu_map/x86_Haswell-noTSX.xml +usr/share/libvirt/cpu_map/x86_Haswell.xml +usr/share/libvirt/cpu_map/x86_Icelake-Client.xml +usr/share/libvirt/cpu_map/x86_Icelake-Server.xml +usr/share/libvirt/cpu_map/x86_IvyBridge-IBRS.xml +usr/share/libvirt/cpu_map/x86_IvyBridge.xml +usr/share/libvirt/cpu_map/x86_Nehalem-IBRS.xml +usr/share/libvirt/cpu_map/x86_Nehalem.xml +usr/share/libvirt/cpu_map/x86_Opteron_G1.xml +usr/share/libvirt/cpu_map/x86_Opteron_G2.xml +usr/share/libvirt/cpu_map/x86_Opteron_G3.xml +usr/share/libvirt/cpu_map/x86_Opteron_G4.xml +usr/share/libvirt/cpu_map/x86_Opteron_G5.xml +usr/share/libvirt/cpu_map/x86_Penryn.xml +usr/share/libvirt/cpu_map/x86_SandyBridge-IBRS.xml +usr/share/libvirt/cpu_map/x86_SandyBridge.xml +usr/share/libvirt/cpu_map/x86_Skylake-Client-IBRS.xml +usr/share/libvirt/cpu_map/x86_Skylake-Client.xml +usr/share/libvirt/cpu_map/x86_Skylake-Server-IBRS.xml +usr/share/libvirt/cpu_map/x86_Skylake-Server.xml +usr/share/libvirt/cpu_map/x86_Westmere-IBRS.xml +usr/share/libvirt/cpu_map/x86_Westmere.xml +usr/share/libvirt/cpu_map/x86_athlon.xml +usr/share/libvirt/cpu_map/x86_core2duo.xml +usr/share/libvirt/cpu_map/x86_coreduo.xml +usr/share/libvirt/cpu_map/x86_cpu64-rhel5.xml +usr/share/libvirt/cpu_map/x86_cpu64-rhel6.xml +usr/share/libvirt/cpu_map/x86_features.xml +usr/share/libvirt/cpu_map/x86_kvm32.xml +usr/share/libvirt/cpu_map/x86_kvm64.xml +usr/share/libvirt/cpu_map/x86_n270.xml +usr/share/libvirt/cpu_map/x86_pentium.xml +usr/share/libvirt/cpu_map/x86_pentium2.xml +usr/share/libvirt/cpu_map/x86_pentium3.xml +usr/share/libvirt/cpu_map/x86_pentiumpro.xml +usr/share/libvirt/cpu_map/x86_phenom.xml +usr/share/libvirt/cpu_map/x86_qemu32.xml +usr/share/libvirt/cpu_map/x86_qemu64.xml +usr/share/libvirt/cpu_map/x86_vendors.xml #usr/share/libvirt/schemas usr/share/libvirt/schemas/basictypes.rng usr/share/libvirt/schemas/capability.rng diff --git a/lfs/bind b/lfs/bind index c2530b174..44b649fcb 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.11.5 +VER = 9.11.5-P1 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 17a0d02102117c9a221e857cf2cc8157 +$(DL_FILE)_MD5 = 2825d818db51008f88a0030507edfa8a install : $(TARGET) diff --git a/lfs/libvirt b/lfs/libvirt index de25a3d55..aba2f1339 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -24,7 +24,7 @@ include Config -VER = 4.6.0 +VER = 4.10.0 THISAPP = libvirt-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6ea17a8f004a4bcdfc4beaed91fcdddd +$(DL_FILE)_MD5 = f85067e830bd89db08b7b7ffa75db6ef install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) diff --git a/lfs/sqlite b/lfs/sqlite index 467e01805..8f02634cd 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -24,7 +24,7 @@ include Config -VER = 3250200 +VER = 3260000 THISAPP = sqlite-autoconf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bfade31d59f58badc51aeaa6ae26a5de +$(DL_FILE)_MD5 = ac2b3b8cd3a97600e36fb8e756e8dda1 install : $(TARGET) diff --git a/lfs/squid b/lfs/squid index 11b84d719..aaa2d0b96 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.5.28 +VER = 4.4 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9367e0375ea53ba0e99f77054d4402c5 +$(DL_FILE)_MD5 = 892504ca9700e1f139a53f84098613bd install : $(TARGET) @@ -72,9 +72,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/01_Certificate_fields_injection_via_D_in_ERR_SECURE_CONNECT_FAIL_306.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/02_Fix_memory_leak_when_parsing_SNMP_packet_313.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/01_Fix_netdb_exchange_with_a_TLS_cache_peer_307.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/02_Maintenance_add_xz_tarball_format_formally_to_make_dist_325.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/03_The_handshake_logformat_code_331.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-4.4-fix-max-file-descriptors.patch cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi @@ -125,7 +126,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-zph-qos \ --with-dl \ --with-filedescriptors=$$(( 16384 * 64 )) \ - --with-large-files + --with-large-files \ + --without-gnutls \ + --without-netfilter-conntrack cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/unbound b/lfs/unbound index e4761eb67..07501d1d6 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -79,6 +79,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-static \ --with-libevent \ --enable-event-api \ + --enable-tfo-client \ + --enable-tfo-server \ ac_cv_func_getentropy=no cd $(DIR_APP) && make $(MAKETUNING) diff --git a/src/patches/squid/01_Certificate_fields_injection_via_D_in_ERR_SECURE_CONNECT_FAIL_306.patch b/src/patches/squid/01_Certificate_fields_injection_via_D_in_ERR_SECURE_CONNECT_FAIL_306.patch deleted file mode 100644 index fadb1d48c..000000000 --- a/src/patches/squid/01_Certificate_fields_injection_via_D_in_ERR_SECURE_CONNECT_FAIL_306.patch +++ /dev/null @@ -1,72 +0,0 @@ -commit f1657a9decc820f748fa3aff68168d3145258031 -Author: Christos Tsantilas <christos(a)chtsanti.net> -Date: 2018-10-17 15:14:07 +0000 - - Certificate fields injection via %D in ERR_SECURE_CONNECT_FAIL (#306) - - %ssl_subject, %ssl_ca_name, and %ssl_cn values were not properly escaped when %D code was expanded in HTML context of the ERR_SECURE_CONNECT_FAIL template. This bug affects all - ERR_SECURE_CONNECT_FAIL page templates containing %D, including the default template. - - Other error pages are not vulnerable because Squid does not populate %D with certificate details in other contexts (yet). - - Thanks to Nikolas Lohmann [eBlocker] for identifying the problem. - - TODO: If those certificate details become needed for ACL checks or other non-HTML purposes, make their HTML-escaping conditional. - - This is a Measurement Factory project. - -diff --git a/src/ssl/ErrorDetail.cc b/src/ssl/ErrorDetail.cc -index b5030e3..314e998 100644 ---- a/src/ssl/ErrorDetail.cc -+++ b/src/ssl/ErrorDetail.cc -@@ -8,6 +8,8 @@ - - #include "squid.h" - #include "errorpage.h" -+#include "fatal.h" -+#include "html_quote.h" - #include "ssl/ErrorDetail.h" - - #include <climits> -@@ -432,8 +434,11 @@ const char *Ssl::ErrorDetail::subject() const - { - if (broken_cert.get()) { - static char tmpBuffer[256]; // A temporary buffer -- if (X509_NAME_oneline(X509_get_subject_name(broken_cert.get()), tmpBuffer, sizeof(tmpBuffer))) -- return tmpBuffer; -+ if (X509_NAME_oneline(X509_get_subject_name(broken_cert.get()), tmpBuffer, sizeof(tmpBuffer))) { -+ // quote to avoid possible html code injection through -+ // certificate subject -+ return html_quote(tmpBuffer); -+ } - } - return "[Not available]"; - } -@@ -461,8 +466,11 @@ const char *Ssl::ErrorDetail::cn() const - static String tmpStr; ///< A temporary string buffer - tmpStr.clean(); - Ssl::matchX509CommonNames(broken_cert.get(), &tmpStr, copy_cn); -- if (tmpStr.size()) -- return tmpStr.termedBuf(); -+ if (tmpStr.size()) { -+ // quote to avoid possible html code injection through -+ // certificate subject -+ return html_quote(tmpStr.termedBuf()); -+ } - } - return "[Not available]"; - } -@@ -474,8 +482,11 @@ const char *Ssl::ErrorDetail::ca_name() const - { - if (broken_cert.get()) { - static char tmpBuffer[256]; // A temporary buffer -- if (X509_NAME_oneline(X509_get_issuer_name(broken_cert.get()), tmpBuffer, sizeof(tmpBuffer))) -- return tmpBuffer; -+ if (X509_NAME_oneline(X509_get_issuer_name(broken_cert.get()), tmpBuffer, sizeof(tmpBuffer))) { -+ // quote to avoid possible html code injection through -+ // certificate issuer subject -+ return html_quote(tmpBuffer); -+ } - } - return "[Not available]"; - } diff --git a/src/patches/squid/01_Fix_netdb_exchange_with_a_TLS_cache_peer_307.patch b/src/patches/squid/01_Fix_netdb_exchange_with_a_TLS_cache_peer_307.patch new file mode 100644 index 000000000..09f8961dc --- /dev/null +++ b/src/patches/squid/01_Fix_netdb_exchange_with_a_TLS_cache_peer_307.patch @@ -0,0 +1,91 @@ +commit bc54d7a6f7ec510a25966f2f800d3ea874657546 +Author: chi-mf <43963496+chi-mf(a)users.noreply.github.com> +Date: 2018-10-30 04:48:40 +0000 + + Fix netdb exchange with a TLS cache_peer (#307) + + Squid uses http-scheme URLs when sending netdb exchange (and possibly + other) requests to a cache_peer. If a DIRECT path is selected for that + cache_peer URL, then Squid sends a clear text HTTP request to that + cache_peer. If that cache_peer expects a TLS connection, it will reject + that request (with, e.g., error:transaction-end-before-headers), + resulting in an HTTP 503 or 504 netdb fetch error. + + Workaround this by adding an internalRemoteUri() parameter to indicate + whether https or http URL scheme should be used. Netdb fetches from + CachePeer::secure peers now get an https scheme and, hence, a TLS + connection. + +diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc +index 0f488de..526093f 100644 +--- a/src/icmp/net_db.cc ++++ b/src/icmp/net_db.cc +@@ -1282,7 +1282,7 @@ netdbExchangeStart(void *data) + #if USE_ICMP + CachePeer *p = (CachePeer *)data; + static const SBuf netDB("netdb"); +- char *uri = internalRemoteUri(p->host, p->http_port, "/squid-internal-dynamic/", netDB); ++ char *uri = internalRemoteUri(p->secure.encryptTransport, p->host, p->http_port, "/squid-internal-dynamic/", netDB); + debugs(38, 3, "Requesting '" << uri << "'"); + const MasterXaction::Pointer mx = new MasterXaction(XactionInitiator::initIcmp); + HttpRequest *req = HttpRequest::FromUrl(uri, mx); +diff --git a/src/internal.cc b/src/internal.cc +index 6ebc7a6..ff7b4d6 100644 +--- a/src/internal.cc ++++ b/src/internal.cc +@@ -82,7 +82,7 @@ internalStaticCheck(const SBuf &urlPath) + * makes internal url with a given host and port (remote internal url) + */ + char * +-internalRemoteUri(const char *host, unsigned short port, const char *dir, const SBuf &name) ++internalRemoteUri(bool encrypt, const char *host, unsigned short port, const char *dir, const SBuf &name) + { + static char lc_host[SQUIDHOSTNAMELEN]; + assert(host && !name.isEmpty()); +@@ -115,7 +115,7 @@ internalRemoteUri(const char *host, unsigned short port, const char *dir, const + static MemBuf mb; + + mb.reset(); +- mb.appendf("http://" SQUIDSBUFPH, SQUIDSBUFPRINT(tmp.authority())); ++ mb.appendf("%s://" SQUIDSBUFPH, encrypt ? "https" : "http", SQUIDSBUFPRINT(tmp.authority())); + + if (dir) + mb.append(dir, strlen(dir)); +@@ -132,7 +132,10 @@ internalRemoteUri(const char *host, unsigned short port, const char *dir, const + char * + internalLocalUri(const char *dir, const SBuf &name) + { +- return internalRemoteUri(getMyHostname(), ++ // XXX: getMy*() may return https_port info, but we force http URIs ++ // because we have not checked whether the callers can handle https. ++ const bool secure = false; ++ return internalRemoteUri(secure, getMyHostname(), + getMyPort(), dir, name); + } + +diff --git a/src/internal.h b/src/internal.h +index c91f9ac..13a43a6 100644 +--- a/src/internal.h ++++ b/src/internal.h +@@ -24,7 +24,7 @@ void internalStart(const Comm::ConnectionPointer &clientConn, HttpRequest *, Sto + bool internalCheck(const SBuf &urlPath); + bool internalStaticCheck(const SBuf &urlPath); + char *internalLocalUri(const char *dir, const SBuf &name); +-char *internalRemoteUri(const char *, unsigned short, const char *, const SBuf &); ++char *internalRemoteUri(bool, const char *, unsigned short, const char *, const SBuf &); + const char *internalHostname(void); + int internalHostnameIs(const char *); + +diff --git a/src/peer_digest.cc b/src/peer_digest.cc +index 36a8705..f515aaa 100644 +--- a/src/peer_digest.cc ++++ b/src/peer_digest.cc +@@ -323,7 +323,7 @@ peerDigestRequest(PeerDigest * pd) + if (p->digest_url) + url = xstrdup(p->digest_url); + else +- url = xstrdup(internalRemoteUri(p->host, p->http_port, "/squid-internal-periodic/", SBuf(StoreDigestFileName))); ++ url = xstrdup(internalRemoteUri(p->secure.encryptTransport, p->host, p->http_port, "/squid-internal-periodic/", SBuf(StoreDigestFileName))); + debugs(72, 2, url); + + const MasterXaction::Pointer mx = new MasterXaction(XactionInitiator::initCacheDigest); diff --git a/src/patches/squid/02_Fix_memory_leak_when_parsing_SNMP_packet_313.patch b/src/patches/squid/02_Fix_memory_leak_when_parsing_SNMP_packet_313.patch deleted file mode 100644 index 2ae034c20..000000000 --- a/src/patches/squid/02_Fix_memory_leak_when_parsing_SNMP_packet_313.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit bc9786119f058a76ddf0625424bc33d36460b9a2 (refs/remotes/origin/v3.5) -Author: flozilla <fishyflow(a)gmail.com> -Date: 2018-10-24 14:12:01 +0200 - - Fix memory leak when parsing SNMP packet (#313) - - SNMP queries denied by snmp_access rules and queries with certain - unsupported SNMPv2 commands were leaking a few hundred bytes each. Such - queries trigger "SNMP agent query DENIED from..." WARNINGs in cache.log. - -diff --git a/src/snmp_core.cc b/src/snmp_core.cc -index c4d21c1..16c2993 100644 ---- a/src/snmp_core.cc -+++ b/src/snmp_core.cc -@@ -409,6 +409,7 @@ snmpDecodePacket(SnmpRequest * rq) - snmpConstructReponse(rq); - } else { - debugs(49, DBG_IMPORTANT, "WARNING: SNMP agent query DENIED from : " << rq->from); -+ snmp_free_pdu(PDU); - } - xfree(Community); - diff --git a/src/patches/squid/02_Maintenance_add_xz_tarball_format_formally_to_make_dist_325.patch b/src/patches/squid/02_Maintenance_add_xz_tarball_format_formally_to_make_dist_325.patch new file mode 100644 index 000000000..58ceaa034 --- /dev/null +++ b/src/patches/squid/02_Maintenance_add_xz_tarball_format_formally_to_make_dist_325.patch @@ -0,0 +1,22 @@ +commit 3c23ae8c7431344f8fc50bb5ee8f4b56d08c10a4 +Author: Amos Jeffries <yadij(a)users.noreply.github.com> +Date: 2018-11-11 04:29:58 +0000 + + Maintenance: add .xz tarball format formally to make dist (#325) + + Automake can now handle generating this format itself and the + experiments of providing it for downstream have gone well. + +diff --git a/configure.ac b/configure.ac +index 3f8af6d..f668567 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -10,7 +10,7 @@ AC_PREREQ(2.61) + AC_CONFIG_HEADERS([include/autoconf.h]) + AC_CONFIG_AUX_DIR(cfgaux) + AC_CONFIG_SRCDIR([src/main.cc]) +-AM_INIT_AUTOMAKE([tar-ustar nostdinc subdir-objects]) ++AM_INIT_AUTOMAKE([tar-ustar nostdinc subdir-objects dist-xz]) + AC_REVISION($Revision$)dnl + AC_PREFIX_DEFAULT(/usr/local/squid) + AM_MAINTAINER_MODE diff --git a/src/patches/squid/03_The_handshake_logformat_code_331.patch b/src/patches/squid/03_The_handshake_logformat_code_331.patch new file mode 100644 index 000000000..2ce8bdc4a --- /dev/null +++ b/src/patches/squid/03_The_handshake_logformat_code_331.patch @@ -0,0 +1,132 @@ +commit 0022167d80725513d95b38aaebc90086fc0b6938 (tag: refs/tags/M-staged-PR331, refs/remotes/origin/v4) +Author: Christos Tsantilas <christos(a)chtsanti.net> +Date: 2018-11-14 15:17:06 +0000 + + The %>handshake logformat code (#331) + + Logging client "handshake" bytes is useful in at least two contexts: + + * Runtime traffic bypass and bumping/splicing decisions. Identifying + popular clients like Skype for Business (that uses a TLS handshake but + then may not speak TLS) is critical for handling their traffic + correctly. Squid does not have enough ACLs to interrogate most TLS + handshake aspects. Adding more ACLs may still be a good idea, but + initial sketches for SfB handshakes showed rather complex + ACLs/configurations, _and_ no reasonable ACLs would be able to handle + non-TLS handshakes. An external ACL receiving the handshake is in a + much better position to analyze/fingerprint it according to custom + admin needs. + + * A logged handshake can be used to analyze new/unusual traffic or even + trigger security-related alarms. + + The current support is limited to cases where Squid was saving handshake + for other reasons. With enough demand, this initial support can be + extended to all protocols and port configurations. + + This is a Measurement Factory project. + +diff --git a/src/cf.data.pre b/src/cf.data.pre +index fa8af56..a8ca587 100644 +--- a/src/cf.data.pre ++++ b/src/cf.data.pre +@@ -4394,6 +4394,37 @@ DOC_START + <qos Server connection TOS/DSCP value set by Squid + <nfmark Server connection netfilter mark set by Squid + ++ >handshake Raw client handshake ++ Initial client bytes received by Squid on a newly ++ accepted TCP connection or inside a just established ++ CONNECT tunnel. Squid stops accumulating handshake ++ bytes as soon as the handshake parser succeeds or ++ fails (determining whether the client is using the ++ expected protocol). ++ ++ For HTTP clients, the handshake is the request line. ++ For TLS clients, the handshake consists of all TLS ++ records up to and including the TLS record that ++ contains the last byte of the first ClientHello ++ message. For clients using an unsupported protocol, ++ this field contains the bytes received by Squid at the ++ time of the handshake parsing failure. ++ ++ See the on_unsupported_protocol directive for more ++ information on Squid handshake traffic expectations. ++ ++ Current support is limited to these contexts: ++ - http_port connections, but only when the ++ on_unsupported_protocol directive is in use. ++ - https_port connections (and CONNECT tunnels) that ++ are subject to the ssl_bump peek or stare action. ++ ++ To protect binary handshake data, this field is always ++ base64-encoded (RFC 4648 Section 4). If logformat ++ field encoding is configured, that encoding is applied ++ on top of base64. Otherwise, the computed base64 value ++ is recorded as is. ++ + Time related format codes: + + ts Seconds since epoch +diff --git a/src/format/ByteCode.h b/src/format/ByteCode.h +index ad230bb..a6f8fd9 100644 +--- a/src/format/ByteCode.h ++++ b/src/format/ByteCode.h +@@ -46,6 +46,8 @@ typedef enum { + LFT_CLIENT_LOCAL_TOS, + LFT_CLIENT_LOCAL_NFMARK, + ++ LFT_CLIENT_HANDSHAKE, ++ + /* client connection local squid.conf details */ + LFT_LOCAL_LISTENING_IP, + LFT_LOCAL_LISTENING_PORT, +diff --git a/src/format/Format.cc b/src/format/Format.cc +index c1e19b4..8fd6720 100644 +--- a/src/format/Format.cc ++++ b/src/format/Format.cc +@@ -8,6 +8,7 @@ + + #include "squid.h" + #include "AccessLogEntry.h" ++#include "base64.h" + #include "client_side.h" + #include "comm/Connection.h" + #include "err_detail_type.h" +@@ -547,6 +548,24 @@ Format::Format::assemble(MemBuf &mb, const AccessLogEntry::Pointer &al, int logS + } + break; + ++ case LFT_CLIENT_HANDSHAKE: ++ if (al->request && al->request->clientConnectionManager.valid()) { ++ const auto &handshake = al->request->clientConnectionManager->preservedClientData; ++ if (const auto rawLength = handshake.length()) { ++ // add 1 byte to optimize the c_str() conversion below ++ char *buf = sb.rawAppendStart(base64_encode_len(rawLength) + 1); ++ ++ struct base64_encode_ctx ctx; ++ base64_encode_init(&ctx); ++ auto encLength = base64_encode_update(&ctx, buf, rawLength, reinterpret_cast<const uint8_t*>(handshake.rawContent())); ++ encLength += base64_encode_final(&ctx, buf + encLength); ++ ++ sb.rawAppendFinish(buf, encLength); ++ out = sb.c_str(); ++ } ++ } ++ break; ++ + case LFT_TIME_SECONDS_SINCE_EPOCH: + // some platforms store time in 32-bit, some 64-bit... + outoff = static_cast<int64_t>(current_time.tv_sec); +diff --git a/src/format/Token.cc b/src/format/Token.cc +index 186ade5..06c60cf 100644 +--- a/src/format/Token.cc ++++ b/src/format/Token.cc +@@ -141,6 +141,7 @@ static TokenTableEntry TokenTableMisc[] = { + TokenTableEntry("<qos", LFT_SERVER_LOCAL_TOS), + TokenTableEntry(">nfmark", LFT_CLIENT_LOCAL_NFMARK), + TokenTableEntry("<nfmark", LFT_SERVER_LOCAL_NFMARK), ++ TokenTableEntry(">handshake", LFT_CLIENT_HANDSHAKE), + TokenTableEntry("err_code", LFT_SQUID_ERROR ), + TokenTableEntry("err_detail", LFT_SQUID_ERROR_DETAIL ), + TokenTableEntry("note", LFT_NOTE ), diff --git a/src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch b/src/patches/squid/squid-4.4-fix-max-file-descriptors.patch similarity index 92% rename from src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch rename to src/patches/squid/squid-4.4-fix-max-file-descriptors.patch index b740b6104..8d1a4e03a 100644 --- a/src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch +++ b/src/patches/squid/squid-4.4-fix-max-file-descriptors.patch @@ -1,6 +1,6 @@ --- configure.ac.~ Wed Apr 20 14:26:07 2016 +++ configure.ac Fri Apr 22 17:20:46 2016 -@@ -3135,6 +3135,9 @@ +@@ -3156,6 +3156,9 @@ ;; esac @@ -10,7 +10,7 @@ dnl --with-maxfd present for compatibility with Squid-2. dnl undocumented in ./configure --help to encourage using the Squid-3 directive AC_ARG_WITH(maxfd,, -@@ -3165,8 +3168,6 @@ +@@ -3186,8 +3189,6 @@ esac ]) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 57c04aa49db6b93dee562477ce9fec5141c787a6
by Michael Tremer 17 Dec '18

17 Dec '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 57c04aa49db6b93dee562477ce9fec5141c787a6 (commit) from 6174b7b1c72cd5141e04ac2621eef90d86987a91 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 57c04aa49db6b93dee562477ce9fec5141c787a6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 16 22:23:50 2018 +0000 Revert "make.sh: Build in ramdisk" This reverts commit 6174b7b1c72cd5141e04ac2621eef90d86987a91. This had absolutely no effect on build time or rather made it slower. So this is being reverted to save ourselves the RAM. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: make.sh | 68 ----------------------------------------------------------------- 1 file changed, 68 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index fb529b669..fd626a999 100755 --- a/make.sh +++ b/make.sh @@ -290,9 +290,6 @@ stdumount() { umount $BASEDIR/build/usr/src/lfs 2>/dev/null; umount $BASEDIR/build/usr/src/log 2>/dev/null; umount $BASEDIR/build/usr/src/src 2>/dev/null; - - # Umount ramdisk - ramdisk_save "${BASEDIR}/build" } now() { @@ -426,68 +423,6 @@ exiterror() { exit 1 } -ramdisk_save() { - local path="${1}" - - # Check if the ramdisk is actually mounted - if ! mountpoint "${path}" &>/dev/null; then - return 1 - fi - - # Remove the bind-mount - umount "${path}" - - echo -n "Saving ramdisk (this might take a moment)..." - - # Copy all data - mkdir -p "${path}.tmpfs" - if ! rsync -aHAXq --delete "${path}.tmpfs/" "${path}/"; then - print_status FAIL - return 1 - fi - - # Umount ramdisk - umount "${path}.tmpfs" - rm -rf "${path}.tmpfs" - - print_status DONE -} - -ramdisk_restore() { - local path="${1}" - - # Don't do anything if ramdisk support isn't enabled - if [ "${USE_RAMDISK}" != "1" ]; then - return 1 - fi - - # Check for sufficient memory - # XXX TODO - - echo -n "Restoring ramdisk (this might take a moment)..." - - # Mount new ramdisk - mkdir -p "${path}.tmpfs" - if ! mount -t tmpfs none "${path}.tmpfs"; then - exiterror "Could not mount ramdisk" - fi - - # Restore all data - if ! rsync -aHAXq --delete "${path}/" "${path}.tmpfs/"; then - umount "${path}.tmpfs" - rm -rf "${path}.tmpfs" - - exiterror "Could not restore ramdisk" - fi - - # Overlay the files on disk - # We would use "mount --move ..." but systemd is always - # mounting / as shared which doesn't allow moving anything - mount --bind "${path}.tmpfs" "${path}" - - print_status DONE -} - prepareenv() { # Are we running the right shell? if [ -z "${BASH}" ]; then @@ -537,9 +472,6 @@ prepareenv() { export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD - # Mount ramdisk (if requested) - ramdisk_restore "${BASEDIR}/build" - # Make some extra directories mkdir -p "${BASEDIR}/build${TOOLS_DIR}" 2>/dev/null mkdir -p $BASEDIR/build/{etc,usr/src} 2>/dev/null hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6174b7b1c72cd5141e04ac2621eef90d86987a91
by Michael Tremer 16 Dec '18

16 Dec '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 6174b7b1c72cd5141e04ac2621eef90d86987a91 (commit) from 53ac9dd222aac232b35d0c1ce453eaf4cacc3419 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6174b7b1c72cd5141e04ac2621eef90d86987a91 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 16 16:50:13 2018 +0000 make.sh: Build in ramdisk This is an experimental change that I want to trial to speed up the nightly builds. The build environment will be mounted in a ramdisk and the build will be performed in there. This will hopefully reduce IO on the (slow) replicated disks. If there is no significant performance gain from this, this commit will be reverted. To enable this, USE_RAMDISK must be set to 1 in .config. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: make.sh | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) Difference in files: diff --git a/make.sh b/make.sh index fd626a999..fb529b669 100755 --- a/make.sh +++ b/make.sh @@ -290,6 +290,9 @@ stdumount() { umount $BASEDIR/build/usr/src/lfs 2>/dev/null; umount $BASEDIR/build/usr/src/log 2>/dev/null; umount $BASEDIR/build/usr/src/src 2>/dev/null; + + # Umount ramdisk + ramdisk_save "${BASEDIR}/build" } now() { @@ -423,6 +426,68 @@ exiterror() { exit 1 } +ramdisk_save() { + local path="${1}" + + # Check if the ramdisk is actually mounted + if ! mountpoint "${path}" &>/dev/null; then + return 1 + fi + + # Remove the bind-mount + umount "${path}" + + echo -n "Saving ramdisk (this might take a moment)..." + + # Copy all data + mkdir -p "${path}.tmpfs" + if ! rsync -aHAXq --delete "${path}.tmpfs/" "${path}/"; then + print_status FAIL + return 1 + fi + + # Umount ramdisk + umount "${path}.tmpfs" + rm -rf "${path}.tmpfs" + + print_status DONE +} + +ramdisk_restore() { + local path="${1}" + + # Don't do anything if ramdisk support isn't enabled + if [ "${USE_RAMDISK}" != "1" ]; then + return 1 + fi + + # Check for sufficient memory + # XXX TODO + + echo -n "Restoring ramdisk (this might take a moment)..." + + # Mount new ramdisk + mkdir -p "${path}.tmpfs" + if ! mount -t tmpfs none "${path}.tmpfs"; then + exiterror "Could not mount ramdisk" + fi + + # Restore all data + if ! rsync -aHAXq --delete "${path}/" "${path}.tmpfs/"; then + umount "${path}.tmpfs" + rm -rf "${path}.tmpfs" + + exiterror "Could not restore ramdisk" + fi + + # Overlay the files on disk + # We would use "mount --move ..." but systemd is always + # mounting / as shared which doesn't allow moving anything + mount --bind "${path}.tmpfs" "${path}" + + print_status DONE +} + prepareenv() { # Are we running the right shell? if [ -z "${BASH}" ]; then @@ -472,6 +537,9 @@ prepareenv() { export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD + # Mount ramdisk (if requested) + ramdisk_restore "${BASEDIR}/build" + # Make some extra directories mkdir -p "${BASEDIR}/build${TOOLS_DIR}" 2>/dev/null mkdir -p $BASEDIR/build/{etc,usr/src} 2>/dev/null hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1544a62869c0c597b0ff18f3227a37551a376f2a
by Michael Tremer 13 Dec '18

13 Dec '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 1544a62869c0c597b0ff18f3227a37551a376f2a (commit) via 5d951df37e52807304a027c55762e1ef500adbe2 (commit) via 643d637c1c155ecfd509918e244d366b60435272 (commit) via 253d3a95ca171b74e761523760f35d610e5785e3 (commit) via 1e1ddde29356eaeed71411459682585f7d7eabed (commit) via 198756ea972532b8dace5dd39f8e6254ca7c7220 (commit) via 5772fe7f3098cdd731c7327d78f20c5f40960feb (commit) from aaa616e7d52510873d87917acb54efd1af556992 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1544a62869c0c597b0ff18f3227a37551a376f2a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 13 13:35:49 2018 +0000 setup: Drop quagga user Since we no longer have quagga, we don't need this any more Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5d951df37e52807304a027c55762e1ef500adbe2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 13 13:34:53 2018 +0000 Drop frr & quagga These are replaced by bird. There is such chaos now with all these routing daemons... Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 643d637c1c155ecfd509918e244d366b60435272 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 13 13:34:32 2018 +0000 network: Depend on bird instead of frr Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 253d3a95ca171b74e761523760f35d610e5785e3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 13 13:33:01 2018 +0000 bird: Update to 2.0.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1e1ddde29356eaeed71411459682585f7d7eabed Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 13 13:30:46 2018 +0000 Revert "bird: Drop package" This reverts commit 09c3106fb13fde1c815c9513fd89b402e344c05b. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 198756ea972532b8dace5dd39f8e6254ca7c7220 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 1 19:19:41 2018 +0000 strongswan: Update to 5.7.1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5772fe7f3098cdd731c7327d78f20c5f40960feb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 1 18:34:40 2018 +0000 nano: Update to 3.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: rng-tools/rng-tools.nm => bird/bird.nm | 30 +++++---- bird/systemd/bird.service | 13 ++++ bird/systemd/bird6.service | 13 ++++ frr/frr.nm | 107 --------------------------------- frr/frr.tmpfiles | 1 - frr/systemd/bgpd.service | 12 ---- frr/systemd/ospf6d.service | 12 ---- frr/systemd/ospfd.service | 12 ---- frr/systemd/zebra.service | 12 ---- nano/nano.nm | 6 +- network/network.nm | 4 +- quagga/quagga.nm | 105 -------------------------------- quagga/quagga.tmpfiles | 1 - quagga/systemd/bgpd.service | 12 ---- quagga/systemd/ospf6d.service | 12 ---- quagga/systemd/ospfd.service | 12 ---- quagga/systemd/zebra.service | 12 ---- setup/setup.nm | 2 +- setup/uidgid | 1 - strongswan/strongswan.nm | 4 +- 20 files changed, 51 insertions(+), 332 deletions(-) copy rng-tools/rng-tools.nm => bird/bird.nm (56%) create mode 100644 bird/systemd/bird.service create mode 100644 bird/systemd/bird6.service delete mode 100644 frr/frr.nm delete mode 100644 frr/frr.tmpfiles delete mode 100644 frr/systemd/bgpd.service delete mode 100644 frr/systemd/ospf6d.service delete mode 100644 frr/systemd/ospfd.service delete mode 100644 frr/systemd/zebra.service delete mode 100644 quagga/quagga.nm delete mode 100644 quagga/quagga.tmpfiles delete mode 100644 quagga/systemd/bgpd.service delete mode 100644 quagga/systemd/ospf6d.service delete mode 100644 quagga/systemd/ospfd.service delete mode 100644 quagga/systemd/zebra.service Difference in files: diff --git a/bird/bird.nm b/bird/bird.nm new file mode 100644 index 000000000..c288bcefc --- /dev/null +++ b/bird/bird.nm @@ -0,0 +1,58 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = bird +version = 2.0.2 +release = 1 + +groups = Networking/Routing +url = http://bird.network.cz/ +license = GPLv2+ +summary = BIRD Internet Routing Daemon. + +description + BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of routing + protocols BGP, RIP and OSPF. +end + +source_dl = ftp://bird.network.cz/pub/bird/ + +build + requires + bison + flex + ncurses-devel + readline-devel + end +end + +packages + package %{name} + prerequires = systemd-units + + script postin + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + /bin/systemctl --no-reload disable bird.service > /dev/null 2>&1 || : + /bin/systemctl stop bird.service > /dev/null 2>&1 || : + + end + + script postun + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + /bin/systemctl daemon-reload 2>&1 || : + /bin/systemctl reload-or-try-restart bird.service >/dev/null 2>&1 || : + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/bird/systemd/bird.service b/bird/systemd/bird.service new file mode 100644 index 000000000..438d6afef --- /dev/null +++ b/bird/systemd/bird.service @@ -0,0 +1,13 @@ +[Unit] +Description=BIRD Internet Routing Daemon +Requires=network.target +After=network.target +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/sbin/bird +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/bird/systemd/bird6.service b/bird/systemd/bird6.service new file mode 100644 index 000000000..0d8e9b58a --- /dev/null +++ b/bird/systemd/bird6.service @@ -0,0 +1,13 @@ +[Unit] +Description=BIRD Internet Routing Daemon +Requires=network.target +After=network.target +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/sbin/bird6 +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/frr/frr.nm b/frr/frr.nm deleted file mode 100644 index cafa62677..000000000 --- a/frr/frr.nm +++ /dev/null @@ -1,107 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = frr -version = 2.0 -release = 1 - -groups = Networking/Routing -url = https://frrouting.org -license = GPLv2+ -summary = FRRouting is an IP routing protocol suite - -description - FRRouting (FRR) is an IP routing protocol suite for Linux and Unix - platforms which includes protocol daemons for BGP, IS-IS, LDP, OSPF, - PIM, and RIP. -end - -source_dl = https://github.com/FRRouting/frr/releases/download/frr-%{version}/ - -build - requires - json-c-devel - ncurses-devel - readline-devel - systemd-units - texinfo - end - - prepare_cmds - %{create_user} - end - - configure_options += \ - --sysconfdir=/etc/frr \ - --localstatedir=%{localstatedir}/run/frr \ - --disable-static \ - --disable-watchfrr \ - --enable-multipath=64 \ - --disable-isisd \ - --disable-pimd \ - --disable-ripd \ - --disable-ripngd - - install_cmds - mkdir -pv %{localstatedir}/run/frr - chown -v frr.frr %{localstatedir}/run/frr - end -end - -create_user - getent group frr >/dev/null || /usr/sbin/groupadd -r frr - getent passwd frr >/dev/null || /usr/sbin/useradd -r -g frr \ - -d %{sysconfdir}/%{name} -s /sbin/nologin frr -end - -packages - package %{name} - services = bgpd ospf6d ospfd zebra - - # This is a fork of quagga and installs binaries - # with the same name. Hence we cannot install both - # at the same time. - conflicts = quagga - - script prein - %{create_user} - end - - script postin - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - end - - script preun - for i in %{services}; do - systemctl --no-reload disable ${i}.service >/dev/null 2>&1 || : - systemctl stop ${i}.service >/dev/null 2>&1 || : - done - end - - script postun - systemctl daemon-reload >/dev/null 2>&1 || : - end - - script postup - systemctl daemon-reload >/dev/null 2>&1 || : - - for i in %{services}; do - systemctl try-restart ${i}.service >/dev/null 2>&1 || : - done - end - end - - package %{name}-libs - template LIBS - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/frr/frr.tmpfiles b/frr/frr.tmpfiles deleted file mode 100644 index ec703564f..000000000 --- a/frr/frr.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/run/frr 0755 frr frr diff --git a/frr/systemd/bgpd.service b/frr/systemd/bgpd.service deleted file mode 100644 index a52ebea2d..000000000 --- a/frr/systemd/bgpd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=BGP routing daemon -BindTo=zebra.service -After=syslog.target network.target zebra.service - -[Service] -Type=forking -ExecStart=/usr/sbin/bgpd -d -f /etc/frr/bgpd.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/frr/systemd/ospf6d.service b/frr/systemd/ospf6d.service deleted file mode 100644 index 14f2f0337..000000000 --- a/frr/systemd/ospf6d.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OSPF routing daemon for IPv6 -BindTo=zebra.service -After=syslog.target network.target zebra.service - -[Service] -Type=forking -ExecStart=/usr/sbin/ospf6d -d -f /etc/frr/ospf6d.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/frr/systemd/ospfd.service b/frr/systemd/ospfd.service deleted file mode 100644 index 90b7dbbec..000000000 --- a/frr/systemd/ospfd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OSPF routing daemon -BindTo=zebra.service -After=syslog.target network.target zebra.service - -[Service] -Type=forking -ExecStart=/usr/sbin/ospfd -d -f /etc/frr/ospfd.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/frr/systemd/zebra.service b/frr/systemd/zebra.service deleted file mode 100644 index 81ac73224..000000000 --- a/frr/systemd/zebra.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=GNU Zebra routing manager -After=syslog.target network.target - -[Service] -Type=forking -ExecStartPre=/sbin/ip route flush proto zebra -ExecStart=/usr/sbin/zebra -d -f /etc/frr/zebra.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/nano/nano.nm b/nano/nano.nm index c7a65dfe6..d8edbee40 100644 --- a/nano/nano.nm +++ b/nano/nano.nm @@ -4,9 +4,7 @@ ############################################################################### name = nano -mainversion = 2.9 -subversion = 2 -version = %{mainversion}.%{subversion} +version = 3.2 release = 1 groups = Application/Editors @@ -18,7 +16,7 @@ description GNU nano is a small and friendly text editor. end -source_dl = http://www.nano-editor.org/dist/v%{mainversion}/ +source_dl = http://www.nano-editor.org/dist/v3/ build requires diff --git a/network/network.nm b/network/network.nm index 7db2dba63..c6a789447 100644 --- a/network/network.nm +++ b/network/network.nm @@ -6,7 +6,7 @@ name = network epoch = 1 version = 010 -release = 1 +release = 2 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Base Networking/Tools @@ -70,7 +70,7 @@ packages end recommends - frr + bird end configfiles diff --git a/quagga/quagga.nm b/quagga/quagga.nm deleted file mode 100644 index ad28175b5..000000000 --- a/quagga/quagga.nm +++ /dev/null @@ -1,105 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = quagga -version = 1.2.0 -release = 1 - -groups = Networking/Routing -url = http://www.quagga.net/ -license = GPLv2+ -summary = Quagga is a rounting daemon. - -description - Quagga is a free software that manages TCP/IP based routing - protocol. It takes multi-server and multi-thread approach to resolve - the current complexity of the Internet. - - Quagga supports BGP4, BGP4+, OSPFv2 and OSPFv3. -end - -source_dl = http://download.savannah.gnu.org/releases/quagga/ - -build - requires - c-ares-devel - ncurses-devel - net-snmp-devel - readline-devel - systemd-units - texinfo - end - - prepare_cmds - %{create_user} - end - - configure_options += \ - --sysconfdir=/etc/quagga \ - --localstatedir=%{localstatedir}/run/quagga \ - --disable-static \ - --disable-watchquagga \ - --enable-multipath=64 \ - --disable-isisd \ - --disable-pimd \ - --disable-ripd \ - --disable-ripngd - - install_cmds - mkdir -pv %{localstatedir}/run/quagga - chown -v quagga.quagga %{localstatedir}/run/quagga - end -end - -create_user - getent group quagga >/dev/null || /usr/sbin/groupadd -r quagga - getent passwd quagga >/dev/null || /usr/sbin/useradd -r -g quagga \ - -d %{sysconfdir}/%{name} -s /sbin/nologin quagga -end - -packages - package %{name} - services = bgpd ospf6d ospfd zebra - - script prein - %{create_user} - end - - script postin - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - end - - script preun - for i in %{services}; do - systemctl --no-reload disable ${i}.service >/dev/null 2>&1 || : - systemctl stop ${i}.service >/dev/null 2>&1 || : - done - end - - script postun - systemctl daemon-reload >/dev/null 2>&1 || : - end - - script postup - systemctl daemon-reload >/dev/null 2>&1 || : - - for i in %{services}; do - systemctl try-restart ${i}.service >/dev/null 2>&1 || : - done - end - end - - package %{name}-libs - template LIBS - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/quagga/quagga.tmpfiles b/quagga/quagga.tmpfiles deleted file mode 100644 index 8974b64f8..000000000 --- a/quagga/quagga.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/run/quagga 0755 quagga quagga diff --git a/quagga/systemd/bgpd.service b/quagga/systemd/bgpd.service deleted file mode 100644 index 2874432df..000000000 --- a/quagga/systemd/bgpd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=BGP routing daemon -BindTo=zebra.service -After=syslog.target network.target zebra.service - -[Service] -Type=forking -ExecStart=/usr/sbin/bgpd -d -f /etc/quagga/bgpd.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/quagga/systemd/ospf6d.service b/quagga/systemd/ospf6d.service deleted file mode 100644 index 93b9dfa61..000000000 --- a/quagga/systemd/ospf6d.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OSPF routing daemon for IPv6 -BindTo=zebra.service -After=syslog.target network.target zebra.service - -[Service] -Type=forking -ExecStart=/usr/sbin/ospf6d -d -f /etc/quagga/ospf6d.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/quagga/systemd/ospfd.service b/quagga/systemd/ospfd.service deleted file mode 100644 index e276649bc..000000000 --- a/quagga/systemd/ospfd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OSPF routing daemon -BindTo=zebra.service -After=syslog.target network.target zebra.service - -[Service] -Type=forking -ExecStart=/usr/sbin/ospfd -d -f /etc/quagga/ospfd.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/quagga/systemd/zebra.service b/quagga/systemd/zebra.service deleted file mode 100644 index 977c2dc27..000000000 --- a/quagga/systemd/zebra.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=GNU Zebra routing manager -After=syslog.target network.target - -[Service] -Type=forking -ExecStartPre=/sbin/ip route flush proto zebra -ExecStart=/usr/sbin/zebra -d -f /etc/quagga/zebra.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/setup/setup.nm b/setup/setup.nm index dad72ae0b..78d1a5df3 100644 --- a/setup/setup.nm +++ b/setup/setup.nm @@ -5,7 +5,7 @@ name = setup version = 3.0 -release = 9 +release = 10 arch = noarch groups = Base Build System/Base diff --git a/setup/uidgid b/setup/uidgid index 2486675fb..7bdb249a8 100644 --- a/setup/uidgid +++ b/setup/uidgid @@ -93,7 +93,6 @@ dbus 81 81 / /sbin/nologin dbus jonas 82 82 /var/lib/jonas /sbin/nologin jonas clamav 83 83 /tmp /sbin/nologin clamav screen - 84 - - screen -quaggavt - 85 - - quagga sabayon 86 86 - /sbin/nologin sabayon polkituser 87 87 / /sbin/nologin PolicyKit wbpriv - 88 - - samba-common diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm index 12505baf0..e3121e08f 100644 --- a/strongswan/strongswan.nm +++ b/strongswan/strongswan.nm @@ -4,8 +4,8 @@ ############################################################################### name = strongswan -version = 5.6.3 -release = 2 +version = 5.7.1 +release = 1 groups = Networking/VPN url = http://www.strongswan.org/ hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 53ac9dd222aac232b35d0c1ce453eaf4cacc3419
by Michael Tremer 13 Dec '18

13 Dec '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 53ac9dd222aac232b35d0c1ce453eaf4cacc3419 (commit) via edff2bb85107c411d890b0ad4c55305fd9297566 (commit) via 848ac6900974f8ac3718c0ea4febec6e56954823 (commit) from 81e1e80e38609e01f98af649ee38e064420bab3d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 53ac9dd222aac232b35d0c1ce453eaf4cacc3419 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed Dec 12 20:41:54 2018 +0100 unbound: Update to 1.8.3 For details see: https://nlnetlabs.nl/svn/unbound/tags/release-1.8.3/doc/Changelog "Fix dns64 allocation in wrong region for returned internal queries." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit edff2bb85107c411d890b0ad4c55305fd9297566 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 13 13:11:01 2018 +0000 core127: Ship updated grub It doesn't need to be re-installed because no system with that configuration should exist right now. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 848ac6900974f8ac3718c0ea4febec6e56954823 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Dec 13 12:52:50 2018 +0100 grub: xfs: Accept filesystem with sparse inodes Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Tested-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/unbound | 2 +- .../124 => core/127}/filelists/aarch64/grub | 0 .../{oldcore/100 => core/127}/filelists/i586/grub | 0 .../100 => core/127}/filelists/x86_64/grub | 0 lfs/grub | 1 + lfs/unbound | 4 +- ...-xfs-accept-filesystem-with-sparse-inodes.patch | 60 ++++++++++++++++++++++ 7 files changed, 64 insertions(+), 3 deletions(-) copy config/rootfiles/{oldcore/124 => core/127}/filelists/aarch64/grub (100%) copy config/rootfiles/{oldcore/100 => core/127}/filelists/i586/grub (100%) copy config/rootfiles/{oldcore/100 => core/127}/filelists/x86_64/grub (100%) create mode 100644 src/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch Difference in files: diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index e02860487..9a8126c15 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.8 -usr/lib/libunbound.so.8.0.2 +usr/lib/libunbound.so.8.0.3 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/config/rootfiles/core/127/filelists/aarch64/grub b/config/rootfiles/core/127/filelists/aarch64/grub new file mode 120000 index 000000000..40ae85fb6 --- /dev/null +++ b/config/rootfiles/core/127/filelists/aarch64/grub @@ -0,0 +1 @@ +../../../../common/aarch64/grub \ No newline at end of file diff --git a/config/rootfiles/core/127/filelists/i586/grub b/config/rootfiles/core/127/filelists/i586/grub new file mode 120000 index 000000000..feb236a22 --- /dev/null +++ b/config/rootfiles/core/127/filelists/i586/grub @@ -0,0 +1 @@ +../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/127/filelists/x86_64/grub b/config/rootfiles/core/127/filelists/x86_64/grub new file mode 120000 index 000000000..78d3bd784 --- /dev/null +++ b/config/rootfiles/core/127/filelists/x86_64/grub @@ -0,0 +1 @@ +../../../../common/x86_64/grub \ No newline at end of file diff --git a/lfs/grub b/lfs/grub index 1a10c2aa5..e6131f2f5 100644 --- a/lfs/grub +++ b/lfs/grub @@ -99,6 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) $(DIR_APP_EFI) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.02_disable_vga_fallback.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch # Install unifont cp -v $(DIR_DL)/unifont-7.0.03.pcf.gz $(DIR_APP)/unifont.pcf.gz diff --git a/lfs/unbound b/lfs/unbound index 3c876b79a..e4761eb67 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -24,7 +24,7 @@ include Config -VER = 1.8.2 +VER = 1.8.3 THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3b2f1024df47ccc59a8100c3b40c6dc1 +$(DL_FILE)_MD5 = 4646203343d3b8f5aeb1b57753c27ead install : $(TARGET) diff --git a/src/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch b/src/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch new file mode 100644 index 000000000..6c6a750b4 --- /dev/null +++ b/src/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch @@ -0,0 +1,60 @@ +From cda0a857dd7a27cd5d621747464bfe71e8727fff Mon Sep 17 00:00:00 2001 +From: Daniel Kiper <daniel.kiper(a)oracle.com> +Date: Tue, 29 May 2018 16:16:02 +0200 +Subject: xfs: Accept filesystem with sparse inodes + +The sparse inode metadata format became a mkfs.xfs default in +xfsprogs-4.16.0, and such filesystems are now rejected by grub as +containing an incompatible feature. + +In essence, this feature allows xfs to allocate inodes into fragmented +freespace. (Without this feature, if xfs could not allocate contiguous +space for 64 new inodes, inode creation would fail.) + +In practice, the disk format change is restricted to the inode btree, +which as far as I can tell is not used by grub. If all you're doing +today is parsing a directory, reading an inode number, and converting +that inode number to a disk location, then ignoring this feature +should be fine, so I've added it to XFS_SB_FEAT_INCOMPAT_SUPPORTED + +I did some brief testing of this patch by hacking up the regression +tests to completely fragment freespace on the test xfs filesystem, and +then write a large-ish number of inodes to consume any existing +contiguous 64-inode chunk. This way any files the grub tests add and +traverse would be in such a fragmented inode allocation. Tests passed, +but I'm not sure how to cleanly integrate that into the test harness. + +Signed-off-by: Eric Sandeen <sandeen(a)redhat.com> +Reviewed-by: Daniel Kiper <daniel.kiper(a)oracle.com> +Tested-by: Chris Murphy <lists(a)colorremedies.com> +--- + grub-core/fs/xfs.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c +index c6031bd..3b00c74 100644 +--- a/grub-core/fs/xfs.c ++++ b/grub-core/fs/xfs.c +@@ -79,9 +79,18 @@ GRUB_MOD_LICENSE ("GPLv3+"); + #define XFS_SB_FEAT_INCOMPAT_SPINODES (1 << 1) /* sparse inode chunks */ + #define XFS_SB_FEAT_INCOMPAT_META_UUID (1 << 2) /* metadata UUID */ + +-/* We do not currently verify metadata UUID so it is safe to read such filesystem */ ++/* ++ * Directory entries with ftype are explicitly handled by GRUB code. ++ * ++ * We do not currently read the inode btrees, so it is safe to read filesystems ++ * with the XFS_SB_FEAT_INCOMPAT_SPINODES feature. ++ * ++ * We do not currently verify metadata UUID, so it is safe to read filesystems ++ * with the XFS_SB_FEAT_INCOMPAT_META_UUID feature. ++ */ + #define XFS_SB_FEAT_INCOMPAT_SUPPORTED \ + (XFS_SB_FEAT_INCOMPAT_FTYPE | \ ++ XFS_SB_FEAT_INCOMPAT_SPINODES | \ + XFS_SB_FEAT_INCOMPAT_META_UUID) + + struct grub_xfs_sblock +-- +cgit v1.0-41-gc330 + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 81e1e80e38609e01f98af649ee38e064420bab3d
by Michael Tremer 12 Dec '18

12 Dec '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 81e1e80e38609e01f98af649ee38e064420bab3d (commit) from 58e840bd96d6f7e34d332d8b18c95857ced5ca1d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 81e1e80e38609e01f98af649ee38e064420bab3d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Dec 12 11:34:12 2018 +0000 AWS: Prefer red* or eth* when importing configuration This change is necessary to make sure that the script prefers are link with internet access. That would usually be red (after the second boot) or eth* (on the first boot). That allows (and ensures) that we can install packages in the user-data script. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/127/filelists/files | 1 + src/initscripts/system/aws | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/127/filelists/files b/config/rootfiles/core/127/filelists/files index ce4e51768..1bcc4ca54 100644 --- a/config/rootfiles/core/127/filelists/files +++ b/config/rootfiles/core/127/filelists/files @@ -2,3 +2,4 @@ etc/system-release etc/issue srv/web/ipfire/cgi-bin/credits.cgi var/ipfire/langs +etc/rc.d/init.d/aws diff --git a/src/initscripts/system/aws b/src/initscripts/system/aws index 2a556801a..b22af7573 100644 --- a/src/initscripts/system/aws +++ b/src/initscripts/system/aws @@ -34,7 +34,8 @@ case "${1}" in running_on_ec2 || exit 0 # Find the first interface to use - for i in /sys/class/net/*; do + for i in /sys/class/net/red* /sys/class/net/eth* \ + /sys/class/net/*; do [ -d "${i}" ] || continue i=$(basename ${i}) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core126, updated. 98947f44fc603465178e17c59043cbfb935f157d
by Arne Fitzenreiter 11 Dec '18

11 Dec '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core126 has been updated via 98947f44fc603465178e17c59043cbfb935f157d (commit) from ed4bbe44d121480e56c817f42f797423507c7630 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 98947f44fc603465178e17c59043cbfb935f157d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Dec 11 20:43:24 2018 +0000 installer: Intialize part_boot_efi_idx This variable was not initialized on systems where EFI was not in use. Therefore the generated parted command line was not valid and caused the installation to abort. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/installer/hw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Difference in files: diff --git a/src/installer/hw.c b/src/installer/hw.c index b329db545..71a1f1cce 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -547,8 +547,10 @@ static int hw_calculate_partition_table(struct hw* hw, struct hw_destination* de snprintf(dest->part_boot_efi, sizeof(dest->part_boot_efi), "%s%d", path, part_idx++); - } else + } else { *dest->part_boot_efi = '\0'; + dest->part_boot_efi_idx = 0; + } if (dest->size_swap > 0) snprintf(dest->part_swap, sizeof(dest->part_swap), "%s%d", path, part_idx++); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 58e840bd96d6f7e34d332d8b18c95857ced5ca1d
by Michael Tremer 11 Dec '18

11 Dec '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 58e840bd96d6f7e34d332d8b18c95857ced5ca1d (commit) from de4f303186927ad1a7a8ff1ec221583d0f8ca047 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 58e840bd96d6f7e34d332d8b18c95857ced5ca1d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Dec 11 20:43:24 2018 +0000 installer: Intialize part_boot_efi_idx This variable was not initialized on systems where EFI was not in use. Therefore the generated parted command line was not valid and caused the installation to abort. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/installer/hw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Difference in files: diff --git a/src/installer/hw.c b/src/installer/hw.c index b329db545..71a1f1cce 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -547,8 +547,10 @@ static int hw_calculate_partition_table(struct hw* hw, struct hw_destination* de snprintf(dest->part_boot_efi, sizeof(dest->part_boot_efi), "%s%d", path, part_idx++); - } else + } else { *dest->part_boot_efi = '\0'; + dest->part_boot_efi_idx = 0; + } if (dest->size_swap > 0) snprintf(dest->part_swap, sizeof(dest->part_swap), "%s%d", path, part_idx++); hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM December 2018