IPFire-SCM May 2019

ipfire-scm@lists.ipfire.org

1 participants
60 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. db3451fe72518d7875e52db51315e7d3a87d9eaa
by Michael Tremer 20 May '19

20 May '19

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 db3451fe72518d7875e52db51315e7d3a87d9eaa (commit) via 84227f7a1c1b5093c01a0cabd6160d82197ee04b (commit) via 40407aee99546b4f25632bcaeb796d2a53cb1bcb (commit) from b06288b74d1abe20df2670824c8aafccb1f3aef6 (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 db3451fe72518d7875e52db51315e7d3a87d9eaa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 20 19:10:15 2019 +0100 suricata: Ship updated rule download script Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 84227f7a1c1b5093c01a0cabd6160d82197ee04b Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon May 20 20:06:22 2019 +0200 update-ids-ruleset: Release ids_page_lock when the downloader fails. Fixes #12085. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 40407aee99546b4f25632bcaeb796d2a53cb1bcb Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat May 18 15:14:00 2019 +0000 ids.cgi: Fix upstream proxy validation Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Acked-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/ids-functions.pl | 24 +++++++----------------- config/rootfiles/core/132/filelists/files | 1 + src/scripts/update-ids-ruleset | 3 +++ 3 files changed, 11 insertions(+), 17 deletions(-) Difference in files: diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl index deb287bb7..5530da11e 100644 --- a/config/cfgroot/ids-functions.pl +++ b/config/cfgroot/ids-functions.pl @@ -174,28 +174,18 @@ sub downloadruleset { # Check if an upstream proxy is configured. if ($proxysettings{'UPSTREAM_PROXY'}) { - my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/); my $proxy_url; - # Check if we got a peer. - if ($peer) { - $proxy_url = "http://"; + $proxy_url = "http://"; - # Check if the proxy requires authentication. - if (($proxysettings{'UPSTREAM_USER'}) && ($proxysettings{'UPSTREAM_PASSWORD'})) { - $proxy_url .= "$proxysettings{'UPSTREAM_USER'}\:$proxysettings{'UPSTREAM_PASSWORD'}\@"; - } - - # Add proxy server address and port. - $proxy_url .= "$peer\:$peerport"; - } else { - # Log error message and break. - &_log_to_syslog("Could not proper configure the proxy server access."); - - # Return "1" - false. - return 1; + # Check if the proxy requires authentication. + if (($proxysettings{'UPSTREAM_USER'}) && ($proxysettings{'UPSTREAM_PASSWORD'})) { + $proxy_url .= "$proxysettings{'UPSTREAM_USER'}\:$proxysettings{'UPSTREAM_PASSWORD'}\@"; } + # Add proxy server address and port. + $proxy_url .= $proxysettings{'UPSTREAM_PROXY'}; + # Setup proxy settings. $downloader->proxy(['http', 'https'], $proxy_url); } diff --git a/config/rootfiles/core/132/filelists/files b/config/rootfiles/core/132/filelists/files index dea80e4a2..cd6938878 100644 --- a/config/rootfiles/core/132/filelists/files +++ b/config/rootfiles/core/132/filelists/files @@ -19,6 +19,7 @@ srv/web/ipfire/cgi-bin/urlfilter.cgi srv/web/ipfire/cgi-bin/zoneconf.cgi usr/lib/firewall/rules.pl usr/local/bin/backupiso +usr/local/bin/update-ids-ruleset usr/sbin/convert-snort var/ipfire/ids-functions.pl var/ipfire/langs diff --git a/src/scripts/update-ids-ruleset b/src/scripts/update-ids-ruleset index f28a8c156..956c3a1f5 100644 --- a/src/scripts/update-ids-ruleset +++ b/src/scripts/update-ids-ruleset @@ -54,6 +54,9 @@ if(&IDS::downloadruleset()) { # Store error message for displaying in the WUI. &IDS::_store_error_message("$Lang::tr{'could not download latest updates'}"); + # Unlock the IDS page. + &IDS::unlock_ids_page(); + # Exit. exit 0; } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b06288b74d1abe20df2670824c8aafccb1f3aef6
by Michael Tremer 20 May '19

20 May '19

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 b06288b74d1abe20df2670824c8aafccb1f3aef6 (commit) from e6d721a916d528e6bc4068f57426ed1c398ab849 (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 b06288b74d1abe20df2670824c8aafccb1f3aef6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 20 18:04:49 2019 +0100 spectre-meltdown-checker: Update to 0.41 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/spectre-meltdown-checker | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/spectre-meltdown-checker b/lfs/spectre-meltdown-checker index 8bb3efb04..4f8d9a1cc 100644 --- a/lfs/spectre-meltdown-checker +++ b/lfs/spectre-meltdown-checker @@ -24,7 +24,7 @@ include Config -VER = 0.40 +VER = 0.41 THISAPP = spectre-meltdown-checker-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = spectre-meltdown-checker -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = cc1ed68faf3fde13b1ff3bd15a22d46d +$(DL_FILE)_MD5 = d3adcb3ac32e226dc18ab7f6ef6f7617 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e6d721a916d528e6bc4068f57426ed1c398ab849
by Michael Tremer 20 May '19

20 May '19

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 e6d721a916d528e6bc4068f57426ed1c398ab849 (commit) via 23b26ce5e342de51b0b677cbe92b8a276e19aa18 (commit) via 4d497f8ea03703131c0c0dd4b40822f1411d5f22 (commit) via 7478903fb172d6d2539197009a2cf4ca3a945134 (commit) via 0ec8e31aded7973d59878384fe13df1db220dc8a (commit) via 145343d56ea304a97221926d99b94719559b2749 (commit) via 933bfbf3059e0cdbad596fc4f04c05b9de91ebc4 (commit) via 13389777024b686c8316153b5f316e87e82d65f6 (commit) via 88e4e3d3ad2df2e7e86e94dd5de5d37f3d61b674 (commit) via 0c4ffc69193221a351ea2e53efae34514af1c90a (commit) via 86308adb25c4c54ad22f16527b10cb3fffe244f1 (commit) via 715a269aa4b1e5c09bef7beeeef21c651ce6b5e8 (commit) via ffcef39d403c0dd1b1e658e4a18c63a2bc0501cc (commit) via bf2a1c524bb11f41b38708f3a7e5d0c19d54d5cf (commit) via f8f4cd666008e4b5a1fe5ab029ca66606cc41cf2 (commit) via 2df98063a246dc1f17bae7fd0e477d7f73e2319f (commit) from d12e3fcd1e90188b9ddc31dc84334a8e6a5274a8 (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 e6d721a916d528e6bc4068f57426ed1c398ab849 Author: Stéphane Pautrel <stephane.pautrel(a)gmail.com> Date: Mon May 20 10:59:12 2019 +0100 Update French translation Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 23b26ce5e342de51b0b677cbe92b8a276e19aa18 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 20 10:56:13 2019 +0100 zoneconf: Reindent with tabs Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4d497f8ea03703131c0c0dd4b40822f1411d5f22 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 20 10:55:02 2019 +0100 Update translations Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7478903fb172d6d2539197009a2cf4ca3a945134 Author: Florian Bührle <flo(a)erdlof.org> Date: Sun May 19 23:33:45 2019 +0200 Added reboot notice Added a reboot notice and made table rows more distinguishable by alternating their background color. This improves usability. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0ec8e31aded7973d59878384fe13df1db220dc8a Author: Florian Bührle <flo(a)erdlof.org> Date: Sun May 19 23:04:24 2019 +0200 zoneconf: Switch rows/columns This change is necessary because the table can grow larger than the main container if a user has many NICs on their machine. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 145343d56ea304a97221926d99b94719559b2749 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 20 10:52:42 2019 +0100 Update contributors Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 933bfbf3059e0cdbad596fc4f04c05b9de91ebc4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 20 10:52:16 2019 +0100 core132: Ship updated ovpnmain.cgi file Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 13389777024b686c8316153b5f316e87e82d65f6 Author: Erik Kapfer <ummeegge(a)ipfire.org> Date: Sat Apr 27 16:05:51 2019 +0200 ovpn_reorganize_encryption: Integrate LZO from global to advanced section Fixes: #11819 - Since the Voracle vulnerability, LZO is better placed under advanced section cause under specific circumstances it is exploitable. - Warning/hint has been added in the option defaults description. Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 88e4e3d3ad2df2e7e86e94dd5de5d37f3d61b674 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 20 10:51:09 2019 +0100 Update translations Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0c4ffc69193221a351ea2e53efae34514af1c90a Author: Erik Kapfer <ummeegge(a)ipfire.org> Date: Sat Apr 27 16:05:50 2019 +0200 ovpn_reorganize_encryption: Added tls-auth into global section - Since HMAC selection is already in global section, it makes sense to keep the encryption togehter. - Given tls-auth better understandable name. Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 86308adb25c4c54ad22f16527b10cb3fffe244f1 Author: Erik Kapfer <ummeegge(a)ipfire.org> Date: Sat Apr 27 16:05:49 2019 +0200 ovpn_reorganize_encryption: Integrate HMAC selection to global section Fixes: #12009 and #11824 - Since HMACs will be used in any configuration it is better placed in the global menu. - Adapted global section to advanced and marked sections with a headline for better overview. - Deleted old headline in advanced section cause it is not needed anymore. - Added check if settings do not includes 'DAUTH', if possible SHA512 will be used and written to settings file. Old configurations with SHA1 will be untouched. Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 715a269aa4b1e5c09bef7beeeef21c651ce6b5e8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 20 10:48:25 2019 +0100 tshark: Drop special package scripts We are not doing anything different from the default here, so we do not need an extra copy of them. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ffcef39d403c0dd1b1e658e4a18c63a2bc0501cc Author: Erik Kapfer <ummeegge(a)ipfire.org> Date: Sun May 19 06:37:03 2019 +0200 tshark: New addon Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bf2a1c524bb11f41b38708f3a7e5d0c19d54d5cf Author: Oliver Fuhrer <oliver.fuhrer(a)bluewin.ch> Date: Sun May 19 15:30:52 2019 +0200 BUG 11696: VPN Subnets missing from wpad.dat This patch fixes the behavior in 11696 and adds IPSEC and OpenVPN n2n subnets to wpad.dat so they don't pass through the proxy. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f8f4cd666008e4b5a1fe5ab029ca66606cc41cf2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 20 10:09:26 2019 +0100 tor: Bump release version Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2df98063a246dc1f17bae7fd0e477d7f73e2319f Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat May 18 14:40:00 2019 +0000 Tor: specify correct user for default configuration While being built with user/group set to "tor", the default configuration still contains the old username. This patch adjusts it to the correct value. The issue was caused by insufficient testing, which I apologise for. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/132/filelists/files | 1 + config/rootfiles/packages/tshark | 1000 +++++++++++++++++++++++++++++ config/tor/defaults-torrc | 2 +- doc/language_issues.en | 3 +- doc/language_issues.es | 3 +- doc/language_issues.fr | 24 +- doc/language_issues.it | 3 + doc/language_issues.nl | 3 +- doc/language_issues.pl | 3 +- doc/language_issues.ru | 3 +- doc/language_issues.tr | 3 + doc/language_missings | 39 +- html/cgi-bin/credits.cgi | 1 + html/cgi-bin/ovpnmain.cgi | 136 ++-- html/cgi-bin/proxy.cgi | 25 + html/cgi-bin/zoneconf.cgi | 129 ++-- langs/de/cgi-bin/de.pl | 3 +- langs/en/cgi-bin/en.pl | 3 +- langs/fr/cgi-bin/fr.pl | 105 +-- lfs/tor | 2 +- lfs/{knot => tshark} | 31 +- make.sh | 1 + 22 files changed, 1293 insertions(+), 230 deletions(-) create mode 100644 config/rootfiles/packages/tshark copy lfs/{knot => tshark} (86%) Difference in files: diff --git a/config/rootfiles/core/132/filelists/files b/config/rootfiles/core/132/filelists/files index f62f14099..dea80e4a2 100644 --- a/config/rootfiles/core/132/filelists/files +++ b/config/rootfiles/core/132/filelists/files @@ -12,6 +12,7 @@ srv/web/ipfire/cgi-bin/captive.cgi srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/cgi-bin/urlfilter.cgi diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark new file mode 100644 index 000000000..fde4030a4 --- /dev/null +++ b/config/rootfiles/packages/tshark @@ -0,0 +1,1000 @@ +#usr/bin/capinfos +#usr/bin/captype +usr/bin/dumpcap +#usr/bin/editcap +#usr/bin/idl2wrs +#usr/bin/mergecap +#usr/bin/randpkt +#usr/bin/rawshark +#usr/bin/reordercap +#usr/bin/sharkd +#usr/bin/text2pcap +usr/bin/tshark +#usr/include/wireshark +#usr/include/wireshark/cfile.h +#usr/include/wireshark/cli_main.h +#usr/include/wireshark/codecs +#usr/include/wireshark/codecs/codecs.h +#usr/include/wireshark/epan +#usr/include/wireshark/epan/addr_and_mask.h +#usr/include/wireshark/epan/addr_resolv.h +#usr/include/wireshark/epan/address.h +#usr/include/wireshark/epan/address_types.h +#usr/include/wireshark/epan/afn.h +#usr/include/wireshark/epan/aftypes.h +#usr/include/wireshark/epan/app_mem_usage.h +#usr/include/wireshark/epan/arcnet_pids.h +#usr/include/wireshark/epan/arptypes.h +#usr/include/wireshark/epan/asn1.h +#usr/include/wireshark/epan/ax25_pids.h +#usr/include/wireshark/epan/bridged_pids.h +#usr/include/wireshark/epan/capture_dissectors.h +#usr/include/wireshark/epan/charsets.h +#usr/include/wireshark/epan/chdlctypes.h +#usr/include/wireshark/epan/color_filters.h +#usr/include/wireshark/epan/column-info.h +#usr/include/wireshark/epan/column-utils.h +#usr/include/wireshark/epan/column.h +#usr/include/wireshark/epan/conv_id.h +#usr/include/wireshark/epan/conversation.h +#usr/include/wireshark/epan/conversation_debug.h +#usr/include/wireshark/epan/conversation_table.h +#usr/include/wireshark/epan/crc10-tvb.h +#usr/include/wireshark/epan/crc16-tvb.h +#usr/include/wireshark/epan/crc32-tvb.h +#usr/include/wireshark/epan/crc6-tvb.h +#usr/include/wireshark/epan/crc8-tvb.h +#usr/include/wireshark/epan/decode_as.h +#usr/include/wireshark/epan/dfilter +#usr/include/wireshark/epan/dfilter/dfilter.h +#usr/include/wireshark/epan/dfilter/drange.h +#usr/include/wireshark/epan/diam_dict.h +#usr/include/wireshark/epan/disabled_protos.h +#usr/include/wireshark/epan/dissector_filters.h +#usr/include/wireshark/epan/dissectors +#usr/include/wireshark/epan/dissectors/file-rbm.h +#usr/include/wireshark/epan/dissectors/packet-6lowpan.h +#usr/include/wireshark/epan/dissectors/packet-a21.h +#usr/include/wireshark/epan/dissectors/packet-acp133.h +#usr/include/wireshark/epan/dissectors/packet-acse.h +#usr/include/wireshark/epan/dissectors/packet-actrace.h +#usr/include/wireshark/epan/dissectors/packet-adb_service.h +#usr/include/wireshark/epan/dissectors/packet-afp.h +#usr/include/wireshark/epan/dissectors/packet-alcap.h +#usr/include/wireshark/epan/dissectors/packet-ansi_a.h +#usr/include/wireshark/epan/dissectors/packet-ansi_map.h +#usr/include/wireshark/epan/dissectors/packet-ansi_tcap.h +#usr/include/wireshark/epan/dissectors/packet-arp.h +#usr/include/wireshark/epan/dissectors/packet-atalk.h +#usr/include/wireshark/epan/dissectors/packet-atm.h +#usr/include/wireshark/epan/dissectors/packet-atn-ulcs.h +#usr/include/wireshark/epan/dissectors/packet-bacapp.h +#usr/include/wireshark/epan/dissectors/packet-bacnet.h +#usr/include/wireshark/epan/dissectors/packet-ber.h +#usr/include/wireshark/epan/dissectors/packet-bfd.h +#usr/include/wireshark/epan/dissectors/packet-bgp.h +#usr/include/wireshark/epan/dissectors/packet-bluetooth.h +#usr/include/wireshark/epan/dissectors/packet-bssap.h +#usr/include/wireshark/epan/dissectors/packet-bssgp.h +#usr/include/wireshark/epan/dissectors/packet-btatt.h +#usr/include/wireshark/epan/dissectors/packet-btavctp.h +#usr/include/wireshark/epan/dissectors/packet-btavdtp.h +#usr/include/wireshark/epan/dissectors/packet-btavrcp.h +#usr/include/wireshark/epan/dissectors/packet-bthci_acl.h +#usr/include/wireshark/epan/dissectors/packet-bthci_cmd.h +#usr/include/wireshark/epan/dissectors/packet-bthci_evt.h +#usr/include/wireshark/epan/dissectors/packet-bthci_sco.h +#usr/include/wireshark/epan/dissectors/packet-btl2cap.h +#usr/include/wireshark/epan/dissectors/packet-btle.h +#usr/include/wireshark/epan/dissectors/packet-btrfcomm.h +#usr/include/wireshark/epan/dissectors/packet-btsdp.h +#usr/include/wireshark/epan/dissectors/packet-c1222.h +#usr/include/wireshark/epan/dissectors/packet-camel.h +#usr/include/wireshark/epan/dissectors/packet-cdt.h +#usr/include/wireshark/epan/dissectors/packet-cell_broadcast.h +#usr/include/wireshark/epan/dissectors/packet-charging_ase.h +#usr/include/wireshark/epan/dissectors/packet-chdlc.h +#usr/include/wireshark/epan/dissectors/packet-cip.h +#usr/include/wireshark/epan/dissectors/packet-cipsafety.h +#usr/include/wireshark/epan/dissectors/packet-cmip.h +#usr/include/wireshark/epan/dissectors/packet-cmp.h +#usr/include/wireshark/epan/dissectors/packet-cms.h +#usr/include/wireshark/epan/dissectors/packet-coap.h +#usr/include/wireshark/epan/dissectors/packet-credssp.h +#usr/include/wireshark/epan/dissectors/packet-crmf.h +#usr/include/wireshark/epan/dissectors/packet-csn1.h +#usr/include/wireshark/epan/dissectors/packet-dap.h +#usr/include/wireshark/epan/dissectors/packet-dcc.h +#usr/include/wireshark/epan/dissectors/packet-dccp.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-browser.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-budb.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-butc.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-dce122.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-dcom.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-dnsserver.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-frsapi.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-frsrpc.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-netlogon.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-nt.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-pnp.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-rras.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-samr.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-spoolss.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-svcctl.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc-tapi.h +#usr/include/wireshark/epan/dissectors/packet-dcerpc.h +#usr/include/wireshark/epan/dissectors/packet-dcom-dispatch.h +#usr/include/wireshark/epan/dissectors/packet-dcom.h +#usr/include/wireshark/epan/dissectors/packet-diameter.h +#usr/include/wireshark/epan/dissectors/packet-diameter_3gpp.h +#usr/include/wireshark/epan/dissectors/packet-diffserv-mpls-common.h +#usr/include/wireshark/epan/dissectors/packet-disp.h +#usr/include/wireshark/epan/dissectors/packet-dns.h +#usr/include/wireshark/epan/dissectors/packet-docsis-tlv.h +#usr/include/wireshark/epan/dissectors/packet-dop.h +#usr/include/wireshark/epan/dissectors/packet-dsp.h +#usr/include/wireshark/epan/dissectors/packet-dtls.h +#usr/include/wireshark/epan/dissectors/packet-dtn.h +#usr/include/wireshark/epan/dissectors/packet-dvbci.h +#usr/include/wireshark/epan/dissectors/packet-e164.h +#usr/include/wireshark/epan/dissectors/packet-e212.h +#usr/include/wireshark/epan/dissectors/packet-eapol.h +#usr/include/wireshark/epan/dissectors/packet-edonkey.h +#usr/include/wireshark/epan/dissectors/packet-eigrp.h +#usr/include/wireshark/epan/dissectors/packet-enip.h +#usr/include/wireshark/epan/dissectors/packet-epl.h +#usr/include/wireshark/epan/dissectors/packet-epmd.h +#usr/include/wireshark/epan/dissectors/packet-erf.h +#usr/include/wireshark/epan/dissectors/packet-ess.h +#usr/include/wireshark/epan/dissectors/packet-eth.h +#usr/include/wireshark/epan/dissectors/packet-f5ethtrailer.h +#usr/include/wireshark/epan/dissectors/packet-fc.h +#usr/include/wireshark/epan/dissectors/packet-fcbls.h +#usr/include/wireshark/epan/dissectors/packet-fcct.h +#usr/include/wireshark/epan/dissectors/packet-fcels.h +#usr/include/wireshark/epan/dissectors/packet-fcfcs.h +#usr/include/wireshark/epan/dissectors/packet-fcfzs.h +#usr/include/wireshark/epan/dissectors/packet-fclctl.h +#usr/include/wireshark/epan/dissectors/packet-fcsb3.h +#usr/include/wireshark/epan/dissectors/packet-fcswils.h +#usr/include/wireshark/epan/dissectors/packet-ff.h +#usr/include/wireshark/epan/dissectors/packet-fix.h +#usr/include/wireshark/epan/dissectors/packet-fmp.h +#usr/include/wireshark/epan/dissectors/packet-frame.h +#usr/include/wireshark/epan/dissectors/packet-ftam.h +#usr/include/wireshark/epan/dissectors/packet-geonw.h +#usr/include/wireshark/epan/dissectors/packet-giop.h +#usr/include/wireshark/epan/dissectors/packet-gluster.h +#usr/include/wireshark/epan/dissectors/packet-gmr1_common.h +#usr/include/wireshark/epan/dissectors/packet-gmr1_rr.h +#usr/include/wireshark/epan/dissectors/packet-gprscdr.h +#usr/include/wireshark/epan/dissectors/packet-gre.h +#usr/include/wireshark/epan/dissectors/packet-gsm_a_common.h +#usr/include/wireshark/epan/dissectors/packet-gsm_a_rr.h +#usr/include/wireshark/epan/dissectors/packet-gsm_map.h +#usr/include/wireshark/epan/dissectors/packet-gsm_rlcmac.h +#usr/include/wireshark/epan/dissectors/packet-gsm_sms.h +#usr/include/wireshark/epan/dissectors/packet-gsmtap.h +#usr/include/wireshark/epan/dissectors/packet-gssapi.h +#usr/include/wireshark/epan/dissectors/packet-gtp.h +#usr/include/wireshark/epan/dissectors/packet-gtpv2.h +#usr/include/wireshark/epan/dissectors/packet-h223.h +#usr/include/wireshark/epan/dissectors/packet-h225.h +#usr/include/wireshark/epan/dissectors/packet-h235.h +#usr/include/wireshark/epan/dissectors/packet-h245.h +#usr/include/wireshark/epan/dissectors/packet-h248.h +#usr/include/wireshark/epan/dissectors/packet-h263.h +#usr/include/wireshark/epan/dissectors/packet-h264.h +#usr/include/wireshark/epan/dissectors/packet-h265.h +#usr/include/wireshark/epan/dissectors/packet-h323.h +#usr/include/wireshark/epan/dissectors/packet-h450-ros.h +#usr/include/wireshark/epan/dissectors/packet-hpext.h +#usr/include/wireshark/epan/dissectors/packet-http.h +#usr/include/wireshark/epan/dissectors/packet-http2.h +#usr/include/wireshark/epan/dissectors/packet-iana-oui.h +#usr/include/wireshark/epan/dissectors/packet-iax2.h +#usr/include/wireshark/epan/dissectors/packet-icmp.h +#usr/include/wireshark/epan/dissectors/packet-idmp.h +#usr/include/wireshark/epan/dissectors/packet-idp.h +#usr/include/wireshark/epan/dissectors/packet-ieee1609dot2.h +#usr/include/wireshark/epan/dissectors/packet-ieee80211-radio.h +#usr/include/wireshark/epan/dissectors/packet-ieee80211-radiotap-defs.h +#usr/include/wireshark/epan/dissectors/packet-ieee80211-radiotap-iter.h +#usr/include/wireshark/epan/dissectors/packet-ieee80211.h +#usr/include/wireshark/epan/dissectors/packet-ieee802154.h +#usr/include/wireshark/epan/dissectors/packet-ieee8023.h +#usr/include/wireshark/epan/dissectors/packet-ieee802a.h +#usr/include/wireshark/epan/dissectors/packet-igmp.h +#usr/include/wireshark/epan/dissectors/packet-imf.h +#usr/include/wireshark/epan/dissectors/packet-inap.h +#usr/include/wireshark/epan/dissectors/packet-infiniband.h +#usr/include/wireshark/epan/dissectors/packet-ip.h +#usr/include/wireshark/epan/dissectors/packet-ipmi.h +#usr/include/wireshark/epan/dissectors/packet-ipsec.h +#usr/include/wireshark/epan/dissectors/packet-ipx.h +#usr/include/wireshark/epan/dissectors/packet-isakmp.h +#usr/include/wireshark/epan/dissectors/packet-isis-clv.h +#usr/include/wireshark/epan/dissectors/packet-isis.h +#usr/include/wireshark/epan/dissectors/packet-isl.h +#usr/include/wireshark/epan/dissectors/packet-isup.h +#usr/include/wireshark/epan/dissectors/packet-its.h +#usr/include/wireshark/epan/dissectors/packet-iwarp-ddp-rdmap.h +#usr/include/wireshark/epan/dissectors/packet-juniper.h +#usr/include/wireshark/epan/dissectors/packet-jxta.h +#usr/include/wireshark/epan/dissectors/packet-kerberos.h +#usr/include/wireshark/epan/dissectors/packet-knxip.h +#usr/include/wireshark/epan/dissectors/packet-knxip_decrypt.h +#usr/include/wireshark/epan/dissectors/packet-l2tp.h +#usr/include/wireshark/epan/dissectors/packet-lapdm.h +#usr/include/wireshark/epan/dissectors/packet-lbm.h +#usr/include/wireshark/epan/dissectors/packet-lbtrm.h +#usr/include/wireshark/epan/dissectors/packet-lbtru.h +#usr/include/wireshark/epan/dissectors/packet-lbttcp.h +#usr/include/wireshark/epan/dissectors/packet-lcsap.h +#usr/include/wireshark/epan/dissectors/packet-ldap.h +#usr/include/wireshark/epan/dissectors/packet-ldp.h +#usr/include/wireshark/epan/dissectors/packet-link16.h +#usr/include/wireshark/epan/dissectors/packet-lisp.h +#usr/include/wireshark/epan/dissectors/packet-llc.h +#usr/include/wireshark/epan/dissectors/packet-lnet.h +#usr/include/wireshark/epan/dissectors/packet-logotypecertextn.h +#usr/include/wireshark/epan/dissectors/packet-lpp.h +#usr/include/wireshark/epan/dissectors/packet-lte-rrc.h +#usr/include/wireshark/epan/dissectors/packet-mac-lte.h +#usr/include/wireshark/epan/dissectors/packet-mausb.h +#usr/include/wireshark/epan/dissectors/packet-mbim.h +#usr/include/wireshark/epan/dissectors/packet-mbtcp.h +#usr/include/wireshark/epan/dissectors/packet-mgcp.h +#usr/include/wireshark/epan/dissectors/packet-mle.h +#usr/include/wireshark/epan/dissectors/packet-mms.h +#usr/include/wireshark/epan/dissectors/packet-mount.h +#usr/include/wireshark/epan/dissectors/packet-mp4ves.h +#usr/include/wireshark/epan/dissectors/packet-mpeg-descriptor.h +#usr/include/wireshark/epan/dissectors/packet-mpeg-sect.h +#usr/include/wireshark/epan/dissectors/packet-mpls.h +#usr/include/wireshark/epan/dissectors/packet-mq.h +#usr/include/wireshark/epan/dissectors/packet-msrp.h +#usr/include/wireshark/epan/dissectors/packet-mstp.h +#usr/include/wireshark/epan/dissectors/packet-mtp3.h +#usr/include/wireshark/epan/dissectors/packet-nbap.h +#usr/include/wireshark/epan/dissectors/packet-ncp-int.h +#usr/include/wireshark/epan/dissectors/packet-ncp-nmas.h +#usr/include/wireshark/epan/dissectors/packet-ncp-sss.h +#usr/include/wireshark/epan/dissectors/packet-ndmp.h +#usr/include/wireshark/epan/dissectors/packet-ndps.h +#usr/include/wireshark/epan/dissectors/packet-netbios.h +#usr/include/wireshark/epan/dissectors/packet-netlink.h +#usr/include/wireshark/epan/dissectors/packet-nfs.h +#usr/include/wireshark/epan/dissectors/packet-ngap.h +#usr/include/wireshark/epan/dissectors/packet-nisplus.h +#usr/include/wireshark/epan/dissectors/packet-nlm.h +#usr/include/wireshark/epan/dissectors/packet-nr-rrc.h +#usr/include/wireshark/epan/dissectors/packet-nsh.h +#usr/include/wireshark/epan/dissectors/packet-ntlmssp.h +#usr/include/wireshark/epan/dissectors/packet-ntp.h +#usr/include/wireshark/epan/dissectors/packet-nvme.h +#usr/include/wireshark/epan/dissectors/packet-ocsp.h +#usr/include/wireshark/epan/dissectors/packet-oer.h +#usr/include/wireshark/epan/dissectors/packet-opensafety.h +#usr/include/wireshark/epan/dissectors/packet-oscore.h +#usr/include/wireshark/epan/dissectors/packet-osi-options.h +#usr/include/wireshark/epan/dissectors/packet-osi.h +#usr/include/wireshark/epan/dissectors/packet-p1.h +#usr/include/wireshark/epan/dissectors/packet-p22.h +#usr/include/wireshark/epan/dissectors/packet-p7.h +#usr/include/wireshark/epan/dissectors/packet-p772.h +#usr/include/wireshark/epan/dissectors/packet-pcap_pktdata.h +#usr/include/wireshark/epan/dissectors/packet-pcnfsd.h +#usr/include/wireshark/epan/dissectors/packet-pdcp-lte.h +#usr/include/wireshark/epan/dissectors/packet-pdcp-nr.h +#usr/include/wireshark/epan/dissectors/packet-per.h +#usr/include/wireshark/epan/dissectors/packet-pkcs1.h +#usr/include/wireshark/epan/dissectors/packet-pkcs12.h +#usr/include/wireshark/epan/dissectors/packet-pkinit.h +#usr/include/wireshark/epan/dissectors/packet-pkix1explicit.h +#usr/include/wireshark/epan/dissectors/packet-pkix1implicit.h +#usr/include/wireshark/epan/dissectors/packet-pkixac.h +#usr/include/wireshark/epan/dissectors/packet-pkixproxy.h +#usr/include/wireshark/epan/dissectors/packet-pkixqualified.h +#usr/include/wireshark/epan/dissectors/packet-pkixtsp.h +#usr/include/wireshark/epan/dissectors/packet-portmap.h +#usr/include/wireshark/epan/dissectors/packet-ppi-geolocation-common.h +#usr/include/wireshark/epan/dissectors/packet-ppp.h +#usr/include/wireshark/epan/dissectors/packet-pres.h +#usr/include/wireshark/epan/dissectors/packet-ptp.h +#usr/include/wireshark/epan/dissectors/packet-ptpip.h +#usr/include/wireshark/epan/dissectors/packet-pw-atm.h +#usr/include/wireshark/epan/dissectors/packet-pw-common.h +#usr/include/wireshark/epan/dissectors/packet-q708.h +#usr/include/wireshark/epan/dissectors/packet-q931.h +#usr/include/wireshark/epan/dissectors/packet-q932.h +#usr/include/wireshark/epan/dissectors/packet-qsig.h +#usr/include/wireshark/epan/dissectors/packet-radius.h +#usr/include/wireshark/epan/dissectors/packet-raknet.h +#usr/include/wireshark/epan/dissectors/packet-ranap.h +#usr/include/wireshark/epan/dissectors/packet-rdm.h +#usr/include/wireshark/epan/dissectors/packet-rdt.h +#usr/include/wireshark/epan/dissectors/packet-reload.h +#usr/include/wireshark/epan/dissectors/packet-rlc-lte.h +#usr/include/wireshark/epan/dissectors/packet-rlc-nr.h +#usr/include/wireshark/epan/dissectors/packet-rmi.h +#usr/include/wireshark/epan/dissectors/packet-rmt-common.h +#usr/include/wireshark/epan/dissectors/packet-rohc.h +#usr/include/wireshark/epan/dissectors/packet-ros.h +#usr/include/wireshark/epan/dissectors/packet-rpc.h +#usr/include/wireshark/epan/dissectors/packet-rpcrdma.h +#usr/include/wireshark/epan/dissectors/packet-rrc.h +#usr/include/wireshark/epan/dissectors/packet-rsvp.h +#usr/include/wireshark/epan/dissectors/packet-rtcp.h +#usr/include/wireshark/epan/dissectors/packet-rtp-events.h +#usr/include/wireshark/epan/dissectors/packet-rtp.h +#usr/include/wireshark/epan/dissectors/packet-rtps.h +#usr/include/wireshark/epan/dissectors/packet-rtse.h +#usr/include/wireshark/epan/dissectors/packet-rtsp.h +#usr/include/wireshark/epan/dissectors/packet-rx.h +#usr/include/wireshark/epan/dissectors/packet-s1ap.h +#usr/include/wireshark/epan/dissectors/packet-s5066sis.h +#usr/include/wireshark/epan/dissectors/packet-s7comm.h +#usr/include/wireshark/epan/dissectors/packet-s7comm_szl_ids.h +#usr/include/wireshark/epan/dissectors/packet-sccp.h +#usr/include/wireshark/epan/dissectors/packet-scsi-mmc.h +#usr/include/wireshark/epan/dissectors/packet-scsi-osd.h +#usr/include/wireshark/epan/dissectors/packet-scsi-sbc.h +#usr/include/wireshark/epan/dissectors/packet-scsi-smc.h +#usr/include/wireshark/epan/dissectors/packet-scsi-ssc.h +#usr/include/wireshark/epan/dissectors/packet-scsi.h +#usr/include/wireshark/epan/dissectors/packet-sctp.h +#usr/include/wireshark/epan/dissectors/packet-sdp.h +#usr/include/wireshark/epan/dissectors/packet-ses.h +#usr/include/wireshark/epan/dissectors/packet-sflow.h +#usr/include/wireshark/epan/dissectors/packet-sip.h +#usr/include/wireshark/epan/dissectors/packet-skinny.h +#usr/include/wireshark/epan/dissectors/packet-sll.h +#usr/include/wireshark/epan/dissectors/packet-smb-browse.h +#usr/include/wireshark/epan/dissectors/packet-smb-common.h +#usr/include/wireshark/epan/dissectors/packet-smb-mailslot.h +#usr/include/wireshark/epan/dissectors/packet-smb-pipe.h +#usr/include/wireshark/epan/dissectors/packet-smb-sidsnooping.h +#usr/include/wireshark/epan/dissectors/packet-smb.h +#usr/include/wireshark/epan/dissectors/packet-smb2.h +#usr/include/wireshark/epan/dissectors/packet-smpp.h +#usr/include/wireshark/epan/dissectors/packet-smrse.h +#usr/include/wireshark/epan/dissectors/packet-snmp.h +#usr/include/wireshark/epan/dissectors/packet-socketcan.h +#usr/include/wireshark/epan/dissectors/packet-spice.h +#usr/include/wireshark/epan/dissectors/packet-sprt.h +#usr/include/wireshark/epan/dissectors/packet-sscop.h +#usr/include/wireshark/epan/dissectors/packet-stat-notify.h +#usr/include/wireshark/epan/dissectors/packet-stat.h +#usr/include/wireshark/epan/dissectors/packet-sv.h +#usr/include/wireshark/epan/dissectors/packet-syslog.h +#usr/include/wireshark/epan/dissectors/packet-t124.h +#usr/include/wireshark/epan/dissectors/packet-t30.h +#usr/include/wireshark/epan/dissectors/packet-t38.h +#usr/include/wireshark/epan/dissectors/packet-tacacs.h +#usr/include/wireshark/epan/dissectors/packet-tcap.h +#usr/include/wireshark/epan/dissectors/packet-tcp.h +#usr/include/wireshark/epan/dissectors/packet-tetra.h +#usr/include/wireshark/epan/dissectors/packet-tls-utils.h +#usr/include/wireshark/epan/dissectors/packet-tls.h +#usr/include/wireshark/epan/dissectors/packet-tn3270.h +#usr/include/wireshark/epan/dissectors/packet-tn5250.h +#usr/include/wireshark/epan/dissectors/packet-tpkt.h +#usr/include/wireshark/epan/dissectors/packet-tr.h +#usr/include/wireshark/epan/dissectors/packet-tte.h +#usr/include/wireshark/epan/dissectors/packet-ua.h +#usr/include/wireshark/epan/dissectors/packet-uaudp.h +#usr/include/wireshark/epan/dissectors/packet-ubertooth.h +#usr/include/wireshark/epan/dissectors/packet-udp.h +#usr/include/wireshark/epan/dissectors/packet-umts_fp.h +#usr/include/wireshark/epan/dissectors/packet-umts_mac.h +#usr/include/wireshark/epan/dissectors/packet-umts_rlc.h +#usr/include/wireshark/epan/dissectors/packet-usb-hid.h +#usr/include/wireshark/epan/dissectors/packet-usb.h +#usr/include/wireshark/epan/dissectors/packet-usbip.h +#usr/include/wireshark/epan/dissectors/packet-vxlan.h +#usr/include/wireshark/epan/dissectors/packet-wap.h +#usr/include/wireshark/epan/dissectors/packet-wccp.h +#usr/include/wireshark/epan/dissectors/packet-windows-common.h +#usr/include/wireshark/epan/dissectors/packet-wlancertextn.h +#usr/include/wireshark/epan/dissectors/packet-wps.h +#usr/include/wireshark/epan/dissectors/packet-wsp.h +#usr/include/wireshark/epan/dissectors/packet-wtls.h +#usr/include/wireshark/epan/dissectors/packet-wtp.h +#usr/include/wireshark/epan/dissectors/packet-x11-keysymdef.h +#usr/include/wireshark/epan/dissectors/packet-x11.h +#usr/include/wireshark/epan/dissectors/packet-x2ap.h +#usr/include/wireshark/epan/dissectors/packet-x509af.h +#usr/include/wireshark/epan/dissectors/packet-x509ce.h +#usr/include/wireshark/epan/dissectors/packet-x509if.h +#usr/include/wireshark/epan/dissectors/packet-x509sat.h +#usr/include/wireshark/epan/dissectors/packet-xml.h +#usr/include/wireshark/epan/dissectors/packet-xmpp-conference.h +#usr/include/wireshark/epan/dissectors/packet-xmpp-core.h +#usr/include/wireshark/epan/dissectors/packet-xmpp-gtalk.h +#usr/include/wireshark/epan/dissectors/packet-xmpp-jingle.h +#usr/include/wireshark/epan/dissectors/packet-xmpp-other.h +#usr/include/wireshark/epan/dissectors/packet-xmpp-utils.h +#usr/include/wireshark/epan/dissectors/packet-xmpp.h +#usr/include/wireshark/epan/dissectors/packet-ypbind.h +#usr/include/wireshark/epan/dissectors/packet-yppasswd.h +#usr/include/wireshark/epan/dissectors/packet-ypserv.h +#usr/include/wireshark/epan/dissectors/packet-ypxfr.h +#usr/include/wireshark/epan/dissectors/packet-zbee-aps.h +#usr/include/wireshark/epan/dissectors/packet-zbee-nwk.h +#usr/include/wireshark/epan/dissectors/packet-zbee-security.h +#usr/include/wireshark/epan/dissectors/packet-zbee-zcl.h +#usr/include/wireshark/epan/dissectors/packet-zbee-zdp.h +#usr/include/wireshark/epan/dissectors/packet-zbee.h +#usr/include/wireshark/epan/dissectors/packet-ziop.h +#usr/include/wireshark/epan/dtd.h +#usr/include/wireshark/epan/dtd_parse.h +#usr/include/wireshark/epan/dvb_chartbl.h +#usr/include/wireshark/epan/eap.h +#usr/include/wireshark/epan/eapol_keydes_types.h +#usr/include/wireshark/epan/epan.h +#usr/include/wireshark/epan/epan_dissect.h +#usr/include/wireshark/epan/etypes.h +#usr/include/wireshark/epan/ex-opt.h +#usr/include/wireshark/epan/except.h +#usr/include/wireshark/epan/exceptions.h +#usr/include/wireshark/epan/expert.h +#usr/include/wireshark/epan/export_object.h +#usr/include/wireshark/epan/exported_pdu.h +#usr/include/wireshark/epan/filter_expressions.h +#usr/include/wireshark/epan/follow.h +#usr/include/wireshark/epan/frame_data.h +#usr/include/wireshark/epan/frame_data_sequence.h +#usr/include/wireshark/epan/ftypes +#usr/include/wireshark/epan/ftypes/ftypes.h +#usr/include/wireshark/epan/funnel.h +#usr/include/wireshark/epan/garrayfix.h +#usr/include/wireshark/epan/golay.h +#usr/include/wireshark/epan/guid-utils.h +#usr/include/wireshark/epan/iana_charsets.h +#usr/include/wireshark/epan/iax2_codec_type.h +#usr/include/wireshark/epan/in_cksum.h +#usr/include/wireshark/epan/ip_opts.h +#usr/include/wireshark/epan/ipproto.h +#usr/include/wireshark/epan/ipv4.h +#usr/include/wireshark/epan/ipv6.h +#usr/include/wireshark/epan/lapd_sapi.h +#usr/include/wireshark/epan/llcsaps.h +#usr/include/wireshark/epan/maxmind_db.h +#usr/include/wireshark/epan/media_params.h +#usr/include/wireshark/epan/next_tvb.h +#usr/include/wireshark/epan/nlpid.h +#usr/include/wireshark/epan/oids.h +#usr/include/wireshark/epan/osi-utils.h +#usr/include/wireshark/epan/oui.h +#usr/include/wireshark/epan/packet.h +#usr/include/wireshark/epan/packet_info.h +#usr/include/wireshark/epan/params.h +#usr/include/wireshark/epan/plugin_if.h +#usr/include/wireshark/epan/ppptypes.h +#usr/include/wireshark/epan/prefs-int.h +#usr/include/wireshark/epan/prefs.h +#usr/include/wireshark/epan/print.h +#usr/include/wireshark/epan/print_stream.h +#usr/include/wireshark/epan/proto.h +#usr/include/wireshark/epan/proto_data.h +#usr/include/wireshark/epan/ps.h +#usr/include/wireshark/epan/ptvcursor.h +#usr/include/wireshark/epan/range.h +#usr/include/wireshark/epan/reassemble.h +#usr/include/wireshark/epan/reedsolomon.h +#usr/include/wireshark/epan/register.h +#usr/include/wireshark/epan/req_resp_hdrs.h +#usr/include/wireshark/epan/rtd_table.h +#usr/include/wireshark/epan/rtp_pt.h +#usr/include/wireshark/epan/sctpppids.h +#usr/include/wireshark/epan/secrets.h +#usr/include/wireshark/epan/show_exception.h +#usr/include/wireshark/epan/slow_protocol_subtypes.h +#usr/include/wireshark/epan/sminmpec.h +#usr/include/wireshark/epan/srt_table.h +#usr/include/wireshark/epan/stat_groups.h +#usr/include/wireshark/epan/stat_tap_ui.h +#usr/include/wireshark/epan/stats_tree.h +#usr/include/wireshark/epan/stats_tree_priv.h +#usr/include/wireshark/epan/stream.h +#usr/include/wireshark/epan/strutil.h +#usr/include/wireshark/epan/t35.h +#usr/include/wireshark/epan/tap-voip.h +#usr/include/wireshark/epan/tap.h +#usr/include/wireshark/epan/tfs.h +#usr/include/wireshark/epan/time_fmt.h +#usr/include/wireshark/epan/timestamp.h +#usr/include/wireshark/epan/timestats.h +#usr/include/wireshark/epan/to_str.h +#usr/include/wireshark/epan/tvbparse.h +#usr/include/wireshark/epan/tvbuff-int.h +#usr/include/wireshark/epan/tvbuff.h +#usr/include/wireshark/epan/uat-int.h +#usr/include/wireshark/epan/uat.h +#usr/include/wireshark/epan/unit_strings.h +#usr/include/wireshark/epan/value_string.h +#usr/include/wireshark/epan/wmem +#usr/include/wireshark/epan/wmem/wmem.h +#usr/include/wireshark/epan/wmem/wmem_array.h +#usr/include/wireshark/epan/wmem/wmem_core.h +#usr/include/wireshark/epan/wmem/wmem_interval_tree.h +#usr/include/wireshark/epan/wmem/wmem_list.h +#usr/include/wireshark/epan/wmem/wmem_map.h +#usr/include/wireshark/epan/wmem/wmem_miscutl.h +#usr/include/wireshark/epan/wmem/wmem_queue.h +#usr/include/wireshark/epan/wmem/wmem_scopes.h +#usr/include/wireshark/epan/wmem/wmem_stack.h +#usr/include/wireshark/epan/wmem/wmem_strbuf.h +#usr/include/wireshark/epan/wmem/wmem_strutl.h +#usr/include/wireshark/epan/wmem/wmem_tree.h +#usr/include/wireshark/epan/wmem/wmem_user_cb.h +#usr/include/wireshark/epan/x264_prt_id.h +#usr/include/wireshark/epan/xdlc.h +#usr/include/wireshark/file.h +#usr/include/wireshark/globals.h +#usr/include/wireshark/log.h +#usr/include/wireshark/version_info.h +#usr/include/wireshark/wiretap +#usr/include/wireshark/wiretap/file_wrappers.h +#usr/include/wireshark/wiretap/merge.h +#usr/include/wireshark/wiretap/pcap-encap.h +#usr/include/wireshark/wiretap/pcapng_module.h +#usr/include/wireshark/wiretap/secrets-types.h +#usr/include/wireshark/wiretap/wtap.h +#usr/include/wireshark/wiretap/wtap_opttypes.h +#usr/include/wireshark/ws_attributes.h +#usr/include/wireshark/ws_compiler_tests.h +#usr/include/wireshark/ws_diag_control.h +#usr/include/wireshark/ws_symbol_export.h +#usr/include/wireshark/ws_version.h +#usr/include/wireshark/wsutil +#usr/include/wireshark/wsutil/adler32.h +#usr/include/wireshark/wsutil/base32.h +#usr/include/wireshark/wsutil/bits_count_ones.h +#usr/include/wireshark/wsutil/bits_ctz.h +#usr/include/wireshark/wsutil/bitswap.h +#usr/include/wireshark/wsutil/buffer.h +#usr/include/wireshark/wsutil/color.h +#usr/include/wireshark/wsutil/copyright_info.h +#usr/include/wireshark/wsutil/cpu_info.h +#usr/include/wireshark/wsutil/crash_info.h +#usr/include/wireshark/wsutil/crc10.h +#usr/include/wireshark/wsutil/crc11.h +#usr/include/wireshark/wsutil/crc16-plain.h +#usr/include/wireshark/wsutil/crc16.h +#usr/include/wireshark/wsutil/crc32.h +#usr/include/wireshark/wsutil/crc6.h +#usr/include/wireshark/wsutil/crc7.h +#usr/include/wireshark/wsutil/crc8.h +#usr/include/wireshark/wsutil/curve25519.h +#usr/include/wireshark/wsutil/eax.h +#usr/include/wireshark/wsutil/filesystem.h +#usr/include/wireshark/wsutil/frequency-utils.h +#usr/include/wireshark/wsutil/g711.h +#usr/include/wireshark/wsutil/inet_addr.h +#usr/include/wireshark/wsutil/inet_ipv4.h +#usr/include/wireshark/wsutil/inet_ipv6.h +#usr/include/wireshark/wsutil/interface.h +#usr/include/wireshark/wsutil/jsmn.h +#usr/include/wireshark/wsutil/json_dumper.h +#usr/include/wireshark/wsutil/mpeg-audio.h +#usr/include/wireshark/wsutil/netlink.h +#usr/include/wireshark/wsutil/nstime.h +#usr/include/wireshark/wsutil/os_version_info.h +#usr/include/wireshark/wsutil/pint.h +#usr/include/wireshark/wsutil/plugins.h +#usr/include/wireshark/wsutil/pow2.h +#usr/include/wireshark/wsutil/privileges.h +#usr/include/wireshark/wsutil/processes.h +#usr/include/wireshark/wsutil/report_message.h +#usr/include/wireshark/wsutil/sign_ext.h +#usr/include/wireshark/wsutil/sober128.h +#usr/include/wireshark/wsutil/socket.h +#usr/include/wireshark/wsutil/str_util.h +#usr/include/wireshark/wsutil/strnatcmp.h +#usr/include/wireshark/wsutil/strtoi.h +#usr/include/wireshark/wsutil/tempfile.h +#usr/include/wireshark/wsutil/time_util.h +#usr/include/wireshark/wsutil/type_util.h +#usr/include/wireshark/wsutil/unicode-utils.h +#usr/include/wireshark/wsutil/utf8_entities.h +#usr/include/wireshark/wsutil/ws_cpuid.h +#usr/include/wireshark/wsutil/ws_mempbrk.h +#usr/include/wireshark/wsutil/ws_mempbrk_int.h +#usr/include/wireshark/wsutil/ws_pipe.h +#usr/include/wireshark/wsutil/ws_printf.h +#usr/include/wireshark/wsutil/wsjson.h +#usr/include/wireshark/wsutil/xtea.h +#usr/lib/libwireshark.so +usr/lib/libwireshark.so.12 +usr/lib/libwireshark.so.12.0.1 +#usr/lib/libwiretap.so +usr/lib/libwiretap.so.9 +usr/lib/libwiretap.so.9.0.1 +#usr/lib/libwscodecs.so +usr/lib/libwscodecs.so.2 +usr/lib/libwscodecs.so.2.0.0 +#usr/lib/libwsutil.so +usr/lib/libwsutil.so.10 +usr/lib/libwsutil.so.10.0.0 +#usr/lib/pkgconfig/wireshark.pc +#usr/lib/wireshark +#usr/lib/wireshark/cmake +#usr/lib/wireshark/cmake/FindGLIB2.cmake +#usr/lib/wireshark/cmake/FindWSWinLibs.cmake +#usr/lib/wireshark/cmake/LocatePythonModule.cmake +#usr/lib/wireshark/cmake/UseAsn2Wrs.cmake +#usr/lib/wireshark/cmake/UseMakePluginReg.cmake +#usr/lib/wireshark/cmake/WiresharkConfig.cmake +#usr/lib/wireshark/cmake/WiresharkConfigVersion.cmake +#usr/lib/wireshark/cmake/WiresharkTargets-relwithdebinfo.cmake +#usr/lib/wireshark/cmake/WiresharkTargets.cmake +#usr/lib/wireshark/extcap +usr/lib/wireshark/extcap/androiddump +usr/lib/wireshark/extcap/dpauxmon +usr/lib/wireshark/extcap/randpktdump +usr/lib/wireshark/extcap/udpdump +#usr/lib/wireshark/plugins +#usr/lib/wireshark/plugins/3.0 +#usr/lib/wireshark/plugins/3.0/codecs +usr/lib/wireshark/plugins/3.0/codecs/l16mono.so +#usr/lib/wireshark/plugins/3.0/epan +usr/lib/wireshark/plugins/3.0/epan/ethercat.so +usr/lib/wireshark/plugins/3.0/epan/gryphon.so +usr/lib/wireshark/plugins/3.0/epan/irda.so +usr/lib/wireshark/plugins/3.0/epan/mate.so +usr/lib/wireshark/plugins/3.0/epan/opcua.so +usr/lib/wireshark/plugins/3.0/epan/profinet.so +usr/lib/wireshark/plugins/3.0/epan/stats_tree.so +usr/lib/wireshark/plugins/3.0/epan/transum.so +usr/lib/wireshark/plugins/3.0/epan/unistim.so +usr/lib/wireshark/plugins/3.0/epan/wimax.so +usr/lib/wireshark/plugins/3.0/epan/wimaxasncp.so +usr/lib/wireshark/plugins/3.0/epan/wimaxmacphy.so +usr/lib/wireshark/plugins/3.0/wiretap +usr/lib/wireshark/plugins/3.0/wiretap/usbdump.so +#usr/share/doc/wireshark +#usr/share/doc/wireshark/androiddump.html +#usr/share/doc/wireshark/capinfos.html +#usr/share/doc/wireshark/captype.html +#usr/share/doc/wireshark/ciscodump.html +#usr/share/doc/wireshark/dftest.html +#usr/share/doc/wireshark/dpauxmon.html +#usr/share/doc/wireshark/dumpcap.html +#usr/share/doc/wireshark/editcap.html +#usr/share/doc/wireshark/extcap.html +#usr/share/doc/wireshark/mergecap.html +#usr/share/doc/wireshark/randpkt.html +#usr/share/doc/wireshark/randpktdump.html +#usr/share/doc/wireshark/rawshark.html +#usr/share/doc/wireshark/reordercap.html +#usr/share/doc/wireshark/sshdump.html +#usr/share/doc/wireshark/text2pcap.html +#usr/share/doc/wireshark/tshark.html +#usr/share/doc/wireshark/udpdump.html +#usr/share/doc/wireshark/wireshark-filter.html +#usr/share/doc/wireshark/wireshark.html +#usr/share/man/man1/androiddump.1 +#usr/share/man/man1/capinfos.1 +#usr/share/man/man1/captype.1 +#usr/share/man/man1/ciscodump.1 +#usr/share/man/man1/dftest.1 +#usr/share/man/man1/dpauxmon.1 +#usr/share/man/man1/dumpcap.1 +#usr/share/man/man1/editcap.1 +#usr/share/man/man1/mergecap.1 +#usr/share/man/man1/randpkt.1 +#usr/share/man/man1/randpktdump.1 +#usr/share/man/man1/rawshark.1 +#usr/share/man/man1/reordercap.1 +#usr/share/man/man1/sshdump.1 +#usr/share/man/man1/text2pcap.1 +#usr/share/man/man1/tshark.1 +#usr/share/man/man1/udpdump.1 +#usr/share/man/man1/wireshark.1 +#usr/share/man/man4/extcap.4 +#usr/share/man/man4/wireshark-filter.4 +#usr/share/wireshark +#usr/share/wireshark/AUTHORS-SHORT +#usr/share/wireshark/COPYING +#usr/share/wireshark/androiddump.html +#usr/share/wireshark/capinfos.html +#usr/share/wireshark/captype.html +usr/share/wireshark/cfilters +#usr/share/wireshark/ciscodump.html +usr/share/wireshark/colorfilters +usr/share/wireshark/dfilters +#usr/share/wireshark/dftest.html +#usr/share/wireshark/diameter +usr/share/wireshark/diameter/AlcatelLucent.xml +usr/share/wireshark/diameter/Cisco.xml +usr/share/wireshark/diameter/CiscoSystems.xml +usr/share/wireshark/diameter/Custom.xml +usr/share/wireshark/diameter/Ericsson.xml +usr/share/wireshark/diameter/HP.xml +usr/share/wireshark/diameter/Huawei.xml +usr/share/wireshark/diameter/Inovar.xml +usr/share/wireshark/diameter/Juniper.xml +usr/share/wireshark/diameter/Nokia.xml +usr/share/wireshark/diameter/NokiaSolutionsAndNetworks.xml +usr/share/wireshark/diameter/Oracle.xml +usr/share/wireshark/diameter/Starent.xml +usr/share/wireshark/diameter/TGPP.xml +usr/share/wireshark/diameter/TGPP2.xml +usr/share/wireshark/diameter/VerizonWireless.xml +usr/share/wireshark/diameter/Vodafone.xml +usr/share/wireshark/diameter/chargecontrol.xml +usr/share/wireshark/diameter/dictionary.dtd +usr/share/wireshark/diameter/dictionary.xml +usr/share/wireshark/diameter/eap.xml +usr/share/wireshark/diameter/etsie2e4.xml +usr/share/wireshark/diameter/mobileipv4.xml +usr/share/wireshark/diameter/mobileipv6.xml +usr/share/wireshark/diameter/nasreq.xml +usr/share/wireshark/diameter/sip.xml +usr/share/wireshark/diameter/sunping.xml +#usr/share/wireshark/dtds +usr/share/wireshark/dtds/dc.dtd +usr/share/wireshark/dtds/itunes.dtd +usr/share/wireshark/dtds/mscml.dtd +usr/share/wireshark/dtds/pocsettings.dtd +usr/share/wireshark/dtds/presence.dtd +usr/share/wireshark/dtds/reginfo.dtd +usr/share/wireshark/dtds/rlmi.dtd +usr/share/wireshark/dtds/rss.dtd +usr/share/wireshark/dtds/smil.dtd +usr/share/wireshark/dtds/watcherinfo.dtd +usr/share/wireshark/dtds/xcap-caps.dtd +usr/share/wireshark/dtds/xcap-error.dtd +#usr/share/wireshark/dumpcap.html +#usr/share/wireshark/editcap.html +#usr/share/wireshark/enterprises.tsv +#usr/share/wireshark/extcap.html +#usr/share/wireshark/help +#usr/share/wireshark/help/capture_filters.txt +#usr/share/wireshark/help/capturing.txt +#usr/share/wireshark/help/display_filters.txt +#usr/share/wireshark/help/faq.py +#usr/share/wireshark/help/getting_started.txt +#usr/share/wireshark/help/overview.txt +#usr/share/wireshark/help/toc +#usr/share/wireshark/ipmap.html +#usr/share/wireshark/manuf +#usr/share/wireshark/mergecap.html +#usr/share/wireshark/pdml2html.xsl +#usr/share/wireshark/profiles +#usr/share/wireshark/profiles/Bluetooth +usr/share/wireshark/profiles/Bluetooth/colorfilters +usr/share/wireshark/profiles/Bluetooth/preferences +#usr/share/wireshark/profiles/Classic +usr/share/wireshark/profiles/Classic/colorfilters +#usr/share/wireshark/profiles/No +#Reassembly +#usr/share/wireshark/profiles/No +#Reassembly/preferences +#usr/share/wireshark/radius +#usr/share/wireshark/radius/README.radius_dictionary +usr/share/wireshark/radius/custom.includes +#usr/share/wireshark/radius/dictionary +usr/share/wireshark/radius/dictionary.3com +usr/share/wireshark/radius/dictionary.3gpp +usr/share/wireshark/radius/dictionary.3gpp2 +usr/share/wireshark/radius/dictionary.acc +usr/share/wireshark/radius/dictionary.acme +usr/share/wireshark/radius/dictionary.actelis +usr/share/wireshark/radius/dictionary.aerohive +usr/share/wireshark/radius/dictionary.airespace +usr/share/wireshark/radius/dictionary.alcatel +usr/share/wireshark/radius/dictionary.alcatel-lucent.aaa +usr/share/wireshark/radius/dictionary.alcatel.esam +usr/share/wireshark/radius/dictionary.alcatel.sr +usr/share/wireshark/radius/dictionary.alteon +usr/share/wireshark/radius/dictionary.altiga +usr/share/wireshark/radius/dictionary.alvarion +usr/share/wireshark/radius/dictionary.alvarion.wimax.v2_2 +usr/share/wireshark/radius/dictionary.apc +usr/share/wireshark/radius/dictionary.aptis +usr/share/wireshark/radius/dictionary.arbor +usr/share/wireshark/radius/dictionary.aruba +usr/share/wireshark/radius/dictionary.ascend +usr/share/wireshark/radius/dictionary.asn +usr/share/wireshark/radius/dictionary.audiocodes +usr/share/wireshark/radius/dictionary.avaya +usr/share/wireshark/radius/dictionary.azaire +usr/share/wireshark/radius/dictionary.bay +usr/share/wireshark/radius/dictionary.bintec +usr/share/wireshark/radius/dictionary.bluecoat +usr/share/wireshark/radius/dictionary.bristol +usr/share/wireshark/radius/dictionary.broadsoft +usr/share/wireshark/radius/dictionary.brocade +usr/share/wireshark/radius/dictionary.bskyb +usr/share/wireshark/radius/dictionary.bt +usr/share/wireshark/radius/dictionary.cablelabs +usr/share/wireshark/radius/dictionary.cabletron +usr/share/wireshark/radius/dictionary.camiant +usr/share/wireshark/radius/dictionary.chillispot +usr/share/wireshark/radius/dictionary.cisco +usr/share/wireshark/radius/dictionary.cisco.asa +usr/share/wireshark/radius/dictionary.cisco.bbsm +usr/share/wireshark/radius/dictionary.cisco.vpn3000 +usr/share/wireshark/radius/dictionary.cisco.vpn5000 +usr/share/wireshark/radius/dictionary.citrix +usr/share/wireshark/radius/dictionary.clavister +usr/share/wireshark/radius/dictionary.cnergee +usr/share/wireshark/radius/dictionary.colubris +usr/share/wireshark/radius/dictionary.columbia_university +usr/share/wireshark/radius/dictionary.compat +usr/share/wireshark/radius/dictionary.compatible +usr/share/wireshark/radius/dictionary.cosine +usr/share/wireshark/radius/dictionary.dante +usr/share/wireshark/radius/dictionary.dellemc +usr/share/wireshark/radius/dictionary.dhcp +usr/share/wireshark/radius/dictionary.digium +usr/share/wireshark/radius/dictionary.dlink +usr/share/wireshark/radius/dictionary.dragonwave +usr/share/wireshark/radius/dictionary.efficientip +usr/share/wireshark/radius/dictionary.eltex +usr/share/wireshark/radius/dictionary.epygi +usr/share/wireshark/radius/dictionary.equallogic +usr/share/wireshark/radius/dictionary.ericsson +usr/share/wireshark/radius/dictionary.ericsson.ab +usr/share/wireshark/radius/dictionary.ericsson.packet.core.networks +usr/share/wireshark/radius/dictionary.extreme +usr/share/wireshark/radius/dictionary.f5 +usr/share/wireshark/radius/dictionary.fdxtended +usr/share/wireshark/radius/dictionary.fortinet +usr/share/wireshark/radius/dictionary.foundry +usr/share/wireshark/radius/dictionary.freedhcp +usr/share/wireshark/radius/dictionary.freeradius +usr/share/wireshark/radius/dictionary.freeradius.internal +usr/share/wireshark/radius/dictionary.freeswitch +usr/share/wireshark/radius/dictionary.gandalf +usr/share/wireshark/radius/dictionary.garderos +usr/share/wireshark/radius/dictionary.gemtek +usr/share/wireshark/radius/dictionary.h3c +usr/share/wireshark/radius/dictionary.hp +usr/share/wireshark/radius/dictionary.huawei +usr/share/wireshark/radius/dictionary.iana +usr/share/wireshark/radius/dictionary.iea +usr/share/wireshark/radius/dictionary.infoblox +usr/share/wireshark/radius/dictionary.infonet +usr/share/wireshark/radius/dictionary.ipunplugged +usr/share/wireshark/radius/dictionary.issanni +usr/share/wireshark/radius/dictionary.itk +usr/share/wireshark/radius/dictionary.jradius +usr/share/wireshark/radius/dictionary.juniper +usr/share/wireshark/radius/dictionary.karlnet +usr/share/wireshark/radius/dictionary.kineto +usr/share/wireshark/radius/dictionary.lancom +usr/share/wireshark/radius/dictionary.livingston +usr/share/wireshark/radius/dictionary.localweb +usr/share/wireshark/radius/dictionary.lucent +usr/share/wireshark/radius/dictionary.manzara +usr/share/wireshark/radius/dictionary.meinberg +usr/share/wireshark/radius/dictionary.merit +usr/share/wireshark/radius/dictionary.meru +usr/share/wireshark/radius/dictionary.microsemi +usr/share/wireshark/radius/dictionary.microsoft +usr/share/wireshark/radius/dictionary.mikrotik +usr/share/wireshark/radius/dictionary.motorola +usr/share/wireshark/radius/dictionary.motorola.wimax +usr/share/wireshark/radius/dictionary.navini +usr/share/wireshark/radius/dictionary.netscreen +usr/share/wireshark/radius/dictionary.networkphysics +usr/share/wireshark/radius/dictionary.nexans +usr/share/wireshark/radius/dictionary.nokia +usr/share/wireshark/radius/dictionary.nokia.conflict +usr/share/wireshark/radius/dictionary.nomadix +usr/share/wireshark/radius/dictionary.nortel +usr/share/wireshark/radius/dictionary.ntua +usr/share/wireshark/radius/dictionary.openser +usr/share/wireshark/radius/dictionary.packeteer +usr/share/wireshark/radius/dictionary.paloalto +usr/share/wireshark/radius/dictionary.patton +usr/share/wireshark/radius/dictionary.perle +usr/share/wireshark/radius/dictionary.propel +usr/share/wireshark/radius/dictionary.prosoft +usr/share/wireshark/radius/dictionary.proxim +usr/share/wireshark/radius/dictionary.purewave +usr/share/wireshark/radius/dictionary.quiconnect +usr/share/wireshark/radius/dictionary.quintum +usr/share/wireshark/radius/dictionary.redcreek +usr/share/wireshark/radius/dictionary.rfc2865 +usr/share/wireshark/radius/dictionary.rfc2866 +usr/share/wireshark/radius/dictionary.rfc2867 +usr/share/wireshark/radius/dictionary.rfc2868 +usr/share/wireshark/radius/dictionary.rfc2869 +usr/share/wireshark/radius/dictionary.rfc3162 +usr/share/wireshark/radius/dictionary.rfc3576 +usr/share/wireshark/radius/dictionary.rfc3580 +usr/share/wireshark/radius/dictionary.rfc4072 +usr/share/wireshark/radius/dictionary.rfc4372 +usr/share/wireshark/radius/dictionary.rfc4603 +usr/share/wireshark/radius/dictionary.rfc4675 +usr/share/wireshark/radius/dictionary.rfc4679 +usr/share/wireshark/radius/dictionary.rfc4818 +usr/share/wireshark/radius/dictionary.rfc4849 +usr/share/wireshark/radius/dictionary.rfc5090 +usr/share/wireshark/radius/dictionary.rfc5176 +usr/share/wireshark/radius/dictionary.rfc5447 +usr/share/wireshark/radius/dictionary.rfc5580 +usr/share/wireshark/radius/dictionary.rfc5607 +usr/share/wireshark/radius/dictionary.rfc5904 +usr/share/wireshark/radius/dictionary.rfc6519 +usr/share/wireshark/radius/dictionary.rfc6572 +usr/share/wireshark/radius/dictionary.rfc6677 +usr/share/wireshark/radius/dictionary.rfc6911 +usr/share/wireshark/radius/dictionary.rfc6929 +usr/share/wireshark/radius/dictionary.rfc6930 +usr/share/wireshark/radius/dictionary.rfc7055 +usr/share/wireshark/radius/dictionary.rfc7155 +usr/share/wireshark/radius/dictionary.rfc7268 +usr/share/wireshark/radius/dictionary.rfc7499 +usr/share/wireshark/radius/dictionary.rfc7930 +usr/share/wireshark/radius/dictionary.riverbed +usr/share/wireshark/radius/dictionary.riverstone +usr/share/wireshark/radius/dictionary.roaringpenguin +usr/share/wireshark/radius/dictionary.ruckus +usr/share/wireshark/radius/dictionary.ruggedcom +usr/share/wireshark/radius/dictionary.sangoma +usr/share/wireshark/radius/dictionary.sg +usr/share/wireshark/radius/dictionary.shasta +usr/share/wireshark/radius/dictionary.shiva +usr/share/wireshark/radius/dictionary.siemens +usr/share/wireshark/radius/dictionary.slipstream +usr/share/wireshark/radius/dictionary.sofaware +usr/share/wireshark/radius/dictionary.sonicwall +usr/share/wireshark/radius/dictionary.springtide +usr/share/wireshark/radius/dictionary.starent +usr/share/wireshark/radius/dictionary.starent.vsa1 +usr/share/wireshark/radius/dictionary.surfnet +usr/share/wireshark/radius/dictionary.symbol +usr/share/wireshark/radius/dictionary.t_systems_nova +usr/share/wireshark/radius/dictionary.telebit +usr/share/wireshark/radius/dictionary.telkom +usr/share/wireshark/radius/dictionary.terena +usr/share/wireshark/radius/dictionary.trapeze +usr/share/wireshark/radius/dictionary.travelping +usr/share/wireshark/radius/dictionary.tropos +usr/share/wireshark/radius/dictionary.ukerna +usr/share/wireshark/radius/dictionary.unisphere +usr/share/wireshark/radius/dictionary.unix +usr/share/wireshark/radius/dictionary.usr +usr/share/wireshark/radius/dictionary.utstarcom +usr/share/wireshark/radius/dictionary.valemount +usr/share/wireshark/radius/dictionary.verizon +usr/share/wireshark/radius/dictionary.versanet +usr/share/wireshark/radius/dictionary.vqp +usr/share/wireshark/radius/dictionary.walabi +usr/share/wireshark/radius/dictionary.waverider +usr/share/wireshark/radius/dictionary.wichorus +usr/share/wireshark/radius/dictionary.wimax +usr/share/wireshark/radius/dictionary.wimax.alvarion +usr/share/wireshark/radius/dictionary.wimax.wichorus +usr/share/wireshark/radius/dictionary.wispr +usr/share/wireshark/radius/dictionary.xedia +usr/share/wireshark/radius/dictionary.xylan +usr/share/wireshark/radius/dictionary.yubico +usr/share/wireshark/radius/dictionary.zeus +usr/share/wireshark/radius/dictionary.zte +usr/share/wireshark/radius/dictionary.zyxel +#usr/share/wireshark/randpkt.html +#usr/share/wireshark/randpktdump.html +#usr/share/wireshark/rawshark.html +#usr/share/wireshark/reordercap.html +usr/share/wireshark/services +usr/share/wireshark/smi_modules +#usr/share/wireshark/sshdump.html +#usr/share/wireshark/text2pcap.html +#usr/share/wireshark/tpncp +usr/share/wireshark/tpncp/tpncp.dat +#usr/share/wireshark/tshark.html +#usr/share/wireshark/udpdump.html +#usr/share/wireshark/wimaxasncp +usr/share/wireshark/wimaxasncp/dictionary.dtd +usr/share/wireshark/wimaxasncp/dictionary.xml +usr/share/wireshark/wireshark-filter.html +usr/share/wireshark/wireshark.html +usr/share/wireshark/wka +usr/share/wireshark/ws.css diff --git a/config/tor/defaults-torrc b/config/tor/defaults-torrc index 703d821fe..ee8f809d9 100644 --- a/config/tor/defaults-torrc +++ b/config/tor/defaults-torrc @@ -1,3 +1,3 @@ DataDirectory /var/lib/tor -User nobody +User tor Log notice syslog diff --git a/doc/language_issues.en b/doc/language_issues.en index 4069705af..9d1c36b35 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1410,7 +1410,6 @@ WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: ovpn generating the root and host certificates = Generating the root and host certificate can take a long time. WARNING: untranslated string: ovpn ha = Hash algorithm -WARNING: untranslated string: ovpn hmac = HMAC options WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required. WARNING: untranslated string: ovpn no connections = No active OpenVPN connections WARNING: untranslated string: ovpn on blue = OpenVPN on BLUE: @@ -1423,6 +1422,7 @@ WARNING: untranslated string: ovpn server status = Current OpenVPN server status WARNING: untranslated string: ovpn subnet = OpenVPN subnet: WARNING: untranslated string: ovpn subnet is invalid = OpenVPN subnet is invalid. WARNING: untranslated string: ovpn subnet overlap = OpenVPN Subnet overlaps with : +WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: p2p block = P2P networks WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes. @@ -2193,4 +2193,5 @@ WARNING: untranslated string: yes = Yes WARNING: untranslated string: you can only define one roadwarrior connection when using pre-shared key authentication = You can only define one Roadwarrior connection when using pre-shared key authentication.<br />Either you already have a Roadwarrior connection with pre-shared key authentication, or you're trying to add one now. WARNING: untranslated string: your department = Your department WARNING: untranslated string: your e-mail = Your e-mail address +WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes. WARNING: untranslated string: zoneconf title = Zone Configuration diff --git a/doc/language_issues.es b/doc/language_issues.es index 2256a97c2..2ffea2f43 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1179,12 +1179,12 @@ WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: ovpn generating the root and host certificates = Generating the root and host certificate can take a long time. WARNING: untranslated string: ovpn ha = Hash algorithm -WARNING: untranslated string: ovpn hmac = HMAC options WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required. WARNING: untranslated string: ovpn no connections = No active OpenVPN connections WARNING: untranslated string: ovpn port in root range = A port number of 1024 or higher is required. WARNING: untranslated string: ovpn routes push = Routes (one per line) e.g. 192.168.10.0/255.255.255.0 192.168.20.0/24 WARNING: untranslated string: ovpn routes push options = Route push options +WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: p2p block = P2P networks WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes. @@ -1367,4 +1367,5 @@ WARNING: untranslated string: wlanap management frame protection = Management Fr WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! WARNING: untranslated string: wlanap ssid = SSID +WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes. WARNING: untranslated string: zoneconf title = Zone Configuration diff --git a/doc/language_issues.fr b/doc/language_issues.fr index e86215a8d..950e4713d 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -177,6 +177,7 @@ WARNING: translation string unused: could not open installed updates file WARNING: translation string unused: could not open update information file WARNING: translation string unused: create WARNING: translation string unused: create new backup +WARNING: translation string unused: cryptographic settings WARNING: translation string unused: current dynamic leases WARNING: translation string unused: current media WARNING: translation string unused: current ovpn @@ -529,6 +530,7 @@ WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines +WARNING: translation string unused: ovpn hmac WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 @@ -792,9 +794,6 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: bytes = unknown string -WARNING: untranslated string: default IP address = Default IP Address -WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous) -WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled) WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules WARNING: untranslated string: fwhost cust geoipgrp = unknown string @@ -848,22 +847,8 @@ WARNING: untranslated string: ids show = Show WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully... WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string WARNING: untranslated string: info messages = unknown string -WARNING: untranslated string: interface mode = Interface -WARNING: untranslated string: invalid input for interface address = Invalid input for interface address -WARNING: untranslated string: invalid input for interface mode = Invalid input for interface mode -WARNING: untranslated string: invalid input for interface mtu = Invalid input to interface MTU -WARNING: untranslated string: invalid input for local ip address = Invalid input for local IP address -WARNING: untranslated string: invalid input for mode = Invalid input for mode -WARNING: untranslated string: ipsec connection = IPsec Connection -WARNING: untranslated string: ipsec interface mode gre = GRE -WARNING: untranslated string: ipsec interface mode none = - None (Default) - -WARNING: untranslated string: ipsec interface mode vti = VTI -WARNING: untranslated string: ipsec mode transport = Transport -WARNING: untranslated string: ipsec mode tunnel = Tunnel -WARNING: untranslated string: ipsec settings = IPsec Settings -WARNING: untranslated string: local ip address = Local IP Address -WARNING: untranslated string: mtu = MTU WARNING: untranslated string: no data = unknown string +WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: ptr = PTR WARNING: untranslated string: route config changed = unknown string @@ -871,9 +856,7 @@ WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string WARNING: untranslated string: routing table = unknown string WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding -WARNING: untranslated string: subnet mask = Subnet Mask WARNING: untranslated string: system is offline = The system is offline. -WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: update ruleset = Update ruleset WARNING: untranslated string: vpn statistics n2n = unknown string WARNING: untranslated string: wlanap auto = Automatic Channel Selection @@ -881,4 +864,5 @@ WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID WARNING: untranslated string: wlanap client isolation = Client Isolation WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap ssid = SSID +WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes. WARNING: untranslated string: zoneconf title = Zone Configuration diff --git a/doc/language_issues.it b/doc/language_issues.it index 6b1a5591f..3acfd5ba9 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -502,6 +502,7 @@ WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines +WARNING: translation string unused: ovpn hmac WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 @@ -962,6 +963,7 @@ WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing O WARNING: untranslated string: ovpn add conf = Additional configuration WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs to be in minimum 2048 bit! <br>Please generate or upload a new Diffie-Hellman parameter, this can be made below in the section "Diffie-Hellman parameters options".</br> WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> +WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: pptp netconfig = My Net Config WARNING: untranslated string: pptp peer = Peer @@ -1034,4 +1036,5 @@ WARNING: untranslated string: wlanap management frame protection = Management Fr WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! WARNING: untranslated string: wlanap ssid = SSID +WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes. WARNING: untranslated string: zoneconf title = Zone Configuration diff --git a/doc/language_issues.nl b/doc/language_issues.nl index bd0188b4c..ac0093776 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -999,7 +999,7 @@ WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: ovpn generating the root and host certificates = Generating the root and host certificate can take a long time. WARNING: untranslated string: ovpn ha = Hash algorithm -WARNING: untranslated string: ovpn hmac = HMAC options +WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: pptp netconfig = My Net Config WARNING: untranslated string: pptp peer = Peer @@ -1080,4 +1080,5 @@ WARNING: untranslated string: wlanap management frame protection = Management Fr WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! WARNING: untranslated string: wlanap ssid = SSID +WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes. WARNING: untranslated string: zoneconf title = Zone Configuration diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 2256a97c2..2ffea2f43 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1179,12 +1179,12 @@ WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: ovpn generating the root and host certificates = Generating the root and host certificate can take a long time. WARNING: untranslated string: ovpn ha = Hash algorithm -WARNING: untranslated string: ovpn hmac = HMAC options WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required. WARNING: untranslated string: ovpn no connections = No active OpenVPN connections WARNING: untranslated string: ovpn port in root range = A port number of 1024 or higher is required. WARNING: untranslated string: ovpn routes push = Routes (one per line) e.g. 192.168.10.0/255.255.255.0 192.168.20.0/24 WARNING: untranslated string: ovpn routes push options = Route push options +WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: p2p block = P2P networks WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes. @@ -1367,4 +1367,5 @@ WARNING: untranslated string: wlanap management frame protection = Management Fr WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! WARNING: untranslated string: wlanap ssid = SSID +WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes. WARNING: untranslated string: zoneconf title = Zone Configuration diff --git a/doc/language_issues.ru b/doc/language_issues.ru index f5aee0df9..8923c2705 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1178,10 +1178,10 @@ WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: ovpn generating the root and host certificates = Generating the root and host certificate can take a long time. WARNING: untranslated string: ovpn ha = Hash algorithm -WARNING: untranslated string: ovpn hmac = HMAC options WARNING: untranslated string: ovpn mgmt in root range = A port number of 1024 or higher is required. WARNING: untranslated string: ovpn no connections = No active OpenVPN connections WARNING: untranslated string: ovpn port in root range = A port number of 1024 or higher is required. +WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: p2p block = P2P networks WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes. @@ -1362,4 +1362,5 @@ WARNING: untranslated string: wlanap management frame protection = Management Fr WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! WARNING: untranslated string: wlanap ssid = SSID +WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes. WARNING: untranslated string: zoneconf title = Zone Configuration diff --git a/doc/language_issues.tr b/doc/language_issues.tr index c498de30d..42c7811bf 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -530,6 +530,7 @@ WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines +WARNING: translation string unused: ovpn hmac WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 @@ -872,6 +873,7 @@ WARNING: untranslated string: mtu = MTU WARNING: untranslated string: no data = unknown string WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs to be in minimum 2048 bit! <br>Please generate or upload a new Diffie-Hellman parameter, this can be made below in the section "Diffie-Hellman parameters options".</br> WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> +WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: ptr = PTR WARNING: untranslated string: route config changed = unknown string @@ -897,4 +899,5 @@ WARNING: untranslated string: wlanap management frame protection = Management Fr WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! WARNING: untranslated string: wlanap ssid = SSID +WARNING: untranslated string: zoneconf notice reboot = Please reboot to apply your changes. WARNING: untranslated string: zoneconf title = Zone Configuration diff --git a/doc/language_missings b/doc/language_missings index f46c3e4ce..7b779054d 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -642,7 +642,6 @@ < ovpn error md5 < ovpn generating the root and host certificates < ovpn ha -< ovpn hmac < ovpn mgmt in root range < ovpn mtu-disc < ovpn mtu-disc and mtu not 1500 @@ -656,6 +655,7 @@ < ovpn reneg sec < ovpn routes push < ovpn routes push options +< ovpn tls auth < ovpn warning rfc3280 < p2p block < p2p block save notice @@ -855,6 +855,7 @@ < zoneconf nicmode bridge < zoneconf nicmode default < zoneconf nicmode macvtap +< zoneconf notice reboot < zoneconf title < zoneconf val native assignment error < zoneconf val ppp assignment error @@ -873,13 +874,9 @@ < advproxy wpad title < advproxy wpad view pac < Captive delete logo -< cryptographic settings < Daily -< default IP address < Disabled -< dns forward disable dnssec < dnsforward dnssec disabled -< dns forwarding dnssec disabled notice < emerging pro rules < error < generate ptr @@ -900,28 +897,12 @@ < ids ruleset settings < ids show < ids working -< interface mode < intrusion prevention system -< invalid input for interface address -< invalid input for interface mode -< invalid input for interface mtu -< invalid input for local ip address -< invalid input for mode -< ipsec connection -< ipsec interface mode gre -< ipsec interface mode none -< ipsec interface mode vti -< ipsec mode transport -< ipsec mode tunnel -< ipsec settings -< local ip address -< mtu +< ovpn tls auth < ptr < runmode < ssh agent forwarding -< subnet mask < system is offline -< transport mode does not support vti < update ruleset < Weekly < wlanap auto @@ -936,6 +917,7 @@ < zoneconf nicmode bridge < zoneconf nicmode default < zoneconf nicmode macvtap +< zoneconf notice reboot < zoneconf title < zoneconf val native assignment error < zoneconf val ppp assignment error @@ -1152,6 +1134,7 @@ < ovpn add conf < ovpn error dh < ovpn error md5 +< ovpn tls auth < ovpn warning rfc3280 < pptp netconfig < pptp peer @@ -1228,6 +1211,7 @@ < zoneconf nicmode bridge < zoneconf nicmode default < zoneconf nicmode macvtap +< zoneconf notice reboot < zoneconf title < zoneconf val native assignment error < zoneconf val ppp assignment error @@ -1491,8 +1475,8 @@ < ovpn error md5 < ovpn generating the root and host certificates < ovpn ha -< ovpn hmac < ovpn reneg sec +< ovpn tls auth < ovpn warning rfc3280 < pptp netconfig < pptp peer @@ -1578,6 +1562,7 @@ < zoneconf nicmode bridge < zoneconf nicmode default < zoneconf nicmode macvtap +< zoneconf notice reboot < zoneconf title < zoneconf val native assignment error < zoneconf val ppp assignment error @@ -2157,7 +2142,6 @@ < ovpn error md5 < ovpn generating the root and host certificates < ovpn ha -< ovpn hmac < ovpn mgmt in root range < ovpn mtu-disc < ovpn mtu-disc and mtu not 1500 @@ -2171,6 +2155,7 @@ < ovpn reneg sec < ovpn routes push < ovpn routes push options +< ovpn tls auth < ovpn warning rfc3280 < p2p block < p2p block save notice @@ -2368,6 +2353,7 @@ < zoneconf nicmode bridge < zoneconf nicmode default < zoneconf nicmode macvtap +< zoneconf notice reboot < zoneconf title < zoneconf val native assignment error < zoneconf val ppp assignment error @@ -2954,7 +2940,6 @@ < ovpn error md5 < ovpn generating the root and host certificates < ovpn ha -< ovpn hmac < ovpn mgmt in root range < ovpn mtu-disc < ovpn mtu-disc and mtu not 1500 @@ -2966,6 +2951,7 @@ < ovpn no connections < ovpn port in root range < ovpn reneg sec +< ovpn tls auth < ovpn warning rfc3280 < p2p block < p2p block save notice @@ -3165,6 +3151,7 @@ < zoneconf nicmode bridge < zoneconf nicmode default < zoneconf nicmode macvtap +< zoneconf notice reboot < zoneconf title < zoneconf val native assignment error < zoneconf val ppp assignment error @@ -3233,6 +3220,7 @@ < mtu < ovpn error dh < ovpn error md5 +< ovpn tls auth < ovpn warning rfc3280 < ptr < runmode @@ -3262,6 +3250,7 @@ < zoneconf nicmode bridge < zoneconf nicmode default < zoneconf nicmode macvtap +< zoneconf notice reboot < zoneconf title < zoneconf val native assignment error < zoneconf val ppp assignment error diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 6c89352bb..7119a4628 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -126,6 +126,7 @@ Kay-Michael Köhler, Kim Wölfel, Logan Schmidt, Nico Prenzel, +Oliver Fuhrer, Osmar Gonzalez, Paul T. Simmons, Rob Brewer, diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 812680328..c5eac26a9 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -332,11 +332,8 @@ sub writeserverconf { print CONF "status /var/run/ovpnserver.log 30\n"; print CONF "ncp-disable\n"; print CONF "cipher $sovpnsettings{DCIPHER}\n"; - if ($sovpnsettings{'DAUTH'} eq '') { - print CONF ""; - } else { print CONF "auth $sovpnsettings{'DAUTH'}\n"; - } + if ($sovpnsettings{'TLSAUTH'} eq 'on') { print CONF "tls-auth ${General::swroot}/ovpn/certs/ta.key\n"; } @@ -788,13 +785,12 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { $vpnsettings{'MAX_CLIENTS'} = $cgiparams{'MAX_CLIENTS'}; $vpnsettings{'REDIRECT_GW_DEF1'} = $cgiparams{'REDIRECT_GW_DEF1'}; $vpnsettings{'CLIENT2CLIENT'} = $cgiparams{'CLIENT2CLIENT'}; + $vpnsettings{'COMPLZO'} = $cgiparams{'DCOMPLZO'}; $vpnsettings{'ADDITIONAL_CONFIGS'} = $cgiparams{'ADDITIONAL_CONFIGS'}; $vpnsettings{'DHCP_DOMAIN'} = $cgiparams{'DHCP_DOMAIN'}; $vpnsettings{'DHCP_DNS'} = $cgiparams{'DHCP_DNS'}; $vpnsettings{'DHCP_WINS'} = $cgiparams{'DHCP_WINS'}; $vpnsettings{'ROUTES_PUSH'} = $cgiparams{'ROUTES_PUSH'}; - $vpnsettings{'DAUTH'} = $cgiparams{'DAUTH'}; - $vpnsettings{'TLSAUTH'} = $cgiparams{'TLSAUTH'}; my @temp=(); if ($cgiparams{'FRAGMENT'} eq '') { @@ -1204,6 +1200,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg $vpnsettings{'DMTU'} = $cgiparams{'DMTU'}; $vpnsettings{'DCOMPLZO'} = $cgiparams{'DCOMPLZO'}; $vpnsettings{'DCIPHER'} = $cgiparams{'DCIPHER'}; + $vpnsettings{'DAUTH'} = $cgiparams{'DAUTH'}; + $vpnsettings{'TLSAUTH'} = $cgiparams{'TLSAUTH'}; #wrtie enable if ( $vpnsettings{'ENABLED_BLUE'} eq 'on' ) {system("touch ${General::swroot}/ovpn/enable_blue 2>/dev/null");}else{system("unlink ${General::swroot}/ovpn/enable_blue 2>/dev/null");} @@ -2341,11 +2339,8 @@ else $zip->addFile( "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", "$confighash{$cgiparams{'KEY'}}[1]cert.pem") or die "Can't add file $confighash{$cgiparams{'KEY'}}[1]cert.pem\n"; } print CLIENTCONF "cipher $vpnsettings{DCIPHER}\r\n"; - if ($vpnsettings{'DAUTH'} eq '') { - print CLIENTCONF ""; - } else { print CLIENTCONF "auth $vpnsettings{'DAUTH'}\r\n"; - } + if ($vpnsettings{'TLSAUTH'} eq 'on') { if ($cgiparams{'MODE'} eq 'insecure') { print CLIENTCONF ";"; @@ -2651,9 +2646,6 @@ ADV_ERROR: if ($cgiparams{'LOG_VERB'} eq '') { $cgiparams{'LOG_VERB'} = '3'; } - if ($cgiparams{'DAUTH'} eq '') { - $cgiparams{'DAUTH'} = 'SHA512'; - } if ($cgiparams{'TLSAUTH'} eq '') { $cgiparams{'TLSAUTH'} = 'off'; } @@ -2663,6 +2655,9 @@ ADV_ERROR: $checked{'REDIRECT_GW_DEF1'}{'off'} = ''; $checked{'REDIRECT_GW_DEF1'}{'on'} = ''; $checked{'REDIRECT_GW_DEF1'}{$cgiparams{'REDIRECT_GW_DEF1'}} = 'CHECKED'; + $checked{'DCOMPLZO'}{'off'} = ''; + $checked{'DCOMPLZO'}{'on'} = ''; + $checked{'DCOMPLZO'}{$cgiparams{'DCOMPLZO'}} = 'CHECKED'; $checked{'ADDITIONAL_CONFIGS'}{'off'} = ''; $checked{'ADDITIONAL_CONFIGS'}{'on'} = ''; $checked{'ADDITIONAL_CONFIGS'}{$cgiparams{'ADDITIONAL_CONFIGS'}} = 'CHECKED'; @@ -2682,15 +2677,6 @@ ADV_ERROR: $selected{'LOG_VERB'}{'10'} = ''; $selected{'LOG_VERB'}{'11'} = ''; $selected{'LOG_VERB'}{$cgiparams{'LOG_VERB'}} = 'SELECTED'; - $selected{'DAUTH'}{'whirlpool'} = ''; - $selected{'DAUTH'}{'SHA512'} = ''; - $selected{'DAUTH'}{'SHA384'} = ''; - $selected{'DAUTH'}{'SHA256'} = ''; - $selected{'DAUTH'}{'SHA1'} = ''; - $selected{'DAUTH'}{$cgiparams{'DAUTH'}} = 'SELECTED'; - $checked{'TLSAUTH'}{'off'} = ''; - $checked{'TLSAUTH'}{'on'} = ''; - $checked{'TLSAUTH'}{$cgiparams{'TLSAUTH'}} = 'CHECKED'; &Header::showhttpheaders(); &Header::openpage($Lang::tr{'status ovpn'}, 1, ''); @@ -2750,7 +2736,7 @@ print <<END; </tr> <tr> - <td width='20%'></td> <td width='15%'> </td><td width='15%'> </td><td width='15%'></td><td width='35%'></td> + <td width='20%'></td> <td width='15%'> </td><td width='20%'> </td><td width='20%'></td><td width='35%'></td> </tr> <tr> @@ -2763,6 +2749,11 @@ print <<END; <td><input type='checkbox' name='REDIRECT_GW_DEF1' $checked{'REDIRECT_GW_DEF1'}{'on'} /></td> </tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'}</td> + <td><input type='checkbox' name='DCOMPLZO' $checked{'DCOMPLZO'}{'on'} /></td> + <td>$Lang::tr{'openvpn default'}: off <font color='red'>($Lang::tr{'attention'} exploitable via Voracle)</font></td> + </tr> + <tr> <td class='base'>$Lang::tr{'ovpn add conf'}</td> <td><input type='checkbox' name='ADDITIONAL_CONFIGS' $checked{'ADDITIONAL_CONFIGS'}{'on'} /></td> @@ -2820,36 +2811,6 @@ print <<END; </table> <hr size='1'> -<table width='100%'> - <tr> - <td class'base'><b>$Lang::tr{'ovpn crypt options'}</b></td> - </tr> - <tr> - <td width='20%'></td> <td width='30%'> </td><td width='25%'> </td><td width='25%'></td> - </tr> - <tr><td class='base'>$Lang::tr{'ovpn ha'}</td> - <td><select name='DAUTH'> - <option value='whirlpool' $selected{'DAUTH'}{'whirlpool'}>Whirlpool (512 $Lang::tr{'bit'})</option> - <option value='SHA512' $selected{'DAUTH'}{'SHA512'}>SHA2 (512 $Lang::tr{'bit'})</option> - <option value='SHA384' $selected{'DAUTH'}{'SHA384'}>SHA2 (384 $Lang::tr{'bit'})</option> - <option value='SHA256' $selected{'DAUTH'}{'SHA256'}>SHA2 (256 $Lang::tr{'bit'})</option> - <option value='SHA1' $selected{'DAUTH'}{'SHA1'}>SHA1 (160 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option> - </select> - </td> - <td>$Lang::tr{'openvpn default'}: <span class="base">SHA1 (160 $Lang::tr{'bit'})</span></td> - </tr> -</table> - -<table width='100%'> - <tr> - <td width='20%'></td> <td width='15%'> </td><td width='15%'> </td><td width='15%'></td><td width='35%'></td> - </tr> - - <tr> - <td class='base'>HMAC tls-auth</td> - <td><input type='checkbox' name='TLSAUTH' $checked{'TLSAUTH'}{'on'} /></td> - </tr> - </table><hr> END if ( -e "/var/run/openvpn.pid"){ @@ -3526,7 +3487,7 @@ foreach my $dkey (keys %confighash) { <tr><td class='boldbase' nowrap='nowrap'>Fragment:</td><td><b>$confighash{$key}[24]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}</td><td><b>$confighash{$key}[31]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>Management Port </td><td><b>$confighash{$key}[22]</b></td></tr> - <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn hmac'}:</td><td><b>$confighash{$key}[39]</b></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn tls auth'}:</td><td><b>$confighash{$key}[39]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'cipher'}</td><td><b>$confighash{$key}[40]</b></td></tr> <tr><td> </td><td> </td></tr> </table> @@ -4566,12 +4527,10 @@ if ($cgiparams{'TYPE'} eq 'net') { $selected{'DAUTH'}{'SHA384'} = ''; $selected{'DAUTH'}{'SHA256'} = ''; $selected{'DAUTH'}{'SHA1'} = ''; - # If no hash algorythm has been choosen yet, select - # the old default value (SHA1) for compatiblity reasons. - if ($cgiparams{'DAUTH'} eq '') { - $cgiparams{'DAUTH'} = 'SHA1'; - } $selected{'DAUTH'}{$cgiparams{'DAUTH'}} = 'SELECTED'; + $checked{'TLSAUTH'}{'off'} = ''; + $checked{'TLSAUTH'}{'on'} = ''; + $checked{'TLSAUTH'}{$cgiparams{'TLSAUTH'}} = 'CHECKED'; if (1) { &Header::showhttpheaders(); @@ -5107,8 +5066,20 @@ END $cgiparams{'MSSFIX'} = 'off'; } if ($cgiparams{'DAUTH'} eq '') { - $cgiparams{'DAUTH'} = 'SHA512'; - } + if (-z "${General::swroot}/ovpn/ovpnconfig") { + $cgiparams{'DAUTH'} = 'SHA512'; + } + foreach my $key (keys %confighash) { + if ($confighash{$key}[3] ne 'host') { + $cgiparams{'DAUTH'} = 'SHA512'; + } else { + $cgiparams{'DAUTH'} = 'SHA1'; + } + } + } + if ($cgiparams{'TLSAUTH'} eq '') { + $cgiparams{'TLSAUTH'} = 'off'; + } if ($cgiparams{'DOVPN_SUBNET'} eq '') { $cgiparams{'DOVPN_SUBNET'} = '10.' . int(rand(256)) . '.' . int(rand(256)) . '.0/255.255.255.0'; } @@ -5151,6 +5122,10 @@ END $selected{'DAUTH'}{'SHA1'} = ''; $selected{'DAUTH'}{$cgiparams{'DAUTH'}} = 'SELECTED'; + $checked{'TLSAUTH'}{'off'} = ''; + $checked{'TLSAUTH'}{'on'} = ''; + $checked{'TLSAUTH'}{$cgiparams{'TLSAUTH'}} = 'CHECKED'; + $checked{'DCOMPLZO'}{'off'} = ''; $checked{'DCOMPLZO'}{'on'} = ''; $checked{'DCOMPLZO'}{$cgiparams{'DCOMPLZO'}} = 'CHECKED'; @@ -5225,8 +5200,16 @@ END if (&haveOrangeNet()) { print "<tr><td class='boldbase'>$Lang::tr{'ovpn on orange'}</td>"; print "<td><input type='checkbox' name='ENABLED_ORANGE' $checked{'ENABLED_ORANGE'}{'on'} /></td>"; - } - print <<END; + } + + print <<END; + + <tr><td colspan='4'><br></td></tr> + <tr> + <td class'base'><b>$Lang::tr{'net config'}:</b></td> + </tr> + <tr><td colspan='1'><br></td></tr> + <tr><td class='base' nowrap='nowrap' colspan='2'>$Lang::tr{'local vpn hostname/ip'}:<br /><input type='text' name='VPN_IP' value='$cgiparams{'VPN_IP'}' size='30' /></td> <td class='boldbase' nowrap='nowrap' colspan='2'>$Lang::tr{'ovpn subnet'}<br /><input type='TEXT' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}' size='30' /></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'protocol'}</td> @@ -5236,6 +5219,24 @@ END <td><input type='TEXT' name='DDEST_PORT' value='$cgiparams{'DDEST_PORT'}' size='5' /></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'} </td> <td> <input type='TEXT' name='DMTU' VALUE='$cgiparams{'DMTU'}' size='5' /></td> + </tr> + + <tr><td colspan='4'><br></td></tr> + <tr> + <td class'base'><b>$Lang::tr{'ovpn crypt options'}:</b></td> + </tr> + <tr><td colspan='1'><br></td></tr> + + <tr> + <td class='base'>$Lang::tr{'ovpn ha'}</td> + <td><select name='DAUTH'> + <option value='whirlpool' $selected{'DAUTH'}{'whirlpool'}>Whirlpool (512 $Lang::tr{'bit'})</option> + <option value='SHA512' $selected{'DAUTH'}{'SHA512'}>SHA2 (512 $Lang::tr{'bit'})</option> + <option value='SHA384' $selected{'DAUTH'}{'SHA384'}>SHA2 (384 $Lang::tr{'bit'})</option> + <option value='SHA256' $selected{'DAUTH'}{'SHA256'}>SHA2 (256 $Lang::tr{'bit'})</option> + <option value='SHA1' $selected{'DAUTH'}{'SHA1'}>SHA1 (160 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option> + </select> + </td> <td class='boldbase' nowrap='nowrap'>$Lang::tr{'cipher'}</td> <td><select name='DCIPHER'> @@ -5256,9 +5257,14 @@ END <option value='CAST5-CBC' $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option> </select> </td> - <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'}</td> - <td><input type='checkbox' name='DCOMPLZO' $checked{'DCOMPLZO'}{'on'} /></td> </tr> + + <tr><td colspan='4'><br></td></tr> + <tr> + <td class='base'>$Lang::tr{'ovpn tls auth'}</td> + <td><input type='checkbox' name='TLSAUTH' $checked{'TLSAUTH'}{'on'} /></td> + </tr> + <tr><td colspan='4'><br><br></td></tr> END ; diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 91e4fcee8..b63964081 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2848,6 +2848,10 @@ sub write_acls sub writepacfile { + my %vpnconfig=(); + my %ovpnconfig=(); + &General::readhasharray("${General::swroot}/vpn/config", \%vpnconfig); + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ovpnconfig); open(FILE, ">/srv/web/ipfire/html/proxy.pac"); flock(FILE, 2); print FILE "function FindProxyForURL(url, host)\n"; @@ -2910,6 +2914,27 @@ END } } + foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp uc($vpnconfig{$b}[1]) } keys %vpnconfig) { + if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] ne 'host') { + my @networks = split(/\|/, $vpnconfig{$key}[11]); + foreach my $network (@networks) { + my ($vpnip, $vpnsub) = split("/", $network); + $vpnsub = &Network::convert_prefix2netmask($vpnsub) || $vpnsub; + print FILE " (isInNet(host, \"$vpnip\", \"$vpnsub\")) ||\n"; + } + } + } + + foreach my $key (sort { uc($ovpnconfig{$a}[1]) cmp uc($ovpnconfig{$b}[1]) } keys %ovpnconfig) { + if ($ovpnconfig{$key}[0] eq 'on' && $ovpnconfig{$key}[3] ne 'host') { + my @networks = split(/\|/, $ovpnconfig{$key}[11]); + foreach my $network (@networks) { + my ($vpnip, $vpnsub) = split("/", $network); + print FILE " (isInNet(host, \"$vpnip\", \"$vpnsub\")) ||\n"; + } + } + } + print FILE <<END (isInNet(host, "169.254.0.0", "255.255.0.0")) ) diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi index 3712b92cd..40239c14e 100644 --- a/html/cgi-bin/zoneconf.cgi +++ b/html/cgi-bin/zoneconf.cgi @@ -30,14 +30,20 @@ my $css = <<END <style> table { width: 100%; + border-collapse: collapse; + table-layout: fixed; } tr { height: 4em; } - td:first-child { - width: 1px; + tr.thin { + height: 3em; + } + + td.narrow { + width: 11em; } td { @@ -47,8 +53,8 @@ my $css = <<END border: 0.5px solid black; } - table { - border-collapse: collapse; + td.slightlygrey { + background-color: #F0F0F0; } td.h { @@ -91,6 +97,7 @@ my $css = <<END width: 100%; padding-top: 20px; text-align: right; + color: red; } #submit-container.input { @@ -100,7 +107,6 @@ my $css = <<END button { margin-top: 1em; } - </style> END ; @@ -109,6 +115,8 @@ my %ethsettings = (); my %vlansettings = (); my %cgiparams = (); +my $restart_notice = ""; + &General::readhash("${General::swroot}/ethernet/settings",\%ethsettings); &General::readhash("${General::swroot}/ethernet/vlans",\%vlansettings); @@ -287,6 +295,8 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) { &General::writehash("${General::swroot}/ethernet/settings",\%ethsettings); &General::writehash("${General::swroot}/ethernet/vlans",\%vlansettings); + + $restart_notice = $Lang::tr{'zoneconf notice reboot'}; } &Header::openbox('100%', 'left', $Lang::tr{"zoneconf nic assignment"}); @@ -294,23 +304,14 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) { ### START OF TABLE ### print <<END - <form method='post' enctype='multipart/form-data'> - <table> - <tr> - <td class="h topleft" /td> +<form method='post' enctype='multipart/form-data'> + <table> + <tr> + <td class="h narrow topleft" /td> END ; -# Fill the table header with all physical NICs -foreach (@nics) { - my $mac = $_->[0]; - my $nic = $_->[1]; - - print "<td class='h textcenter'>$nic<br>$mac</td>"; -} - -print "</tr>"; - +# Fill the table header with all activated zones foreach (@zones) { my $uc = uc $_; my $dev_name = $ethsettings{"${uc}_DEV"}; @@ -319,28 +320,14 @@ foreach (@zones) { next; } - print "<tr>"; - + # If the zone is in PPP mode, don't show a mode dropdown if ($uc eq "RED") { my $red_type = $ethsettings{"RED_TYPE"}; my $red_restricted = ($uc eq "RED" && ! ($red_type eq "STATIC" || $red_type eq "DHCP")); - # VLANs/Bridging is not possible if the RED interface is set to PPP, PPPoE, VDSL, ... if ($red_restricted) { - print "<td class='h $_'>$uc<br>($red_type)</td>"; - - foreach (@nics) { - my $mac = $_->[0]; - my $checked = ""; + print "<td class='h textcenter $_'>$uc ($red_type)</td>"; - if ($mac eq $ethsettings{"${uc}_MACADDR"}) { - $checked = "checked"; - } - - print "<td class='textcenter'><input type='radio' id='PPPACCESS $mac' name='PPPACCESS' value='$mac' $checked></td>"; - } - - print "</tr>"; next; # We're done here } } @@ -357,7 +344,7 @@ foreach (@zones) { } print <<END - <td class='h $_'>$uc<br> + <td class='h textcenter $_'>$uc</br> <select name="MODE $uc"> <option value="DEFAULT" $mode_selected{"DEFAULT"}>$Lang::tr{"zoneconf nicmode default"}</option> <option value="BRIDGE" $mode_selected{"BRIDGE"}>$Lang::tr{"zoneconf nicmode bridge"}</option> @@ -366,29 +353,60 @@ foreach (@zones) { </td> END ; +} - # ZONE_PARENT_DEV is set if this zone accesses any interface via a VLAN - my $zone_parent_dev = $vlansettings{"${uc}_PARENT_DEV"}; +print "</tr>"; - # If ZONE_PARENT_DEV is set to a NICs name (e.g. green0 or eth0) instead of a MAC address, we have to find out this NICs MAC address - $zone_parent_dev = &Network::get_mac_by_name($zone_parent_dev); +my $slightlygrey = ""; + +foreach (@nics) { + my $mac = $_->[0]; + my $nic = $_->[1]; + my $wlan = $_->[2]; + + print "<tr><td class='h narrow textcenter'>$nic<br>$mac</td>"; + + # Iterate through all zones and check if the current NIC is assigned to it + foreach (@zones) { + my $uc = uc $_; + my $dev_name = $ethsettings{"${uc}_DEV"}; + + if ($dev_name eq "") { # Again, skip the zone if it is not activated + next; + } + + if ($uc eq "RED") { + my $red_type = $ethsettings{"RED_TYPE"}; + my $red_restricted = ($uc eq "RED" && ! ($red_type eq "STATIC" || $red_type eq "DHCP")); + + # VLANs/Bridging is not possible if the RED interface is set to PPP, PPPoE, VDSL, ... + if ($red_restricted) { + my $checked = ""; + + if ($mac eq $ethsettings{"${uc}_MACADDR"}) { + $checked = "checked"; + } + + print "<td class='textcenter $slightlygrey'><input type='radio' id='PPPACCESS $mac' name='PPPACCESS' value='$mac' $checked></td>"; + next; # We're done here + } + } - foreach (@nics) { # Check for all nics if they are assigned to the current zone my %access_selected = (); - my $mac = $_->[0]; - my $wlan = $_->[2]; + my $zone_mode = $ethsettings{"${uc}_MODE"}; + my $zone_parent_dev = $vlansettings{"${uc}_PARENT_DEV"}; # ZONE_PARENT_DEV is set if this zone accesses any interface via a VLAN my $field_disabled = "disabled"; # Only enable the VLAN ID input field if the current access mode is VLAN my $zone_vlan_id = ""; + # If ZONE_PARENT_DEV is set to a NICs name (e.g. green0 or eth0) instead of a MAC address, we have to find out this NICs MAC address + $zone_parent_dev = &Network::get_mac_by_name($zone_parent_dev); + # If the current NIC is accessed by the current zone via a VLAN, the ZONE_PARENT_DEV option corresponds to the current NIC if ($mac eq $zone_parent_dev) { $access_selected{"VLAN"} = "selected"; $field_disabled = ""; $zone_vlan_id = $vlansettings{"${uc}_VLAN_ID"}; - } - - # If the current zone is in bridge mode, all corresponding NICs (Native as well as VLAN) are set via the ZONE_SLAVES option - if ($zone_mode eq "bridge") { + } elsif ($zone_mode eq "bridge") { # If the current zone is in bridge mode, all corresponding NICs (Native as well as VLAN) are set via the ZONE_SLAVES option my @slaves = split(/ /, $ethsettings{"${uc}_SLAVES"}); foreach (@slaves) { @@ -400,17 +418,15 @@ END last; } } - } else { # Native access via ZONE_MACADDR is only set if the zone does not access a NIC via a VLAN and the zone is not in bridge mode - if ($mac eq $ethsettings{"${uc}_MACADDR"}) { - $access_selected{"NATIVE"} = "selected"; - } + } elsif ($mac eq $ethsettings{"${uc}_MACADDR"}) { # Native access via ZONE_MACADDR is only set if the zone does not access a NIC via a VLAN and the zone is not in bridge mode + $access_selected{"NATIVE"} = "selected"; } $access_selected{"NONE"} = ($access_selected{"NATIVE"} eq "") && ($access_selected{"VLAN"} eq "") ? "selected" : ""; my $vlan_disabled = ($wlan) ? "disabled" : ""; print <<END - <td class="textcenter"> + <td class="textcenter $slightlygrey"> <select name="ACCESS $uc $mac" onchange="document.getElementById('TAG $uc $mac').disabled = (this.value === 'VLAN' ? false : true)"> <option value="NONE" $access_selected{"NONE"}>- $Lang::tr{"zoneconf access none"} -</option> <option value="NATIVE" $access_selected{"NATIVE"}>$Lang::tr{"zoneconf access native"}</option> @@ -420,15 +436,22 @@ END </td> END ; - } + print "</tr>"; + + if ($slightlygrey) { + $slightlygrey = ""; + } else { + $slightlygrey = "slightlygrey"; + } } print <<END </table> <div id="submit-container"> + $restart_notice <input type="submit" name="ACTION" value="$Lang::tr{"save"}"> </div> </form> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 0603e7135..bb97e4511 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1866,7 +1866,6 @@ 'ovpn error md5' => 'Das Host Zertifikat nutzt einen MD5 Algorithmus welcher nicht mehr akzeptiert wird. <br>Bitte IPFire auf die neueste Version updaten und generieren sie ein neues Root und Host Zertifikate.</br><br>Es müssen dann alle OpenVPN clients erneuert werden!</br>', 'ovpn generating the root and host certificates' => 'Die Erzeugung der Root- und Host-Zertifikate kann lange Zeit dauern.', 'ovpn ha' => 'Hash-Algorithmus', -'ovpn hmac' => 'HMAC-Optionen', 'ovpn log' => 'OVPN-Protokoll', 'ovpn mgmt in root range' => 'Ein Port von 1024 oder höher ist erforderlich.', 'ovpn mtu-disc' => 'Path MTU Discovery', @@ -1888,6 +1887,7 @@ 'ovpn subnet' => 'OpenVPN-Subnetz:', 'ovpn subnet is invalid' => 'Das OpenVPN-Subnetz ist ungültig.', 'ovpn subnet overlap' => 'OpenVPNSubnetz überschneidet sich mit ', +'ovpn tls auth' => 'TLS-Kanalabsicherung:', 'ovpn warning rfc3280' => 'Das Host Zertifikat ist nicht RFC3280 Regelkonform. <br>Bitte IPFire auf die letzte Version updaten und generieren sie ein neues Root und Host Zertifikat so bald wie möglich.</br><br>Es müssen dann alle OpenVPN clients erneuert werden!</br>', 'ovpn_fastio' => 'Fast-IO', 'ovpn_fragment' => 'Fragmentgrösse', @@ -2888,6 +2888,7 @@ 'zoneconf nicmode bridge' => 'Brücke', 'zoneconf nicmode default' => 'Normal', 'zoneconf nicmode macvtap' => 'MacVTap', +'zoneconf notice reboot' => 'Bitte einen Neustart durchführen, um die Änderungen zu übernehmen.', 'zoneconf title' => 'Zonen einrichten', 'zoneconf val native assignment error' => 'Eine Netzwerkkarte kann nicht von mehreren Zonen nativ verwendet werden.', 'zoneconf val ppp assignment error' => 'Die Netzwerkkarte, die von RED im PPP-Modus verwendet wird, kann keiner anderen Zone zugeordnet werden.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 6e4f855cb..8b43872a3 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1905,7 +1905,6 @@ 'ovpn error md5' => 'You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>', 'ovpn generating the root and host certificates' => 'Generating the root and host certificate can take a long time.', 'ovpn ha' => 'Hash algorithm', -'ovpn hmac' => 'HMAC options', 'ovpn log' => 'OVPN-Log', 'ovpn mgmt in root range' => 'A port number of 1024 or higher is required.', 'ovpn mtu-disc' => 'Path MTU Discovery', @@ -1927,6 +1926,7 @@ 'ovpn subnet' => 'OpenVPN subnet:', 'ovpn subnet is invalid' => 'OpenVPN subnet is invalid.', 'ovpn subnet overlap' => 'OpenVPN Subnet overlaps with : ', +'ovpn tls auth' => 'TLS Channel Protection:', 'ovpn warning rfc3280' => 'Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>', 'ovpn_fastio' => 'Fast-IO', 'ovpn_mssfix' => 'MSSFIX Size', @@ -2937,6 +2937,7 @@ 'zoneconf nicmode bridge' => 'Bridge', 'zoneconf nicmode default' => 'Default', 'zoneconf nicmode macvtap' => 'MacVTtap', +'zoneconf notice reboot' => 'Please reboot to apply your changes.', 'zoneconf title' => 'Zone Configuration', 'zoneconf val native assignment error' => 'A NIC cannot be accessed natively by more than one zone.', 'zoneconf val ppp assignment error' => 'The NIC used for RED in PPP mode cannot be accessed by any other zone.', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index e6376f505..deb0a1f8f 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -423,7 +423,7 @@ 'alt vpn' => 'VPNs', 'and' => 'Et', 'ansi t1.483' => 'A EFFACER', -'apcupsd' => 'Statut APC-UPS', +'apcupsd' => 'Statut UPS-APC', 'application layer gateways' => 'Passerelles de couche d\'application', 'apply' => 'Appliquer maintenant', 'april' => 'Avril', @@ -539,8 +539,8 @@ 'calamaris show usernames' => 'Montrer les noms d\'utilisateurs ', 'calamaris skip archived logfiles' => 'Ignorer les archives de fichiers journal ', 'calamaris unlimited' => 'illimité', -'calamaris view' => 'Voir', -'calamaris view report' => 'Voir le rapport', +'calamaris view' => 'Afficher le rapport', +'calamaris view report' => 'Rapport ', 'calc traffic all x minutes' => 'Calculer le trafic toutes les X minutes', 'cancel' => 'Annuler', 'cancel-adv-options' => 'Annuler', @@ -617,7 +617,7 @@ 'class in use' => 'La classe est déjà en cours d\'utilisation.', 'clear cache' => 'Vider le cache', 'clear playlist' => 'Liste de lecture vide', -'clenabled' => 'Fournir du temps au réseau local', +'clenabled' => 'Fournir l\'heure au réseau local', 'click to disable' => 'Activé (cocher pour désactiver)', 'click to enable' => 'Désactivé (cocher pour activer)', 'client' => 'Nom de la station (ordinateur)', @@ -661,7 +661,7 @@ 'could not open installed updates file' => 'Impossible d\'ouvrir le fichier des mises à jour installées', 'could not open update information file' => 'Impossible d\'ouvrir le fichier d\'information de mise à jour. Le fichier est corrompu.', 'could not retrieve common name from certificate' => 'Impossible de récupérer le nom courant depuis le certificat.', -'count' => 'Compte', +'count' => 'Nombre', 'countries' => 'Pays', 'country' => 'Pays ', 'country codes and flags' => 'Codes de pays et drapeaux :', @@ -684,19 +684,20 @@ 'cron server' => 'Serveur CRON', 'crypto error' => 'Erreur cryptographique', 'crypto warning' => 'Alerte cryptographique', -'current' => 'Courant', -'current aliases' => 'Alias courants :', -'current class' => 'Classes courantes', -'current devices' => 'Périphériques courants', +'cryptographic settings' => 'Paramètres cryptographiques', +'current' => 'Actuel', +'current aliases' => 'Alias actuels :', +'current class' => 'Classes actuelles', +'current devices' => 'Périphériques actuels', 'current dhcp leases on blue' => 'Etat actuel des baux DHCP sur BLEU', 'current dynamic leases' => 'Etat actuel des baux dynamiques', 'current fixed leases' => 'Etat actuel des baux fixes', -'current hosts' => 'Hôtes courants :', -'current media' => 'Média courant', +'current hosts' => 'Hôtes actuels :', +'current media' => 'Média actuel', 'current ovpn' => 'Connexion OVPN active :', -'current playlist' => 'Liste de lecture courante', -'current profile' => 'Profil courant :', -'current rules' => 'Règles courantes :', +'current playlist' => 'Liste de lecture actuelle', +'current profile' => 'Profil actuel :', +'current rules' => 'Règles actuelles :', 'custom networks' => 'Réseaux personnalisés', 'custom services' => 'Services personnalisés', 'daily firewallhits' => 'Contacts journaliers du pare-feu', @@ -719,12 +720,13 @@ 'ddns noip prefix' => 'Pour utiliser autre chose que des IP dans le mode de groupe, préfixez les noms d\'hôtes avec <b>%</b>', 'deactivate' => 'désactiver', 'deactivate user' => 'désactiver l\'utilisateur', -'dead peer detection' => 'Détection Dead Peer', +'dead peer detection' => 'Détection pair mort', 'debugme' => 'Pas encore implémenté', 'december' => 'Décembre', 'deep scan directories' => 'Scan récursif', 'def lease time' => 'Durée de bail par défaut', 'default' => 'Par défaut', +'default IP address' => 'Adresse IP par défaut', 'default ip' => 'Adresse IP par défaut', 'default lease time' => 'Durée du bail par défaut (minutes) :', 'default networks' => 'Réseaux par défaut', @@ -830,6 +832,8 @@ 'dns error 0' => 'L\'adresse IP du <strong>premier</strong> serveur DNS n\'est pas valide, veuillez revoir votre saisie<br />La saisie de l\'adresse du <strong>second</strong> serveur DNS est valide.', 'dns error 01' => 'Les adresses IP du <strong>premier</strong> et du <strong>second</strong> serveur DNS ne sont pas valides, veuillez revoir vos saisies', 'dns error 1' => 'L\'adresse IP du <strong>second</strong> serveur DNS n\'est pas valide, veuillez revoir votre saisie<br />La saisie de l\'adresse du <strong>premier</strong> serveur DNS est valide.', +'dns forward disable dnssec' => 'Désactiver DNSSEC (dangereux)', +'dns forwarding dnssec disabled notice' => '(DNSSEC désactivé)', 'dns header' => 'Assigner les adresses du serveur DNS seulement pour le DHCP sur ROUGE0', 'dns list' => 'Liste de serveurs DNS publiques gratuits', 'dns menu' => 'Assigner un serveur DNS', @@ -848,7 +852,7 @@ 'dnsforward entries' => 'Entrées actuelles', 'dnsforward forward_servers' => 'Nom des serveurs ', 'dnsforward zone' => 'Zone ', -'dnssec aware' => 'DNSSEC Aware', +'dnssec aware' => 'DNSSEC avisé', 'dnssec disabled warning' => 'AVERTISSEMENT : DNSSEC a été désactivé', 'dnssec information' => 'Informations DNSSEC', 'dnssec not supported' => 'DNSSEC non supporté', @@ -873,13 +877,13 @@ 'downlink speed' => 'Débit descendant - download (kbit/sec) ', 'downlink std class' => 'Classe standard de téléchargement ', 'download' => 'Téléchargement ', -'download ca certificate' => 'Téléchargez le certificat CA', -'download certificate' => 'Téléchargez le certificat', +'download ca certificate' => 'Télécharger le certificat CA', +'download certificate' => 'Télécharger le certificat', 'download dh parameter' => 'Télécharger paramètres Diffie-Hellman', -'download host certificate' => 'Téléchargez le certificat de l\'hôte', +'download host certificate' => 'Télécharger le certificat de l\'hôte', 'download new ruleset' => 'Télécharger de nouvelles règles', -'download pkcs12 file' => 'Téléchargez le fichier PKCS12', -'download root certificate' => 'Téléchargez le certificat Root', +'download pkcs12 file' => 'Télécharger le fichier PKCS12', +'download root certificate' => 'Télécharger le certificat Root', 'download tls-auth key' => 'Télécharger la clé tls-auth', 'dpd action' => 'Détection du peer mort', 'dpd delay' => 'Retard', @@ -1284,7 +1288,7 @@ 'generate a certificate' => 'Générer un certificat :', 'generate dh key' => 'Générer paramètres Diffie-Hellman', 'generate iso' => 'Générer ISO', -'generate root/host certificates' => 'Générer des certificats root / hôte', +'generate root/host certificates' => 'Générer des certificats root / hôte ', 'generate tripwire keys and init' => 'Générer des clef Tripwire et init', 'generatekeys' => 'Générer des clefs', 'generatepolicy' => 'Générer une nouvelle politique', @@ -1392,6 +1396,7 @@ 'instant update' => 'Mise à jour instantanée', 'integrity' => 'Intégrité :', 'interface' => 'Interface', +'interface mode' => 'Mode d\'interface', 'interfaces' => 'Interfaces', 'internet' => 'INTERNET', 'intrusion detection' => 'Détection d\'intrusion', @@ -1425,10 +1430,15 @@ 'invalid input for hostname' => 'Nom d\'hôte non valide.', 'invalid input for ike lifetime' => 'Durée de validité IKE non valide', 'invalid input for inactivity timeout' => 'Entrée non valide pour le délai d\'inactivité', +'invalid input for interface address' => 'Entrée non valide pour l\'adresse d\'interface', +'invalid input for interface mode' => 'Entrée non valide pour le mode d\'interface', +'invalid input for interface mtu' => 'Entrée non valide vers l\'interface MTU', 'invalid input for keepalive 1' => 'Ping keepalive non valide', 'invalid input for keepalive 1:2' => 'Keepalive non valide, utilisez au minimum un ratio de 1:2', 'invalid input for keepalive 2' => 'Redémarrage ping keepalive non valide', +'invalid input for local ip address' => 'Entrée non valide pour l\'adresse IP locale', 'invalid input for max clients' => 'Nombre de clients maximum non valide', +'invalid input for mode' => 'Entrée non valide pour le mode', 'invalid input for name' => 'Mauvaise entrée pour le nom d\'utilisateur ou le nom du sytème', 'invalid input for oink code' => 'Oink code non valide', 'invalid input for organization' => 'Organisation non valide', @@ -1481,8 +1491,15 @@ 'ipfires hostname' => 'Nom d\'hôte d\'IPFire ', 'ipinfo' => 'Info IP', 'ipsec' => 'IPsec', +'ipsec connection' => 'Connexion IPsec', +'ipsec interface mode gre' => 'GRE', +'ipsec interface mode none' => '- Aucun (défaut) -', +'ipsec interface mode vti' => 'VTI', +'ipsec mode transport' => 'Transport', +'ipsec mode tunnel' => 'Tunnel', 'ipsec network' => 'Réseau IPsec', 'ipsec no connections' => 'Aucune connexion IPsec active', +'ipsec settings' => 'Paramètres IPsec', 'iptable rules' => 'Règles table IP', 'iptmangles' => 'Mangles IPTable ', 'iptnats' => 'Traduction d\'adresses réseaux table IP ', @@ -1518,6 +1535,7 @@ 'load printer' => 'Charger imprimante', 'loaded modules' => 'Modules chargés :', 'local hard disk' => 'Disque dur', +'local ip address' => 'Adresse IP locale', 'local master' => 'Maitre local', 'local ntp server specified but not enabled' => 'Serveur NTP local spécifié mais pas activé', 'local subnet' => 'Sous-réseau local :', @@ -1684,6 +1702,7 @@ 'mpfire search' => 'Recherche MPFire', 'mpfire songs' => 'Liste des chansons MPFire', 'mpfire webradio' => 'Radio web MPFire', +'mtu' => 'MTU', 'mtu QoS' => 'Ceci ne change pas le MTU global, cela règle uniquement le MTU pour la QoS.', 'my new share' => 'Mon nouveau partage', 'name' => 'Nom', @@ -1726,7 +1745,7 @@ 'newer' => 'Récents', 'next' => 'suivant', 'no' => 'Non', -'no alcatelusb firmware' => 'aucun firmware Alcatel USB, veuillez le charger.', +'no alcatelusb firmware' => 'Aucun firmware Alcatel USB, veuillez le charger.', 'no cfg upload' => 'Aucune donnée n\'a été envoyée', 'no dhcp lease' => 'Aucun bail DHCP n\'a été obtenu', 'no eciadsl synch.bin file' => 'Aucun fichier ECI ADSL synch.bin, veuillez le charger.', @@ -1765,7 +1784,7 @@ 'october' => 'Octobre', 'off' => 'off', 'ok' => 'Ok', -'older' => 'Anciens', +'older' => 'Plus anciens', 'on' => 'sur', 'one hour' => 'Une heure', 'one month' => 'Un mois', @@ -1850,7 +1869,7 @@ 'ovpn dh parameters' => 'Options de paramètres Diffie-Hellman', 'ovpn dh upload' => 'Mettre à jour de nouveaux paramètres Diffie-Hellman ', 'ovpn dl' => 'Télécharger OVPN-Config', -'ovpn engines' => 'Crypto engine', +'ovpn engines' => 'Moteur Crypto', 'ovpn errmsg green already pushed' => 'La route pour le réseau VERT est toujours activée', 'ovpn errmsg invalid ip or mask' => 'Adresse ou masque de sous-r?seau invalide', 'ovpn error dh' => 'Le paramètre Diffie-Hellman doit être au minimum à 2048 bits ! <br>Veuillez générer ou télécharger un nouveau paramètre Diffie-Hellman, cela peut être fait ci-dessous dans la section "Options de paramètres Diffie-Hellman".</br>', @@ -1938,7 +1957,7 @@ 'percentage' => 'Pourcentage', 'persistent' => 'Persistant', 'pfs yes no' => 'Perfect Forward Secrecy (PFS)', -'phase1 group' => 'Phase 1 du groupe', +'phase1 group' => 'Groupe phase1', 'phonebook entry' => 'Entrée du répertoire :', 'ping disabled' => 'Désactiver la réponse au ping', 'pkcs12 file password' => 'Mot de passe PKCS12 ', @@ -1993,10 +2012,10 @@ 'proxy no proxy local' => 'Rejeter le proxy local sur les réseaux BLEU /VERT', 'proxy port' => 'Port du proxy', 'proxy reconfigure' => 'Sauvegarder et recharger', -'proxy reports' => 'Rapports proxy', +'proxy reports' => 'Rapports proxy ', 'proxy reports daily' => 'Rapports quotidiens', 'proxy reports monthly' => 'Rapports mensuels', -'proxy reports today' => 'Aujourd\'hui', +'proxy reports today' => 'Rapport d\'aujourd\'hui', 'proxy reports weekly' => 'Rapports hebdomadaires', 'psk' => 'PSK', 'pulse' => 'Impulsion', @@ -2028,7 +2047,7 @@ 'refresh' => 'Rafraîchir', 'refresh index page while connected' => 'Rafraîchir la page index.cgi tout en restant connecté', 'refresh update list' => 'Rafraîchir la liste des mises à jour', -'registered user rules' => 'Règles Talos VRT pour les utilisateurs enregistrés', +'registered user rules' => 'Règles Sourcefire VRT pour les utilisateurs enregistrés', 'released' => 'Disponible', 'reload' => 'Recharger', 'remark' => 'Remarque ', @@ -2057,7 +2076,7 @@ 'resetglobals' => 'Réinitialiser les paramètres globaux', 'resetpolicy' => 'Réinitialiser la politique par défaut', 'resetshares' => 'réinitialiser les partages ?', -'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Réinitialiser la configuration VPN va supprimer le CA root, le certificat hôte et tous les certificats basés sur les connexions ', +'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'La réinitialisation de la configuration VPN va supprimer le CA root, le certificat hôte et tous les certificats basés sur les connexions ', 'restart' => 'Relancer', 'restart ovpn server' => 'Relancer le serveur OpenVPN', 'restore' => 'Restaurer', @@ -2120,7 +2139,7 @@ 'services settings' => 'Pare-feu - Paramètres des services', 'set' => 'défini', 'set time now' => 'Régler heure maintenant', -'set time now help' => 'Pour placer dans la file d\'attente un événement de synchronisation à tout moment (même si vous utilisez un calendrier répété), appuyez sur le bouton <i>Régler heure maintenant</i>. Il se peut que vous ayez à attendre cinq minutes, ou plus, avant qu\'un évènement de synchronisation se produise.', +'set time now help' => 'A tout moment, pour placer un événement de synchronisation dans la file d\'attente (même si vous utilisez un calendrier répété), appuyez sur le bouton <i>Régler heure maintenant</i>. Il se peut que vous ayez à attendre cinq minutes, ou plus, avant qu\'une synchronisation se produise.', 'settings' => 'Réglages ', 'shaping add options' => 'Ajouter un service', 'shaping list options' => 'Services de mise en forme du trafic', @@ -2129,16 +2148,16 @@ 'shares' => 'Partages', 'show ajax speedmeter in footer' => 'Afficher le compteur de bande passante Ajax', 'show areas' => 'montrer les domaines', -'show ca certificate' => 'Montrer le certificat CA', +'show ca certificate' => 'Afficher le certificat CA', 'show certificate' => 'Afficher le certificat', 'show crl' => 'Montrer la liste de révocation des certificats', -'show dh' => 'Voir paramètres Diffie-Hellman', -'show host certificate' => 'Montrer le certificat hôte', +'show dh' => 'Afficher les paramètres Diffie-Hellman', +'show host certificate' => 'Afficher le certificat hôte', 'show last x lines' => 'Montrer les dernières x lignes', 'show lines' => 'Montrer les lignes', -'show root certificate' => 'Montrer le certificat root', +'show root certificate' => 'Afficher le certificat root', 'show share options' => 'Montrer les options partagées', -'show tls-auth key' => 'afficher clef tls-auth', +'show tls-auth key' => 'Afficher clef tls-auth', 'shuffle' => 'Mélanger', 'shutdown' => 'Arrêter', 'shutdown ask' => 'Arrêter ?', @@ -2228,7 +2247,7 @@ 'static ip' => 'IP statique', 'static routes' => 'Routes statiques', 'status' => 'Statut', -'status information' => 'Etat matériel', +'status information' => 'Informations d\'état', 'status ovpn' => 'Statut / configuration OpenVPN :', 'std classes' => 'Classes standards', 'stop' => 'Arrêter', @@ -2239,7 +2258,8 @@ 'subject warn' => 'Attention - Le niveau d\'alerte a été atteint', 'subnet' => 'Sous-réseau', 'subnet is invalid' => 'Le masque réseau est non valide', -'subscripted user rules' => 'Règles Talos VRT avec abonnement', +'subnet mask' => 'Masque de sous-réseau', +'subscripted user rules' => 'Règles Sourcefire VRT avec abonnement', 'successfully refreshed updates list' => 'La liste des mises à jour a été rafraîchie avec succès.', 'summaries kept' => 'Conserver pour les résumés', 'sunday' => 'Dimanche', @@ -2320,7 +2340,7 @@ 'tor errmsg invalid accounting limit' => 'Invalid accounting limit', 'tor errmsg invalid directory port' => 'Invalid directory port', 'tor errmsg invalid ip or mask' => 'Sous-réseau ou IP non valide', -'tor errmsg invalid node id' => 'Node ID invalide', +'tor errmsg invalid node id' => 'ID noeud invalide', 'tor errmsg invalid relay address' => 'Adresse relais invalide', 'tor errmsg invalid relay name' => 'Surnom relais invalide', 'tor errmsg invalid relay port' => 'Port relais invalide', @@ -2371,8 +2391,9 @@ 'trafficto' => 'A', 'transfer limits' => 'Limites des taux de transfert', 'transparent on' => 'Transparent sur', +'transport mode does not support vti' => 'VTI n\'est pas supporté dans le mode de transport', 'tripwire' => 'Tripwire', -'tripwire cronjob' => 'Tripwire cronjob', +'tripwire cronjob' => 'cronjob tripwire', 'tripwire functions' => 'fonctions tripwire', 'tripwire reports' => 'rapports tripwire', 'tripwireoperating' => 'Le processus a commencé, cela peut prendre quelques minutes. Veuillez attendre que la fenêtre se soit automatiquement rafraîchie pour que le processus soit fini.', @@ -2402,7 +2423,7 @@ 'unnamed' => 'Sans nom', 'update' => 'Mettre à jour', 'update accelerator' => 'Accélérateur (cache)', -'update time' => 'Mettre à jour l\'heure :', +'update time' => 'Mise à jour de l\'heure :', 'update transcript' => 'Mettre à jour transcript', 'updatedatabase' => 'Mettre à jour la base de données avec le dernier rapport', 'updates' => 'Mises à jour', @@ -2869,7 +2890,7 @@ 'year-graph' => 'Annee', 'yearly firewallhits' => 'Contacts annuels du pare-feu', 'yes' => 'Oui', -'you can only define one roadwarrior connection when using pre-shared key authentication' => 'vous ne pouvez définir qu\'une connexion client nomade lors de l\'utilisation avec pré-authentification par clé partagée.<br />Soit vous avez déjà une connexion client nomade avec pré-authentification par clé partagée, ou vous essayez d\'en ajouter une maintenant.', +'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Vous ne pouvez définir qu\'une connexion client nomade lors de l\'utilisation avec pré-authentification par clé partagée.<br />Soit vous avez déjà une connexion client nomade avec pré-authentification par clé partagée, ou vous essayez d\'en ajouter une maintenant.', 'your department' => 'Votre département', 'your e-mail' => 'Votre adresse de courriel ', ); diff --git a/lfs/tor b/lfs/tor index 0ed3109ab..9b3416450 100644 --- a/lfs/tor +++ b/lfs/tor @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 36 +PAK_VER = 37 DEPS = "" diff --git a/lfs/tshark b/lfs/tshark new file mode 100644 index 000000000..a978cf73c --- /dev/null +++ b/lfs/tshark @@ -0,0 +1,89 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 3.0.1 + +THISAPP = wireshark-$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = tshark +DEPS = "krb5" +PAK_VER = 1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 370a113e1c8ec240c4621cfb5abb0c52 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist : + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && mkdir build + cd $(DIR_APP)/build && cmake .. \ + -DBUILD_wireshark=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr + + cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) + cd $(DIR_APP)/build && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index ea593370b..e70da788e 100755 --- a/make.sh +++ b/make.sh @@ -1596,6 +1596,7 @@ buildipfire() { lfsmake2 zabbix_agentd lfsmake2 flashrom lfsmake2 firmware-update + lfsmake2 tshark } buildinstaller() { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d12e3fcd1e90188b9ddc31dc84334a8e6a5274a8
by Arne Fitzenreiter 20 May '19

20 May '19

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 d12e3fcd1e90188b9ddc31dc84334a8e6a5274a8 (commit) from 9961167a52ef80da63f8bc065360119de688f727 (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 d12e3fcd1e90188b9ddc31dc84334a8e6a5274a8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 20 07:24:04 2019 +0200 make.sh: comment to update backupiso if version change It was to offten forgotten to update the backupiso script that need to download the matching iso from the servers so i added a comment. no functional change Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: make.sh | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/make.sh b/make.sh index bfcc83709..ea593370b 100755 --- a/make.sh +++ b/make.sh @@ -24,6 +24,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name +# If you update the version don't forget to update backupiso and add it to core update VERSION="2.23" # Version number CORE="132" # Core Level (Filename) PAKFIRE_CORE="131" # Core Level (PAKFIRE) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9961167a52ef80da63f8bc065360119de688f727
by Arne Fitzenreiter 20 May '19

20 May '19

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 9961167a52ef80da63f8bc065360119de688f727 (commit) via 830dfc978c00ac2134f6f4bcd26227182fd3212f (commit) from a8387f8d6e246ec8d84e113468bb3c4793afad9a (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 9961167a52ef80da63f8bc065360119de688f727 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 20 07:14:12 2019 +0200 core132: add log.dat to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 830dfc978c00ac2134f6f4bcd26227182fd3212f Author: Erik Kapfer <ummeegge(a)ipfire.org> Date: Sun May 19 15:54:32 2019 +0200 suricata: Fixed logs.dat regex for suricata Fixes: #12084 Since the Suricata regex did not match the messages output, Suricata was not displayed in the "System Logs" section in the WUI. Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/132/filelists/files | 1 + html/cgi-bin/logs.cgi/log.dat | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/132/filelists/files b/config/rootfiles/core/132/filelists/files index ab3520b40..f62f14099 100644 --- a/config/rootfiles/core/132/filelists/files +++ b/config/rootfiles/core/132/filelists/files @@ -11,6 +11,7 @@ opt/pakfire/pakfire srv/web/ipfire/cgi-bin/captive.cgi srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/cgi-bin/urlfilter.cgi diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 136fed77c..061525382 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -67,7 +67,7 @@ my %sections = ( 'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )', 'pakfire' => '(pakfire:)', 'red' => '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])', - 'suricata' => '(suricata\[.*\]: )', + 'suricata' => '(suricata: )', 'squid' => '(squid\[.*\]: |squid: )', 'ssh' => '(sshd(?:$.*$)?\[.*\]: )', 'unbound' => '(unbound: \[.*:.*\])(.*:.*$)', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a8387f8d6e246ec8d84e113468bb3c4793afad9a
by Arne Fitzenreiter 20 May '19

20 May '19

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 a8387f8d6e246ec8d84e113468bb3c4793afad9a (commit) from 3c6423cd40c793338836de904a37d42f89d50b5b (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 a8387f8d6e246ec8d84e113468bb3c4793afad9a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun May 19 18:52:23 2019 +0200 suricata: Limit to a maximum of "16" netfilter queues. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/initscripts/system/suricata | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) Difference in files: diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suricata index 38b6a40d8..5a567f2d7 100644 --- a/src/initscripts/system/suricata +++ b/src/initscripts/system/suricata @@ -6,7 +6,7 @@ # # Author : Stefan Schantl <stefan.schantl(a)ipfire.org> # -# Version : 01.01 +# Version : 01.02 # # Notes : # @@ -50,7 +50,13 @@ function get_cpu_count { [ "$line" ] && [ -z "${line%processor*}" ] && ((CPUCOUNT++)) done </proc/cpuinfo - echo $CPUCOUNT + # Limit to a maximum of 16 cores, because suricata does not support more than + # 16 netfilter queues at the moment. + if [ $CPUCOUNT -gt "16" ]; then + echo "16" + else + echo $CPUCOUNT + fi } # Function to flush the firewall chains. hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3c6423cd40c793338836de904a37d42f89d50b5b
by Michael Tremer 18 May '19

18 May '19

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 3c6423cd40c793338836de904a37d42f89d50b5b (commit) via 045ea1d0138e208c6aa5d6e78875f1b5b3f260b8 (commit) via c96146d01ea11cde01ca1e2c1368b57730fb7f1b (commit) from f809b8d5c75ebfba1fce53882596356456328826 (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 3c6423cd40c793338836de904a37d42f89d50b5b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat May 18 09:25:54 2019 +0100 Update contributors Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 045ea1d0138e208c6aa5d6e78875f1b5b3f260b8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri May 17 23:36:53 2019 +0100 Update translations Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c96146d01ea11cde01ca1e2c1368b57730fb7f1b Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu May 24 12:38:39 2018 +0200 BUG11505: Captive Portal: no way to remove an uploaded logo added a delete button Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: doc/language_issues.en | 1 + doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 7 +++++++ html/cgi-bin/captive.cgi | 9 ++++++++- html/cgi-bin/credits.cgi | 3 ++- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 13 files changed, 27 insertions(+), 2 deletions(-) Difference in files: diff --git a/doc/language_issues.en b/doc/language_issues.en index 8cc104347..4069705af 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -18,6 +18,7 @@ WARNING: untranslated string: Captive client session expiry time = Session Expir WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Captive config = Settings WARNING: untranslated string: Captive coupon = Coupon +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Captive expiry time = Expiry Time WARNING: untranslated string: Captive export coupons = Export Coupons WARNING: untranslated string: Captive generate coupons = Generate Coupons diff --git a/doc/language_issues.es b/doc/language_issues.es index 5e3467eef..2256a97c2 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -677,6 +677,7 @@ WARNING: untranslated string: Captive client session expiry time = Session Expir WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Captive config = Settings WARNING: untranslated string: Captive coupon = Coupon +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Captive expiry time = Expiry Time WARNING: untranslated string: Captive export coupons = Export Coupons WARNING: untranslated string: Captive generate coupons = Generate Coupons diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 4af8190bb..e86215a8d 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -778,6 +778,7 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Captive clients = unknown string +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Daily = Daily WARNING: untranslated string: Disabled = Disabled WARNING: untranslated string: Scan for Songs = unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index dce48892c..6b1a5591f 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -766,6 +766,7 @@ WARNING: untranslated string: Captive client session expiry time = Session Expir WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Captive config = Settings WARNING: untranslated string: Captive coupon = Coupon +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Captive expiry time = Expiry Time WARNING: untranslated string: Captive export coupons = Export Coupons WARNING: untranslated string: Captive generate coupons = Generate Coupons diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 9dfe2f9ff..bd0188b4c 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -761,6 +761,7 @@ WARNING: untranslated string: Captive client session expiry time = Session Expir WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Captive config = Settings WARNING: untranslated string: Captive coupon = Coupon +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Captive expiry time = Expiry Time WARNING: untranslated string: Captive export coupons = Export Coupons WARNING: untranslated string: Captive generate coupons = Generate Coupons diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 5e3467eef..2256a97c2 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -677,6 +677,7 @@ WARNING: untranslated string: Captive client session expiry time = Session Expir WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Captive config = Settings WARNING: untranslated string: Captive coupon = Coupon +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Captive expiry time = Expiry Time WARNING: untranslated string: Captive export coupons = Export Coupons WARNING: untranslated string: Captive generate coupons = Generate Coupons diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 274872394..f5aee0df9 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -679,6 +679,7 @@ WARNING: untranslated string: Captive client session expiry time = Session Expir WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Captive config = Settings WARNING: untranslated string: Captive coupon = Coupon +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Captive expiry time = Expiry Time WARNING: untranslated string: Captive export coupons = Export Coupons WARNING: untranslated string: Captive generate coupons = Generate Coupons diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 7891e53e2..c498de30d 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -779,6 +779,7 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Captive clients = unknown string +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Daily = Daily WARNING: untranslated string: Disabled = Disabled WARNING: untranslated string: Scan for Songs = unknown string diff --git a/doc/language_missings b/doc/language_missings index 54b2f5120..f46c3e4ce 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -112,6 +112,7 @@ < Captive client session expiry time < Captive config < Captive coupon +< Captive delete logo < Captive err doublevoucher < Captive expire < Captive expiry time @@ -871,6 +872,7 @@ < advproxy wpad notice < advproxy wpad title < advproxy wpad view pac +< Captive delete logo < cryptographic settings < Daily < default IP address @@ -978,6 +980,7 @@ < Captive client session expiry time < Captive config < Captive coupon +< Captive delete logo < Captive err doublevoucher < Captive expire < Captive expiry time @@ -1272,6 +1275,7 @@ < Captive client session expiry time < Captive config < Captive coupon +< Captive delete logo < Captive err doublevoucher < Captive expire < Captive expiry time @@ -1634,6 +1638,7 @@ < Captive client session expiry time < Captive config < Captive coupon +< Captive delete logo < Captive err doublevoucher < Captive expire < Captive expiry time @@ -2424,6 +2429,7 @@ < Captive client session expiry time < Captive config < Captive coupon +< Captive delete logo < Captive err doublevoucher < Captive expire < Captive expiry time @@ -3176,6 +3182,7 @@ < advproxy wpad notice < advproxy wpad title < advproxy wpad view pac +< Captive delete logo < crypto error < cryptographic settings < crypto warning diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index b7c42e797..b33287dd4 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -142,6 +142,10 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { } } +if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive delete logo'}") { + unlink $logo; +} + if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupons'}") { #check valid remark if ($cgiparams{'REMARK'} ne '' && !&validremark($cgiparams{'REMARK'})){ @@ -381,7 +385,10 @@ if (-e $logo) { print <<END; <tr> <td>$Lang::tr{'Captive logo uploaded'}</td> - <td>$Lang::tr{'yes'}</td> + <td> + $Lang::tr{'yes'}  + <input type='submit' name='ACTION' value="$Lang::tr{'Captive delete logo'}"/> + </td> </tr> END } diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index b2727733c..6c89352bb 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -83,19 +83,20 @@ Jan Lentfer, Marcus Scholz, Ersan Yildirim, Joern-Ingo Weigert, +Alexander Koch, Wolfgang Apolinarski, Alfred Haas, Lars Schuhmacher, Rene Zingel, Sascha Kilian, Ronald Wiesinger, -Alexander Koch, Stephan Feddersen, Stéphane Pautrel, Justin Luth, Michael Eitelwein, Bernhard Bitsch, Dominik Hassler, +Florian Bührle, Larsen, Gabriel Rolland, Anton D. Seliverstov, diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index ba7771ab6..0603e7135 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -28,6 +28,7 @@ 'Captive clients' => 'Clients', 'Captive config' => 'Konfiguration', 'Captive coupon' => 'Gutschein', +'Captive delete logo' => 'Logo löschen', 'Captive err doublevoucher' => 'Ein Gutschein mit diesem Code ist bereits im Umlauf', 'Captive expire' => 'Ablauf', 'Captive expiry time' => 'Ablaufzeit', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 8dbd13433..6e4f855cb 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -27,6 +27,7 @@ 'Captive client session expiry time' => 'Session Expiry Time', 'Captive config' => 'Settings', 'Captive coupon' => 'Coupon', +'Captive delete logo' => 'Delete Logo', 'Captive err doublevoucher' => 'A coupon with this code already exists', 'Captive expire' => 'Expire', 'Captive expiry time' => 'Expiry Time', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. aec5cbe79ec7a6263dfe9778600e0bdf3ed89bec
by Michael Tremer 17 May '19

17 May '19

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 aec5cbe79ec7a6263dfe9778600e0bdf3ed89bec (commit) via 017586474a622f13b010ced06d2f405b8217e260 (commit) via f4c965cf4657172f734cd5cbe22d12cf73353257 (commit) via bd60a87780a8b56b562dec8a92aaab87c150ca86 (commit) via c2ffcb8518aa4e767e70e4ab109cc9778f1044ca (commit) via a05b91af74b3d213651d970e8e2eca21d0306465 (commit) from 414ca3fe85d1fbaed8e775926166f19c158ea836 (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 aec5cbe79ec7a6263dfe9778600e0bdf3ed89bec Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Wed May 15 16:44:00 2019 +0000 update ca-certificates CA bundle Update the CA certificates list to what Mozilla NSS ships currently. The original file can be retrieved from: https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/b… Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 017586474a622f13b010ced06d2f405b8217e260 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 8 04:04:18 2019 +0100 gcc: Update to 9.1.0 This patch also removes libmpx which has been removed from GCC. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f4c965cf4657172f734cd5cbe22d12cf73353257 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 7 15:11:41 2019 +0100 ccache: Update to 3.7.1 The project also moved to a new home at https://ccache.dev. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bd60a87780a8b56b562dec8a92aaab87c150ca86 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 15 22:01:38 2019 +0100 qemu: Update to 3.1.0 Also use libseccomp for sandboxing Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c2ffcb8518aa4e767e70e4ab109cc9778f1044ca Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 15 21:37:35 2019 +0100 libseccomp: New package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a05b91af74b3d213651d970e8e2eca21d0306465 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 15 21:14:57 2019 +0100 automake: Update to 1.16.1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: automake/automake.nm | 2 +- ca-certificates/ca-certificates.nm | 4 +- ca-certificates/certdata.txt | 675 +++++++++++++++++++++++++++++++++++++ ccache/ccache.nm | 9 +- gcc/gcc.nm | 29 +- libseccomp/libseccomp.nm | 42 +++ qemu/qemu.nm | 12 +- 7 files changed, 731 insertions(+), 42 deletions(-) create mode 100644 libseccomp/libseccomp.nm Difference in files: diff --git a/automake/automake.nm b/automake/automake.nm index ca553c1a1..21b24784d 100644 --- a/automake/automake.nm +++ b/automake/automake.nm @@ -4,7 +4,7 @@ ############################################################################### name = automake -version = 1.15 +version = 1.16.1 release = 1 arch = noarch diff --git a/ca-certificates/ca-certificates.nm b/ca-certificates/ca-certificates.nm index e06021c17..2a44912ae 100644 --- a/ca-certificates/ca-certificates.nm +++ b/ca-certificates/ca-certificates.nm @@ -4,12 +4,12 @@ ############################################################################### name = ca-certificates -version = 2019.01 +version = 2019.05 release = 1 arch = noarch groups = System/Base -url = http://www.mozilla.org +url = https://www.mozilla.org/ license = Public Domain summary = The Mozilla CA root certificate bundle. diff --git a/ca-certificates/certdata.txt b/ca-certificates/certdata.txt index 182dda65e..61ce1dee6 100644 --- a/ca-certificates/certdata.txt +++ b/ca-certificates/certdata.txt @@ -23153,3 +23153,678 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "emSign Root CA - G1" +# +# Issuer: CN=emSign Root CA - G1,O=eMudhra Technologies Limited,OU=emSign PKI,C=IN +# Serial Number:31:f5:e4:62:0c:6c:58:ed:d6:d8 +# Subject: CN=emSign Root CA - G1,O=eMudhra Technologies Limited,OU=emSign PKI,C=IN +# Not Valid Before: Sun Feb 18 18:30:00 2018 +# Not Valid After : Wed Feb 18 18:30:00 2043 +# Fingerprint (SHA-256): 40:F6:AF:03:46:A9:9A:A1:CD:1D:55:5A:4E:9C:CE:62:C7:F9:63:46:03:EE:40:66:15:83:3D:C8:C8:D0:03:67 +# Fingerprint (SHA1): 8A:C7:AD:8F:73:AC:4E:C1:B5:75:4D:A5:40:F4:FC:CF:7C:B5:8E:8C +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "emSign Root CA - G1" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\147\061\013\060\011\006\003\125\004\006\023\002\111\116\061 +\023\060\021\006\003\125\004\013\023\012\145\155\123\151\147\156 +\040\120\113\111\061\045\060\043\006\003\125\004\012\023\034\145 +\115\165\144\150\162\141\040\124\145\143\150\156\157\154\157\147 +\151\145\163\040\114\151\155\151\164\145\144\061\034\060\032\006 +\003\125\004\003\023\023\145\155\123\151\147\156\040\122\157\157 +\164\040\103\101\040\055\040\107\061 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\147\061\013\060\011\006\003\125\004\006\023\002\111\116\061 +\023\060\021\006\003\125\004\013\023\012\145\155\123\151\147\156 +\040\120\113\111\061\045\060\043\006\003\125\004\012\023\034\145 +\115\165\144\150\162\141\040\124\145\143\150\156\157\154\157\147 +\151\145\163\040\114\151\155\151\164\145\144\061\034\060\032\006 +\003\125\004\003\023\023\145\155\123\151\147\156\040\122\157\157 +\164\040\103\101\040\055\040\107\061 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\012\061\365\344\142\014\154\130\355\326\330 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\003\224\060\202\002\174\240\003\002\001\002\002\012\061 +\365\344\142\014\154\130\355\326\330\060\015\006\011\052\206\110 +\206\367\015\001\001\013\005\000\060\147\061\013\060\011\006\003 +\125\004\006\023\002\111\116\061\023\060\021\006\003\125\004\013 +\023\012\145\155\123\151\147\156\040\120\113\111\061\045\060\043 +\006\003\125\004\012\023\034\145\115\165\144\150\162\141\040\124 +\145\143\150\156\157\154\157\147\151\145\163\040\114\151\155\151 +\164\145\144\061\034\060\032\006\003\125\004\003\023\023\145\155 +\123\151\147\156\040\122\157\157\164\040\103\101\040\055\040\107 +\061\060\036\027\015\061\070\060\062\061\070\061\070\063\060\060 +\060\132\027\015\064\063\060\062\061\070\061\070\063\060\060\060 +\132\060\147\061\013\060\011\006\003\125\004\006\023\002\111\116 +\061\023\060\021\006\003\125\004\013\023\012\145\155\123\151\147 +\156\040\120\113\111\061\045\060\043\006\003\125\004\012\023\034 +\145\115\165\144\150\162\141\040\124\145\143\150\156\157\154\157 +\147\151\145\163\040\114\151\155\151\164\145\144\061\034\060\032 +\006\003\125\004\003\023\023\145\155\123\151\147\156\040\122\157 +\157\164\040\103\101\040\055\040\107\061\060\202\001\042\060\015 +\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001 +\017\000\060\202\001\012\002\202\001\001\000\223\113\273\351\146 +\212\356\235\133\325\064\223\320\033\036\303\347\236\270\144\063 +\177\143\170\150\264\315\056\161\165\327\233\040\306\115\051\274 +\266\150\140\212\367\041\232\126\065\132\363\166\275\330\315\232 +\377\223\126\113\245\131\006\241\223\064\051\335\026\064\165\116 +\362\201\264\307\226\116\255\031\025\122\112\376\074\160\165\160 +\315\257\053\253\025\232\063\074\252\263\213\252\315\103\375\365 +\352\160\377\355\317\021\073\224\316\116\062\026\323\043\100\052 +\167\263\257\074\001\054\154\355\231\054\213\331\116\151\230\262 +\367\217\101\260\062\170\141\326\015\137\303\372\242\100\222\035 +\134\027\346\160\076\065\347\242\267\302\142\342\253\244\070\114 +\265\071\065\157\352\003\151\372\072\124\150\205\155\326\362\057 +\103\125\036\221\015\016\330\325\152\244\226\321\023\074\054\170 +\120\350\072\222\322\027\126\345\065\032\100\034\076\215\054\355 +\071\337\102\340\203\101\164\337\243\315\302\206\140\110\150\343 +\151\013\124\000\213\344\166\151\041\015\171\116\064\010\136\024 +\302\314\261\267\255\327\174\160\212\307\205\002\003\001\000\001 +\243\102\060\100\060\035\006\003\125\035\016\004\026\004\024\373 +\357\015\206\236\260\343\335\251\271\361\041\027\177\076\374\360 +\167\053\032\060\016\006\003\125\035\017\001\001\377\004\004\003 +\002\001\006\060\017\006\003\125\035\023\001\001\377\004\005\060 +\003\001\001\377\060\015\006\011\052\206\110\206\367\015\001\001 +\013\005\000\003\202\001\001\000\131\377\362\214\365\207\175\161 +\075\243\237\033\133\321\332\370\323\234\153\066\275\233\251\141 +\353\336\026\054\164\075\236\346\165\332\327\272\247\274\102\027 +\347\075\221\353\345\175\335\076\234\361\317\222\254\154\110\314 +\302\042\077\151\073\305\266\025\057\243\065\306\150\052\034\127 +\257\071\357\215\320\065\303\030\014\173\000\126\034\315\213\031 +\164\336\276\017\022\340\320\252\241\077\002\064\261\160\316\235 +\030\326\010\003\011\106\356\140\340\176\266\304\111\004\121\175 +\160\140\274\252\262\377\171\162\172\246\035\075\137\052\370\312 +\342\375\071\267\107\271\353\176\337\004\043\257\372\234\006\007 +\351\373\143\223\200\100\265\306\154\012\061\050\316\014\237\317 +\263\043\065\200\101\215\154\304\067\173\201\057\200\241\100\102 +\205\351\331\070\215\350\241\123\315\001\277\151\350\132\006\362 +\105\013\220\372\256\341\277\235\362\256\127\074\245\256\262\126 +\364\213\145\100\351\375\061\201\054\364\071\011\330\356\153\247 +\264\246\035\025\245\230\367\001\201\330\205\175\363\121\134\161 +\210\336\272\314\037\200\176\112 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE + +# Trust for "emSign Root CA - G1" +# Issuer: CN=emSign Root CA - G1,O=eMudhra Technologies Limited,OU=emSign PKI,C=IN +# Serial Number:31:f5:e4:62:0c:6c:58:ed:d6:d8 +# Subject: CN=emSign Root CA - G1,O=eMudhra Technologies Limited,OU=emSign PKI,C=IN +# Not Valid Before: Sun Feb 18 18:30:00 2018 +# Not Valid After : Wed Feb 18 18:30:00 2043 +# Fingerprint (SHA-256): 40:F6:AF:03:46:A9:9A:A1:CD:1D:55:5A:4E:9C:CE:62:C7:F9:63:46:03:EE:40:66:15:83:3D:C8:C8:D0:03:67 +# Fingerprint (SHA1): 8A:C7:AD:8F:73:AC:4E:C1:B5:75:4D:A5:40:F4:FC:CF:7C:B5:8E:8C +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "emSign Root CA - G1" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\212\307\255\217\163\254\116\301\265\165\115\245\100\364\374\317 +\174\265\216\214 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\234\102\204\127\335\313\013\247\056\225\255\266\363\332\274\254 +END +CKA_ISSUER MULTILINE_OCTAL +\060\147\061\013\060\011\006\003\125\004\006\023\002\111\116\061 +\023\060\021\006\003\125\004\013\023\012\145\155\123\151\147\156 +\040\120\113\111\061\045\060\043\006\003\125\004\012\023\034\145 +\115\165\144\150\162\141\040\124\145\143\150\156\157\154\157\147 +\151\145\163\040\114\151\155\151\164\145\144\061\034\060\032\006 +\003\125\004\003\023\023\145\155\123\151\147\156\040\122\157\157 +\164\040\103\101\040\055\040\107\061 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\012\061\365\344\142\014\154\130\355\326\330 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "emSign ECC Root CA - G3" +# +# Issuer: CN=emSign ECC Root CA - G3,O=eMudhra Technologies Limited,OU=emSign PKI,C=IN +# Serial Number:3c:f6:07:a9:68:70:0e:da:8b:84 +# Subject: CN=emSign ECC Root CA - G3,O=eMudhra Technologies Limited,OU=emSign PKI,C=IN +# Not Valid Before: Sun Feb 18 18:30:00 2018 +# Not Valid After : Wed Feb 18 18:30:00 2043 +# Fingerprint (SHA-256): 86:A1:EC:BA:08:9C:4A:8D:3B:BE:27:34:C6:12:BA:34:1D:81:3E:04:3C:F9:E8:A8:62:CD:5C:57:A3:6B:BE:6B +# Fingerprint (SHA1): 30:43:FA:4F:F2:57:DC:A0:C3:80:EE:2E:58:EA:78:B2:3F:E6:BB:C1 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "emSign ECC Root CA - G3" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\153\061\013\060\011\006\003\125\004\006\023\002\111\116\061 +\023\060\021\006\003\125\004\013\023\012\145\155\123\151\147\156 +\040\120\113\111\061\045\060\043\006\003\125\004\012\023\034\145 +\115\165\144\150\162\141\040\124\145\143\150\156\157\154\157\147 +\151\145\163\040\114\151\155\151\164\145\144\061\040\060\036\006 +\003\125\004\003\023\027\145\155\123\151\147\156\040\105\103\103 +\040\122\157\157\164\040\103\101\040\055\040\107\063 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\153\061\013\060\011\006\003\125\004\006\023\002\111\116\061 +\023\060\021\006\003\125\004\013\023\012\145\155\123\151\147\156 +\040\120\113\111\061\045\060\043\006\003\125\004\012\023\034\145 +\115\165\144\150\162\141\040\124\145\143\150\156\157\154\157\147 +\151\145\163\040\114\151\155\151\164\145\144\061\040\060\036\006 +\003\125\004\003\023\027\145\155\123\151\147\156\040\105\103\103 +\040\122\157\157\164\040\103\101\040\055\040\107\063 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\012\074\366\007\251\150\160\016\332\213\204 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\116\060\202\001\323\240\003\002\001\002\002\012\074 +\366\007\251\150\160\016\332\213\204\060\012\006\010\052\206\110 +\316\075\004\003\003\060\153\061\013\060\011\006\003\125\004\006 +\023\002\111\116\061\023\060\021\006\003\125\004\013\023\012\145 +\155\123\151\147\156\040\120\113\111\061\045\060\043\006\003\125 +\004\012\023\034\145\115\165\144\150\162\141\040\124\145\143\150 +\156\157\154\157\147\151\145\163\040\114\151\155\151\164\145\144 +\061\040\060\036\006\003\125\004\003\023\027\145\155\123\151\147 +\156\040\105\103\103\040\122\157\157\164\040\103\101\040\055\040 +\107\063\060\036\027\015\061\070\060\062\061\070\061\070\063\060 +\060\060\132\027\015\064\063\060\062\061\070\061\070\063\060\060 +\060\132\060\153\061\013\060\011\006\003\125\004\006\023\002\111 +\116\061\023\060\021\006\003\125\004\013\023\012\145\155\123\151 +\147\156\040\120\113\111\061\045\060\043\006\003\125\004\012\023 +\034\145\115\165\144\150\162\141\040\124\145\143\150\156\157\154 +\157\147\151\145\163\040\114\151\155\151\164\145\144\061\040\060 +\036\006\003\125\004\003\023\027\145\155\123\151\147\156\040\105 +\103\103\040\122\157\157\164\040\103\101\040\055\040\107\063\060 +\166\060\020\006\007\052\206\110\316\075\002\001\006\005\053\201 +\004\000\042\003\142\000\004\043\245\014\270\055\022\365\050\363 +\261\262\335\342\002\022\200\236\071\137\111\115\237\311\045\064 +\131\164\354\273\006\034\347\300\162\257\350\256\057\341\101\124 +\207\024\250\112\262\350\174\202\346\133\152\265\334\263\165\316 +\213\006\320\206\043\277\106\325\216\017\077\004\364\327\034\222 +\176\366\245\143\302\365\137\216\056\117\241\030\031\002\053\062 +\012\202\144\175\026\223\321\243\102\060\100\060\035\006\003\125 +\035\016\004\026\004\024\174\135\002\204\023\324\314\212\233\201 +\316\027\034\056\051\036\234\110\143\102\060\016\006\003\125\035 +\017\001\001\377\004\004\003\002\001\006\060\017\006\003\125\035 +\023\001\001\377\004\005\060\003\001\001\377\060\012\006\010\052 +\206\110\316\075\004\003\003\003\151\000\060\146\002\061\000\276 +\363\141\317\002\020\035\144\225\007\270\030\156\210\205\005\057 +\203\010\027\220\312\037\212\114\350\015\033\172\261\255\325\201 +\011\107\357\073\254\010\004\174\134\231\261\355\107\007\322\002 +\061\000\235\272\125\374\251\112\350\355\355\346\166\001\102\173 +\310\370\140\331\215\121\213\125\073\373\214\173\353\145\011\303 +\370\226\315\107\250\202\362\026\125\167\044\176\022\020\225\004 +\054\243 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE + +# Trust for "emSign ECC Root CA - G3" +# Issuer: CN=emSign ECC Root CA - G3,O=eMudhra Technologies Limited,OU=emSign PKI,C=IN +# Serial Number:3c:f6:07:a9:68:70:0e:da:8b:84 +# Subject: CN=emSign ECC Root CA - G3,O=eMudhra Technologies Limited,OU=emSign PKI,C=IN +# Not Valid Before: Sun Feb 18 18:30:00 2018 +# Not Valid After : Wed Feb 18 18:30:00 2043 +# Fingerprint (SHA-256): 86:A1:EC:BA:08:9C:4A:8D:3B:BE:27:34:C6:12:BA:34:1D:81:3E:04:3C:F9:E8:A8:62:CD:5C:57:A3:6B:BE:6B +# Fingerprint (SHA1): 30:43:FA:4F:F2:57:DC:A0:C3:80:EE:2E:58:EA:78:B2:3F:E6:BB:C1 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "emSign ECC Root CA - G3" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\060\103\372\117\362\127\334\240\303\200\356\056\130\352\170\262 +\077\346\273\301 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\316\013\162\321\237\210\216\320\120\003\350\343\270\213\147\100 +END +CKA_ISSUER MULTILINE_OCTAL +\060\153\061\013\060\011\006\003\125\004\006\023\002\111\116\061 +\023\060\021\006\003\125\004\013\023\012\145\155\123\151\147\156 +\040\120\113\111\061\045\060\043\006\003\125\004\012\023\034\145 +\115\165\144\150\162\141\040\124\145\143\150\156\157\154\157\147 +\151\145\163\040\114\151\155\151\164\145\144\061\040\060\036\006 +\003\125\004\003\023\027\145\155\123\151\147\156\040\105\103\103 +\040\122\157\157\164\040\103\101\040\055\040\107\063 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\012\074\366\007\251\150\160\016\332\213\204 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "emSign Root CA - C1" +# +# Issuer: CN=emSign Root CA - C1,O=eMudhra Inc,OU=emSign PKI,C=US +# Serial Number:00:ae:cf:00:ba:c4:cf:32:f8:43:b2 +# Subject: CN=emSign Root CA - C1,O=eMudhra Inc,OU=emSign PKI,C=US +# Not Valid Before: Sun Feb 18 18:30:00 2018 +# Not Valid After : Wed Feb 18 18:30:00 2043 +# Fingerprint (SHA-256): 12:56:09:AA:30:1D:A0:A2:49:B9:7A:82:39:CB:6A:34:21:6F:44:DC:AC:9F:39:54:B1:42:92:F2:E8:C8:60:8F +# Fingerprint (SHA1): E7:2E:F1:DF:FC:B2:09:28:CF:5D:D4:D5:67:37:B1:51:CB:86:4F:01 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "emSign Root CA - C1" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\126\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\023\060\021\006\003\125\004\013\023\012\145\155\123\151\147\156 +\040\120\113\111\061\024\060\022\006\003\125\004\012\023\013\145 +\115\165\144\150\162\141\040\111\156\143\061\034\060\032\006\003 +\125\004\003\023\023\145\155\123\151\147\156\040\122\157\157\164 +\040\103\101\040\055\040\103\061 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\126\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\023\060\021\006\003\125\004\013\023\012\145\155\123\151\147\156 +\040\120\113\111\061\024\060\022\006\003\125\004\012\023\013\145 +\115\165\144\150\162\141\040\111\156\143\061\034\060\032\006\003 +\125\004\003\023\023\145\155\123\151\147\156\040\122\157\157\164 +\040\103\101\040\055\040\103\061 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\013\000\256\317\000\272\304\317\062\370\103\262 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\003\163\060\202\002\133\240\003\002\001\002\002\013\000 +\256\317\000\272\304\317\062\370\103\262\060\015\006\011\052\206 +\110\206\367\015\001\001\013\005\000\060\126\061\013\060\011\006 +\003\125\004\006\023\002\125\123\061\023\060\021\006\003\125\004 +\013\023\012\145\155\123\151\147\156\040\120\113\111\061\024\060 +\022\006\003\125\004\012\023\013\145\115\165\144\150\162\141\040 +\111\156\143\061\034\060\032\006\003\125\004\003\023\023\145\155 +\123\151\147\156\040\122\157\157\164\040\103\101\040\055\040\103 +\061\060\036\027\015\061\070\060\062\061\070\061\070\063\060\060 +\060\132\027\015\064\063\060\062\061\070\061\070\063\060\060\060 +\132\060\126\061\013\060\011\006\003\125\004\006\023\002\125\123 +\061\023\060\021\006\003\125\004\013\023\012\145\155\123\151\147 +\156\040\120\113\111\061\024\060\022\006\003\125\004\012\023\013 +\145\115\165\144\150\162\141\040\111\156\143\061\034\060\032\006 +\003\125\004\003\023\023\145\155\123\151\147\156\040\122\157\157 +\164\040\103\101\040\055\040\103\061\060\202\001\042\060\015\006 +\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017 +\000\060\202\001\012\002\202\001\001\000\317\353\251\271\361\231 +\005\314\330\050\041\112\363\163\064\121\204\126\020\365\240\117 +\054\022\343\372\023\232\047\320\317\371\171\032\164\137\035\171 +\071\374\133\370\160\216\340\222\122\367\344\045\371\124\203\331 +\035\323\310\132\205\077\136\307\266\007\356\076\300\316\232\257 +\254\126\102\052\071\045\160\326\277\265\173\066\255\254\366\163 +\334\315\327\035\212\203\245\373\053\220\025\067\153\034\046\107 +\334\073\051\126\223\152\263\301\152\072\235\075\365\301\227\070 +\130\005\213\034\021\343\344\264\270\135\205\035\203\376\170\137 +\013\105\150\030\110\245\106\163\064\073\376\017\310\166\273\307 +\030\363\005\321\206\363\205\355\347\271\331\062\255\125\210\316 +\246\266\221\260\117\254\176\025\043\226\366\077\360\040\064\026 +\336\012\306\304\004\105\171\177\247\375\276\322\251\245\257\234 +\305\043\052\367\074\041\154\275\257\217\116\305\072\262\363\064 +\022\374\337\200\032\111\244\324\251\225\367\236\211\136\242\211 +\254\224\313\250\150\233\257\212\145\047\315\211\356\335\214\265 +\153\051\160\103\240\151\013\344\271\017\002\003\001\000\001\243 +\102\060\100\060\035\006\003\125\035\016\004\026\004\024\376\241 +\340\160\036\052\003\071\122\132\102\276\134\221\205\172\030\252 +\115\265\060\016\006\003\125\035\017\001\001\377\004\004\003\002 +\001\006\060\017\006\003\125\035\023\001\001\377\004\005\060\003 +\001\001\377\060\015\006\011\052\206\110\206\367\015\001\001\013 +\005\000\003\202\001\001\000\302\112\126\372\025\041\173\050\242 +\351\345\035\373\370\055\304\071\226\101\114\073\047\054\304\154 +\030\025\200\306\254\257\107\131\057\046\013\343\066\260\357\073 +\376\103\227\111\062\231\022\025\133\337\021\051\377\253\123\370 +\273\301\170\017\254\234\123\257\127\275\150\214\075\151\063\360 +\243\240\043\143\073\144\147\042\104\255\325\161\313\126\052\170 +\222\243\117\022\061\066\066\342\336\376\000\304\243\140\017\047 +\255\240\260\212\265\066\172\122\241\275\047\364\040\047\142\350 +\115\224\044\023\344\012\004\351\074\253\056\310\103\011\112\306 +\141\004\345\111\064\176\323\304\310\365\017\300\252\351\272\124 +\136\363\143\053\117\117\120\324\376\271\173\231\214\075\300\056 +\274\002\053\323\304\100\344\212\007\061\036\233\316\046\231\023 +\373\021\352\232\042\014\021\031\307\136\033\201\120\060\310\226 +\022\156\347\313\101\177\221\073\242\107\267\124\200\033\334\000 +\314\232\220\352\303\303\120\006\142\014\060\300\025\110\247\250 +\131\174\341\256\042\242\342\012\172\017\372\142\253\122\114\341 +\361\337\312\276\203\015\102 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE + +# Trust for "emSign Root CA - C1" +# Issuer: CN=emSign Root CA - C1,O=eMudhra Inc,OU=emSign PKI,C=US +# Serial Number:00:ae:cf:00:ba:c4:cf:32:f8:43:b2 +# Subject: CN=emSign Root CA - C1,O=eMudhra Inc,OU=emSign PKI,C=US +# Not Valid Before: Sun Feb 18 18:30:00 2018 +# Not Valid After : Wed Feb 18 18:30:00 2043 +# Fingerprint (SHA-256): 12:56:09:AA:30:1D:A0:A2:49:B9:7A:82:39:CB:6A:34:21:6F:44:DC:AC:9F:39:54:B1:42:92:F2:E8:C8:60:8F +# Fingerprint (SHA1): E7:2E:F1:DF:FC:B2:09:28:CF:5D:D4:D5:67:37:B1:51:CB:86:4F:01 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "emSign Root CA - C1" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\347\056\361\337\374\262\011\050\317\135\324\325\147\067\261\121 +\313\206\117\001 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\330\343\135\001\041\372\170\132\260\337\272\322\356\052\137\150 +END +CKA_ISSUER MULTILINE_OCTAL +\060\126\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\023\060\021\006\003\125\004\013\023\012\145\155\123\151\147\156 +\040\120\113\111\061\024\060\022\006\003\125\004\012\023\013\145 +\115\165\144\150\162\141\040\111\156\143\061\034\060\032\006\003 +\125\004\003\023\023\145\155\123\151\147\156\040\122\157\157\164 +\040\103\101\040\055\040\103\061 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\013\000\256\317\000\272\304\317\062\370\103\262 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "emSign ECC Root CA - C3" +# +# Issuer: CN=emSign ECC Root CA - C3,O=eMudhra Inc,OU=emSign PKI,C=US +# Serial Number:7b:71:b6:82:56:b8:12:7c:9c:a8 +# Subject: CN=emSign ECC Root CA - C3,O=eMudhra Inc,OU=emSign PKI,C=US +# Not Valid Before: Sun Feb 18 18:30:00 2018 +# Not Valid After : Wed Feb 18 18:30:00 2043 +# Fingerprint (SHA-256): BC:4D:80:9B:15:18:9D:78:DB:3E:1D:8C:F4:F9:72:6A:79:5D:A1:64:3C:A5:F1:35:8E:1D:DB:0E:DC:0D:7E:B3 +# Fingerprint (SHA1): B6:AF:43:C2:9B:81:53:7D:F6:EF:6B:C3:1F:1F:60:15:0C:EE:48:66 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "emSign ECC Root CA - C3" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\132\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\023\060\021\006\003\125\004\013\023\012\145\155\123\151\147\156 +\040\120\113\111\061\024\060\022\006\003\125\004\012\023\013\145 +\115\165\144\150\162\141\040\111\156\143\061\040\060\036\006\003 +\125\004\003\023\027\145\155\123\151\147\156\040\105\103\103\040 +\122\157\157\164\040\103\101\040\055\040\103\063 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\132\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\023\060\021\006\003\125\004\013\023\012\145\155\123\151\147\156 +\040\120\113\111\061\024\060\022\006\003\125\004\012\023\013\145 +\115\165\144\150\162\141\040\111\156\143\061\040\060\036\006\003 +\125\004\003\023\027\145\155\123\151\147\156\040\105\103\103\040 +\122\157\157\164\040\103\101\040\055\040\103\063 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\012\173\161\266\202\126\270\022\174\234\250 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\053\060\202\001\261\240\003\002\001\002\002\012\173 +\161\266\202\126\270\022\174\234\250\060\012\006\010\052\206\110 +\316\075\004\003\003\060\132\061\013\060\011\006\003\125\004\006 +\023\002\125\123\061\023\060\021\006\003\125\004\013\023\012\145 +\155\123\151\147\156\040\120\113\111\061\024\060\022\006\003\125 +\004\012\023\013\145\115\165\144\150\162\141\040\111\156\143\061 +\040\060\036\006\003\125\004\003\023\027\145\155\123\151\147\156 +\040\105\103\103\040\122\157\157\164\040\103\101\040\055\040\103 +\063\060\036\027\015\061\070\060\062\061\070\061\070\063\060\060 +\060\132\027\015\064\063\060\062\061\070\061\070\063\060\060\060 +\132\060\132\061\013\060\011\006\003\125\004\006\023\002\125\123 +\061\023\060\021\006\003\125\004\013\023\012\145\155\123\151\147 +\156\040\120\113\111\061\024\060\022\006\003\125\004\012\023\013 +\145\115\165\144\150\162\141\040\111\156\143\061\040\060\036\006 +\003\125\004\003\023\027\145\155\123\151\147\156\040\105\103\103 +\040\122\157\157\164\040\103\101\040\055\040\103\063\060\166\060 +\020\006\007\052\206\110\316\075\002\001\006\005\053\201\004\000 +\042\003\142\000\004\375\245\141\256\173\046\020\035\351\267\042 +\060\256\006\364\201\263\261\102\161\225\071\274\323\122\343\257 +\257\371\362\227\065\222\066\106\016\207\225\215\271\071\132\351 +\273\337\320\376\310\007\101\074\273\125\157\203\243\152\373\142 +\260\201\211\002\160\175\110\305\112\343\351\042\124\042\115\223 +\273\102\014\257\167\234\043\246\175\327\141\021\316\145\307\370 +\177\376\365\362\251\243\102\060\100\060\035\006\003\125\035\016 +\004\026\004\024\373\132\110\320\200\040\100\362\250\351\000\007 +\151\031\167\247\346\303\364\317\060\016\006\003\125\035\017\001 +\001\377\004\004\003\002\001\006\060\017\006\003\125\035\023\001 +\001\377\004\005\060\003\001\001\377\060\012\006\010\052\206\110 +\316\075\004\003\003\003\150\000\060\145\002\061\000\264\330\057 +\002\211\375\266\114\142\272\103\116\023\204\162\265\256\335\034 +\336\326\265\334\126\217\130\100\132\055\336\040\114\042\203\312 +\223\250\176\356\022\100\307\326\207\117\370\337\205\002\060\034 +\024\144\344\174\226\203\021\234\260\321\132\141\113\246\017\111 +\323\000\374\241\374\344\245\377\177\255\327\060\320\307\167\177 +\276\201\007\125\060\120\040\024\365\127\070\012\250\061\121 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE + +# Trust for "emSign ECC Root CA - C3" +# Issuer: CN=emSign ECC Root CA - C3,O=eMudhra Inc,OU=emSign PKI,C=US +# Serial Number:7b:71:b6:82:56:b8:12:7c:9c:a8 +# Subject: CN=emSign ECC Root CA - C3,O=eMudhra Inc,OU=emSign PKI,C=US +# Not Valid Before: Sun Feb 18 18:30:00 2018 +# Not Valid After : Wed Feb 18 18:30:00 2043 +# Fingerprint (SHA-256): BC:4D:80:9B:15:18:9D:78:DB:3E:1D:8C:F4:F9:72:6A:79:5D:A1:64:3C:A5:F1:35:8E:1D:DB:0E:DC:0D:7E:B3 +# Fingerprint (SHA1): B6:AF:43:C2:9B:81:53:7D:F6:EF:6B:C3:1F:1F:60:15:0C:EE:48:66 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "emSign ECC Root CA - C3" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\266\257\103\302\233\201\123\175\366\357\153\303\037\037\140\025 +\014\356\110\146 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\076\123\263\243\201\356\327\020\370\323\260\035\027\222\365\325 +END +CKA_ISSUER MULTILINE_OCTAL +\060\132\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\023\060\021\006\003\125\004\013\023\012\145\155\123\151\147\156 +\040\120\113\111\061\024\060\022\006\003\125\004\012\023\013\145 +\115\165\144\150\162\141\040\111\156\143\061\040\060\036\006\003 +\125\004\003\023\027\145\155\123\151\147\156\040\105\103\103\040 +\122\157\157\164\040\103\101\040\055\040\103\063 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\012\173\161\266\202\126\270\022\174\234\250 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "Hongkong Post Root CA 3" +# +# Issuer: CN=Hongkong Post Root CA 3,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK +# Serial Number:08:16:5f:8a:4c:a5:ec:00:c9:93:40:df:c4:c6:ae:23:b8:1c:5a:a4 +# Subject: CN=Hongkong Post Root CA 3,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK +# Not Valid Before: Sat Jun 03 02:29:46 2017 +# Not Valid After : Tue Jun 03 02:29:46 2042 +# Fingerprint (SHA-256): 5A:2F:C0:3F:0C:83:B0:90:BB:FA:40:60:4B:09:88:44:6C:76:36:18:3D:F9:84:6E:17:10:1A:44:7F:B8:EF:D6 +# Fingerprint (SHA1): 58:A2:D0:EC:20:52:81:5B:C1:F3:F8:64:02:24:4E:C2:8E:02:4B:02 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Hongkong Post Root CA 3" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\157\061\013\060\011\006\003\125\004\006\023\002\110\113\061 +\022\060\020\006\003\125\004\010\023\011\110\157\156\147\040\113 +\157\156\147\061\022\060\020\006\003\125\004\007\023\011\110\157 +\156\147\040\113\157\156\147\061\026\060\024\006\003\125\004\012 +\023\015\110\157\156\147\153\157\156\147\040\120\157\163\164\061 +\040\060\036\006\003\125\004\003\023\027\110\157\156\147\153\157 +\156\147\040\120\157\163\164\040\122\157\157\164\040\103\101\040 +\063 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\157\061\013\060\011\006\003\125\004\006\023\002\110\113\061 +\022\060\020\006\003\125\004\010\023\011\110\157\156\147\040\113 +\157\156\147\061\022\060\020\006\003\125\004\007\023\011\110\157 +\156\147\040\113\157\156\147\061\026\060\024\006\003\125\004\012 +\023\015\110\157\156\147\153\157\156\147\040\120\157\163\164\061 +\040\060\036\006\003\125\004\003\023\027\110\157\156\147\153\157 +\156\147\040\120\157\163\164\040\122\157\157\164\040\103\101\040 +\063 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\024\010\026\137\212\114\245\354\000\311\223\100\337\304\306 +\256\043\270\034\132\244 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\005\317\060\202\003\267\240\003\002\001\002\002\024\010 +\026\137\212\114\245\354\000\311\223\100\337\304\306\256\043\270 +\034\132\244\060\015\006\011\052\206\110\206\367\015\001\001\013 +\005\000\060\157\061\013\060\011\006\003\125\004\006\023\002\110 +\113\061\022\060\020\006\003\125\004\010\023\011\110\157\156\147 +\040\113\157\156\147\061\022\060\020\006\003\125\004\007\023\011 +\110\157\156\147\040\113\157\156\147\061\026\060\024\006\003\125 +\004\012\023\015\110\157\156\147\153\157\156\147\040\120\157\163 +\164\061\040\060\036\006\003\125\004\003\023\027\110\157\156\147 +\153\157\156\147\040\120\157\163\164\040\122\157\157\164\040\103 +\101\040\063\060\036\027\015\061\067\060\066\060\063\060\062\062 +\071\064\066\132\027\015\064\062\060\066\060\063\060\062\062\071 +\064\066\132\060\157\061\013\060\011\006\003\125\004\006\023\002 +\110\113\061\022\060\020\006\003\125\004\010\023\011\110\157\156 +\147\040\113\157\156\147\061\022\060\020\006\003\125\004\007\023 +\011\110\157\156\147\040\113\157\156\147\061\026\060\024\006\003 +\125\004\012\023\015\110\157\156\147\153\157\156\147\040\120\157 +\163\164\061\040\060\036\006\003\125\004\003\023\027\110\157\156 +\147\153\157\156\147\040\120\157\163\164\040\122\157\157\164\040 +\103\101\040\063\060\202\002\042\060\015\006\011\052\206\110\206 +\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002\012 +\002\202\002\001\000\263\210\327\352\316\017\040\116\276\346\326 +\003\155\356\131\374\302\127\337\051\150\241\203\016\076\150\307 +\150\130\234\034\140\113\211\103\014\271\324\025\262\356\301\116 +\165\351\265\247\357\345\351\065\231\344\314\034\347\113\137\215 +\063\060\040\063\123\331\246\273\325\076\023\216\351\037\207\111 +\255\120\055\120\312\030\276\001\130\242\023\160\226\273\211\210 +\126\200\134\370\275\054\074\341\114\127\210\273\323\271\225\357 +\313\307\366\332\061\164\050\246\346\124\211\365\101\061\312\345 +\046\032\315\202\340\160\332\073\051\273\325\003\365\231\272\125 +\365\144\321\140\016\263\211\111\270\212\057\005\322\204\105\050 +\174\217\150\120\022\170\374\013\265\123\313\302\230\034\204\243 +\236\260\276\043\244\332\334\310\053\036\332\156\105\036\211\230 +\332\371\000\056\006\351\014\073\160\325\120\045\210\231\313\315 +\163\140\367\325\377\065\147\305\241\274\136\253\315\112\270\105 +\353\310\150\036\015\015\024\106\022\343\322\144\142\212\102\230 +\274\264\306\010\010\370\375\250\114\144\234\166\001\275\057\251 +\154\063\017\330\077\050\270\074\151\001\102\206\176\151\301\311 +\006\312\345\172\106\145\351\302\326\120\101\056\077\267\344\355 +\154\327\277\046\001\021\242\026\051\112\153\064\006\220\354\023 +\322\266\373\152\166\322\074\355\360\326\055\335\341\025\354\243 +\233\057\054\311\076\053\344\151\073\377\162\045\261\066\206\133 +\307\177\153\213\125\033\112\305\040\141\075\256\313\120\341\010 +\072\276\260\217\143\101\123\060\010\131\074\230\035\167\272\143 +\221\172\312\020\120\140\277\360\327\274\225\207\217\227\305\376 +\227\152\001\224\243\174\133\205\035\052\071\072\320\124\241\321 +\071\161\235\375\041\371\265\173\360\342\340\002\217\156\226\044 +\045\054\240\036\054\250\304\211\247\357\355\231\006\057\266\012 +\114\117\333\242\314\067\032\257\107\205\055\212\137\304\064\064 +\114\000\375\030\223\147\023\321\067\346\110\264\213\006\305\127 +\173\031\206\012\171\313\000\311\122\257\102\377\067\217\341\243 +\036\172\075\120\253\143\006\347\025\265\077\266\105\067\224\067 +\261\176\362\110\303\177\305\165\376\227\215\105\217\032\247\032 +\162\050\032\100\017\002\003\001\000\001\243\143\060\141\060\017 +\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060 +\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060 +\037\006\003\125\035\043\004\030\060\026\200\024\027\235\315\036 +\213\326\071\053\160\323\134\324\240\270\037\260\000\374\305\141 +\060\035\006\003\125\035\016\004\026\004\024\027\235\315\036\213 +\326\071\053\160\323\134\324\240\270\037\260\000\374\305\141\060 +\015\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202 +\002\001\000\126\325\173\156\346\042\001\322\102\233\030\325\016 +\327\146\043\134\343\376\240\307\222\322\351\224\255\113\242\306 +\354\022\174\164\325\110\322\131\024\231\300\353\271\321\353\364 +\110\060\133\255\247\127\163\231\251\323\345\267\321\056\131\044 +\130\334\150\056\056\142\330\152\344\160\013\055\040\120\040\244 +\062\225\321\000\230\273\323\375\367\062\362\111\256\306\172\340 +\107\276\156\316\313\243\162\072\055\151\135\313\310\350\105\071 +\324\372\102\301\021\114\167\135\222\373\152\377\130\104\345\353 +\201\236\257\240\231\255\276\251\001\146\313\070\035\074\337\103 +\037\364\115\156\264\272\027\106\374\175\375\207\201\171\152\015 +\063\017\372\057\370\024\271\200\263\135\115\252\227\341\371\344 +\030\305\370\325\070\214\046\074\375\362\050\342\356\132\111\210 +\054\337\171\075\216\236\220\074\275\101\112\072\335\133\366\232 +\264\316\077\045\060\177\062\175\242\003\224\320\334\172\241\122 +\336\156\223\215\030\046\375\125\254\275\217\233\322\317\257\347 +\206\054\313\037\011\157\243\157\251\204\324\163\277\115\241\164 +\033\116\043\140\362\314\016\252\177\244\234\114\045\250\262\146 +\073\070\377\331\224\060\366\162\204\276\150\125\020\017\306\163 +\054\026\151\223\007\376\261\105\355\273\242\125\152\260\332\265 +\112\002\045\047\205\327\267\267\206\104\026\211\154\200\053\076 +\227\251\234\325\176\125\114\306\336\105\020\034\352\351\073\237 +\003\123\356\356\172\001\002\026\170\324\350\302\276\106\166\210 +\023\077\042\273\110\022\035\122\000\264\002\176\041\032\036\234 +\045\364\363\075\136\036\322\034\371\263\055\266\367\067\134\306 +\313\041\116\260\367\231\107\030\205\301\053\272\125\256\006\352 +\320\007\262\334\253\320\202\226\165\316\322\120\376\231\347\317 +\057\237\347\166\321\141\052\373\041\273\061\320\252\237\107\244 +\262\042\312\026\072\120\127\304\133\103\147\305\145\142\003\111 +\001\353\103\331\330\370\236\255\317\261\143\016\105\364\240\132 +\054\233\055\305\246\300\255\250\107\364\047\114\070\015\056\033 +\111\073\122\364\350\210\203\053\124\050\324\362\065\122\264\062 +\203\142\151\144\014\221\234\237\227\352\164\026\375\037\021\006 +\232\233\364 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE + +# Trust for "Hongkong Post Root CA 3" +# Issuer: CN=Hongkong Post Root CA 3,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK +# Serial Number:08:16:5f:8a:4c:a5:ec:00:c9:93:40:df:c4:c6:ae:23:b8:1c:5a:a4 +# Subject: CN=Hongkong Post Root CA 3,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK +# Not Valid Before: Sat Jun 03 02:29:46 2017 +# Not Valid After : Tue Jun 03 02:29:46 2042 +# Fingerprint (SHA-256): 5A:2F:C0:3F:0C:83:B0:90:BB:FA:40:60:4B:09:88:44:6C:76:36:18:3D:F9:84:6E:17:10:1A:44:7F:B8:EF:D6 +# Fingerprint (SHA1): 58:A2:D0:EC:20:52:81:5B:C1:F3:F8:64:02:24:4E:C2:8E:02:4B:02 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Hongkong Post Root CA 3" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\130\242\320\354\040\122\201\133\301\363\370\144\002\044\116\302 +\216\002\113\002 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\021\374\237\275\163\060\002\212\375\077\363\130\271\313\040\360 +END +CKA_ISSUER MULTILINE_OCTAL +\060\157\061\013\060\011\006\003\125\004\006\023\002\110\113\061 +\022\060\020\006\003\125\004\010\023\011\110\157\156\147\040\113 +\157\156\147\061\022\060\020\006\003\125\004\007\023\011\110\157 +\156\147\040\113\157\156\147\061\026\060\024\006\003\125\004\012 +\023\015\110\157\156\147\153\157\156\147\040\120\157\163\164\061 +\040\060\036\006\003\125\004\003\023\027\110\157\156\147\153\157 +\156\147\040\120\157\163\164\040\122\157\157\164\040\103\101\040 +\063 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\024\010\026\137\212\114\245\354\000\311\223\100\337\304\306 +\256\043\270\034\132\244 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/ccache/ccache.nm b/ccache/ccache.nm index 9c62b05bc..6edc79767 100644 --- a/ccache/ccache.nm +++ b/ccache/ccache.nm @@ -4,11 +4,11 @@ ############################################################################### name = ccache -version = 3.5.1 +version = 3.7.1 release = 1 groups = Development/Compilers -url = http://ccache.samba.org/ +url = https://ccache.dev license = GPLv2+ summary = C/C++ compiler cache. @@ -19,7 +19,7 @@ description a 5 to 10 times speedup in common compilations. end -source_dl = https://www.samba.org/ftp/ccache/ +source_dl = https://github.com/ccache/ccache/releases/download/v%{version}/ sources = %{thisapp}.tar.xz # Sets ccache max size up to 2 GB @@ -36,9 +36,6 @@ build CCACHE_CACHE = %{localstatedir}/cache/ccache prepare_cmds - # The included configure script renders an incorrect Makefile - autoreconf -vfi - # Do not run test for pre-compiled headers sed -e "/^pch$/d" -i test/run diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 5266c2f80..64831ef3a 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -7,7 +7,7 @@ build_graphite = 1 name = gcc -version = 8.3.0 +version = 9.1.0 release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> @@ -64,9 +64,6 @@ build # Build libubsan build_libubsan = 0 - # Build libmpx (only on x86_64) - build_libmpx = 0 - # A couple of configure arguments depending on the architecture and # configuration. configure_options = @@ -80,7 +77,6 @@ build build_liblsan = 1 build_libtsan = 1 build_libubsan = 1 - build_libmpx = 1 end if "%{DISTRO_ARCH}" == "i686" @@ -282,7 +278,7 @@ build chmod 755 %{BUILDROOT}%{libdir}/libgomp.so.1.* # libstdc++ - ln -svf ../../../libstdc++.so.6.0.25 ${FULLPATH}/libstdc++.so + ln -svf ../../../libstdc++.so.6.0.26 ${FULLPATH}/libstdc++.so mv -vf %{BUILDROOT}%{libdir}/lib{std,sup}c++.a ${FULLPATH} # libquadmath @@ -313,11 +309,6 @@ build ln -svf ../../../libubsan.so.1.0.0 ${FULLPATH}/libubsan.so chmod 755 %{BUILDROOT}%{libdir}/libubsan.so.* fi - - if [ "%{build_libmpx}" = "1" ]; then - ln -svf ../../../libmpx.so.2.0.1 ${FULLPATH}/libmpx.so - ln -svf ../../../libmpxwrappers.so.2.0.1 ${FULLPATH}/libmpxwrappers.so - fi end keep_libraries @@ -612,22 +603,6 @@ packages end end - if "%{build_libmpx}" == "1" - package libmpx - summary = The Memory Protection Extensions runtime libraries - description - This package contains the Memory Protection Extensions - runtime libraries which is used for -fcheck-pointer-bounds - -mmpx instrumented programs. - end - - files - %{libdir}/libmpx.so.* - %{libdir}/libmpxwrappers.so.* - end - end - end - package gcc-plugin-devel summary = Support for compiling GCC plugins. description diff --git a/libseccomp/libseccomp.nm b/libseccomp/libseccomp.nm new file mode 100644 index 000000000..2be8e9730 --- /dev/null +++ b/libseccomp/libseccomp.nm @@ -0,0 +1,42 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = libseccomp +version = 2.4.0 +release = 1 + +groups = System/Libraries +url = https://github.com/seccomp/libseccomp +license = LGPLv2.1+ +summary = A library for the kernel's syscall filtering + +description + The libseccomp library provides an easy to use, platform independent, + interface to the Linux Kernel's syscall filtering mechanism. The + libseccomp API is designed to abstract away the underlying BPF based + syscall filter language and present a more conventional function-call + based filtering interface that should be familiar to, and easily + adopted by, application developers. +end + +source_dl = https://github.com/seccomp/libseccomp/releases/download/v%{version}/ + +build + test + make check + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/qemu/qemu.nm b/qemu/qemu.nm index e04a4c0bd..c80c70d44 100644 --- a/qemu/qemu.nm +++ b/qemu/qemu.nm @@ -4,8 +4,8 @@ ############################################################################### name = qemu -version = 2.7.0 -release = 2 +version = 3.1.0 +release = 1 groups = Applications/Virtualization url = http://www.qemu.org @@ -18,8 +18,8 @@ description architectures. end -source_dl = http://wiki.qemu-project.org/download/ -sources = %{thisapp}.tar.bz2 +source_dl = https://download.qemu.org/ +sources = %{thisapp}.tar.xz build requires @@ -35,6 +35,7 @@ build libgcrypt-devel libjpeg-devel libpng-devel + libseccomp-devel libtasn1-devel libusb-devel libuuid-devel @@ -74,7 +75,6 @@ build --enable-libusb \ --enable-lzo \ --enable-pie \ - --enable-vhdx \ --enable-vnc \ --enable-vnc-jpeg \ --enable-vnc-png \ @@ -86,7 +86,7 @@ build install_cmds # Remove BIOS file which is an ELF files w/ invalid interpreter - rm -vf %{BUILDROOT}%{datadir}/qemu/s390-ccw.img + rm -vf %{BUILDROOT}%{datadir}/qemu/s390-*.img # Remove ivshm stuff rm -vf %{BUILDROOT}%{bindir}/ivshmem* %{BUILDROOT}%{mandir}/ivshmem* hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f809b8d5c75ebfba1fce53882596356456328826
by Michael Tremer 17 May '19

17 May '19

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 f809b8d5c75ebfba1fce53882596356456328826 (commit) via df62774e32cdd33da266432f2dffefb0402c8ccf (commit) from 0aa21ad307979f96d3ea26ae3d86e19fc40f6787 (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 f809b8d5c75ebfba1fce53882596356456328826 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri May 17 20:30:13 2019 +0100 core132: Ship updated apache configuration A reload would be sufficient. I could not find why apache needs to be restarted. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit df62774e32cdd33da266432f2dffefb0402c8ccf Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Wed May 15 17:01:00 2019 +0000 httpd: prefer AES-GCM ciphers over AES-CBC CBC ciphers are vulnerable to a bunch of attacks (being rather academic so far) such as MAC-then-encrypt or padding oracle. These seem to be more serious (see https://blog.qualys.com/technology/2019/04/22/zombie-poodle-and-goldendoodl… for further readings) which is why they should be used for interoperability purposes only. I plan to remove AES-CBC ciphers for the WebUI at the end of the year, provided overall security landscape has not changed until that. This patch changes the WebUI cipherlist to: TLS_CHACHA20_POLY1305_SHA256 TLSv1.3 Kx=any Au=any Enc=CHACHA20/POLY1305(256) Mac=AEAD TLS_AES_256_GCM_SHA384 TLSv1.3 Kx=any Au=any Enc=AESGCM(256) Mac=AEAD TLS_AES_128_GCM_SHA256 TLSv1.3 Kx=any Au=any Enc=AESGCM(128) Mac=AEAD ECDHE-ECDSA-CHACHA20-POLY1305 TLSv1.2 Kx=ECDH Au=ECDSA Enc=CHACHA20/POLY1305(256) Mac=AEAD ECDHE-ECDSA-AES256-GCM-SHA384 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AESGCM(256) Mac=AEAD ECDHE-ECDSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AESGCM(128) Mac=AEAD ECDHE-RSA-CHACHA20-POLY1305 TLSv1.2 Kx=ECDH Au=RSA Enc=CHACHA20/POLY1305(256) Mac=AEAD ECDHE-RSA-AES256-GCM-SHA384 TLSv1.2 Kx=ECDH Au=RSA Enc=AESGCM(256) Mac=AEAD ECDHE-RSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH Au=RSA Enc=AESGCM(128) Mac=AEAD ECDHE-ECDSA-AES256-SHA384 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AES(256) Mac=SHA384 ECDHE-ECDSA-AES128-SHA256 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AES(128) Mac=SHA256 ECDHE-RSA-AES256-SHA384 TLSv1.2 Kx=ECDH Au=RSA Enc=AES(256) Mac=SHA384 ECDHE-RSA-AES128-SHA256 TLSv1.2 Kx=ECDH Au=RSA Enc=AES(128) Mac=SHA256 (AES-CBC + ECDSA will be preferred over RSA for performance reasons. As this cipher order cannot be trivially rebuilt with OpenSSL cipher stings, it has to be hard-coded.) All working clients will stay compatible. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/httpd/vhosts.d/ipfire-interface-ssl.conf | 2 +- config/rootfiles/core/132/filelists/files | 1 + config/rootfiles/core/132/update.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf index f88a6a52a..0166c4920 100644 --- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf +++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf @@ -11,7 +11,7 @@ SSLEngine on SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1 - SSLCipherSuite TLS_CHACHA20_POLY1305_SHA256:TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256 + SSLCipherSuite TLS_CHACHA20_POLY1305_SHA256:TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256 SSLHonorCipherOrder on SSLCompression off SSLSessionTickets off diff --git a/config/rootfiles/core/132/filelists/files b/config/rootfiles/core/132/filelists/files index d63c77e4a..ab3520b40 100644 --- a/config/rootfiles/core/132/filelists/files +++ b/config/rootfiles/core/132/filelists/files @@ -1,6 +1,7 @@ etc/system-release etc/issue etc/mime.types +etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf etc/rc.d/init.d/suricata etc/rc.d/init.d/unbound etc/suricata/suricata.yaml diff --git a/config/rootfiles/core/132/update.sh b/config/rootfiles/core/132/update.sh index 669df6009..94c38b19e 100644 --- a/config/rootfiles/core/132/update.sh +++ b/config/rootfiles/core/132/update.sh @@ -92,7 +92,7 @@ ldconfig /usr/local/bin/update-lang-cache # Start services -/etc/init.d/apache restart +/etc/init.d/apache reload /etc/init.d/collectd restart /etc/init.d/firewall restart /etc/init.d/unbound restart hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0aa21ad307979f96d3ea26ae3d86e19fc40f6787
by Michael Tremer 17 May '19

17 May '19

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 0aa21ad307979f96d3ea26ae3d86e19fc40f6787 (commit) from 16cb73d9019fb76727dc5f4376e2cb47ea6e9a4f (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 0aa21ad307979f96d3ea26ae3d86e19fc40f6787 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri May 17 19:52:27 2019 +0100 Fix version information in backupiso script Fixes: #12083 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/132/filelists/files | 1 + src/scripts/backupiso | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/132/filelists/files b/config/rootfiles/core/132/filelists/files index 2b14c1aa7..d63c77e4a 100644 --- a/config/rootfiles/core/132/filelists/files +++ b/config/rootfiles/core/132/filelists/files @@ -15,6 +15,7 @@ srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/cgi-bin/urlfilter.cgi srv/web/ipfire/cgi-bin/zoneconf.cgi usr/lib/firewall/rules.pl +usr/local/bin/backupiso usr/sbin/convert-snort var/ipfire/ids-functions.pl var/ipfire/langs diff --git a/src/scripts/backupiso b/src/scripts/backupiso index d15833d5d..7e8599f00 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -1,7 +1,7 @@ #!/bin/sh # FIXME: edit this lines before release -IPFVER=2.21 +IPFVER=2.23 COREVER=$(cat /opt/pakfire/db/core/mine) arch=$(uname -m) 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 May 2019