IPFire-SCM June 2015

ipfire-scm@lists.ipfire.org

1 participants
51 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bbdc2e4bcf64a96d3ddd3ae42cbe49341c1a4f59
by git＠ipfire.org 18 Jun '15

18 Jun '15

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 bbdc2e4bcf64a96d3ddd3ae42cbe49341c1a4f59 (commit) via 67bc7ab222d9221abed1c538f92f2ad4064f26b1 (commit) via 1ae0db1a7437359da7bbe9527ae7653d4be3146e (commit) via 654f71f1a4a261e57970a57f430e639f23ae26da (commit) via b309fb54554af979118b13770d334968c0925416 (commit) via 77a94be71110f428d42b44321f5c1aa387098339 (commit) via 5d4c1d20d7aef63de51531f1a6eb1a379adf937d (commit) via e9088b9d3e40b75b5192346e3d780804c3f104cc (commit) via 11f26128556730fd61f7ca7d308d5278f85c9361 (commit) via 9f98b05277e7e17c1bc0477017c2b28d3b4edf3e (commit) via f7024a3ac69ab1915815cb51ef3c5298c8e9e099 (commit) via 66ca2ca5c53a2b82340a544bf617e87a0c447f20 (commit) via ff0e684eeef9ebabd78e8b331673151c9976ae57 (commit) via dfa88551aec1cc1d3ede5a156715c3652f11d2d5 (commit) via d8837b032f99895d656d06e647d084b4301671cf (commit) via 26120e5d5d4ef81f61130712db0e30fe6f73c54f (commit) via a52932e1b077ad243e8b6d63c8015f78cb6b6eda (commit) via 4d8688303d35ef3392eaab7c5d3a7dd40e7c7612 (commit) via 7f7d0ae75075cf6329ba17fb7df7634b81360215 (commit) via b6adeb235df18dcd1cef757819c808328ba009e4 (commit) via 81b83eba104cccc91dce7229716c835ffeb04dc8 (commit) via dff6612b02b564c0b0b202bbe33955d1cac7927c (commit) via 508288ab6b369451614dada8837d7883e8bec2c6 (commit) via 348334b6eb85aee6a4af46b907d19d6c45772ee6 (commit) via bbe4537de3ef49c0d584896374876e5a3cdece75 (commit) via 7cbd533265e97b3f7d288f1d287e6a5699ebace8 (commit) via 837a6e01a87e8c9fc88920c84718d9d20ae7d859 (commit) via bdd6ecd3788c244f9d84109d241fd97b2e2e74ed (commit) via a3a0aefba160c9e9e5b16e49d7a5f7843585695d (commit) via 07c09125e1edee75dff5f33fcb07f6feb075111f (commit) via fa0203f78eaac71a83fc102091a40bb613499cc2 (commit) via c8ab87f16b30bbc86d6beedb73e512f8ec4d7d1b (commit) via 7a2b5c6470e8b723868de7a5c994404d0b75d4fb (commit) via 8984f4f0c4a416803d9470b284b718ee97fb4352 (commit) via dbc15d1e62ec7d26c33dea79abb1c5addd9fd9be (commit) via e30d382778d09a324665e402bc7d8676c7360bc7 (commit) via a0026a62962f62ace60de1d7b8c6128194698ad8 (commit) via 4d3dc4bd65d5528a17bc845f169a60df55a42f22 (commit) via 4349d6b3eb3f0156ad052c77bac1e1354171ab82 (commit) via 895e1da27917960895514bdb97c3355a6bc7ae5b (commit) via 4116f912f038663353a04391aed551fba8394093 (commit) via 60e84dfd47d2ae6752c51d67e589f547503297ee (commit) via 6c63e94298f768f21aac407885682eeb411ac4d5 (commit) from 697b4f04bf8a007b289e424cf88bfbba7a2df71a (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 bbdc2e4bcf64a96d3ddd3ae42cbe49341c1a4f59 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 16 17:57:54 2015 +0200 python: Update to 2.7.10 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 67bc7ab222d9221abed1c538f92f2ad4064f26b1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 16 17:57:53 2015 +0200 python: Build libffi before python and link against it Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1ae0db1a7437359da7bbe9527ae7653d4be3146e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 16 17:57:52 2015 +0200 Python: Update to 2.7.9 This reverts commit 3d9b9dd30e86b03dce4e31103099a6a0bdc97a98. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 654f71f1a4a261e57970a57f430e639f23ae26da Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 18 21:01:35 2015 +0200 git: Update to version 2.4.4 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b309fb54554af979118b13770d334968c0925416 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 18 13:24:37 2015 +0200 core92: Add updated libusb and libusb-compat Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 77a94be71110f428d42b44321f5c1aa387098339 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Fri Apr 3 11:58:01 2015 +0200 libusb-compat: Fixed rootfile (removed file '23-usb.rules') Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5d4c1d20d7aef63de51531f1a6eb1a379adf937d Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Tue Mar 24 20:24:46 2015 +0100 libusb: Update to 1.0.19 libusbx: removed, moved to 'libusb-compat 0.1.5' updated: make.sh Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e9088b9d3e40b75b5192346e3d780804c3f104cc Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sat Apr 4 10:38:16 2015 +0200 7zip: Update to 9.38.1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 11f26128556730fd61f7ca7d308d5278f85c9361 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Wed Apr 8 21:01:19 2015 +0200 libassuan: Update to 2.2.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9f98b05277e7e17c1bc0477017c2b28d3b4edf3e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 18 13:19:07 2015 +0200 core92: Add updated libgpg-error Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f7024a3ac69ab1915815cb51ef3c5298c8e9e099 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Wed Apr 8 21:07:17 2015 +0200 libgpg-error: Update to 1.18 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 66ca2ca5c53a2b82340a544bf617e87a0c447f20 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 18 13:18:10 2015 +0200 core92: Add updated libgcrypt Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ff0e684eeef9ebabd78e8b331673151c9976ae57 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Tue Apr 7 00:15:09 2015 +0200 libgcrypt: Update to 1.63 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit dfa88551aec1cc1d3ede5a156715c3652f11d2d5 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Tue Mar 31 17:15:40 2015 +0200 powertop: Update to 2.7 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d8837b032f99895d656d06e647d084b4301671cf Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun May 17 15:26:34 2015 +0200 nano: Update to 2.4.1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 26120e5d5d4ef81f61130712db0e30fe6f73c54f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 18 13:16:32 2015 +0200 core92: Add updated libpcap Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a52932e1b077ad243e8b6d63c8015f78cb6b6eda Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Thu May 28 11:07:38 2015 +0200 libpcap: Update to 1.7.3 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4d8688303d35ef3392eaab7c5d3a7dd40e7c7612 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun May 17 15:29:55 2015 +0200 tcpdump: Update to 4.7.4 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7f7d0ae75075cf6329ba17fb7df7634b81360215 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 18 13:14:55 2015 +0200 core92: Add rrdtool update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b6adeb235df18dcd1cef757819c808328ba009e4 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun May 17 15:12:16 2015 +0200 graphs.pl: bugfixes regarding rrdtool Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 81b83eba104cccc91dce7229716c835ffeb04dc8 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Fri May 15 12:43:06 2015 +0200 rrdtool: Update to 1.5.3 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit dff6612b02b564c0b0b202bbe33955d1cac7927c Merge: 697b4f0 508288a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 18 13:12:33 2015 +0200 Merge remote-tracking branch 'mfischer/dnsmasq' into next Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Conflicts: lfs/dnsmasq commit 508288ab6b369451614dada8837d7883e8bec2c6 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Wed Jun 17 13:01:53 2015 +0200 dnsmasq: Update to 2.73 commit 348334b6eb85aee6a4af46b907d19d6c45772ee6 Merge: bbe4537 5428eee Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Tue Jun 16 21:40:16 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into dnsmasq commit bbe4537de3ef49c0d584896374876e5a3cdece75 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun May 17 00:39:39 2015 +0200 dnsmasq: again - latest upstream patches commit 7cbd533265e97b3f7d288f1d287e6a5699ebace8 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sat May 9 21:21:34 2015 +0200 dnsmasq: import latest upstream patches commit 837a6e01a87e8c9fc88920c84718d9d20ae7d859 Merge: bdd6ecd 16c18d2 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sat May 9 11:09:11 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit bdd6ecd3788c244f9d84109d241fd97b2e2e74ed Merge: a3a0aef 086eb9b Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Wed May 6 20:12:22 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit a3a0aefba160c9e9e5b16e49d7a5f7843585695d Merge: 07c0912 b59da37 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Mon May 4 18:46:27 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 07c09125e1edee75dff5f33fcb07f6feb075111f Merge: fa0203f 0ee35ce Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sat May 2 22:19:21 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit fa0203f78eaac71a83fc102091a40bb613499cc2 Merge: c8ab87f 8d1e36c Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Thu Apr 30 18:44:01 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit c8ab87f16b30bbc86d6beedb73e512f8ec4d7d1b Merge: 7a2b5c6 0594323 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sat Apr 25 00:32:20 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 7a2b5c6470e8b723868de7a5c994404d0b75d4fb Merge: 8984f4f 4d9e31a Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Fri Apr 17 19:41:57 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 8984f4f0c4a416803d9470b284b718ee97fb4352 Merge: dbc15d1 30986db Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Wed Apr 15 20:46:44 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit dbc15d1e62ec7d26c33dea79abb1c5addd9fd9be Merge: e30d382 040ec36 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun Apr 12 00:09:10 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit e30d382778d09a324665e402bc7d8676c7360bc7 Merge: a0026a6 1164cb0 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Fri Apr 10 16:36:57 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit a0026a62962f62ace60de1d7b8c6128194698ad8 Merge: 4d3dc4b d0552ea Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Thu Apr 9 21:41:14 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 4d3dc4bd65d5528a17bc845f169a60df55a42f22 Merge: 4349d6b ecb2d6b Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Thu Apr 9 00:38:06 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 4349d6b3eb3f0156ad052c77bac1e1354171ab82 Merge: 895e1da 15847a8 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun Apr 5 22:08:13 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 895e1da27917960895514bdb97c3355a6bc7ae5b Merge: 4116f91 b0b6105 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sat Apr 4 23:49:48 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 4116f912f038663353a04391aed551fba8394093 Merge: 60e84df 8f548df Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sat Apr 4 10:38:48 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 60e84dfd47d2ae6752c51d67e589f547503297ee Merge: 6c63e94 0d573e2 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Tue Mar 31 17:27:42 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 6c63e94298f768f21aac407885682eeb411ac4d5 Merge: 0e1fcef e0b9a60 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun Mar 29 00:16:55 2015 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next ----------------------------------------------------------------------- Summary of changes: config/cfgroot/graphs.pl | 8 +- config/rootfiles/common/libgcrypt | 2 +- config/rootfiles/common/libgpg-error | 11 +- config/rootfiles/common/libpcap | 2 +- config/rootfiles/common/libusb | 21 +- config/rootfiles/common/libusb-compat | 7 + config/rootfiles/common/libusbx | 8 - config/rootfiles/common/python | 234 ++++++++++++++++++++- config/rootfiles/common/rrdtool | 190 ++++++++--------- .../{oldcore/59 => core/91}/filelists/python | 0 config/rootfiles/core/92/filelists/files | 1 + .../{oldcore/80 => core/92}/filelists/libgcrypt | 0 .../{oldcore/80 => core/92}/filelists/libgpg-error | 0 .../{oldcore/89 => core/92}/filelists/libpcap | 0 config/rootfiles/core/92/filelists/libusb | 1 + config/rootfiles/core/92/filelists/libusb-compat | 1 + .../{oldcore/66 => core/92}/filelists/rrdtool | 0 config/rootfiles/packages/7zip | 112 +++++----- config/rootfiles/packages/git | 21 +- config/rootfiles/packages/libassuan | 2 +- config/rootfiles/packages/nano | 18 +- config/rootfiles/packages/powertop | 2 +- lfs/7zip | 10 +- lfs/dnsmasq | 119 +---------- lfs/git | 13 +- lfs/libassuan | 8 +- lfs/libgcrypt | 6 +- lfs/libgpg-error | 6 +- lfs/libpcap | 6 +- lfs/libusb | 10 +- lfs/{7zip => libusb-compat} | 21 +- lfs/libusbx | 78 ------- lfs/nano | 8 +- lfs/powertop | 10 +- lfs/python | 10 +- lfs/python-optional-src | 2 +- lfs/rrdtool | 6 +- lfs/tcpdump | 8 +- make.sh | 4 +- ....7.3-gdbm-1.patch => Python-2.7.9-gdbm-1.patch} | 0 ...fragmentation-of-large-packets-is-broken.patch} | 39 ++-- ...-mapped-IPv6-addresses-with--stop-rebind.patch} | 13 +- .../dnsmasq/0090-Tweak-EDNS-timeout-code.patch | 1 - ...-archive-mailing-list-mirror-in-doc-html.patch} | 9 +- ...-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch | 1 - ...ect-DHCP-context-for-PXE-proxy-server-id.patch} | 8 +- ...ix-buffer-overflow-introduced-in-2-73rc6.patch} | 8 +- src/patches/python-2.7rc1-ctypes-noexecmem.patch | 85 ++++++++ 48 files changed, 641 insertions(+), 489 deletions(-) create mode 100644 config/rootfiles/common/libusb-compat delete mode 100644 config/rootfiles/common/libusbx copy config/rootfiles/{oldcore/59 => core/91}/filelists/python (100%) copy config/rootfiles/{oldcore/80 => core/92}/filelists/libgcrypt (100%) copy config/rootfiles/{oldcore/80 => core/92}/filelists/libgpg-error (100%) copy config/rootfiles/{oldcore/89 => core/92}/filelists/libpcap (100%) create mode 120000 config/rootfiles/core/92/filelists/libusb create mode 120000 config/rootfiles/core/92/filelists/libusb-compat copy config/rootfiles/{oldcore/66 => core/92}/filelists/rrdtool (100%) copy lfs/{7zip => libusb-compat} (91%) delete mode 100644 lfs/libusbx copy src/patches/{Python-2.7.3-gdbm-1.patch => Python-2.7.9-gdbm-1.patch} (100%) copy src/patches/dnsmasq/{0088-Handle-UDP-packet-loss-when-fragmentation-of-large-p.patch => 0088-Handle-UDP-packet-loss-when-fragmentation-of-large-packets-is-broken.patch} (94%) copy src/patches/dnsmasq/{0089-Check-IPv4-mapped-IPv6-addresses-with-stop-rebind.patch => 0089-Check-IPv4-mapped-IPv6-addresses-with--stop-rebind.patch} (87%) copy src/patches/dnsmasq/{0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc.h.patch => 0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc-html.patch} (86%) copy src/patches/dnsmasq/{0094-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch => 0093-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch} (89%) copy src/patches/dnsmasq/{0095-Fix-buffer-overflow-introduced-in-2.73rc6.patch => 0094-Fix-buffer-overflow-introduced-in-2-73rc6.patch} (91%) create mode 100644 src/patches/python-2.7rc1-ctypes-noexecmem.patch Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 40c1bc8..c3fb43e 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -257,11 +257,11 @@ sub updateloadgraph { "DEF:load1=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:shortterm:AVERAGE", "DEF:load5=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:midterm:AVERAGE", "DEF:load15=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:longterm:AVERAGE", - "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'}.":", + "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'}, "GPRINT:load1:LAST:%5.2lf", - "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}.":", + "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}, "GPRINT:load5:LAST:%5.2lf", - "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}.":", + "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}, "GPRINT:load15:LAST:%5.2lf\\j", "LINE1:load5".$color{"color13"}, "LINE1:load1".$color{"color18"}, @@ -519,7 +519,7 @@ sub updatediskgraph { "CDEF:writen=write,-1,*", "DEF:standby=".$mainsettings{'RRDLOG'}."/hddshutdown-".$disk.".rrd:standby:AVERAGE", "CDEF:st=standby,INF,*", - "CDEF:st1=standby,-INF,*", + "CDEF:st1=standby,NEGINF,*", "COMMENT:".sprintf("%-25s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt index 96e48e1..344a055 100644 --- a/config/rootfiles/common/libgcrypt +++ b/config/rootfiles/common/libgcrypt @@ -6,7 +6,7 @@ #usr/lib/libgcrypt.la #usr/lib/libgcrypt.so usr/lib/libgcrypt.so.20 -usr/lib/libgcrypt.so.20.0.1 +usr/lib/libgcrypt.so.20.0.3 #usr/share/aclocal/libgcrypt.m4 #usr/share/info/gcrypt.info #usr/share/info/gcrypt.info-1 diff --git a/config/rootfiles/common/libgpg-error b/config/rootfiles/common/libgpg-error index cbb7dec..4d6febc 100644 --- a/config/rootfiles/common/libgpg-error +++ b/config/rootfiles/common/libgpg-error @@ -4,7 +4,7 @@ usr/bin/gpg-error #usr/lib/libgpg-error.la #usr/lib/libgpg-error.so usr/lib/libgpg-error.so.0 -usr/lib/libgpg-error.so.0.11.0 +usr/lib/libgpg-error.so.0.14.0 #usr/share/aclocal/gpg-error.m4 #usr/share/common-lisp #usr/share/common-lisp/source @@ -13,19 +13,24 @@ usr/lib/libgpg-error.so.0.11.0 #usr/share/common-lisp/source/gpg-error/gpg-error-package.lisp #usr/share/common-lisp/source/gpg-error/gpg-error.asd #usr/share/common-lisp/source/gpg-error/gpg-error.lisp +#usr/share/info/gpgrt.info #usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo #usr/share/locale/da/LC_MESSAGES/libgpg-error.mo #usr/share/locale/de/LC_MESSAGES/libgpg-error.mo -#usr/share/locale/eo -#usr/share/locale/eo/LC_MESSAGES #usr/share/locale/eo/LC_MESSAGES/libgpg-error.mo #usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/hu/LC_MESSAGES/libgpg-error.mo #usr/share/locale/it/LC_MESSAGES/libgpg-error.mo #usr/share/locale/ja/LC_MESSAGES/libgpg-error.mo #usr/share/locale/nl/LC_MESSAGES/libgpg-error.mo #usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/pt/LC_MESSAGES/libgpg-error.mo #usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/ru/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/sr/LC_MESSAGES/libgpg-error.mo #usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo #usr/share/locale/uk/LC_MESSAGES/libgpg-error.mo #usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo #usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/zh_TW/LC_MESSAGES/libgpg-error.mo +#usr/share/man/man1/gpg-error-config.1 diff --git a/config/rootfiles/common/libpcap b/config/rootfiles/common/libpcap index b8e9648..9031c6e 100644 --- a/config/rootfiles/common/libpcap +++ b/config/rootfiles/common/libpcap @@ -15,7 +15,7 @@ #usr/lib/libpcap.a usr/lib/libpcap.so usr/lib/libpcap.so.1 -usr/lib/libpcap.so.1.6.2 +usr/lib/libpcap.so.1.7.3 #usr/share/man/man1/pcap-config.1 #usr/share/man/man3/pcap.3pcap #usr/share/man/man3/pcap_activate.3pcap diff --git a/config/rootfiles/common/libusb b/config/rootfiles/common/libusb index 61c2f2a..5be9bdf 100644 --- a/config/rootfiles/common/libusb +++ b/config/rootfiles/common/libusb @@ -1,15 +1,16 @@ etc/udev/rules.d/23-usb.rules #usr/bin/libusb-config +#usr/include/libusb-1.0 +#usr/include/libusb-1.0/libusb.h #usr/include/usb.h -#usr/include/usbpp.h -usr/lib/libusb-0.1.so.4 -usr/lib/libusb-0.1.so.4.4.4 -#usr/lib/libusb.a +#usr/lib/libusb-0.1.so.4 +#usr/lib/libusb-0.1.so.4.4.4 +#usr/lib/libusb-1.0.a +#usr/lib/libusb-1.0.la +#usr/lib/libusb-1.0.so +usr/lib/libusb-1.0.so.0 +usr/lib/libusb-1.0.so.0.1.0 #usr/lib/libusb.la -usr/lib/libusb.so -usr/lib/libusbpp-0.1.so.4 -usr/lib/libusbpp-0.1.so.4.4.4 -#usr/lib/libusbpp.a -#usr/lib/libusbpp.la -usr/lib/libusbpp.so +#usr/lib/libusb.so +#usr/lib/pkgconfig/libusb-1.0.pc #usr/lib/pkgconfig/libusb.pc diff --git a/config/rootfiles/common/libusb-compat b/config/rootfiles/common/libusb-compat new file mode 100644 index 0000000..ca3007e --- /dev/null +++ b/config/rootfiles/common/libusb-compat @@ -0,0 +1,7 @@ +#usr/bin/libusb-config +#usr/include/usb.h +usr/lib/libusb-0.1.so.4 +usr/lib/libusb-0.1.so.4.4.4 +#usr/lib/libusb.la +usr/lib/libusb.so +#usr/lib/pkgconfig/libusb.pc diff --git a/config/rootfiles/common/libusbx b/config/rootfiles/common/libusbx deleted file mode 100644 index 62d6492..0000000 --- a/config/rootfiles/common/libusbx +++ /dev/null @@ -1,8 +0,0 @@ -#usr/include/libusb-1.0 -#usr/include/libusb-1.0/libusb.h -#usr/lib/libusb-1.0.a -#usr/lib/libusb-1.0.la -#usr/lib/libusb-1.0.so -usr/lib/libusb-1.0.so.0 -usr/lib/libusb-1.0.so.0.1.0 -#usr/lib/pkgconfig/libusb-1.0.pc diff --git a/config/rootfiles/common/python b/config/rootfiles/common/python index 3472e25..4f11c56 100644 --- a/config/rootfiles/common/python +++ b/config/rootfiles/common/python @@ -171,12 +171,18 @@ usr/lib/python2.7/__phello__.foo.pyc #usr/lib/python2.7/_abcoll.py usr/lib/python2.7/_abcoll.pyc #usr/lib/python2.7/_abcoll.pyo +#usr/lib/python2.7/_osx_support.py +#usr/lib/python2.7/_osx_support.pyc +#usr/lib/python2.7/_osx_support.pyo #usr/lib/python2.7/_pyio.py usr/lib/python2.7/_pyio.pyc #usr/lib/python2.7/_pyio.pyo #usr/lib/python2.7/_strptime.py usr/lib/python2.7/_strptime.pyc #usr/lib/python2.7/_strptime.pyo +#usr/lib/python2.7/_sysconfigdata.py +#usr/lib/python2.7/_sysconfigdata.pyc +#usr/lib/python2.7/_sysconfigdata.pyo #usr/lib/python2.7/_threading_local.py usr/lib/python2.7/_threading_local.pyc #usr/lib/python2.7/_threading_local.pyo @@ -605,6 +611,9 @@ usr/lib/python2.7/ctypes/macholib/framework.pyc #usr/lib/python2.7/ctypes/test/test_win32.py #usr/lib/python2.7/ctypes/test/test_win32.pyc #usr/lib/python2.7/ctypes/test/test_win32.pyo +#usr/lib/python2.7/ctypes/test/test_wintypes.py +#usr/lib/python2.7/ctypes/test/test_wintypes.pyc +#usr/lib/python2.7/ctypes/test/test_wintypes.pyo #usr/lib/python2.7/ctypes/util.py usr/lib/python2.7/ctypes/util.pyc #usr/lib/python2.7/ctypes/util.pyo @@ -1452,6 +1461,19 @@ usr/lib/python2.7/encodings/uu_codec.pyc #usr/lib/python2.7/encodings/zlib_codec.py usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/encodings/zlib_codec.pyo +#usr/lib/python2.7/ensurepip +#usr/lib/python2.7/ensurepip/__init__.py +#usr/lib/python2.7/ensurepip/__init__.pyc +#usr/lib/python2.7/ensurepip/__init__.pyo +#usr/lib/python2.7/ensurepip/__main__.py +#usr/lib/python2.7/ensurepip/__main__.pyc +#usr/lib/python2.7/ensurepip/__main__.pyo +#usr/lib/python2.7/ensurepip/_bundled +#usr/lib/python2.7/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_uninstall.py +#usr/lib/python2.7/ensurepip/_uninstall.pyc +#usr/lib/python2.7/ensurepip/_uninstall.pyo #usr/lib/python2.7/filecmp.py usr/lib/python2.7/filecmp.pyc #usr/lib/python2.7/filecmp.pyo @@ -1583,6 +1605,13 @@ usr/lib/python2.7/httplib.pyc #usr/lib/python2.7/idlelib/Icons #usr/lib/python2.7/idlelib/Icons/folder.gif #usr/lib/python2.7/idlelib/Icons/idle.icns +#usr/lib/python2.7/idlelib/Icons/idle.ico +#usr/lib/python2.7/idlelib/Icons/idle_16.gif +#usr/lib/python2.7/idlelib/Icons/idle_16.png +#usr/lib/python2.7/idlelib/Icons/idle_32.gif +#usr/lib/python2.7/idlelib/Icons/idle_32.png +#usr/lib/python2.7/idlelib/Icons/idle_48.gif +#usr/lib/python2.7/idlelib/Icons/idle_48.png #usr/lib/python2.7/idlelib/Icons/minusnode.gif #usr/lib/python2.7/idlelib/Icons/openfolder.gif #usr/lib/python2.7/idlelib/Icons/plusnode.gif @@ -1701,6 +1730,77 @@ usr/lib/python2.7/httplib.pyc #usr/lib/python2.7/idlelib/idle.pyc #usr/lib/python2.7/idlelib/idle.pyo #usr/lib/python2.7/idlelib/idle.pyw +#usr/lib/python2.7/idlelib/idle_test +#usr/lib/python2.7/idlelib/idle_test/README.txt +#usr/lib/python2.7/idlelib/idle_test/__init__.py +#usr/lib/python2.7/idlelib/idle_test/__init__.pyc +#usr/lib/python2.7/idlelib/idle_test/__init__.pyo +#usr/lib/python2.7/idlelib/idle_test/htest.py +#usr/lib/python2.7/idlelib/idle_test/htest.pyc +#usr/lib/python2.7/idlelib/idle_test/htest.pyo +#usr/lib/python2.7/idlelib/idle_test/mock_idle.py +#usr/lib/python2.7/idlelib/idle_test/mock_idle.pyc +#usr/lib/python2.7/idlelib/idle_test/mock_idle.pyo +#usr/lib/python2.7/idlelib/idle_test/mock_tk.py +#usr/lib/python2.7/idlelib/idle_test/mock_tk.pyc +#usr/lib/python2.7/idlelib/idle_test/mock_tk.pyo +#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.py +#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.pyc +#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.pyo +#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.py +#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.pyc +#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.pyo +#usr/lib/python2.7/idlelib/idle_test/test_calltips.py +#usr/lib/python2.7/idlelib/idle_test/test_calltips.pyc +#usr/lib/python2.7/idlelib/idle_test/test_calltips.pyo +#usr/lib/python2.7/idlelib/idle_test/test_config_name.py +#usr/lib/python2.7/idlelib/idle_test/test_config_name.pyc +#usr/lib/python2.7/idlelib/idle_test/test_config_name.pyo +#usr/lib/python2.7/idlelib/idle_test/test_configdialog.py +#usr/lib/python2.7/idlelib/idle_test/test_configdialog.pyc +#usr/lib/python2.7/idlelib/idle_test/test_configdialog.pyo +#usr/lib/python2.7/idlelib/idle_test/test_delegator.py +#usr/lib/python2.7/idlelib/idle_test/test_delegator.pyc +#usr/lib/python2.7/idlelib/idle_test/test_delegator.pyo +#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.py +#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyc +#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyo +#usr/lib/python2.7/idlelib/idle_test/test_grep.py +#usr/lib/python2.7/idlelib/idle_test/test_grep.pyc +#usr/lib/python2.7/idlelib/idle_test/test_grep.pyo +#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.py +#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyc +#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyo +#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.py +#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyc +#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyo +#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.py +#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyc +#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyo +#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.py +#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.pyc +#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.pyo +#usr/lib/python2.7/idlelib/idle_test/test_rstrip.py +#usr/lib/python2.7/idlelib/idle_test/test_rstrip.pyc +#usr/lib/python2.7/idlelib/idle_test/test_rstrip.pyo +#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.py +#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyc +#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyo +#usr/lib/python2.7/idlelib/idle_test/test_searchengine.py +#usr/lib/python2.7/idlelib/idle_test/test_searchengine.pyc +#usr/lib/python2.7/idlelib/idle_test/test_searchengine.pyo +#usr/lib/python2.7/idlelib/idle_test/test_text.py +#usr/lib/python2.7/idlelib/idle_test/test_text.pyc +#usr/lib/python2.7/idlelib/idle_test/test_text.pyo +#usr/lib/python2.7/idlelib/idle_test/test_textview.py +#usr/lib/python2.7/idlelib/idle_test/test_textview.pyc +#usr/lib/python2.7/idlelib/idle_test/test_textview.pyo +#usr/lib/python2.7/idlelib/idle_test/test_warning.py +#usr/lib/python2.7/idlelib/idle_test/test_warning.pyc +#usr/lib/python2.7/idlelib/idle_test/test_warning.pyo +#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.py +#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.pyc +#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.pyo #usr/lib/python2.7/idlelib/idlever.py #usr/lib/python2.7/idlelib/idlever.pyc #usr/lib/python2.7/idlelib/idlever.pyo @@ -1809,6 +1909,9 @@ usr/lib/python2.7/json/scanner.pyc #usr/lib/python2.7/json/tests/test_speedups.py #usr/lib/python2.7/json/tests/test_speedups.pyc #usr/lib/python2.7/json/tests/test_speedups.pyo +#usr/lib/python2.7/json/tests/test_tool.py +#usr/lib/python2.7/json/tests/test_tool.pyc +#usr/lib/python2.7/json/tests/test_tool.pyo #usr/lib/python2.7/json/tests/test_unicode.py #usr/lib/python2.7/json/tests/test_unicode.pyc #usr/lib/python2.7/json/tests/test_unicode.pyo @@ -1819,7 +1922,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -usr/lib/python2.7/lib-dynload/Python-2.7.3-py2.7.egg-info +usr/lib/python2.7/lib-dynload/Python-2.7.9-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -1860,7 +1963,7 @@ usr/lib/python2.7/lib-dynload/cStringIO.so usr/lib/python2.7/lib-dynload/cmath.so usr/lib/python2.7/lib-dynload/crypt.so usr/lib/python2.7/lib-dynload/datetime.so -usr/lib/python2.7/lib-dynload/dbm.so +#usr/lib/python2.7/lib-dynload/dbm_failed.so usr/lib/python2.7/lib-dynload/dl.so usr/lib/python2.7/lib-dynload/fcntl.so usr/lib/python2.7/lib-dynload/future_builtins.so @@ -1926,12 +2029,27 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.py #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.pyo +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.py +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.pyc +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.pyo +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.py +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyc +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyo +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.py +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.pyc +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.pyo #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyo #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyo +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.py +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.pyc +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.pyo +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.py +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.pyc +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.pyo #usr/lib/python2.7/lib-tk/test/test_ttk #usr/lib/python2.7/lib-tk/test/test_ttk/__init__.py #usr/lib/python2.7/lib-tk/test/test_ttk/__init__.pyc @@ -1951,6 +2069,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.py #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.pyc #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.pyo +#usr/lib/python2.7/lib-tk/test/widget_tests.py +#usr/lib/python2.7/lib-tk/test/widget_tests.pyc +#usr/lib/python2.7/lib-tk/test/widget_tests.pyo #usr/lib/python2.7/lib-tk/tkColorChooser.py #usr/lib/python2.7/lib-tk/tkColorChooser.pyc #usr/lib/python2.7/lib-tk/tkColorChooser.pyo @@ -1977,9 +2098,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.3.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.9.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.3.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.9.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo @@ -2005,6 +2126,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib2to3/fixes/fix_apply.py #usr/lib/python2.7/lib2to3/fixes/fix_apply.pyc #usr/lib/python2.7/lib2to3/fixes/fix_apply.pyo +#usr/lib/python2.7/lib2to3/fixes/fix_asserts.py +#usr/lib/python2.7/lib2to3/fixes/fix_asserts.pyc +#usr/lib/python2.7/lib2to3/fixes/fix_asserts.pyo #usr/lib/python2.7/lib2to3/fixes/fix_basestring.py #usr/lib/python2.7/lib2to3/fixes/fix_basestring.pyc #usr/lib/python2.7/lib2to3/fixes/fix_basestring.pyo @@ -2207,6 +2331,7 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib2to3/tests/data/bom.py #usr/lib/python2.7/lib2to3/tests/data/crlf.py #usr/lib/python2.7/lib2to3/tests/data/different_encoding.py +#usr/lib/python2.7/lib2to3/tests/data/false_encoding.py #usr/lib/python2.7/lib2to3/tests/data/fixers #usr/lib/python2.7/lib2to3/tests/data/fixers/bad_order.py #usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes @@ -2628,12 +2753,33 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/__init__.py #usr/lib/python2.7/test/__init__.pyc #usr/lib/python2.7/test/__init__.pyo +#usr/lib/python2.7/test/_mock_backport.py +#usr/lib/python2.7/test/_mock_backport.pyc +#usr/lib/python2.7/test/_mock_backport.pyo +#usr/lib/python2.7/test/audiodata +#usr/lib/python2.7/test/audiodata/pluck-pcm16.aiff +#usr/lib/python2.7/test/audiodata/pluck-pcm16.au +#usr/lib/python2.7/test/audiodata/pluck-pcm16.wav +#usr/lib/python2.7/test/audiodata/pluck-pcm24.aiff +#usr/lib/python2.7/test/audiodata/pluck-pcm24.wav +#usr/lib/python2.7/test/audiodata/pluck-pcm32.aiff +#usr/lib/python2.7/test/audiodata/pluck-pcm32.au +#usr/lib/python2.7/test/audiodata/pluck-pcm32.wav +#usr/lib/python2.7/test/audiodata/pluck-pcm8.aiff +#usr/lib/python2.7/test/audiodata/pluck-pcm8.au +#usr/lib/python2.7/test/audiodata/pluck-pcm8.wav +#usr/lib/python2.7/test/audiodata/pluck-ulaw.aifc +#usr/lib/python2.7/test/audiodata/pluck-ulaw.au #usr/lib/python2.7/test/audiotest.au +#usr/lib/python2.7/test/audiotests.py +#usr/lib/python2.7/test/audiotests.pyc +#usr/lib/python2.7/test/audiotests.pyo #usr/lib/python2.7/test/autotest.py #usr/lib/python2.7/test/autotest.pyc #usr/lib/python2.7/test/autotest.pyo #usr/lib/python2.7/test/bad_coding.py #usr/lib/python2.7/test/bad_coding2.py +#usr/lib/python2.7/test/bad_coding3.py #usr/lib/python2.7/test/badcert.pem #usr/lib/python2.7/test/badkey.pem #usr/lib/python2.7/test/badsyntax_future3.py @@ -2647,6 +2793,11 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/buffer_tests.py #usr/lib/python2.7/test/buffer_tests.pyc #usr/lib/python2.7/test/buffer_tests.pyo +#usr/lib/python2.7/test/capath +#usr/lib/python2.7/test/capath/4e1295a3.0 +#usr/lib/python2.7/test/capath/5ed36f99.0 +#usr/lib/python2.7/test/capath/6e88d7b8.0 +#usr/lib/python2.7/test/capath/99d0fa06.0 #usr/lib/python2.7/test/cfgparser.1 #usr/lib/python2.7/test/check_soundcard.vbs #usr/lib/python2.7/test/cjkencodings @@ -2830,6 +2981,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/decimaltestdata/tointegral.decTest #usr/lib/python2.7/test/decimaltestdata/tointegralx.decTest #usr/lib/python2.7/test/decimaltestdata/xor.decTest +#usr/lib/python2.7/test/dh512.pem #usr/lib/python2.7/test/doctest_aliases.py #usr/lib/python2.7/test/doctest_aliases.pyc #usr/lib/python2.7/test/doctest_aliases.pyo @@ -2849,6 +3001,18 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/greyrgb.uue #usr/lib/python2.7/test/https_svn_python_org_root.pem #usr/lib/python2.7/test/ieee754.txt +#usr/lib/python2.7/test/imghdrdata +#usr/lib/python2.7/test/imghdrdata/python.bmp +#usr/lib/python2.7/test/imghdrdata/python.gif +#usr/lib/python2.7/test/imghdrdata/python.jpg +#usr/lib/python2.7/test/imghdrdata/python.pbm +#usr/lib/python2.7/test/imghdrdata/python.pgm +#usr/lib/python2.7/test/imghdrdata/python.png +#usr/lib/python2.7/test/imghdrdata/python.ppm +#usr/lib/python2.7/test/imghdrdata/python.ras +#usr/lib/python2.7/test/imghdrdata/python.sgi +#usr/lib/python2.7/test/imghdrdata/python.tiff +#usr/lib/python2.7/test/imghdrdata/python.xbm #usr/lib/python2.7/test/infinite_reload.py #usr/lib/python2.7/test/infinite_reload.pyc #usr/lib/python2.7/test/infinite_reload.pyo @@ -2858,18 +3022,29 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/inspect_fodder2.py #usr/lib/python2.7/test/inspect_fodder2.pyc #usr/lib/python2.7/test/inspect_fodder2.pyo +#usr/lib/python2.7/test/keycert.passwd.pem #usr/lib/python2.7/test/keycert.pem +#usr/lib/python2.7/test/keycert2.pem +#usr/lib/python2.7/test/keycert3.pem +#usr/lib/python2.7/test/keycert4.pem #usr/lib/python2.7/test/list_tests.py #usr/lib/python2.7/test/list_tests.pyc #usr/lib/python2.7/test/list_tests.pyo #usr/lib/python2.7/test/lock_tests.py #usr/lib/python2.7/test/lock_tests.pyc #usr/lib/python2.7/test/lock_tests.pyo +#usr/lib/python2.7/test/make_ssl_certs.py +#usr/lib/python2.7/test/make_ssl_certs.pyc +#usr/lib/python2.7/test/make_ssl_certs.pyo #usr/lib/python2.7/test/mapping_tests.py #usr/lib/python2.7/test/mapping_tests.pyc #usr/lib/python2.7/test/mapping_tests.pyo #usr/lib/python2.7/test/math_testcases.txt +#usr/lib/python2.7/test/mp_fork_bomb.py +#usr/lib/python2.7/test/mp_fork_bomb.pyc +#usr/lib/python2.7/test/mp_fork_bomb.pyo #usr/lib/python2.7/test/nokia.pem +#usr/lib/python2.7/test/nullbytecert.pem #usr/lib/python2.7/test/nullcert.pem #usr/lib/python2.7/test/outstanding_bugs.py #usr/lib/python2.7/test/outstanding_bugs.pyc @@ -2880,6 +3055,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/profilee.py #usr/lib/python2.7/test/profilee.pyc #usr/lib/python2.7/test/profilee.pyo +#usr/lib/python2.7/test/pycacert.pem #usr/lib/python2.7/test/pyclbr_input.py #usr/lib/python2.7/test/pyclbr_input.pyc #usr/lib/python2.7/test/pyclbr_input.pyo @@ -2907,12 +3083,20 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/reperf.py #usr/lib/python2.7/test/reperf.pyc #usr/lib/python2.7/test/reperf.pyo +#usr/lib/python2.7/test/revocation.crl #usr/lib/python2.7/test/sample_doctest.py #usr/lib/python2.7/test/sample_doctest.pyc #usr/lib/python2.7/test/sample_doctest.pyo +#usr/lib/python2.7/test/sample_doctest_no_docstrings.py +#usr/lib/python2.7/test/sample_doctest_no_docstrings.pyc +#usr/lib/python2.7/test/sample_doctest_no_docstrings.pyo +#usr/lib/python2.7/test/sample_doctest_no_doctests.py +#usr/lib/python2.7/test/sample_doctest_no_doctests.pyc +#usr/lib/python2.7/test/sample_doctest_no_doctests.pyo #usr/lib/python2.7/test/script_helper.py #usr/lib/python2.7/test/script_helper.pyc #usr/lib/python2.7/test/script_helper.pyo +#usr/lib/python2.7/test/selfsigned_pythontestdotnet.pem #usr/lib/python2.7/test/seq_tests.py #usr/lib/python2.7/test/seq_tests.pyc #usr/lib/python2.7/test/seq_tests.pyo @@ -2922,7 +3106,11 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/sortperf.pyc #usr/lib/python2.7/test/sortperf.pyo #usr/lib/python2.7/test/ssl_cert.pem +#usr/lib/python2.7/test/ssl_key.passwd.pem #usr/lib/python2.7/test/ssl_key.pem +#usr/lib/python2.7/test/ssl_servers.py +#usr/lib/python2.7/test/ssl_servers.pyc +#usr/lib/python2.7/test/ssl_servers.pyo #usr/lib/python2.7/test/string_tests.py #usr/lib/python2.7/test/string_tests.pyc #usr/lib/python2.7/test/string_tests.pyo @@ -2930,6 +3118,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo +#usr/lib/python2.7/test/symlink_support.py +#usr/lib/python2.7/test/symlink_support.pyc +#usr/lib/python2.7/test/symlink_support.pyo #usr/lib/python2.7/test/test_MimeWriter.py #usr/lib/python2.7/test/test_MimeWriter.pyc #usr/lib/python2.7/test/test_MimeWriter.pyo @@ -2948,6 +3139,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test__locale.py #usr/lib/python2.7/test/test__locale.pyc #usr/lib/python2.7/test/test__locale.pyo +#usr/lib/python2.7/test/test__osx_support.py +#usr/lib/python2.7/test/test__osx_support.pyc +#usr/lib/python2.7/test/test__osx_support.pyo #usr/lib/python2.7/test/test_abc.py #usr/lib/python2.7/test/test_abc.pyc #usr/lib/python2.7/test/test_abc.pyo @@ -3280,6 +3474,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_email_renamed.py #usr/lib/python2.7/test/test_email_renamed.pyc #usr/lib/python2.7/test/test_email_renamed.pyo +#usr/lib/python2.7/test/test_ensurepip.py +#usr/lib/python2.7/test/test_ensurepip.pyc +#usr/lib/python2.7/test/test_ensurepip.pyo #usr/lib/python2.7/test/test_enumerate.py #usr/lib/python2.7/test/test_enumerate.pyc #usr/lib/python2.7/test/test_enumerate.pyo @@ -3310,6 +3507,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_file2k.py #usr/lib/python2.7/test/test_file2k.pyc #usr/lib/python2.7/test/test_file2k.pyo +#usr/lib/python2.7/test/test_file_eintr.py +#usr/lib/python2.7/test/test_file_eintr.pyc +#usr/lib/python2.7/test/test_file_eintr.pyo #usr/lib/python2.7/test/test_filecmp.py #usr/lib/python2.7/test/test_filecmp.pyc #usr/lib/python2.7/test/test_filecmp.pyo @@ -3445,6 +3645,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_httpservers.py #usr/lib/python2.7/test/test_httpservers.pyc #usr/lib/python2.7/test/test_httpservers.pyo +#usr/lib/python2.7/test/test_idle.py +#usr/lib/python2.7/test/test_idle.pyc +#usr/lib/python2.7/test/test_idle.pyo #usr/lib/python2.7/test/test_imageop.py #usr/lib/python2.7/test/test_imageop.pyc #usr/lib/python2.7/test/test_imageop.pyo @@ -3454,6 +3657,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_imgfile.py #usr/lib/python2.7/test/test_imgfile.pyc #usr/lib/python2.7/test/test_imgfile.pyo +#usr/lib/python2.7/test/test_imghdr.py +#usr/lib/python2.7/test/test_imghdr.pyc +#usr/lib/python2.7/test/test_imghdr.pyo #usr/lib/python2.7/test/test_imp.py #usr/lib/python2.7/test/test_imp.pyc #usr/lib/python2.7/test/test_imp.pyo @@ -3541,6 +3747,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_macpath.py #usr/lib/python2.7/test/test_macpath.pyc #usr/lib/python2.7/test/test_macpath.pyo +#usr/lib/python2.7/test/test_macurl2path.py +#usr/lib/python2.7/test/test_macurl2path.pyc +#usr/lib/python2.7/test/test_macurl2path.pyo #usr/lib/python2.7/test/test_mailbox.py #usr/lib/python2.7/test/test_mailbox.pyc #usr/lib/python2.7/test/test_mailbox.pyo @@ -3610,6 +3819,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_nis.py #usr/lib/python2.7/test/test_nis.pyc #usr/lib/python2.7/test/test_nis.pyo +#usr/lib/python2.7/test/test_nntplib.py +#usr/lib/python2.7/test/test_nntplib.pyc +#usr/lib/python2.7/test/test_nntplib.pyo #usr/lib/python2.7/test/test_normalization.py #usr/lib/python2.7/test/test_normalization.pyc #usr/lib/python2.7/test/test_normalization.pyo @@ -3841,6 +4053,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_sort.py #usr/lib/python2.7/test/test_sort.pyc #usr/lib/python2.7/test/test_sort.pyo +#usr/lib/python2.7/test/test_spwd.py +#usr/lib/python2.7/test/test_spwd.pyc +#usr/lib/python2.7/test/test_spwd.pyo #usr/lib/python2.7/test/test_sqlite.py #usr/lib/python2.7/test/test_sqlite.pyc #usr/lib/python2.7/test/test_sqlite.pyo @@ -3850,6 +4065,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_startfile.py #usr/lib/python2.7/test/test_startfile.pyc #usr/lib/python2.7/test/test_startfile.pyo +#usr/lib/python2.7/test/test_stat.py +#usr/lib/python2.7/test/test_stat.pyc +#usr/lib/python2.7/test/test_stat.pyo #usr/lib/python2.7/test/test_str.py #usr/lib/python2.7/test/test_str.pyc #usr/lib/python2.7/test/test_str.pyo @@ -3883,6 +4101,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_subprocess.py #usr/lib/python2.7/test/test_subprocess.pyc #usr/lib/python2.7/test/test_subprocess.pyo +#usr/lib/python2.7/test/test_sunau.py +#usr/lib/python2.7/test/test_sunau.pyc +#usr/lib/python2.7/test/test_sunau.pyo #usr/lib/python2.7/test/test_sunaudiodev.py #usr/lib/python2.7/test/test_sunaudiodev.pyc #usr/lib/python2.7/test/test_sunaudiodev.pyo @@ -3955,6 +4176,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_tokenize.py #usr/lib/python2.7/test/test_tokenize.pyc #usr/lib/python2.7/test/test_tokenize.pyo +#usr/lib/python2.7/test/test_tools.py +#usr/lib/python2.7/test/test_tools.pyc +#usr/lib/python2.7/test/test_tools.pyo #usr/lib/python2.7/test/test_trace.py #usr/lib/python2.7/test/test_trace.pyc #usr/lib/python2.7/test/test_trace.pyo @@ -4400,4 +4624,6 @@ usr/lib/python2.7/xmlrpclib.pyc #usr/lib/python2.7/zipfile.py usr/lib/python2.7/zipfile.pyc #usr/lib/python2.7/zipfile.pyo +#usr/share/man/man1/python.1 +#usr/share/man/man1/python2.1 #usr/share/man/man1/python2.7.1 diff --git a/config/rootfiles/common/rrdtool b/config/rootfiles/common/rrdtool index c957d52..738fe37 100644 --- a/config/rootfiles/common/rrdtool +++ b/config/rootfiles/common/rrdtool @@ -1,5 +1,7 @@ #srv/web/ipfire/html/graphs usr/bin/rrdcached +#usr/bin/rrdcreate +#usr/bin/rrdinfo usr/bin/rrdtool usr/bin/rrdupdate #usr/include/rrd.h @@ -9,12 +11,12 @@ usr/bin/rrdupdate #usr/lib/librrd.la #usr/lib/librrd.so usr/lib/librrd.so.4 -usr/lib/librrd.so.4.2.0 +usr/lib/librrd.so.4.3.0 #usr/lib/librrd_th.a #usr/lib/librrd_th.la #usr/lib/librrd_th.so usr/lib/librrd_th.so.4 -usr/lib/librrd_th.so.4.2.0 +usr/lib/librrd_th.so.4.3.0 usr/lib/perl5/site_perl/5.12.3/RRDp.pm usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/RRDs.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDp @@ -24,98 +26,98 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/RRDs.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.bs usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so #usr/lib/pkgconfig/librrd.pc -#usr/share/doc/rrdtool-1.4.7 -#usr/share/doc/rrdtool-1.4.7/html -#usr/share/doc/rrdtool-1.4.7/html/RRDp.html -#usr/share/doc/rrdtool-1.4.7/html/RRDs.html -#usr/share/doc/rrdtool-1.4.7/html/bin_dec_hex.html -#usr/share/doc/rrdtool-1.4.7/html/cdeftutorial.html -#usr/share/doc/rrdtool-1.4.7/html/index.html -#usr/share/doc/rrdtool-1.4.7/html/librrd.html -#usr/share/doc/rrdtool-1.4.7/html/rpntutorial.html -#usr/share/doc/rrdtool-1.4.7/html/rrd-beginners.html -#usr/share/doc/rrdtool-1.4.7/html/rrdbuild.html -#usr/share/doc/rrdtool-1.4.7/html/rrdcached.html -#usr/share/doc/rrdtool-1.4.7/html/rrdcgi.html -#usr/share/doc/rrdtool-1.4.7/html/rrdcreate.html -#usr/share/doc/rrdtool-1.4.7/html/rrddump.html -#usr/share/doc/rrdtool-1.4.7/html/rrdfetch.html -#usr/share/doc/rrdtool-1.4.7/html/rrdfirst.html -#usr/share/doc/rrdtool-1.4.7/html/rrdflushcached.html -#usr/share/doc/rrdtool-1.4.7/html/rrdgraph.html -#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_data.html -#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_examples.html -#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_graph.html -#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_rpn.html -#usr/share/doc/rrdtool-1.4.7/html/rrdinfo.html -#usr/share/doc/rrdtool-1.4.7/html/rrdlast.html -#usr/share/doc/rrdtool-1.4.7/html/rrdlastupdate.html -#usr/share/doc/rrdtool-1.4.7/html/rrdresize.html -#usr/share/doc/rrdtool-1.4.7/html/rrdrestore.html -#usr/share/doc/rrdtool-1.4.7/html/rrdthreads.html -#usr/share/doc/rrdtool-1.4.7/html/rrdtool.html -#usr/share/doc/rrdtool-1.4.7/html/rrdtune.html -#usr/share/doc/rrdtool-1.4.7/html/rrdtutorial.html -#usr/share/doc/rrdtool-1.4.7/html/rrdupdate.html -#usr/share/doc/rrdtool-1.4.7/html/rrdxport.html -#usr/share/doc/rrdtool-1.4.7/txt -#usr/share/doc/rrdtool-1.4.7/txt/bin_dec_hex.pod -#usr/share/doc/rrdtool-1.4.7/txt/bin_dec_hex.txt -#usr/share/doc/rrdtool-1.4.7/txt/cdeftutorial.pod -#usr/share/doc/rrdtool-1.4.7/txt/cdeftutorial.txt -#usr/share/doc/rrdtool-1.4.7/txt/librrd.txt -#usr/share/doc/rrdtool-1.4.7/txt/rpntutorial.pod -#usr/share/doc/rrdtool-1.4.7/txt/rpntutorial.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrd-beginners.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrd-beginners.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdbuild.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdbuild.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdcached.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdcached.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdcgi.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdcgi.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdcreate.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdcreate.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrddump.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrddump.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdfetch.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdfetch.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdfirst.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdfirst.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdflushcached.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdflushcached.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_data.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_data.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_examples.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_examples.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_graph.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_graph.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_rpn.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_rpn.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdinfo.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdinfo.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdlast.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdlast.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdlastupdate.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdlastupdate.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdresize.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdresize.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdrestore.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdrestore.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdthreads.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdthreads.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdtool.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdtool.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdtune.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdtune.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdtutorial.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdtutorial.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdupdate.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdupdate.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdxport.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdxport.txt +#usr/share/doc/rrdtool-1.5.3 +#usr/share/doc/rrdtool-1.5.3/html +#usr/share/doc/rrdtool-1.5.3/html/RRDp.html +#usr/share/doc/rrdtool-1.5.3/html/RRDs.html +#usr/share/doc/rrdtool-1.5.3/html/bin_dec_hex.html +#usr/share/doc/rrdtool-1.5.3/html/cdeftutorial.html +#usr/share/doc/rrdtool-1.5.3/html/index.html +#usr/share/doc/rrdtool-1.5.3/html/librrd.html +#usr/share/doc/rrdtool-1.5.3/html/rpntutorial.html +#usr/share/doc/rrdtool-1.5.3/html/rrd-beginners.html +#usr/share/doc/rrdtool-1.5.3/html/rrdbuild.html +#usr/share/doc/rrdtool-1.5.3/html/rrdcached.html +#usr/share/doc/rrdtool-1.5.3/html/rrdcgi.html +#usr/share/doc/rrdtool-1.5.3/html/rrdcreate.html +#usr/share/doc/rrdtool-1.5.3/html/rrddump.html +#usr/share/doc/rrdtool-1.5.3/html/rrdfetch.html +#usr/share/doc/rrdtool-1.5.3/html/rrdfirst.html +#usr/share/doc/rrdtool-1.5.3/html/rrdflushcached.html +#usr/share/doc/rrdtool-1.5.3/html/rrdgraph.html +#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_data.html +#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_examples.html +#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_graph.html +#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_rpn.html +#usr/share/doc/rrdtool-1.5.3/html/rrdinfo.html +#usr/share/doc/rrdtool-1.5.3/html/rrdlast.html +#usr/share/doc/rrdtool-1.5.3/html/rrdlastupdate.html +#usr/share/doc/rrdtool-1.5.3/html/rrdresize.html +#usr/share/doc/rrdtool-1.5.3/html/rrdrestore.html +#usr/share/doc/rrdtool-1.5.3/html/rrdthreads.html +#usr/share/doc/rrdtool-1.5.3/html/rrdtool.html +#usr/share/doc/rrdtool-1.5.3/html/rrdtune.html +#usr/share/doc/rrdtool-1.5.3/html/rrdtutorial.html +#usr/share/doc/rrdtool-1.5.3/html/rrdupdate.html +#usr/share/doc/rrdtool-1.5.3/html/rrdxport.html +#usr/share/doc/rrdtool-1.5.3/txt +#usr/share/doc/rrdtool-1.5.3/txt/bin_dec_hex.pod +#usr/share/doc/rrdtool-1.5.3/txt/bin_dec_hex.txt +#usr/share/doc/rrdtool-1.5.3/txt/cdeftutorial.pod +#usr/share/doc/rrdtool-1.5.3/txt/cdeftutorial.txt +#usr/share/doc/rrdtool-1.5.3/txt/librrd.txt +#usr/share/doc/rrdtool-1.5.3/txt/rpntutorial.pod +#usr/share/doc/rrdtool-1.5.3/txt/rpntutorial.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrd-beginners.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrd-beginners.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdbuild.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdbuild.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdcached.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdcached.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdcgi.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdcgi.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdcreate.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdcreate.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrddump.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrddump.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdfetch.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdfetch.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdfirst.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdfirst.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdflushcached.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdflushcached.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_data.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_data.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_examples.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_examples.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_graph.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_graph.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_rpn.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_rpn.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdinfo.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdinfo.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdlast.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdlast.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdlastupdate.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdlastupdate.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdresize.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdresize.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdrestore.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdrestore.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdthreads.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdthreads.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdtool.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdtool.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdtune.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdtune.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdtutorial.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdtutorial.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdupdate.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdupdate.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdxport.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdxport.txt #usr/share/man/man1/bin_dec_hex.1 #usr/share/man/man1/cdeftutorial.1 #usr/share/man/man1/rpntutorial.1 diff --git a/config/rootfiles/core/91/filelists/python b/config/rootfiles/core/91/filelists/python new file mode 120000 index 0000000..ffe6e2c --- /dev/null +++ b/config/rootfiles/core/91/filelists/python @@ -0,0 +1 @@ +../../../common/python \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/files b/config/rootfiles/core/92/filelists/files index fe764db..9c5a302 100644 --- a/config/rootfiles/core/92/filelists/files +++ b/config/rootfiles/core/92/filelists/files @@ -4,6 +4,7 @@ srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/webaccess.cgi +var/ipfire/graphs.pl var/ipfire/network-functions.pl var/ipfire/langs var/ipfire/urlfilter/bin/autoupdate.pl diff --git a/config/rootfiles/core/92/filelists/libgcrypt b/config/rootfiles/core/92/filelists/libgcrypt new file mode 120000 index 0000000..2df12a2 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libgcrypt @@ -0,0 +1 @@ +../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libgpg-error b/config/rootfiles/core/92/filelists/libgpg-error new file mode 120000 index 0000000..cad4313 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libgpg-error @@ -0,0 +1 @@ +../../../common/libgpg-error \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libpcap b/config/rootfiles/core/92/filelists/libpcap new file mode 120000 index 0000000..c7f9f52 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libpcap @@ -0,0 +1 @@ +../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libusb b/config/rootfiles/core/92/filelists/libusb new file mode 120000 index 0000000..edbe8c2 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libusb @@ -0,0 +1 @@ +../../../common/libusb \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libusb-compat b/config/rootfiles/core/92/filelists/libusb-compat new file mode 120000 index 0000000..35c3237 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libusb-compat @@ -0,0 +1 @@ +../../../common/libusb-compat \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/rrdtool b/config/rootfiles/core/92/filelists/rrdtool new file mode 120000 index 0000000..7a82e41 --- /dev/null +++ b/config/rootfiles/core/92/filelists/rrdtool @@ -0,0 +1 @@ +../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip index ff0eea8..15d9515 100644 --- a/config/rootfiles/packages/7zip +++ b/config/rootfiles/packages/7zip @@ -9,55 +9,65 @@ usr/local/lib/p7zip #usr/local/man/man1/7zr.1 #usr/local/share/doc/p7zip #usr/local/share/doc/p7zip/ChangeLog -#usr/local/share/doc/p7zip/DOCS -#usr/local/share/doc/p7zip/DOCS/7zC.txt -#usr/local/share/doc/p7zip/DOCS/7zFormat.txt -#usr/local/share/doc/p7zip/DOCS/License.txt -#usr/local/share/doc/p7zip/DOCS/MANUAL -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/add.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/bench.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/delete.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/extract.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/extract_full.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/index.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/list.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/style.css -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/test.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/update.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/exit_codes.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/index.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/style.css -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_exclude.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_include.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_no.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/charset.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/exclude.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/include.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/index.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/list_tech.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/method.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/output_dir.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/overwrite.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/password.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/recurse.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/sfx.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ssc.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stdin.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stdout.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stop_switch.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/style.css -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/type.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/update.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/volume.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/working_dir.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/yes.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/syntax.htm -#usr/local/share/doc/p7zip/DOCS/Methods.txt -#usr/local/share/doc/p7zip/DOCS/copying.txt -#usr/local/share/doc/p7zip/DOCS/history.txt -#usr/local/share/doc/p7zip/DOCS/lzma.txt -#usr/local/share/doc/p7zip/DOCS/readme.txt -#usr/local/share/doc/p7zip/DOCS/unRarLicense.txt +#usr/local/share/doc/p7zip/DOC +#usr/local/share/doc/p7zip/DOC/7zC.txt +#usr/local/share/doc/p7zip/DOC/7zFormat.txt +#usr/local/share/doc/p7zip/DOC/License.txt +#usr/local/share/doc/p7zip/DOC/MANUAL +#usr/local/share/doc/p7zip/DOC/MANUAL/commands +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/add.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/bench.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/delete.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/extract.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/extract_full.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/hash.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/index.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/list.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/rename.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/style.css +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/test.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/update.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/exit_codes.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/index.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/style.css +#usr/local/share/doc/p7zip/DOC/MANUAL/switches +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/ar_exclude.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/ar_include.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/ar_no.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/charset.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/exclude.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/include.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/index.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/large_pages.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/list_tech.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/method.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/output_dir.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/overwrite.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/password.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/recurse.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/sa.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/scrc.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/sdel.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/sfx.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/sni.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/sns.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/spf.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/ssc.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/stdin.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/stdout.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/stl.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/stop_switch.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/style.css +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/type.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/update.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/volume.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/working_dir.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/yes.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/syntax.htm +#usr/local/share/doc/p7zip/DOC/Methods.txt +#usr/local/share/doc/p7zip/DOC/copying.txt +#usr/local/share/doc/p7zip/DOC/lzma.txt +#usr/local/share/doc/p7zip/DOC/readme.txt +#usr/local/share/doc/p7zip/DOC/src-history.txt +#usr/local/share/doc/p7zip/DOC/unRarLicense.txt #usr/local/share/doc/p7zip/README diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index 5584c25..e168483 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -95,8 +95,8 @@ usr/libexec/git-core/git-index-pack usr/libexec/git-core/git-init usr/libexec/git-core/git-init-db usr/libexec/git-core/git-instaweb +usr/libexec/git-core/git-interpret-trailers usr/libexec/git-core/git-log -usr/libexec/git-core/git-lost-found usr/libexec/git-core/git-ls-files usr/libexec/git-core/git-ls-remote usr/libexec/git-core/git-ls-tree @@ -126,7 +126,6 @@ usr/libexec/git-core/git-pack-redundant usr/libexec/git-core/git-pack-refs usr/libexec/git-core/git-parse-remote usr/libexec/git-core/git-patch-id -usr/libexec/git-core/git-peek-remote usr/libexec/git-core/git-prune usr/libexec/git-core/git-prune-packed usr/libexec/git-core/git-pull @@ -150,7 +149,6 @@ usr/libexec/git-core/git-remote-https usr/libexec/git-core/git-remote-testsvn usr/libexec/git-core/git-repack usr/libexec/git-core/git-replace -usr/libexec/git-core/git-repo-config usr/libexec/git-core/git-request-pull usr/libexec/git-core/git-rerere usr/libexec/git-core/git-reset @@ -177,7 +175,6 @@ usr/libexec/git-core/git-submodule usr/libexec/git-core/git-svn usr/libexec/git-core/git-symbolic-ref usr/libexec/git-core/git-tag -usr/libexec/git-core/git-tar-tree usr/libexec/git-core/git-unpack-file usr/libexec/git-core/git-unpack-objects usr/libexec/git-core/git-update-index @@ -186,6 +183,7 @@ usr/libexec/git-core/git-update-server-info usr/libexec/git-core/git-upload-archive usr/libexec/git-core/git-upload-pack usr/libexec/git-core/git-var +usr/libexec/git-core/git-verify-commit usr/libexec/git-core/git-verify-pack usr/libexec/git-core/git-verify-tag usr/libexec/git-core/git-web--browse @@ -193,6 +191,7 @@ usr/libexec/git-core/git-whatchanged usr/libexec/git-core/git-write-tree usr/libexec/git-core/mergetools usr/libexec/git-core/mergetools/araxis +usr/libexec/git-core/mergetools/bc usr/libexec/git-core/mergetools/bc3 usr/libexec/git-core/mergetools/codecompare usr/libexec/git-core/mergetools/deltawalker @@ -202,6 +201,7 @@ usr/libexec/git-core/mergetools/ecmerge usr/libexec/git-core/mergetools/emerge usr/libexec/git-core/mergetools/gvimdiff usr/libexec/git-core/mergetools/gvimdiff2 +usr/libexec/git-core/mergetools/gvimdiff3 usr/libexec/git-core/mergetools/kdiff3 usr/libexec/git-core/mergetools/kompare usr/libexec/git-core/mergetools/meld @@ -211,6 +211,7 @@ usr/libexec/git-core/mergetools/tkdiff usr/libexec/git-core/mergetools/tortoisemerge usr/libexec/git-core/mergetools/vimdiff usr/libexec/git-core/mergetools/vimdiff2 +usr/libexec/git-core/mergetools/vimdiff3 usr/libexec/git-core/mergetools/xxdiff usr/share/git-core usr/share/git-core/templates @@ -257,6 +258,7 @@ usr/share/git-core/templates/info/exclude #usr/share/git-gui/lib/merge.tcl #usr/share/git-gui/lib/mergetool.tcl #usr/share/git-gui/lib/msgs +#usr/share/git-gui/lib/msgs/bg.msg #usr/share/git-gui/lib/msgs/de.msg #usr/share/git-gui/lib/msgs/el.msg #usr/share/git-gui/lib/msgs/fr.msg @@ -267,6 +269,7 @@ usr/share/git-core/templates/info/exclude #usr/share/git-gui/lib/msgs/pt_br.msg #usr/share/git-gui/lib/msgs/ru.msg #usr/share/git-gui/lib/msgs/sv.msg +#usr/share/git-gui/lib/msgs/vi.msg #usr/share/git-gui/lib/msgs/zh_cn.msg #usr/share/git-gui/lib/option.tcl #usr/share/git-gui/lib/remote.tcl @@ -287,6 +290,8 @@ usr/share/git-core/templates/info/exclude #usr/share/gitk #usr/share/gitk/lib #usr/share/gitk/lib/msgs +#usr/share/gitk/lib/msgs/bg.msg +#usr/share/gitk/lib/msgs/ca.msg #usr/share/gitk/lib/msgs/de.msg #usr/share/gitk/lib/msgs/es.msg #usr/share/gitk/lib/msgs/fr.msg @@ -296,6 +301,7 @@ usr/share/git-core/templates/info/exclude #usr/share/gitk/lib/msgs/pt_br.msg #usr/share/gitk/lib/msgs/ru.msg #usr/share/gitk/lib/msgs/sv.msg +#usr/share/gitk/lib/msgs/vi.msg #usr/share/gitweb #usr/share/gitweb/gitweb.cgi #usr/share/gitweb/static @@ -303,15 +309,14 @@ usr/share/git-core/templates/info/exclude #usr/share/gitweb/static/git-logo.png #usr/share/gitweb/static/gitweb.css #usr/share/gitweb/static/gitweb.js -#usr/share/locale/da/LC_MESSAGES/git.mo +#usr/share/locale/bg/LC_MESSAGES/git.mo +#usr/share/locale/ca/LC_MESSAGES/git.mo #usr/share/locale/de/LC_MESSAGES/git.mo #usr/share/locale/fr/LC_MESSAGES/git.mo #usr/share/locale/is/LC_MESSAGES/git.mo #usr/share/locale/it/LC_MESSAGES/git.mo -#usr/share/locale/nl/LC_MESSAGES/git.mo -#usr/share/locale/pt_PT -#usr/share/locale/pt_PT/LC_MESSAGES #usr/share/locale/pt_PT/LC_MESSAGES/git.mo +#usr/share/locale/ru/LC_MESSAGES/git.mo #usr/share/locale/sv/LC_MESSAGES/git.mo #usr/share/locale/vi/LC_MESSAGES/git.mo #usr/share/locale/zh_CN/LC_MESSAGES/git.mo diff --git a/config/rootfiles/packages/libassuan b/config/rootfiles/packages/libassuan index 79b74ca..9c7aadb 100644 --- a/config/rootfiles/packages/libassuan +++ b/config/rootfiles/packages/libassuan @@ -3,6 +3,6 @@ usr/bin/libassuan-config #usr/lib/libassuan.la usr/lib/libassuan.so usr/lib/libassuan.so.0 -usr/lib/libassuan.so.0.4.3 +usr/lib/libassuan.so.0.5.0 #usr/share/aclocal/libassuan.m4 #usr/share/info/assuan.info diff --git a/config/rootfiles/packages/nano b/config/rootfiles/packages/nano index 815c3fa..67cf060 100644 --- a/config/rootfiles/packages/nano +++ b/config/rootfiles/packages/nano @@ -3,6 +3,11 @@ etc/nano/nanorc.sample usr/bin/nano usr/bin/pico usr/bin/rnano +#usr/share/doc/nano +#usr/share/doc/nano/faq.html +#usr/share/doc/nano/nano.1.html +#usr/share/doc/nano/nanorc.5.html +#usr/share/doc/nano/rnano.1.html #usr/share/info/nano.info #usr/share/man/man1/nano.1 #usr/share/man/man1/rnano.1 @@ -11,19 +16,21 @@ usr/bin/rnano usr/share/nano/asm.nanorc usr/share/nano/awk.nanorc usr/share/nano/c.nanorc +#usr/share/nano/changelog.nanorc usr/share/nano/cmake.nanorc usr/share/nano/css.nanorc usr/share/nano/debian.nanorc +usr/share/nano/default.nanorc usr/share/nano/fortran.nanorc usr/share/nano/gentoo.nanorc +#usr/share/nano/go.nanorc usr/share/nano/groff.nanorc usr/share/nano/html.nanorc usr/share/nano/java.nanorc +#usr/share/nano/javascript.nanorc +#usr/share/nano/json.nanorc +#usr/share/nano/lua.nanorc usr/share/nano/makefile.nanorc -#usr/share/nano/man-html -#usr/share/nano/man-html/nano.1.html -#usr/share/nano/man-html/nanorc.5.html -#usr/share/nano/man-html/rnano.1.html usr/share/nano/man.nanorc usr/share/nano/mgp.nanorc usr/share/nano/mutt.nanorc @@ -33,10 +40,13 @@ usr/share/nano/ocaml.nanorc usr/share/nano/patch.nanorc usr/share/nano/perl.nanorc usr/share/nano/php.nanorc +usr/share/nano/po.nanorc usr/share/nano/pov.nanorc usr/share/nano/python.nanorc usr/share/nano/ruby.nanorc usr/share/nano/sh.nanorc +usr/share/nano/spec.nanorc usr/share/nano/tcl.nanorc usr/share/nano/tex.nanorc +usr/share/nano/texinfo.nanorc usr/share/nano/xml.nanorc diff --git a/config/rootfiles/packages/powertop b/config/rootfiles/packages/powertop index 1bf6f25..d14bcee 100644 --- a/config/rootfiles/packages/powertop +++ b/config/rootfiles/packages/powertop @@ -1,4 +1,4 @@ -usr/bin/powertop +usr/sbin/powertop #usr/share/locale/de/LC_MESSAGES/powertop.mo #usr/share/locale/es/LC_MESSAGES/powertop.mo #usr/share/locale/fi/LC_MESSAGES/powertop.mo diff --git a/lfs/7zip b/lfs/7zip index c007371..f8ac672 100644 --- a/lfs/7zip +++ b/lfs/7zip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,15 +24,15 @@ include Config -VER = 4.65 +VER = 9.38.1 THISAPP = p7zip_$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP)_src_all.tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = 7zip -PAK_VER = 3 +PAK_VER = 4 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f78ed232436dc8f8be25a2f95d4e5f9a +$(DL_FILE)_MD5 = 6cba8402ccab2370d3b70c5e28b3d651 install : $(TARGET) diff --git a/lfs/dnsmasq b/lfs/dnsmasq index a5d86e9..e4410cc 100644 --- a/lfs/dnsmasq +++ b/lfs/dnsmasq @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.72 +VER = 2.73 THISAPP = dnsmasq-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0256e0a71e27c8d8a5c89a0d18f3cfe2 +$(DL_FILE)_MD5 = b8bfe96d22945c8cf4466826ba9b21bd install : $(TARGET) @@ -73,119 +73,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0001-Add-newline-at-the-end-of-example-config-file.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0002-crash-at-startup-when-an-empty-suffix-is-supplied-to.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0003-Debian-build-fixes-for-kFreeBSD.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0006-Fit-example-conf-file-typo.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0007-Improve-RFC-compliance-when-unable-to-supply-address.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0008-Fix-conntrack-with-bind-interfaces.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0009-Use-inotify-instead-of-polling-on-Linux.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0010-Teach-the-new-inotify-code-about-symlinks.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0011-Remove-floor-on-EDNS0-packet-size-with-DNSSEC.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0012-CHANGELOG-re.-inotify.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0013-Fix-breakage-of-domain-domain-subnet-local.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0014-Remove-redundant-IN6_IS_ADDR_ULA-a-macro-defn.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0015-Eliminate-IPv6-privacy-addresses-from-interface-name.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0016-Tweak-field-width-in-cache-dump-to-avoid-truncating-.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0017-Fix-crash-in-DNSSEC-code-when-attempting-to-verify-l.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0018-Make-caching-work-for-CNAMEs-pointing-to-A-AAAA-reco.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0019-Fix-problems-validating-NSEC3-and-wildcards.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0020-Initialise-return-value.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0021-Add-ignore-address-option.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0022-Bad-packet-protection.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0023-Fix-build-failure-in-new-inotify-code-on-BSD.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0024-Implement-makefile-dependencies-on-COPTS-variable.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0025-Fix-race-condition-issue-in-makefile.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0026-DNSSEC-do-top-down-search-for-limit-of-secure-delega.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0027-Add-log-queries-extra-option-for-more-complete-loggi.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0028-Add-min-cache-ttl-option.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0029-Log-port-of-requestor-when-doing-extra-logging.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0030-Don-t-answer-from-cache-RRsets-from-wildcards-as-we-.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0031-Logs-for-DS-records-consistent.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0032-Cope-with-multiple-interfaces-with-the-same-LL-addre.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0033-Don-t-treat-SERVFAIL-as-a-recoverable-error.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0034-Add-dhcp-hostsdir-config-option.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0035-Update-German-translation.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0036-Don-t-reply-to-DHCPv6-SOLICIT-messages-when-not-conf.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0037-Allow-inotify-to-be-disabled-at-compile-time-on-Linu.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0038-Expand-inotify-code-to-dhcp-hostsdir-dhcp-optsdir-an.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0039-Update-copyrights-for-dawn-of-2015.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0040-inotify-documentation-updates.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0041-Fix-broken-ECDSA-DNSSEC-signatures.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0042-BSD-make-support.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0043-Fix-build-failure-on-openBSD.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0044-Manpage-typo-fix.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0045-Fixup-dhcp-configs-after-reading-extra-hostfiles-wit.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0046-Extra-logging-for-inotify-code.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0047-man-page-typo.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0048-Fix-get-version-script-which-returned-wrong-tag-in-s.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0049-Typos.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0050-Make-dynamic-hosts-files-work-when-no-hosts-set.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0051-Fix-trivial-memory-leaks-to-quieten-valgrind.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0052-Fix-uninitialized-value-used-in-get_client_mac.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0053-Log-parsing-utils-in-contrib-reverse-dns.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0054-Add-dnssec-timestamp-option-and-facility.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0055-Fix-last-commit-to-not-crash-if-uid-changing-not-con.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0058-Fix-boilerplate-code-for-re-running-system-calls-on-.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0059-Make-address-example.com-equivalent-to-server-exampl.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0060-dhcp-set-outbound-interface-via-cmsg-in-unicast-repl.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0061-Don-t-fail-DNSSEC-when-a-signed-CNAME-dangles-into-a.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0062-Return-SERVFAIL-when-validation-abandoned.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0063-Protect-against-broken-DNSSEC-upstreams.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0064-DNSSEC-fix-for-non-ascii-characters-in-labels.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0065-Allow-control-characters-in-names-in-the-cache-handl.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0066-Fix-crash-in-last-commit.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0067-Merge-message-translations.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0068-add-tftp-no-fail-to-ignore-missing-tftp-root.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0069-Whitespace-fixes.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0070-Return-INSECURE-rather-than-BOGUS-when-DS-proved-not.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0071-Fix-compiler-warning-when-not-including-DNSSEC.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0072-Fix-crash-caused-by-looking-up-servers.bind-when-man.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0073-Fix-crash-on-receipt-of-certain-malformed-DNS-reques.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0074-Fix-crash-in-auth-code-with-odd-configuration.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0075-Auth-correct-replies-to-NS-and-SOA-in-.arpa-zones.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0076-Fix-srk-induced-crash-in-new-tftp_no_fail-code.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0077-Note-CVE-2015-3294.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0078-Log-domain-when-reporting-DNSSEC-validation-failure.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0079-Check-IP-address-command-line-arg-in-dhcp_release.c.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0080-Revert-61b838dd574c51d96fef100285a0d225824534f9-and-.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0081-Handle-domain-names-with-.-or-000-within-labels.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0082-Tweaks-to-previous-DNS-label-charset-commit.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0083-Logs-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0084-Make-get-version-work-when-repo-is-a-git-submodule.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0085-Fix-argument-order-botch-which-broke-DNSSEC-for-TCP-.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0086-Don-t-remove-RRSIG-RR-from-answers-to-ANY-queries-wh.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0087-Constify-some-DHCP-lease-management-functions.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-p.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with-stop-rebind.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc.h.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0093-Tweak-last-commit.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0094-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0095-Fix-buffer-overflow-introduced-in-2.73rc6.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0096-Remove-support-for-DNS-Extended-Label-Types.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0097-Select-correct-DHCP-context-when-in-PXE-bootserver-m.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0098-Tweak-immediately-previous-patch.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0099-Man-page-typo.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0100-Add-infiniband-to-example-config-file.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0101-Correctly-sanitise-DNS-header-bits-in-answer-when-re.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0102-DHCPv6-DHCPCONFIRM-should-be-OK-for-any-address-on-l.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0103-Handle-corner-cases-in-NSEC-coverage-checks.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0104-Add-Dbus-methods-to-create-and-delete-DHCP-leases.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0105-Add-a-couple-of-missed-logging-strings-to-the-catalo.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0106-Fix-logging-of-unknown-interface-in-bridge-interface.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0107-Extend-bridge-interface-aliasing-to-DHCPv6.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0108-Allow-router-advertisements-to-have-the-off-link-bit.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0109-Upply-bridge-interface-aliasing-to-solicited-router-.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0110-Apply-bridge-interfaces-to-unsolicited-router-advert.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0111-Documenation-updates-for-bridge-interface-and-off-li.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0112-Merge-messages-and-fix-makefile-process-to-do-this.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0113-Handle-CNAMEs-to-DS-records-when-confirming-absence-.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch cd $(DIR_APP) && sed -i src/config.h \ -e 's|/\* #define HAVE_IDN \*/|#define HAVE_IDN|g' \ diff --git a/lfs/git b/lfs/git index 51936ab..bbec140 100644 --- a/lfs/git +++ b/lfs/git @@ -24,15 +24,15 @@ include Config -VER = 1.8.5.2 +VER = 2.4.4 THISAPP = git-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 11 +PAK_VER = 12 DEPS = "perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = df8519044f9880f3687d863d99245282 +$(DL_FILE)_MD5 = 847787cd0616d38b0e429ea85f558c31 install : $(TARGET) @@ -78,7 +78,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure \ - --prefix=/usr + --prefix=/usr \ + --with-libpcre \ + --with-curl \ + --with-expat cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/libassuan b/lfs/libassuan index 9670b7b..0137d14 100644 --- a/lfs/libassuan +++ b/lfs/libassuan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.1.3 +VER = 2.2.0 THISAPP = libassuan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libassuan -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b5373485419a7e2c23457d20811caabe +$(DL_FILE)_MD5 = a104faed3e97b9c302c5d67cc22b1d60 install : $(TARGET) diff --git a/lfs/libgcrypt b/lfs/libgcrypt index 76ee3d0..0596ebf 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.6.1 +VER = 1.6.3 THISAPP = libgcrypt-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a5a5060dc2f80bcac700ab0236ea47dc +$(DL_FILE)_MD5 = 4262c3aadf837500756c2051a5c4ae5e install : $(TARGET) diff --git a/lfs/libgpg-error b/lfs/libgpg-error index 7faf289..83c403d 100644 --- a/lfs/libgpg-error +++ b/lfs/libgpg-error @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.13 +VER = 1.18 THISAPP = libgpg-error-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fe0cfa7e15262ef8fdeee366109e9ff6 +$(DL_FILE)_MD5 = 12312802d2065774b787cbfc22cc04e9 install : $(TARGET) diff --git a/lfs/libpcap b/lfs/libpcap index fa2aae8..32b2f36 100644 --- a/lfs/libpcap +++ b/lfs/libpcap @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.6.2 +VER = 1.7.3 THISAPP = libpcap-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5f14191c1a684a75532c739c2c4059fa +$(DL_FILE)_MD5 = 9ce284eacc02cb5491e123b875f3f63c install : $(TARGET) diff --git a/lfs/libusb b/lfs/libusb index b35c90c..f557bd8 100644 --- a/lfs/libusb +++ b/lfs/libusb @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,10 +24,10 @@ include Config -VER = 0.1.12 +VER = 1.0.19 THISAPP = libusb-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = caf182cbc7565dac0fd72155919672e6 +$(DL_FILE)_MD5 = f9e2bb5879968467e5ca756cb4e1fa7e install : $(TARGET) @@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --disable-build-docs --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/libusb-compat b/lfs/libusb-compat new file mode 100644 index 0000000..6d63843 --- /dev/null +++ b/lfs/libusb-compat @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# # +# 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 = 0.1.5 + +THISAPP = libusb-compat-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 2780b6a758a1e2c2943bdbf7faf740e4 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# 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) && ./configure --prefix=/usr --disable-static + cd $(DIR_APP) && make -j $(PARALLELISM) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libusbx b/lfs/libusbx deleted file mode 100644 index 167b945..0000000 --- a/lfs/libusbx +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 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 = 1.0.11 - -THISAPP = libusbx-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 9aaab6aee72f65900cc731ecbffb4cf4 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# 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 axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr \ - --enable-examples-build - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/nano b/lfs/nano index b034677..4eec9c1 100644 --- a/lfs/nano +++ b/lfs/nano @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.2.6 +VER = 2.4.1 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 3 +PAK_VER = 5 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 03233ae480689a008eb98feb1b599807 +$(DL_FILE)_MD5 = 1c612b478f976abf8ef926480c7a3684 install : $(TARGET) diff --git a/lfs/powertop b/lfs/powertop index f10dca9..8520f94 100644 --- a/lfs/powertop +++ b/lfs/powertop @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.13 +VER = 2.7 THISAPP = powertop-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = powertop -PAK_VER = 0 +PAK_VER = 1 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 78aa17c8f55178004223bf236654298e +$(DL_FILE)_MD5 = e0d686e47daaf7e9d89031f7763432ef install : $(TARGET) @@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - + cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/python b/lfs/python index 6095e5e..22613e6 100644 --- a/lfs/python +++ b/lfs/python @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.7.3 +VER = 2.7.10 THISAPP = Python-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 62c4c1699170078c469f79ddfed21bc0 +$(DL_FILE)_MD5 = c685ef0b8e9f27b5e3db5db12b268ac6 install : $(TARGET) @@ -70,8 +70,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx} cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gdbm-1.patch - cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure --prefix=/usr --enable-shared + cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \ + --prefix=/usr --enable-shared --with-system-ffi cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/python-optional-src b/lfs/python-optional-src index 3b9f1c5..d09f4a4 100644 --- a/lfs/python-optional-src +++ b/lfs/python-optional-src @@ -24,7 +24,7 @@ include Config -VER = 2.7.3 +VER = 2.7.9 include python diff --git a/lfs/rrdtool b/lfs/rrdtool index 0237b89..d0a1181 100644 --- a/lfs/rrdtool +++ b/lfs/rrdtool @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.4.7 +VER = 1.5.3 THISAPP = rrdtool-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ffe369d8921b4dfdeaaf43812100c38f +$(DL_FILE)_MD5 = 868a828cc6b10654c440a85054240ae2 install : $(TARGET) diff --git a/lfs/tcpdump b/lfs/tcpdump index 6fe6f98..646250d 100644 --- a/lfs/tcpdump +++ b/lfs/tcpdump @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 4.6.2 +VER = 4.7.4 THISAPP = tcpdump-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tcpdump -PAK_VER = 4 +PAK_VER = 6 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 74d0d3728b3cdc60db872d842e7f1598 +$(DL_FILE)_MD5 = 58af728de36f499341918fc4b8e827c3 install : $(TARGET) diff --git a/make.sh b/make.sh index db16c55..d3c23c6 100755 --- a/make.sh +++ b/make.sh @@ -385,7 +385,7 @@ buildipfire() { ipfiremake backup ipfiremake pkg-config ipfiremake libusb - ipfiremake libusbx + ipfiremake libusb-compat ipfiremake libpcap ipfiremake ppp ipfiremake pptp @@ -476,6 +476,7 @@ buildipfire() { ipfiremake curl ipfiremake tcl ipfiremake sqlite + ipfiremake libffi ipfiremake python ipfiremake fireinfo ipfiremake libnet @@ -579,7 +580,6 @@ buildipfire() { ipfiremake python-mechanize ipfiremake python-feedparser ipfiremake python-rssdler - ipfiremake libffi ipfiremake glib ipfiremake GeoIP ipfiremake fwhits diff --git a/src/patches/Python-2.7.9-gdbm-1.patch b/src/patches/Python-2.7.9-gdbm-1.patch new file mode 100644 index 0000000..c72b452 --- /dev/null +++ b/src/patches/Python-2.7.9-gdbm-1.patch @@ -0,0 +1,21 @@ +diff -Naur Python-2.7-org/setup.py Python-2.7/setup.py +--- Python-2.7-org/setup.py 2010-06-27 14:36:16.000000000 +0200 ++++ Python-2.7/setup.py 2010-07-13 22:23:04.000000000 +0200 +@@ -1125,7 +1125,7 @@ + 'ndbm'): + ndbm_libs = ['ndbm'] + else: +- ndbm_libs = [] ++ ndbm_libs = ['gdbm', 'gdbm_compat' ] + print "building dbm using ndbm" + dbmext = Extension('dbm', ['dbmmodule.c'], + define_macros=[ +@@ -1140,7 +1140,7 @@ + if self.compiler.find_library_file(lib_dirs, + 'gdbm_compat'): + gdbm_libs.append('gdbm_compat') +- if find_file("gdbm/ndbm.h", inc_dirs, []) is not None: ++ if find_file("ndbm.h", inc_dirs, []) is not None: + print "building dbm using gdbm" + dbmext = Extension( + 'dbm', ['dbmmodule.c'], diff --git a/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-packets-is-broken.patch b/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-packets-is-broken.patch new file mode 100644 index 0000000..0b12cb8 --- /dev/null +++ b/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-packets-is-broken.patch @@ -0,0 +1,331 @@ +From a77cec8d58231d71cbc26615f0c0f0292c09ef54 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Fri, 8 May 2015 16:25:38 +0100 +Subject: [PATCH] Handle UDP packet loss when fragmentation of large packets + is broken. + +--- + CHANGELOG | 6 ++++++ + src/config.h | 1 + + src/dnsmasq.h | 5 +++-- + src/dnssec.c | 11 +++++++++-- + src/forward.c | 37 +++++++++++++++++++++++++++++-------- + src/network.c | 1 + + src/option.c | 18 +++++++++++------- + src/rfc1035.c | 22 ++++++---------------- + 8 files changed, 66 insertions(+), 35 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index af2b22c..d8fc57a 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -109,6 +109,12 @@ version 2.73 + by quiet-dhcp6. Thanks to J. Pablo Abonia for + spotting the problem. + ++ Try and handle net connections with broken fragmentation ++ that lose large UDP packets. If a server times out, ++ reduce the maximum UDP packet size field in the EDNS0 ++ header to 1280 bytes. If it then answers, make that ++ change permanent. ++ + + version 2.72 + Add ra-advrouter mode, for RFC-3775 mobile IPv6 support. +diff --git a/src/config.h b/src/config.h +index 8def6f2..f75fe9d 100644 +--- a/src/config.h ++++ b/src/config.h +@@ -19,6 +19,7 @@ + #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ + #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ + #define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ ++#define SAFE_PKTSZ 1280 /* "go anywhere" UDP packet size */ + #define KEYBLOCK_LEN 40 /* choose to mininise fragmentation when storing DNSSEC keys */ + #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ + #define TIMEOUT 10 /* drop UDP queries after TIMEOUT seconds */ +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index 824a860..ab16f79 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -504,7 +504,7 @@ struct server { + char interface[IF_NAMESIZE+1]; + struct serverfd *sfd; + char *domain; /* set if this server only handles a domain. */ +- int flags, tcpfd; ++ int flags, tcpfd, edns_pktsz; + unsigned int queries, failed_queries; + #ifdef HAVE_LOOP + u32 uid; +@@ -594,6 +594,7 @@ struct hostsfile { + #define FREC_DO_QUESTION 64 + #define FREC_ADDED_PHEADER 128 + #define FREC_CHECK_NOSIGN 256 ++#define FREC_TEST_PKTSZ 512 + + #ifdef HAVE_DNSSEC + #define HASH_SIZE 20 /* SHA-1 digest size */ +@@ -1148,7 +1149,7 @@ int in_zone(struct auth_zone *zone, char *name, char **cut); + #endif + + /* dnssec.c */ +-size_t dnssec_generate_query(struct dns_header *header, char *end, char *name, int class, int type, union mysockaddr *addr); ++size_t dnssec_generate_query(struct dns_header *header, char *end, char *name, int class, int type, union mysockaddr *addr, int edns_pktsz); + int dnssec_validate_by_ds(time_t now, struct dns_header *header, size_t n, char *name, char *keyname, int class); + int dnssec_validate_ds(time_t now, struct dns_header *header, size_t plen, char *name, char *keyname, int class); + int dnssec_validate_reply(time_t now, struct dns_header *header, size_t plen, char *name, char *keyname, int *class, int *neganswer, int *nons); +diff --git a/src/dnssec.c b/src/dnssec.c +index a9e1215..e91d7c2 100644 +--- a/src/dnssec.c ++++ b/src/dnssec.c +@@ -2162,10 +2162,12 @@ int dnskey_keytag(int alg, int flags, unsigned char *key, int keylen) + } + } + +-size_t dnssec_generate_query(struct dns_header *header, char *end, char *name, int class, int type, union mysockaddr *addr) ++size_t dnssec_generate_query(struct dns_header *header, char *end, char *name, int class, ++ int type, union mysockaddr *addr, int edns_pktsz) + { + unsigned char *p; + char *types = querystr("dnssec-query", type); ++ size_t ret; + + if (addr->sa.sa_family == AF_INET) + log_query(F_NOEXTRA | F_DNSSEC | F_IPV4, name, (struct all_addr *)&addr->in.sin_addr, types); +@@ -2194,7 +2196,12 @@ size_t dnssec_generate_query(struct dns_header *header, char *end, char *name, i + PUTSHORT(type, p); + PUTSHORT(class, p); + +- return add_do_bit(header, p - (unsigned char *)header, end); ++ ret = add_do_bit(header, p - (unsigned char *)header, end); ++ ++ if (find_pseudoheader(header, ret, NULL, &p, NULL)) ++ PUTSHORT(edns_pktsz, p); ++ ++ return ret; + } + + /* Go through a domain name, find "pointers" and fix them up based on how many bytes +diff --git a/src/forward.c b/src/forward.c +index a8e403c..592243f 100644 +--- a/src/forward.c ++++ b/src/forward.c +@@ -253,6 +253,7 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr, + void *hash = &crc; + #endif + unsigned int gotname = extract_request(header, plen, daemon->namebuff, NULL); ++ unsigned char *pheader; + + (void)do_bit; + +@@ -261,19 +262,32 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr, + forward = NULL; + else if (forward || (hash && (forward = lookup_frec_by_sender(ntohs(header->id), udpaddr, hash)))) + { ++ /* If we didn't get an answer advertising a maximal packet in EDNS, ++ fall back to 1280, which should work everywhere on IPv6. ++ If that generates an answer, it will become the new default ++ for this server */ ++ forward->flags |= FREC_TEST_PKTSZ; ++ + #ifdef HAVE_DNSSEC + /* If we've already got an answer to this query, but we're awaiting keys for validation, + there's no point retrying the query, retry the key query instead...... */ + if (forward->blocking_query) + { + int fd; +- ++ ++ forward->flags &= ~FREC_TEST_PKTSZ; ++ + while (forward->blocking_query) + forward = forward->blocking_query; ++ ++ forward->flags |= FREC_TEST_PKTSZ; + + blockdata_retrieve(forward->stash, forward->stash_len, (void *)header); + plen = forward->stash_len; + ++ if (find_pseudoheader(header, plen, NULL, &pheader, NULL)) ++ PUTSHORT((forward->flags & FREC_TEST_PKTSZ) ? SAFE_PKTSZ : forward->sentto->edns_pktsz, pheader); ++ + if (forward->sentto->addr.sa.sa_family == AF_INET) + log_query(F_NOEXTRA | F_DNSSEC | F_IPV4, "retry", (struct all_addr *)&forward->sentto->addr.in.sin_addr, "dnssec"); + #ifdef HAVE_IPV6 +@@ -417,7 +431,7 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr, + plen = new_plen; + } + #endif +- ++ + while (1) + { + /* only send to servers dealing with our domain. +@@ -464,6 +478,9 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr, + } + #endif + } ++ ++ if (find_pseudoheader(header, plen, NULL, &pheader, NULL)) ++ PUTSHORT((forward->flags & FREC_TEST_PKTSZ) ? SAFE_PKTSZ : start->edns_pktsz, pheader); + + if (retry_send(sendto(fd, (char *)header, plen, 0, + &start->addr.sa, +@@ -760,7 +777,6 @@ void reply_query(int fd, int family, time_t now) + } + + server = forward->sentto; +- + if ((forward->sentto->flags & SERV_TYPE) == 0) + { + if (RCODE(header) == REFUSED) +@@ -781,7 +797,12 @@ void reply_query(int fd, int family, time_t now) + if (!option_bool(OPT_ALL_SERVERS)) + daemon->last_server = server; + } +- ++ ++ /* We tried resending to this server with a smaller maximum size and got an answer. ++ Make that permanent. */ ++ if (server && (forward->flags & FREC_TEST_PKTSZ)) ++ server->edns_pktsz = SAFE_PKTSZ; ++ + /* If the answer is an error, keep the forward record in place in case + we get a good reply from another server. Kill it when we've + had replies from all to avoid filling the forwarding table when +@@ -890,7 +911,7 @@ void reply_query(int fd, int family, time_t now) + { + new->flags |= FREC_DNSKEY_QUERY; + nn = dnssec_generate_query(header, ((char *) header) + daemon->packet_buff_sz, +- daemon->keyname, forward->class, T_DNSKEY, &server->addr); ++ daemon->keyname, forward->class, T_DNSKEY, &server->addr, server->edns_pktsz); + } + else + { +@@ -899,7 +920,7 @@ void reply_query(int fd, int family, time_t now) + else + new->flags |= FREC_DS_QUERY; + nn = dnssec_generate_query(header,((char *) header) + daemon->packet_buff_sz, +- daemon->keyname, forward->class, T_DS, &server->addr); ++ daemon->keyname, forward->class, T_DS, &server->addr, server->edns_pktsz); + } + if ((hash = hash_questions(header, nn, daemon->namebuff))) + memcpy(new->hash, hash, HASH_SIZE); +@@ -1526,7 +1547,7 @@ static int tcp_check_for_unsigned_zone(time_t now, struct dns_header *header, s + + /* Can't find it in the cache, have to send a query */ + +- m = dnssec_generate_query(header, ((char *) header) + 65536, name_start, class, T_DS, &server->addr); ++ m = dnssec_generate_query(header, ((char *) header) + 65536, name_start, class, T_DS, &server->addr, server->edns_pktsz); + + *length = htons(m); + +@@ -1638,7 +1659,7 @@ static int tcp_key_recurse(time_t now, int status, struct dns_header *header, si + + another_tcp_key: + m = dnssec_generate_query(new_header, ((char *) new_header) + 65536, keyname, class, +- new_status == STAT_NEED_KEY ? T_DNSKEY : T_DS, &server->addr); ++ new_status == STAT_NEED_KEY ? T_DNSKEY : T_DS, &server->addr, server->edns_pktsz); + + *length = htons(m); + +diff --git a/src/network.c b/src/network.c +index 992f023..a1d90c8 100644 +--- a/src/network.c ++++ b/src/network.c +@@ -1396,6 +1396,7 @@ void add_update_server(int flags, + serv->domain = domain_str; + serv->next = next; + serv->queries = serv->failed_queries = 0; ++ serv->edns_pktsz = daemon->edns_pktsz; + #ifdef HAVE_LOOP + serv->uid = rand32(); + #endif +diff --git a/src/option.c b/src/option.c +index f91cfbb..c7add88 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -4498,15 +4498,19 @@ void read_opts(int argc, char **argv, char *compile_opts) + { + struct server *tmp; + for (tmp = daemon->servers; tmp; tmp = tmp->next) +- if (!(tmp->flags & SERV_HAS_SOURCE)) +- { +- if (tmp->source_addr.sa.sa_family == AF_INET) +- tmp->source_addr.in.sin_port = htons(daemon->query_port); ++ { ++ tmp->edns_pktsz = daemon->edns_pktsz; ++ ++ if (!(tmp->flags & SERV_HAS_SOURCE)) ++ { ++ if (tmp->source_addr.sa.sa_family == AF_INET) ++ tmp->source_addr.in.sin_port = htons(daemon->query_port); + #ifdef HAVE_IPV6 +- else if (tmp->source_addr.sa.sa_family == AF_INET6) +- tmp->source_addr.in6.sin6_port = htons(daemon->query_port); ++ else if (tmp->source_addr.sa.sa_family == AF_INET6) ++ tmp->source_addr.in6.sin6_port = htons(daemon->query_port); + #endif +- } ++ } ++ } + } + + if (daemon->if_addrs) +diff --git a/src/rfc1035.c b/src/rfc1035.c +index 5828055..8b1709d 100644 +--- a/src/rfc1035.c ++++ b/src/rfc1035.c +@@ -552,7 +552,7 @@ static size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned + return plen; + *p++ = 0; /* empty name */ + PUTSHORT(T_OPT, p); +- PUTSHORT(daemon->edns_pktsz, p); /* max packet length */ ++ PUTSHORT(SAFE_PKTSZ, p); /* max packet length, this will be overwritten */ + PUTSHORT(0, p); /* extended RCODE and version */ + PUTSHORT(set_do ? 0x8000 : 0, p); /* DO flag */ + lenp = p; +@@ -1537,7 +1537,6 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen, + unsigned short flag; + int q, ans, anscount = 0, addncount = 0; + int dryrun = 0, sec_reqd = 0, have_pseudoheader = 0; +- int is_sign; + struct crec *crecp; + int nxdomain = 0, auth = 1, trunc = 0, sec_data = 1; + struct mx_srv_record *rec; +@@ -1557,28 +1556,19 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen, + forward rather than answering from the cache, which doesn't include + security information, unless we're in DNSSEC validation mode. */ + +- if (find_pseudoheader(header, qlen, NULL, &pheader, &is_sign)) ++ if (find_pseudoheader(header, qlen, NULL, &pheader, NULL)) + { +- unsigned short udpsz, flags; +- unsigned char *psave = pheader; +- ++ unsigned short flags; ++ + have_pseudoheader = 1; + +- GETSHORT(udpsz, pheader); +- pheader += 2; /* ext_rcode */ ++ pheader += 4; /* udp size, ext_rcode */ + GETSHORT(flags, pheader); + + if ((sec_reqd = flags & 0x8000)) + *do_bit = 1;/* do bit */ +- *ad_reqd = 1; +- +- /* If our client is advertising a larger UDP packet size +- than we allow, trim it so that we don't get an overlarge +- response from upstream */ +- +- if (!is_sign && (udpsz > daemon->edns_pktsz)) +- PUTSHORT(daemon->edns_pktsz, psave); + ++ *ad_reqd = 1; + dryrun = 1; + } + +-- +1.7.10.4 diff --git a/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with--stop-rebind.patch b/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with--stop-rebind.patch new file mode 100644 index 0000000..33463b6 --- /dev/null +++ b/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with--stop-rebind.patch @@ -0,0 +1,58 @@ +From b059c96dc69dfe3055c5b32b078a05c53b11ebb3 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Fri, 8 May 2015 20:25:51 +0100 +Subject: [PATCH] Check IPv4-mapped IPv6 addresses with --stop-rebind. + +--- + CHANGELOG | 3 +++ + src/rfc1035.c | 21 +++++++++++++++++---- + 2 files changed, 20 insertions(+), 4 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index d8fc57a..94a521f 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -115,6 +115,9 @@ version 2.73 + header to 1280 bytes. If it then answers, make that + change permanent. + ++ Check IPv4-mapped IPv6 addresses when --stop-rebind ++ is active. Thanks to Jordan Milne for spotting this. ++ + + version 2.72 + Add ra-advrouter mode, for RFC-3775 mobile IPv6 support. +diff --git a/src/rfc1035.c b/src/rfc1035.c +index 8b1709d..5e3f566 100644 +--- a/src/rfc1035.c ++++ b/src/rfc1035.c +@@ -1117,10 +1117,23 @@ int extract_addresses(struct dns_header *header, size_t qlen, char *name, time_t + memcpy(&addr, p1, addrlen); + + /* check for returned address in private space */ +- if (check_rebind && +- (flags & F_IPV4) && +- private_net(addr.addr.addr4, !option_bool(OPT_LOCAL_REBIND))) +- return 1; ++ if (check_rebind) ++ { ++ if ((flags & F_IPV4) && ++ private_net(addr.addr.addr4, !option_bool(OPT_LOCAL_REBIND))) ++ return 1; ++ ++#ifdef HAVE_IPV6 ++ if ((flags & F_IPV6) && ++ IN6_IS_ADDR_V4MAPPED(&addr.addr.addr6)) ++ { ++ struct in_addr v4; ++ v4.s_addr = ((const uint32_t *) (&addr.addr.addr6))[3]; ++ if (private_net(v4, !option_bool(OPT_LOCAL_REBIND))) ++ return 1; ++ } ++#endif ++ } + + #ifdef HAVE_IPSET + if (ipsets && (flags & (F_IPV4 | F_IPV6))) +-- +1.7.10.4 diff --git a/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch b/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch index d774a23..ab98b44 100644 --- a/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch +++ b/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch @@ -26,4 +26,3 @@ index 592243fd4d35..74e5ab66c423 100644 /* If the answer is an error, keep the forward record in place in case -- 2.1.0 - diff --git a/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc-html.patch b/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc-html.patch new file mode 100644 index 0000000..6ebfa81 --- /dev/null +++ b/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc-html.patch @@ -0,0 +1,27 @@ +From 585840b03365372679907f175b07a01c9d621ae0 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Wed, 13 May 2015 12:35:57 +0100 +Subject: [PATCH] Pointer to mail-archive mailing list mirror in doc.html. + +--- + doc.html | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/doc.html b/doc.html +index 92c9d0d..54f59bb 100644 +--- a/doc.html ++++ b/doc.html +@@ -74,7 +74,9 @@ for details. + There is a dnsmasq mailing list at <A + HREF="http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss"> + http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss</A> which should be the +-first location for queries, bugreports, suggestions etc. ++first location for queries, bugreports, suggestions etc. The list is mirrored, with a ++search facility, at <A HREF="https://www.mail-archive.com/dnsmasq-discuss@lists.thekelleys.org.uk/"> ++https://www.mail-archive.com/dnsmasq-discuss@lists.thekelleys.org.uk/</A>. + You can contact me at <A + HREF="mailto:simon@thekelleys.org.uk">simon(a)thekelleys.org.uk</A>. + +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch b/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch index 6fb21e8..a5178cb 100644 --- a/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch +++ b/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch @@ -197,4 +197,3 @@ index 55526443dc84..a10e499ef768 100644 if (optno == OPTION_SNAME && done_server) -- 2.1.0 - diff --git a/src/patches/dnsmasq/0093-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch b/src/patches/dnsmasq/0093-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch new file mode 100644 index 0000000..64efd4f --- /dev/null +++ b/src/patches/dnsmasq/0093-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch @@ -0,0 +1,29 @@ +From 62018e1f720fa11e83879111a4b1b3753b5c25bb Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Thu, 14 May 2015 21:30:00 +0100 +Subject: [PATCH] Use correct DHCP context for PXE-proxy server-id. + +--- + src/rfc2131.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/rfc2131.c b/src/rfc2131.c +index b95f9be..70d1e59 100644 +--- a/src/rfc2131.c ++++ b/src/rfc2131.c +@@ -888,10 +888,10 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index, + + option_put(mess, end, OPTION_MESSAGE_TYPE, 1, + mess_type == DHCPDISCOVER ? DHCPOFFER : DHCPACK); +- option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(context->local.s_addr)); ++ option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(tmp->local.s_addr)); + pxe_misc(mess, end, uuid); + prune_vendor_opts(tagif_netid); +- do_encap_opts(pxe_opts(pxearch, tagif_netid, context->local, now), OPTION_VENDOR_CLASS_OPT, DHOPT_VENDOR_MATCH, mess, end, 0); ++ do_encap_opts(pxe_opts(pxearch, tagif_netid, tmp->local, now), OPTION_VENDOR_CLASS_OPT, DHOPT_VENDOR_MATCH, mess, end, 0); + + log_packet("PXE", NULL, emac, emac_len, iface_name, ignore ? "proxy-ignored" : "proxy", NULL, mess->xid); + log_tags(tagif_netid, ntohl(mess->xid)); +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/0094-Fix-buffer-overflow-introduced-in-2-73rc6.patch b/src/patches/dnsmasq/0094-Fix-buffer-overflow-introduced-in-2-73rc6.patch new file mode 100644 index 0000000..cb56c79 --- /dev/null +++ b/src/patches/dnsmasq/0094-Fix-buffer-overflow-introduced-in-2-73rc6.patch @@ -0,0 +1,49 @@ +From 5d07d77e75e0f02bc0a8f6029ffbc8b371fa804e Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Fri, 15 May 2015 18:13:06 +0100 +Subject: [PATCH] Fix buffer overflow introduced in 2.73rc6. + +Fix off-by-one in code which checks for over-long domain names +in received DNS packets. This enables buffer overflow attacks +which can certainly crash dnsmasq and may allow for arbitrary +code execution. The problem was introduced in commit b8f16556d, +release 2.73rc6, so has not escaped into any stable release. +Note that the off-by-one was in the label length determination, +so the buffer can be overflowed by as many bytes as there are +labels in the name - ie, many. + +Thanks to Ron Bowes, who used lcmatuf's afl-fuzz tool to find +the problem. +--- + src/rfc1035.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/rfc1035.c b/src/rfc1035.c +index 5e3f566..a95241f 100644 +--- a/src/rfc1035.c ++++ b/src/rfc1035.c +@@ -94,8 +94,8 @@ int extract_name(struct dns_header *header, size_t plen, unsigned char **pp, + count = 256; + digs = ((count-1)>>2)+1; + +- /* output is \[x<hex>/siz]. which is digs+6/7/8 chars */ +- namelen += digs+6; ++ /* output is \[x<hex>/siz]. which is digs+7/8/9 chars */ ++ namelen += digs+7; + if (count > 9) + namelen++; + if (count > 99) +@@ -125,8 +125,8 @@ int extract_name(struct dns_header *header, size_t plen, unsigned char **pp, + } + else + { /* label_type = 0 -> label. */ +- namelen += l; +- if (namelen+1 >= MAXDNAME) ++ namelen += l + 1; /* include period */ ++ if (namelen >= MAXDNAME) + return 0; + if (!CHECK_LEN(header, p, plen, l)) + return 0; +-- +1.7.10.4 + diff --git a/src/patches/python-2.7rc1-ctypes-noexecmem.patch b/src/patches/python-2.7rc1-ctypes-noexecmem.patch new file mode 100644 index 0000000..ccc2e68 --- /dev/null +++ b/src/patches/python-2.7rc1-ctypes-noexecmem.patch @@ -0,0 +1,85 @@ +diff -up Python-2.7rc1/Modules/_ctypes/callbacks.c.selinux Python-2.7rc1/Modules/_ctypes/callbacks.c +--- Python-2.7rc1/Modules/_ctypes/callbacks.c.selinux 2010-05-09 10:46:46.000000000 -0400 ++++ Python-2.7rc1/Modules/_ctypes/callbacks.c 2010-06-08 08:44:18.357366200 -0400 +@@ -21,8 +21,8 @@ CThunkObject_dealloc(PyObject *_self) + Py_XDECREF(self->converters); + Py_XDECREF(self->callable); + Py_XDECREF(self->restype); +- if (self->pcl) +- _ctypes_free_closure(self->pcl); ++ if (self->pcl_write) ++ ffi_closure_free(self->pcl_write); + PyObject_GC_Del(self); + } + +@@ -391,7 +391,8 @@ static CThunkObject* CThunkObject_new(Py + return NULL; + } + +- p->pcl = NULL; ++ p->pcl_exec = NULL; ++ p->pcl_write = NULL; + memset(&p->cif, 0, sizeof(p->cif)); + p->converters = NULL; + p->callable = NULL; +@@ -421,8 +422,9 @@ CThunkObject *_ctypes_alloc_callback(PyO + + assert(CThunk_CheckExact(p)); + +- p->pcl = _ctypes_alloc_closure(); +- if (p->pcl == NULL) { ++ p->pcl_write = ffi_closure_alloc(sizeof(ffi_closure), ++ &p->pcl_exec); ++ if (p->pcl_write == NULL) { + PyErr_NoMemory(); + goto error; + } +@@ -467,7 +469,9 @@ CThunkObject *_ctypes_alloc_callback(PyO + "ffi_prep_cif failed with %d", result); + goto error; + } +- result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p); ++ result = ffi_prep_closure_loc(p->pcl_write, &p->cif, closure_fcn, ++ p, ++ p->pcl_exec); + if (result != FFI_OK) { + PyErr_Format(PyExc_RuntimeError, + "ffi_prep_closure failed with %d", result); +diff -up Python-2.7rc1/Modules/_ctypes/_ctypes.c.selinux Python-2.7rc1/Modules/_ctypes/_ctypes.c +--- Python-2.7rc1/Modules/_ctypes/_ctypes.c.selinux 2010-05-09 10:46:46.000000000 -0400 ++++ Python-2.7rc1/Modules/_ctypes/_ctypes.c 2010-06-07 23:19:39.950146038 -0400 +@@ -3463,7 +3463,7 @@ PyCFuncPtr_new(PyTypeObject *type, PyObj + self->callable = callable; + + self->thunk = thunk; +- *(void **)self->b_ptr = (void *)thunk->pcl; ++ *(void **)self->b_ptr = (void *)thunk->pcl_exec; + + Py_INCREF((PyObject *)thunk); /* for KeepRef */ + if (-1 == KeepRef((CDataObject *)self, 0, (PyObject *)thunk)) { +diff -up Python-2.7rc1/Modules/_ctypes/ctypes.h.selinux Python-2.7rc1/Modules/_ctypes/ctypes.h +--- Python-2.7rc1/Modules/_ctypes/ctypes.h.selinux 2010-05-09 10:46:46.000000000 -0400 ++++ Python-2.7rc1/Modules/_ctypes/ctypes.h 2010-06-07 23:19:39.950146038 -0400 +@@ -95,7 +95,8 @@ struct tagCDataObject { + + typedef struct { + PyObject_VAR_HEAD +- ffi_closure *pcl; /* the C callable */ ++ ffi_closure *pcl_write; /* the C callable, writeable */ ++ void *pcl_exec; /* the C callable, executable */ + ffi_cif cif; + int flags; + PyObject *converters; +diff -up Python-2.7rc1/setup.py.selinux Python-2.7rc1/setup.py +--- Python-2.7rc1/setup.py.selinux 2010-06-07 23:19:39.922147795 -0400 ++++ Python-2.7rc1/setup.py 2010-06-07 23:19:39.951145942 -0400 +@@ -1864,8 +1864,7 @@ class PyBuildExt(build_ext): + '_ctypes/callbacks.c', + '_ctypes/callproc.c', + '_ctypes/stgdict.c', +- '_ctypes/cfield.c', +- '_ctypes/malloc_closure.c'] ++ '_ctypes/cfield.c'] + depends = ['_ctypes/ctypes.h'] + + if sys.platform == 'darwin': hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 697b4f04bf8a007b289e424cf88bfbba7a2df71a
by git＠ipfire.org 18 Jun '15

18 Jun '15

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 697b4f04bf8a007b289e424cf88bfbba7a2df71a (commit) from c0ba8eb2009100ed731b369de35f04729acac9e1 (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 697b4f04bf8a007b289e424cf88bfbba7a2df71a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 18 12:38:38 2015 +0200 dnsmasq: Import patches from upstream These fix minor bugs and contain smaller improvements. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../{oldcore/90 => core/92}/filelists/dnsmasq | 0 lfs/dnsmasq | 15 + ...newline-at-the-end-of-example-config-file.patch | 2 +- ...artup-when-an-empty-suffix-is-supplied-to.patch | 2 +- .../0003-Debian-build-fixes-for-kFreeBSD.patch | 2 +- ...04-Set-conntrack-mark-before-connect-call.patch | 2 +- .../dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch | 2 +- .../dnsmasq/0006-Fit-example-conf-file-typo.patch | 2 +- ...-compliance-when-unable-to-supply-address.patch | 4 +- .../0008-Fix-conntrack-with-bind-interfaces.patch | 2 +- ...9-Use-inotify-instead-of-polling-on-Linux.patch | 2 +- ...Teach-the-new-inotify-code-about-symlinks.patch | 2 +- ...ve-floor-on-EDNS0-packet-size-with-DNSSEC.patch | 2 +- .../dnsmasq/0012-CHANGELOG-re.-inotify.patch | 2 +- ...ix-breakage-of-domain-domain-subnet-local.patch | 2 +- ...ve-redundant-IN6_IS_ADDR_ULA-a-macro-defn.patch | 2 +- ...Pv6-privacy-addresses-from-interface-name.patch | 4 +- ...-width-in-cache-dump-to-avoid-truncating-.patch | 2 +- ...n-DNSSEC-code-when-attempting-to-verify-l.patch | 2 +- ...g-work-for-CNAMEs-pointing-to-A-AAAA-reco.patch | 4 +- ...x-problems-validating-NSEC3-and-wildcards.patch | 2 +- .../dnsmasq/0020-Initialise-return-value.patch | 2 +- .../dnsmasq/0021-Add-ignore-address-option.patch | 2 +- .../dnsmasq/0022-Bad-packet-protection.patch | 2 +- ...-build-failure-in-new-inotify-code-on-BSD.patch | 2 +- ...t-makefile-dependencies-on-COPTS-variable.patch | 2 +- ...0025-Fix-race-condition-issue-in-makefile.patch | 2 +- ...op-down-search-for-limit-of-secure-delega.patch | 2 +- ...ries-extra-option-for-more-complete-loggi.patch | 2 +- .../dnsmasq/0028-Add-min-cache-ttl-option.patch | 2 +- ...ort-of-requestor-when-doing-extra-logging.patch | 2 +- ...r-from-cache-RRsets-from-wildcards-as-we-.patch | 2 +- .../0031-Logs-for-DS-records-consistent.patch | 2 +- ...ultiple-interfaces-with-the-same-LL-addre.patch | 3 +- ...n-t-treat-SERVFAIL-as-a-recoverable-error.patch | 2 +- .../0034-Add-dhcp-hostsdir-config-option.patch | 2 +- .../dnsmasq/0035-Update-German-translation.patch | 2 +- ...-to-DHCPv6-SOLICIT-messages-when-not-conf.patch | 2 +- ...fy-to-be-disabled-at-compile-time-on-Linu.patch | 3 +- ...ify-code-to-dhcp-hostsdir-dhcp-optsdir-an.patch | 4 +- .../0039-Update-copyrights-for-dawn-of-2015.patch | 2 +- .../0040-inotify-documentation-updates.patch | 2 +- .../0041-Fix-broken-ECDSA-DNSSEC-signatures.patch | 2 +- src/patches/dnsmasq/0042-BSD-make-support.patch | 2 +- .../0043-Fix-build-failure-on-openBSD.patch | 2 +- src/patches/dnsmasq/0044-Manpage-typo-fix.patch | 2 +- ...configs-after-reading-extra-hostfiles-wit.patch | 2 +- .../0046-Extra-logging-for-inotify-code.patch | 2 +- src/patches/dnsmasq/0047-man-page-typo.patch | 2 +- ...sion-script-which-returned-wrong-tag-in-s.patch | 4 +- src/patches/dnsmasq/0049-Typos.patch | 2 +- ...ynamic-hosts-files-work-when-no-hosts-set.patch | 2 +- ...-trivial-memory-leaks-to-quieten-valgrind.patch | 2 +- ...ninitialized-value-used-in-get_client_mac.patch | 2 +- ...-Log-parsing-utils-in-contrib-reverse-dns.patch | 2 +- ...-Add-dnssec-timestamp-option-and-facility.patch | 2 +- ...mmit-to-not-crash-if-uid-changing-not-con.patch | 2 +- .../0056-New-version-of-contrib-reverse-dns.patch | 2 +- ...C-timestamp-code-to-create-file-later-rem.patch | 2 +- ...late-code-for-re-running-system-calls-on-.patch | 2 +- ...s-example.com-equivalent-to-server-exampl.patch | 2 +- ...tbound-interface-via-cmsg-in-unicast-repl.patch | 3 +- ...DNSSEC-when-a-signed-CNAME-dangles-into-a.patch | 2 +- ...Return-SERVFAIL-when-validation-abandoned.patch | 2 +- ...3-Protect-against-broken-DNSSEC-upstreams.patch | 2 +- ...EC-fix-for-non-ascii-characters-in-labels.patch | 2 +- ...ol-characters-in-names-in-the-cache-handl.patch | 4 +- .../dnsmasq/0066-Fix-crash-in-last-commit.patch | 2 +- .../dnsmasq/0067-Merge-message-translations.patch | 2 +- ...-tftp-no-fail-to-ignore-missing-tftp-root.patch | 2 +- src/patches/dnsmasq/0069-Whitespace-fixes.patch | 2 +- ...CURE-rather-than-BOGUS-when-DS-proved-not.patch | 2 +- ...ompiler-warning-when-not-including-DNSSEC.patch | 2 +- ...aused-by-looking-up-servers.bind-when-man.patch | 2 +- ...n-receipt-of-certain-malformed-DNS-reques.patch | 3 +- ...crash-in-auth-code-with-odd-configuration.patch | 2 +- ...rect-replies-to-NS-and-SOA-in-.arpa-zones.patch | 2 +- ...rk-induced-crash-in-new-tftp_no_fail-code.patch | 2 +- src/patches/dnsmasq/0077-Note-CVE-2015-3294.patch | 2 +- ...-when-reporting-DNSSEC-validation-failure.patch | 2 +- ...ddress-command-line-arg-in-dhcp_release.c.patch | 2 +- ...38dd574c51d96fef100285a0d225824534f9-and-.patch | 2 +- ...-domain-names-with-.-or-000-within-labels.patch | 2 +- ...eaks-to-previous-DNS-label-charset-commit.patch | 2 +- ...s-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch | 2 +- ...version-work-when-repo-is-a-git-submodule.patch | 2 +- ...t-order-botch-which-broke-DNSSEC-for-TCP-.patch | 2 +- ...e-RRSIG-RR-from-answers-to-ANY-queries-wh.patch | 4 +- ...tify-some-DHCP-lease-management-functions.patch | 2 +- ...packet-loss-when-fragmentation-of-large-p.patch | 2 +- ...v4-mapped-IPv6-addresses-with-stop-rebind.patch | 2 +- .../dnsmasq/0090-Tweak-EDNS-timeout-code.patch | 2 +- ...mail-archive-mailing-list-mirror-in-doc.h.patch | 2 +- ...-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch | 2 +- src/patches/dnsmasq/0093-Tweak-last-commit.patch | 2 +- ...rect-DHCP-context-for-PXE-proxy-server-id.patch | 2 +- ...Fix-buffer-overflow-introduced-in-2.73rc6.patch | 2 +- ...move-support-for-DNS-Extended-Label-Types.patch | 2 +- ...ect-DHCP-context-when-in-PXE-bootserver-m.patch | 2 +- .../0098-Tweak-immediately-previous-patch.patch | 2 +- src/patches/dnsmasq/0099-Man-page-typo.patch | 25 + ...100-Add-infiniband-to-example-config-file.patch | 30 + ...anitise-DNS-header-bits-in-answer-when-re.patch | 55 + ...CONFIRM-should-be-OK-for-any-address-on-l.patch | 43 + ...ndle-corner-cases-in-NSEC-coverage-checks.patch | 53 + ...-methods-to-create-and-delete-DHCP-leases.patch | 329 + ...e-of-missed-logging-strings-to-the-catalo.patch | 32 + ...-of-unknown-interface-in-bridge-interface.patch | 28 + ...xtend-bridge-interface-aliasing-to-DHCPv6.patch | 65 + ...r-advertisements-to-have-the-off-link-bit.patch | 85 + ...e-interface-aliasing-to-solicited-router-.patch | 107 + ...e-interfaces-to-unsolicited-router-advert.patch | 131 + ...n-updates-for-bridge-interface-and-off-li.patch | 201 + ...ages-and-fix-makefile-process-to-do-this.patch} | 19383 ++++++++++--------- ...Es-to-DS-records-when-confirming-absence-.patch | 173 + 115 files changed, 11738 insertions(+), 9231 deletions(-) copy config/rootfiles/{oldcore/90 => core/92}/filelists/dnsmasq (100%) create mode 100644 src/patches/dnsmasq/0099-Man-page-typo.patch create mode 100644 src/patches/dnsmasq/0100-Add-infiniband-to-example-config-file.patch create mode 100644 src/patches/dnsmasq/0101-Correctly-sanitise-DNS-header-bits-in-answer-when-re.patch create mode 100644 src/patches/dnsmasq/0102-DHCPv6-DHCPCONFIRM-should-be-OK-for-any-address-on-l.patch create mode 100644 src/patches/dnsmasq/0103-Handle-corner-cases-in-NSEC-coverage-checks.patch create mode 100644 src/patches/dnsmasq/0104-Add-Dbus-methods-to-create-and-delete-DHCP-leases.patch create mode 100644 src/patches/dnsmasq/0105-Add-a-couple-of-missed-logging-strings-to-the-catalo.patch create mode 100644 src/patches/dnsmasq/0106-Fix-logging-of-unknown-interface-in-bridge-interface.patch create mode 100644 src/patches/dnsmasq/0107-Extend-bridge-interface-aliasing-to-DHCPv6.patch create mode 100644 src/patches/dnsmasq/0108-Allow-router-advertisements-to-have-the-off-link-bit.patch create mode 100644 src/patches/dnsmasq/0109-Upply-bridge-interface-aliasing-to-solicited-router-.patch create mode 100644 src/patches/dnsmasq/0110-Apply-bridge-interfaces-to-unsolicited-router-advert.patch create mode 100644 src/patches/dnsmasq/0111-Documenation-updates-for-bridge-interface-and-off-li.patch copy src/patches/dnsmasq/{0067-Merge-message-translations.patch => 0112-Merge-messages-and-fix-makefile-process-to-do-this.patch} (68%) create mode 100644 src/patches/dnsmasq/0113-Handle-CNAMEs-to-DS-records-when-confirming-absence-.patch Difference in files: diff --git a/config/rootfiles/core/92/filelists/dnsmasq b/config/rootfiles/core/92/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/core/92/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/lfs/dnsmasq b/lfs/dnsmasq index 857434c..a5d86e9 100644 --- a/lfs/dnsmasq +++ b/lfs/dnsmasq @@ -171,6 +171,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0096-Remove-support-for-DNS-Extended-Label-Types.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0097-Select-correct-DHCP-context-when-in-PXE-bootserver-m.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0098-Tweak-immediately-previous-patch.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0099-Man-page-typo.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0100-Add-infiniband-to-example-config-file.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0101-Correctly-sanitise-DNS-header-bits-in-answer-when-re.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0102-DHCPv6-DHCPCONFIRM-should-be-OK-for-any-address-on-l.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0103-Handle-corner-cases-in-NSEC-coverage-checks.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0104-Add-Dbus-methods-to-create-and-delete-DHCP-leases.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0105-Add-a-couple-of-missed-logging-strings-to-the-catalo.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0106-Fix-logging-of-unknown-interface-in-bridge-interface.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0107-Extend-bridge-interface-aliasing-to-DHCPv6.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0108-Allow-router-advertisements-to-have-the-off-link-bit.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0109-Upply-bridge-interface-aliasing-to-solicited-router-.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0110-Apply-bridge-interfaces-to-unsolicited-router-advert.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0111-Documenation-updates-for-bridge-interface-and-off-li.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0112-Merge-messages-and-fix-makefile-process-to-do-this.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0113-Handle-CNAMEs-to-DS-records-when-confirming-absence-.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch cd $(DIR_APP) && sed -i src/config.h \ -e 's|/\* #define HAVE_IDN \*/|#define HAVE_IDN|g' \ diff --git a/src/patches/dnsmasq/0001-Add-newline-at-the-end-of-example-config-file.patch b/src/patches/dnsmasq/0001-Add-newline-at-the-end-of-example-config-file.patch index 57c9ff1..3c67b64 100644 --- a/src/patches/dnsmasq/0001-Add-newline-at-the-end-of-example-config-file.patch +++ b/src/patches/dnsmasq/0001-Add-newline-at-the-end-of-example-config-file.patch @@ -1,7 +1,7 @@ From f2658275b25ebfe691cdcb9fede85a3088cca168 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 25 Sep 2014 21:51:25 +0100 -Subject: [PATCH 01/98] Add newline at the end of example config file. +Subject: [PATCH 001/113] Add newline at the end of example config file. --- dnsmasq.conf.example | 2 +- diff --git a/src/patches/dnsmasq/0002-crash-at-startup-when-an-empty-suffix-is-supplied-to.patch b/src/patches/dnsmasq/0002-crash-at-startup-when-an-empty-suffix-is-supplied-to.patch index 86eb603..090892d 100644 --- a/src/patches/dnsmasq/0002-crash-at-startup-when-an-empty-suffix-is-supplied-to.patch +++ b/src/patches/dnsmasq/0002-crash-at-startup-when-an-empty-suffix-is-supplied-to.patch @@ -1,7 +1,7 @@ From 00cd9d551998307225312fd21f761cfa8868bd2c Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 2 Oct 2014 21:44:21 +0100 -Subject: [PATCH 02/98] crash at startup when an empty suffix is supplied to +Subject: [PATCH 002/113] crash at startup when an empty suffix is supplied to --conf-dir --- diff --git a/src/patches/dnsmasq/0003-Debian-build-fixes-for-kFreeBSD.patch b/src/patches/dnsmasq/0003-Debian-build-fixes-for-kFreeBSD.patch index b0badb1..1fcb041 100644 --- a/src/patches/dnsmasq/0003-Debian-build-fixes-for-kFreeBSD.patch +++ b/src/patches/dnsmasq/0003-Debian-build-fixes-for-kFreeBSD.patch @@ -1,7 +1,7 @@ From 6ac3bc0452a74e16e3d620a0757b0f8caab182ec Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 3 Oct 2014 08:48:11 +0100 -Subject: [PATCH 03/98] Debian build fixes for kFreeBSD +Subject: [PATCH 003/113] Debian build fixes for kFreeBSD --- src/tables.c | 6 +++++- diff --git a/src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch b/src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch index b2725d4..f734fbc 100644 --- a/src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch +++ b/src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch @@ -1,7 +1,7 @@ From e9828b6f66b22ce8873f8d30a773137d1aef1b92 Mon Sep 17 00:00:00 2001 From: Karl Vogel <karl.vogel(a)gmail.com> Date: Fri, 3 Oct 2014 21:45:15 +0100 -Subject: [PATCH 04/98] Set conntrack mark before connect() call. +Subject: [PATCH 004/113] Set conntrack mark before connect() call. SO_MARK has to be done before issuing the connect() call on the TCP socket. diff --git a/src/patches/dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch b/src/patches/dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch index 84be7de..ef70ae3 100644 --- a/src/patches/dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch +++ b/src/patches/dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch @@ -1,7 +1,7 @@ From 17b475912f6a4e72797a543dad59d4d5dde6bb1b Mon Sep 17 00:00:00 2001 From: Daniel Collins <daniel.collins(a)smoothwall.net> Date: Fri, 3 Oct 2014 21:58:43 +0100 -Subject: [PATCH 05/98] Fix typo in new Dbus code. +Subject: [PATCH 005/113] Fix typo in new Dbus code. Simon's fault. --- diff --git a/src/patches/dnsmasq/0006-Fit-example-conf-file-typo.patch b/src/patches/dnsmasq/0006-Fit-example-conf-file-typo.patch index 0cb139f..c6dc31e 100644 --- a/src/patches/dnsmasq/0006-Fit-example-conf-file-typo.patch +++ b/src/patches/dnsmasq/0006-Fit-example-conf-file-typo.patch @@ -1,7 +1,7 @@ From 3d9d2dd0018603a2ae4b9cd65ac6ff959f4fd8c7 Mon Sep 17 00:00:00 2001 From: Tomas Hozza <thozza(a)redhat.com> Date: Mon, 6 Oct 2014 10:46:48 +0100 -Subject: [PATCH 06/98] Fit example conf file typo. +Subject: [PATCH 006/113] Fit example conf file typo. --- dnsmasq.conf.example | 2 +- diff --git a/src/patches/dnsmasq/0007-Improve-RFC-compliance-when-unable-to-supply-address.patch b/src/patches/dnsmasq/0007-Improve-RFC-compliance-when-unable-to-supply-address.patch index 286ddcf..bc24281 100644 --- a/src/patches/dnsmasq/0007-Improve-RFC-compliance-when-unable-to-supply-address.patch +++ b/src/patches/dnsmasq/0007-Improve-RFC-compliance-when-unable-to-supply-address.patch @@ -1,8 +1,8 @@ From b9ff5c8f435173cfa616e3c398bdc089ef690a07 Mon Sep 17 00:00:00 2001 From: Vladislav Grishenko <themiron(a)mail.ru> Date: Mon, 6 Oct 2014 14:34:24 +0100 -Subject: [PATCH 07/98] Improve RFC-compliance when unable to supply addresses - in DHCPv6 +Subject: [PATCH 007/113] Improve RFC-compliance when unable to supply + addresses in DHCPv6 While testing https://github.com/sbyx/odhcp6c client I have noticed it permanently crashes after startup. diff --git a/src/patches/dnsmasq/0008-Fix-conntrack-with-bind-interfaces.patch b/src/patches/dnsmasq/0008-Fix-conntrack-with-bind-interfaces.patch index f667cf3..47f0ea6 100644 --- a/src/patches/dnsmasq/0008-Fix-conntrack-with-bind-interfaces.patch +++ b/src/patches/dnsmasq/0008-Fix-conntrack-with-bind-interfaces.patch @@ -1,7 +1,7 @@ From 98906275a02ae260fe3f82133bd79054f8315f06 Mon Sep 17 00:00:00 2001 From: Hans Dedecker <dedeckeh(a)gmail.com> Date: Tue, 9 Dec 2014 22:22:53 +0000 -Subject: [PATCH 08/98] Fix conntrack with --bind-interfaces +Subject: [PATCH 008/113] Fix conntrack with --bind-interfaces Make sure dst_addr is assigned the correct address in receive_query when OPTNOWILD is enabled so the assigned mark can be correctly retrieved and set in forward_query when diff --git a/src/patches/dnsmasq/0009-Use-inotify-instead-of-polling-on-Linux.patch b/src/patches/dnsmasq/0009-Use-inotify-instead-of-polling-on-Linux.patch index 3d66540..3cefd02 100644 --- a/src/patches/dnsmasq/0009-Use-inotify-instead-of-polling-on-Linux.patch +++ b/src/patches/dnsmasq/0009-Use-inotify-instead-of-polling-on-Linux.patch @@ -1,7 +1,7 @@ From 193de4abf59e49c6b70d54cfe9720fcb95ca2f71 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 10 Dec 2014 17:32:16 +0000 -Subject: [PATCH 09/98] Use inotify instead of polling on Linux. +Subject: [PATCH 009/113] Use inotify instead of polling on Linux. This should solve problems people are seeing when a file changes twice within a second and thus is missed for polling. diff --git a/src/patches/dnsmasq/0010-Teach-the-new-inotify-code-about-symlinks.patch b/src/patches/dnsmasq/0010-Teach-the-new-inotify-code-about-symlinks.patch index 2ddef28..35c405b 100644 --- a/src/patches/dnsmasq/0010-Teach-the-new-inotify-code-about-symlinks.patch +++ b/src/patches/dnsmasq/0010-Teach-the-new-inotify-code-about-symlinks.patch @@ -1,7 +1,7 @@ From 857973e6f7e0a3d03535a9df7f9373fd7a0b65cc Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 15 Dec 2014 15:58:13 +0000 -Subject: [PATCH 10/98] Teach the new inotify code about symlinks. +Subject: [PATCH 010/113] Teach the new inotify code about symlinks. --- src/inotify.c | 43 +++++++++++++++++++++++++++---------------- diff --git a/src/patches/dnsmasq/0011-Remove-floor-on-EDNS0-packet-size-with-DNSSEC.patch b/src/patches/dnsmasq/0011-Remove-floor-on-EDNS0-packet-size-with-DNSSEC.patch index c4dd777..d1766f5 100644 --- a/src/patches/dnsmasq/0011-Remove-floor-on-EDNS0-packet-size-with-DNSSEC.patch +++ b/src/patches/dnsmasq/0011-Remove-floor-on-EDNS0-packet-size-with-DNSSEC.patch @@ -1,7 +1,7 @@ From 800c5cc1e7438818fd80f08c2d472df249a6942d Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 15 Dec 2014 17:50:15 +0000 -Subject: [PATCH 11/98] Remove floor on EDNS0 packet size with DNSSEC. +Subject: [PATCH 011/113] Remove floor on EDNS0 packet size with DNSSEC. --- CHANGELOG | 6 +++++- diff --git a/src/patches/dnsmasq/0012-CHANGELOG-re.-inotify.patch b/src/patches/dnsmasq/0012-CHANGELOG-re.-inotify.patch index 0044a39..5fe1dfb 100644 --- a/src/patches/dnsmasq/0012-CHANGELOG-re.-inotify.patch +++ b/src/patches/dnsmasq/0012-CHANGELOG-re.-inotify.patch @@ -1,7 +1,7 @@ From ad946d555dce44eb690c7699933b6ff40ab85bb6 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 15 Dec 2014 17:52:22 +0000 -Subject: [PATCH 12/98] CHANGELOG re. inotify. +Subject: [PATCH 012/113] CHANGELOG re. inotify. --- CHANGELOG | 4 ++++ diff --git a/src/patches/dnsmasq/0013-Fix-breakage-of-domain-domain-subnet-local.patch b/src/patches/dnsmasq/0013-Fix-breakage-of-domain-domain-subnet-local.patch index 8f67d2a..284b5cc 100644 --- a/src/patches/dnsmasq/0013-Fix-breakage-of-domain-domain-subnet-local.patch +++ b/src/patches/dnsmasq/0013-Fix-breakage-of-domain-domain-subnet-local.patch @@ -1,7 +1,7 @@ From 3ad3f3bbd4ee716a7d2fb1e115cf89bd1b1a5de9 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 16 Dec 2014 18:25:17 +0000 -Subject: [PATCH 13/98] Fix breakage of --domain=<domain>,<subnet>,local +Subject: [PATCH 013/113] Fix breakage of --domain=<domain>,<subnet>,local --- CHANGELOG | 4 ++++ diff --git a/src/patches/dnsmasq/0014-Remove-redundant-IN6_IS_ADDR_ULA-a-macro-defn.patch b/src/patches/dnsmasq/0014-Remove-redundant-IN6_IS_ADDR_ULA-a-macro-defn.patch index 19f0322..65030e9 100644 --- a/src/patches/dnsmasq/0014-Remove-redundant-IN6_IS_ADDR_ULA-a-macro-defn.patch +++ b/src/patches/dnsmasq/0014-Remove-redundant-IN6_IS_ADDR_ULA-a-macro-defn.patch @@ -1,7 +1,7 @@ From bd9520b7ade7098ee423acc38965376aa57feb07 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 16 Dec 2014 20:41:29 +0000 -Subject: [PATCH 14/98] Remove redundant IN6_IS_ADDR_ULA(a) macro defn. +Subject: [PATCH 014/113] Remove redundant IN6_IS_ADDR_ULA(a) macro defn. --- src/network.c | 4 ---- diff --git a/src/patches/dnsmasq/0015-Eliminate-IPv6-privacy-addresses-from-interface-name.patch b/src/patches/dnsmasq/0015-Eliminate-IPv6-privacy-addresses-from-interface-name.patch index 2c9c2a6..8aca09f 100644 --- a/src/patches/dnsmasq/0015-Eliminate-IPv6-privacy-addresses-from-interface-name.patch +++ b/src/patches/dnsmasq/0015-Eliminate-IPv6-privacy-addresses-from-interface-name.patch @@ -1,8 +1,8 @@ From 476693678e778886b64d0b56e27eb7695cbcca99 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 17 Dec 2014 12:41:56 +0000 -Subject: [PATCH 15/98] Eliminate IPv6 privacy addresses from --interface-name - answers. +Subject: [PATCH 015/113] Eliminate IPv6 privacy addresses from + --interface-name answers. --- CHANGELOG | 5 +++++ diff --git a/src/patches/dnsmasq/0016-Tweak-field-width-in-cache-dump-to-avoid-truncating-.patch b/src/patches/dnsmasq/0016-Tweak-field-width-in-cache-dump-to-avoid-truncating-.patch index 3b984f3..df1268f 100644 --- a/src/patches/dnsmasq/0016-Tweak-field-width-in-cache-dump-to-avoid-truncating-.patch +++ b/src/patches/dnsmasq/0016-Tweak-field-width-in-cache-dump-to-avoid-truncating-.patch @@ -1,7 +1,7 @@ From 3267804598047bd1781cab91508d1bc516e5ddbb Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 17 Dec 2014 20:38:20 +0000 -Subject: [PATCH 16/98] Tweak field width in cache dump to avoid truncating +Subject: [PATCH 016/113] Tweak field width in cache dump to avoid truncating IPv6 addresses. --- diff --git a/src/patches/dnsmasq/0017-Fix-crash-in-DNSSEC-code-when-attempting-to-verify-l.patch b/src/patches/dnsmasq/0017-Fix-crash-in-DNSSEC-code-when-attempting-to-verify-l.patch index 0aa4fe9..81a39be 100644 --- a/src/patches/dnsmasq/0017-Fix-crash-in-DNSSEC-code-when-attempting-to-verify-l.patch +++ b/src/patches/dnsmasq/0017-Fix-crash-in-DNSSEC-code-when-attempting-to-verify-l.patch @@ -1,7 +1,7 @@ From 094b5c3d904bae9aeb3206d9f3b8348926b84975 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 21 Dec 2014 16:11:52 +0000 -Subject: [PATCH 17/98] Fix crash in DNSSEC code when attempting to verify +Subject: [PATCH 017/113] Fix crash in DNSSEC code when attempting to verify large RRs. --- diff --git a/src/patches/dnsmasq/0018-Make-caching-work-for-CNAMEs-pointing-to-A-AAAA-reco.patch b/src/patches/dnsmasq/0018-Make-caching-work-for-CNAMEs-pointing-to-A-AAAA-reco.patch index e80f0e3..6f41cf2 100644 --- a/src/patches/dnsmasq/0018-Make-caching-work-for-CNAMEs-pointing-to-A-AAAA-reco.patch +++ b/src/patches/dnsmasq/0018-Make-caching-work-for-CNAMEs-pointing-to-A-AAAA-reco.patch @@ -1,8 +1,8 @@ From cbc652423403e3cef00e00240f6beef713142246 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 21 Dec 2014 21:21:53 +0000 -Subject: [PATCH 18/98] Make caching work for CNAMEs pointing to A/AAAA records - shadowed in /etc/hosts +Subject: [PATCH 018/113] Make caching work for CNAMEs pointing to A/AAAA + records shadowed in /etc/hosts If the answer to an upstream query is a CNAME which points to an A/AAAA record which also exists in /etc/hosts and friends, then diff --git a/src/patches/dnsmasq/0019-Fix-problems-validating-NSEC3-and-wildcards.patch b/src/patches/dnsmasq/0019-Fix-problems-validating-NSEC3-and-wildcards.patch index 7bd143e..1755c3a 100644 --- a/src/patches/dnsmasq/0019-Fix-problems-validating-NSEC3-and-wildcards.patch +++ b/src/patches/dnsmasq/0019-Fix-problems-validating-NSEC3-and-wildcards.patch @@ -1,7 +1,7 @@ From fbc5205702c7f6f431d9f1043c553d7fb62ddfdb Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 23 Dec 2014 15:46:08 +0000 -Subject: [PATCH 19/98] Fix problems validating NSEC3 and wildcards. +Subject: [PATCH 019/113] Fix problems validating NSEC3 and wildcards. --- src/dnssec.c | 253 ++++++++++++++++++++++++++++++----------------------------- diff --git a/src/patches/dnsmasq/0020-Initialise-return-value.patch b/src/patches/dnsmasq/0020-Initialise-return-value.patch index 27d1217..2dd2f26 100644 --- a/src/patches/dnsmasq/0020-Initialise-return-value.patch +++ b/src/patches/dnsmasq/0020-Initialise-return-value.patch @@ -1,7 +1,7 @@ From 83d2ed09fc0216b567d7fb2197e4ff3eae150b0d Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 23 Dec 2014 18:42:38 +0000 -Subject: [PATCH 20/98] Initialise return value. +Subject: [PATCH 020/113] Initialise return value. --- src/dnssec.c | 7 +++++-- diff --git a/src/patches/dnsmasq/0021-Add-ignore-address-option.patch b/src/patches/dnsmasq/0021-Add-ignore-address-option.patch index ab6e7a5..7ff57af 100644 --- a/src/patches/dnsmasq/0021-Add-ignore-address-option.patch +++ b/src/patches/dnsmasq/0021-Add-ignore-address-option.patch @@ -1,7 +1,7 @@ From 32fc6dbe03569d70dd394420ceb73532cf303c33 Mon Sep 17 00:00:00 2001 From: Glen Huang <curvedmark(a)gmail.com> Date: Sat, 27 Dec 2014 15:28:12 +0000 -Subject: [PATCH 21/98] Add --ignore-address option. +Subject: [PATCH 021/113] Add --ignore-address option. --- CHANGELOG | 8 ++++++++ diff --git a/src/patches/dnsmasq/0022-Bad-packet-protection.patch b/src/patches/dnsmasq/0022-Bad-packet-protection.patch index 0c82506..96c4696 100644 --- a/src/patches/dnsmasq/0022-Bad-packet-protection.patch +++ b/src/patches/dnsmasq/0022-Bad-packet-protection.patch @@ -1,7 +1,7 @@ From 0b1008d367d44e77352134a4c5178f896f0db3e7 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 27 Dec 2014 15:33:32 +0000 -Subject: [PATCH 22/98] Bad packet protection. +Subject: [PATCH 022/113] Bad packet protection. --- src/dnssec.c | 2 +- diff --git a/src/patches/dnsmasq/0023-Fix-build-failure-in-new-inotify-code-on-BSD.patch b/src/patches/dnsmasq/0023-Fix-build-failure-in-new-inotify-code-on-BSD.patch index 5bf7d63..f5dfad8 100644 --- a/src/patches/dnsmasq/0023-Fix-build-failure-in-new-inotify-code-on-BSD.patch +++ b/src/patches/dnsmasq/0023-Fix-build-failure-in-new-inotify-code-on-BSD.patch @@ -1,7 +1,7 @@ From d310ab7ecbffce79d3d90debba621e0222f9bced Mon Sep 17 00:00:00 2001 From: Matthias Andree <matthias.andree(a)gmx.de> Date: Sat, 27 Dec 2014 15:36:38 +0000 -Subject: [PATCH 23/98] Fix build failure in new inotify code on BSD. +Subject: [PATCH 023/113] Fix build failure in new inotify code on BSD. --- src/inotify.c | 4 ++-- diff --git a/src/patches/dnsmasq/0024-Implement-makefile-dependencies-on-COPTS-variable.patch b/src/patches/dnsmasq/0024-Implement-makefile-dependencies-on-COPTS-variable.patch index 41662b7..6f29876 100644 --- a/src/patches/dnsmasq/0024-Implement-makefile-dependencies-on-COPTS-variable.patch +++ b/src/patches/dnsmasq/0024-Implement-makefile-dependencies-on-COPTS-variable.patch @@ -1,7 +1,7 @@ From 81c538efcebfce2ce4a1d3a420b6c885b8f08df9 Mon Sep 17 00:00:00 2001 From: Yousong Zhou <yszhou4tech(a)gmail.com> Date: Sat, 3 Jan 2015 16:36:14 +0000 -Subject: [PATCH 24/98] Implement makefile dependencies on COPTS variable. +Subject: [PATCH 024/113] Implement makefile dependencies on COPTS variable. --- .gitignore | 2 +- diff --git a/src/patches/dnsmasq/0025-Fix-race-condition-issue-in-makefile.patch b/src/patches/dnsmasq/0025-Fix-race-condition-issue-in-makefile.patch index 4de4883..84245f8 100644 --- a/src/patches/dnsmasq/0025-Fix-race-condition-issue-in-makefile.patch +++ b/src/patches/dnsmasq/0025-Fix-race-condition-issue-in-makefile.patch @@ -1,7 +1,7 @@ From d8dbd903d024f84a149dac2f8a674a68dfed47a3 Mon Sep 17 00:00:00 2001 From: Yousong Zhou <yszhou4tech(a)gmail.com> Date: Mon, 5 Jan 2015 17:03:35 +0000 -Subject: [PATCH 25/98] Fix race condition issue in makefile. +Subject: [PATCH 025/113] Fix race condition issue in makefile. --- Makefile | 4 +++- diff --git a/src/patches/dnsmasq/0026-DNSSEC-do-top-down-search-for-limit-of-secure-delega.patch b/src/patches/dnsmasq/0026-DNSSEC-do-top-down-search-for-limit-of-secure-delega.patch index cb9c925..e715c50 100644 --- a/src/patches/dnsmasq/0026-DNSSEC-do-top-down-search-for-limit-of-secure-delega.patch +++ b/src/patches/dnsmasq/0026-DNSSEC-do-top-down-search-for-limit-of-secure-delega.patch @@ -1,7 +1,7 @@ From 97e618a0e3f29465acc689d87288596b006f197e Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 7 Jan 2015 21:55:43 +0000 -Subject: [PATCH 26/98] DNSSEC: do top-down search for limit of secure +Subject: [PATCH 026/113] DNSSEC: do top-down search for limit of secure delegation. --- diff --git a/src/patches/dnsmasq/0027-Add-log-queries-extra-option-for-more-complete-loggi.patch b/src/patches/dnsmasq/0027-Add-log-queries-extra-option-for-more-complete-loggi.patch index 6b75253..f643527 100644 --- a/src/patches/dnsmasq/0027-Add-log-queries-extra-option-for-more-complete-loggi.patch +++ b/src/patches/dnsmasq/0027-Add-log-queries-extra-option-for-more-complete-loggi.patch @@ -1,7 +1,7 @@ From 25cf5e373eb41c088d4ee5e625209c4cf6a5659e Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 9 Jan 2015 15:53:03 +0000 -Subject: [PATCH 27/98] Add --log-queries=extra option for more complete +Subject: [PATCH 027/113] Add --log-queries=extra option for more complete logging. --- diff --git a/src/patches/dnsmasq/0028-Add-min-cache-ttl-option.patch b/src/patches/dnsmasq/0028-Add-min-cache-ttl-option.patch index 6bb1c97..8714feb 100644 --- a/src/patches/dnsmasq/0028-Add-min-cache-ttl-option.patch +++ b/src/patches/dnsmasq/0028-Add-min-cache-ttl-option.patch @@ -1,7 +1,7 @@ From 28de38768e2c7d763b9aa5b7a4d251d5e56bab0b Mon Sep 17 00:00:00 2001 From: RinSatsuki <aa65535(a)live.com> Date: Sat, 10 Jan 2015 15:22:21 +0000 -Subject: [PATCH 28/98] Add --min-cache-ttl option. +Subject: [PATCH 028/113] Add --min-cache-ttl option. --- CHANGELOG | 7 +++++++ diff --git a/src/patches/dnsmasq/0029-Log-port-of-requestor-when-doing-extra-logging.patch b/src/patches/dnsmasq/0029-Log-port-of-requestor-when-doing-extra-logging.patch index 0e63180..6c4423e 100644 --- a/src/patches/dnsmasq/0029-Log-port-of-requestor-when-doing-extra-logging.patch +++ b/src/patches/dnsmasq/0029-Log-port-of-requestor-when-doing-extra-logging.patch @@ -1,7 +1,7 @@ From 9f79ee4ae34886c0319f06d8f162b81ef79d62fb Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 12 Jan 2015 20:18:18 +0000 -Subject: [PATCH 29/98] Log port of requestor when doing extra logging. +Subject: [PATCH 029/113] Log port of requestor when doing extra logging. --- src/cache.c | 6 +++--- diff --git a/src/patches/dnsmasq/0030-Don-t-answer-from-cache-RRsets-from-wildcards-as-we-.patch b/src/patches/dnsmasq/0030-Don-t-answer-from-cache-RRsets-from-wildcards-as-we-.patch index 6817da1..3be42b4 100644 --- a/src/patches/dnsmasq/0030-Don-t-answer-from-cache-RRsets-from-wildcards-as-we-.patch +++ b/src/patches/dnsmasq/0030-Don-t-answer-from-cache-RRsets-from-wildcards-as-we-.patch @@ -1,7 +1,7 @@ From 5e321739db381a1d7b5964d76e9c81471d2564c9 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 12 Jan 2015 23:16:56 +0000 -Subject: [PATCH 30/98] Don't answer from cache RRsets from wildcards, as we +Subject: [PATCH 030/113] Don't answer from cache RRsets from wildcards, as we don't have NSECs. --- diff --git a/src/patches/dnsmasq/0031-Logs-for-DS-records-consistent.patch b/src/patches/dnsmasq/0031-Logs-for-DS-records-consistent.patch index 2b86121..eafd381 100644 --- a/src/patches/dnsmasq/0031-Logs-for-DS-records-consistent.patch +++ b/src/patches/dnsmasq/0031-Logs-for-DS-records-consistent.patch @@ -1,7 +1,7 @@ From ae4624bf46b5e37ff1a9a2ba3c927e0dede95adb Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 12 Jan 2015 23:22:08 +0000 -Subject: [PATCH 31/98] Logs for DS records consistent. +Subject: [PATCH 031/113] Logs for DS records consistent. --- src/rfc1035.c | 2 +- diff --git a/src/patches/dnsmasq/0032-Cope-with-multiple-interfaces-with-the-same-LL-addre.patch b/src/patches/dnsmasq/0032-Cope-with-multiple-interfaces-with-the-same-LL-addre.patch index d3d1277..4997b83 100644 --- a/src/patches/dnsmasq/0032-Cope-with-multiple-interfaces-with-the-same-LL-addre.patch +++ b/src/patches/dnsmasq/0032-Cope-with-multiple-interfaces-with-the-same-LL-addre.patch @@ -1,7 +1,8 @@ From 393415597c8b5b09558b789ab9ac238dbe3db65d Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 18 Jan 2015 22:11:10 +0000 -Subject: [PATCH 32/98] Cope with multiple interfaces with the same LL address. +Subject: [PATCH 032/113] Cope with multiple interfaces with the same LL + address. --- CHANGELOG | 4 ++++ diff --git a/src/patches/dnsmasq/0033-Don-t-treat-SERVFAIL-as-a-recoverable-error.patch b/src/patches/dnsmasq/0033-Don-t-treat-SERVFAIL-as-a-recoverable-error.patch index 07cc080..fe05a9c 100644 --- a/src/patches/dnsmasq/0033-Don-t-treat-SERVFAIL-as-a-recoverable-error.patch +++ b/src/patches/dnsmasq/0033-Don-t-treat-SERVFAIL-as-a-recoverable-error.patch @@ -1,7 +1,7 @@ From 2ae195f5a71f7c5a75717845de1bd72fc7dd67f3 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 18 Jan 2015 22:20:48 +0000 -Subject: [PATCH 33/98] Don't treat SERVFAIL as a recoverable error..... +Subject: [PATCH 033/113] Don't treat SERVFAIL as a recoverable error..... --- src/forward.c | 2 +- diff --git a/src/patches/dnsmasq/0034-Add-dhcp-hostsdir-config-option.patch b/src/patches/dnsmasq/0034-Add-dhcp-hostsdir-config-option.patch index b93d9cc..636e91d 100644 --- a/src/patches/dnsmasq/0034-Add-dhcp-hostsdir-config-option.patch +++ b/src/patches/dnsmasq/0034-Add-dhcp-hostsdir-config-option.patch @@ -1,7 +1,7 @@ From 5f4dc5c6ca50655ab14f572c7e30815ed74cd51a Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 20 Jan 2015 20:51:02 +0000 -Subject: [PATCH 34/98] Add --dhcp-hostsdir config option. +Subject: [PATCH 034/113] Add --dhcp-hostsdir config option. --- CHANGELOG | 5 +++ diff --git a/src/patches/dnsmasq/0035-Update-German-translation.patch b/src/patches/dnsmasq/0035-Update-German-translation.patch index 820bce1..99f7687 100644 --- a/src/patches/dnsmasq/0035-Update-German-translation.patch +++ b/src/patches/dnsmasq/0035-Update-German-translation.patch @@ -1,7 +1,7 @@ From fbf01f7046e75f9aa73fd4aab2a94e43386d9052 Mon Sep 17 00:00:00 2001 From: Conrad Kostecki <ck(a)conrad-kostecki.de> Date: Tue, 20 Jan 2015 21:07:56 +0000 -Subject: [PATCH 35/98] Update German translation. +Subject: [PATCH 035/113] Update German translation. --- po/de.po | 101 +++++++++++++++++++++++++++++---------------------------------- diff --git a/src/patches/dnsmasq/0036-Don-t-reply-to-DHCPv6-SOLICIT-messages-when-not-conf.patch b/src/patches/dnsmasq/0036-Don-t-reply-to-DHCPv6-SOLICIT-messages-when-not-conf.patch index 8856236..23d497e 100644 --- a/src/patches/dnsmasq/0036-Don-t-reply-to-DHCPv6-SOLICIT-messages-when-not-conf.patch +++ b/src/patches/dnsmasq/0036-Don-t-reply-to-DHCPv6-SOLICIT-messages-when-not-conf.patch @@ -1,7 +1,7 @@ From 61b838dd574c51d96fef100285a0d225824534f9 Mon Sep 17 00:00:00 2001 From: Win King Wan <pinwing+dnsmasq(a)gmail.com> Date: Wed, 21 Jan 2015 20:41:48 +0000 -Subject: [PATCH 36/98] Don't reply to DHCPv6 SOLICIT messages when not +Subject: [PATCH 036/113] Don't reply to DHCPv6 SOLICIT messages when not configured for statefull DHCPv6. --- diff --git a/src/patches/dnsmasq/0037-Allow-inotify-to-be-disabled-at-compile-time-on-Linu.patch b/src/patches/dnsmasq/0037-Allow-inotify-to-be-disabled-at-compile-time-on-Linu.patch index 2a4df45..d962964 100644 --- a/src/patches/dnsmasq/0037-Allow-inotify-to-be-disabled-at-compile-time-on-Linu.patch +++ b/src/patches/dnsmasq/0037-Allow-inotify-to-be-disabled-at-compile-time-on-Linu.patch @@ -1,7 +1,8 @@ From 0491805d2ff6e7727f0272c94fd97d9897d1e22c Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 26 Jan 2015 11:23:43 +0000 -Subject: [PATCH 37/98] Allow inotify to be disabled at compile time on Linux. +Subject: [PATCH 037/113] Allow inotify to be disabled at compile time on + Linux. --- CHANGELOG | 4 +++- diff --git a/src/patches/dnsmasq/0038-Expand-inotify-code-to-dhcp-hostsdir-dhcp-optsdir-an.patch b/src/patches/dnsmasq/0038-Expand-inotify-code-to-dhcp-hostsdir-dhcp-optsdir-an.patch index cd35f36..2059922 100644 --- a/src/patches/dnsmasq/0038-Expand-inotify-code-to-dhcp-hostsdir-dhcp-optsdir-an.patch +++ b/src/patches/dnsmasq/0038-Expand-inotify-code-to-dhcp-hostsdir-dhcp-optsdir-an.patch @@ -1,8 +1,8 @@ From 70d1873dd9e70041ed4bb88c69d5b886b7cc634c Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 31 Jan 2015 19:59:29 +0000 -Subject: [PATCH 38/98] Expand inotify code to dhcp-hostsdir, dhcp-optsdir and - hostsdir. +Subject: [PATCH 038/113] Expand inotify code to dhcp-hostsdir, dhcp-optsdir + and hostsdir. --- src/cache.c | 81 +++++++++++++++++--------- diff --git a/src/patches/dnsmasq/0039-Update-copyrights-for-dawn-of-2015.patch b/src/patches/dnsmasq/0039-Update-copyrights-for-dawn-of-2015.patch index 7cf3fa7..4b56034 100644 --- a/src/patches/dnsmasq/0039-Update-copyrights-for-dawn-of-2015.patch +++ b/src/patches/dnsmasq/0039-Update-copyrights-for-dawn-of-2015.patch @@ -1,7 +1,7 @@ From aff3396280e944833f0e23d834aa6acd5fe2605a Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 31 Jan 2015 20:13:40 +0000 -Subject: [PATCH 39/98] Update copyrights for dawn of 2015. +Subject: [PATCH 039/113] Update copyrights for dawn of 2015. --- Makefile | 2 +- diff --git a/src/patches/dnsmasq/0040-inotify-documentation-updates.patch b/src/patches/dnsmasq/0040-inotify-documentation-updates.patch index 3ed1b15..0a4a91a 100644 --- a/src/patches/dnsmasq/0040-inotify-documentation-updates.patch +++ b/src/patches/dnsmasq/0040-inotify-documentation-updates.patch @@ -1,7 +1,7 @@ From 3d04f46334d0e345f589eda1372e638b946fe637 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 31 Jan 2015 21:59:13 +0000 -Subject: [PATCH 40/98] inotify documentation updates. +Subject: [PATCH 040/113] inotify documentation updates. --- man/dnsmasq.8 | 11 +++++++++-- diff --git a/src/patches/dnsmasq/0041-Fix-broken-ECDSA-DNSSEC-signatures.patch b/src/patches/dnsmasq/0041-Fix-broken-ECDSA-DNSSEC-signatures.patch index 56dcc5f..01033f4 100644 --- a/src/patches/dnsmasq/0041-Fix-broken-ECDSA-DNSSEC-signatures.patch +++ b/src/patches/dnsmasq/0041-Fix-broken-ECDSA-DNSSEC-signatures.patch @@ -1,7 +1,7 @@ From 6ef15b34ca83c62a939f69356d5c3f7a6bfef3d0 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 31 Jan 2015 22:44:26 +0000 -Subject: [PATCH 41/98] Fix broken ECDSA DNSSEC signatures. +Subject: [PATCH 041/113] Fix broken ECDSA DNSSEC signatures. --- CHANGELOG | 2 ++ diff --git a/src/patches/dnsmasq/0042-BSD-make-support.patch b/src/patches/dnsmasq/0042-BSD-make-support.patch index 6584253..6e9bc47 100644 --- a/src/patches/dnsmasq/0042-BSD-make-support.patch +++ b/src/patches/dnsmasq/0042-BSD-make-support.patch @@ -1,7 +1,7 @@ From 106266761828a0acb006346ae47bf031dee46a5d Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 1 Feb 2015 00:15:16 +0000 -Subject: [PATCH 42/98] BSD make support +Subject: [PATCH 042/113] BSD make support --- Makefile | 6 ++++-- diff --git a/src/patches/dnsmasq/0043-Fix-build-failure-on-openBSD.patch b/src/patches/dnsmasq/0043-Fix-build-failure-on-openBSD.patch index a8c26bf..6953204 100644 --- a/src/patches/dnsmasq/0043-Fix-build-failure-on-openBSD.patch +++ b/src/patches/dnsmasq/0043-Fix-build-failure-on-openBSD.patch @@ -1,7 +1,7 @@ From 8d8a54ec79d9f96979fabbd97b1dd2ddebc7d78f Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 1 Feb 2015 21:48:46 +0000 -Subject: [PATCH 43/98] Fix build failure on openBSD. +Subject: [PATCH 043/113] Fix build failure on openBSD. --- src/tables.c | 2 +- diff --git a/src/patches/dnsmasq/0044-Manpage-typo-fix.patch b/src/patches/dnsmasq/0044-Manpage-typo-fix.patch index f8bd5fc..5c01cfe 100644 --- a/src/patches/dnsmasq/0044-Manpage-typo-fix.patch +++ b/src/patches/dnsmasq/0044-Manpage-typo-fix.patch @@ -1,7 +1,7 @@ From d36b732c4cfa91ea09af64b5dc0f3a85a075e5bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thi=C3=A9baud=20Weksteen?= <thiebaud(a)weksteen.fr> Date: Mon, 2 Feb 2015 21:37:27 +0000 -Subject: [PATCH 44/98] Manpage typo fix. +Subject: [PATCH 044/113] Manpage typo fix. --- man/dnsmasq.8 | 2 +- diff --git a/src/patches/dnsmasq/0045-Fixup-dhcp-configs-after-reading-extra-hostfiles-wit.patch b/src/patches/dnsmasq/0045-Fixup-dhcp-configs-after-reading-extra-hostfiles-wit.patch index 7f6d39f..b4c2748 100644 --- a/src/patches/dnsmasq/0045-Fixup-dhcp-configs-after-reading-extra-hostfiles-wit.patch +++ b/src/patches/dnsmasq/0045-Fixup-dhcp-configs-after-reading-extra-hostfiles-wit.patch @@ -1,7 +1,7 @@ From 2941d3ac898cf84b544e47c9735c5e4111711db1 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 2 Feb 2015 22:36:42 +0000 -Subject: [PATCH 45/98] Fixup dhcp-configs after reading extra hostfiles with +Subject: [PATCH 045/113] Fixup dhcp-configs after reading extra hostfiles with inotify. --- diff --git a/src/patches/dnsmasq/0046-Extra-logging-for-inotify-code.patch b/src/patches/dnsmasq/0046-Extra-logging-for-inotify-code.patch index b15ef9a..d4f823d 100644 --- a/src/patches/dnsmasq/0046-Extra-logging-for-inotify-code.patch +++ b/src/patches/dnsmasq/0046-Extra-logging-for-inotify-code.patch @@ -1,7 +1,7 @@ From f9c863708c6b0aea31ff7a466647685dc739de50 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 3 Feb 2015 21:52:48 +0000 -Subject: [PATCH 46/98] Extra logging for inotify code. +Subject: [PATCH 046/113] Extra logging for inotify code. --- src/cache.c | 9 ++++----- diff --git a/src/patches/dnsmasq/0047-man-page-typo.patch b/src/patches/dnsmasq/0047-man-page-typo.patch index 5557b51..bcf53f1 100644 --- a/src/patches/dnsmasq/0047-man-page-typo.patch +++ b/src/patches/dnsmasq/0047-man-page-typo.patch @@ -1,7 +1,7 @@ From efb8b5566aafc1f3ce18514a2df93af5a2e4998c Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 7 Feb 2015 22:36:34 +0000 -Subject: [PATCH 47/98] man page typo. +Subject: [PATCH 047/113] man page typo. --- man/dnsmasq.8 | 1 + diff --git a/src/patches/dnsmasq/0048-Fix-get-version-script-which-returned-wrong-tag-in-s.patch b/src/patches/dnsmasq/0048-Fix-get-version-script-which-returned-wrong-tag-in-s.patch index c70ca46..47ada5b 100644 --- a/src/patches/dnsmasq/0048-Fix-get-version-script-which-returned-wrong-tag-in-s.patch +++ b/src/patches/dnsmasq/0048-Fix-get-version-script-which-returned-wrong-tag-in-s.patch @@ -1,8 +1,8 @@ From f4f400776b3c1aa303d1a0fcd500f0ab5bc970f2 Mon Sep 17 00:00:00 2001 From: Shantanu Gadgil <shantanugadgil(a)yahoo.com> Date: Wed, 11 Feb 2015 20:16:59 +0000 -Subject: [PATCH 48/98] Fix get-version script which returned wrong tag in some - situations. +Subject: [PATCH 048/113] Fix get-version script which returned wrong tag in + some situations. --- bld/get-version | 2 +- diff --git a/src/patches/dnsmasq/0049-Typos.patch b/src/patches/dnsmasq/0049-Typos.patch index 1c71180..88ace38 100644 --- a/src/patches/dnsmasq/0049-Typos.patch +++ b/src/patches/dnsmasq/0049-Typos.patch @@ -1,7 +1,7 @@ From 8ff70de618eb7de9147dbfbd4deca4a2dd62f0cb Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 14 Feb 2015 20:02:37 +0000 -Subject: [PATCH 49/98] Typos. +Subject: [PATCH 049/113] Typos. --- src/inotify.c | 3 ++- diff --git a/src/patches/dnsmasq/0050-Make-dynamic-hosts-files-work-when-no-hosts-set.patch b/src/patches/dnsmasq/0050-Make-dynamic-hosts-files-work-when-no-hosts-set.patch index 38736c7..fda7094 100644 --- a/src/patches/dnsmasq/0050-Make-dynamic-hosts-files-work-when-no-hosts-set.patch +++ b/src/patches/dnsmasq/0050-Make-dynamic-hosts-files-work-when-no-hosts-set.patch @@ -1,7 +1,7 @@ From caeea190f12efd20139f694aac4942d1ac00019f Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 14 Feb 2015 20:08:56 +0000 -Subject: [PATCH 50/98] Make dynamic hosts files work when --no-hosts set. +Subject: [PATCH 050/113] Make dynamic hosts files work when --no-hosts set. --- src/cache.c | 21 +++++++++++---------- diff --git a/src/patches/dnsmasq/0051-Fix-trivial-memory-leaks-to-quieten-valgrind.patch b/src/patches/dnsmasq/0051-Fix-trivial-memory-leaks-to-quieten-valgrind.patch index fb15cc2..72bd1ca 100644 --- a/src/patches/dnsmasq/0051-Fix-trivial-memory-leaks-to-quieten-valgrind.patch +++ b/src/patches/dnsmasq/0051-Fix-trivial-memory-leaks-to-quieten-valgrind.patch @@ -1,7 +1,7 @@ From 28b879ac47b872af6e8c5e86d76806c69338434d Mon Sep 17 00:00:00 2001 From: Chen Wei <weichen302(a)icloud.com> Date: Tue, 17 Feb 2015 22:07:35 +0000 -Subject: [PATCH 51/98] Fix trivial memory leaks to quieten valgrind. +Subject: [PATCH 051/113] Fix trivial memory leaks to quieten valgrind. --- src/dnsmasq.c | 2 ++ diff --git a/src/patches/dnsmasq/0052-Fix-uninitialized-value-used-in-get_client_mac.patch b/src/patches/dnsmasq/0052-Fix-uninitialized-value-used-in-get_client_mac.patch index dabc770..1e28322 100644 --- a/src/patches/dnsmasq/0052-Fix-uninitialized-value-used-in-get_client_mac.patch +++ b/src/patches/dnsmasq/0052-Fix-uninitialized-value-used-in-get_client_mac.patch @@ -1,7 +1,7 @@ From 0705a7e2d57654b27c7e14f35ca77241c1821f4d Mon Sep 17 00:00:00 2001 From: Tomas Hozza <thozza(a)redhat.com> Date: Mon, 23 Feb 2015 21:26:26 +0000 -Subject: [PATCH 52/98] Fix uninitialized value used in get_client_mac() +Subject: [PATCH 052/113] Fix uninitialized value used in get_client_mac() --- src/dhcp6.c | 4 +++- diff --git a/src/patches/dnsmasq/0053-Log-parsing-utils-in-contrib-reverse-dns.patch b/src/patches/dnsmasq/0053-Log-parsing-utils-in-contrib-reverse-dns.patch index 82e38fc..9a53149 100644 --- a/src/patches/dnsmasq/0053-Log-parsing-utils-in-contrib-reverse-dns.patch +++ b/src/patches/dnsmasq/0053-Log-parsing-utils-in-contrib-reverse-dns.patch @@ -1,7 +1,7 @@ From 47b9ac59c715827252ae6e6732903c3dabb697fb Mon Sep 17 00:00:00 2001 From: Joachim Zobel <jz-2014(a)heute-morgen.de> Date: Mon, 23 Feb 2015 21:38:11 +0000 -Subject: [PATCH 53/98] Log parsing utils in contrib/reverse-dns +Subject: [PATCH 053/113] Log parsing utils in contrib/reverse-dns --- contrib/reverse-dns/README | 18 ++++++++++++++++++ diff --git a/src/patches/dnsmasq/0054-Add-dnssec-timestamp-option-and-facility.patch b/src/patches/dnsmasq/0054-Add-dnssec-timestamp-option-and-facility.patch index 6d57b65..4eebb74 100644 --- a/src/patches/dnsmasq/0054-Add-dnssec-timestamp-option-and-facility.patch +++ b/src/patches/dnsmasq/0054-Add-dnssec-timestamp-option-and-facility.patch @@ -1,7 +1,7 @@ From f6e62e2af96f5fa0d1e3d93167a93a8f09bf6e61 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 1 Mar 2015 18:17:54 +0000 -Subject: [PATCH 54/98] Add --dnssec-timestamp option and facility. +Subject: [PATCH 054/113] Add --dnssec-timestamp option and facility. --- CHANGELOG | 6 +++++ diff --git a/src/patches/dnsmasq/0055-Fix-last-commit-to-not-crash-if-uid-changing-not-con.patch b/src/patches/dnsmasq/0055-Fix-last-commit-to-not-crash-if-uid-changing-not-con.patch index 53e1388..e41596b 100644 --- a/src/patches/dnsmasq/0055-Fix-last-commit-to-not-crash-if-uid-changing-not-con.patch +++ b/src/patches/dnsmasq/0055-Fix-last-commit-to-not-crash-if-uid-changing-not-con.patch @@ -1,7 +1,7 @@ From 9003b50b13da624ca45f3e0cf99abb623b8d026b Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 2 Mar 2015 22:47:23 +0000 -Subject: [PATCH 55/98] Fix last commit to not crash if uid changing not +Subject: [PATCH 055/113] Fix last commit to not crash if uid changing not configured. --- diff --git a/src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch b/src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch index 32cd743..50b0db3 100644 --- a/src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch +++ b/src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch @@ -1,7 +1,7 @@ From 4c960fa90a975d20f75a1ecabd217247f1922c8f Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 4 Mar 2015 20:32:26 +0000 -Subject: [PATCH 56/98] New version of contrib/reverse-dns +Subject: [PATCH 056/113] New version of contrib/reverse-dns --- contrib/reverse-dns/README | 22 +++--- diff --git a/src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch b/src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch index d63c047..f33e4d2 100644 --- a/src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch +++ b/src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch @@ -1,7 +1,7 @@ From 360f2513ab12a9bf1e262d388dd2ea8a566590a3 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 7 Mar 2015 18:28:06 +0000 -Subject: [PATCH 57/98] Tweak DNSSEC timestamp code to create file later, +Subject: [PATCH 057/113] Tweak DNSSEC timestamp code to create file later, removing need to chown it. --- diff --git a/src/patches/dnsmasq/0058-Fix-boilerplate-code-for-re-running-system-calls-on-.patch b/src/patches/dnsmasq/0058-Fix-boilerplate-code-for-re-running-system-calls-on-.patch index f746fcf..18bae12 100644 --- a/src/patches/dnsmasq/0058-Fix-boilerplate-code-for-re-running-system-calls-on-.patch +++ b/src/patches/dnsmasq/0058-Fix-boilerplate-code-for-re-running-system-calls-on-.patch @@ -1,7 +1,7 @@ From ff841ebf5a5d6864ff48571f607c32ce80dbb75a Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 11 Mar 2015 21:36:30 +0000 -Subject: [PATCH 58/98] Fix boilerplate code for re-running system calls on +Subject: [PATCH 058/113] Fix boilerplate code for re-running system calls on EINTR and EAGAIN etc. The nasty code with static variable in retry_send() which diff --git a/src/patches/dnsmasq/0059-Make-address-example.com-equivalent-to-server-exampl.patch b/src/patches/dnsmasq/0059-Make-address-example.com-equivalent-to-server-exampl.patch index d986e8e..83690d3 100644 --- a/src/patches/dnsmasq/0059-Make-address-example.com-equivalent-to-server-exampl.patch +++ b/src/patches/dnsmasq/0059-Make-address-example.com-equivalent-to-server-exampl.patch @@ -1,7 +1,7 @@ From 979fe86bc8693f660eddea232ae39cbbb50b294c Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 19 Mar 2015 22:50:22 +0000 -Subject: [PATCH 59/98] Make --address=/example.com/ equivalent to +Subject: [PATCH 059/113] Make --address=/example.com/ equivalent to --server=/example.com/ --- diff --git a/src/patches/dnsmasq/0060-dhcp-set-outbound-interface-via-cmsg-in-unicast-repl.patch b/src/patches/dnsmasq/0060-dhcp-set-outbound-interface-via-cmsg-in-unicast-repl.patch index 6810930..0033d01 100644 --- a/src/patches/dnsmasq/0060-dhcp-set-outbound-interface-via-cmsg-in-unicast-repl.patch +++ b/src/patches/dnsmasq/0060-dhcp-set-outbound-interface-via-cmsg-in-unicast-repl.patch @@ -1,7 +1,8 @@ From 65c721200023ef0023114459a8d12f8b0a24cfd8 Mon Sep 17 00:00:00 2001 From: Lung-Pin Chang <changlp(a)cs.nctu.edu.tw> Date: Thu, 19 Mar 2015 23:22:21 +0000 -Subject: [PATCH 60/98] dhcp: set outbound interface via cmsg in unicast reply +Subject: [PATCH 060/113] dhcp: set outbound interface via cmsg in unicast + reply If multiple routes to the same network exist, Linux blindly picks the first interface (route) based on destination address, which might not be diff --git a/src/patches/dnsmasq/0061-Don-t-fail-DNSSEC-when-a-signed-CNAME-dangles-into-a.patch b/src/patches/dnsmasq/0061-Don-t-fail-DNSSEC-when-a-signed-CNAME-dangles-into-a.patch index af79f15..67bf508 100644 --- a/src/patches/dnsmasq/0061-Don-t-fail-DNSSEC-when-a-signed-CNAME-dangles-into-a.patch +++ b/src/patches/dnsmasq/0061-Don-t-fail-DNSSEC-when-a-signed-CNAME-dangles-into-a.patch @@ -1,7 +1,7 @@ From 8805283088d670baecb92569252c01cf754cda51 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 26 Mar 2015 21:15:43 +0000 -Subject: [PATCH 61/98] Don't fail DNSSEC when a signed CNAME dangles into an +Subject: [PATCH 061/113] Don't fail DNSSEC when a signed CNAME dangles into an unsigned zone. --- diff --git a/src/patches/dnsmasq/0062-Return-SERVFAIL-when-validation-abandoned.patch b/src/patches/dnsmasq/0062-Return-SERVFAIL-when-validation-abandoned.patch index 0b64aa7..ed4068e 100644 --- a/src/patches/dnsmasq/0062-Return-SERVFAIL-when-validation-abandoned.patch +++ b/src/patches/dnsmasq/0062-Return-SERVFAIL-when-validation-abandoned.patch @@ -1,7 +1,7 @@ From 150162bc37170a6edae9d488435e836b1e4e3a4e Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 27 Mar 2015 09:58:26 +0000 -Subject: [PATCH 62/98] Return SERVFAIL when validation abandoned. +Subject: [PATCH 062/113] Return SERVFAIL when validation abandoned. --- src/forward.c | 11 +++++++++-- diff --git a/src/patches/dnsmasq/0063-Protect-against-broken-DNSSEC-upstreams.patch b/src/patches/dnsmasq/0063-Protect-against-broken-DNSSEC-upstreams.patch index 9ecd43b..3372b2d 100644 --- a/src/patches/dnsmasq/0063-Protect-against-broken-DNSSEC-upstreams.patch +++ b/src/patches/dnsmasq/0063-Protect-against-broken-DNSSEC-upstreams.patch @@ -1,7 +1,7 @@ From 0b8a5a30a77331974ba24a04e43e720585dfbc61 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 27 Mar 2015 11:44:55 +0000 -Subject: [PATCH 63/98] Protect against broken DNSSEC upstreams. +Subject: [PATCH 063/113] Protect against broken DNSSEC upstreams. --- src/dnssec.c | 7 +++++-- diff --git a/src/patches/dnsmasq/0064-DNSSEC-fix-for-non-ascii-characters-in-labels.patch b/src/patches/dnsmasq/0064-DNSSEC-fix-for-non-ascii-characters-in-labels.patch index bfd703d..2a26325 100644 --- a/src/patches/dnsmasq/0064-DNSSEC-fix-for-non-ascii-characters-in-labels.patch +++ b/src/patches/dnsmasq/0064-DNSSEC-fix-for-non-ascii-characters-in-labels.patch @@ -1,7 +1,7 @@ From 1e153945def3c50d1e59ceea6a768db0ac770f98 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 28 Mar 2015 21:34:07 +0000 -Subject: [PATCH 64/98] DNSSEC fix for non-ascii characters in labels. +Subject: [PATCH 064/113] DNSSEC fix for non-ascii characters in labels. --- src/dnssec.c | 34 +++++++++++++++++----------------- diff --git a/src/patches/dnsmasq/0065-Allow-control-characters-in-names-in-the-cache-handl.patch b/src/patches/dnsmasq/0065-Allow-control-characters-in-names-in-the-cache-handl.patch index f67b65a..fc41947 100644 --- a/src/patches/dnsmasq/0065-Allow-control-characters-in-names-in-the-cache-handl.patch +++ b/src/patches/dnsmasq/0065-Allow-control-characters-in-names-in-the-cache-handl.patch @@ -1,8 +1,8 @@ From 394ff492da6af5da7e7d356be9586683bc5fc011 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 29 Mar 2015 22:17:14 +0100 -Subject: [PATCH 65/98] Allow control characters in names in the cache, handle - when logging. +Subject: [PATCH 065/113] Allow control characters in names in the cache, + handle when logging. --- src/cache.c | 19 +++++++++++++++++-- diff --git a/src/patches/dnsmasq/0066-Fix-crash-in-last-commit.patch b/src/patches/dnsmasq/0066-Fix-crash-in-last-commit.patch index 7a227d5..8625dae 100644 --- a/src/patches/dnsmasq/0066-Fix-crash-in-last-commit.patch +++ b/src/patches/dnsmasq/0066-Fix-crash-in-last-commit.patch @@ -1,7 +1,7 @@ From 794fccca7ffebfba4468bfffc6276b68bbf6afd9 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 29 Mar 2015 22:35:44 +0100 -Subject: [PATCH 66/98] Fix crash in last commit. +Subject: [PATCH 066/113] Fix crash in last commit. --- src/cache.c | 7 ++++--- diff --git a/src/patches/dnsmasq/0067-Merge-message-translations.patch b/src/patches/dnsmasq/0067-Merge-message-translations.patch index a88db22..67849f6 100644 --- a/src/patches/dnsmasq/0067-Merge-message-translations.patch +++ b/src/patches/dnsmasq/0067-Merge-message-translations.patch @@ -1,7 +1,7 @@ From fd6ad9e481ab7c812a6b1515244908818cbb0442 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 30 Mar 2015 07:52:21 +0100 -Subject: [PATCH 67/98] Merge message translations. +Subject: [PATCH 067/113] Merge message translations. --- po/de.po | 803 +++++++++++++++++++++++++++++++++-------------------------- diff --git a/src/patches/dnsmasq/0068-add-tftp-no-fail-to-ignore-missing-tftp-root.patch b/src/patches/dnsmasq/0068-add-tftp-no-fail-to-ignore-missing-tftp-root.patch index b273220..e8f796e 100644 --- a/src/patches/dnsmasq/0068-add-tftp-no-fail-to-ignore-missing-tftp-root.patch +++ b/src/patches/dnsmasq/0068-add-tftp-no-fail-to-ignore-missing-tftp-root.patch @@ -1,7 +1,7 @@ From 30d0879ed55cb67b1b735beab3d93f3bb3ef1dd2 Mon Sep 17 00:00:00 2001 From: Stefan Tomanek <stefan.tomanek+dnsmasq(a)wertarbyte.de> Date: Tue, 31 Mar 2015 22:32:11 +0100 -Subject: [PATCH 68/98] add --tftp-no-fail to ignore missing tftp root +Subject: [PATCH 068/113] add --tftp-no-fail to ignore missing tftp root --- CHANGELOG | 3 +++ diff --git a/src/patches/dnsmasq/0069-Whitespace-fixes.patch b/src/patches/dnsmasq/0069-Whitespace-fixes.patch index 684ef64..49dca71 100644 --- a/src/patches/dnsmasq/0069-Whitespace-fixes.patch +++ b/src/patches/dnsmasq/0069-Whitespace-fixes.patch @@ -1,7 +1,7 @@ From 7aa970e2c7043201663d86a4b5d8cd5c592cef39 Mon Sep 17 00:00:00 2001 From: Stefan Tomanek <stefan.tomanek+dnsmasq(a)wertarbyte.de> Date: Wed, 1 Apr 2015 17:55:07 +0100 -Subject: [PATCH 69/98] Whitespace fixes. +Subject: [PATCH 069/113] Whitespace fixes. --- src/dnsmasq.c | 14 +++++++------- diff --git a/src/patches/dnsmasq/0070-Return-INSECURE-rather-than-BOGUS-when-DS-proved-not.patch b/src/patches/dnsmasq/0070-Return-INSECURE-rather-than-BOGUS-when-DS-proved-not.patch index aa24c01..142f4c9 100644 --- a/src/patches/dnsmasq/0070-Return-INSECURE-rather-than-BOGUS-when-DS-proved-not.patch +++ b/src/patches/dnsmasq/0070-Return-INSECURE-rather-than-BOGUS-when-DS-proved-not.patch @@ -1,7 +1,7 @@ From fe3992f9fa69fa975ea31919c53933b5f6a63527 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 3 Apr 2015 21:25:05 +0100 -Subject: [PATCH 70/98] Return INSECURE, rather than BOGUS when DS proved not +Subject: [PATCH 070/113] Return INSECURE, rather than BOGUS when DS proved not to exist. Return INSECURE when validating DNS replies which have RRSIGs, but diff --git a/src/patches/dnsmasq/0071-Fix-compiler-warning-when-not-including-DNSSEC.patch b/src/patches/dnsmasq/0071-Fix-compiler-warning-when-not-including-DNSSEC.patch index ac57b8b..37f09d7 100644 --- a/src/patches/dnsmasq/0071-Fix-compiler-warning-when-not-including-DNSSEC.patch +++ b/src/patches/dnsmasq/0071-Fix-compiler-warning-when-not-including-DNSSEC.patch @@ -1,7 +1,7 @@ From 982faf402487e265ed11ac03524531d42b03c966 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 3 Apr 2015 21:42:30 +0100 -Subject: [PATCH 71/98] Fix compiler warning when not including DNSSEC. +Subject: [PATCH 071/113] Fix compiler warning when not including DNSSEC. --- src/forward.c | 3 ++- diff --git a/src/patches/dnsmasq/0072-Fix-crash-caused-by-looking-up-servers.bind-when-man.patch b/src/patches/dnsmasq/0072-Fix-crash-caused-by-looking-up-servers.bind-when-man.patch index 2303ec3..7baedf0 100644 --- a/src/patches/dnsmasq/0072-Fix-crash-caused-by-looking-up-servers.bind-when-man.patch +++ b/src/patches/dnsmasq/0072-Fix-crash-caused-by-looking-up-servers.bind-when-man.patch @@ -1,7 +1,7 @@ From 04b0ac05377936d121a36873bb63d492cde292c9 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 6 Apr 2015 17:19:13 +0100 -Subject: [PATCH 72/98] Fix crash caused by looking up servers.bind when many +Subject: [PATCH 072/113] Fix crash caused by looking up servers.bind when many servers defined. --- diff --git a/src/patches/dnsmasq/0073-Fix-crash-on-receipt-of-certain-malformed-DNS-reques.patch b/src/patches/dnsmasq/0073-Fix-crash-on-receipt-of-certain-malformed-DNS-reques.patch index 82471ae..cc7ed4b 100644 --- a/src/patches/dnsmasq/0073-Fix-crash-on-receipt-of-certain-malformed-DNS-reques.patch +++ b/src/patches/dnsmasq/0073-Fix-crash-on-receipt-of-certain-malformed-DNS-reques.patch @@ -1,7 +1,8 @@ From ad4a8ff7d9097008d7623df8543df435bfddeac8 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 9 Apr 2015 21:48:00 +0100 -Subject: [PATCH 73/98] Fix crash on receipt of certain malformed DNS requests. +Subject: [PATCH 073/113] Fix crash on receipt of certain malformed DNS + requests. --- CHANGELOG | 3 +++ diff --git a/src/patches/dnsmasq/0074-Fix-crash-in-auth-code-with-odd-configuration.patch b/src/patches/dnsmasq/0074-Fix-crash-in-auth-code-with-odd-configuration.patch index 6a7d798..4b4ff32 100644 --- a/src/patches/dnsmasq/0074-Fix-crash-in-auth-code-with-odd-configuration.patch +++ b/src/patches/dnsmasq/0074-Fix-crash-in-auth-code-with-odd-configuration.patch @@ -1,7 +1,7 @@ From 38440b204db65f9be16c4c3daa7e991e4356f6ed Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 12 Apr 2015 21:52:47 +0100 -Subject: [PATCH 74/98] Fix crash in auth code with odd configuration. +Subject: [PATCH 074/113] Fix crash in auth code with odd configuration. --- CHANGELOG | 32 +++++++++++++++++++++----------- diff --git a/src/patches/dnsmasq/0075-Auth-correct-replies-to-NS-and-SOA-in-.arpa-zones.patch b/src/patches/dnsmasq/0075-Auth-correct-replies-to-NS-and-SOA-in-.arpa-zones.patch index 76f3143..b125a92 100644 --- a/src/patches/dnsmasq/0075-Auth-correct-replies-to-NS-and-SOA-in-.arpa-zones.patch +++ b/src/patches/dnsmasq/0075-Auth-correct-replies-to-NS-and-SOA-in-.arpa-zones.patch @@ -1,7 +1,7 @@ From 78c6184752dce27849e36cce4360abc27b8d76d2 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 16 Apr 2015 15:05:30 +0100 -Subject: [PATCH 75/98] Auth: correct replies to NS and SOA in .arpa zones. +Subject: [PATCH 075/113] Auth: correct replies to NS and SOA in .arpa zones. --- CHANGELOG | 8 ++++++++ diff --git a/src/patches/dnsmasq/0076-Fix-srk-induced-crash-in-new-tftp_no_fail-code.patch b/src/patches/dnsmasq/0076-Fix-srk-induced-crash-in-new-tftp_no_fail-code.patch index 9401cb9..8702f53 100644 --- a/src/patches/dnsmasq/0076-Fix-srk-induced-crash-in-new-tftp_no_fail-code.patch +++ b/src/patches/dnsmasq/0076-Fix-srk-induced-crash-in-new-tftp_no_fail-code.patch @@ -1,7 +1,7 @@ From b4c0f092d8ce63ea4763c0ac17aa8d24318ad301 Mon Sep 17 00:00:00 2001 From: Stefan Tomanek <stefan.tomanek+dnsmasq(a)wertarbyte.de> Date: Thu, 16 Apr 2015 15:20:59 +0100 -Subject: [PATCH 76/98] Fix (srk induced) crash in new tftp_no_fail code. +Subject: [PATCH 076/113] Fix (srk induced) crash in new tftp_no_fail code. --- src/dnsmasq.c | 6 ++++-- diff --git a/src/patches/dnsmasq/0077-Note-CVE-2015-3294.patch b/src/patches/dnsmasq/0077-Note-CVE-2015-3294.patch index a14b1a8..9f2c6d8 100644 --- a/src/patches/dnsmasq/0077-Note-CVE-2015-3294.patch +++ b/src/patches/dnsmasq/0077-Note-CVE-2015-3294.patch @@ -1,7 +1,7 @@ From 0df29f5e23fd2f16181847db1fcf3a8b392d869a Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 16 Apr 2015 15:24:52 +0100 -Subject: [PATCH 77/98] Note CVE-2015-3294 +Subject: [PATCH 077/113] Note CVE-2015-3294 --- CHANGELOG | 3 +++ diff --git a/src/patches/dnsmasq/0078-Log-domain-when-reporting-DNSSEC-validation-failure.patch b/src/patches/dnsmasq/0078-Log-domain-when-reporting-DNSSEC-validation-failure.patch index 2204d24..f833b93 100644 --- a/src/patches/dnsmasq/0078-Log-domain-when-reporting-DNSSEC-validation-failure.patch +++ b/src/patches/dnsmasq/0078-Log-domain-when-reporting-DNSSEC-validation-failure.patch @@ -1,7 +1,7 @@ From 554b580e970275d5a869cb4fbfb2716f92b2f664 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 17 Apr 2015 22:50:20 +0100 -Subject: [PATCH 78/98] Log domain when reporting DNSSEC validation failure. +Subject: [PATCH 078/113] Log domain when reporting DNSSEC validation failure. --- src/forward.c | 15 ++++++++++----- diff --git a/src/patches/dnsmasq/0079-Check-IP-address-command-line-arg-in-dhcp_release.c.patch b/src/patches/dnsmasq/0079-Check-IP-address-command-line-arg-in-dhcp_release.c.patch index 6db33bb..9916cb7 100644 --- a/src/patches/dnsmasq/0079-Check-IP-address-command-line-arg-in-dhcp_release.c.patch +++ b/src/patches/dnsmasq/0079-Check-IP-address-command-line-arg-in-dhcp_release.c.patch @@ -1,7 +1,7 @@ From a006eb7e1486023480ea40244720ef7aab51de71 Mon Sep 17 00:00:00 2001 From: Moshe Levi <moshele(a)mellanox.com> Date: Sun, 19 Apr 2015 22:10:40 +0100 -Subject: [PATCH 79/98] Check IP address command line arg in dhcp_release.c +Subject: [PATCH 079/113] Check IP address command line arg in dhcp_release.c --- contrib/wrt/dhcp_release.c | 5 +++++ diff --git a/src/patches/dnsmasq/0080-Revert-61b838dd574c51d96fef100285a0d225824534f9-and-.patch b/src/patches/dnsmasq/0080-Revert-61b838dd574c51d96fef100285a0d225824534f9-and-.patch index 4fe26ac..c4e2103 100644 --- a/src/patches/dnsmasq/0080-Revert-61b838dd574c51d96fef100285a0d225824534f9-and-.patch +++ b/src/patches/dnsmasq/0080-Revert-61b838dd574c51d96fef100285a0d225824534f9-and-.patch @@ -1,7 +1,7 @@ From 338b340be9e7198f5c0f68133d070d6598a0814c Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 20 Apr 2015 21:34:05 +0100 -Subject: [PATCH 80/98] Revert 61b838dd574c51d96fef100285a0d225824534f9 and +Subject: [PATCH 080/113] Revert 61b838dd574c51d96fef100285a0d225824534f9 and just quieten log instead. --- diff --git a/src/patches/dnsmasq/0081-Handle-domain-names-with-.-or-000-within-labels.patch b/src/patches/dnsmasq/0081-Handle-domain-names-with-.-or-000-within-labels.patch index 13ff059..a2f10fe 100644 --- a/src/patches/dnsmasq/0081-Handle-domain-names-with-.-or-000-within-labels.patch +++ b/src/patches/dnsmasq/0081-Handle-domain-names-with-.-or-000-within-labels.patch @@ -1,7 +1,7 @@ From cbe379ad6b52a538a4416a7cd992817e5637ccf9 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 21 Apr 2015 22:57:06 +0100 -Subject: [PATCH 81/98] Handle domain names with '.' or /000 within labels. +Subject: [PATCH 081/113] Handle domain names with '.' or /000 within labels. Only in DNSSEC mode, where we might need to validate or store such names. In none-DNSSEC mode, simply don't cache these, as before. diff --git a/src/patches/dnsmasq/0082-Tweaks-to-previous-DNS-label-charset-commit.patch b/src/patches/dnsmasq/0082-Tweaks-to-previous-DNS-label-charset-commit.patch index 2429e99..1b2b73b 100644 --- a/src/patches/dnsmasq/0082-Tweaks-to-previous-DNS-label-charset-commit.patch +++ b/src/patches/dnsmasq/0082-Tweaks-to-previous-DNS-label-charset-commit.patch @@ -1,7 +1,7 @@ From b8f16556d36924cd8dc7663cb4129d7b1f3fc2be Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 22 Apr 2015 21:14:31 +0100 -Subject: [PATCH 82/98] Tweaks to previous, DNS label charset commit. +Subject: [PATCH 082/113] Tweaks to previous, DNS label charset commit. --- src/dns-protocol.h | 6 +++++- diff --git a/src/patches/dnsmasq/0083-Logs-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch b/src/patches/dnsmasq/0083-Logs-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch index 423b40e..bd800c7 100644 --- a/src/patches/dnsmasq/0083-Logs-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch +++ b/src/patches/dnsmasq/0083-Logs-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch @@ -1,7 +1,7 @@ From a5ae1f85873829efe473075ad77806cc02792622 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 25 Apr 2015 21:46:10 +0100 -Subject: [PATCH 83/98] Logs in DHCPv6 not suppressed by dhcp6-quiet. +Subject: [PATCH 083/113] Logs in DHCPv6 not suppressed by dhcp6-quiet. --- CHANGELOG | 6 +++++- diff --git a/src/patches/dnsmasq/0084-Make-get-version-work-when-repo-is-a-git-submodule.patch b/src/patches/dnsmasq/0084-Make-get-version-work-when-repo-is-a-git-submodule.patch index 555bd6c..bafdeb2 100644 --- a/src/patches/dnsmasq/0084-Make-get-version-work-when-repo-is-a-git-submodule.patch +++ b/src/patches/dnsmasq/0084-Make-get-version-work-when-repo-is-a-git-submodule.patch @@ -1,7 +1,7 @@ From 8efd731cc4ed2baa42aa69d0a9d336392e9987cb Mon Sep 17 00:00:00 2001 From: "Johnny S. Lee" <_(a)jsl.io> Date: Sun, 26 Apr 2015 22:23:57 +0100 -Subject: [PATCH 84/98] Make get-version work when repo is a git submodule. +Subject: [PATCH 084/113] Make get-version work when repo is a git submodule. --- bld/get-version | 5 +++-- diff --git a/src/patches/dnsmasq/0085-Fix-argument-order-botch-which-broke-DNSSEC-for-TCP-.patch b/src/patches/dnsmasq/0085-Fix-argument-order-botch-which-broke-DNSSEC-for-TCP-.patch index 828c21f..0b5a6cf 100644 --- a/src/patches/dnsmasq/0085-Fix-argument-order-botch-which-broke-DNSSEC-for-TCP-.patch +++ b/src/patches/dnsmasq/0085-Fix-argument-order-botch-which-broke-DNSSEC-for-TCP-.patch @@ -1,7 +1,7 @@ From e66b4dff3c562c7836d5be4c26972d665ad783f1 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 28 Apr 2015 20:45:57 +0100 -Subject: [PATCH 85/98] Fix argument-order botch which broke DNSSEC for TCP +Subject: [PATCH 085/113] Fix argument-order botch which broke DNSSEC for TCP queries. --- diff --git a/src/patches/dnsmasq/0086-Don-t-remove-RRSIG-RR-from-answers-to-ANY-queries-wh.patch b/src/patches/dnsmasq/0086-Don-t-remove-RRSIG-RR-from-answers-to-ANY-queries-wh.patch index 9d3aadc..afa4831 100644 --- a/src/patches/dnsmasq/0086-Don-t-remove-RRSIG-RR-from-answers-to-ANY-queries-wh.patch +++ b/src/patches/dnsmasq/0086-Don-t-remove-RRSIG-RR-from-answers-to-ANY-queries-wh.patch @@ -1,8 +1,8 @@ From 2ed162ac204f3609fe4d9f9a0430baeaa352d88f Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 28 Apr 2015 21:26:35 +0100 -Subject: [PATCH 86/98] Don't remove RRSIG RR from answers to ANY queries when - the do bit is not set. +Subject: [PATCH 086/113] Don't remove RRSIG RR from answers to ANY queries + when the do bit is not set. --- src/rfc1035.c | 5 +++++ diff --git a/src/patches/dnsmasq/0087-Constify-some-DHCP-lease-management-functions.patch b/src/patches/dnsmasq/0087-Constify-some-DHCP-lease-management-functions.patch index 743548e..0023ab5 100644 --- a/src/patches/dnsmasq/0087-Constify-some-DHCP-lease-management-functions.patch +++ b/src/patches/dnsmasq/0087-Constify-some-DHCP-lease-management-functions.patch @@ -1,7 +1,7 @@ From 64bcff1c7c72eecda8750bc2dca8b4c5dc38a837 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari <nicolas.cavallari(a)green-communications.fr> Date: Tue, 28 Apr 2015 21:55:18 +0100 -Subject: [PATCH 87/98] Constify some DHCP lease management functions. +Subject: [PATCH 087/113] Constify some DHCP lease management functions. --- src/dnsmasq.h | 7 ++++--- diff --git a/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-p.patch b/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-p.patch index af4d6d7..af86776 100644 --- a/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-p.patch +++ b/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-p.patch @@ -1,7 +1,7 @@ From a77cec8d58231d71cbc26615f0c0f0292c09ef54 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 8 May 2015 16:25:38 +0100 -Subject: [PATCH 88/98] Handle UDP packet loss when fragmentation of large +Subject: [PATCH 088/113] Handle UDP packet loss when fragmentation of large packets is broken. --- diff --git a/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with-stop-rebind.patch b/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with-stop-rebind.patch index c75d864..a1011b0 100644 --- a/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with-stop-rebind.patch +++ b/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with-stop-rebind.patch @@ -1,7 +1,7 @@ From b059c96dc69dfe3055c5b32b078a05c53b11ebb3 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 8 May 2015 20:25:51 +0100 -Subject: [PATCH 89/98] Check IPv4-mapped IPv6 addresses with --stop-rebind. +Subject: [PATCH 089/113] Check IPv4-mapped IPv6 addresses with --stop-rebind. --- CHANGELOG | 3 +++ diff --git a/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch b/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch index b6d9c47..d774a23 100644 --- a/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch +++ b/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch @@ -1,7 +1,7 @@ From 86fa1046920dedc8134136a6244ca96e8a37e9d8 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 10 May 2015 13:50:59 +0100 -Subject: [PATCH 90/98] Tweak EDNS timeout code. +Subject: [PATCH 090/113] Tweak EDNS timeout code. --- src/forward.c | 6 ++++-- diff --git a/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc.h.patch b/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc.h.patch index b65bb87..abfea9c 100644 --- a/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc.h.patch +++ b/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc.h.patch @@ -1,7 +1,7 @@ From 585840b03365372679907f175b07a01c9d621ae0 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 13 May 2015 12:35:57 +0100 -Subject: [PATCH 91/98] Pointer to mail-archive mailing list mirror in +Subject: [PATCH 091/113] Pointer to mail-archive mailing list mirror in doc.html. --- diff --git a/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch b/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch index 84246c3..6fb21e8 100644 --- a/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch +++ b/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch @@ -1,7 +1,7 @@ From ca85a28241ef87919d68d52c843b6964b7070e11 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 13 May 2015 22:33:04 +0100 -Subject: [PATCH 92/98] Allow T1 and T2 DHCPv4 options to be set. +Subject: [PATCH 092/113] Allow T1 and T2 DHCPv4 options to be set. --- CHANGELOG | 3 +++ diff --git a/src/patches/dnsmasq/0093-Tweak-last-commit.patch b/src/patches/dnsmasq/0093-Tweak-last-commit.patch index 578e764..5192bbc 100644 --- a/src/patches/dnsmasq/0093-Tweak-last-commit.patch +++ b/src/patches/dnsmasq/0093-Tweak-last-commit.patch @@ -1,7 +1,7 @@ From 7c0f2543a7e761d1ec82738374556beeb8a35bef Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 14 May 2015 21:16:18 +0100 -Subject: [PATCH 93/98] Tweak last commit. +Subject: [PATCH 093/113] Tweak last commit. --- src/rfc2131.c | 8 ++++---- diff --git a/src/patches/dnsmasq/0094-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch b/src/patches/dnsmasq/0094-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch index a7d7546..ad18401 100644 --- a/src/patches/dnsmasq/0094-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch +++ b/src/patches/dnsmasq/0094-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch @@ -1,7 +1,7 @@ From 62018e1f720fa11e83879111a4b1b3753b5c25bb Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 14 May 2015 21:30:00 +0100 -Subject: [PATCH 94/98] Use correct DHCP context for PXE-proxy server-id. +Subject: [PATCH 094/113] Use correct DHCP context for PXE-proxy server-id. --- src/rfc2131.c | 4 ++-- diff --git a/src/patches/dnsmasq/0095-Fix-buffer-overflow-introduced-in-2.73rc6.patch b/src/patches/dnsmasq/0095-Fix-buffer-overflow-introduced-in-2.73rc6.patch index b1b06f2..a6a788f 100644 --- a/src/patches/dnsmasq/0095-Fix-buffer-overflow-introduced-in-2.73rc6.patch +++ b/src/patches/dnsmasq/0095-Fix-buffer-overflow-introduced-in-2.73rc6.patch @@ -1,7 +1,7 @@ From 5d07d77e75e0f02bc0a8f6029ffbc8b371fa804e Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 15 May 2015 18:13:06 +0100 -Subject: [PATCH 95/98] Fix buffer overflow introduced in 2.73rc6. +Subject: [PATCH 095/113] Fix buffer overflow introduced in 2.73rc6. Fix off-by-one in code which checks for over-long domain names in received DNS packets. This enables buffer overflow attacks diff --git a/src/patches/dnsmasq/0096-Remove-support-for-DNS-Extended-Label-Types.patch b/src/patches/dnsmasq/0096-Remove-support-for-DNS-Extended-Label-Types.patch index db0a1e5..763a43d 100644 --- a/src/patches/dnsmasq/0096-Remove-support-for-DNS-Extended-Label-Types.patch +++ b/src/patches/dnsmasq/0096-Remove-support-for-DNS-Extended-Label-Types.patch @@ -1,7 +1,7 @@ From 06568c663643b9ed1577d95efee69d734f427cf5 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 15 May 2015 20:43:48 +0100 -Subject: [PATCH 96/98] Remove support for DNS Extended Label Types. +Subject: [PATCH 096/113] Remove support for DNS Extended Label Types. The support was only partial, and the whole concept is now deprecated in the standards. diff --git a/src/patches/dnsmasq/0097-Select-correct-DHCP-context-when-in-PXE-bootserver-m.patch b/src/patches/dnsmasq/0097-Select-correct-DHCP-context-when-in-PXE-bootserver-m.patch index b9f2e63..896ba6d 100644 --- a/src/patches/dnsmasq/0097-Select-correct-DHCP-context-when-in-PXE-bootserver-m.patch +++ b/src/patches/dnsmasq/0097-Select-correct-DHCP-context-when-in-PXE-bootserver-m.patch @@ -1,7 +1,7 @@ From 7f8565b94ca52dde31f7688a9f9a0cc611d9dae3 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 19 May 2015 23:01:27 +0100 -Subject: [PATCH 97/98] Select correct DHCP context when in PXE bootserver +Subject: [PATCH 097/113] Select correct DHCP context when in PXE bootserver mode. --- diff --git a/src/patches/dnsmasq/0098-Tweak-immediately-previous-patch.patch b/src/patches/dnsmasq/0098-Tweak-immediately-previous-patch.patch index 1be4278..a478e77 100644 --- a/src/patches/dnsmasq/0098-Tweak-immediately-previous-patch.patch +++ b/src/patches/dnsmasq/0098-Tweak-immediately-previous-patch.patch @@ -1,7 +1,7 @@ From 549b1a478c5eee9dbd3a0709913a26ec29d30f2c Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 20 May 2015 20:20:24 +0100 -Subject: [PATCH 98/98] Tweak immediately previous patch. +Subject: [PATCH 098/113] Tweak immediately previous patch. --- src/rfc2131.c | 9 +++++++-- diff --git a/src/patches/dnsmasq/0099-Man-page-typo.patch b/src/patches/dnsmasq/0099-Man-page-typo.patch new file mode 100644 index 0000000..51831ad --- /dev/null +++ b/src/patches/dnsmasq/0099-Man-page-typo.patch @@ -0,0 +1,25 @@ +From 23facf0d7752b048521f0d900336bda89348ae67 Mon Sep 17 00:00:00 2001 +From: Christian Demsar <vixsomnis(a)fastmail.com> +Date: Wed, 20 May 2015 20:26:23 +0100 +Subject: [PATCH 099/113] Man page typo. + +--- + man/dnsmasq.8 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 +index 6b4626cc0aad..f811dc326e9f 100644 +--- a/man/dnsmasq.8 ++++ b/man/dnsmasq.8 +@@ -1388,7 +1388,7 @@ enables dynamic allocation. With tags, only when the tags are all + set. It may be repeated with different tag sets. + .TP + .B \-5, --no-ping +-(IPv4 only) By default, the DHCP server will attempt to ensure that an address in ++(IPv4 only) By default, the DHCP server will attempt to ensure that an address is + not in use before allocating it to a host. It does this by sending an + ICMP echo request (aka "ping") to the address in question. If it gets + a reply, then the address must already be in use, and another is +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0100-Add-infiniband-to-example-config-file.patch b/src/patches/dnsmasq/0100-Add-infiniband-to-example-config-file.patch new file mode 100644 index 0000000..74c6800 --- /dev/null +++ b/src/patches/dnsmasq/0100-Add-infiniband-to-example-config-file.patch @@ -0,0 +1,30 @@ +From 46c89f2bd0e0734889e4707202a5aaed24f74daa Mon Sep 17 00:00:00 2001 +From: John Hanks <griznog(a)gmail.com> +Date: Tue, 26 May 2015 22:07:57 +0100 +Subject: [PATCH 100/113] Add infiniband to example config file. + +--- + dnsmasq.conf.example | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/dnsmasq.conf.example b/dnsmasq.conf.example +index 67be99acb028..250a79204e8d 100644 +--- a/dnsmasq.conf.example ++++ b/dnsmasq.conf.example +@@ -251,6 +251,13 @@ + # the IP address 192.168.0.60 + #dhcp-host=id:01:02:02:04,192.168.0.60 + ++# Always give the Infiniband interface with hardware address ++# 80:00:00:48:fe:80:00:00:00:00:00:00:f4:52:14:03:00:28:05:81 the ++# ip address 192.168.0.61. The client id is derived from the prefix ++# ff:00:00:00:00:00:02:00:00:02:c9:00 and the last 8 pairs of ++# hex digits of the hardware address. ++#dhcp-host=id:ff:00:00:00:00:00:02:00:00:02:c9:00:f4:52:14:03:00:28:05:81,192.168.0.61 ++ + # Always give the host with client identifier "marjorie" + # the IP address 192.168.0.60 + #dhcp-host=id:marjorie,192.168.0.60 +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0101-Correctly-sanitise-DNS-header-bits-in-answer-when-re.patch b/src/patches/dnsmasq/0101-Correctly-sanitise-DNS-header-bits-in-answer-when-re.patch new file mode 100644 index 0000000..e97e5f7 --- /dev/null +++ b/src/patches/dnsmasq/0101-Correctly-sanitise-DNS-header-bits-in-answer-when-re.patch @@ -0,0 +1,55 @@ +From bd7bfa21c4500fca8b18bc7f68890bf51cd737e3 Mon Sep 17 00:00:00 2001 +From: swigger <swigger(a)gmail.com> +Date: Mon, 1 Jun 2015 20:54:59 +0100 +Subject: [PATCH 101/113] Correctly sanitise DNS header bits in answer when + recreating query for retry. + +--- + src/dns-protocol.h | 14 +++++++------- + src/forward.c | 3 ++- + 2 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/src/dns-protocol.h b/src/dns-protocol.h +index 4b71746f8d26..6cf515881c17 100644 +--- a/src/dns-protocol.h ++++ b/src/dns-protocol.h +@@ -84,15 +84,15 @@ struct dns_header { + u16 qdcount,ancount,nscount,arcount; + }; + +-#define HB3_QR 0x80 ++#define HB3_QR 0x80 /* Query */ + #define HB3_OPCODE 0x78 +-#define HB3_AA 0x04 +-#define HB3_TC 0x02 +-#define HB3_RD 0x01 ++#define HB3_AA 0x04 /* Authoritative Answer */ ++#define HB3_TC 0x02 /* TrunCated */ ++#define HB3_RD 0x01 /* Recursion Desired */ + +-#define HB4_RA 0x80 +-#define HB4_AD 0x20 +-#define HB4_CD 0x10 ++#define HB4_RA 0x80 /* Recursion Available */ ++#define HB4_AD 0x20 /* Authenticated Data */ ++#define HB4_CD 0x10 /* Checking Disabled */ + #define HB4_RCODE 0x0f + + #define OPCODE(x) (((x)->hb3 & HB3_OPCODE) >> 3) +diff --git a/src/forward.c b/src/forward.c +index 74e5ab66c423..8c3e71cebe87 100644 +--- a/src/forward.c ++++ b/src/forward.c +@@ -769,7 +769,8 @@ void reply_query(int fd, int family, time_t now) + header->arcount = htons(0); + if ((nn = resize_packet(header, (size_t)n, pheader, plen))) + { +- header->hb3 &= ~(HB3_QR | HB3_TC); ++ header->hb3 &= ~(HB3_QR | HB3_AA | HB3_TC); ++ header->hb4 &= ~(HB4_RA | HB4_RCODE); + forward_query(-1, NULL, NULL, 0, header, nn, now, forward, 0, 0); + return; + } +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0102-DHCPv6-DHCPCONFIRM-should-be-OK-for-any-address-on-l.patch b/src/patches/dnsmasq/0102-DHCPv6-DHCPCONFIRM-should-be-OK-for-any-address-on-l.patch new file mode 100644 index 0000000..22b24cd --- /dev/null +++ b/src/patches/dnsmasq/0102-DHCPv6-DHCPCONFIRM-should-be-OK-for-any-address-on-l.patch @@ -0,0 +1,43 @@ +From 89130d91d684faa88cb244f46c85eb26a8c06d7a Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Wed, 3 Jun 2015 22:30:59 +0100 +Subject: [PATCH 102/113] DHCPv6: DHCPCONFIRM should be OK for any address on + link, not just dynamic addresses. + +--- + CHANGELOG | 5 +++++ + src/rfc3315.c | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CHANGELOG b/CHANGELOG +index ef39a415788b..9e1b5a5ab0b8 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -121,6 +121,11 @@ version 2.73 + Allow DHCPv4 options T1 and T2 to be set using --dhcp-option. + Thanks to Kevin Benton for patches and work on this. + ++ Fix code for DHCPCONFIRM DHCPv6 messages to confirm addresses ++ in the correct subnet, even of not in dynamic address ++ allocation range. Thanks to Steve Hirsch for spotting ++ the problem. ++ + + version 2.72 + Add ra-advrouter mode, for RFC-3775 mobile IPv6 support. +diff --git a/src/rfc3315.c b/src/rfc3315.c +index b4f5dd2db61f..2665d0d3294a 100644 +--- a/src/rfc3315.c ++++ b/src/rfc3315.c +@@ -1089,7 +1089,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ + { + struct in6_addr *req_addr = opt6_ptr(ia_option, 0); + +- if (!address6_available(state->context, req_addr, tagif, 1)) ++ if (!address6_valid(state->context, req_addr, tagif, 1)) + { + o1 = new_opt6(OPTION6_STATUS_CODE); + put_opt6_short(DHCP6NOTONLINK); +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0103-Handle-corner-cases-in-NSEC-coverage-checks.patch b/src/patches/dnsmasq/0103-Handle-corner-cases-in-NSEC-coverage-checks.patch new file mode 100644 index 0000000..c7cde8d --- /dev/null +++ b/src/patches/dnsmasq/0103-Handle-corner-cases-in-NSEC-coverage-checks.patch @@ -0,0 +1,53 @@ +From 4d25cf89d51c635af0a23c0ca3425c7aadbc0b55 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Sat, 6 Jun 2015 23:13:57 +0100 +Subject: [PATCH 103/113] Handle corner cases in NSEC coverage checks. + +--- + src/dnssec.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/dnssec.c b/src/dnssec.c +index e91d7c2cf040..93217b05a846 100644 +--- a/src/dnssec.c ++++ b/src/dnssec.c +@@ -1493,13 +1493,13 @@ static int prove_non_existence_nsec(struct dns_header *header, size_t plen, unsi + { + /* Normal case, name falls between NSEC name and next domain name, + wrap around case, name falls between NSEC name (rc == -1) and end */ +- if (hostname_cmp(workspace2, name) == 1 || hostname_cmp(workspace1, workspace2) == 1) ++ if (hostname_cmp(workspace2, name) >= 0 || hostname_cmp(workspace1, workspace2) >= 0) + return STAT_SECURE; + } + else + { + /* wrap around case, name falls between start and next domain name */ +- if (hostname_cmp(workspace1, workspace2) == 1 && hostname_cmp(workspace2, name) == 1) ++ if (hostname_cmp(workspace1, workspace2) >= 0 && hostname_cmp(workspace2, name) >=0 ) + return STAT_SECURE; + } + } +@@ -1632,17 +1632,17 @@ static int check_nsec3_coverage(struct dns_header *header, size_t plen, int dige + + return 1; + } +- else if (rc <= 0) ++ else if (rc < 0) + { + /* Normal case, hash falls between NSEC3 name-hash and next domain name-hash, + wrap around case, name-hash falls between NSEC3 name-hash and end */ +- if (memcmp(p, digest, digest_len) > 0 || memcmp(workspace2, p, digest_len) > 0) ++ if (memcmp(p, digest, digest_len) >= 0 || memcmp(workspace2, p, digest_len) >= 0) + return 1; + } + else + { + /* wrap around case, name falls between start and next domain name */ +- if (memcmp(workspace2, p, digest_len) > 0 && memcmp(p, digest, digest_len) > 0) ++ if (memcmp(workspace2, p, digest_len) >= 0 && memcmp(p, digest, digest_len) >= 0) + return 1; + } + } +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0104-Add-Dbus-methods-to-create-and-delete-DHCP-leases.patch b/src/patches/dnsmasq/0104-Add-Dbus-methods-to-create-and-delete-DHCP-leases.patch new file mode 100644 index 0000000..684ffbb --- /dev/null +++ b/src/patches/dnsmasq/0104-Add-Dbus-methods-to-create-and-delete-DHCP-leases.patch @@ -0,0 +1,329 @@ +From c6d82c9ba64cdd50f76c9079dd06c48cca4fc39b Mon Sep 17 00:00:00 2001 +From: Nicolas Cavallari <nicolas.cavallari(a)green-communications.fr> +Date: Tue, 9 Jun 2015 20:42:20 +0100 +Subject: [PATCH 104/113] Add Dbus methods to create and delete DHCP leases. + +--- + CHANGELOG | 3 + + dbus/DBus-interface | 74 ++++++++++++++++++++ + src/dbus.c | 191 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 268 insertions(+) + +diff --git a/CHANGELOG b/CHANGELOG +index 9e1b5a5ab0b8..a5bd4dc02701 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -125,6 +125,9 @@ version 2.73 + in the correct subnet, even of not in dynamic address + allocation range. Thanks to Steve Hirsch for spotting + the problem. ++ ++ Add AddDhcpLease and DeleteDhcpLease DBus methods. Thanks ++ to Nicolas Cavallari for the patch. + + + version 2.72 +diff --git a/dbus/DBus-interface b/dbus/DBus-interface +index 9a895eb24a61..2db5c30b2eaa 100644 +--- a/dbus/DBus-interface ++++ b/dbus/DBus-interface +@@ -169,6 +169,80 @@ Return an array of strings, each string is the IP address of an upstream + server which has been found to loop queries back to this dnsmasq instance, and + it therefore not being used. + ++AddDhcpLease ++------------ ++ ++Returns nothing. Adds or updates a DHCP or DHCPv6 lease to the internal lease ++database, as if a client requested and obtained a lease. ++ ++If a lease for the IPv4 or IPv6 address already exist, it is overwritten. ++ ++Note that this function will trigger the DhcpLeaseAdded or DhcpLeaseUpdated ++D-Bus signal and will run the configured DHCP lease script accordingly. ++ ++This function takes many arguments which are the lease parameters: ++- A string with the textual representation of the IPv4 or IPv6 address of the ++ client. ++ ++ Examples: ++ "192.168.1.115" ++ "1003:1234:abcd::1%eth0" ++ "2001:db8:abcd::1" ++ ++- A string representing the hardware address of the client, using the same ++ format as the one used in the lease database. ++ ++ Examples: ++ ++ "00:23:45:67:89:ab" ++ "06-00:20:e0:3b:13:af" (token ring) ++ ++- The hostname of the client, as an array of bytes (so there is no problem ++ with non-ASCII character encoding). May be empty. ++ ++ Example (for "hostname.or.fqdn"): ++ [104, 111, 115, 116, 110, 97, 109, 101, 46, 111, 114, 46, 102, 113, 100, 110] ++ ++- The client identifier (IPv4) or DUID (IPv6) as an array of bytes. May be ++ empty. ++ ++ Examples: ++ ++ DHCPv6 DUID: ++ [0, 3, 0, 1, 0, 35, 69, 103, 137, 171] ++ DHCPv4 client identifier: ++ [255, 12, 34, 56, 78, 0, 1, 0, 1, 29, 9, 99, 190, 35, 69, 103, 137, 171] ++ ++- The duration of the lease, in seconds. If the lease is updated, then ++ the duration replaces the previous duration. ++ ++ Example: ++ ++ 7200 ++ ++- The IAID (Identity association identifier) of the DHCPv6 lease, as a network ++ byte-order unsigned integer. For DHCPv4 leases, this must be set to 0. ++ ++ Example (for IPv6): ++ ++ 203569230 ++ ++- A boolean which, if true, indicates that the DHCPv6 lease is for a temporary ++ address (IA_TA). If false, the DHCPv6 lease is for a non-temporary address ++ (IA_NA). For DHCPv4 leases, this must be set to false. ++ ++RemoveDhcpLease ++--------------- ++ ++Returns nothing. Removes a DHCP or DHCPv6 lease to the internal lease ++database, as if a client sent a release message to abandon a lease. ++ ++This function takes only one parameter: the text representation of the ++IPv4 or IPv6 address of the lease to remove. ++ ++Note that this function will trigger the DhcpLeaseRemoved signal and the ++configured DHCP lease script will be run with the "del" action. ++ + + + 2. SIGNALS +diff --git a/src/dbus.c b/src/dbus.c +index 5b69de518beb..801d4825001b 100644 +--- a/src/dbus.c ++++ b/src/dbus.c +@@ -70,6 +70,21 @@ const char* introspection_xml_template = + " <arg name=\"hwaddr\" type=\"s\"/>\n" + " <arg name=\"hostname\" type=\"s\"/>\n" + " </signal>\n" ++#ifdef HAVE_DHCP ++" <method name=\"AddDhcpLease\">\n" ++" <arg name=\"ipaddr\" type=\"s\"/>\n" ++" <arg name=\"hwaddr\" type=\"s\"/>\n" ++" <arg name=\"hostname\" type=\"ay\"/>\n" ++" <arg name=\"clid\" type=\"ay\"/>\n" ++" <arg name=\"lease_duration\" type=\"u\"/>\n" ++" <arg name=\"ia_id\" type=\"u\"/>\n" ++" <arg name=\"is_temporary\" type=\"b\"/>\n" ++" </method>\n" ++" <method name=\"DeleteDhcpLease\">\n" ++" <arg name=\"ipaddr\" type=\"s\"/>\n" ++" <arg name=\"success\" type=\"b\" direction=\"out\"/>\n" ++" </method>\n" ++#endif + " </interface>\n" + "</node>\n"; + +@@ -433,6 +448,172 @@ static DBusMessage *dbus_set_bool(DBusMessage *message, int flag, char *name) + return NULL; + } + ++#ifdef HAVE_DHCP ++static DBusMessage *dbus_add_lease(DBusMessage* message) ++{ ++ struct dhcp_lease *lease; ++ const char *ipaddr, *hwaddr, *hostname, *tmp; ++ const unsigned char* clid; ++ int clid_len, hostname_len, hw_len, hw_type; ++ dbus_uint32_t expires, ia_id; ++ dbus_bool_t is_temporary; ++ struct all_addr addr; ++ time_t now = dnsmasq_time(); ++ unsigned char dhcp_chaddr[DHCP_CHADDR_MAX]; ++ ++ DBusMessageIter iter, array_iter; ++ if (!dbus_message_iter_init(message, &iter)) ++ return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, ++ "Failed to initialize dbus message iter"); ++ ++ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) ++ return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, ++ "Expected string as first argument"); ++ ++ dbus_message_iter_get_basic(&iter, &ipaddr); ++ dbus_message_iter_next(&iter); ++ ++ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) ++ return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, ++ "Expected string as second argument"); ++ ++ dbus_message_iter_get_basic(&iter, &hwaddr); ++ dbus_message_iter_next(&iter); ++ ++ if ((dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY) || ++ (dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_BYTE)) ++ return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, ++ "Expected byte array as third argument"); ++ ++ dbus_message_iter_recurse(&iter, &array_iter); ++ dbus_message_iter_get_fixed_array(&array_iter, &hostname, &hostname_len); ++ tmp = memchr(hostname, '\0', hostname_len); ++ if (tmp) ++ { ++ if (tmp == &hostname[hostname_len - 1]) ++ hostname_len--; ++ else ++ return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, ++ "Hostname contains an embedded NUL character"); ++ } ++ dbus_message_iter_next(&iter); ++ ++ if ((dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY) || ++ (dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_BYTE)) ++ return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, ++ "Expected byte array as fourth argument"); ++ ++ dbus_message_iter_recurse(&iter, &array_iter); ++ dbus_message_iter_get_fixed_array(&array_iter, &clid, &clid_len); ++ dbus_message_iter_next(&iter); ++ ++ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT32) ++ return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, ++ "Expected uint32 as fifth argument"); ++ ++ dbus_message_iter_get_basic(&iter, &expires); ++ dbus_message_iter_next(&iter); ++ ++ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT32) ++ return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, ++ "Expected uint32 as sixth argument"); ++ ++ dbus_message_iter_get_basic(&iter, &ia_id); ++ dbus_message_iter_next(&iter); ++ ++ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_BOOLEAN) ++ return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, ++ "Expected uint32 as sixth argument"); ++ ++ dbus_message_iter_get_basic(&iter, &is_temporary); ++ ++ if (inet_pton(AF_INET, ipaddr, &addr.addr.addr4)) ++ { ++ if (ia_id != 0 || is_temporary) ++ return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, ++ "ia_id and is_temporary must be zero for IPv4 lease"); ++ ++ if (!(lease = lease_find_by_addr(addr.addr.addr4))) ++ lease = lease4_allocate(addr.addr.addr4); ++ } ++#ifdef HAVE_DHCP6 ++ else if (inet_pton(AF_INET6, ipaddr, &addr.addr.addr6)) ++ { ++ if (!(lease = lease6_find_by_addr(&addr.addr.addr6, 128, 0))) ++ lease = lease6_allocate(&addr.addr.addr6, ++ is_temporary ? LEASE_TA : LEASE_NA); ++ lease_set_iaid(lease, ia_id); ++ } ++#endif ++ else ++ return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS, ++ "Invalid IP address '%s'", ipaddr); ++ ++ hw_len = parse_hex((char*)hwaddr, dhcp_chaddr, DHCP_CHADDR_MAX, NULL, ++ &hw_type); ++ if (hw_type == 0 && hw_len != 0) ++ hw_type = ARPHRD_ETHER; ++ ++ lease_set_hwaddr(lease, dhcp_chaddr, clid, hw_len, hw_type, ++ clid_len, now, 0); ++ lease_set_expires(lease, expires, now); ++ if (hostname_len != 0) ++ lease_set_hostname(lease, hostname, 0, get_domain(lease->addr), NULL); ++ ++ lease_update_file(now); ++ lease_update_dns(0); ++ ++ return NULL; ++} ++ ++static DBusMessage *dbus_del_lease(DBusMessage* message) ++{ ++ struct dhcp_lease *lease; ++ DBusMessageIter iter; ++ const char *ipaddr; ++ DBusMessage *reply; ++ struct all_addr addr; ++ dbus_bool_t ret = 1; ++ time_t now = dnsmasq_time(); ++ ++ if (!dbus_message_iter_init(message, &iter)) ++ return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, ++ "Failed to initialize dbus message iter"); ++ ++ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) ++ return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, ++ "Expected string as first argument"); ++ ++ dbus_message_iter_get_basic(&iter, &ipaddr); ++ ++ if (inet_pton(AF_INET, ipaddr, &addr.addr.addr4)) ++ lease = lease_find_by_addr(addr.addr.addr4); ++#ifdef HAVE_DHCP6 ++ else if (inet_pton(AF_INET6, ipaddr, &addr.addr.addr6)) ++ lease = lease6_find_by_addr(&addr.addr.addr6, 128, 0); ++#endif ++ else ++ return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS, ++ "Invalid IP address '%s'", ipaddr); ++ ++ if (lease) ++ { ++ lease_prune(lease, now); ++ lease_update_file(now); ++ lease_update_dns(0); ++ } ++ else ++ ret = 0; ++ ++ if ((reply = dbus_message_new_method_return(message))) ++ dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &ret, ++ DBUS_TYPE_INVALID); ++ ++ ++ return reply; ++} ++#endif ++ + DBusHandlerResult message_handler(DBusConnection *connection, + DBusMessage *message, + void *user_data) +@@ -490,6 +671,16 @@ DBusHandlerResult message_handler(DBusConnection *connection, + { + reply = dbus_set_bool(message, OPT_BOGUSPRIV, "bogus-priv"); + } ++#ifdef HAVE_DHCP ++ else if (strcmp(method, "AddDhcpLease") == 0) ++ { ++ reply = dbus_add_lease(message); ++ } ++ else if (strcmp(method, "DeleteDhcpLease") == 0) ++ { ++ reply = dbus_del_lease(message); ++ } ++#endif + else if (strcmp(method, "ClearCache") == 0) + clear_cache = 1; + else +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0105-Add-a-couple-of-missed-logging-strings-to-the-catalo.patch b/src/patches/dnsmasq/0105-Add-a-couple-of-missed-logging-strings-to-the-catalo.patch new file mode 100644 index 0000000..804a337 --- /dev/null +++ b/src/patches/dnsmasq/0105-Add-a-couple-of-missed-logging-strings-to-the-catalo.patch @@ -0,0 +1,32 @@ +From d91b1fd402d8de127921dc4cca01007d9da23f92 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Tue, 9 Jun 2015 20:45:07 +0100 +Subject: [PATCH 105/113] Add a couple of missed logging strings to the + catalogue. + +--- + src/dbus.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/dbus.c b/src/dbus.c +index 801d4825001b..3d686e86f41e 100644 +--- a/src/dbus.c ++++ b/src/dbus.c +@@ -436,12 +436,12 @@ static DBusMessage *dbus_set_bool(DBusMessage *message, int flag, char *name) + + if (enabled) + { +- my_syslog(LOG_INFO, "Enabling --%s option from D-Bus", name); ++ my_syslog(LOG_INFO, _("Enabling --%s option from D-Bus"), name); + set_option_bool(flag); + } + else + { +- my_syslog(LOG_INFO, "Disabling --%s option from D-Bus", name); ++ my_syslog(LOG_INFO, _("Disabling --%s option from D-Bus"), name); + reset_option_bool(flag); + } + +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0106-Fix-logging-of-unknown-interface-in-bridge-interface.patch b/src/patches/dnsmasq/0106-Fix-logging-of-unknown-interface-in-bridge-interface.patch new file mode 100644 index 0000000..f08516c --- /dev/null +++ b/src/patches/dnsmasq/0106-Fix-logging-of-unknown-interface-in-bridge-interface.patch @@ -0,0 +1,28 @@ +From 654f59e7620c857279843e50588ac76e88040b0f Mon Sep 17 00:00:00 2001 +From: Neil Jerram <Neil.Jerram(a)metaswitch.com> +Date: Wed, 10 Jun 2015 22:06:33 +0100 +Subject: [PATCH 106/113] Fix logging of unknown interface in + --bridge-interface, DHPCv4. + +--- + src/dhcp.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/dhcp.c b/src/dhcp.c +index f1f43f8d8f90..eb1ea810b573 100644 +--- a/src/dhcp.c ++++ b/src/dhcp.c +@@ -236,7 +236,9 @@ void dhcp_packet(time_t now, int pxe_fd) + { + if (!(iface_index = if_nametoindex(bridge->iface))) + { +- my_syslog(LOG_WARNING, _("unknown interface %s in bridge-interface"), ifr.ifr_name); ++ my_syslog(MS_DHCP | LOG_WARNING, ++ _("unknown interface %s in bridge-interface"), ++ bridge->iface); + return; + } + else +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0107-Extend-bridge-interface-aliasing-to-DHCPv6.patch b/src/patches/dnsmasq/0107-Extend-bridge-interface-aliasing-to-DHCPv6.patch new file mode 100644 index 0000000..8ae75d3 --- /dev/null +++ b/src/patches/dnsmasq/0107-Extend-bridge-interface-aliasing-to-DHCPv6.patch @@ -0,0 +1,65 @@ +From 0ddb8769bb809cd118840553e12be86297cdf246 Mon Sep 17 00:00:00 2001 +From: Neil Jerram <Neil.Jerram(a)metaswitch.com> +Date: Wed, 10 Jun 2015 22:11:06 +0100 +Subject: [PATCH 107/113] Extend --bridge-interface aliasing to DHCPv6. + +--- + src/dhcp6.c | 28 +++++++++++++++++++++++++++- + 1 file changed, 27 insertions(+), 1 deletion(-) + +diff --git a/src/dhcp6.c b/src/dhcp6.c +index ee2aa5d3bf3c..4c60c6e86c0c 100644 +--- a/src/dhcp6.c ++++ b/src/dhcp6.c +@@ -144,6 +144,8 @@ void dhcp6_packet(time_t now) + + if ((port = relay_reply6(&from, sz, ifr.ifr_name)) == 0) + { ++ struct dhcp_bridge *bridge, *alias; ++ + for (tmp = daemon->if_except; tmp; tmp = tmp->next) + if (tmp->name && wildcard_match(tmp->name, ifr.ifr_name)) + return; +@@ -160,6 +162,30 @@ void dhcp6_packet(time_t now) + memset(&parm.fallback, 0, IN6ADDRSZ); + memset(&parm.ll_addr, 0, IN6ADDRSZ); + memset(&parm.ula_addr, 0, IN6ADDRSZ); ++ ++ /* If the interface on which the DHCPv6 request was received is ++ an alias of some other interface (as specified by the ++ --bridge-interfaces option), change parm.ind so that we look ++ for DHCPv6 contexts associated with the aliased interface ++ instead of with the aliasing one. */ ++ for (bridge = daemon->bridges; bridge; bridge = bridge->next) ++ { ++ for (alias = bridge->alias; alias; alias = alias->next) ++ if (wildcard_matchn(alias->iface, ifr.ifr_name, IF_NAMESIZE)) ++ { ++ parm.ind = if_nametoindex(bridge->iface); ++ if (!parm.ind) ++ { ++ my_syslog(MS_DHCP | LOG_WARNING, ++ _("unknown interface %s in bridge-interface"), ++ bridge->iface); ++ return; ++ } ++ break; ++ } ++ if (alias) ++ break; ++ } + + for (context = daemon->dhcp6; context; context = context->next) + if (IN6_IS_ADDR_UNSPECIFIED(&context->start6) && context->prefix == 0) +@@ -208,7 +234,7 @@ void dhcp6_packet(time_t now) + /* May have configured relay, but not DHCP server */ + if (!daemon->doing_dhcp6) + return; +- ++ + lease_prune(NULL, now); /* lose any expired leases */ + + port = dhcp6_reply(parm.current, if_index, ifr.ifr_name, &parm.fallback, +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0108-Allow-router-advertisements-to-have-the-off-link-bit.patch b/src/patches/dnsmasq/0108-Allow-router-advertisements-to-have-the-off-link-bit.patch new file mode 100644 index 0000000..576945d --- /dev/null +++ b/src/patches/dnsmasq/0108-Allow-router-advertisements-to-have-the-off-link-bit.patch @@ -0,0 +1,85 @@ +From 2fd5bc952dc802433ffebc90eacb78da3d30b80e Mon Sep 17 00:00:00 2001 +From: Neil Jerram <Neil.Jerram(a)metaswitch.com> +Date: Wed, 10 Jun 2015 22:13:06 +0100 +Subject: [PATCH 108/113] Allow router advertisements to have the "off-link" + bit set. + +--- + src/dnsmasq.h | 1 + + src/option.c | 2 ++ + src/radv.c | 13 +++++++++---- + 3 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index ab16f79b3ec9..8d005d732e72 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -868,6 +868,7 @@ struct dhcp_context { + #define CONTEXT_USED (1u<<15) + #define CONTEXT_OLD (1u<<16) + #define CONTEXT_V6 (1u<<17) ++#define CONTEXT_RA_OFF_LINK (1u<<18) + + struct ping_result { + struct in_addr addr; +diff --git a/src/option.c b/src/option.c +index c7add88de7ac..f99c3f59e9d3 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -2699,6 +2699,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + new->flags |= CONTEXT_RA_ROUTER | CONTEXT_RA; + else if (strcmp(a[leasepos], "ra-stateless") == 0) + new->flags |= CONTEXT_RA_STATELESS | CONTEXT_DHCP | CONTEXT_RA; ++ else if (strcmp(a[leasepos], "off-link") == 0) ++ new->flags |= CONTEXT_RA_OFF_LINK; + else if (leasepos == 1 && inet_pton(AF_INET6, a[leasepos], &new->end6)) + new->flags |= CONTEXT_DHCP; + else if (strstr(a[leasepos], "constructor:") == a[leasepos]) +diff --git a/src/radv.c b/src/radv.c +index d0faddf8684a..ec22464b78b9 100644 +--- a/src/radv.c ++++ b/src/radv.c +@@ -313,8 +313,10 @@ static void send_ra(time_t now, int iface, char *iface_name, struct in6_addr *de + opt->type = ICMP6_OPT_PREFIX; + opt->len = 4; + opt->prefix_len = context->prefix; +- /* autonomous only if we're not doing dhcp, always set "on-link" */ +- opt->flags = do_slaac ? 0xC0 : 0x80; ++ /* autonomous only if we're not doing dhcp, set ++ "on-link" unless "off-link" was specified */ ++ opt->flags = (do_slaac ? 0x40 : 0) | ++ ((context->flags & CONTEXT_RA_OFF_LINK) ? 0 : 0x80); + opt->valid_lifetime = htonl(context->saved_valid - old); + opt->preferred_lifetime = htonl(0); + opt->reserved = 0; +@@ -514,6 +516,7 @@ static int add_prefixes(struct in6_addr *local, int prefix, + int deprecate = 0; + int constructed = 0; + int adv_router = 0; ++ int off_link = 0; + unsigned int time = 0xffffffff; + struct dhcp_context *context; + +@@ -586,6 +589,7 @@ static int add_prefixes(struct in6_addr *local, int prefix, + context->ra_time = 0; + context->flags |= CONTEXT_RA_DONE; + real_prefix = context->prefix; ++ off_link = (context->flags & CONTEXT_RA_OFF_LINK); + } + + param->first = 0; +@@ -636,8 +640,9 @@ static int add_prefixes(struct in6_addr *local, int prefix, + opt->type = ICMP6_OPT_PREFIX; + opt->len = 4; + opt->prefix_len = real_prefix; +- /* autonomous only if we're not doing dhcp, always set "on-link" */ +- opt->flags = 0x80; ++ /* autonomous only if we're not doing dhcp, set ++ "on-link" unless "off-link" was specified */ ++ opt->flags = (off_link ? 0 : 0x80); + if (do_slaac) + opt->flags |= 0x40; + if (adv_router) +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0109-Upply-bridge-interface-aliasing-to-solicited-router-.patch b/src/patches/dnsmasq/0109-Upply-bridge-interface-aliasing-to-solicited-router-.patch new file mode 100644 index 0000000..6518771 --- /dev/null +++ b/src/patches/dnsmasq/0109-Upply-bridge-interface-aliasing-to-solicited-router-.patch @@ -0,0 +1,107 @@ +From ba4fc0f99619014438621ccd2bc473657ab4c51c Mon Sep 17 00:00:00 2001 +From: Neil Jerram <Neil.Jerram(a)metaswitch.com> +Date: Wed, 10 Jun 2015 22:14:49 +0100 +Subject: [PATCH 109/113] Upply --bridge-interface aliasing to solicited router + advertisements. + +--- + src/radv.c | 45 ++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 40 insertions(+), 5 deletions(-) + +diff --git a/src/radv.c b/src/radv.c +index ec22464b78b9..54784967df57 100644 +--- a/src/radv.c ++++ b/src/radv.c +@@ -41,6 +41,8 @@ struct search_param { + }; + + static void send_ra(time_t now, int iface, char *iface_name, struct in6_addr *dest); ++static void send_ra_alias(time_t now, int iface, char *iface_name, struct in6_addr *dest, ++ int send_iface); + static int add_prefixes(struct in6_addr *local, int prefix, + int scope, int if_index, int flags, + unsigned int preferred, unsigned int valid, void *vparam); +@@ -181,6 +183,7 @@ void icmp6_packet(time_t now) + else if (packet[0] == ND_ROUTER_SOLICIT) + { + char *mac = ""; ++ struct dhcp_bridge *bridge, *alias; + + /* look for link-layer address option for logging */ + if (sz >= 16 && packet[8] == ICMP6_OPT_SOURCE_MAC && (packet[9] * 8) + 8 <= sz) +@@ -191,12 +194,37 @@ void icmp6_packet(time_t now) + + if (!option_bool(OPT_QUIET_RA)) + my_syslog(MS_DHCP | LOG_INFO, "RTR-SOLICIT(%s) %s", interface, mac); +- /* source address may not be valid in solicit request. */ +- send_ra(now, if_index, interface, !IN6_IS_ADDR_UNSPECIFIED(&from.sin6_addr) ? &from.sin6_addr : NULL); ++ ++ /* If the incoming interface is an alias of some other one (as ++ specified by the --bridge-interfaces option), send an RA ++ using the context of the aliased interface. */ ++ for (bridge = daemon->bridges; bridge; bridge = bridge->next) ++ { ++ int bridge_index = if_nametoindex(bridge->iface); ++ if (bridge_index) ++ { ++ for (alias = bridge->alias; alias; alias = alias->next) ++ if (wildcard_matchn(alias->iface, interface, IF_NAMESIZE)) ++ { ++ /* Send an RA on if_index with information from ++ bridge_index. */ ++ send_ra_alias(now, bridge_index, bridge->iface, NULL, if_index); ++ break; ++ } ++ if (alias) ++ break; ++ } ++ } ++ ++ /* If the incoming interface wasn't an alias, send an RA using ++ the context of the incoming interface. */ ++ if (!bridge) ++ /* source address may not be valid in solicit request. */ ++ send_ra(now, if_index, interface, !IN6_IS_ADDR_UNSPECIFIED(&from.sin6_addr) ? &from.sin6_addr : NULL); + } + } + +-static void send_ra(time_t now, int iface, char *iface_name, struct in6_addr *dest) ++static void send_ra_alias(time_t now, int iface, char *iface_name, struct in6_addr *dest, int send_iface) + { + struct ra_packet *ra; + struct ra_param parm; +@@ -370,7 +398,7 @@ static void send_ra(time_t now, int iface, char *iface_name, struct in6_addr *de + } + #endif + +- iface_enumerate(AF_LOCAL, &iface, add_lla); ++ iface_enumerate(AF_LOCAL, &send_iface, add_lla); + + /* RDNSS, RFC 6106, use relevant DHCP6 options */ + (void)option_filter(parm.tags, NULL, daemon->dhcp_opts6); +@@ -478,7 +506,7 @@ static void send_ra(time_t now, int iface, char *iface_name, struct in6_addr *de + else + { + inet_pton(AF_INET6, ALL_NODES, &addr.sin6_addr); +- setsockopt(daemon->icmp6fd, IPPROTO_IPV6, IPV6_MULTICAST_IF, &iface, sizeof(iface)); ++ setsockopt(daemon->icmp6fd, IPPROTO_IPV6, IPV6_MULTICAST_IF, &send_iface, sizeof(send_iface)); + } + + while (retry_send(sendto(daemon->icmp6fd, daemon->outpacket.iov_base, +@@ -487,6 +515,13 @@ static void send_ra(time_t now, int iface, char *iface_name, struct in6_addr *de + + } + ++static void send_ra(time_t now, int iface, char *iface_name, struct in6_addr *dest) ++{ ++ /* Send an RA on the same interface that the RA content is based ++ on. */ ++ send_ra_alias(now, iface, iface_name, dest, iface); ++} ++ + static int add_prefixes(struct in6_addr *local, int prefix, + int scope, int if_index, int flags, + unsigned int preferred, unsigned int valid, void *vparam) +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0110-Apply-bridge-interfaces-to-unsolicited-router-advert.patch b/src/patches/dnsmasq/0110-Apply-bridge-interfaces-to-unsolicited-router-advert.patch new file mode 100644 index 0000000..3097211 --- /dev/null +++ b/src/patches/dnsmasq/0110-Apply-bridge-interfaces-to-unsolicited-router-advert.patch @@ -0,0 +1,131 @@ +From 9bad339af848fc30bab4ea2759f022820f474e17 Mon Sep 17 00:00:00 2001 +From: Neil Jerram <Neil.Jerram(a)metaswitch.com> +Date: Wed, 10 Jun 2015 22:16:35 +0100 +Subject: [PATCH 110/113] Apply --bridge-interfaces to unsolicited router + advertisements. + +--- + src/radv.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 84 insertions(+), 2 deletions(-) + +diff --git a/src/radv.c b/src/radv.c +index 54784967df57..300c31c83c78 100644 +--- a/src/radv.c ++++ b/src/radv.c +@@ -40,9 +40,18 @@ struct search_param { + char name[IF_NAMESIZE+1]; + }; + ++struct alias_param { ++ int iface; ++ struct dhcp_bridge *bridge; ++ int num_alias_ifs; ++ int max_alias_ifs; ++ int *alias_ifs; ++}; ++ + static void send_ra(time_t now, int iface, char *iface_name, struct in6_addr *dest); + static void send_ra_alias(time_t now, int iface, char *iface_name, struct in6_addr *dest, + int send_iface); ++static int send_ra_to_aliases(int index, unsigned int type, char *mac, size_t maclen, void *parm); + static int add_prefixes(struct in6_addr *local, int prefix, + int scope, int if_index, int flags, + unsigned int preferred, unsigned int valid, void *vparam); +@@ -723,6 +732,7 @@ time_t periodic_ra(time_t now) + struct search_param param; + struct dhcp_context *context; + time_t next_event; ++ struct alias_param aparam; + + param.now = now; + param.iface = 0; +@@ -770,12 +780,84 @@ time_t periodic_ra(time_t now) + if (tmp->name && wildcard_match(tmp->name, param.name)) + break; + if (!tmp) +- send_ra(now, param.iface, param.name, NULL); ++ { ++ send_ra(now, param.iface, param.name, NULL); ++ ++ /* Also send on all interfaces that are aliases of this ++ one. */ ++ for (aparam.bridge = daemon->bridges; ++ aparam.bridge; ++ aparam.bridge = aparam.bridge->next) ++ if ((int)if_nametoindex(aparam.bridge->iface) == param.iface) ++ { ++ /* Count the number of alias interfaces for this ++ 'bridge', by calling iface_enumerate with ++ send_ra_to_aliases and NULL alias_ifs. */ ++ aparam.iface = param.iface; ++ aparam.alias_ifs = NULL; ++ aparam.num_alias_ifs = 0; ++ iface_enumerate(AF_LOCAL, &aparam, send_ra_to_aliases); ++ my_syslog(MS_DHCP | LOG_INFO, "RTR-ADVERT(%s) %s => %d alias(es)", ++ param.name, daemon->addrbuff, aparam.num_alias_ifs); ++ ++ /* Allocate memory to store the alias interface ++ indices. */ ++ aparam.alias_ifs = (int *)whine_malloc(aparam.num_alias_ifs * ++ sizeof(int)); ++ if (aparam.alias_ifs) ++ { ++ /* Use iface_enumerate again to get the alias ++ interface indices, then send on each of ++ those. */ ++ aparam.max_alias_ifs = aparam.num_alias_ifs; ++ aparam.num_alias_ifs = 0; ++ iface_enumerate(AF_LOCAL, &aparam, send_ra_to_aliases); ++ for (; aparam.num_alias_ifs; aparam.num_alias_ifs--) ++ { ++ my_syslog(MS_DHCP | LOG_INFO, "RTR-ADVERT(%s) %s => i/f %d", ++ param.name, daemon->addrbuff, ++ aparam.alias_ifs[aparam.num_alias_ifs - 1]); ++ send_ra_alias(now, ++ param.iface, ++ param.name, ++ NULL, ++ aparam.alias_ifs[aparam.num_alias_ifs - 1]); ++ } ++ free(aparam.alias_ifs); ++ } ++ ++ /* The source interface can only appear in at most ++ one --bridge-interfaces. */ ++ break; ++ } ++ } + } + } + return next_event; + } +- ++ ++static int send_ra_to_aliases(int index, unsigned int type, char *mac, size_t maclen, void *parm) ++{ ++ struct alias_param *aparam = (struct alias_param *)parm; ++ char ifrn_name[IFNAMSIZ]; ++ struct dhcp_bridge *alias; ++ ++ (void)type; ++ (void)mac; ++ (void)maclen; ++ ++ if (if_indextoname(index, ifrn_name)) ++ for (alias = aparam->bridge->alias; alias; alias = alias->next) ++ if (wildcard_matchn(alias->iface, ifrn_name, IFNAMSIZ)) ++ { ++ if (aparam->alias_ifs && (aparam->num_alias_ifs < aparam->max_alias_ifs)) ++ aparam->alias_ifs[aparam->num_alias_ifs] = index; ++ aparam->num_alias_ifs++; ++ } ++ ++ return 1; ++} ++ + static int iface_search(struct in6_addr *local, int prefix, + int scope, int if_index, int flags, + int preferred, int valid, void *vparam) +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0111-Documenation-updates-for-bridge-interface-and-off-li.patch b/src/patches/dnsmasq/0111-Documenation-updates-for-bridge-interface-and-off-li.patch new file mode 100644 index 0000000..b2b8bcb --- /dev/null +++ b/src/patches/dnsmasq/0111-Documenation-updates-for-bridge-interface-and-off-li.patch @@ -0,0 +1,201 @@ +From 4918bd550573844441a287a67202a6a3f0f6126a Mon Sep 17 00:00:00 2001 +From: Neil Jerram <Neil.Jerram(a)metaswitch.com> +Date: Wed, 10 Jun 2015 22:23:20 +0100 +Subject: [PATCH 111/113] Documenation updates for --bridge-interface and + "off-link". + +--- + CHANGELOG | 6 ++++++ + man/dnsmasq.8 | 17 +++++++++++------ + man/es/dnsmasq.8 | 12 ++++++++---- + man/fr/dnsmasq.8 | 18 ++++++++++++------ + src/dhcp.c | 9 +++++---- + src/dhcp6.c | 2 +- + src/radv.c | 6 +++--- + 7 files changed, 46 insertions(+), 24 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index a5bd4dc02701..7d8f73ffa61c 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -128,6 +128,12 @@ version 2.73 + + Add AddDhcpLease and DeleteDhcpLease DBus methods. Thanks + to Nicolas Cavallari for the patch. ++ ++ Allow configuration of router advertisements without the ++ "on-link" bit set. Thanks to Neil Jerram for the patch. ++ ++ Extend --bridge-interface to DHCPv6 and router ++ advertisements. Thanks to Neil Jerram for the patch. + + + version 2.72 +diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 +index f811dc326e9f..ffa0c7b1f436 100644 +--- a/man/dnsmasq.8 ++++ b/man/dnsmasq.8 +@@ -833,7 +833,7 @@ and + for details.) + + For IPv6, the mode may be some combination of +-.B ra-only, slaac, ra-names, ra-stateless, ra-advrouter. ++.B ra-only, slaac, ra-names, ra-stateless, ra-advrouter, off-link. + + .B ra-only + tells dnsmasq to offer Router Advertisement only on this subnet, +@@ -873,6 +873,9 @@ enables a mode where router address(es) rather than prefix(es) are included in t + This is described in RFC-3775 section 7.2 and is used in mobile IPv6. In this mode the interval option + is also included, as described in RFC-3775 section 7.3. + ++.B off-link ++tells dnsmasq to advertise the prefix without the on-link (aka L) bit set. ++ + .TP + .B \-G, --dhcp-host=[<hwaddr>][,id:<client_id>|*][,set:<tag>][,<ipaddr>][,<hostname>][,<lease_time>][,ignore] + Specify per host parameters for the DHCP server. This allows a machine +@@ -1597,11 +1600,13 @@ option also forces the leasechange script to be called on changes + to the client-id and lease length and expiry time. + .TP + .B --bridge-interface=<interface>,<alias>[,<alias>] +-Treat DHCP request packets arriving at any of the <alias> interfaces +-as if they had arrived at <interface>. This option is necessary when +-using "old style" bridging on BSD platforms, since +-packets arrive at tap interfaces which don't have an IP address. +-A trailing '*' wildcard can be used in each <alias>. ++Treat DHCP (v4 and v6) request and IPv6 Router Solicit packets ++arriving at any of the <alias> interfaces as if they had arrived at ++<interface>. This option allows dnsmasq to provide DHCP and RA ++service over unaddressed and unbridged Ethernet interfaces, e.g. on an ++OpenStack compute host where each such interface is a TAP interface to ++a VM, or as in "old style bridging" on BSD platforms. A trailing '*' ++wildcard can be used in each <alias>. + .TP + .B \-s, --domain=<domain>[,<address range>[,local]] + Specifies DNS domains for the DHCP server. Domains may be be given +diff --git a/man/es/dnsmasq.8 b/man/es/dnsmasq.8 +index 65e4b7277a6b..81c745a48b6e 100644 +--- a/man/es/dnsmasq.8 ++++ b/man/es/dnsmasq.8 +@@ -1062,10 +1062,14 @@ esta opci + cuando hay cambios hechos a el client-id y tiempos de arriendo y vencimiento. + .TP + .B --bridge-interface=<nombre de interface>,<alias>[,<alias>] +-Tratar paquetes de pedidos DHCP que llegan a cualquiera de las interfaces <alias> +-como si hubieran llegado a la interface <nombre de interface>. Esta opción +-es necesaria al usar bridging estilo viejo en plataformas BSD, dado a que +-los paquetes llegan a interfaces tap que no tienen una dirección IP. ++Tratar paquetes de pedidos DHCP (v4 y v6) y de IPv6 Router Solicit que ++llegan a cualquiera de las interfaces <alias> como si hubieran llegado ++a la interface <nombre de interface>. Esta opción permite que dnsmasq ++puede proporcionar los servicios DHCP y RA a través de interfaces ++ethernet sin dirección y sin puente; por ejemplo en un nodo de cálculo ++de OpenStack, donde cada una de esas interfaces es una interfaz TAP ++para una máquina virtual, o al usar bridging estilo viejo en ++plataformas BSD. + .TP + .B \-s, --domain=<dominio>[,<rango de IPs>] + Especifica los dominios DNS para el servidor DHCP. Dominios pueden ser +diff --git a/man/fr/dnsmasq.8 b/man/fr/dnsmasq.8 +index e0d1e9ad92e5..b4cc16dd3786 100644 +--- a/man/fr/dnsmasq.8 ++++ b/man/fr/dnsmasq.8 +@@ -852,7 +852,7 @@ et + pour plus de dÃ©tails). + + Pour IPv6, le mode peut-Ãªtre une combinaison des valeurs +-.B ra-only, slaac, ra-names, ra-stateless. ++.B ra-only, slaac, ra-names, ra-stateless, off-link. + + .B ra-only + indique Ã dnsmasq de n'effectuer que des annonces de routeur (Router +@@ -888,6 +888,9 @@ peut-Ãªtre combinÃ© avec + et + .B slaac. + ++.B off-link ++indique Ã dnsmasq d'annoncer le prÃ©fixe sans le bit L (sur lien). ++ + .TP + .B \-G, --dhcp-host=[<adresse matÃ©rielle>][,id:<identifiant client>|*][,set:<label>][,<adresse IP>][,<nom d'hÃŽte>][,<durÃ©e de bail>][,ignore] + SpÃ©cifie les paramÃštres DHCP relatifs Ã un hÃŽte. Cela permet Ã une machine +@@ -1655,11 +1658,14 @@ changement d'Ã©tat de bail Ã chaque changement de l'identifiant de client, de + longueur de bail ou de date d'expiration. + .TP + .B --bridge-interface=<interface>,<alias>[,<alias>] +-Traiter les requÃªtes DHCP arrivant sur n'importe laquelle des interfaces <alias> +-comme si elles arrivaient de l'interface <interface>. Cette option est +-nÃ©cessaire lors de l'utilisation de pont ethernet "ancien mode" sur plate-forme +-BSD, puisque dans ce cas les paquets arrivent sur des interfaces "tap" n'ont +-pas d'adresse IP. Chaque <alias> peut finir avec un simple '*' joker. ++Traiter les requÃªtes DHCP (v4 et v6) et IPv6 Router Solicit arrivant ++sur n'importe laquelle des interfaces <alias> comme si elles ++arrivaient de l'interface <interface>. Cette option permet Ã dnsmasq ++de fournir les service DHCP et RA sur les interfaces ethernet non ++adressÃ©s et non pontÃ©s; par exemple sur un hÃŽte de calcul d'OpenStack ++oÃ¹ chaque telle interface est une interface TAP Ã une machine ++virtuelle, ou lors de l'utilisation de pont ethernet "ancien mode" sur ++plate-forme BSD. Chaque <alias> peut finir avec un simple '*' joker. + .TP + .B \-s, --domain=<domaine>[,<gamme d'adresses>[,local]] + SpÃ©cifie le domaine du serveur DHCP. Le domaine peut Ãªtre donnÃ© de maniÃšre +diff --git a/src/dhcp.c b/src/dhcp.c +index eb1ea810b573..e6fceb13a3e1 100644 +--- a/src/dhcp.c ++++ b/src/dhcp.c +@@ -225,10 +225,11 @@ void dhcp_packet(time_t now, int pxe_fd) + strncpy(arp_req.arp_dev, ifr.ifr_name, 16); + #endif + +- /* One form of bridging on BSD has the property that packets +- can be recieved on bridge interfaces which do not have an IP address. +- We allow these to be treated as aliases of another interface which does have +- an IP address with --dhcp-bridge=interface,alias,alias */ ++ /* If the interface on which the DHCP request was received is an ++ alias of some other interface (as specified by the ++ --bridge-interface option), change ifr.ifr_name so that we look ++ for DHCP contexts associated with the aliased interface instead ++ of with the aliasing one. */ + for (bridge = daemon->bridges; bridge; bridge = bridge->next) + { + for (alias = bridge->alias; alias; alias = alias->next) +diff --git a/src/dhcp6.c b/src/dhcp6.c +index 4c60c6e86c0c..8286ff400217 100644 +--- a/src/dhcp6.c ++++ b/src/dhcp6.c +@@ -165,7 +165,7 @@ void dhcp6_packet(time_t now) + + /* If the interface on which the DHCPv6 request was received is + an alias of some other interface (as specified by the +- --bridge-interfaces option), change parm.ind so that we look ++ --bridge-interface option), change parm.ind so that we look + for DHCPv6 contexts associated with the aliased interface + instead of with the aliasing one. */ + for (bridge = daemon->bridges; bridge; bridge = bridge->next) +diff --git a/src/radv.c b/src/radv.c +index 300c31c83c78..39f1e92ae75f 100644 +--- a/src/radv.c ++++ b/src/radv.c +@@ -205,8 +205,8 @@ void icmp6_packet(time_t now) + my_syslog(MS_DHCP | LOG_INFO, "RTR-SOLICIT(%s) %s", interface, mac); + + /* If the incoming interface is an alias of some other one (as +- specified by the --bridge-interfaces option), send an RA +- using the context of the aliased interface. */ ++ specified by the --bridge-interface option), send an RA using ++ the context of the aliased interface. */ + for (bridge = daemon->bridges; bridge; bridge = bridge->next) + { + int bridge_index = if_nametoindex(bridge->iface); +@@ -827,7 +827,7 @@ time_t periodic_ra(time_t now) + } + + /* The source interface can only appear in at most +- one --bridge-interfaces. */ ++ one --bridge-interface. */ + break; + } + } +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0112-Merge-messages-and-fix-makefile-process-to-do-this.patch b/src/patches/dnsmasq/0112-Merge-messages-and-fix-makefile-process-to-do-this.patch new file mode 100644 index 0000000..46acdd8 --- /dev/null +++ b/src/patches/dnsmasq/0112-Merge-messages-and-fix-makefile-process-to-do-this.patch @@ -0,0 +1,21460 @@ +From f7bfbdc8727b4ba0a231ed2f8daffbd493a8dbb5 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Wed, 10 Jun 2015 22:31:02 +0100 +Subject: [PATCH 112/113] Merge messages and fix makefile process to do this. + +--- + Makefile | 2 +- + po/de.po | 790 +++++++++++++++++++++++++++++++----------------------------- + po/es.po | 790 +++++++++++++++++++++++++++++++----------------------------- + po/fi.po | 790 +++++++++++++++++++++++++++++++----------------------------- + po/fr.po | 790 +++++++++++++++++++++++++++++++----------------------------- + po/id.po | 790 +++++++++++++++++++++++++++++++----------------------------- + po/it.po | 790 +++++++++++++++++++++++++++++++----------------------------- + po/no.po | 790 +++++++++++++++++++++++++++++++----------------------------- + po/pl.po | 790 +++++++++++++++++++++++++++++++----------------------------- + po/pt_BR.po | 790 +++++++++++++++++++++++++++++++----------------------------- + po/ro.po | 790 +++++++++++++++++++++++++++++++----------------------------- + 11 files changed, 4071 insertions(+), 3831 deletions(-) + +diff --git a/Makefile b/Makefile +index 2910320b6452..59750bcb7442 100644 +--- a/Makefile ++++ b/Makefile +@@ -117,7 +117,7 @@ install-i18n : all-i18n install-common + cd $(MAN); ../bld/install-man $(DESTDIR)$(MANDIR) $(INSTALL) + + merge : +- @cd $(BUILDDIR) && $(MAKE) -f $(top)/Makefile dnsmasq.pot ++ @cd $(BUILDDIR) && $(MAKE) top="$(top)" -f $(top)/Makefile dnsmasq.pot + for f in `cd $(PO); echo *.po`; do \ + echo -n msgmerge $(PO)/$$f && $(MSGMERGE) --no-wrap -U $(PO)/$$f $(BUILDDIR)/dnsmasq.pot; \ + done +diff --git a/po/de.po b/po/de.po +index a03173845b35..ced02c8bb13b 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -32,17 +32,17 @@ msgstr "Interner Fehler im Cache." + msgid "failed to load names from %s: %s" + msgstr "Fehler beim Laden der Namen von %s: %s" + +-#: cache.c:967 dhcp.c:825 ++#: cache.c:967 dhcp.c:828 + #, c-format + msgid "bad address at %s line %d" + msgstr "Fehlerhafte Adresse in %s Zeile %d" + +-#: cache.c:1018 dhcp.c:841 ++#: cache.c:1018 dhcp.c:844 + #, c-format + msgid "bad name at %s line %d" + msgstr "Fehlerhafter Name in %s Zeile %d" + +-#: cache.c:1027 dhcp.c:916 ++#: cache.c:1027 dhcp.c:919 + #, c-format + msgid "read %s - %d addresses" + msgstr "%s gelesen - %d Adressen" +@@ -100,641 +100,645 @@ msgstr "Konnte den Zufallszahlengenerator nicht initialisieren: %s" + msgid "failed to allocate memory" + msgstr "Konnte Speicher nicht belegen" + +-#: util.c:243 option.c:598 ++#: util.c:250 option.c:601 + msgid "could not get memory" + msgstr "Speicher nicht verfÃŒgbar" + +-#: util.c:253 ++#: util.c:260 + #, c-format + msgid "cannot create pipe: %s" + msgstr "Konnte Pipe nicht erzeugen: %s" + +-#: util.c:261 ++#: util.c:268 + #, c-format + msgid "failed to allocate %d bytes" + msgstr "Konnte %d Bytes nicht belegen" + + # @Simon: not perfect but I cannot get nearer right now. +-#: util.c:430 ++#: util.c:437 + #, c-format + msgid "infinite" + msgstr "unendlich" + +-#: option.c:330 ++#: option.c:332 + msgid "Specify local address(es) to listen on." + msgstr "Lokale abzuhÃ¶rende Adresse(n) angeben." + +-#: option.c:331 ++#: option.c:333 + msgid "Return ipaddr for all hosts in specified domains." + msgstr "IP-Adresse fÃŒr alle Hosts in angegebenen DomÃ€nen festlegen." + + # FIXME: the English test is not to the point. Just use a shortened description + # from the manpage instead. -- MA +-#: option.c:332 ++#: option.c:334 + msgid "Fake reverse lookups for RFC1918 private address ranges." + msgstr "FÃŒr private Adressbereiche nach RFC1918 \"keine solche Domain\" liefern." + +-#: option.c:333 ++#: option.c:335 + msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." + msgstr "Diese IP-Adresse als NXDOMAIN interpretieren (wehrt \"Suchhilfen\" ab)." + +-#: option.c:334 ++#: option.c:336 + #, c-format + msgid "Specify the size of the cache in entries (defaults to %s)." + msgstr "GrÃ¶Ãe des Caches (Zahl der EintrÃ€ge) festlegen (Voreinstellung: %s)." + +-#: option.c:335 ++#: option.c:337 + #, c-format + msgid "Specify configuration file (defaults to %s)." + msgstr "Konfigurationsdatei festlegen (Voreinstellung: %s)." + +-#: option.c:336 ++#: option.c:338 + msgid "Do NOT fork into the background: run in debug mode." + msgstr "NICHT in den Hintergrund gehen: Betrieb im Debug-Modus" + +-#: option.c:337 ++#: option.c:339 + msgid "Do NOT forward queries with no domain part." + msgstr "Anfragen ohne DomÃ€nen-Teil NICHT weiterschicken." + +-#: option.c:338 ++#: option.c:340 + msgid "Return self-pointing MX records for local hosts." + msgstr "FÃŒr lokale EintrÃ€ge MX-EintrÃ€ge liefern, die auf sich selbst zeigen." + +-#: option.c:339 ++#: option.c:341 + msgid "Expand simple names in /etc/hosts with domain-suffix." + msgstr "Erweitere einfache Namen in /etc/hosts mit der DomÃ€nen-Endung." + +-#: option.c:340 ++#: option.c:342 + msgid "Don't forward spurious DNS requests from Windows hosts." + msgstr "'unechte' DNS-Anfragen von Windows-Rechnern nicht weiterleiten" + + # @Simon: I'm a bit unsure about "spurious" +-#: option.c:341 ++#: option.c:343 + msgid "Enable DHCP in the range given with lease duration." + msgstr "DHCP fÃŒr angegebenen Bereich und Dauer einschalten" + +-#: option.c:342 ++#: option.c:344 + #, c-format + msgid "Change to this group after startup (defaults to %s)." + msgstr "Nach dem Start in diese Benutzergruppe wechseln (Voreinstellung %s)." + +-#: option.c:343 ++#: option.c:345 + msgid "Set address or hostname for a specified machine." + msgstr "Adresse oder Hostnamen fÃŒr einen angegebenen Computer setzen." + +-#: option.c:344 ++#: option.c:346 + msgid "Read DHCP host specs from file." + msgstr "DHCP-Host-Angaben aus Datei lesen." + +-#: option.c:345 ++#: option.c:347 + msgid "Read DHCP option specs from file." + msgstr "DHCP-Optionen aus Datei lesen." + +-#: option.c:346 ++#: option.c:348 + #, fuzzy + msgid "Read DHCP host specs from a directory." + msgstr "DHCP-Host-Angaben aus Datei lesen." + +-#: option.c:347 ++#: option.c:349 + #, fuzzy + msgid "Read DHCP options from a directory." + msgstr "DHCP-Optionen aus Datei lesen." + +-#: option.c:348 ++#: option.c:350 + msgid "Evaluate conditional tag expression." + msgstr "Auswertung eines Ausdrucks bedingter Marken." + +-#: option.c:349 ++#: option.c:351 + #, c-format + msgid "Do NOT load %s file." + msgstr "%s-Datei NICHT laden." + +-#: option.c:350 ++#: option.c:352 + #, c-format + msgid "Specify a hosts file to be read in addition to %s." + msgstr "Hosts-Datei festlegen, die zusÃ€tzlich zu %s gelesen wird." + +-#: option.c:351 ++#: option.c:353 + #, fuzzy + msgid "Read hosts files from a directory." + msgstr "DHCP-Host-Angaben aus Datei lesen." + +-#: option.c:352 ++#: option.c:354 + msgid "Specify interface(s) to listen on." + msgstr "Schnittstelle(n) zum Empfang festlegen." + +-#: option.c:353 ++#: option.c:355 + msgid "Specify interface(s) NOT to listen on." + msgstr "Schnittstelle(n) festlegen, die NICHT empfangen sollen." + +-#: option.c:354 ++#: option.c:356 + msgid "Map DHCP user class to tag." + msgstr "DHCP-Benutzerklasse auf Marke abbilden." + +-#: option.c:355 ++#: option.c:357 + msgid "Map RFC3046 circuit-id to tag." + msgstr "RFC3046 \"circuit-id\" auf Marke abbilden." + +-#: option.c:356 ++#: option.c:358 + msgid "Map RFC3046 remote-id to tag." + msgstr "RFC3046 \"remote-id\" auf Marke abbilden." + +-#: option.c:357 ++#: option.c:359 + msgid "Map RFC3993 subscriber-id to tag." + msgstr "RFC3993 \"subscriber-id\" auf Marke abbilden." + +-#: option.c:358 ++#: option.c:360 + msgid "Don't do DHCP for hosts with tag set." + msgstr "Kein DHCP fÃŒr Hosts mit gesetzter Marke verwenden." + +-#: option.c:359 ++#: option.c:361 + msgid "Force broadcast replies for hosts with tag set." + msgstr "Rundsendung fÃŒr Hosts mit gesetzter Marke erzwingen." + +-#: option.c:360 ++#: option.c:362 + msgid "Do NOT fork into the background, do NOT run in debug mode." + msgstr "NICHT in den Hintergrund wechseln, NICHT im Debug-Modus laufen." + +-#: option.c:361 ++#: option.c:363 + msgid "Assume we are the only DHCP server on the local network." + msgstr "Voraussetzen, dass wir der einzige DHCP-Server im lokalen Netz sind." + +-#: option.c:362 ++#: option.c:364 + #, c-format + msgid "Specify where to store DHCP leases (defaults to %s)." + msgstr "Festlegen, wo DHCP-Leases gespeichert werden (Voreinstellung %s)." + +-#: option.c:363 ++#: option.c:365 + msgid "Return MX records for local hosts." + msgstr "MX-EintrÃ€ge fÃŒr lokale Hosts liefern." + +-#: option.c:364 ++#: option.c:366 + msgid "Specify an MX record." + msgstr "Einen MX-Eintrag festlegen." + +-#: option.c:365 ++#: option.c:367 + msgid "Specify BOOTP options to DHCP server." + msgstr "BOOTP-Optionen fÃŒr DHCP-Server festlegen." + +-#: option.c:366 ++#: option.c:368 + #, c-format + msgid "Do NOT poll %s file, reload only on SIGHUP." + msgstr "%s-Datei NICHT abfragen, nur bei SIGHUP neu laden." + +-#: option.c:367 ++#: option.c:369 + msgid "Do NOT cache failed search results." + msgstr "Fehlerhafte Suchergebnisse NICHT zwischenspeichern." + +-#: option.c:368 ++#: option.c:370 + #, c-format + msgid "Use nameservers strictly in the order given in %s." + msgstr "Namensserver streng in der in %s angegebenen Reihenfolge verwenden." + +-#: option.c:369 ++#: option.c:371 + msgid "Specify options to be sent to DHCP clients." + msgstr "Optionen festlegen, die an DHCP-Klienten gesendet werden." + +-#: option.c:370 ++#: option.c:372 + msgid "DHCP option sent even if the client does not request it." + msgstr "DHCP-Option, die selbst ohne Klientenanfrage gesendet wird." + +-#: option.c:371 ++#: option.c:373 + msgid "Specify port to listen for DNS requests on (defaults to 53)." + msgstr "Port zum AbhÃ¶ren der DNS-Anfragen festlegen (53 voreingestellt)." + +-#: option.c:372 ++#: option.c:374 + #, c-format + msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." + msgstr "Maximale unterstÃŒtzte UDP-PaketgrÃ¶Ãe fÃŒr EDNS.0 (Voreinstellung %s)." + +-#: option.c:373 ++#: option.c:375 + msgid "Log DNS queries." + msgstr "DNS-Anfragen protokollieren." + +-#: option.c:374 ++#: option.c:376 + msgid "Force the originating port for upstream DNS queries." + msgstr "Ausgehenden Port erzwingen fÃŒr DNS-Anfragen an vorgelagerte Server." + +-#: option.c:375 ++#: option.c:377 + msgid "Do NOT read resolv.conf." + msgstr "resolv.conf NICHT lesen." + +-#: option.c:376 ++#: option.c:378 + #, c-format + msgid "Specify path to resolv.conf (defaults to %s)." + msgstr "Pfad zu resolv.conf festlegen (%s voreingestellt)." + +-#: option.c:377 ++#: option.c:379 + msgid "Specify path to file with server= options" + msgstr " Dateipfad mit der Option server= angeben" + +-#: option.c:378 ++#: option.c:380 + msgid "Specify address(es) of upstream servers with optional domains." + msgstr "Adresse(n) vorgelagerter Server festlegen, optional mit DomÃ€nen." + +-#: option.c:379 ++#: option.c:381 + msgid "Specify address of upstream servers for reverse address queries" + msgstr "Adresse(n) vorgelagerter Server festlegen, fÃŒr reverse Adressanfragen" + +-#: option.c:380 ++#: option.c:382 + msgid "Never forward queries to specified domains." + msgstr "Anfragen fÃŒr angegebene DomÃ€nen niemals weiterleiten." + +-#: option.c:381 ++#: option.c:383 + msgid "Specify the domain to be assigned in DHCP leases." + msgstr "DomÃ€ne festlegen, die fÃŒr DHCP-Leases zugewiesen wird." + +-#: option.c:382 ++#: option.c:384 + msgid "Specify default target in an MX record." + msgstr "Voreingestelltes Ziel fÃŒr MX-EintrÃ€ge festlegen." + +-#: option.c:383 ++#: option.c:385 + msgid "Specify time-to-live in seconds for replies from /etc/hosts." + msgstr "GÃŒltigkeitsdauer fÃŒr Antworten aus /etc/hosts festlegen." + +-#: option.c:384 ++#: option.c:386 + msgid "Specify time-to-live in seconds for negative caching." + msgstr "GÃŒltigkeitsdauer in Sekunden fÃŒr Caching negativer Ergebnisse festlegen." + +-#: option.c:385 ++#: option.c:387 + msgid "Specify time-to-live in seconds for maximum TTL to send to clients." + msgstr "GÃŒltigkeitsdauer in Sekunden fÃŒr Caching negativer Ergebnisse festlegen." + +-#: option.c:386 ++#: option.c:388 + #, fuzzy + msgid "Specify time-to-live ceiling for cache." + msgstr "GÃŒltigkeitsdauer in Sekunden fÃŒr Caching negativer Ergebnisse festlegen." + +-#: option.c:387 ++#: option.c:389 + #, fuzzy + msgid "Specify time-to-live floor for cache." + msgstr "GÃŒltigkeitsdauer in Sekunden fÃŒr Caching negativer Ergebnisse festlegen." + +-#: option.c:388 ++#: option.c:390 + #, c-format + msgid "Change to this user after startup. (defaults to %s)." + msgstr "Nach dem Start diese Benutzerrechte annehmen (%s voreingestellt)." + +-#: option.c:389 ++#: option.c:391 + msgid "Map DHCP vendor class to tag." + msgstr "DHCP-\"vendor class\" auf Marke abbilden." + +-#: option.c:390 ++#: option.c:392 + msgid "Display dnsmasq version and copyright information." + msgstr "dnsmasq-Version und Urheberrecht anzeigen." + +-#: option.c:391 ++#: option.c:393 + msgid "Translate IPv4 addresses from upstream servers." + msgstr "IPv4-Adressen von vorgelagerten Servern ÃŒbersetzen." + +-#: option.c:392 ++#: option.c:394 + msgid "Specify a SRV record." + msgstr "SRV-Eintrag festlegen." + +-#: option.c:393 ++#: option.c:395 + msgid "Display this message. Use --help dhcp for known DHCP options." + msgstr "Diese Hilfe anzeigen. Benutzen Sie --help dhcp fÃŒr bekannte DHCP-Optionen." + +-#: option.c:394 ++#: option.c:396 + #, c-format + msgid "Specify path of PID file (defaults to %s)." + msgstr "Dateipfad fÃŒr Prozesskennung (PID) festlegen (Voreinstellung: %s)." + +-#: option.c:395 ++#: option.c:397 + #, c-format + msgid "Specify maximum number of DHCP leases (defaults to %s)." + msgstr "HÃ¶chstzahl der DHCP-Leases festlegen (%s voreingestellt)." + +-#: option.c:396 ++#: option.c:398 + msgid "Answer DNS queries based on the interface a query was sent to." + msgstr "DNS-Anfragen abhÃ€ngig der Emfpangsschnittstelle beantworten." + +-#: option.c:397 ++#: option.c:399 + msgid "Specify TXT DNS record." + msgstr "DNS-TXT-Eintrag festlegen." + +-#: option.c:398 ++#: option.c:400 + msgid "Specify PTR DNS record." + msgstr "DNS-PTR-Eintrag festlegen." + +-#: option.c:399 ++#: option.c:401 + msgid "Give DNS name to IPv4 address of interface." + msgstr "Schnittstellennamen zur IPv4-Adresse des Interfaces auflÃ¶sen." + +-#: option.c:400 ++#: option.c:402 + msgid "Bind only to interfaces in use." + msgstr "Nur an verwendete Schnittstellen binden." + +-#: option.c:401 ++#: option.c:403 + #, c-format + msgid "Read DHCP static host information from %s." + msgstr "Statische DHCP-Host-Information aus %s lesen." + +-#: option.c:402 ++#: option.c:404 + msgid "Enable the DBus interface for setting upstream servers, etc." + msgstr "DBus-Schnittstelle zum Festlegen vorgelagerter Server usw. festlegen." + +-#: option.c:403 ++#: option.c:405 + msgid "Do not provide DHCP on this interface, only provide DNS." + msgstr "Auf dieser Schnittstelle kein DHCP anbieten, sondern nur DNS." + +-#: option.c:404 ++#: option.c:406 + msgid "Enable dynamic address allocation for bootp." + msgstr "Dynamische Adressbelegung fÃŒr bootp einschalten." + +-#: option.c:405 ++#: option.c:407 + msgid "Map MAC address (with wildcards) to option set." + msgstr "MAC-Adresse (mit Jokerzeichen) auf Netzmarke abbilden." + +-#: option.c:406 ++#: option.c:408 + msgid "Treat DHCP requests on aliases as arriving from interface." + msgstr "DHCP-Anfragen von Alias-Schnittstellen fÃŒr die Hauptschnittstelle beantworten." + +-#: option.c:407 ++#: option.c:409 + msgid "Disable ICMP echo address checking in the DHCP server." + msgstr "ICMP-Echo-AdressprÃŒfung im DHCP-Server abschalten." + +-#: option.c:408 ++#: option.c:410 + msgid "Shell script to run on DHCP lease creation and destruction." + msgstr "Skript, das bei Erzeugung/LÃ¶schung einer DHCP-Lease laufen soll." + +-#: option.c:409 ++#: option.c:411 + msgid "Lua script to run on DHCP lease creation and destruction." + msgstr "Lua-Skript, welches bei Erzeugung/LÃ¶schung eines DHCP-Leases laufen soll." + +-#: option.c:410 ++#: option.c:412 + msgid "Run lease-change scripts as this user." + msgstr "Lease-Ãnderungs-Skript mit den Rechten dieses Nutzers ausfÃŒhren." + +-#: option.c:411 ++#: option.c:413 + msgid "Read configuration from all the files in this directory." + msgstr "Konfiguration aus allen Dateien in diesem Verzeichnis lesen." + +-#: option.c:412 ++#: option.c:414 + msgid "Log to this syslog facility or file. (defaults to DAEMON)" + msgstr "FÃŒr diese Syslog-Anlage oder in Datei loggen (Voreinstellung DAEMON)." + +-#: option.c:413 ++#: option.c:415 + msgid "Do not use leasefile." + msgstr "Keine Lease-Datei benÃŒtzen." + +-#: option.c:414 ++#: option.c:416 + #, c-format + msgid "Maximum number of concurrent DNS queries. (defaults to %s)" + msgstr "HÃ¶chstzahl nebenlÃ€ufiger DNS-Anfragen (%s voreingestellt)." + +-#: option.c:415 ++#: option.c:417 + #, c-format + msgid "Clear DNS cache when reloading %s." + msgstr "DNS-Cache beim Neuladen von %s lÃ¶schen." + +-#: option.c:416 ++#: option.c:418 + msgid "Ignore hostnames provided by DHCP clients." + msgstr "Von DHCP-Clients gelieferte Hostnamen ignorieren." + +-#: option.c:417 ++#: option.c:419 + msgid "Do NOT reuse filename and server fields for extra DHCP options." + msgstr "Dateinamen und Server-Datenfehler fÃŒr zusÃ€tzliche DHCP-Optionen NICHT wiederverwenden." + +-#: option.c:418 ++#: option.c:420 + msgid "Enable integrated read-only TFTP server." + msgstr "Eingebauten Nur-Lese-TFTP-Server einschalten." + +-#: option.c:419 ++#: option.c:421 + msgid "Export files by TFTP only from the specified subtree." + msgstr "Nur vom festgelegten Unterbaum Dateien per TFTP exportieren." + +-#: option.c:420 ++#: option.c:422 + msgid "Add client IP address to tftp-root." + msgstr "IP-Adresse des Klienten an tftp-root anhÃ€ngen." + +-#: option.c:421 ++#: option.c:423 + msgid "Allow access only to files owned by the user running dnsmasq." + msgstr "Zugriff nur auf Dateien gestatten, die dem dnsmasq aufrufenden Benutzer gehÃ¶ren." + +-#: option.c:422 ++#: option.c:424 ++msgid "Do not terminate the service if TFTP directories are inaccessible." ++msgstr "" ++ ++#: option.c:425 + #, c-format + msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." + msgstr "HÃ¶chstzahl nebenlÃ€ufiger TFTP-Ãbertragungen (%s voreingestellt)." + +-#: option.c:423 ++#: option.c:426 + msgid "Disable the TFTP blocksize extension." + msgstr "TFTP-BlockgrÃ¶Ãen-Erweiterung abschalten." + +-#: option.c:424 ++#: option.c:427 + msgid "Convert TFTP filenames to lowercase" + msgstr "Konvertiere TFTP Dateinamen in Kleinschreibung" + +-#: option.c:425 ++#: option.c:428 + msgid "Ephemeral port range for use by TFTP transfers." + msgstr "Bereich fÃŒr vorÃŒbergehende Ports fÃŒr TFTP-Ãbertragungen." + +-#: option.c:426 ++#: option.c:429 + msgid "Extra logging for DHCP." + msgstr "Erweiterte DHCP-Protokollierung." + +-#: option.c:427 ++#: option.c:430 + msgid "Enable async. logging; optionally set queue length." + msgstr "Asynchrone Protokollierung einschalten, opt. WarteschlangenlÃ€nge festlegen." + +-#: option.c:428 ++#: option.c:431 + msgid "Stop DNS rebinding. Filter private IP ranges when resolving." + msgstr "DNS-Rebinding unterbinden, private IP-Bereiche bei der AuflÃ¶sung ausfiltern." + +-#: option.c:429 ++#: option.c:432 + msgid "Allow rebinding of 127.0.0.0/8, for RBL servers." + msgstr "AuflÃ¶sung zu 127.0.0.0/8 erlauben, fÃŒr RBL-Server." + +-#: option.c:430 ++#: option.c:433 + msgid "Inhibit DNS-rebind protection on this domain." + msgstr "DNS-Rebind-Schutz fÃŒr diese DomÃ€ne sperren." + +-#: option.c:431 ++#: option.c:434 + msgid "Always perform DNS queries to all servers." + msgstr "DNS-Anfragen immer an alle Server weiterleiten." + +-#: option.c:432 ++#: option.c:435 + msgid "Set tag if client includes matching option in request." + msgstr "Marke setzen, wenn Klient eine entsprechende Option anfragt." + +-#: option.c:433 ++#: option.c:436 + msgid "Use alternative ports for DHCP." + msgstr "Alternative Ports fÃŒr DHCP verwenden." + +-#: option.c:434 ++#: option.c:437 + msgid "Specify NAPTR DNS record." + msgstr "DNS-NAPTR-Eintrag festlegen." + +-#: option.c:435 ++#: option.c:438 + msgid "Specify lowest port available for DNS query transmission." + msgstr "Niedrigsten verfÃŒgbaren Port fÃŒr Ãbertragung von DNS-Anfragen festlegen." + +-#: option.c:436 ++#: option.c:439 + msgid "Use only fully qualified domain names for DHCP clients." + msgstr "FÃŒr DHCP-Klienten nur vollstÃ€ndig bestimmte DomÃ€nennamen benutzen." + + # FIXME: probably typo in original message. -- MA +-#: option.c:437 ++#: option.c:440 + msgid "Generate hostnames based on MAC address for nameless clients." + msgstr "Generiere Hostnamen auf Basis der MAC-Adresse fÃŒr namenlose Klienten." + +-#: option.c:438 ++#: option.c:441 + msgid "Use these DHCP relays as full proxies." + msgstr "Diese DHCP-Relais als vollwertige Proxies verwenden." + +-#: option.c:439 ++#: option.c:442 + msgid "Relay DHCP requests to a remote server" + msgstr "Leute DHCP Anfragen an entfernten Server weiter" + +-#: option.c:440 ++#: option.c:443 + msgid "Specify alias name for LOCAL DNS name." + msgstr "Alias fÃŒr LOKALEN DNS-Namen festlegen." + +-#: option.c:441 ++#: option.c:444 + msgid "Prompt to send to PXE clients." + msgstr "Aufforderung, die an PXE-Klienten geschickt wird." + +-#: option.c:442 ++#: option.c:445 + msgid "Boot service for PXE menu." + msgstr "Boot-Dienst fÃŒr PXE-MenÃŒ." + +-#: option.c:443 ++#: option.c:446 + msgid "Check configuration syntax." + msgstr "Konfigurationssyntax prÃŒfen." + +-#: option.c:444 ++#: option.c:447 + msgid "Add requestor's MAC address to forwarded DNS queries." + msgstr "Anfragende MAC-Adresse in die weiterleitende DNS-Anfrage einfÃŒgen" + +-#: option.c:445 ++#: option.c:448 + msgid "Add requestor's IP subnet to forwarded DNS queries." + msgstr "FÃŒge das IP-Subnetz des Anfragenden in die weitergeleiteten DNS-Anfragen hinzu." + +-#: option.c:446 ++#: option.c:449 + msgid "Proxy DNSSEC validation results from upstream nameservers." + msgstr "Proxy-DNSSEC-Validierung-Ergebnisse von Upstream-Namensservern." + +-#: option.c:447 ++#: option.c:450 + msgid "Attempt to allocate sequential IP addresses to DHCP clients." + msgstr "Versuche sequenzielle IP-Adressen an DHCP-Klienten zu vergeben." + +-#: option.c:448 ++#: option.c:451 + msgid "Copy connection-track mark from queries to upstream connections." + msgstr "Kopiere \"connection-track mark\" von Anfragen nach Upstream-Verbindungen." + +-#: option.c:449 ++#: option.c:452 + msgid "Allow DHCP clients to do their own DDNS updates." + msgstr "Erlaube DHCP-Klienten ihre eigenen DDNS-Updates durchzufÃŒhren." + +-#: option.c:450 ++#: option.c:453 + msgid "Send router-advertisements for interfaces doing DHCPv6" + msgstr "Sende \"Router-Advertisments\" fÃŒr Netzwerkschnittstellen, welche DHCPv6 nutzen" + +-#: option.c:451 ++#: option.c:454 + msgid "Specify DUID_EN-type DHCPv6 server DUID" + msgstr "Spezifiziere DUID_EN-type DHCPv6 Server DUID" + +-#: option.c:452 ++#: option.c:455 + msgid "Specify host (A/AAAA and PTR) records" + msgstr "Spezifiziere Host (A/AAAA und PTR) EintrÃ€ge" + +-#: option.c:453 ++#: option.c:456 + msgid "Specify arbitrary DNS resource record" + msgstr "Spezifiziere einen beliebiegen DNS Eintrag" + +-#: option.c:454 ++#: option.c:457 + msgid "Bind to interfaces in use - check for new interfaces" + msgstr "Bindung zu Schnittstellen in Benutzung - prÃŒfe auf neue Schnittstellen" + +-#: option.c:455 ++#: option.c:458 + msgid "Export local names to global DNS" + msgstr "Exportiere lokale Namen in das globale DNS" + +-#: option.c:456 ++#: option.c:459 + msgid "Domain to export to global DNS" + msgstr "Domain fÃŒr das Exportieren des globalen DNS" + +-#: option.c:457 ++#: option.c:460 + msgid "Set TTL for authoritative replies" + msgstr "Setzte TTL fÃŒr autoritative Antworten" + +-#: option.c:458 ++#: option.c:461 + msgid "Set authoritive zone information" + msgstr "Setze autoritative Zoneninformationen" + +-#: option.c:459 ++#: option.c:462 + msgid "Secondary authoritative nameservers for forward domains" + msgstr "SekundÃ€rer autoritativer Nameserver fÃŒr weitergeleitete Domains" + +-#: option.c:460 ++#: option.c:463 + msgid "Peers which are allowed to do zone transfer" + msgstr "Peers welche einen Zonentransfer durchfÃŒhren dÃŒrfen" + +-#: option.c:461 ++#: option.c:464 + msgid "Specify ipsets to which matching domains should be added" + msgstr "Spezifiziere IPSets zu welcher passende Domains hinzugefÃŒgt werden sollen" + +-#: option.c:462 ++#: option.c:465 + msgid "Specify a domain and address range for synthesised names" + msgstr "Spezifiziere eine Domain und Adressbereich fÃŒr synthetisierte Namen" + +-#: option.c:463 ++#: option.c:466 + msgid "Activate DNSSEC validation" + msgstr "Aktiviere DNSSEC-Validierung" + +-#: option.c:464 ++#: option.c:467 + msgid "Specify trust anchor key digest." + msgstr "Spezifiziere Vertrauensursprung (Trust Anchor) der SchlÃŒssel-PrÃŒfdaten (Key Digest)." + +-#: option.c:465 ++#: option.c:468 + msgid "Disable upstream checking for DNSSEC debugging." + msgstr "Deaktiviere die ÃberprÃŒfung vorgelagerter Server fÃŒr DNSSEC-Debugging" + +-#: option.c:466 ++#: option.c:469 + msgid "Ensure answers without DNSSEC are in unsigned zones." + msgstr "Stellt sicher, dass Antworten ohne DNSSEC sich in einer unsignierten Zone befinden." + +-#: option.c:467 ++#: option.c:470 + msgid "Don't check DNSSEC signature timestamps until first cache-reload" + msgstr "DNSSEC Signatur-Zeitstempel nicht prÃŒfen, bis erstmalig der Cache neugeladen wird" + +-#: option.c:468 ++#: option.c:471 + msgid "Timestamp file to verify system clock for DNSSEC" + msgstr "" + +-#: option.c:470 ++#: option.c:473 + msgid "Specify DHCPv6 prefix class" + msgstr "Spezifiziere DHCPv6 Prefix Klasse" + +-#: option.c:472 ++#: option.c:475 + msgid "Set priority, resend-interval and router-lifetime" + msgstr "Setze PrioritÃ€t, Intervall des erneuten Sendens und Router Lebenszeit" + +-#: option.c:473 ++#: option.c:476 + msgid "Do not log routine DHCP." + msgstr "Protokolliere kein DHCP." + +-#: option.c:474 ++#: option.c:477 + msgid "Do not log routine DHCPv6." + msgstr "Protokolliere kein DHCPv6." + +-#: option.c:475 ++#: option.c:478 + msgid "Do not log RA." + msgstr "RA nicht protokollieren." + +-#: option.c:476 ++#: option.c:479 + msgid "Accept queries only from directly-connected networks" + msgstr "Akzeptiere nur Anfragen von direkt verbundenen Netzwerken" + +-#: option.c:477 ++#: option.c:480 + msgid "Detect and remove DNS forwarding loops" + msgstr "Erkennen und Entfernen von DNS-Weiterleitungsschleifen" + +-#: option.c:478 ++#: option.c:481 + msgid "Ignore DNS responses containing ipaddr." + msgstr "" + +-#: option.c:680 ++#: option.c:683 + #, c-format + msgid "" + "Usage: dnsmasq [options]\n" +@@ -743,312 +747,312 @@ msgstr "" + "Verwendung: dnsmasq [Optionen]\n" + "\n" + +-#: option.c:682 ++#: option.c:685 + #, c-format + msgid "Use short options only on the command line.\n" + msgstr "Auf der Befehlszeile nur kurze Optionen verwenden!\n" + +-#: option.c:684 ++#: option.c:687 + #, c-format + msgid "Valid options are:\n" + msgstr "GÃŒltige Optionen sind:\n" + +-#: option.c:741 option.c:745 ++#: option.c:744 option.c:748 + msgid "bad port" + msgstr "unzulÃ€ssiger Port" + +-#: option.c:772 option.c:804 ++#: option.c:775 option.c:807 + msgid "interface binding not supported" + msgstr "Schnittstellenbindung nicht unterstÃŒtzt" + +-#: option.c:781 option.c:3570 ++#: option.c:784 option.c:3575 + msgid "bad interface name" + msgstr "unzulÃ€ssiger Schnittestellenname" + +-#: option.c:811 ++#: option.c:814 + msgid "bad address" + msgstr "Fehlerhafte Adresse" + +-#: option.c:993 ++#: option.c:996 + msgid "unsupported encapsulation for IPv6 option" + msgstr "Nicht unterstÃŒtzte Verkapselung fÃŒr eine IPv6-Option" + +-#: option.c:1007 ++#: option.c:1010 + msgid "bad dhcp-option" + msgstr "Fehlerhafte DHCP-Option" + +-#: option.c:1075 ++#: option.c:1078 + msgid "bad IP address" + msgstr "Fehlerhafte IP-Adresse" + +-#: option.c:1078 option.c:1216 option.c:2888 ++#: option.c:1081 option.c:1219 option.c:2893 + msgid "bad IPv6 address" + msgstr "Fehlerhafte IPv6-Adresse" + +-#: option.c:1243 option.c:1337 ++#: option.c:1246 option.c:1340 + msgid "bad domain in dhcp-option" + msgstr "Fehlerhafte DomÃ€ne in DHCP-Option" + +-#: option.c:1375 ++#: option.c:1378 + msgid "dhcp-option too long" + msgstr "DHCP-Option zu lang" + +-#: option.c:1382 ++#: option.c:1385 + msgid "illegal dhcp-match" + msgstr "UnzulÃ€ssige dhcp-match-Option" + +-#: option.c:1444 ++#: option.c:1447 + msgid "illegal repeated flag" + msgstr "unzulÃ€ssig wiederholte Markierung" + +-#: option.c:1452 ++#: option.c:1455 + msgid "illegal repeated keyword" + msgstr "unzulÃ€ssig wiederholtes SchlÃŒsselwort" + +-#: option.c:1517 option.c:4186 ++#: option.c:1520 option.c:4191 + #, c-format + msgid "cannot access directory %s: %s" + msgstr "Kann auf Verzeichnis %s nicht zugreifen: %s" + +-#: option.c:1563 tftp.c:493 ++#: option.c:1566 tftp.c:493 + #, c-format + msgid "cannot access %s: %s" + msgstr "Kann auf %s nicht zugreifen: %s" + +-#: option.c:1615 ++#: option.c:1618 + msgid "setting log facility is not possible under Android" + msgstr "Die Einstellung Protokolliereinrichtung kann unter Android nicht gesetzt werden" + +-#: option.c:1624 ++#: option.c:1627 + msgid "bad log facility" + msgstr "Falsche Protokolliereinrichtung" + +-#: option.c:1677 ++#: option.c:1680 + msgid "bad MX preference" + msgstr "unzulÃ€ssige MX-PrÃ€ferenz-Angabe" + +-#: option.c:1682 ++#: option.c:1685 + msgid "bad MX name" + msgstr "unzulÃ€ssiger MX-Name" + +-#: option.c:1696 ++#: option.c:1699 + msgid "bad MX target" + msgstr "unzulÃ€ssiges MX-Ziel" + +-#: option.c:1708 ++#: option.c:1711 + msgid "cannot run scripts under uClinux" + msgstr "unter uClinux ist die SkriptausfÃŒhrung nicht mÃ¶glich" + +-#: option.c:1710 ++#: option.c:1713 + msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts" + msgstr "NeuÃŒbersetzung mit HAVE_SCRIPT nÃ¶tig, um Lease-Ãnderungs-Skripte auszufÃŒhren" + +-#: option.c:1714 ++#: option.c:1717 + msgid "recompile with HAVE_LUASCRIPT defined to enable Lua scripts" + msgstr "Um Benutzerdefinierte Lua-Scripte zu ermÃ¶glichen, muss mit HAVE_LUASCRIPT neu kompiliert werden" + +-#: option.c:1970 option.c:2015 option.c:2071 ++#: option.c:1973 option.c:2018 option.c:2074 + msgid "bad prefix" + msgstr "unzulÃ€ssiger PrÃ€fix" + +-#: option.c:2352 ++#: option.c:2355 + msgid "recompile with HAVE_IPSET defined to enable ipset directives" + msgstr "Um IPSet-Direktiven zu aktivieren, muss mit HAVE_IPSET neu ÃŒbersetzt werden" + +-#: option.c:2545 ++#: option.c:2548 + msgid "bad port range" + msgstr "unzulÃ€ssiger Portbereich" + +-#: option.c:2561 ++#: option.c:2564 + msgid "bad bridge-interface" + msgstr "unzulÃ€ssige BrÃŒcken-Schnittstelle" + +-#: option.c:2621 ++#: option.c:2624 + msgid "only one tag allowed" + msgstr "nur eine Marke zulÃ€ssig" + +-#: option.c:2641 option.c:2653 option.c:2759 option.c:2800 ++#: option.c:2644 option.c:2656 option.c:2764 option.c:2805 + msgid "bad dhcp-range" + msgstr "unzulÃ€ssiger DHCP-Bereich" + +-#: option.c:2668 ++#: option.c:2671 + msgid "inconsistent DHCP range" + msgstr "inkonsistenter DHCP-Bereich" + +-#: option.c:2727 ++#: option.c:2732 + msgid "prefix length must be exactly 64 for RA subnets" + msgstr "Die PrÃ€fixlenge muss genau 64 fÃŒr RA Subnetze sein" + +-#: option.c:2729 ++#: option.c:2734 + msgid "prefix length must be exactly 64 for subnet constructors" + msgstr "Die PrÃ€fixlenge muss genau 64 fÃŒr Subnet Konstruktoren sein" + +-#: option.c:2733 ++#: option.c:2738 + msgid "prefix length must be at least 64" + msgstr "Die PrÃ€fixlÃ€nge muss mindestens 64 sein" + +-#: option.c:2736 ++#: option.c:2741 + msgid "inconsistent DHCPv6 range" + msgstr "Inkonsistenter DHCPv6-Bereich" + +-#: option.c:2747 ++#: option.c:2752 + msgid "prefix must be zero with \"constructor:\" argument" + msgstr "Prefix muss mit dem \"constructor:\" Argument Null sein" + +-#: option.c:2858 option.c:2906 ++#: option.c:2863 option.c:2911 + msgid "bad hex constant" + msgstr "Falscher Hexwert" + +-#: option.c:2880 ++#: option.c:2885 + msgid "cannot match tags in --dhcp-host" + msgstr "Kann die Tags in --dhcp-host nicht abgleichen" + +-#: option.c:2928 ++#: option.c:2933 + #, c-format + msgid "duplicate dhcp-host IP address %s" + msgstr "doppelte dhcp-host IP-Adresse %s" + +-#: option.c:2986 ++#: option.c:2991 + msgid "bad DHCP host name" + msgstr "unzulÃ€ssiger DHCP-Hostname" + +-#: option.c:3068 ++#: option.c:3073 + msgid "bad tag-if" + msgstr "unzulÃ€ssige bedingte Marke (tag-if)" + +-#: option.c:3392 option.c:3786 ++#: option.c:3397 option.c:3791 + msgid "invalid port number" + msgstr "unzulÃ€ssige Portnummer" + +-#: option.c:3454 ++#: option.c:3459 + msgid "bad dhcp-proxy address" + msgstr "Fehlerhafte DHCP-Proxy-Adresse" + +-#: option.c:3480 ++#: option.c:3485 + msgid "Bad dhcp-relay" + msgstr "unzulÃ€ssiger dhcp-relay" + +-#: option.c:3506 ++#: option.c:3511 + msgid "bad RA-params" + msgstr "unzulÃ€ssige RA-Parameter" + +-#: option.c:3515 ++#: option.c:3520 + msgid "bad DUID" + msgstr "unzulÃ€ssige DUID" + +-#: option.c:3557 ++#: option.c:3562 + msgid "invalid alias range" + msgstr "unzulÃ€ssiger Alias-Bereich" + +-#: option.c:3611 ++#: option.c:3616 + msgid "bad CNAME" + msgstr "unzulÃ€ssiger CNAME" + +-#: option.c:3616 ++#: option.c:3621 + msgid "duplicate CNAME" + msgstr "doppelter CNAME" + +-#: option.c:3636 ++#: option.c:3641 + msgid "bad PTR record" + msgstr "unzulÃ€ssiger PTR-Eintrag" + +-#: option.c:3667 ++#: option.c:3672 + msgid "bad NAPTR record" + msgstr "unzulÃ€ssiger NAPTR-Eintrag" + +-#: option.c:3701 ++#: option.c:3706 + msgid "bad RR record" + msgstr "unzulÃ€ssiger RR-Eintrag" + +-#: option.c:3731 ++#: option.c:3736 + msgid "bad TXT record" + msgstr "unzulÃ€ssiger TXT-Eintrag" + +-#: option.c:3772 ++#: option.c:3777 + msgid "bad SRV record" + msgstr "unzulÃ€ssiger SRV-Eintrag" + +-#: option.c:3779 ++#: option.c:3784 + msgid "bad SRV target" + msgstr "unzulÃ€ssiges SRV-Ziel" + +-#: option.c:3793 ++#: option.c:3798 + msgid "invalid priority" + msgstr "unzulÃ€ssige PrioritÃ€t" + +-#: option.c:3800 ++#: option.c:3805 + msgid "invalid weight" + msgstr "unzulÃ€ssige Wichtung" + +-#: option.c:3824 ++#: option.c:3829 + msgid "Bad host-record" + msgstr "unzulÃ€ssiger host-record" + +-#: option.c:3841 ++#: option.c:3846 + msgid "Bad name in host-record" + msgstr "UnzulÃ€ssiger Name in host-record" + +-#: option.c:3906 ++#: option.c:3911 + msgid "bad trust anchor" + msgstr "unzulÃ€ssiger Vertrauensursprung (Trust Anchor)" + +-#: option.c:3920 ++#: option.c:3925 + msgid "bad HEX in trust anchor" + msgstr "unzulÃ€ssiger Hexwert in Vertrauensursprung (Trust Anchor)" + +-#: option.c:3930 ++#: option.c:3935 + msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DNSSEC/DBus support)" + msgstr "Nicht unterstÃŒtzte Option (prÃŒfen Sie, ob DNSMasq mit DHCP/TFTP/DNSSEC/DBus-UnterstÃŒtzung ÃŒbersetzt wurde)" + +-#: option.c:3989 ++#: option.c:3994 + msgid "missing \"" + msgstr "fehlende \\\"" + +-#: option.c:4046 ++#: option.c:4051 + msgid "bad option" + msgstr "unzulÃ€ssige Option" + +-#: option.c:4048 ++#: option.c:4053 + msgid "extraneous parameter" + msgstr "ÃŒberschÃŒssiger Parameter" + +-#: option.c:4050 ++#: option.c:4055 + msgid "missing parameter" + msgstr "fehler Parameter" + +-#: option.c:4052 ++#: option.c:4057 + msgid "illegal option" + msgstr "unzulÃ€ssige Option" + +-#: option.c:4059 ++#: option.c:4064 + msgid "error" + msgstr "Fehler" + +-#: option.c:4061 ++#: option.c:4066 + #, c-format + msgid " at line %d of %s" + msgstr " in Zeile %d von %s" + +-#: option.c:4076 option.c:4323 option.c:4359 ++#: option.c:4081 option.c:4328 option.c:4364 + #, c-format + msgid "read %s" + msgstr "%s gelesen" + +-#: option.c:4139 option.c:4262 tftp.c:667 ++#: option.c:4144 option.c:4267 tftp.c:667 + #, c-format + msgid "cannot read %s: %s" + msgstr "kann %s nicht lesen: %s" + +-#: option.c:4425 ++#: option.c:4430 + msgid "junk found in command line" + msgstr "Mist in der Kommandozeile gefunden" + +-#: option.c:4460 ++#: option.c:4465 + #, c-format + msgid "Dnsmasq version %s %s\n" + msgstr "Dnsmasq Version %s %s\n" + +-#: option.c:4461 ++#: option.c:4466 + #, c-format + msgid "" + "Compile time options: %s\n" +@@ -1057,63 +1061,63 @@ msgstr "" + "Kompilierungs-Optionen %s\n" + "\n" + +-#: option.c:4462 ++#: option.c:4467 + #, c-format + msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" + msgstr "FÃŒr diese Software wird ABSOLUT KEINE GARANTIE gewÃ€hrt.\n" + + # FIXME: this must be one long string! -- MA +-#: option.c:4463 ++#: option.c:4468 + #, c-format + msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" + msgstr "Dnsmasq ist freie Software, und du bist willkommen es weiter zu verteilen\n" + +-#: option.c:4464 ++#: option.c:4469 + #, c-format + msgid "under the terms of the GNU General Public License, version 2 or 3.\n" + msgstr "unter den Bedingungen der GNU General Public Lizenz, Version 2 oder 3.\n" + +-#: option.c:4475 ++#: option.c:4480 + msgid "try --help" + msgstr "versuchen Sie --help" + +-#: option.c:4477 ++#: option.c:4482 + msgid "try -w" + msgstr "versuchen Sie -w" + +-#: option.c:4479 ++#: option.c:4484 + #, c-format + msgid "bad command line options: %s" + msgstr "unzulÃ€ssige Optionen auf der Befehlszeile: %s" + +-#: option.c:4535 ++#: option.c:4544 + #, c-format + msgid "cannot get host-name: %s" + msgstr "kann Hostnamen nicht ermitteln: %s" + +-#: option.c:4563 ++#: option.c:4572 + msgid "only one resolv.conf file allowed in no-poll mode." + msgstr "mit -n/--no-poll ist nur eine resolv.conf-Datei zulÃ€ssig." + +-#: option.c:4573 ++#: option.c:4582 + msgid "must have exactly one resolv.conf to read domain from." + msgstr "Um die DomÃ€ne zu lesen, muss genau eine resolv.conf-Datei verwendet werden." + +-#: option.c:4576 network.c:1506 dhcp.c:774 ++#: option.c:4585 network.c:1507 dhcp.c:777 + #, c-format + msgid "failed to read %s: %s" + msgstr "konnte %s nicht lesen: %s" + +-#: option.c:4593 ++#: option.c:4602 + #, c-format + msgid "no search directive found in %s" + msgstr "keine \"search\"-Anweisung in %s gefunden" + +-#: option.c:4614 ++#: option.c:4623 + msgid "there must be a default domain when --dhcp-fqdn is set" + msgstr "Es muss eine standard Domain gesetzt sein, wenn --dhcp-fqdn gesetzt ist" + +-#: option.c:4623 ++#: option.c:4632 + msgid "syntax check OK" + msgstr "SyntaxprÃŒfung OK" + +@@ -1122,25 +1126,25 @@ msgstr "SyntaxprÃŒfung OK" + msgid "failed to send packet: %s" + msgstr "Fehlgeschlagen, folgendes Paket zu senden: %s" + +-#: forward.c:572 ++#: forward.c:591 + msgid "discarding DNS reply: subnet option mismatch" + msgstr "Verwerfe DNS Antwort: Subnetoption stimmt nicht ÃŒberrein" + +-#: forward.c:595 ++#: forward.c:614 + #, c-format + msgid "nameserver %s refused to do a recursive query" + msgstr "Namensserver %s hat eine rekursive Anfrage verweigert" + +-#: forward.c:627 ++#: forward.c:646 + #, c-format + msgid "possible DNS-rebind attack detected: %s" + msgstr "mÃ¶glichen DNS-Rebind-Angriff entdeckt: %s" + +-#: forward.c:1156 forward.c:1722 ++#: forward.c:1209 forward.c:1785 + msgid "Ignoring query from non-local network" + msgstr "Ignoriere Anfragen vom nicht lokalen Netzwerk" + +-#: forward.c:2178 ++#: forward.c:2256 + #, c-format + msgid "Maximum number of concurrent DNS queries reached (max: %d)" + msgstr "Maximale Anzahl an nebenlÃ€ufiger DNS-Anfragen erreicht (Max: %d)" +@@ -1174,341 +1178,351 @@ msgstr "Schnittstelle %s konnte DHCPv6-Multicast-Gruppe nicht beitreten: %s" + msgid "failed to bind server socket for %s: %s" + msgstr "konnte nicht an Server-Socket fÃŒr %s binden: %s" + +-#: network.c:1444 ++#: network.c:1445 + #, c-format + msgid "ignoring nameserver %s - local interface" + msgstr "ignoriere Namensserver %s - lokale Schnittstelle" + +-#: network.c:1455 ++#: network.c:1456 + #, c-format + msgid "ignoring nameserver %s - cannot make/bind socket: %s" + msgstr "ignoriere Namensserver %s - kann Socket nicht erzeugen/binden: %s" + + # FIXME: this isn't translatable - always provide full strings, do not assemble yourself! -- MA +-#: network.c:1468 ++#: network.c:1469 + msgid "unqualified" + msgstr "unqualifiziert" + +-#: network.c:1468 ++#: network.c:1469 + msgid "names" + msgstr "Namen" + +-#: network.c:1470 ++#: network.c:1471 + msgid "default" + msgstr "Standard" + +-#: network.c:1472 ++#: network.c:1473 + msgid "domain" + msgstr "Domain" + +-#: network.c:1475 ++#: network.c:1476 + #, c-format + msgid "using local addresses only for %s %s" + msgstr "Benutze lokale Adressen nur fÃŒr %s %s" + +-#: network.c:1477 ++#: network.c:1478 + #, c-format + msgid "using standard nameservers for %s %s" + msgstr "Benutze standard Namensserver fÃŒr %s %s" + +-#: network.c:1479 ++#: network.c:1480 + #, c-format + msgid "using nameserver %s#%d for %s %s" + msgstr "Benutze Namensserver %s#%d fÃŒr %s %s" + +-#: network.c:1483 ++#: network.c:1484 + #, c-format + msgid "NOT using nameserver %s#%d - query loop detected" + msgstr "Benutze Namensserver %s#%d NICHT - Anfragenschleife festgetellt" + +-#: network.c:1486 ++#: network.c:1487 + #, c-format + msgid "using nameserver %s#%d(via %s)" + msgstr "Benutze Namensserver %s#%d(via %s)" + +-#: network.c:1488 ++#: network.c:1489 + #, c-format + msgid "using nameserver %s#%d" + msgstr "Benutze Namensserver %s#%d" + +-#: dnsmasq.c:149 ++#: dnsmasq.c:163 + msgid "dhcp-hostsdir, dhcp-optsdir and hostsdir are not supported on this platform" + msgstr "" + +-#: dnsmasq.c:156 ++#: dnsmasq.c:170 + #, fuzzy + msgid "no trust anchors provided for DNSSEC" + msgstr "Keine VertrauensursprÃŒnge (Trust Anchor) fÃŒr DNSSEC verfÃŒgbar" + +-#: dnsmasq.c:159 ++#: dnsmasq.c:173 + #, fuzzy + msgid "cannot reduce cache size from default when DNSSEC enabled" + msgstr "Kann die Standard CachegrÃ¶Ãe nicht verkleinern, wenn DNSSEC aktiviert ist" + +-#: dnsmasq.c:161 ++#: dnsmasq.c:175 + msgid "DNSSEC not available: set HAVE_DNSSEC in src/config.h" + msgstr "DNSSEC nicht verfÃŒgbar: setzen Sie HAVE_DNSSEC in src/config.h" + +-#: dnsmasq.c:167 ++#: dnsmasq.c:181 + msgid "TFTP server not available: set HAVE_TFTP in src/config.h" + msgstr "TFTP-Server nicht verfÃŒgbar, setzen Sie HAVE_TFTP in src/config.h" + +-#: dnsmasq.c:172 ++#: dnsmasq.c:186 + #, fuzzy + msgid "cannot use --conntrack AND --query-port" + msgstr "Kann nicht --conntrack UND --query-port einsetzen" + +-#: dnsmasq.c:175 ++#: dnsmasq.c:189 + #, fuzzy + msgid "conntrack support not available: set HAVE_CONNTRACK in src/config.h" + msgstr "Conntrack-UnterstÃŒtzung nicht verfÃŒgbar: setze HAVE_CONNTRACK in src/config.h" + +-#: dnsmasq.c:180 ++#: dnsmasq.c:194 + msgid "asychronous logging is not available under Solaris" + msgstr "asynchrone Protokollierung unter Solaris nicht verfÃŒgbar" + +-#: dnsmasq.c:185 ++#: dnsmasq.c:199 + msgid "asychronous logging is not available under Android" + msgstr "Asynchrone Protokollierung unter Android nicht verfÃŒgbar" + +-#: dnsmasq.c:190 ++#: dnsmasq.c:204 + msgid "authoritative DNS not available: set HAVE_AUTH in src/config.h" + msgstr "Authoritatives DNS nicht verfÃŒgbar: Es muss HAVE_AUTH in src/config.h gesetzt sein" + +-#: dnsmasq.c:195 ++#: dnsmasq.c:209 + #, fuzzy + msgid "loop detection not available: set HAVE_LOOP in src/config.h" + msgstr "Loop-Erkennung nicht verfÃŒgbar, setzen Sie HAVE_LOOP in src/config.h" + +-#: dnsmasq.c:203 ++#: dnsmasq.c:217 + msgid "zone serial must be configured in --auth-soa" + msgstr "Zonen Seriennummer muss mit --auth-soa konfiguriert werden" + +-#: dnsmasq.c:221 ++#: dnsmasq.c:235 + msgid "dhcp-range constructor not available on this platform" + msgstr "dhcp-range Konstruktor ist auf dieser Plattform nicht verfÃŒbar" + +-#: dnsmasq.c:264 ++#: dnsmasq.c:278 + msgid "cannot set --bind-interfaces and --bind-dynamic" + msgstr "Kann nicht --bind-interfaces und --bind-dynamic setzen" + +-#: dnsmasq.c:267 ++#: dnsmasq.c:281 + #, c-format + msgid "failed to find list of interfaces: %s" + msgstr "konnte Schnitstellenliste nicht beziehen: %s" + +-#: dnsmasq.c:276 ++#: dnsmasq.c:290 + #, c-format + msgid "unknown interface %s" + msgstr "unbekannte Schnittstelle %s" + +-#: dnsmasq.c:340 dnsmasq.c:1004 ++#: dnsmasq.c:354 dnsmasq.c:1037 + #, c-format + msgid "DBus error: %s" + msgstr "DBus-Fehler: %s" + +-#: dnsmasq.c:343 ++#: dnsmasq.c:357 + msgid "DBus not available: set HAVE_DBUS in src/config.h" + msgstr "DBus nicht verfÃŒgbar: setzen Sie HAVE_DBUS in src/config.h" + +-#: dnsmasq.c:371 ++#: dnsmasq.c:385 + #, c-format + msgid "unknown user or group: %s" + msgstr "Unbekannter Benutzer oder Gruppe: %s" + +-#: dnsmasq.c:426 ++#: dnsmasq.c:440 + #, c-format + msgid "cannot chdir to filesystem root: %s" + msgstr "kann nicht ins Wurzelverzeichnis des Dateisystems wechseln: %s" + + # FIXME: this and the next would need commas after the version +-#: dnsmasq.c:667 ++#: dnsmasq.c:692 + #, c-format + msgid "started, version %s DNS disabled" + msgstr "gestartet, Version %s, DNS abgeschaltet" + +-#: dnsmasq.c:669 ++#: dnsmasq.c:694 + #, c-format + msgid "started, version %s cachesize %d" + msgstr "gestartet, Version %s, CachegrÃ¶Ãe %d" + +-#: dnsmasq.c:671 ++#: dnsmasq.c:696 + #, c-format + msgid "started, version %s cache disabled" + msgstr "Gestartet, Version %s Cache deaktiviert" + +-#: dnsmasq.c:673 ++#: dnsmasq.c:698 + #, c-format + msgid "compile time options: %s" + msgstr "Ãbersetzungsoptionen: %s" + +-#: dnsmasq.c:679 ++#: dnsmasq.c:704 + msgid "DBus support enabled: connected to system bus" + msgstr "DBus-UnterstÃŒtzung eingeschaltet: mit Systembus verbunden" + +-#: dnsmasq.c:681 ++#: dnsmasq.c:706 + msgid "DBus support enabled: bus connection pending" + msgstr "DBus-UnterstÃŒtzung eingeschaltet: warte auf Systembus-Verbindung" + +-#: dnsmasq.c:686 ++#: dnsmasq.c:711 + msgid "DNS service limited to local subnets" + msgstr "DNS-Dienst auf lokale Subnetze eingeschrÃ€nkt" + +-#: dnsmasq.c:702 ++#: dnsmasq.c:727 + msgid "DNSSEC validation enabled" + msgstr "DNSSEC-Validierung aktiviert" + +-#: dnsmasq.c:705 ++#: dnsmasq.c:730 + msgid "DNSSEC signature timestamps not checked until first cache reload" + msgstr "DNSSEC Signatur-Zeitstempel werden erst ab dem ersten Neuladen des Caches ÃŒberprÃŒft" + +-#: dnsmasq.c:708 ++#: dnsmasq.c:733 + #, fuzzy + msgid "DNSSEC signature timestamps not checked until system time valid" + msgstr "DNSSEC Signatur-Zeitstempel werden erst ab dem ersten Neuladen des Caches ÃŒberprÃŒft" + +-#: dnsmasq.c:713 ++#: dnsmasq.c:738 + #, c-format + msgid "warning: failed to change owner of %s: %s" + msgstr "Warnung: konnte den Besitzer von %s nicht Ã€ndern: %s" + +-#: dnsmasq.c:717 ++#: dnsmasq.c:742 + msgid "setting --bind-interfaces option because of OS limitations" + msgstr "Aktiviere --bind-interfaces wegen EinschrÃ€nkungen des Betriebssystems" + +-#: dnsmasq.c:727 ++#: dnsmasq.c:752 + #, c-format + msgid "warning: interface %s does not currently exist" + msgstr "Warnung: Schnittstelle %s existiert derzeit nicht" + +-#: dnsmasq.c:732 ++#: dnsmasq.c:757 + msgid "warning: ignoring resolv-file flag because no-resolv is set" + msgstr "Warnung: Ignoriere \"resolv-file\", weil \"no-resolv\" aktiv ist" + +-#: dnsmasq.c:735 ++#: dnsmasq.c:760 + msgid "warning: no upstream servers configured" + msgstr "Warnung: keine vorgelagerten (Upstream) Server konfiguriert" + +-#: dnsmasq.c:739 ++#: dnsmasq.c:764 + #, c-format + msgid "asynchronous logging enabled, queue limit is %d messages" + msgstr "asynchrone Protokollierung eingeschaltet, Warteschlange fasst %d Nachrichten" + +-#: dnsmasq.c:760 ++#: dnsmasq.c:785 + msgid "IPv6 router advertisement enabled" + msgstr "IPv6-Router-Advertisement aktiviert" + +-#: dnsmasq.c:765 ++#: dnsmasq.c:790 + #, c-format + msgid "DHCP, sockets bound exclusively to interface %s" + msgstr "DHCP, Sockets exklusiv an das Interface %s gebunden" + + # FIXME: this and the next few must be full strings to be translatable - do not assemble in code" +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "root is " + msgstr "Wurzel ist " + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "enabled" + msgstr "Aktiviert" + +-#: dnsmasq.c:784 ++#: dnsmasq.c:810 + msgid "secure mode" + msgstr "sicherer Modus" + +-#: dnsmasq.c:810 ++#: dnsmasq.c:813 ++#, c-format ++msgid "warning: %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:817 ++#, fuzzy, c-format ++msgid "warning: TFTP directory %s inaccessible" ++msgstr "Das TFTP-Verzeichnis %s ist nicht zugreifbar: %s" ++ ++#: dnsmasq.c:843 + #, c-format + msgid "restricting maximum simultaneous TFTP transfers to %d" + msgstr "Begrenze gleichzeitige TFTP-Ãbertragungen auf maximal %d" + +-#: dnsmasq.c:1006 ++#: dnsmasq.c:1039 + msgid "connected to system DBus" + msgstr "Mit System-DBus verbunden" + +-#: dnsmasq.c:1156 ++#: dnsmasq.c:1189 + #, c-format + msgid "cannot fork into background: %s" + msgstr "kann nicht in den Hintergrund abspalten: %s" + +-#: dnsmasq.c:1159 ++#: dnsmasq.c:1192 + #, c-format + msgid "failed to create helper: %s" + msgstr "kann Helfer nicht erzeugen: %s" + +-#: dnsmasq.c:1162 ++#: dnsmasq.c:1195 + #, c-format + msgid "setting capabilities failed: %s" + msgstr "kann \"capabilities\" nicht setzen: %s" + +-#: dnsmasq.c:1165 ++#: dnsmasq.c:1198 + #, c-format + msgid "failed to change user-id to %s: %s" + msgstr "Kann nicht Benutzerrechte %s annehmen: %s" + +-#: dnsmasq.c:1168 ++#: dnsmasq.c:1201 + #, c-format + msgid "failed to change group-id to %s: %s" + msgstr "Kann nicht Gruppenrechte %s annehmen: %s" + +-#: dnsmasq.c:1171 ++#: dnsmasq.c:1204 + #, c-format + msgid "failed to open pidfile %s: %s" + msgstr "kann die Prozessidentifikations-(PID)-Datei %s nicht Ã¶ffnen: %s" + +-#: dnsmasq.c:1174 ++#: dnsmasq.c:1207 + #, c-format + msgid "cannot open log %s: %s" + msgstr "Kann Logdatei %s nicht Ã¶ffnen: %s" + +-#: dnsmasq.c:1177 ++#: dnsmasq.c:1210 + #, c-format + msgid "failed to load Lua script: %s" + msgstr "Konnte Lua-Script nicht laden: %s" + +-#: dnsmasq.c:1180 ++#: dnsmasq.c:1213 + #, c-format + msgid "TFTP directory %s inaccessible: %s" + msgstr "Das TFTP-Verzeichnis %s ist nicht zugreifbar: %s" + +-#: dnsmasq.c:1183 ++#: dnsmasq.c:1216 + #, fuzzy, c-format + msgid "cannot create timestamp file %s: %s" + msgstr "kann Lease-Datei %s nicht Ã¶ffnen: %s" + +-#: dnsmasq.c:1204 ++#: dnsmasq.c:1237 + msgid "now checking DNSSEC signature timestamps" + msgstr "PrÃŒfe jetzt DNSSEC Signatur-Zeitstempel" + +-#: dnsmasq.c:1271 ++#: dnsmasq.c:1304 + #, c-format + msgid "script process killed by signal %d" + msgstr "Scriptprozess durch Signal %d getÃ¶tet" + +-#: dnsmasq.c:1275 ++#: dnsmasq.c:1308 + #, c-format + msgid "script process exited with status %d" + msgstr "Scriptprozess hat sich mit Status %d beendet" + +-#: dnsmasq.c:1279 ++#: dnsmasq.c:1312 + #, c-format + msgid "failed to execute %s: %s" + msgstr "konnte %s nicht ausfÃŒhren: %s" + +-#: dnsmasq.c:1334 ++#: dnsmasq.c:1367 + msgid "exiting on receipt of SIGTERM" + msgstr "beende nach Empfang von SIGTERM" + +-#: dnsmasq.c:1362 ++#: dnsmasq.c:1395 + #, c-format + msgid "failed to access %s: %s" + msgstr "konnte auf %s nicht zugreifen: %s" + +-#: dnsmasq.c:1392 ++#: dnsmasq.c:1425 + #, c-format + msgid "reading %s" + msgstr "lese %s" + +-#: dnsmasq.c:1403 ++#: dnsmasq.c:1436 + #, c-format + msgid "no servers found in %s, will retry" + msgstr "keine Server in %s gefunden, werde es spÃ€ter neu versuchen" +@@ -1538,37 +1552,37 @@ msgstr "kann nicht an DHCP-Server-Socket binden: %s" + msgid "cannot create ICMP raw socket: %s." + msgstr "kann ICMP-Rohdaten-Socket nicht erzeugen: %s." + +-#: dhcp.c:239 ++#: dhcp.c:241 dhcp6.c:180 + #, c-format + msgid "unknown interface %s in bridge-interface" + msgstr "unbekannte Schnittstelle %s in bridge-interface" + +-#: dhcp.c:278 ++#: dhcp.c:281 + #, c-format + msgid "DHCP packet received on %s which has no address" + msgstr "DHCP-Paket ohne Adresse an Schnittstelle %s empfangen" + +-#: dhcp.c:412 ++#: dhcp.c:415 + #, c-format + msgid "ARP-cache injection failed: %s" + msgstr "APR-Cache Injektion fehlgeschlagen: %s" + +-#: dhcp.c:511 ++#: dhcp.c:514 + #, c-format + msgid "DHCP range %s -- %s is not consistent with netmask %s" + msgstr "DHCP-Bereich %s - %s passt nicht zur Netzmaske %s" + +-#: dhcp.c:812 ++#: dhcp.c:815 + #, c-format + msgid "bad line at %s line %d" + msgstr "ungÃŒltige Zeile %2$d in Datei %1$s" + +-#: dhcp.c:855 ++#: dhcp.c:858 + #, c-format + msgid "ignoring %s line %d, duplicate name or IP address" + msgstr "ignoriere %s Zeile %d, doppelter Name oder doppelte IP-Adresse" + +-#: dhcp.c:999 rfc3315.c:2139 ++#: dhcp.c:1002 rfc3315.c:2135 + #, c-format + msgid "DHCP relay %s -> %s" + msgstr "DHCP Weiterleitung %s -> %s" +@@ -1605,172 +1619,172 @@ msgstr "Ignoriere DomÃ€ne %s fÃŒr DHCP-Hostnamen %s" + + # FIXME: this and the next few are not translatable. Please provide full + # strings, do not programmatically assemble them. +-#: rfc2131.c:342 ++#: rfc2131.c:344 + #, c-format + msgid "no address range available for DHCP request %s %s" + msgstr "Kein verfÃŒgbarer DHCP-Bereich fÃŒr Anfrage %s %s" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "with subnet selector" + msgstr "mit Subnetz-WÃ€hler" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "via" + msgstr "via" + +-#: rfc2131.c:355 ++#: rfc2131.c:357 + #, c-format + msgid "%u available DHCP subnet: %s/%s" + msgstr "%u verfÃŒgbare(s) DHCP-Subnetz: %s/%s" + +-#: rfc2131.c:358 rfc3315.c:300 ++#: rfc2131.c:360 rfc3315.c:300 + #, c-format + msgid "%u available DHCP range: %s -- %s" + msgstr "%u verfÃŒgbare(r) DHCP-Bereich: %s - %s" + +-#: rfc2131.c:469 ++#: rfc2131.c:471 + #, c-format + msgid "%u vendor class: %s" + msgstr "%u \"Vendor class\": %s" + +-#: rfc2131.c:471 ++#: rfc2131.c:473 + #, c-format + msgid "%u user class: %s" + msgstr "%u Benutzerklasse: %s" + + # FIXME: do not programmatically assemble strings - untranslatable +-#: rfc2131.c:498 ++#: rfc2131.c:500 + msgid "disabled" + msgstr "deaktiviert" + +-#: rfc2131.c:539 rfc2131.c:967 rfc2131.c:1385 rfc3315.c:603 rfc3315.c:860 +-#: rfc3315.c:1139 ++#: rfc2131.c:541 rfc2131.c:974 rfc2131.c:1380 rfc3315.c:603 rfc3315.c:856 ++#: rfc3315.c:1135 + msgid "ignored" + msgstr "ignoriert" + +-#: rfc2131.c:554 rfc2131.c:1205 rfc3315.c:910 ++#: rfc2131.c:556 rfc2131.c:1207 rfc3315.c:906 + msgid "address in use" + msgstr "Adresse in Nutzung" + +-#: rfc2131.c:568 rfc2131.c:1021 ++#: rfc2131.c:570 rfc2131.c:1028 + msgid "no address available" + msgstr "Keine Adresse verfÃŒgbar" + +-#: rfc2131.c:575 rfc2131.c:1168 ++#: rfc2131.c:577 rfc2131.c:1170 + msgid "wrong network" + msgstr "Falsches Netzwerk" + +-#: rfc2131.c:590 ++#: rfc2131.c:592 + msgid "no address configured" + msgstr "Keine Adresse konfiguriert" + +-#: rfc2131.c:596 rfc2131.c:1218 ++#: rfc2131.c:598 rfc2131.c:1220 + msgid "no leases left" + msgstr "Keine Leases ÃŒbrig" + +-#: rfc2131.c:691 rfc3315.c:476 ++#: rfc2131.c:693 rfc3315.c:476 + #, c-format + msgid "%u client provides name: %s" + msgstr "%u Klient stellt Name bereit: %s" + +-#: rfc2131.c:796 ++#: rfc2131.c:798 + msgid "PXE BIS not supported" + msgstr "PXE BIS nicht unterstÃŒtzt" + +-#: rfc2131.c:935 rfc3315.c:1233 ++#: rfc2131.c:942 rfc3315.c:1229 + #, c-format + msgid "disabling DHCP static address %s for %s" + msgstr "schalte statische DHCP-Adresse %s fÃŒr %s ab" + + # FIXME: do not assemble +-#: rfc2131.c:956 ++#: rfc2131.c:963 + msgid "unknown lease" + msgstr "Unbekannter Lease" + +-#: rfc2131.c:990 ++#: rfc2131.c:997 + #, c-format + msgid "not using configured address %s because it is leased to %s" + msgstr "benutze konfigurierte Adresse %s nicht, weil sie an %s verleast ist" + +-#: rfc2131.c:1000 ++#: rfc2131.c:1007 + #, c-format + msgid "not using configured address %s because it is in use by the server or relay" + msgstr "benutze konfigurierte Adresse %s nicht, weil sie von Server/Relais verwendet wird" + +-#: rfc2131.c:1003 ++#: rfc2131.c:1010 + #, c-format + msgid "not using configured address %s because it was previously declined" + msgstr "benutze konfigurierte Adresse %s nicht, weil sie zuvor abgelehnt wurde" + + # FIXME: do not assemble +-#: rfc2131.c:1019 rfc2131.c:1211 ++#: rfc2131.c:1026 rfc2131.c:1213 + msgid "no unique-id" + msgstr "Keine eindeutige ID" + +-#: rfc2131.c:1106 ++#: rfc2131.c:1108 + msgid "wrong server-ID" + msgstr "Falsche Server-ID" + +-#: rfc2131.c:1125 ++#: rfc2131.c:1127 + msgid "wrong address" + msgstr "Falsche Adresse" + +-#: rfc2131.c:1143 rfc3315.c:1006 ++#: rfc2131.c:1145 rfc3315.c:1002 + msgid "lease not found" + msgstr "Lease nicht gefunden" + +-#: rfc2131.c:1176 ++#: rfc2131.c:1178 + msgid "address not available" + msgstr "Adresse nicht verfÃŒgbar" + +-#: rfc2131.c:1187 ++#: rfc2131.c:1189 + msgid "static lease available" + msgstr "Statischer Lease verfÃŒgbar" + +-#: rfc2131.c:1191 ++#: rfc2131.c:1193 + msgid "address reserved" + msgstr "Adresse reserviert" + +-#: rfc2131.c:1199 ++#: rfc2131.c:1201 + #, c-format + msgid "abandoning lease to %s of %s" + msgstr "Gebe Lease von %2$s an %1$s auf" + +-#: rfc2131.c:1712 ++#: rfc2131.c:1707 + #, c-format + msgid "%u bootfile name: %s" + msgstr "%u Name der Bootdatei: %s" + +-#: rfc2131.c:1721 ++#: rfc2131.c:1716 + #, c-format + msgid "%u server name: %s" + msgstr "%u Servername: %s" + +-#: rfc2131.c:1729 ++#: rfc2131.c:1724 + #, c-format + msgid "%u next server: %s" + msgstr "%u nÃ€chster Server: %s" + +-#: rfc2131.c:1732 ++#: rfc2131.c:1727 + #, c-format + msgid "%u broadcast response" + msgstr "%u Antwort per Rundsendung" + +-#: rfc2131.c:1795 ++#: rfc2131.c:1790 + #, c-format + msgid "cannot send DHCP/BOOTP option %d: no space left in packet" + msgstr "kann DHCP/BOOTP-Opition %d nicht setzen: kein Platz mehr im Paket" + +-#: rfc2131.c:2036 ++#: rfc2131.c:2031 + msgid "PXE menu too large" + msgstr "PXE-MenÃŒeintrag zu groÃ" + +-#: rfc2131.c:2173 rfc3315.c:1506 ++#: rfc2131.c:2170 rfc3315.c:1502 + #, c-format + msgid "%u requested options: %s" + msgstr "%u angeforderte Optionen: %s" + +-#: rfc2131.c:2453 ++#: rfc2131.c:2487 + #, c-format + msgid "cannot send RFC3925 option: too many options for enterprise number %d" + msgstr "Kann RFC3925-Option nicht senden: zu viele Optionen fÃŒr Unternehmen Nr. %d" +@@ -1785,15 +1799,25 @@ msgstr "kann Netlink-Socket nicht erzeugen: %s" + msgid "netlink returns error: %s" + msgstr "Netlink liefert Fehler %s" + +-#: dbus.c:171 ++#: dbus.c:186 + msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" + msgstr "Versuch, via DBus eine IPv6-Serveradresse zu setzen: keine IPv6-UnterstÃŒtzung" + +-#: dbus.c:500 ++#: dbus.c:439 ++#, c-format ++msgid "Enabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:444 ++#, c-format ++msgid "Disabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:691 + msgid "setting upstream servers from DBus" + msgstr "vorgelagerte Server von DBus gesetzt" + +-#: dbus.c:547 ++#: dbus.c:738 + msgid "could not register a DBus message handler" + msgstr "konnte Steuerungsprogramm fÃŒr DBus-Nachrichten nicht anmelden" + +@@ -1914,47 +1938,47 @@ msgstr "%u Klient MAC-Adresse: %s" + msgid "unknown prefix-class %d" + msgstr "unbekannte PrÃ€fixklasse %d" + +-#: rfc3315.c:803 rfc3315.c:902 ++#: rfc3315.c:803 rfc3315.c:898 + msgid "address unavailable" + msgstr "Adresse nicht verfÃŒgbar" + +-#: rfc3315.c:815 rfc3315.c:950 rfc3315.c:1283 ++#: rfc3315.c:815 rfc3315.c:946 rfc3315.c:1279 + msgid "success" + msgstr "Erfolg" + +-#: rfc3315.c:843 rfc3315.c:845 rfc3315.c:958 rfc3315.c:960 ++#: rfc3315.c:830 rfc3315.c:839 rfc3315.c:954 rfc3315.c:956 + msgid "no addresses available" + msgstr "Keine Adressen verfÃŒgbar" + +-#: rfc3315.c:937 ++#: rfc3315.c:933 + msgid "not on link" + msgstr "nicht on link" + +-#: rfc3315.c:1010 rfc3315.c:1195 rfc3315.c:1272 ++#: rfc3315.c:1006 rfc3315.c:1191 rfc3315.c:1268 + msgid "no binding found" + msgstr "Keine Bindung gefunden" + +-#: rfc3315.c:1048 ++#: rfc3315.c:1044 + msgid "deprecated" + msgstr "veraltet" + +-#: rfc3315.c:1053 ++#: rfc3315.c:1049 + msgid "address invalid" + msgstr "Adresse ungÃŒltig" + +-#: rfc3315.c:1100 ++#: rfc3315.c:1096 + msgid "confirm failed" + msgstr "BestÃ€tigung fehlgeschlagen" + +-#: rfc3315.c:1116 ++#: rfc3315.c:1112 + msgid "all addresses still on link" + msgstr "Alle Adressen immer noch on link" + +-#: rfc3315.c:1204 ++#: rfc3315.c:1200 + msgid "release received" + msgstr "Freigabe empfangen" + +-#: rfc3315.c:2130 ++#: rfc3315.c:2126 + msgid "Cannot multicast to DHCPv6 server without correct interface" + msgstr "Kann nicht zum DHCPv6 Server multicasten ohne korrekte Schnittstelle" + +@@ -2042,12 +2066,12 @@ msgstr "DHCP Weiterleitung von %s nach %s ÃŒber %s" + msgid "DHCP relay from %s to %s" + msgstr "DHCP Weiterleitung von %s nach %s" + +-#: radv.c:98 ++#: radv.c:109 + #, c-format + msgid "cannot create ICMPv6 socket: %s" + msgstr "Kann ICMPv6-Socket nicht erzeugen: %s" + +-#: auth.c:436 ++#: auth.c:448 + #, c-format + msgid "ignoring zone transfer request from %s" + msgstr "ignoriere Zonentransfer-Anfrage von %s" +@@ -2062,7 +2086,7 @@ msgstr "konnte Kernelversion nicht finden: %s" + msgid "failed to create IPset control socket: %s" + msgstr "konnte IPset-Kontroll-Socket nicht erzeugen: %s" + +-#: dnssec.c:425 dnssec.c:469 ++#: dnssec.c:449 dnssec.c:493 + #, fuzzy, c-format + msgid "failed to update mtime on %s: %s" + msgstr "kann die Prozessidentifikations-(PID)-Datei %s nicht Ã¶ffnen: %s" +diff --git a/po/es.po b/po/es.po +index b85696072661..d9d2fb4dbf2c 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -25,17 +25,17 @@ msgstr "" + msgid "failed to load names from %s: %s" + msgstr "no se pudo cargar nombres desde %s: %s" + +-#: cache.c:967 dhcp.c:825 ++#: cache.c:967 dhcp.c:828 + #, fuzzy, c-format + msgid "bad address at %s line %d" + msgstr "dirección errónea en %s línea %d" + +-#: cache.c:1018 dhcp.c:841 ++#: cache.c:1018 dhcp.c:844 + #, c-format + msgid "bad name at %s line %d" + msgstr "nombre erróneo en %s línea %d" + +-#: cache.c:1027 dhcp.c:916 ++#: cache.c:1027 dhcp.c:919 + #, c-format + msgid "read %s - %d addresses" + msgstr "direcciónes %s - %d leídas" +@@ -94,664 +94,668 @@ msgstr "no se pudo crear valor semilla para el generador de n + msgid "failed to allocate memory" + msgstr "no se pudo asignar memoria" + +-#: util.c:243 option.c:598 ++#: util.c:250 option.c:601 + msgid "could not get memory" + msgstr "no se pudo adquirir memoria" + +-#: util.c:253 ++#: util.c:260 + #, fuzzy, c-format + msgid "cannot create pipe: %s" + msgstr "no se puede crear pipe: %s" + +-#: util.c:261 ++#: util.c:268 + #, fuzzy, c-format + msgid "failed to allocate %d bytes" + msgstr "no se pudo asignar %d bytes" + +-#: util.c:430 ++#: util.c:437 + #, c-format + msgid "infinite" + msgstr "infinito" + +-#: option.c:330 ++#: option.c:332 + msgid "Specify local address(es) to listen on." + msgstr "Especificar dirección(es) locales dónde escuchar." + +-#: option.c:331 ++#: option.c:333 + msgid "Return ipaddr for all hosts in specified domains." + msgstr "Retornar ipaddr (dirección IP) para todos los hosts en los dominios especificados." + +-#: option.c:332 ++#: option.c:334 + msgid "Fake reverse lookups for RFC1918 private address ranges." + msgstr "Falsificar búsquedas reversas para rangos de dirección privados RFC1918." + +-#: option.c:333 ++#: option.c:335 + msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." + msgstr "Tratar ipaddr (dirección IP) como NXDOMAIN (derrota comodín Verisign)." + +-#: option.c:334 ++#: option.c:336 + #, c-format + msgid "Specify the size of the cache in entries (defaults to %s)." + msgstr "Especificar tamaño de caché en cuanto a cantidad de objetos (%s por predeterminado)." + +-#: option.c:335 ++#: option.c:337 + #, c-format + msgid "Specify configuration file (defaults to %s)." + msgstr "Especificar archivo de configuración (%s por predeterminado)." + +-#: option.c:336 ++#: option.c:338 + msgid "Do NOT fork into the background: run in debug mode." + msgstr "NO hacer un fork hacia el fondo: correr en modo debug." + +-#: option.c:337 ++#: option.c:339 + msgid "Do NOT forward queries with no domain part." + msgstr "NO reenviar búsquedas sin parte de dominio." + +-#: option.c:338 ++#: option.c:340 + msgid "Return self-pointing MX records for local hosts." + msgstr "Retornar expedientes MX auto-señaladores para hosts locales." + +-#: option.c:339 ++#: option.c:341 + msgid "Expand simple names in /etc/hosts with domain-suffix." + msgstr "Expandir nombres simples en /etc/hosts con domain-suffix (sufijo de dominio)." + +-#: option.c:340 ++#: option.c:342 + msgid "Don't forward spurious DNS requests from Windows hosts." + msgstr "No reenviar pedidos DNS falsos desde máquinas Windows." + +-#: option.c:341 ++#: option.c:343 + msgid "Enable DHCP in the range given with lease duration." + msgstr "Habilitar DHCP dentro del rango brindado con duración de concesión." + +-#: option.c:342 ++#: option.c:344 + #, c-format + msgid "Change to this group after startup (defaults to %s)." + msgstr "Cambiar a este grupo después del inicio (%s por predeterminado)." + +-#: option.c:343 ++#: option.c:345 + msgid "Set address or hostname for a specified machine." + msgstr "Fijar dirección o nombre de host para una máquina especificada." + +-#: option.c:344 ++#: option.c:346 + #, fuzzy + msgid "Read DHCP host specs from file." + msgstr "Leer especificaciones DHCP de host desde archivo" + +-#: option.c:345 ++#: option.c:347 + #, fuzzy + msgid "Read DHCP option specs from file." + msgstr "Leer opciones DHCP de host desde archivo" + +-#: option.c:346 ++#: option.c:348 + #, fuzzy + msgid "Read DHCP host specs from a directory." + msgstr "Leer especificaciones DHCP de host desde archivo" + +-#: option.c:347 ++#: option.c:349 + #, fuzzy + msgid "Read DHCP options from a directory." + msgstr "Leer opciones DHCP de host desde archivo" + +-#: option.c:348 ++#: option.c:350 + msgid "Evaluate conditional tag expression." + msgstr "Evaluar expresión condicional de etiqueta." + +-#: option.c:349 ++#: option.c:351 + #, c-format + msgid "Do NOT load %s file." + msgstr "NO cargar archivo %s." + +-#: option.c:350 ++#: option.c:352 + #, c-format + msgid "Specify a hosts file to be read in addition to %s." + msgstr "Especificar un archivo de hosts para ser leído adicionalmente a %s." + +-#: option.c:351 ++#: option.c:353 + #, fuzzy + msgid "Read hosts files from a directory." + msgstr "Leer especificaciones DHCP de host desde archivo" + +-#: option.c:352 ++#: option.c:354 + msgid "Specify interface(s) to listen on." + msgstr "Especificar interfase(s) donde escuchar." + +-#: option.c:353 ++#: option.c:355 + msgid "Specify interface(s) NOT to listen on." + msgstr "Especificar interfase(s) donde NO escuchar." + +-#: option.c:354 ++#: option.c:356 + #, fuzzy + msgid "Map DHCP user class to tag." + msgstr "Trazar clase de usuario DHCP a etiqueta." + +-#: option.c:355 ++#: option.c:357 + msgid "Map RFC3046 circuit-id to tag." + msgstr "Trazar circuit-id (identificación de circuito) RFC3046 a etiqueta." + +-#: option.c:356 ++#: option.c:358 + msgid "Map RFC3046 remote-id to tag." + msgstr "Trazar remote-id (identificación remota) RFC3046 a etiqueta." + +-#: option.c:357 ++#: option.c:359 + msgid "Map RFC3993 subscriber-id to tag." + msgstr "Trazar subscriber-id (identificación de suscritor) RFC3993 a etiqueta." + +-#: option.c:358 ++#: option.c:360 + #, fuzzy + msgid "Don't do DHCP for hosts with tag set." + msgstr "No hacer DHCP para hosts con etiqueta fijada." + +-#: option.c:359 ++#: option.c:361 + #, fuzzy + msgid "Force broadcast replies for hosts with tag set." + msgstr "Forzar respuestas broadcast para hosts con etiqueta fijada." + +-#: option.c:360 ++#: option.c:362 + msgid "Do NOT fork into the background, do NOT run in debug mode." + msgstr "NO hacer un fork hacia el fondo, NO correr en modo debug." + +-#: option.c:361 ++#: option.c:363 + msgid "Assume we are the only DHCP server on the local network." + msgstr "Asumir que somos el único servidor DHCP en la red local." + +-#: option.c:362 ++#: option.c:364 + #, c-format + msgid "Specify where to store DHCP leases (defaults to %s)." + msgstr "Especificar donde almacenar concesión DHCP (%s por predeterminado)." + +-#: option.c:363 ++#: option.c:365 + msgid "Return MX records for local hosts." + msgstr "Retornar expedientes MX para hosts locales." + +-#: option.c:364 ++#: option.c:366 + msgid "Specify an MX record." + msgstr "Especificar un expediente MX." + +-#: option.c:365 ++#: option.c:367 + msgid "Specify BOOTP options to DHCP server." + msgstr "Especificar opciones BOOTP a servidor DHCP." + +-#: option.c:366 ++#: option.c:368 + #, c-format + msgid "Do NOT poll %s file, reload only on SIGHUP." + msgstr "NO revisar archivo %s periódicamente, recargar solo con SIGHUP." + +-#: option.c:367 ++#: option.c:369 + msgid "Do NOT cache failed search results." + msgstr "NO almacenar en caché resultados de búsquedas fallidas." + +-#: option.c:368 ++#: option.c:370 + #, c-format + msgid "Use nameservers strictly in the order given in %s." + msgstr "Usar servidores DNS estrictamente en el órden brindado en %s." + +-#: option.c:369 ++#: option.c:371 + #, fuzzy + msgid "Specify options to be sent to DHCP clients." + msgstr "Especificar opciones para ser enviadas a clientes DHCP." + +-#: option.c:370 ++#: option.c:372 + msgid "DHCP option sent even if the client does not request it." + msgstr "Opción DHCP enviada aún si el cliente no la pide." + +-#: option.c:371 ++#: option.c:373 + msgid "Specify port to listen for DNS requests on (defaults to 53)." + msgstr "Especificar puerto donde escuchar por búsquedas DNS (53 por predeterminado)." + +-#: option.c:372 ++#: option.c:374 + #, c-format + msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." + msgstr "Tamaño máximo de paquetes UDP soportado para EDNS.0 (%s por predeterminado)." + +-#: option.c:373 ++#: option.c:375 + #, fuzzy + msgid "Log DNS queries." + msgstr "Bitacorear búsquedas DNS." + +-#: option.c:374 ++#: option.c:376 + #, fuzzy + msgid "Force the originating port for upstream DNS queries." + msgstr "Enforzar el puerto original para búsquedas DNS subida." + +-#: option.c:375 ++#: option.c:377 + msgid "Do NOT read resolv.conf." + msgstr "NO leer resolv.conf." + +-#: option.c:376 ++#: option.c:378 + #, c-format + msgid "Specify path to resolv.conf (defaults to %s)." + msgstr "Especificar el path hacia resolv.conf (%s por predeterminado)." + +-#: option.c:377 ++#: option.c:379 + #, fuzzy + msgid "Specify path to file with server= options" + msgstr "Especificar path de archivo PID (%s por predeterminado)." + +-#: option.c:378 ++#: option.c:380 + msgid "Specify address(es) of upstream servers with optional domains." + msgstr "Especificar dirección(es) de servidores subida con dominios opcionales." + +-#: option.c:379 ++#: option.c:381 + #, fuzzy + msgid "Specify address of upstream servers for reverse address queries" + msgstr "Especificar dirección(es) de servidores subida con dominios opcionales." + +-#: option.c:380 ++#: option.c:382 + msgid "Never forward queries to specified domains." + msgstr "Nunca reenviar búsquedas a dominios especificados." + +-#: option.c:381 ++#: option.c:383 + msgid "Specify the domain to be assigned in DHCP leases." + msgstr "Especificar el dominio para ser asignado en concesión DHCP." + +-#: option.c:382 ++#: option.c:384 + msgid "Specify default target in an MX record." + msgstr "Especificar destino predeterminado en un expediente MX." + +-#: option.c:383 ++#: option.c:385 + msgid "Specify time-to-live in seconds for replies from /etc/hosts." + msgstr "Especificar tiempo de vida en segundos para respuestas desde /etc/hosts." + +-#: option.c:384 ++#: option.c:386 + #, fuzzy + msgid "Specify time-to-live in seconds for negative caching." + msgstr "Especificar tiempo de vida en segundos para caché negativo." + +-#: option.c:385 ++#: option.c:387 + #, fuzzy + msgid "Specify time-to-live in seconds for maximum TTL to send to clients." + msgstr "Especificar tiempo de vida en segundos para respuestas desde /etc/hosts." + +-#: option.c:386 ++#: option.c:388 + #, fuzzy + msgid "Specify time-to-live ceiling for cache." + msgstr "Especificar tiempo de vida en segundos para caché negativo." + +-#: option.c:387 ++#: option.c:389 + #, fuzzy + msgid "Specify time-to-live floor for cache." + msgstr "Especificar tiempo de vida en segundos para caché negativo." + +-#: option.c:388 ++#: option.c:390 + #, c-format + msgid "Change to this user after startup. (defaults to %s)." + msgstr "Cambiar a este usuario despues del inicio (%s por predeterminado)." + +-#: option.c:389 ++#: option.c:391 + #, fuzzy + msgid "Map DHCP vendor class to tag." + msgstr "Trazar clase de vendedor DHCP a etiqueta." + +-#: option.c:390 ++#: option.c:392 + msgid "Display dnsmasq version and copyright information." + msgstr "Mostrar información sobre la versión y copyright de dnsmasq." + +-#: option.c:391 ++#: option.c:393 + msgid "Translate IPv4 addresses from upstream servers." + msgstr "Traducir direcciones IPv4 desde servidores subida." + +-#: option.c:392 ++#: option.c:394 + msgid "Specify a SRV record." + msgstr "Especificar un expediente SRV." + +-#: option.c:393 ++#: option.c:395 + msgid "Display this message. Use --help dhcp for known DHCP options." + msgstr "Mostrar este mensaje. Usar --help dhcp para opciones DHCP conocidas." + +-#: option.c:394 ++#: option.c:396 + #, fuzzy, c-format + msgid "Specify path of PID file (defaults to %s)." + msgstr "Especificar path de archivo PID (%s por predeterminado)." + +-#: option.c:395 ++#: option.c:397 + #, c-format + msgid "Specify maximum number of DHCP leases (defaults to %s)." + msgstr "Especificar número máximo de concesión DHCP (%s por predeterminado)." + +-#: option.c:396 ++#: option.c:398 + msgid "Answer DNS queries based on the interface a query was sent to." + msgstr "Responder a búsquedas DNS en base a la interfase a la cuál fueron enviadas." + +-#: option.c:397 ++#: option.c:399 + msgid "Specify TXT DNS record." + msgstr "Especificar expediente DNS TXT." + +-#: option.c:398 ++#: option.c:400 + #, fuzzy + msgid "Specify PTR DNS record." + msgstr "Especificar expediente DNS PTR." + +-#: option.c:399 ++#: option.c:401 + msgid "Give DNS name to IPv4 address of interface." + msgstr "Otorgar nombre DNS a dirección IPv4 de interfase." + +-#: option.c:400 ++#: option.c:402 + msgid "Bind only to interfaces in use." + msgstr "Acoplar solo a interfases en uso." + +-#: option.c:401 ++#: option.c:403 + #, c-format + msgid "Read DHCP static host information from %s." + msgstr "Leer información sobre hosts DHCP estáticos desde %s." + +-#: option.c:402 ++#: option.c:404 + msgid "Enable the DBus interface for setting upstream servers, etc." + msgstr "Habilitar la interfase DBus para fijar servidores subida, etc." + +-#: option.c:403 ++#: option.c:405 + msgid "Do not provide DHCP on this interface, only provide DNS." + msgstr "No proveer DHCP en esta interfase, sólo proveer DNS." + +-#: option.c:404 ++#: option.c:406 + msgid "Enable dynamic address allocation for bootp." + msgstr "Habilitar alocación dinámica de direcciónes para BOOTP." + +-#: option.c:405 ++#: option.c:407 + #, fuzzy + msgid "Map MAC address (with wildcards) to option set." + msgstr "Trazar dirección MAC (con comodínes) a opción fijada." + +-#: option.c:406 ++#: option.c:408 + msgid "Treat DHCP requests on aliases as arriving from interface." + msgstr "Tratar pedidos DHCP en alias como si llegaran de la interfase." + +-#: option.c:407 ++#: option.c:409 + msgid "Disable ICMP echo address checking in the DHCP server." + msgstr "Deshabilitar verificación de direcciónes para echo ICMP en el servidor DHCP." + +-#: option.c:408 ++#: option.c:410 + #, fuzzy + msgid "Shell script to run on DHCP lease creation and destruction." + msgstr "Archivo guión para ejecutar cuando se crea o destruye una concesión DHCP." + +-#: option.c:409 ++#: option.c:411 + #, fuzzy + msgid "Lua script to run on DHCP lease creation and destruction." + msgstr "Archivo guión para ejecutar cuando se crea o destruye una concesión DHCP." + +-#: option.c:410 ++#: option.c:412 + #, fuzzy + msgid "Run lease-change scripts as this user." + msgstr "Correr archivo guión de cambio de concesión como este usuario." + +-#: option.c:411 ++#: option.c:413 + msgid "Read configuration from all the files in this directory." + msgstr "Leer configuración desde todos los archivos en este directorio." + +-#: option.c:412 ++#: option.c:414 + #, fuzzy + msgid "Log to this syslog facility or file. (defaults to DAEMON)" + msgstr "Bitacorear a esta facilidad syslog o archivo. (DAEMON por predeterminado)" + +-#: option.c:413 ++#: option.c:415 + msgid "Do not use leasefile." + msgstr "No usar archivo de concesión." + +-#: option.c:414 ++#: option.c:416 + #, fuzzy, c-format + msgid "Maximum number of concurrent DNS queries. (defaults to %s)" + msgstr "Número máximo de búsquedas DNS simultáneas. (%s por predeterminado)" + +-#: option.c:415 ++#: option.c:417 + #, c-format + msgid "Clear DNS cache when reloading %s." + msgstr "Liberar caché DNS al recargar %s." + +-#: option.c:416 ++#: option.c:418 + msgid "Ignore hostnames provided by DHCP clients." + msgstr "Ignorar nombres de host brindados por clientes DHCP." + +-#: option.c:417 ++#: option.c:419 + msgid "Do NOT reuse filename and server fields for extra DHCP options." + msgstr "NO reutilizar campos de nombre de archivo y servidor para opciones DHCP extra." + +-#: option.c:418 ++#: option.c:420 + msgid "Enable integrated read-only TFTP server." + msgstr "Habilitar servidor integrado TFTP solo-lectura." + +-#: option.c:419 ++#: option.c:421 + msgid "Export files by TFTP only from the specified subtree." + msgstr "Exportar archivos vía TFTP solo del sub-árbol especificado." + +-#: option.c:420 ++#: option.c:422 + msgid "Add client IP address to tftp-root." + msgstr "Agregar IP de cliente a tftp-root." + +-#: option.c:421 ++#: option.c:423 + msgid "Allow access only to files owned by the user running dnsmasq." + msgstr "Permitir acceso solo a archivos pertenecientes al usuario que corre dnsmasq." + +-#: option.c:422 ++#: option.c:424 ++msgid "Do not terminate the service if TFTP directories are inaccessible." ++msgstr "" ++ ++#: option.c:425 + #, fuzzy, c-format + msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." + msgstr "Número máximo de transferencias TFTP simultáneas (%s por predeterminado)." + +-#: option.c:423 ++#: option.c:426 + msgid "Disable the TFTP blocksize extension." + msgstr "Deshabilitar la extensión TFTP blocksize (tamaño de bloque)." + +-#: option.c:424 ++#: option.c:427 + msgid "Convert TFTP filenames to lowercase" + msgstr "Convertir a minúsculas los nombres de archivos TFTP" + +-#: option.c:425 ++#: option.c:428 + msgid "Ephemeral port range for use by TFTP transfers." + msgstr "Rango de puertos efímeros para ser usados en transferencias TFTP." + +-#: option.c:426 ++#: option.c:429 + msgid "Extra logging for DHCP." + msgstr "Log extra para DHCP." + +-#: option.c:427 ++#: option.c:430 + msgid "Enable async. logging; optionally set queue length." + msgstr "Habilitar registro asíncrono; opcionalmente fijar tamaño de cola." + +-#: option.c:428 ++#: option.c:431 + msgid "Stop DNS rebinding. Filter private IP ranges when resolving." + msgstr "Detener revinculación DNS. Filtrar rangos de IP privados al resolver." + +-#: option.c:429 ++#: option.c:432 + msgid "Allow rebinding of 127.0.0.0/8, for RBL servers." + msgstr "Permitir revinculación de 127.0.0.0/8, para servidores RBL." + +-#: option.c:430 ++#: option.c:433 + msgid "Inhibit DNS-rebind protection on this domain." + msgstr "Inhibir protección de revinculación DNS en este dominio." + +-#: option.c:431 ++#: option.c:434 + msgid "Always perform DNS queries to all servers." + msgstr "Siempre realizar búsquedas DNS a todos los servidores." + +-#: option.c:432 ++#: option.c:435 + #, fuzzy + msgid "Set tag if client includes matching option in request." + msgstr "Fijar etiqueta si cliente incluye opción coincidente en pedido." + +-#: option.c:433 ++#: option.c:436 + msgid "Use alternative ports for DHCP." + msgstr "Usar puertos alternativos para DHCP." + +-#: option.c:434 ++#: option.c:437 + #, fuzzy + msgid "Specify NAPTR DNS record." + msgstr "Especificar expediente DNS NAPTR." + +-#: option.c:435 ++#: option.c:438 + msgid "Specify lowest port available for DNS query transmission." + msgstr "Especificar puerto más bajo disponible para transmisión de búsquedas DNS." + +-#: option.c:436 ++#: option.c:439 + msgid "Use only fully qualified domain names for DHCP clients." + msgstr "Usar solo nombres de dominio completamente calificados para clientes DHCP." + +-#: option.c:437 ++#: option.c:440 + msgid "Generate hostnames based on MAC address for nameless clients." + msgstr "Generar hostnames basados en direcciones MAC para clientes sin nombre." + +-#: option.c:438 ++#: option.c:441 + msgid "Use these DHCP relays as full proxies." + msgstr "Usar estos relays DHCP como proxies completos." + +-#: option.c:439 ++#: option.c:442 + msgid "Relay DHCP requests to a remote server" + msgstr "" + +-#: option.c:440 ++#: option.c:443 + msgid "Specify alias name for LOCAL DNS name." + msgstr "Especificar nombre alias para nombre DNS LOCAL." + +-#: option.c:441 ++#: option.c:444 + #, fuzzy + msgid "Prompt to send to PXE clients." + msgstr "Aviso a ser enviado a clientes PXE." + +-#: option.c:442 ++#: option.c:445 + msgid "Boot service for PXE menu." + msgstr "Servicio de arranque para menú PXE." + +-#: option.c:443 ++#: option.c:446 + msgid "Check configuration syntax." + msgstr "Revisar sintaxis de configuración." + +-#: option.c:444 ++#: option.c:447 + msgid "Add requestor's MAC address to forwarded DNS queries." + msgstr "Añadir direcciones MAC de los peticionarios a los filtros DNS enviados" + +-#: option.c:445 ++#: option.c:448 + #, fuzzy + msgid "Add requestor's IP subnet to forwarded DNS queries." + msgstr "Añadir direcciones MAC de los peticionarios a los filtros DNS enviados" + +-#: option.c:446 ++#: option.c:449 + #, fuzzy + msgid "Proxy DNSSEC validation results from upstream nameservers." + msgstr "Traducir direcciones IPv4 desde servidores subida." + +-#: option.c:447 ++#: option.c:450 + msgid "Attempt to allocate sequential IP addresses to DHCP clients." + msgstr "Intento de instaurar direcciones IP secuenciales a cliente DHCP" + +-#: option.c:448 ++#: option.c:451 + msgid "Copy connection-track mark from queries to upstream connections." + msgstr "Copiar la marca de connection-track desde los filtros a las conexiones salientes" + +-#: option.c:449 ++#: option.c:452 + msgid "Allow DHCP clients to do their own DDNS updates." + msgstr "Permite a clientes DHCP realizar sus propias actualizaciones DDNS" + +-#: option.c:450 ++#: option.c:453 + msgid "Send router-advertisements for interfaces doing DHCPv6" + msgstr "Enviar anuncios del router a los interfases realizando DHCPv6" + +-#: option.c:451 ++#: option.c:454 + msgid "Specify DUID_EN-type DHCPv6 server DUID" + msgstr "" + +-#: option.c:452 ++#: option.c:455 + #, fuzzy + msgid "Specify host (A/AAAA and PTR) records" + msgstr "Especificar un expediente MX." + +-#: option.c:453 ++#: option.c:456 + #, fuzzy + msgid "Specify arbitrary DNS resource record" + msgstr "Especificar expediente DNS TXT." + +-#: option.c:454 ++#: option.c:457 + #, fuzzy + msgid "Bind to interfaces in use - check for new interfaces" + msgstr "interfase desconocida %s en bridge-interfase" + +-#: option.c:455 ++#: option.c:458 + msgid "Export local names to global DNS" + msgstr "Exportar nombres DNS locales a globales" + +-#: option.c:456 ++#: option.c:459 + msgid "Domain to export to global DNS" + msgstr "Dominio a exportar a DNS global" + +-#: option.c:457 ++#: option.c:460 + msgid "Set TTL for authoritative replies" + msgstr "Fijar TTL para respuestas autoritarias" + +-#: option.c:458 ++#: option.c:461 + msgid "Set authoritive zone information" + msgstr "Fijar información de zona autoritaria" + +-#: option.c:459 ++#: option.c:462 + msgid "Secondary authoritative nameservers for forward domains" + msgstr "Nombres de servidor secundario autoritatorios para dominios enviados" + +-#: option.c:460 ++#: option.c:463 + msgid "Peers which are allowed to do zone transfer" + msgstr "Colegas autorizados a la zona de transferencia (transfer)" + +-#: option.c:461 ++#: option.c:464 + msgid "Specify ipsets to which matching domains should be added" + msgstr "Especificar los ipsets coincidentes en dominio que debrían ser añadidos" + +-#: option.c:462 ++#: option.c:465 + #, fuzzy + msgid "Specify a domain and address range for synthesised names" + msgstr "Especificar dominio y rango de direcciones para los nombres acrónimos" + +-#: option.c:463 ++#: option.c:466 + msgid "Activate DNSSEC validation" + msgstr "" + +-#: option.c:464 ++#: option.c:467 + msgid "Specify trust anchor key digest." + msgstr "" + +-#: option.c:465 ++#: option.c:468 + msgid "Disable upstream checking for DNSSEC debugging." + msgstr "" + +-#: option.c:466 ++#: option.c:469 + msgid "Ensure answers without DNSSEC are in unsigned zones." + msgstr "" + +-#: option.c:467 ++#: option.c:470 + msgid "Don't check DNSSEC signature timestamps until first cache-reload" + msgstr "" + +-#: option.c:468 ++#: option.c:471 + msgid "Timestamp file to verify system clock for DNSSEC" + msgstr "" + +-#: option.c:470 ++#: option.c:473 + msgid "Specify DHCPv6 prefix class" + msgstr "Especificar prefijo de clase DHCPv6" + +-#: option.c:472 ++#: option.c:475 + msgid "Set priority, resend-interval and router-lifetime" + msgstr "" + +-#: option.c:473 ++#: option.c:476 + msgid "Do not log routine DHCP." + msgstr "" + +-#: option.c:474 ++#: option.c:477 + msgid "Do not log routine DHCPv6." + msgstr "" + +-#: option.c:475 ++#: option.c:478 + msgid "Do not log RA." + msgstr "" + +-#: option.c:476 ++#: option.c:479 + msgid "Accept queries only from directly-connected networks" + msgstr "" + +-#: option.c:477 ++#: option.c:480 + msgid "Detect and remove DNS forwarding loops" + msgstr "" + +-#: option.c:478 ++#: option.c:481 + msgid "Ignore DNS responses containing ipaddr." + msgstr "" + +-#: option.c:680 ++#: option.c:683 + #, c-format + msgid "" + "Usage: dnsmasq [options]\n" +@@ -760,335 +764,335 @@ msgstr "" + "Modo de uso: dnsmasq [opciones]\n" + "\n" + +-#: option.c:682 ++#: option.c:685 + #, c-format + msgid "Use short options only on the command line.\n" + msgstr "Usar opciones cortas solo en la línea de comandos.\n" + +-#: option.c:684 ++#: option.c:687 + #, fuzzy, c-format + msgid "Valid options are:\n" + msgstr "Opciones válidas son :\n" + +-#: option.c:741 option.c:745 ++#: option.c:744 option.c:748 + msgid "bad port" + msgstr "puerto erróneo" + +-#: option.c:772 option.c:804 ++#: option.c:775 option.c:807 + msgid "interface binding not supported" + msgstr "vinculación de interfase no está soportado" + +-#: option.c:781 option.c:3570 ++#: option.c:784 option.c:3575 + #, fuzzy + msgid "bad interface name" + msgstr "nombre de interfase erróneo" + +-#: option.c:811 ++#: option.c:814 + #, fuzzy + msgid "bad address" + msgstr "dirección IP errónea" + +-#: option.c:993 ++#: option.c:996 + msgid "unsupported encapsulation for IPv6 option" + msgstr "Encapsulación no soportada para opción IPv6" + +-#: option.c:1007 ++#: option.c:1010 + msgid "bad dhcp-option" + msgstr "opción dhcp-option errónea" + +-#: option.c:1075 ++#: option.c:1078 + #, fuzzy + msgid "bad IP address" + msgstr "dirección IP errónea" + +-#: option.c:1078 option.c:1216 option.c:2888 ++#: option.c:1081 option.c:1219 option.c:2893 + #, fuzzy + msgid "bad IPv6 address" + msgstr "dirección IP errónea" + +-#: option.c:1243 option.c:1337 ++#: option.c:1246 option.c:1340 + msgid "bad domain in dhcp-option" + msgstr "dominio erróneo en dhcp-option" + +-#: option.c:1375 ++#: option.c:1378 + msgid "dhcp-option too long" + msgstr "opción dhcp-option demasiado larga" + +-#: option.c:1382 ++#: option.c:1385 + msgid "illegal dhcp-match" + msgstr "dhcp-match ilegal" + +-#: option.c:1444 ++#: option.c:1447 + msgid "illegal repeated flag" + msgstr "opción repetida ilegal" + +-#: option.c:1452 ++#: option.c:1455 + msgid "illegal repeated keyword" + msgstr "palabra clave repetida ilegal" + +-#: option.c:1517 option.c:4186 ++#: option.c:1520 option.c:4191 + #, fuzzy, c-format + msgid "cannot access directory %s: %s" + msgstr "no se puede acceder a directorio %s: %s" + +-#: option.c:1563 tftp.c:493 ++#: option.c:1566 tftp.c:493 + #, fuzzy, c-format + msgid "cannot access %s: %s" + msgstr "no se puede acceder %s: %s" + +-#: option.c:1615 ++#: option.c:1618 + msgid "setting log facility is not possible under Android" + msgstr "la creación de un registro no es posible en Android" + +-#: option.c:1624 ++#: option.c:1627 + msgid "bad log facility" + msgstr "ubicación del registro errónea" + +-#: option.c:1677 ++#: option.c:1680 + msgid "bad MX preference" + msgstr "preferencia MX errónea" + +-#: option.c:1682 ++#: option.c:1685 + msgid "bad MX name" + msgstr "nombre MX erróneo" + +-#: option.c:1696 ++#: option.c:1699 + msgid "bad MX target" + msgstr "destino MX erróneo" + +-#: option.c:1708 ++#: option.c:1711 + msgid "cannot run scripts under uClinux" + msgstr "no se pueden correr archivos 'script' bajo uClinux" + +-#: option.c:1710 ++#: option.c:1713 + msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts" + msgstr "recompilar con HAVE_SCRIPT definido para habilitar guiónes de cambio de concesión" + +-#: option.c:1714 ++#: option.c:1717 + #, fuzzy + msgid "recompile with HAVE_LUASCRIPT defined to enable Lua scripts" + msgstr "recompilar con HAVE_SCRIPT definido para habilitar 'scripts' en Lua" + +-#: option.c:1970 option.c:2015 option.c:2071 ++#: option.c:1973 option.c:2018 option.c:2074 + #, fuzzy + msgid "bad prefix" + msgstr "prefijo erróneo" + +-#: option.c:2352 ++#: option.c:2355 + #, fuzzy + msgid "recompile with HAVE_IPSET defined to enable ipset directives" + msgstr "recompilar con HAVE_SCRIPT definido para habilitar directivas ipset" + +-#: option.c:2545 ++#: option.c:2548 + #, fuzzy + msgid "bad port range" + msgstr "rango de puertos erróneo" + +-#: option.c:2561 ++#: option.c:2564 + msgid "bad bridge-interface" + msgstr "opción bridge-interface (interfase puente) errónea" + +-#: option.c:2621 ++#: option.c:2624 + msgid "only one tag allowed" + msgstr "solo una etiqueta permitida" + +-#: option.c:2641 option.c:2653 option.c:2759 option.c:2800 ++#: option.c:2644 option.c:2656 option.c:2764 option.c:2805 + msgid "bad dhcp-range" + msgstr "opción dhcp-range (rango DHCP) errónea" + +-#: option.c:2668 ++#: option.c:2671 + msgid "inconsistent DHCP range" + msgstr "rango DHCP inconsistente" + +-#: option.c:2727 ++#: option.c:2732 + msgid "prefix length must be exactly 64 for RA subnets" + msgstr "la longitud del prefijo debe ser 64 exacto para subredes RA" + +-#: option.c:2729 ++#: option.c:2734 + msgid "prefix length must be exactly 64 for subnet constructors" + msgstr "la longitud del prefijo debe ser 64 exacto para subredes constructoras" + +-#: option.c:2733 ++#: option.c:2738 + msgid "prefix length must be at least 64" + msgstr "la longitud del prefijo debe ser al menos 64" + +-#: option.c:2736 ++#: option.c:2741 + #, fuzzy + msgid "inconsistent DHCPv6 range" + msgstr "rango DHCP inconsistente" + +-#: option.c:2747 ++#: option.c:2752 + msgid "prefix must be zero with \"constructor:\" argument" + msgstr "prefijo debe ser cero con argumento \"constructor:\"" + +-#: option.c:2858 option.c:2906 ++#: option.c:2863 option.c:2911 + #, fuzzy + msgid "bad hex constant" + msgstr "constante hexadecimal errónea" + +-#: option.c:2880 ++#: option.c:2885 + msgid "cannot match tags in --dhcp-host" + msgstr "no coinciden etiquetas en --dhcp-host" + +-#: option.c:2928 ++#: option.c:2933 + #, fuzzy, c-format + msgid "duplicate dhcp-host IP address %s" + msgstr "dirección IP duplicada %s en %s." + +-#: option.c:2986 ++#: option.c:2991 + #, fuzzy + msgid "bad DHCP host name" + msgstr "nombre de host DHCP erróneo" + +-#: option.c:3068 ++#: option.c:3073 + #, fuzzy + msgid "bad tag-if" + msgstr "etiqueta tag-if errónea" + +-#: option.c:3392 option.c:3786 ++#: option.c:3397 option.c:3791 + msgid "invalid port number" + msgstr "número de puerto inválido" + +-#: option.c:3454 ++#: option.c:3459 + #, fuzzy + msgid "bad dhcp-proxy address" + msgstr "dirección IP errónea" + +-#: option.c:3480 ++#: option.c:3485 + #, fuzzy + msgid "Bad dhcp-relay" + msgstr "opción dhcp-range (rango DHCP) errónea" + +-#: option.c:3506 ++#: option.c:3511 + msgid "bad RA-params" + msgstr "" + +-#: option.c:3515 ++#: option.c:3520 + msgid "bad DUID" + msgstr "DUID erróneo" + +-#: option.c:3557 ++#: option.c:3562 + #, fuzzy + msgid "invalid alias range" + msgstr "rango alias inválido" + +-#: option.c:3611 ++#: option.c:3616 + msgid "bad CNAME" + msgstr "CNAME erróneo" + +-#: option.c:3616 ++#: option.c:3621 + msgid "duplicate CNAME" + msgstr "CNAME duplicado" + +-#: option.c:3636 ++#: option.c:3641 + #, fuzzy + msgid "bad PTR record" + msgstr "registro PTR erróneo" + +-#: option.c:3667 ++#: option.c:3672 + #, fuzzy + msgid "bad NAPTR record" + msgstr "registro NAPTR erróneo" + +-#: option.c:3701 ++#: option.c:3706 + #, fuzzy + msgid "bad RR record" + msgstr "registro PTR erróneo" + +-#: option.c:3731 ++#: option.c:3736 + msgid "bad TXT record" + msgstr "registro TXT erróneo" + +-#: option.c:3772 ++#: option.c:3777 + msgid "bad SRV record" + msgstr "registro SRV erróneo" + +-#: option.c:3779 ++#: option.c:3784 + msgid "bad SRV target" + msgstr "destino SRV erróneo" + +-#: option.c:3793 ++#: option.c:3798 + msgid "invalid priority" + msgstr "prioridad inválida" + +-#: option.c:3800 ++#: option.c:3805 + msgid "invalid weight" + msgstr "peso inválido" + +-#: option.c:3824 ++#: option.c:3829 + #, fuzzy + msgid "Bad host-record" + msgstr "registro PTR erróneo" + +-#: option.c:3841 ++#: option.c:3846 + #, fuzzy + msgid "Bad name in host-record" + msgstr "nombre erróneo en %s" + +-#: option.c:3906 ++#: option.c:3911 + #, fuzzy + msgid "bad trust anchor" + msgstr "rango de puertos erróneo" + +-#: option.c:3920 ++#: option.c:3925 + msgid "bad HEX in trust anchor" + msgstr "" + +-#: option.c:3930 ++#: option.c:3935 + #, fuzzy + msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DNSSEC/DBus support)" + msgstr "opción no soportada (verificar que dnsmasq fue compilado con soporte para DHCP/TFTP/DBus)" + +-#: option.c:3989 ++#: option.c:3994 + msgid "missing \"" + msgstr "falta \"" + +-#: option.c:4046 ++#: option.c:4051 + msgid "bad option" + msgstr "opción errónea" + +-#: option.c:4048 ++#: option.c:4053 + msgid "extraneous parameter" + msgstr "parámetro extraño" + +-#: option.c:4050 ++#: option.c:4055 + msgid "missing parameter" + msgstr "parámetro ausente" + +-#: option.c:4052 ++#: option.c:4057 + #, fuzzy + msgid "illegal option" + msgstr "opción errónea" + +-#: option.c:4059 ++#: option.c:4064 + msgid "error" + msgstr "error" + +-#: option.c:4061 ++#: option.c:4066 + #, fuzzy, c-format + msgid " at line %d of %s" + msgstr "%s en línea %d de %%s" + +-#: option.c:4076 option.c:4323 option.c:4359 ++#: option.c:4081 option.c:4328 option.c:4364 + #, fuzzy, c-format + msgid "read %s" + msgstr "lee %s" + +-#: option.c:4139 option.c:4262 tftp.c:667 ++#: option.c:4144 option.c:4267 tftp.c:667 + #, c-format + msgid "cannot read %s: %s" + msgstr "no se puede leer %s: %s" + +-#: option.c:4425 ++#: option.c:4430 + msgid "junk found in command line" + msgstr "basura encontrada en linea de comando" + +-#: option.c:4460 ++#: option.c:4465 + #, c-format + msgid "Dnsmasq version %s %s\n" + msgstr "Versión dnsmasq %s %s\n" + +-#: option.c:4461 ++#: option.c:4466 + #, fuzzy, c-format + msgid "" + "Compile time options: %s\n" +@@ -1097,63 +1101,63 @@ msgstr "" + "Opciones de compilación %s\n" + "\n" + +-#: option.c:4462 ++#: option.c:4467 + #, c-format + msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" + msgstr "Este software viene SIN NINGUNA GARANTIA.\n" + +-#: option.c:4463 ++#: option.c:4468 + #, c-format + msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" + msgstr "Dnsmasq es software libre, y usted está autorizado a redistribuirlo\n" + +-#: option.c:4464 ++#: option.c:4469 + #, fuzzy, c-format + msgid "under the terms of the GNU General Public License, version 2 or 3.\n" + msgstr "bajo los términos de la GNU General Public License, versión 2 o 3.\n" + +-#: option.c:4475 ++#: option.c:4480 + msgid "try --help" + msgstr "pruebe --help" + +-#: option.c:4477 ++#: option.c:4482 + msgid "try -w" + msgstr "pruebe -w" + +-#: option.c:4479 ++#: option.c:4484 + #, fuzzy, c-format + msgid "bad command line options: %s" + msgstr "opciones de línea de comandos erróneas: %s" + +-#: option.c:4535 ++#: option.c:4544 + #, c-format + msgid "cannot get host-name: %s" + msgstr "no se puede obtener host-name (nombre de host): %s" + +-#: option.c:4563 ++#: option.c:4572 + msgid "only one resolv.conf file allowed in no-poll mode." + msgstr "solo un archivo resolv.conf está permitido en modo no-poll." + +-#: option.c:4573 ++#: option.c:4582 + msgid "must have exactly one resolv.conf to read domain from." + msgstr "debe haber exáctamente un resolv.conf desde donde leer dominio." + +-#: option.c:4576 network.c:1506 dhcp.c:774 ++#: option.c:4585 network.c:1507 dhcp.c:777 + #, fuzzy, c-format + msgid "failed to read %s: %s" + msgstr "no se pudo leer %s: %s" + +-#: option.c:4593 ++#: option.c:4602 + #, c-format + msgid "no search directive found in %s" + msgstr "ninguna directiva de búsqueda encontrada en %s" + +-#: option.c:4614 ++#: option.c:4623 + #, fuzzy + msgid "there must be a default domain when --dhcp-fqdn is set" + msgstr "debe haber un dominio predeterminado cuando --dhcp-fqdn está fijado" + +-#: option.c:4623 ++#: option.c:4632 + msgid "syntax check OK" + msgstr "revisión de sintaxis OK" + +@@ -1162,25 +1166,25 @@ msgstr "revisi + msgid "failed to send packet: %s" + msgstr "no se pudo escuchar en socket: %s" + +-#: forward.c:572 ++#: forward.c:591 + msgid "discarding DNS reply: subnet option mismatch" + msgstr "" + +-#: forward.c:595 ++#: forward.c:614 + #, c-format + msgid "nameserver %s refused to do a recursive query" + msgstr "servidor DNS %s rechazó realizar una búsqueda recursiva" + +-#: forward.c:627 ++#: forward.c:646 + #, fuzzy, c-format + msgid "possible DNS-rebind attack detected: %s" + msgstr "posible ataque de revinculación DNS detectado" + +-#: forward.c:1156 forward.c:1722 ++#: forward.c:1209 forward.c:1785 + msgid "Ignoring query from non-local network" + msgstr "" + +-#: forward.c:2178 ++#: forward.c:2256 + #, fuzzy, c-format + msgid "Maximum number of concurrent DNS queries reached (max: %d)" + msgstr "Número máximo de búsquedas DNS simultáneas alcanzado. (%s por predeterminado)" +@@ -1214,342 +1218,352 @@ msgstr "el interfase % fall + msgid "failed to bind server socket for %s: %s" + msgstr "no se pudo acoplar al zócalo del servidor para %s: %s" + +-#: network.c:1444 ++#: network.c:1445 + #, c-format + msgid "ignoring nameserver %s - local interface" + msgstr "ignorando servidor DNS %s - interfase local" + +-#: network.c:1455 ++#: network.c:1456 + #, fuzzy, c-format + msgid "ignoring nameserver %s - cannot make/bind socket: %s" + msgstr "ignorando servidor DNS %s - no se puede crear/acoplar zócalo: %s" + +-#: network.c:1468 ++#: network.c:1469 + msgid "unqualified" + msgstr "no cualificado" + +-#: network.c:1468 ++#: network.c:1469 + msgid "names" + msgstr "nombres" + +-#: network.c:1470 ++#: network.c:1471 + msgid "default" + msgstr "predeterminado" + +-#: network.c:1472 ++#: network.c:1473 + msgid "domain" + msgstr "dominio" + +-#: network.c:1475 ++#: network.c:1476 + #, c-format + msgid "using local addresses only for %s %s" + msgstr "usando direcciones locales solo para %s %s" + +-#: network.c:1477 ++#: network.c:1478 + #, fuzzy, c-format + msgid "using standard nameservers for %s %s" + msgstr "usando nombres estándar %s#%d para %s %s" + +-#: network.c:1479 ++#: network.c:1480 + #, c-format + msgid "using nameserver %s#%d for %s %s" + msgstr "usando nombre de servidor %s#%d para %s %s" + +-#: network.c:1483 ++#: network.c:1484 + #, fuzzy, c-format + msgid "NOT using nameserver %s#%d - query loop detected" + msgstr "usando nombre de servidor %s#%d para %s %s" + +-#: network.c:1486 ++#: network.c:1487 + #, fuzzy, c-format + msgid "using nameserver %s#%d(via %s)" + msgstr "usando nombre de servidor %s#%d(vía %s)" + +-#: network.c:1488 ++#: network.c:1489 + #, c-format + msgid "using nameserver %s#%d" + msgstr "usando nombre de servidor %s#%d" + +-#: dnsmasq.c:149 ++#: dnsmasq.c:163 + msgid "dhcp-hostsdir, dhcp-optsdir and hostsdir are not supported on this platform" + msgstr "" + +-#: dnsmasq.c:156 ++#: dnsmasq.c:170 + msgid "no trust anchors provided for DNSSEC" + msgstr "" + +-#: dnsmasq.c:159 ++#: dnsmasq.c:173 + msgid "cannot reduce cache size from default when DNSSEC enabled" + msgstr "" + +-#: dnsmasq.c:161 ++#: dnsmasq.c:175 + #, fuzzy + msgid "DNSSEC not available: set HAVE_DNSSEC in src/config.h" + msgstr "DBus no disponible: fijar HAVE_DBUS en src/config.h" + +-#: dnsmasq.c:167 ++#: dnsmasq.c:181 + #, fuzzy + msgid "TFTP server not available: set HAVE_TFTP in src/config.h" + msgstr "servidor TFTP no disponible: fijar HAVE_TFTP en src/config.h" + +-#: dnsmasq.c:172 ++#: dnsmasq.c:186 + #, fuzzy + msgid "cannot use --conntrack AND --query-port" + msgstr "No puede usar --conntrack AND --query-port" + +-#: dnsmasq.c:175 ++#: dnsmasq.c:189 + #, fuzzy + msgid "conntrack support not available: set HAVE_CONNTRACK in src/config.h" + msgstr "servidor TFTP no disponible: fijar HAVE_TFTP en src/config.h" + +-#: dnsmasq.c:180 ++#: dnsmasq.c:194 + #, fuzzy + msgid "asychronous logging is not available under Solaris" + msgstr "registro asíncrono no está disponible bajo Solaris" + +-#: dnsmasq.c:185 ++#: dnsmasq.c:199 + #, fuzzy + msgid "asychronous logging is not available under Android" + msgstr "registro asíncrono no está disponible bajo Solaris" + +-#: dnsmasq.c:190 ++#: dnsmasq.c:204 + #, fuzzy + msgid "authoritative DNS not available: set HAVE_AUTH in src/config.h" + msgstr "DBus no disponible: fijar HAVE_DBUS en src/config.h" + +-#: dnsmasq.c:195 ++#: dnsmasq.c:209 + #, fuzzy + msgid "loop detection not available: set HAVE_LOOP in src/config.h" + msgstr "servidor TFTP no disponible: fijar HAVE_TFTP en src/config.h" + +-#: dnsmasq.c:203 ++#: dnsmasq.c:217 + msgid "zone serial must be configured in --auth-soa" + msgstr "zona serie debe ser configurada en --auth-soa" + +-#: dnsmasq.c:221 ++#: dnsmasq.c:235 + msgid "dhcp-range constructor not available on this platform" + msgstr "constructor rango dhcp no disponible en esta plataforma" + +-#: dnsmasq.c:264 ++#: dnsmasq.c:278 + msgid "cannot set --bind-interfaces and --bind-dynamic" + msgstr "no puede usar --bind-interfases y --bind-dynamic" + +-#: dnsmasq.c:267 ++#: dnsmasq.c:281 + #, c-format + msgid "failed to find list of interfaces: %s" + msgstr "no se pudo encontrar lista de interfases: %s" + +-#: dnsmasq.c:276 ++#: dnsmasq.c:290 + #, c-format + msgid "unknown interface %s" + msgstr "interfase desconocida %s" + +-#: dnsmasq.c:340 dnsmasq.c:1004 ++#: dnsmasq.c:354 dnsmasq.c:1037 + #, c-format + msgid "DBus error: %s" + msgstr "error DBus: %s" + +-#: dnsmasq.c:343 ++#: dnsmasq.c:357 + msgid "DBus not available: set HAVE_DBUS in src/config.h" + msgstr "DBus no disponible: fijar HAVE_DBUS en src/config.h" + +-#: dnsmasq.c:371 ++#: dnsmasq.c:385 + #, c-format + msgid "unknown user or group: %s" + msgstr "usuario o grupo desconocido: %s" + +-#: dnsmasq.c:426 ++#: dnsmasq.c:440 + #, c-format + msgid "cannot chdir to filesystem root: %s" + msgstr "no se puede cambiar directorio a raíz de sistema de archivos: %s" + +-#: dnsmasq.c:667 ++#: dnsmasq.c:692 + #, fuzzy, c-format + msgid "started, version %s DNS disabled" + msgstr "iniciado, versión %s DNS deshabilitado" + +-#: dnsmasq.c:669 ++#: dnsmasq.c:694 + #, c-format + msgid "started, version %s cachesize %d" + msgstr "iniciado, versión %s tamaño de caché %d" + +-#: dnsmasq.c:671 ++#: dnsmasq.c:696 + #, c-format + msgid "started, version %s cache disabled" + msgstr "iniciado, versión %s caché deshabilitado" + +-#: dnsmasq.c:673 ++#: dnsmasq.c:698 + #, c-format + msgid "compile time options: %s" + msgstr "opciones de compilación: %s" + +-#: dnsmasq.c:679 ++#: dnsmasq.c:704 + msgid "DBus support enabled: connected to system bus" + msgstr "soporte DBus habilitado: conectado a bus de sistema" + +-#: dnsmasq.c:681 ++#: dnsmasq.c:706 + msgid "DBus support enabled: bus connection pending" + msgstr "soporte DBus habilitado: conexión a bus pendiente" + +-#: dnsmasq.c:686 ++#: dnsmasq.c:711 + msgid "DNS service limited to local subnets" + msgstr "" + +-#: dnsmasq.c:702 ++#: dnsmasq.c:727 + msgid "DNSSEC validation enabled" + msgstr "" + +-#: dnsmasq.c:705 ++#: dnsmasq.c:730 + msgid "DNSSEC signature timestamps not checked until first cache reload" + msgstr "" + +-#: dnsmasq.c:708 ++#: dnsmasq.c:733 + msgid "DNSSEC signature timestamps not checked until system time valid" + msgstr "" + +-#: dnsmasq.c:713 ++#: dnsmasq.c:738 + #, fuzzy, c-format + msgid "warning: failed to change owner of %s: %s" + msgstr "advertencia: no se pudo cambiar propietario de %s: %s" + +-#: dnsmasq.c:717 ++#: dnsmasq.c:742 + msgid "setting --bind-interfaces option because of OS limitations" + msgstr "fijando opción --bind-interfases debido a limitaciones de sistema operativo" + +-#: dnsmasq.c:727 ++#: dnsmasq.c:752 + #, c-format + msgid "warning: interface %s does not currently exist" + msgstr "advertencia: interfase %s no existe actualmente" + +-#: dnsmasq.c:732 ++#: dnsmasq.c:757 + msgid "warning: ignoring resolv-file flag because no-resolv is set" + msgstr "advertencia: ignorando opción resolv-file porque no-resolv está fijado" + +-#: dnsmasq.c:735 ++#: dnsmasq.c:760 + #, fuzzy + msgid "warning: no upstream servers configured" + msgstr "advertencia: ningún servidor de subida configurado" + +-#: dnsmasq.c:739 ++#: dnsmasq.c:764 + #, c-format + msgid "asynchronous logging enabled, queue limit is %d messages" + msgstr "registro asíncrono habilitado, el límite de la cola es %d mensajes" + +-#: dnsmasq.c:760 ++#: dnsmasq.c:785 + msgid "IPv6 router advertisement enabled" + msgstr "Anuncio de router IPv6 habilitado" + +-#: dnsmasq.c:765 ++#: dnsmasq.c:790 + #, c-format + msgid "DHCP, sockets bound exclusively to interface %s" + msgstr "" + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "root is " + msgstr "root está " + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + #, fuzzy + msgid "enabled" + msgstr "habilitado" + +-#: dnsmasq.c:784 ++#: dnsmasq.c:810 + msgid "secure mode" + msgstr "modo seguro" + +-#: dnsmasq.c:810 ++#: dnsmasq.c:813 ++#, c-format ++msgid "warning: %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:817 ++#, fuzzy, c-format ++msgid "warning: TFTP directory %s inaccessible" ++msgstr "directorio TFTP % inaccesible: %s" ++ ++#: dnsmasq.c:843 + #, c-format + msgid "restricting maximum simultaneous TFTP transfers to %d" + msgstr "limitando número máximo de transferencias TFTP simultáneas a %d" + +-#: dnsmasq.c:1006 ++#: dnsmasq.c:1039 + msgid "connected to system DBus" + msgstr "conectado a DBus de sistema" + +-#: dnsmasq.c:1156 ++#: dnsmasq.c:1189 + #, c-format + msgid "cannot fork into background: %s" + msgstr "no se puede hacer fork en background: %s" + +-#: dnsmasq.c:1159 ++#: dnsmasq.c:1192 + #, fuzzy, c-format + msgid "failed to create helper: %s" + msgstr "no se pudo crear ayudante: %s" + +-#: dnsmasq.c:1162 ++#: dnsmasq.c:1195 + #, fuzzy, c-format + msgid "setting capabilities failed: %s" + msgstr "configuración de capacidades ha fallado: %s" + +-#: dnsmasq.c:1165 ++#: dnsmasq.c:1198 + #, fuzzy, c-format + msgid "failed to change user-id to %s: %s" + msgstr "no se pudo cambiar user-id a %s: %s" + +-#: dnsmasq.c:1168 ++#: dnsmasq.c:1201 + #, fuzzy, c-format + msgid "failed to change group-id to %s: %s" + msgstr "no se pudo cambiar group-id a %s: %s" + +-#: dnsmasq.c:1171 ++#: dnsmasq.c:1204 + #, fuzzy, c-format + msgid "failed to open pidfile %s: %s" + msgstr "no se pudo abrir archivo PID %s: %s" + +-#: dnsmasq.c:1174 ++#: dnsmasq.c:1207 + #, fuzzy, c-format + msgid "cannot open log %s: %s" + msgstr "no se puede abrir registro %s: %s" + +-#: dnsmasq.c:1177 ++#: dnsmasq.c:1210 + #, fuzzy, c-format + msgid "failed to load Lua script: %s" + msgstr "no se pudo cargar script Lua %s: %s" + +-#: dnsmasq.c:1180 ++#: dnsmasq.c:1213 + #, c-format + msgid "TFTP directory %s inaccessible: %s" + msgstr "directorio TFTP % inaccesible: %s" + +-#: dnsmasq.c:1183 ++#: dnsmasq.c:1216 + #, fuzzy, c-format + msgid "cannot create timestamp file %s: %s" + msgstr "no se puede abrir o crear archivo de concesión %s: %s" + +-#: dnsmasq.c:1204 ++#: dnsmasq.c:1237 + msgid "now checking DNSSEC signature timestamps" + msgstr "" + +-#: dnsmasq.c:1271 ++#: dnsmasq.c:1304 + #, fuzzy, c-format + msgid "script process killed by signal %d" + msgstr "proceso script eliminado por señal %d" + +-#: dnsmasq.c:1275 ++#: dnsmasq.c:1308 + #, fuzzy, c-format + msgid "script process exited with status %d" + msgstr "proceso script salió con con estado %d" + +-#: dnsmasq.c:1279 ++#: dnsmasq.c:1312 + #, fuzzy, c-format + msgid "failed to execute %s: %s" + msgstr "no se pudo ejecutar %s: %s" + +-#: dnsmasq.c:1334 ++#: dnsmasq.c:1367 + msgid "exiting on receipt of SIGTERM" + msgstr "saliendo al recibir SIGTERM" + +-#: dnsmasq.c:1362 ++#: dnsmasq.c:1395 + #, fuzzy, c-format + msgid "failed to access %s: %s" + msgstr "no se pudo acceder %s: %s" + +-#: dnsmasq.c:1392 ++#: dnsmasq.c:1425 + #, c-format + msgid "reading %s" + msgstr "leyendo %s" + +-#: dnsmasq.c:1403 ++#: dnsmasq.c:1436 + #, fuzzy, c-format + msgid "no servers found in %s, will retry" + msgstr "ningún servidor encontrado en %s, se reintentará" +@@ -1579,37 +1593,37 @@ msgstr "no se pudo acoplar z + msgid "cannot create ICMP raw socket: %s." + msgstr "no se puede crear zócalo puro ICMP: %s." + +-#: dhcp.c:239 ++#: dhcp.c:241 dhcp6.c:180 + #, fuzzy, c-format + msgid "unknown interface %s in bridge-interface" + msgstr "interfase desconocida %s en bridge-interface" + +-#: dhcp.c:278 ++#: dhcp.c:281 + #, c-format + msgid "DHCP packet received on %s which has no address" + msgstr "Paquete DHCP recibido en %s que no tiene dirección" + +-#: dhcp.c:412 ++#: dhcp.c:415 + #, c-format + msgid "ARP-cache injection failed: %s" + msgstr "" + +-#: dhcp.c:511 ++#: dhcp.c:514 + #, c-format + msgid "DHCP range %s -- %s is not consistent with netmask %s" + msgstr "rango DHCP %s -- %s no coincide con máscara de subred %s" + +-#: dhcp.c:812 ++#: dhcp.c:815 + #, fuzzy, c-format + msgid "bad line at %s line %d" + msgstr "línea errónea en %s línea %d" + +-#: dhcp.c:855 ++#: dhcp.c:858 + #, c-format + msgid "ignoring %s line %d, duplicate name or IP address" + msgstr "ignorando %s línea %d, nombre o dirección IP duplicada" + +-#: dhcp.c:999 rfc3315.c:2139 ++#: dhcp.c:1002 rfc3315.c:2135 + #, c-format + msgid "DHCP relay %s -> %s" + msgstr "DHCP relay %s -> %s" +@@ -1643,169 +1657,169 @@ msgstr "error al escribir %s: %s (reintentar en %us)" + msgid "Ignoring domain %s for DHCP host name %s" + msgstr "Ignorando dominio %s para nombre de host DHCP %s" + +-#: rfc2131.c:342 ++#: rfc2131.c:344 + #, c-format + msgid "no address range available for DHCP request %s %s" + msgstr "ningún rango de direcciónes disponible para pedido DHCP %s %s" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "with subnet selector" + msgstr "con selector de subred" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "via" + msgstr "vía" + +-#: rfc2131.c:355 ++#: rfc2131.c:357 + #, fuzzy, c-format + msgid "%u available DHCP subnet: %s/%s" + msgstr "%u Subred DHCP disponible: %s/%s" + +-#: rfc2131.c:358 rfc3315.c:300 ++#: rfc2131.c:360 rfc3315.c:300 + #, fuzzy, c-format + msgid "%u available DHCP range: %s -- %s" + msgstr "%u Rango DHCP disponible: %s -- %s" + +-#: rfc2131.c:469 ++#: rfc2131.c:471 + #, fuzzy, c-format + msgid "%u vendor class: %s" + msgstr "%u Clase de vendedor: %s" + +-#: rfc2131.c:471 ++#: rfc2131.c:473 + #, fuzzy, c-format + msgid "%u user class: %s" + msgstr "%u Clase de usuario: %s" + +-#: rfc2131.c:498 ++#: rfc2131.c:500 + msgid "disabled" + msgstr "deshabilitado" + +-#: rfc2131.c:539 rfc2131.c:967 rfc2131.c:1385 rfc3315.c:603 rfc3315.c:860 +-#: rfc3315.c:1139 ++#: rfc2131.c:541 rfc2131.c:974 rfc2131.c:1380 rfc3315.c:603 rfc3315.c:856 ++#: rfc3315.c:1135 + msgid "ignored" + msgstr "ignorado" + +-#: rfc2131.c:554 rfc2131.c:1205 rfc3315.c:910 ++#: rfc2131.c:556 rfc2131.c:1207 rfc3315.c:906 + msgid "address in use" + msgstr "dirección en uso" + +-#: rfc2131.c:568 rfc2131.c:1021 ++#: rfc2131.c:570 rfc2131.c:1028 + msgid "no address available" + msgstr "ninguna dirección disponible" + +-#: rfc2131.c:575 rfc2131.c:1168 ++#: rfc2131.c:577 rfc2131.c:1170 + msgid "wrong network" + msgstr "red equivocada" + +-#: rfc2131.c:590 ++#: rfc2131.c:592 + msgid "no address configured" + msgstr "ninguna dirección configurada" + +-#: rfc2131.c:596 rfc2131.c:1218 ++#: rfc2131.c:598 rfc2131.c:1220 + msgid "no leases left" + msgstr "no sobra ninguna concesión" + +-#: rfc2131.c:691 rfc3315.c:476 ++#: rfc2131.c:693 rfc3315.c:476 + #, fuzzy, c-format + msgid "%u client provides name: %s" + msgstr "%u cliente provee nombre: %s" + +-#: rfc2131.c:796 ++#: rfc2131.c:798 + msgid "PXE BIS not supported" + msgstr "no hay soporte para BIS PXE" + +-#: rfc2131.c:935 rfc3315.c:1233 ++#: rfc2131.c:942 rfc3315.c:1229 + #, fuzzy, c-format + msgid "disabling DHCP static address %s for %s" + msgstr "deshabilitando dirección DHCP estática %s para %s" + +-#: rfc2131.c:956 ++#: rfc2131.c:963 + msgid "unknown lease" + msgstr "concesión desconocida" + +-#: rfc2131.c:990 ++#: rfc2131.c:997 + #, c-format + msgid "not using configured address %s because it is leased to %s" + msgstr "no usando dirección configurada %s porque está concedida a %s" + +-#: rfc2131.c:1000 ++#: rfc2131.c:1007 + #, fuzzy, c-format + msgid "not using configured address %s because it is in use by the server or relay" + msgstr "no usando dirección configurada %s porque está en uso por el servidor o relay" + +-#: rfc2131.c:1003 ++#: rfc2131.c:1010 + #, fuzzy, c-format + msgid "not using configured address %s because it was previously declined" + msgstr "no usando dirección configurada %s porque fué previamente denegada" + +-#: rfc2131.c:1019 rfc2131.c:1211 ++#: rfc2131.c:1026 rfc2131.c:1213 + msgid "no unique-id" + msgstr "ningún unique-id (identificación única)" + +-#: rfc2131.c:1106 ++#: rfc2131.c:1108 + msgid "wrong server-ID" + msgstr "ID de servidor equivocada" + +-#: rfc2131.c:1125 ++#: rfc2131.c:1127 + msgid "wrong address" + msgstr "dirección equivocada" + +-#: rfc2131.c:1143 rfc3315.c:1006 ++#: rfc2131.c:1145 rfc3315.c:1002 + msgid "lease not found" + msgstr "concesión no encontrada" + +-#: rfc2131.c:1176 ++#: rfc2131.c:1178 + msgid "address not available" + msgstr "dirección no disponible" + +-#: rfc2131.c:1187 ++#: rfc2131.c:1189 + msgid "static lease available" + msgstr "concesión estática disponible" + +-#: rfc2131.c:1191 ++#: rfc2131.c:1193 + msgid "address reserved" + msgstr "dirección reservada" + +-#: rfc2131.c:1199 ++#: rfc2131.c:1201 + #, c-format + msgid "abandoning lease to %s of %s" + msgstr "abandonando concesión a %s de %s" + +-#: rfc2131.c:1712 ++#: rfc2131.c:1707 + #, c-format + msgid "%u bootfile name: %s" + msgstr "%u nombre de bootfile: %s" + +-#: rfc2131.c:1721 ++#: rfc2131.c:1716 + #, c-format + msgid "%u server name: %s" + msgstr "%u nombre de servidor: %s" + +-#: rfc2131.c:1729 ++#: rfc2131.c:1724 + #, fuzzy, c-format + msgid "%u next server: %s" + msgstr "%u siguiente servidor: %s" + +-#: rfc2131.c:1732 ++#: rfc2131.c:1727 + #, c-format + msgid "%u broadcast response" + msgstr "%u respuesta broadcast" + +-#: rfc2131.c:1795 ++#: rfc2131.c:1790 + #, fuzzy, c-format + msgid "cannot send DHCP/BOOTP option %d: no space left in packet" + msgstr "no se puede enviar opción DHCP/BOOTP %d: no queda espacio en el paquete" + +-#: rfc2131.c:2036 ++#: rfc2131.c:2031 + msgid "PXE menu too large" + msgstr "menú PXE demasiado largo" + +-#: rfc2131.c:2173 rfc3315.c:1506 ++#: rfc2131.c:2170 rfc3315.c:1502 + #, fuzzy, c-format + msgid "%u requested options: %s" + msgstr "%u opciones solicitadas: %s" + +-#: rfc2131.c:2453 ++#: rfc2131.c:2487 + #, c-format + msgid "cannot send RFC3925 option: too many options for enterprise number %d" + msgstr "no se puede enviar opción RFC3925: demasiadas opciones para número enterprise %d" +@@ -1820,15 +1834,25 @@ msgstr "no se puede crear z + msgid "netlink returns error: %s" + msgstr "netlink retorna error: %s" + +-#: dbus.c:171 ++#: dbus.c:186 + msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" + msgstr "intento de fijar dirección de servidor IPv6 vía DBus - no hay soporte IPv6" + +-#: dbus.c:500 ++#: dbus.c:439 ++#, c-format ++msgid "Enabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:444 ++#, c-format ++msgid "Disabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:691 + msgid "setting upstream servers from DBus" + msgstr "fijando servidores subida desde DBus" + +-#: dbus.c:547 ++#: dbus.c:738 + msgid "could not register a DBus message handler" + msgstr "no se pudo registrar un manejador de mensajes DBus" + +@@ -1948,51 +1972,51 @@ msgstr "%u cliente provee nombre: %s" + msgid "unknown prefix-class %d" + msgstr "clase de prefijo desconocida" + +-#: rfc3315.c:803 rfc3315.c:902 ++#: rfc3315.c:803 rfc3315.c:898 + #, fuzzy + msgid "address unavailable" + msgstr "dirección no disponible" + +-#: rfc3315.c:815 rfc3315.c:950 rfc3315.c:1283 ++#: rfc3315.c:815 rfc3315.c:946 rfc3315.c:1279 + msgid "success" + msgstr "" + +-#: rfc3315.c:843 rfc3315.c:845 rfc3315.c:958 rfc3315.c:960 ++#: rfc3315.c:830 rfc3315.c:839 rfc3315.c:954 rfc3315.c:956 + #, fuzzy + msgid "no addresses available" + msgstr "ninguna dirección disponible" + +-#: rfc3315.c:937 ++#: rfc3315.c:933 + msgid "not on link" + msgstr "no en el enlace" + +-#: rfc3315.c:1010 rfc3315.c:1195 rfc3315.c:1272 ++#: rfc3315.c:1006 rfc3315.c:1191 rfc3315.c:1268 + msgid "no binding found" + msgstr "uniones no encontradas" + +-#: rfc3315.c:1048 ++#: rfc3315.c:1044 + msgid "deprecated" + msgstr "descartado" + +-#: rfc3315.c:1053 ++#: rfc3315.c:1049 + #, fuzzy + msgid "address invalid" + msgstr "dirección en uso" + +-#: rfc3315.c:1100 ++#: rfc3315.c:1096 + msgid "confirm failed" + msgstr "confirmación falló" + +-#: rfc3315.c:1116 ++#: rfc3315.c:1112 + #, fuzzy + msgid "all addresses still on link" + msgstr "dirección errónea en %s línea %d" + +-#: rfc3315.c:1204 ++#: rfc3315.c:1200 + msgid "release received" + msgstr "concesión recibida" + +-#: rfc3315.c:2130 ++#: rfc3315.c:2126 + msgid "Cannot multicast to DHCPv6 server without correct interface" + msgstr "No puede hacer multicast DHCPv6 sin el interfase correcto" + +@@ -2080,12 +2104,12 @@ msgstr "" + msgid "DHCP relay from %s to %s" + msgstr "" + +-#: radv.c:98 ++#: radv.c:109 + #, fuzzy, c-format + msgid "cannot create ICMPv6 socket: %s" + msgstr "no se puede crear socket DHCP: %s" + +-#: auth.c:436 ++#: auth.c:448 + #, fuzzy, c-format + msgid "ignoring zone transfer request from %s" + msgstr "pedido no-soportado desde %s" +@@ -2100,7 +2124,7 @@ msgstr "no se pudo acoplar socket de servidor DHCP: %s" + msgid "failed to create IPset control socket: %s" + msgstr "no se pudo crear socket TFTP: %s" + +-#: dnssec.c:425 dnssec.c:469 ++#: dnssec.c:449 dnssec.c:493 + #, fuzzy, c-format + msgid "failed to update mtime on %s: %s" + msgstr "no se pudo abrir archivo PID %s: %s" +diff --git a/po/fi.po b/po/fi.po +index 760b08107510..0d80994b357c 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -25,17 +25,17 @@ msgstr "" + msgid "failed to load names from %s: %s" + msgstr "" + +-#: cache.c:967 dhcp.c:825 ++#: cache.c:967 dhcp.c:828 + #, c-format + msgid "bad address at %s line %d" + msgstr "" + +-#: cache.c:1018 dhcp.c:841 ++#: cache.c:1018 dhcp.c:844 + #, c-format + msgid "bad name at %s line %d" + msgstr "" + +-#: cache.c:1027 dhcp.c:916 ++#: cache.c:1027 dhcp.c:919 + #, c-format + msgid "read %s - %d addresses" + msgstr "" +@@ -93,1005 +93,1009 @@ msgstr "" + msgid "failed to allocate memory" + msgstr "" + +-#: util.c:243 option.c:598 ++#: util.c:250 option.c:601 + msgid "could not get memory" + msgstr "" + +-#: util.c:253 ++#: util.c:260 + #, c-format + msgid "cannot create pipe: %s" + msgstr "" + +-#: util.c:261 ++#: util.c:268 + #, c-format + msgid "failed to allocate %d bytes" + msgstr "" + +-#: util.c:430 ++#: util.c:437 + #, c-format + msgid "infinite" + msgstr "" + +-#: option.c:330 ++#: option.c:332 + msgid "Specify local address(es) to listen on." + msgstr "" + +-#: option.c:331 ++#: option.c:333 + msgid "Return ipaddr for all hosts in specified domains." + msgstr "" + +-#: option.c:332 ++#: option.c:334 + msgid "Fake reverse lookups for RFC1918 private address ranges." + msgstr "" + +-#: option.c:333 ++#: option.c:335 + msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." + msgstr "" + +-#: option.c:334 ++#: option.c:336 + #, c-format + msgid "Specify the size of the cache in entries (defaults to %s)." + msgstr "" + +-#: option.c:335 ++#: option.c:337 + #, c-format + msgid "Specify configuration file (defaults to %s)." + msgstr "" + +-#: option.c:336 ++#: option.c:338 + msgid "Do NOT fork into the background: run in debug mode." + msgstr "" + +-#: option.c:337 ++#: option.c:339 + msgid "Do NOT forward queries with no domain part." + msgstr "" + +-#: option.c:338 ++#: option.c:340 + msgid "Return self-pointing MX records for local hosts." + msgstr "" + +-#: option.c:339 ++#: option.c:341 + msgid "Expand simple names in /etc/hosts with domain-suffix." + msgstr "" + +-#: option.c:340 ++#: option.c:342 + msgid "Don't forward spurious DNS requests from Windows hosts." + msgstr "" + +-#: option.c:341 ++#: option.c:343 + msgid "Enable DHCP in the range given with lease duration." + msgstr "" + +-#: option.c:342 ++#: option.c:344 + #, c-format + msgid "Change to this group after startup (defaults to %s)." + msgstr "" + +-#: option.c:343 ++#: option.c:345 + msgid "Set address or hostname for a specified machine." + msgstr "" + +-#: option.c:344 ++#: option.c:346 + msgid "Read DHCP host specs from file." + msgstr "" + +-#: option.c:345 ++#: option.c:347 + msgid "Read DHCP option specs from file." + msgstr "" + +-#: option.c:346 ++#: option.c:348 + msgid "Read DHCP host specs from a directory." + msgstr "" + +-#: option.c:347 ++#: option.c:349 + msgid "Read DHCP options from a directory." + msgstr "" + +-#: option.c:348 ++#: option.c:350 + msgid "Evaluate conditional tag expression." + msgstr "" + +-#: option.c:349 ++#: option.c:351 + #, c-format + msgid "Do NOT load %s file." + msgstr "" + +-#: option.c:350 ++#: option.c:352 + #, c-format + msgid "Specify a hosts file to be read in addition to %s." + msgstr "" + +-#: option.c:351 ++#: option.c:353 + msgid "Read hosts files from a directory." + msgstr "" + +-#: option.c:352 ++#: option.c:354 + msgid "Specify interface(s) to listen on." + msgstr "" + +-#: option.c:353 ++#: option.c:355 + msgid "Specify interface(s) NOT to listen on." + msgstr "" + +-#: option.c:354 ++#: option.c:356 + msgid "Map DHCP user class to tag." + msgstr "" + +-#: option.c:355 ++#: option.c:357 + msgid "Map RFC3046 circuit-id to tag." + msgstr "" + +-#: option.c:356 ++#: option.c:358 + msgid "Map RFC3046 remote-id to tag." + msgstr "" + +-#: option.c:357 ++#: option.c:359 + msgid "Map RFC3993 subscriber-id to tag." + msgstr "" + +-#: option.c:358 ++#: option.c:360 + msgid "Don't do DHCP for hosts with tag set." + msgstr "" + +-#: option.c:359 ++#: option.c:361 + msgid "Force broadcast replies for hosts with tag set." + msgstr "" + +-#: option.c:360 ++#: option.c:362 + msgid "Do NOT fork into the background, do NOT run in debug mode." + msgstr "" + +-#: option.c:361 ++#: option.c:363 + msgid "Assume we are the only DHCP server on the local network." + msgstr "" + +-#: option.c:362 ++#: option.c:364 + #, c-format + msgid "Specify where to store DHCP leases (defaults to %s)." + msgstr "" + +-#: option.c:363 ++#: option.c:365 + msgid "Return MX records for local hosts." + msgstr "" + +-#: option.c:364 ++#: option.c:366 + msgid "Specify an MX record." + msgstr "" + +-#: option.c:365 ++#: option.c:367 + msgid "Specify BOOTP options to DHCP server." + msgstr "" + +-#: option.c:366 ++#: option.c:368 + #, c-format + msgid "Do NOT poll %s file, reload only on SIGHUP." + msgstr "" + +-#: option.c:367 ++#: option.c:369 + msgid "Do NOT cache failed search results." + msgstr "" + +-#: option.c:368 ++#: option.c:370 + #, c-format + msgid "Use nameservers strictly in the order given in %s." + msgstr "" + +-#: option.c:369 ++#: option.c:371 + msgid "Specify options to be sent to DHCP clients." + msgstr "" + +-#: option.c:370 ++#: option.c:372 + msgid "DHCP option sent even if the client does not request it." + msgstr "" + +-#: option.c:371 ++#: option.c:373 + msgid "Specify port to listen for DNS requests on (defaults to 53)." + msgstr "" + +-#: option.c:372 ++#: option.c:374 + #, c-format + msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." + msgstr "" + +-#: option.c:373 ++#: option.c:375 + msgid "Log DNS queries." + msgstr "" + +-#: option.c:374 ++#: option.c:376 + msgid "Force the originating port for upstream DNS queries." + msgstr "" + +-#: option.c:375 ++#: option.c:377 + msgid "Do NOT read resolv.conf." + msgstr "" + +-#: option.c:376 ++#: option.c:378 + #, c-format + msgid "Specify path to resolv.conf (defaults to %s)." + msgstr "" + +-#: option.c:377 ++#: option.c:379 + msgid "Specify path to file with server= options" + msgstr "" + +-#: option.c:378 ++#: option.c:380 + msgid "Specify address(es) of upstream servers with optional domains." + msgstr "" + +-#: option.c:379 ++#: option.c:381 + msgid "Specify address of upstream servers for reverse address queries" + msgstr "" + +-#: option.c:380 ++#: option.c:382 + msgid "Never forward queries to specified domains." + msgstr "" + +-#: option.c:381 ++#: option.c:383 + msgid "Specify the domain to be assigned in DHCP leases." + msgstr "" + +-#: option.c:382 ++#: option.c:384 + msgid "Specify default target in an MX record." + msgstr "" + +-#: option.c:383 ++#: option.c:385 + msgid "Specify time-to-live in seconds for replies from /etc/hosts." + msgstr "" + +-#: option.c:384 ++#: option.c:386 + msgid "Specify time-to-live in seconds for negative caching." + msgstr "" + +-#: option.c:385 ++#: option.c:387 + msgid "Specify time-to-live in seconds for maximum TTL to send to clients." + msgstr "" + +-#: option.c:386 ++#: option.c:388 + msgid "Specify time-to-live ceiling for cache." + msgstr "" + +-#: option.c:387 ++#: option.c:389 + msgid "Specify time-to-live floor for cache." + msgstr "" + +-#: option.c:388 ++#: option.c:390 + #, c-format + msgid "Change to this user after startup. (defaults to %s)." + msgstr "" + +-#: option.c:389 ++#: option.c:391 + msgid "Map DHCP vendor class to tag." + msgstr "" + +-#: option.c:390 ++#: option.c:392 + msgid "Display dnsmasq version and copyright information." + msgstr "" + +-#: option.c:391 ++#: option.c:393 + msgid "Translate IPv4 addresses from upstream servers." + msgstr "" + +-#: option.c:392 ++#: option.c:394 + msgid "Specify a SRV record." + msgstr "" + +-#: option.c:393 ++#: option.c:395 + msgid "Display this message. Use --help dhcp for known DHCP options." + msgstr "" + +-#: option.c:394 ++#: option.c:396 + #, c-format + msgid "Specify path of PID file (defaults to %s)." + msgstr "" + +-#: option.c:395 ++#: option.c:397 + #, c-format + msgid "Specify maximum number of DHCP leases (defaults to %s)." + msgstr "" + +-#: option.c:396 ++#: option.c:398 + msgid "Answer DNS queries based on the interface a query was sent to." + msgstr "" + +-#: option.c:397 ++#: option.c:399 + msgid "Specify TXT DNS record." + msgstr "" + +-#: option.c:398 ++#: option.c:400 + msgid "Specify PTR DNS record." + msgstr "" + +-#: option.c:399 ++#: option.c:401 + msgid "Give DNS name to IPv4 address of interface." + msgstr "" + +-#: option.c:400 ++#: option.c:402 + msgid "Bind only to interfaces in use." + msgstr "" + +-#: option.c:401 ++#: option.c:403 + #, c-format + msgid "Read DHCP static host information from %s." + msgstr "" + +-#: option.c:402 ++#: option.c:404 + msgid "Enable the DBus interface for setting upstream servers, etc." + msgstr "" + +-#: option.c:403 ++#: option.c:405 + msgid "Do not provide DHCP on this interface, only provide DNS." + msgstr "" + +-#: option.c:404 ++#: option.c:406 + msgid "Enable dynamic address allocation for bootp." + msgstr "" + +-#: option.c:405 ++#: option.c:407 + msgid "Map MAC address (with wildcards) to option set." + msgstr "" + +-#: option.c:406 ++#: option.c:408 + msgid "Treat DHCP requests on aliases as arriving from interface." + msgstr "" + +-#: option.c:407 ++#: option.c:409 + msgid "Disable ICMP echo address checking in the DHCP server." + msgstr "" + +-#: option.c:408 ++#: option.c:410 + msgid "Shell script to run on DHCP lease creation and destruction." + msgstr "" + +-#: option.c:409 ++#: option.c:411 + msgid "Lua script to run on DHCP lease creation and destruction." + msgstr "" + +-#: option.c:410 ++#: option.c:412 + msgid "Run lease-change scripts as this user." + msgstr "" + +-#: option.c:411 ++#: option.c:413 + msgid "Read configuration from all the files in this directory." + msgstr "" + +-#: option.c:412 ++#: option.c:414 + msgid "Log to this syslog facility or file. (defaults to DAEMON)" + msgstr "" + +-#: option.c:413 ++#: option.c:415 + msgid "Do not use leasefile." + msgstr "" + +-#: option.c:414 ++#: option.c:416 + #, c-format + msgid "Maximum number of concurrent DNS queries. (defaults to %s)" + msgstr "" + +-#: option.c:415 ++#: option.c:417 + #, c-format + msgid "Clear DNS cache when reloading %s." + msgstr "" + +-#: option.c:416 ++#: option.c:418 + msgid "Ignore hostnames provided by DHCP clients." + msgstr "" + +-#: option.c:417 ++#: option.c:419 + msgid "Do NOT reuse filename and server fields for extra DHCP options." + msgstr "" + +-#: option.c:418 ++#: option.c:420 + msgid "Enable integrated read-only TFTP server." + msgstr "" + +-#: option.c:419 ++#: option.c:421 + msgid "Export files by TFTP only from the specified subtree." + msgstr "" + +-#: option.c:420 ++#: option.c:422 + msgid "Add client IP address to tftp-root." + msgstr "" + +-#: option.c:421 ++#: option.c:423 + msgid "Allow access only to files owned by the user running dnsmasq." + msgstr "" + +-#: option.c:422 ++#: option.c:424 ++msgid "Do not terminate the service if TFTP directories are inaccessible." ++msgstr "" ++ ++#: option.c:425 + #, c-format + msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." + msgstr "" + +-#: option.c:423 ++#: option.c:426 + msgid "Disable the TFTP blocksize extension." + msgstr "" + +-#: option.c:424 ++#: option.c:427 + msgid "Convert TFTP filenames to lowercase" + msgstr "" + +-#: option.c:425 ++#: option.c:428 + msgid "Ephemeral port range for use by TFTP transfers." + msgstr "" + +-#: option.c:426 ++#: option.c:429 + msgid "Extra logging for DHCP." + msgstr "" + +-#: option.c:427 ++#: option.c:430 + msgid "Enable async. logging; optionally set queue length." + msgstr "" + +-#: option.c:428 ++#: option.c:431 + msgid "Stop DNS rebinding. Filter private IP ranges when resolving." + msgstr "" + +-#: option.c:429 ++#: option.c:432 + msgid "Allow rebinding of 127.0.0.0/8, for RBL servers." + msgstr "" + +-#: option.c:430 ++#: option.c:433 + msgid "Inhibit DNS-rebind protection on this domain." + msgstr "" + +-#: option.c:431 ++#: option.c:434 + msgid "Always perform DNS queries to all servers." + msgstr "" + +-#: option.c:432 ++#: option.c:435 + msgid "Set tag if client includes matching option in request." + msgstr "" + +-#: option.c:433 ++#: option.c:436 + msgid "Use alternative ports for DHCP." + msgstr "" + +-#: option.c:434 ++#: option.c:437 + msgid "Specify NAPTR DNS record." + msgstr "" + +-#: option.c:435 ++#: option.c:438 + msgid "Specify lowest port available for DNS query transmission." + msgstr "" + +-#: option.c:436 ++#: option.c:439 + msgid "Use only fully qualified domain names for DHCP clients." + msgstr "" + +-#: option.c:437 ++#: option.c:440 + msgid "Generate hostnames based on MAC address for nameless clients." + msgstr "" + +-#: option.c:438 ++#: option.c:441 + msgid "Use these DHCP relays as full proxies." + msgstr "" + +-#: option.c:439 ++#: option.c:442 + msgid "Relay DHCP requests to a remote server" + msgstr "" + +-#: option.c:440 ++#: option.c:443 + msgid "Specify alias name for LOCAL DNS name." + msgstr "" + +-#: option.c:441 ++#: option.c:444 + msgid "Prompt to send to PXE clients." + msgstr "" + +-#: option.c:442 ++#: option.c:445 + msgid "Boot service for PXE menu." + msgstr "" + +-#: option.c:443 ++#: option.c:446 + msgid "Check configuration syntax." + msgstr "" + +-#: option.c:444 ++#: option.c:447 + msgid "Add requestor's MAC address to forwarded DNS queries." + msgstr "" + +-#: option.c:445 ++#: option.c:448 + msgid "Add requestor's IP subnet to forwarded DNS queries." + msgstr "" + +-#: option.c:446 ++#: option.c:449 + msgid "Proxy DNSSEC validation results from upstream nameservers." + msgstr "" + +-#: option.c:447 ++#: option.c:450 + msgid "Attempt to allocate sequential IP addresses to DHCP clients." + msgstr "" + +-#: option.c:448 ++#: option.c:451 + msgid "Copy connection-track mark from queries to upstream connections." + msgstr "" + +-#: option.c:449 ++#: option.c:452 + msgid "Allow DHCP clients to do their own DDNS updates." + msgstr "" + +-#: option.c:450 ++#: option.c:453 + msgid "Send router-advertisements for interfaces doing DHCPv6" + msgstr "" + +-#: option.c:451 ++#: option.c:454 + msgid "Specify DUID_EN-type DHCPv6 server DUID" + msgstr "" + +-#: option.c:452 ++#: option.c:455 + msgid "Specify host (A/AAAA and PTR) records" + msgstr "" + +-#: option.c:453 ++#: option.c:456 + msgid "Specify arbitrary DNS resource record" + msgstr "" + +-#: option.c:454 ++#: option.c:457 + msgid "Bind to interfaces in use - check for new interfaces" + msgstr "" + +-#: option.c:455 ++#: option.c:458 + msgid "Export local names to global DNS" + msgstr "" + +-#: option.c:456 ++#: option.c:459 + msgid "Domain to export to global DNS" + msgstr "" + +-#: option.c:457 ++#: option.c:460 + msgid "Set TTL for authoritative replies" + msgstr "" + +-#: option.c:458 ++#: option.c:461 + msgid "Set authoritive zone information" + msgstr "" + +-#: option.c:459 ++#: option.c:462 + msgid "Secondary authoritative nameservers for forward domains" + msgstr "" + +-#: option.c:460 ++#: option.c:463 + msgid "Peers which are allowed to do zone transfer" + msgstr "" + +-#: option.c:461 ++#: option.c:464 + msgid "Specify ipsets to which matching domains should be added" + msgstr "" + +-#: option.c:462 ++#: option.c:465 + msgid "Specify a domain and address range for synthesised names" + msgstr "" + +-#: option.c:463 ++#: option.c:466 + msgid "Activate DNSSEC validation" + msgstr "" + +-#: option.c:464 ++#: option.c:467 + msgid "Specify trust anchor key digest." + msgstr "" + +-#: option.c:465 ++#: option.c:468 + msgid "Disable upstream checking for DNSSEC debugging." + msgstr "" + +-#: option.c:466 ++#: option.c:469 + msgid "Ensure answers without DNSSEC are in unsigned zones." + msgstr "" + +-#: option.c:467 ++#: option.c:470 + msgid "Don't check DNSSEC signature timestamps until first cache-reload" + msgstr "" + +-#: option.c:468 ++#: option.c:471 + msgid "Timestamp file to verify system clock for DNSSEC" + msgstr "" + +-#: option.c:470 ++#: option.c:473 + msgid "Specify DHCPv6 prefix class" + msgstr "" + +-#: option.c:472 ++#: option.c:475 + msgid "Set priority, resend-interval and router-lifetime" + msgstr "" + +-#: option.c:473 ++#: option.c:476 + msgid "Do not log routine DHCP." + msgstr "" + +-#: option.c:474 ++#: option.c:477 + msgid "Do not log routine DHCPv6." + msgstr "" + +-#: option.c:475 ++#: option.c:478 + msgid "Do not log RA." + msgstr "" + +-#: option.c:476 ++#: option.c:479 + msgid "Accept queries only from directly-connected networks" + msgstr "" + +-#: option.c:477 ++#: option.c:480 + msgid "Detect and remove DNS forwarding loops" + msgstr "" + +-#: option.c:478 ++#: option.c:481 + msgid "Ignore DNS responses containing ipaddr." + msgstr "" + +-#: option.c:680 ++#: option.c:683 + #, c-format + msgid "" + "Usage: dnsmasq [options]\n" + "\n" + msgstr "" + +-#: option.c:682 ++#: option.c:685 + #, c-format + msgid "Use short options only on the command line.\n" + msgstr "" + +-#: option.c:684 ++#: option.c:687 + #, c-format + msgid "Valid options are:\n" + msgstr "" + +-#: option.c:741 option.c:745 ++#: option.c:744 option.c:748 + msgid "bad port" + msgstr "" + +-#: option.c:772 option.c:804 ++#: option.c:775 option.c:807 + msgid "interface binding not supported" + msgstr "" + +-#: option.c:781 option.c:3570 ++#: option.c:784 option.c:3575 + msgid "bad interface name" + msgstr "" + +-#: option.c:811 ++#: option.c:814 + msgid "bad address" + msgstr "" + +-#: option.c:993 ++#: option.c:996 + msgid "unsupported encapsulation for IPv6 option" + msgstr "" + +-#: option.c:1007 ++#: option.c:1010 + msgid "bad dhcp-option" + msgstr "" + +-#: option.c:1075 ++#: option.c:1078 + msgid "bad IP address" + msgstr "" + +-#: option.c:1078 option.c:1216 option.c:2888 ++#: option.c:1081 option.c:1219 option.c:2893 + msgid "bad IPv6 address" + msgstr "" + +-#: option.c:1243 option.c:1337 ++#: option.c:1246 option.c:1340 + msgid "bad domain in dhcp-option" + msgstr "" + +-#: option.c:1375 ++#: option.c:1378 + msgid "dhcp-option too long" + msgstr "" + +-#: option.c:1382 ++#: option.c:1385 + msgid "illegal dhcp-match" + msgstr "" + +-#: option.c:1444 ++#: option.c:1447 + msgid "illegal repeated flag" + msgstr "" + +-#: option.c:1452 ++#: option.c:1455 + msgid "illegal repeated keyword" + msgstr "" + +-#: option.c:1517 option.c:4186 ++#: option.c:1520 option.c:4191 + #, c-format + msgid "cannot access directory %s: %s" + msgstr "" + +-#: option.c:1563 tftp.c:493 ++#: option.c:1566 tftp.c:493 + #, c-format + msgid "cannot access %s: %s" + msgstr "" + +-#: option.c:1615 ++#: option.c:1618 + msgid "setting log facility is not possible under Android" + msgstr "" + +-#: option.c:1624 ++#: option.c:1627 + msgid "bad log facility" + msgstr "" + +-#: option.c:1677 ++#: option.c:1680 + msgid "bad MX preference" + msgstr "" + +-#: option.c:1682 ++#: option.c:1685 + msgid "bad MX name" + msgstr "" + +-#: option.c:1696 ++#: option.c:1699 + msgid "bad MX target" + msgstr "" + +-#: option.c:1708 ++#: option.c:1711 + msgid "cannot run scripts under uClinux" + msgstr "" + +-#: option.c:1710 ++#: option.c:1713 + msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts" + msgstr "" + +-#: option.c:1714 ++#: option.c:1717 + msgid "recompile with HAVE_LUASCRIPT defined to enable Lua scripts" + msgstr "" + +-#: option.c:1970 option.c:2015 option.c:2071 ++#: option.c:1973 option.c:2018 option.c:2074 + msgid "bad prefix" + msgstr "" + +-#: option.c:2352 ++#: option.c:2355 + msgid "recompile with HAVE_IPSET defined to enable ipset directives" + msgstr "" + +-#: option.c:2545 ++#: option.c:2548 + msgid "bad port range" + msgstr "" + +-#: option.c:2561 ++#: option.c:2564 + msgid "bad bridge-interface" + msgstr "" + +-#: option.c:2621 ++#: option.c:2624 + msgid "only one tag allowed" + msgstr "" + +-#: option.c:2641 option.c:2653 option.c:2759 option.c:2800 ++#: option.c:2644 option.c:2656 option.c:2764 option.c:2805 + msgid "bad dhcp-range" + msgstr "" + +-#: option.c:2668 ++#: option.c:2671 + msgid "inconsistent DHCP range" + msgstr "" + +-#: option.c:2727 ++#: option.c:2732 + msgid "prefix length must be exactly 64 for RA subnets" + msgstr "" + +-#: option.c:2729 ++#: option.c:2734 + msgid "prefix length must be exactly 64 for subnet constructors" + msgstr "" + +-#: option.c:2733 ++#: option.c:2738 + msgid "prefix length must be at least 64" + msgstr "" + +-#: option.c:2736 ++#: option.c:2741 + msgid "inconsistent DHCPv6 range" + msgstr "" + +-#: option.c:2747 ++#: option.c:2752 + msgid "prefix must be zero with \"constructor:\" argument" + msgstr "" + +-#: option.c:2858 option.c:2906 ++#: option.c:2863 option.c:2911 + msgid "bad hex constant" + msgstr "" + +-#: option.c:2880 ++#: option.c:2885 + msgid "cannot match tags in --dhcp-host" + msgstr "" + +-#: option.c:2928 ++#: option.c:2933 + #, c-format + msgid "duplicate dhcp-host IP address %s" + msgstr "" + +-#: option.c:2986 ++#: option.c:2991 + msgid "bad DHCP host name" + msgstr "" + +-#: option.c:3068 ++#: option.c:3073 + msgid "bad tag-if" + msgstr "" + +-#: option.c:3392 option.c:3786 ++#: option.c:3397 option.c:3791 + msgid "invalid port number" + msgstr "" + +-#: option.c:3454 ++#: option.c:3459 + msgid "bad dhcp-proxy address" + msgstr "" + +-#: option.c:3480 ++#: option.c:3485 + msgid "Bad dhcp-relay" + msgstr "" + +-#: option.c:3506 ++#: option.c:3511 + msgid "bad RA-params" + msgstr "" + +-#: option.c:3515 ++#: option.c:3520 + msgid "bad DUID" + msgstr "" + +-#: option.c:3557 ++#: option.c:3562 + msgid "invalid alias range" + msgstr "" + +-#: option.c:3611 ++#: option.c:3616 + msgid "bad CNAME" + msgstr "" + +-#: option.c:3616 ++#: option.c:3621 + msgid "duplicate CNAME" + msgstr "" + +-#: option.c:3636 ++#: option.c:3641 + msgid "bad PTR record" + msgstr "" + +-#: option.c:3667 ++#: option.c:3672 + msgid "bad NAPTR record" + msgstr "" + +-#: option.c:3701 ++#: option.c:3706 + msgid "bad RR record" + msgstr "" + +-#: option.c:3731 ++#: option.c:3736 + msgid "bad TXT record" + msgstr "" + +-#: option.c:3772 ++#: option.c:3777 + msgid "bad SRV record" + msgstr "" + +-#: option.c:3779 ++#: option.c:3784 + msgid "bad SRV target" + msgstr "" + +-#: option.c:3793 ++#: option.c:3798 + msgid "invalid priority" + msgstr "" + +-#: option.c:3800 ++#: option.c:3805 + msgid "invalid weight" + msgstr "" + +-#: option.c:3824 ++#: option.c:3829 + msgid "Bad host-record" + msgstr "" + +-#: option.c:3841 ++#: option.c:3846 + msgid "Bad name in host-record" + msgstr "" + +-#: option.c:3906 ++#: option.c:3911 + msgid "bad trust anchor" + msgstr "" + +-#: option.c:3920 ++#: option.c:3925 + msgid "bad HEX in trust anchor" + msgstr "" + +-#: option.c:3930 ++#: option.c:3935 + msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DNSSEC/DBus support)" + msgstr "" + +-#: option.c:3989 ++#: option.c:3994 + msgid "missing \"" + msgstr "" + +-#: option.c:4046 ++#: option.c:4051 + msgid "bad option" + msgstr "" + +-#: option.c:4048 ++#: option.c:4053 + msgid "extraneous parameter" + msgstr "" + +-#: option.c:4050 ++#: option.c:4055 + msgid "missing parameter" + msgstr "" + +-#: option.c:4052 ++#: option.c:4057 + msgid "illegal option" + msgstr "" + +-#: option.c:4059 ++#: option.c:4064 + msgid "error" + msgstr "" + +-#: option.c:4061 ++#: option.c:4066 + #, c-format + msgid " at line %d of %s" + msgstr "" + +-#: option.c:4076 option.c:4323 option.c:4359 ++#: option.c:4081 option.c:4328 option.c:4364 + #, c-format + msgid "read %s" + msgstr "" + +-#: option.c:4139 option.c:4262 tftp.c:667 ++#: option.c:4144 option.c:4267 tftp.c:667 + #, c-format + msgid "cannot read %s: %s" + msgstr "" + +-#: option.c:4425 ++#: option.c:4430 + msgid "junk found in command line" + msgstr "" + +-#: option.c:4460 ++#: option.c:4465 + #, c-format + msgid "Dnsmasq version %s %s\n" + msgstr "" + +-#: option.c:4461 ++#: option.c:4466 + #, c-format + msgid "" + "Compile time options: %s\n" + "\n" + msgstr "" + +-#: option.c:4462 ++#: option.c:4467 + #, c-format + msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" + msgstr "" + +-#: option.c:4463 ++#: option.c:4468 + #, c-format + msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" + msgstr "" + +-#: option.c:4464 ++#: option.c:4469 + #, c-format + msgid "under the terms of the GNU General Public License, version 2 or 3.\n" + msgstr "" + +-#: option.c:4475 ++#: option.c:4480 + msgid "try --help" + msgstr "" + +-#: option.c:4477 ++#: option.c:4482 + msgid "try -w" + msgstr "" + +-#: option.c:4479 ++#: option.c:4484 + #, c-format + msgid "bad command line options: %s" + msgstr "" + +-#: option.c:4535 ++#: option.c:4544 + #, c-format + msgid "cannot get host-name: %s" + msgstr "" + +-#: option.c:4563 ++#: option.c:4572 + msgid "only one resolv.conf file allowed in no-poll mode." + msgstr "" + +-#: option.c:4573 ++#: option.c:4582 + msgid "must have exactly one resolv.conf to read domain from." + msgstr "" + +-#: option.c:4576 network.c:1506 dhcp.c:774 ++#: option.c:4585 network.c:1507 dhcp.c:777 + #, c-format + msgid "failed to read %s: %s" + msgstr "" + +-#: option.c:4593 ++#: option.c:4602 + #, c-format + msgid "no search directive found in %s" + msgstr "" + +-#: option.c:4614 ++#: option.c:4623 + msgid "there must be a default domain when --dhcp-fqdn is set" + msgstr "" + +-#: option.c:4623 ++#: option.c:4632 + msgid "syntax check OK" + msgstr "" + +@@ -1100,25 +1104,25 @@ msgstr "" + msgid "failed to send packet: %s" + msgstr "" + +-#: forward.c:572 ++#: forward.c:591 + msgid "discarding DNS reply: subnet option mismatch" + msgstr "" + +-#: forward.c:595 ++#: forward.c:614 + #, c-format + msgid "nameserver %s refused to do a recursive query" + msgstr "" + +-#: forward.c:627 ++#: forward.c:646 + #, c-format + msgid "possible DNS-rebind attack detected: %s" + msgstr "" + +-#: forward.c:1156 forward.c:1722 ++#: forward.c:1209 forward.c:1785 + msgid "Ignoring query from non-local network" + msgstr "" + +-#: forward.c:2178 ++#: forward.c:2256 + #, c-format + msgid "Maximum number of concurrent DNS queries reached (max: %d)" + msgstr "" +@@ -1152,332 +1156,342 @@ msgstr "" + msgid "failed to bind server socket for %s: %s" + msgstr "" + +-#: network.c:1444 ++#: network.c:1445 + #, c-format + msgid "ignoring nameserver %s - local interface" + msgstr "" + +-#: network.c:1455 ++#: network.c:1456 + #, c-format + msgid "ignoring nameserver %s - cannot make/bind socket: %s" + msgstr "" + +-#: network.c:1468 ++#: network.c:1469 + msgid "unqualified" + msgstr "" + +-#: network.c:1468 ++#: network.c:1469 + msgid "names" + msgstr "" + +-#: network.c:1470 ++#: network.c:1471 + msgid "default" + msgstr "" + +-#: network.c:1472 ++#: network.c:1473 + msgid "domain" + msgstr "" + +-#: network.c:1475 ++#: network.c:1476 + #, c-format + msgid "using local addresses only for %s %s" + msgstr "" + +-#: network.c:1477 ++#: network.c:1478 + #, c-format + msgid "using standard nameservers for %s %s" + msgstr "" + +-#: network.c:1479 ++#: network.c:1480 + #, c-format + msgid "using nameserver %s#%d for %s %s" + msgstr "" + +-#: network.c:1483 ++#: network.c:1484 + #, c-format + msgid "NOT using nameserver %s#%d - query loop detected" + msgstr "" + +-#: network.c:1486 ++#: network.c:1487 + #, c-format + msgid "using nameserver %s#%d(via %s)" + msgstr "" + +-#: network.c:1488 ++#: network.c:1489 + #, c-format + msgid "using nameserver %s#%d" + msgstr "" + +-#: dnsmasq.c:149 ++#: dnsmasq.c:163 + msgid "dhcp-hostsdir, dhcp-optsdir and hostsdir are not supported on this platform" + msgstr "" + +-#: dnsmasq.c:156 ++#: dnsmasq.c:170 + msgid "no trust anchors provided for DNSSEC" + msgstr "" + +-#: dnsmasq.c:159 ++#: dnsmasq.c:173 + msgid "cannot reduce cache size from default when DNSSEC enabled" + msgstr "" + +-#: dnsmasq.c:161 ++#: dnsmasq.c:175 + msgid "DNSSEC not available: set HAVE_DNSSEC in src/config.h" + msgstr "" + +-#: dnsmasq.c:167 ++#: dnsmasq.c:181 + msgid "TFTP server not available: set HAVE_TFTP in src/config.h" + msgstr "" + +-#: dnsmasq.c:172 ++#: dnsmasq.c:186 + msgid "cannot use --conntrack AND --query-port" + msgstr "" + +-#: dnsmasq.c:175 ++#: dnsmasq.c:189 + msgid "conntrack support not available: set HAVE_CONNTRACK in src/config.h" + msgstr "" + +-#: dnsmasq.c:180 ++#: dnsmasq.c:194 + msgid "asychronous logging is not available under Solaris" + msgstr "" + +-#: dnsmasq.c:185 ++#: dnsmasq.c:199 + msgid "asychronous logging is not available under Android" + msgstr "" + +-#: dnsmasq.c:190 ++#: dnsmasq.c:204 + msgid "authoritative DNS not available: set HAVE_AUTH in src/config.h" + msgstr "" + +-#: dnsmasq.c:195 ++#: dnsmasq.c:209 + msgid "loop detection not available: set HAVE_LOOP in src/config.h" + msgstr "" + +-#: dnsmasq.c:203 ++#: dnsmasq.c:217 + msgid "zone serial must be configured in --auth-soa" + msgstr "" + +-#: dnsmasq.c:221 ++#: dnsmasq.c:235 + msgid "dhcp-range constructor not available on this platform" + msgstr "" + +-#: dnsmasq.c:264 ++#: dnsmasq.c:278 + msgid "cannot set --bind-interfaces and --bind-dynamic" + msgstr "" + +-#: dnsmasq.c:267 ++#: dnsmasq.c:281 + #, c-format + msgid "failed to find list of interfaces: %s" + msgstr "" + +-#: dnsmasq.c:276 ++#: dnsmasq.c:290 + #, c-format + msgid "unknown interface %s" + msgstr "" + +-#: dnsmasq.c:340 dnsmasq.c:1004 ++#: dnsmasq.c:354 dnsmasq.c:1037 + #, c-format + msgid "DBus error: %s" + msgstr "" + +-#: dnsmasq.c:343 ++#: dnsmasq.c:357 + msgid "DBus not available: set HAVE_DBUS in src/config.h" + msgstr "" + +-#: dnsmasq.c:371 ++#: dnsmasq.c:385 + #, c-format + msgid "unknown user or group: %s" + msgstr "" + +-#: dnsmasq.c:426 ++#: dnsmasq.c:440 + #, c-format + msgid "cannot chdir to filesystem root: %s" + msgstr "" + +-#: dnsmasq.c:667 ++#: dnsmasq.c:692 + #, c-format + msgid "started, version %s DNS disabled" + msgstr "" + +-#: dnsmasq.c:669 ++#: dnsmasq.c:694 + #, c-format + msgid "started, version %s cachesize %d" + msgstr "" + +-#: dnsmasq.c:671 ++#: dnsmasq.c:696 + #, c-format + msgid "started, version %s cache disabled" + msgstr "" + +-#: dnsmasq.c:673 ++#: dnsmasq.c:698 + #, c-format + msgid "compile time options: %s" + msgstr "" + +-#: dnsmasq.c:679 ++#: dnsmasq.c:704 + msgid "DBus support enabled: connected to system bus" + msgstr "" + +-#: dnsmasq.c:681 ++#: dnsmasq.c:706 + msgid "DBus support enabled: bus connection pending" + msgstr "" + +-#: dnsmasq.c:686 ++#: dnsmasq.c:711 + msgid "DNS service limited to local subnets" + msgstr "" + +-#: dnsmasq.c:702 ++#: dnsmasq.c:727 + msgid "DNSSEC validation enabled" + msgstr "" + +-#: dnsmasq.c:705 ++#: dnsmasq.c:730 + msgid "DNSSEC signature timestamps not checked until first cache reload" + msgstr "" + +-#: dnsmasq.c:708 ++#: dnsmasq.c:733 + msgid "DNSSEC signature timestamps not checked until system time valid" + msgstr "" + +-#: dnsmasq.c:713 ++#: dnsmasq.c:738 + #, c-format + msgid "warning: failed to change owner of %s: %s" + msgstr "" + +-#: dnsmasq.c:717 ++#: dnsmasq.c:742 + msgid "setting --bind-interfaces option because of OS limitations" + msgstr "" + +-#: dnsmasq.c:727 ++#: dnsmasq.c:752 + #, c-format + msgid "warning: interface %s does not currently exist" + msgstr "" + +-#: dnsmasq.c:732 ++#: dnsmasq.c:757 + msgid "warning: ignoring resolv-file flag because no-resolv is set" + msgstr "" + +-#: dnsmasq.c:735 ++#: dnsmasq.c:760 + msgid "warning: no upstream servers configured" + msgstr "" + +-#: dnsmasq.c:739 ++#: dnsmasq.c:764 + #, c-format + msgid "asynchronous logging enabled, queue limit is %d messages" + msgstr "" + +-#: dnsmasq.c:760 ++#: dnsmasq.c:785 + msgid "IPv6 router advertisement enabled" + msgstr "" + +-#: dnsmasq.c:765 ++#: dnsmasq.c:790 + #, c-format + msgid "DHCP, sockets bound exclusively to interface %s" + msgstr "" + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "root is " + msgstr "" + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "enabled" + msgstr "" + +-#: dnsmasq.c:784 ++#: dnsmasq.c:810 + msgid "secure mode" + msgstr "" + +-#: dnsmasq.c:810 ++#: dnsmasq.c:813 ++#, c-format ++msgid "warning: %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:817 ++#, c-format ++msgid "warning: TFTP directory %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:843 + #, c-format + msgid "restricting maximum simultaneous TFTP transfers to %d" + msgstr "" + +-#: dnsmasq.c:1006 ++#: dnsmasq.c:1039 + msgid "connected to system DBus" + msgstr "" + +-#: dnsmasq.c:1156 ++#: dnsmasq.c:1189 + #, c-format + msgid "cannot fork into background: %s" + msgstr "" + +-#: dnsmasq.c:1159 ++#: dnsmasq.c:1192 + #, c-format + msgid "failed to create helper: %s" + msgstr "" + +-#: dnsmasq.c:1162 ++#: dnsmasq.c:1195 + #, c-format + msgid "setting capabilities failed: %s" + msgstr "" + +-#: dnsmasq.c:1165 ++#: dnsmasq.c:1198 + #, c-format + msgid "failed to change user-id to %s: %s" + msgstr "" + +-#: dnsmasq.c:1168 ++#: dnsmasq.c:1201 + #, c-format + msgid "failed to change group-id to %s: %s" + msgstr "" + +-#: dnsmasq.c:1171 ++#: dnsmasq.c:1204 + #, c-format + msgid "failed to open pidfile %s: %s" + msgstr "" + +-#: dnsmasq.c:1174 ++#: dnsmasq.c:1207 + #, c-format + msgid "cannot open log %s: %s" + msgstr "" + +-#: dnsmasq.c:1177 ++#: dnsmasq.c:1210 + #, c-format + msgid "failed to load Lua script: %s" + msgstr "" + +-#: dnsmasq.c:1180 ++#: dnsmasq.c:1213 + #, c-format + msgid "TFTP directory %s inaccessible: %s" + msgstr "" + +-#: dnsmasq.c:1183 ++#: dnsmasq.c:1216 + #, c-format + msgid "cannot create timestamp file %s: %s" + msgstr "" + +-#: dnsmasq.c:1204 ++#: dnsmasq.c:1237 + msgid "now checking DNSSEC signature timestamps" + msgstr "" + +-#: dnsmasq.c:1271 ++#: dnsmasq.c:1304 + #, c-format + msgid "script process killed by signal %d" + msgstr "" + +-#: dnsmasq.c:1275 ++#: dnsmasq.c:1308 + #, c-format + msgid "script process exited with status %d" + msgstr "" + +-#: dnsmasq.c:1279 ++#: dnsmasq.c:1312 + #, c-format + msgid "failed to execute %s: %s" + msgstr "" + +-#: dnsmasq.c:1334 ++#: dnsmasq.c:1367 + msgid "exiting on receipt of SIGTERM" + msgstr "" + +-#: dnsmasq.c:1362 ++#: dnsmasq.c:1395 + #, c-format + msgid "failed to access %s: %s" + msgstr "" + +-#: dnsmasq.c:1392 ++#: dnsmasq.c:1425 + #, c-format + msgid "reading %s" + msgstr "" + +-#: dnsmasq.c:1403 ++#: dnsmasq.c:1436 + #, c-format + msgid "no servers found in %s, will retry" + msgstr "" +@@ -1507,37 +1521,37 @@ msgstr "" + msgid "cannot create ICMP raw socket: %s." + msgstr "" + +-#: dhcp.c:239 ++#: dhcp.c:241 dhcp6.c:180 + #, c-format + msgid "unknown interface %s in bridge-interface" + msgstr "" + +-#: dhcp.c:278 ++#: dhcp.c:281 + #, c-format + msgid "DHCP packet received on %s which has no address" + msgstr "" + +-#: dhcp.c:412 ++#: dhcp.c:415 + #, c-format + msgid "ARP-cache injection failed: %s" + msgstr "" + +-#: dhcp.c:511 ++#: dhcp.c:514 + #, c-format + msgid "DHCP range %s -- %s is not consistent with netmask %s" + msgstr "" + +-#: dhcp.c:812 ++#: dhcp.c:815 + #, c-format + msgid "bad line at %s line %d" + msgstr "" + +-#: dhcp.c:855 ++#: dhcp.c:858 + #, c-format + msgid "ignoring %s line %d, duplicate name or IP address" + msgstr "" + +-#: dhcp.c:999 rfc3315.c:2139 ++#: dhcp.c:1002 rfc3315.c:2135 + #, c-format + msgid "DHCP relay %s -> %s" + msgstr "" +@@ -1571,169 +1585,169 @@ msgstr "" + msgid "Ignoring domain %s for DHCP host name %s" + msgstr "" + +-#: rfc2131.c:342 ++#: rfc2131.c:344 + #, c-format + msgid "no address range available for DHCP request %s %s" + msgstr "" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "with subnet selector" + msgstr "" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "via" + msgstr "" + +-#: rfc2131.c:355 ++#: rfc2131.c:357 + #, c-format + msgid "%u available DHCP subnet: %s/%s" + msgstr "" + +-#: rfc2131.c:358 rfc3315.c:300 ++#: rfc2131.c:360 rfc3315.c:300 + #, c-format + msgid "%u available DHCP range: %s -- %s" + msgstr "" + +-#: rfc2131.c:469 ++#: rfc2131.c:471 + #, c-format + msgid "%u vendor class: %s" + msgstr "" + +-#: rfc2131.c:471 ++#: rfc2131.c:473 + #, c-format + msgid "%u user class: %s" + msgstr "" + +-#: rfc2131.c:498 ++#: rfc2131.c:500 + msgid "disabled" + msgstr "" + +-#: rfc2131.c:539 rfc2131.c:967 rfc2131.c:1385 rfc3315.c:603 rfc3315.c:860 +-#: rfc3315.c:1139 ++#: rfc2131.c:541 rfc2131.c:974 rfc2131.c:1380 rfc3315.c:603 rfc3315.c:856 ++#: rfc3315.c:1135 + msgid "ignored" + msgstr "" + +-#: rfc2131.c:554 rfc2131.c:1205 rfc3315.c:910 ++#: rfc2131.c:556 rfc2131.c:1207 rfc3315.c:906 + msgid "address in use" + msgstr "" + +-#: rfc2131.c:568 rfc2131.c:1021 ++#: rfc2131.c:570 rfc2131.c:1028 + msgid "no address available" + msgstr "" + +-#: rfc2131.c:575 rfc2131.c:1168 ++#: rfc2131.c:577 rfc2131.c:1170 + msgid "wrong network" + msgstr "" + +-#: rfc2131.c:590 ++#: rfc2131.c:592 + msgid "no address configured" + msgstr "" + +-#: rfc2131.c:596 rfc2131.c:1218 ++#: rfc2131.c:598 rfc2131.c:1220 + msgid "no leases left" + msgstr "" + +-#: rfc2131.c:691 rfc3315.c:476 ++#: rfc2131.c:693 rfc3315.c:476 + #, c-format + msgid "%u client provides name: %s" + msgstr "" + +-#: rfc2131.c:796 ++#: rfc2131.c:798 + msgid "PXE BIS not supported" + msgstr "" + +-#: rfc2131.c:935 rfc3315.c:1233 ++#: rfc2131.c:942 rfc3315.c:1229 + #, c-format + msgid "disabling DHCP static address %s for %s" + msgstr "" + +-#: rfc2131.c:956 ++#: rfc2131.c:963 + msgid "unknown lease" + msgstr "" + +-#: rfc2131.c:990 ++#: rfc2131.c:997 + #, c-format + msgid "not using configured address %s because it is leased to %s" + msgstr "" + +-#: rfc2131.c:1000 ++#: rfc2131.c:1007 + #, c-format + msgid "not using configured address %s because it is in use by the server or relay" + msgstr "" + +-#: rfc2131.c:1003 ++#: rfc2131.c:1010 + #, c-format + msgid "not using configured address %s because it was previously declined" + msgstr "" + +-#: rfc2131.c:1019 rfc2131.c:1211 ++#: rfc2131.c:1026 rfc2131.c:1213 + msgid "no unique-id" + msgstr "" + +-#: rfc2131.c:1106 ++#: rfc2131.c:1108 + msgid "wrong server-ID" + msgstr "" + +-#: rfc2131.c:1125 ++#: rfc2131.c:1127 + msgid "wrong address" + msgstr "" + +-#: rfc2131.c:1143 rfc3315.c:1006 ++#: rfc2131.c:1145 rfc3315.c:1002 + msgid "lease not found" + msgstr "" + +-#: rfc2131.c:1176 ++#: rfc2131.c:1178 + msgid "address not available" + msgstr "" + +-#: rfc2131.c:1187 ++#: rfc2131.c:1189 + msgid "static lease available" + msgstr "" + +-#: rfc2131.c:1191 ++#: rfc2131.c:1193 + msgid "address reserved" + msgstr "" + +-#: rfc2131.c:1199 ++#: rfc2131.c:1201 + #, c-format + msgid "abandoning lease to %s of %s" + msgstr "" + +-#: rfc2131.c:1712 ++#: rfc2131.c:1707 + #, c-format + msgid "%u bootfile name: %s" + msgstr "" + +-#: rfc2131.c:1721 ++#: rfc2131.c:1716 + #, c-format + msgid "%u server name: %s" + msgstr "" + +-#: rfc2131.c:1729 ++#: rfc2131.c:1724 + #, c-format + msgid "%u next server: %s" + msgstr "" + +-#: rfc2131.c:1732 ++#: rfc2131.c:1727 + #, c-format + msgid "%u broadcast response" + msgstr "" + +-#: rfc2131.c:1795 ++#: rfc2131.c:1790 + #, c-format + msgid "cannot send DHCP/BOOTP option %d: no space left in packet" + msgstr "" + +-#: rfc2131.c:2036 ++#: rfc2131.c:2031 + msgid "PXE menu too large" + msgstr "" + +-#: rfc2131.c:2173 rfc3315.c:1506 ++#: rfc2131.c:2170 rfc3315.c:1502 + #, c-format + msgid "%u requested options: %s" + msgstr "" + +-#: rfc2131.c:2453 ++#: rfc2131.c:2487 + #, c-format + msgid "cannot send RFC3925 option: too many options for enterprise number %d" + msgstr "" +@@ -1748,15 +1762,25 @@ msgstr "" + msgid "netlink returns error: %s" + msgstr "" + +-#: dbus.c:171 ++#: dbus.c:186 + msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" + msgstr "" + +-#: dbus.c:500 ++#: dbus.c:439 ++#, c-format ++msgid "Enabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:444 ++#, c-format ++msgid "Disabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:691 + msgid "setting upstream servers from DBus" + msgstr "" + +-#: dbus.c:547 ++#: dbus.c:738 + msgid "could not register a DBus message handler" + msgstr "" + +@@ -1876,47 +1900,47 @@ msgstr "" + msgid "unknown prefix-class %d" + msgstr "" + +-#: rfc3315.c:803 rfc3315.c:902 ++#: rfc3315.c:803 rfc3315.c:898 + msgid "address unavailable" + msgstr "" + +-#: rfc3315.c:815 rfc3315.c:950 rfc3315.c:1283 ++#: rfc3315.c:815 rfc3315.c:946 rfc3315.c:1279 + msgid "success" + msgstr "" + +-#: rfc3315.c:843 rfc3315.c:845 rfc3315.c:958 rfc3315.c:960 ++#: rfc3315.c:830 rfc3315.c:839 rfc3315.c:954 rfc3315.c:956 + msgid "no addresses available" + msgstr "" + +-#: rfc3315.c:937 ++#: rfc3315.c:933 + msgid "not on link" + msgstr "" + +-#: rfc3315.c:1010 rfc3315.c:1195 rfc3315.c:1272 ++#: rfc3315.c:1006 rfc3315.c:1191 rfc3315.c:1268 + msgid "no binding found" + msgstr "" + +-#: rfc3315.c:1048 ++#: rfc3315.c:1044 + msgid "deprecated" + msgstr "" + +-#: rfc3315.c:1053 ++#: rfc3315.c:1049 + msgid "address invalid" + msgstr "" + +-#: rfc3315.c:1100 ++#: rfc3315.c:1096 + msgid "confirm failed" + msgstr "" + +-#: rfc3315.c:1116 ++#: rfc3315.c:1112 + msgid "all addresses still on link" + msgstr "" + +-#: rfc3315.c:1204 ++#: rfc3315.c:1200 + msgid "release received" + msgstr "" + +-#: rfc3315.c:2130 ++#: rfc3315.c:2126 + msgid "Cannot multicast to DHCPv6 server without correct interface" + msgstr "" + +@@ -2004,12 +2028,12 @@ msgstr "" + msgid "DHCP relay from %s to %s" + msgstr "" + +-#: radv.c:98 ++#: radv.c:109 + #, c-format + msgid "cannot create ICMPv6 socket: %s" + msgstr "" + +-#: auth.c:436 ++#: auth.c:448 + #, c-format + msgid "ignoring zone transfer request from %s" + msgstr "" +@@ -2024,7 +2048,7 @@ msgstr "" + msgid "failed to create IPset control socket: %s" + msgstr "" + +-#: dnssec.c:425 dnssec.c:469 ++#: dnssec.c:449 dnssec.c:493 + #, c-format + msgid "failed to update mtime on %s: %s" + msgstr "" +diff --git a/po/fr.po b/po/fr.po +index fbddad73887a..04675117fc85 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -23,17 +23,17 @@ msgstr "" + msgid "failed to load names from %s: %s" + msgstr "Impossible de charger les noms à partir de %s : %s" + +-#: cache.c:967 dhcp.c:825 ++#: cache.c:967 dhcp.c:828 + #, c-format + msgid "bad address at %s line %d" + msgstr "mauvaise adresse dans %s ligne %d" + +-#: cache.c:1018 dhcp.c:841 ++#: cache.c:1018 dhcp.c:844 + #, c-format + msgid "bad name at %s line %d" + msgstr "mauvais nom dans %s ligne %d" + +-#: cache.c:1027 dhcp.c:916 ++#: cache.c:1027 dhcp.c:919 + #, c-format + msgid "read %s - %d addresses" + msgstr "lecture %s - %d adresses" +@@ -91,656 +91,660 @@ msgstr "impossible d'initialiser le g + msgid "failed to allocate memory" + msgstr "impossible d'allouer la mémoire" + +-#: util.c:243 option.c:598 ++#: util.c:250 option.c:601 + msgid "could not get memory" + msgstr "impossible d'allouer de la mémoire" + +-#: util.c:253 ++#: util.c:260 + #, c-format + msgid "cannot create pipe: %s" + msgstr "Ne peut pas créer le tube %s : %s" + +-#: util.c:261 ++#: util.c:268 + #, c-format + msgid "failed to allocate %d bytes" + msgstr "impossible d'allouer %d octets" + +-#: util.c:430 ++#: util.c:437 + #, c-format + msgid "infinite" + msgstr "illimité(e)" + +-#: option.c:330 ++#: option.c:332 + msgid "Specify local address(es) to listen on." + msgstr "Spécifie la ou les adresse(s) locales où le démon doit se mettre à l'écoute." + +-#: option.c:331 ++#: option.c:333 + msgid "Return ipaddr for all hosts in specified domains." + msgstr "Retourne les adresses IP pour toutes les machines présentes dans les domaines spécifiés" + +-#: option.c:332 ++#: option.c:334 + msgid "Fake reverse lookups for RFC1918 private address ranges." + msgstr "Traduction inverse truquée pour la plage d'adresse privée RFC1918" + +-#: option.c:333 ++#: option.c:335 + msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." + msgstr "Traite l'adresse IP comme un domaine inexistant NXDOMAIN (contourne le systeme de redirection de Verisign)" + +-#: option.c:334 ++#: option.c:336 + #, c-format + msgid "Specify the size of the cache in entries (defaults to %s)." + msgstr "Spécifie le nombre d'entrées que contiendra le cache (par défaut : %s)." + +-#: option.c:335 ++#: option.c:337 + #, c-format + msgid "Specify configuration file (defaults to %s)." + msgstr "Spécifie le nom du fichier de configuration (par défaut : %s)" + +-#: option.c:336 ++#: option.c:338 + msgid "Do NOT fork into the background: run in debug mode." + msgstr "Ne passe pas en tâche de fond : démarre en mode debug" + +-#: option.c:337 ++#: option.c:339 + msgid "Do NOT forward queries with no domain part." + msgstr "Ne retransmet pas les requêtes qui n'ont pas de domaine." + +-#: option.c:338 ++#: option.c:340 + msgid "Return self-pointing MX records for local hosts." + msgstr "Retourne les champs MX pour les machines locales." + +-#: option.c:339 ++#: option.c:341 + msgid "Expand simple names in /etc/hosts with domain-suffix." + msgstr "Etend les noms uniques des machines dans /etc/hosts avec le suffixe du domaine." + +-#: option.c:340 ++#: option.c:342 + msgid "Don't forward spurious DNS requests from Windows hosts." + msgstr "Ne retransmet pas les fausses requêtes DNS en provenance des machines Windows." + +-#: option.c:341 ++#: option.c:343 + msgid "Enable DHCP in the range given with lease duration." + msgstr "Autorise DHCP dans la plage d'adresses donnée sur la durée de validité du bail." + +-#: option.c:342 ++#: option.c:344 + #, c-format + msgid "Change to this group after startup (defaults to %s)." + msgstr "On change pour ce groupe après le démarrage (par défaut : %s)." + +-#: option.c:343 ++#: option.c:345 + msgid "Set address or hostname for a specified machine." + msgstr "On assigne une adresse ou un nom pour une machine spécifiée." + +-#: option.c:344 ++#: option.c:346 + msgid "Read DHCP host specs from file." + msgstr "Lecture des spécifications d'hôtes DHCP à partir du fichier" + +-#: option.c:345 ++#: option.c:347 + msgid "Read DHCP option specs from file." + msgstr "Lecture des options DHCP à partir du fichier" + +-#: option.c:346 ++#: option.c:348 + #, fuzzy + msgid "Read DHCP host specs from a directory." + msgstr "Lecture des spécifications d'hôtes DHCP à partir du fichier" + +-#: option.c:347 ++#: option.c:349 + #, fuzzy + msgid "Read DHCP options from a directory." + msgstr "Lecture des options DHCP à partir du fichier" + +-#: option.c:348 ++#: option.c:350 + msgid "Evaluate conditional tag expression." + msgstr "Expression d'évaluation conditionnelle d'étiquette" + +-#: option.c:349 ++#: option.c:351 + #, c-format + msgid "Do NOT load %s file." + msgstr "Ne charge PAS le fichier %s." + +-#: option.c:350 ++#: option.c:352 + #, c-format + msgid "Specify a hosts file to be read in addition to %s." + msgstr "Spécifie un nom de fichier hosts à lire en complément de %s" + +-#: option.c:351 ++#: option.c:353 + #, fuzzy + msgid "Read hosts files from a directory." + msgstr "Lecture des spécifications d'hôtes DHCP à partir du fichier" + +-#: option.c:352 ++#: option.c:354 + msgid "Specify interface(s) to listen on." + msgstr "Spécifie la ou les interface(s) où le démon doit se mettre à l'écoute." + +-#: option.c:353 ++#: option.c:355 + msgid "Specify interface(s) NOT to listen on." + msgstr "Spécifie la ou les interface(s) que le démon ne doit PAS traiter." + + # +-#: option.c:354 ++#: option.c:356 + msgid "Map DHCP user class to tag." + msgstr "Associe les classes d'utilisateurs ('user class') DHCP aux options." + +-#: option.c:355 ++#: option.c:357 + msgid "Map RFC3046 circuit-id to tag." + msgstr "Associe les identifiants de circuits RFC3046 ('circuit-id') aux options" + +-#: option.c:356 ++#: option.c:358 + msgid "Map RFC3046 remote-id to tag." + msgstr "Associe les identifiants distants RFC3046 ('remote-id') aux options" + +-#: option.c:357 ++#: option.c:359 + msgid "Map RFC3993 subscriber-id to tag." + msgstr "Associe les identifiants de souscripteurs RFC3993 ('subscriber-id') aux options" + + # +-#: option.c:358 ++#: option.c:360 + msgid "Don't do DHCP for hosts with tag set." + msgstr "Ne pas autoriser DHCP pour les machines énumerées dans les options." + + # +-#: option.c:359 ++#: option.c:361 + msgid "Force broadcast replies for hosts with tag set." + msgstr "Forcer les réponses par 'broadcast' pour les machines énumerées dans les options." + +-#: option.c:360 ++#: option.c:362 + msgid "Do NOT fork into the background, do NOT run in debug mode." + msgstr "Ne passe pas en tâche de fond, ne pas s'exécuter en mode debug." + +-#: option.c:361 ++#: option.c:363 + msgid "Assume we are the only DHCP server on the local network." + msgstr "On considère que l'on est le seul serveur DHCP sur le réseau local." + +-#: option.c:362 ++#: option.c:364 + #, c-format + msgid "Specify where to store DHCP leases (defaults to %s)." + msgstr "Spécifie où il faut sauvegarder les baux DHCP (par défaut : %s)." + +-#: option.c:363 ++#: option.c:365 + msgid "Return MX records for local hosts." + msgstr "Retourne les champs MX pour les machines locales." + +-#: option.c:364 ++#: option.c:366 + msgid "Specify an MX record." + msgstr "Spécifie un champ MX." + +-#: option.c:365 ++#: option.c:367 + msgid "Specify BOOTP options to DHCP server." + msgstr "Spécifie les options BOOTP pour le serveur DHCP." + +-#: option.c:366 ++#: option.c:368 + #, c-format + msgid "Do NOT poll %s file, reload only on SIGHUP." + msgstr "Ne pas scruter le fichier %s, ne recharger les modifications que sur réception du signal SIGHUP." + +-#: option.c:367 ++#: option.c:369 + msgid "Do NOT cache failed search results." + msgstr "Ne place pas en cache le résultat des requêtes qui ont échouées." + +-#: option.c:368 ++#: option.c:370 + #, c-format + msgid "Use nameservers strictly in the order given in %s." + msgstr "Utilise les serveurs de noms dans l'ordre donné dans %s." + + # +-#: option.c:369 ++#: option.c:371 + msgid "Specify options to be sent to DHCP clients." + msgstr "Options supplémentaires à associer aux clients DHCP." + +-#: option.c:370 ++#: option.c:372 + msgid "DHCP option sent even if the client does not request it." + msgstr "Option DHCP envoyée même si le client de la demande pas." + +-#: option.c:371 ++#: option.c:373 + msgid "Specify port to listen for DNS requests on (defaults to 53)." + msgstr "Spécifie le port où il faut écouter les requêtes DNS (par défaut : 53)." + +-#: option.c:372 ++#: option.c:374 + #, c-format + msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." + msgstr "Taille maximale des paquets UDP supportés pour EDNS.0 (par défaut : %s)." + + # +-#: option.c:373 ++#: option.c:375 + msgid "Log DNS queries." + msgstr "Enregistre les requêtes DNS dans un journal d'activité." + + # +-#: option.c:374 ++#: option.c:376 + msgid "Force the originating port for upstream DNS queries." + msgstr "Force le port d'origine pour les requêtes vers les serveurs amonts." + +-#: option.c:375 ++#: option.c:377 + msgid "Do NOT read resolv.conf." + msgstr "Ne pas lire le fichier resolv.conf." + +-#: option.c:376 ++#: option.c:378 + #, c-format + msgid "Specify path to resolv.conf (defaults to %s)." + msgstr "Spécifie le chemin pour le fichier resolv.conf (par défaut : %s)." + +-#: option.c:377 ++#: option.c:379 + #, fuzzy + msgid "Specify path to file with server= options" + msgstr "Spécifie un chemin pour le fichier PID (par défaut : %s)." + +-#: option.c:378 ++#: option.c:380 + msgid "Specify address(es) of upstream servers with optional domains." + msgstr "Spécifie la ou les adresses des serveurs amonts avec des domaines optionels." + +-#: option.c:379 ++#: option.c:381 + #, fuzzy + msgid "Specify address of upstream servers for reverse address queries" + msgstr "Spécifie la ou les adresses des serveurs amonts avec des domaines optionels." + +-#: option.c:380 ++#: option.c:382 + msgid "Never forward queries to specified domains." + msgstr "Ne jamais retransmettre les requêtes pour les domaines spécifiés." + +-#: option.c:381 ++#: option.c:383 + msgid "Specify the domain to be assigned in DHCP leases." + msgstr "Spécifie le domaine qui doit etre assigné aux baux DHCP." + +-#: option.c:382 ++#: option.c:384 + msgid "Specify default target in an MX record." + msgstr "Spécifie la cible par défaut dans un champ MX." + +-#: option.c:383 ++#: option.c:385 + msgid "Specify time-to-live in seconds for replies from /etc/hosts." + msgstr "Spécifie le TTL en secondes pour les réponses qui utilisent /etc/hosts." + + # +-#: option.c:384 ++#: option.c:386 + msgid "Specify time-to-live in seconds for negative caching." + msgstr "Spécifie le TTL en secondes pour les réponses qui utilisent /etc/hosts." + +-#: option.c:385 ++#: option.c:387 + msgid "Specify time-to-live in seconds for maximum TTL to send to clients." + msgstr "Spécifie, en secondes, la valeur maximum de TTL à renvoyer aux clients." + + # +-#: option.c:386 ++#: option.c:388 + #, fuzzy + msgid "Specify time-to-live ceiling for cache." + msgstr "Spécifie le TTL en secondes pour les réponses qui utilisent /etc/hosts." + + # +-#: option.c:387 ++#: option.c:389 + #, fuzzy + msgid "Specify time-to-live floor for cache." + msgstr "Spécifie le TTL en secondes pour les réponses qui utilisent /etc/hosts." + +-#: option.c:388 ++#: option.c:390 + #, c-format + msgid "Change to this user after startup. (defaults to %s)." + msgstr "Change pour cet utilisateur après le démarrage (par défaut : %s)." + + # +-#: option.c:389 ++#: option.c:391 + msgid "Map DHCP vendor class to tag." + msgstr "Associe les classes de fournisseurs ('vendor class') DHCP aux options." + +-#: option.c:390 ++#: option.c:392 + msgid "Display dnsmasq version and copyright information." + msgstr "Affiche la version de Dnsmasq et les informations liées au copyright." + +-#: option.c:391 ++#: option.c:393 + msgid "Translate IPv4 addresses from upstream servers." + msgstr "Traduit les adresses IPV4 des serveurs amonts." + +-#: option.c:392 ++#: option.c:394 + msgid "Specify a SRV record." + msgstr "Spécifie un champ SRV." + +-#: option.c:393 ++#: option.c:395 + msgid "Display this message. Use --help dhcp for known DHCP options." + msgstr "Afficher ce message. Utiliser --help dhcp pour obtenir la liste des options DHCP connues." + +-#: option.c:394 ++#: option.c:396 + #, c-format + msgid "Specify path of PID file (defaults to %s)." + msgstr "Spécifie un chemin pour le fichier PID (par défaut : %s)." + +-#: option.c:395 ++#: option.c:397 + #, c-format + msgid "Specify maximum number of DHCP leases (defaults to %s)." + msgstr "Spécifie le nombre maximum de baux DHCP (par défaut : %s)." + +-#: option.c:396 ++#: option.c:398 + msgid "Answer DNS queries based on the interface a query was sent to." + msgstr "Repond aux requêtes DNS en se basant sur l'interface ou a été envoyée la requête." + +-#: option.c:397 ++#: option.c:399 + msgid "Specify TXT DNS record." + msgstr "Spécifie un champ DNS TXT" + + # +-#: option.c:398 ++#: option.c:400 + msgid "Specify PTR DNS record." + msgstr "Spécifie un champ DNS PTR" + +-#: option.c:399 ++#: option.c:401 + msgid "Give DNS name to IPv4 address of interface." + msgstr "Donne le nom DNS pour l'adresse IPv4 de l'interface." + +-#: option.c:400 ++#: option.c:402 + msgid "Bind only to interfaces in use." + msgstr "Association uniquement aux interfaces réseau actuellement actives." + +-#: option.c:401 ++#: option.c:403 + #, c-format + msgid "Read DHCP static host information from %s." + msgstr "Lecture des informations de DHCP statique à partir de %s." + +-#: option.c:402 ++#: option.c:404 + msgid "Enable the DBus interface for setting upstream servers, etc." + msgstr "Autorise l'interface DBus pour la configuration des serveurs amonts, etc." + +-#: option.c:403 ++#: option.c:405 + msgid "Do not provide DHCP on this interface, only provide DNS." + msgstr "Ne pas assurer de fonction DHCP sur cette interface, mais seulement la fonction DNS." + +-#: option.c:404 ++#: option.c:406 + msgid "Enable dynamic address allocation for bootp." + msgstr "Autorise l'allocation dynamique d'adresse pour bootp." + + # +-#: option.c:405 ++#: option.c:407 + msgid "Map MAC address (with wildcards) to option set." + msgstr "Associe l'adresse MAC (avec les jokers) aux options." + +-#: option.c:406 ++#: option.c:408 + msgid "Treat DHCP requests on aliases as arriving from interface." + msgstr "Traiter les requêtes DHCP sur les alias comme arrivant de l'interface." + +-#: option.c:407 ++#: option.c:409 + msgid "Disable ICMP echo address checking in the DHCP server." + msgstr "Supprime la vérification d'adresse sur le serveur au moyen de paquets ICMP echo" + +-#: option.c:408 ++#: option.c:410 + msgid "Shell script to run on DHCP lease creation and destruction." + msgstr "Script shell à exécuter lors de la création ou destruction de bail DHCP." + +-#: option.c:409 ++#: option.c:411 + msgid "Lua script to run on DHCP lease creation and destruction." + msgstr "Script Lua à exécuter lors de la création ou destruction de bail DHCP." + +-#: option.c:410 ++#: option.c:412 + msgid "Run lease-change scripts as this user." + msgstr "Lancer le script 'lease-change' avec cet utilisateur." + +-#: option.c:411 ++#: option.c:413 + msgid "Read configuration from all the files in this directory." + msgstr "Lecture de la configuration dans tous les fichiers de ce répertoire." + + # +-#: option.c:412 ++#: option.c:414 + msgid "Log to this syslog facility or file. (defaults to DAEMON)" + msgstr "Enregistrer les journaux d'activité dans cette facilité syslog. (défaut : DAEMON)" + +-#: option.c:413 ++#: option.c:415 + msgid "Do not use leasefile." + msgstr "Ne pas utiliser de fichier de baux." + +-#: option.c:414 ++#: option.c:416 + #, c-format + msgid "Maximum number of concurrent DNS queries. (defaults to %s)" + msgstr "Spécifie le nombre maximum de requêtes DHCP concurrentes (par défaut : %s)." + +-#: option.c:415 ++#: option.c:417 + #, c-format + msgid "Clear DNS cache when reloading %s." + msgstr "Vider le cache DNS lors du rechargement de %s." + +-#: option.c:416 ++#: option.c:418 + msgid "Ignore hostnames provided by DHCP clients." + msgstr "Ignorer les noms d'hôtes fournis par les clients DHCP" + +-#: option.c:417 ++#: option.c:419 + msgid "Do NOT reuse filename and server fields for extra DHCP options." + msgstr "Ne pas réutiliser les champs nom de fichier et serveur dans les options DHCP supplémentaires." + +-#: option.c:418 ++#: option.c:420 + msgid "Enable integrated read-only TFTP server." + msgstr "Activer le server TFTP intégré (fonctionnant en lecture seulement)" + +-#: option.c:419 ++#: option.c:421 + msgid "Export files by TFTP only from the specified subtree." + msgstr "N'exporter par TFTP que les fichiers de l'arborescence de fichier spécifiée" + +-#: option.c:420 ++#: option.c:422 + msgid "Add client IP address to tftp-root." + msgstr "Ajouter les adresses IP clientes à la racine tftp ('tftp-root')." + +-#: option.c:421 ++#: option.c:423 + msgid "Allow access only to files owned by the user running dnsmasq." + msgstr "Accès aux seuls fichiers appartenants à l'utilisateur sous lequel tourne dnsmasq" + +-#: option.c:422 ++#: option.c:424 ++msgid "Do not terminate the service if TFTP directories are inaccessible." ++msgstr "" ++ ++#: option.c:425 + #, c-format + msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." + msgstr "Spécifie le nombre maximum de transfert TFTP concurrents (défaut : %s)." + +-#: option.c:423 ++#: option.c:426 + msgid "Disable the TFTP blocksize extension." + msgstr "Désactivation de l'extension TFTP « taille de bloc »" + +-#: option.c:424 ++#: option.c:427 + msgid "Convert TFTP filenames to lowercase" + msgstr "Convertis les noms de fichiers TFTP en minuscule" + +-#: option.c:425 ++#: option.c:428 + msgid "Ephemeral port range for use by TFTP transfers." + msgstr "Gamme de ports dans laquelle seront choisis les ports temporaires utilisés dans les transferts TFTP." + +-#: option.c:426 ++#: option.c:429 + msgid "Extra logging for DHCP." + msgstr "Traces supplémentaires pour le DHCP." + +-#: option.c:427 ++#: option.c:430 + msgid "Enable async. logging; optionally set queue length." + msgstr "Active l'écriture de traces en mode asynchrone. Peut prendre en option la valeur de la longueur de la queue." + +-#: option.c:428 ++#: option.c:431 + msgid "Stop DNS rebinding. Filter private IP ranges when resolving." + msgstr "Stopper la réassociation DNS ('DNS rebinding'). Filtre les gammes d'adresses IP privées lors de la résolution." + +-#: option.c:429 ++#: option.c:432 + msgid "Allow rebinding of 127.0.0.0/8, for RBL servers." + msgstr "Autorise la réassociation de 127.0.0/8, pour les serveurs RBL (Realtime Blackhole List)" + +-#: option.c:430 ++#: option.c:433 + msgid "Inhibit DNS-rebind protection on this domain." + msgstr "Désactive la protection contre les réassociation DNS pour ce domaine" + +-#: option.c:431 ++#: option.c:434 + msgid "Always perform DNS queries to all servers." + msgstr "Toujours effectuer les requêtes DNS à tous les serveurs." + + # +-#: option.c:432 ++#: option.c:435 + msgid "Set tag if client includes matching option in request." + msgstr "Spécifie le label si le client inclus l'option dans la requête." + +-#: option.c:433 ++#: option.c:436 + msgid "Use alternative ports for DHCP." + msgstr "Utiliser des ports alternatifs pour le DHCP." + + # +-#: option.c:434 ++#: option.c:437 + msgid "Specify NAPTR DNS record." + msgstr "Spécifie un champ DNS NAPTR." + +-#: option.c:435 ++#: option.c:438 + msgid "Specify lowest port available for DNS query transmission." + msgstr "Définie le plus petit port utilisé pour la transmission d'une requête DNS." + +-#: option.c:436 ++#: option.c:439 + msgid "Use only fully qualified domain names for DHCP clients." + msgstr "Utilise seulement les noms de domaine pleinement qualifiés pour les clients DHCP." + +-#: option.c:437 ++#: option.c:440 + msgid "Generate hostnames based on MAC address for nameless clients." + msgstr "Génère les noms d'hôtes à partir de l'adresse MAC pour les clients sans nom." + +-#: option.c:438 ++#: option.c:441 + msgid "Use these DHCP relays as full proxies." + msgstr "Utilise ces relais DHCP en temps que proxy complets." + +-#: option.c:439 ++#: option.c:442 + msgid "Relay DHCP requests to a remote server" + msgstr "Requêtes de relais DHCP à un serveur distant" + +-#: option.c:440 ++#: option.c:443 + msgid "Specify alias name for LOCAL DNS name." + msgstr "Spécifie un alias pour un nom DNS local." + + # +-#: option.c:441 ++#: option.c:444 + msgid "Prompt to send to PXE clients." + msgstr "Invite à envoyer aux clients PXE." + +-#: option.c:442 ++#: option.c:445 + msgid "Boot service for PXE menu." + msgstr "Service de démarrage pour menu PXE." + +-#: option.c:443 ++#: option.c:446 + msgid "Check configuration syntax." + msgstr "vérification de la syntaxe de la configuration." + +-#: option.c:444 ++#: option.c:447 + msgid "Add requestor's MAC address to forwarded DNS queries." + msgstr "Ajoute l'adresse MAC du requêteur aux requêtes DNS transmises" + +-#: option.c:445 ++#: option.c:448 + #, fuzzy + msgid "Add requestor's IP subnet to forwarded DNS queries." + msgstr "Ajoute l'adresse MAC du requêteur aux requêtes DNS transmises" + +-#: option.c:446 ++#: option.c:449 + msgid "Proxy DNSSEC validation results from upstream nameservers." + msgstr "Copie dans la réponse DNS le résultat de la validation DNSSEC effectuée par les serveurs DNS amonts." + +-#: option.c:447 ++#: option.c:450 + msgid "Attempt to allocate sequential IP addresses to DHCP clients." + msgstr "Essaie d'allouer des adresses IP séquentielles aux clients DHCP." + +-#: option.c:448 ++#: option.c:451 + msgid "Copy connection-track mark from queries to upstream connections." + msgstr "Copie les marques de suivi de connexion pour les requêtes amont." + +-#: option.c:449 ++#: option.c:452 + msgid "Allow DHCP clients to do their own DDNS updates." + msgstr "Autoriser les clients DHCP à faire leurs propres mises à jour DDNS (Dynamic DNS)" + +-#: option.c:450 ++#: option.c:453 + msgid "Send router-advertisements for interfaces doing DHCPv6" + msgstr "Envoyer des annonces de routeurs pour toutes les interfaces faisant du DHCPv6" + +-#: option.c:451 ++#: option.c:454 + msgid "Specify DUID_EN-type DHCPv6 server DUID" + msgstr "Spécifie pour le serveur DHCPv6 un identifiant unique DHCP (DUID) basé sur un numéro unique de vendeur (DUID_EN)" + +-#: option.c:452 ++#: option.c:455 + msgid "Specify host (A/AAAA and PTR) records" + msgstr "Spécifie les enregistrements (A/AAAA et PTR) d'un hôte." + +-#: option.c:453 ++#: option.c:456 + msgid "Specify arbitrary DNS resource record" + msgstr "Définie une resource DNS d'un type spécifique" + +-#: option.c:454 ++#: option.c:457 + msgid "Bind to interfaces in use - check for new interfaces" + msgstr "Se lie aux interfaces préexistantes - vérifie l'apparition de nouvelles interfaces" + +-#: option.c:455 ++#: option.c:458 + msgid "Export local names to global DNS" + msgstr "Exporte les noms locaux dans le DNS global" + +-#: option.c:456 ++#: option.c:459 + msgid "Domain to export to global DNS" + msgstr "Domaine à exporter dans le DNS global" + +-#: option.c:457 ++#: option.c:460 + msgid "Set TTL for authoritative replies" + msgstr "Configure la durée de vie (Time To Live) pour les réponses faisant autorité" + +-#: option.c:458 ++#: option.c:461 + msgid "Set authoritive zone information" + msgstr "Configure les informations pour une zone de nom faisant autorité" + +-#: option.c:459 ++#: option.c:462 + msgid "Secondary authoritative nameservers for forward domains" + msgstr "Serveurs de noms secondaires faisant autorité pour les domaines délégués" + +-#: option.c:460 ++#: option.c:463 + msgid "Peers which are allowed to do zone transfer" + msgstr "Pairs autorisés à faire des transferts de zone" + +-#: option.c:461 ++#: option.c:464 + msgid "Specify ipsets to which matching domains should be added" + msgstr "Spécifie les ipsets auxquels les domaines correspondants doivent-être ajoutés" + +-#: option.c:462 ++#: option.c:465 + #, fuzzy + msgid "Specify a domain and address range for synthesised names" + msgstr "Spécifie un domaine et une plage d'adresses pour les noms auto-générés" + +-#: option.c:463 ++#: option.c:466 + msgid "Activate DNSSEC validation" + msgstr "" + +-#: option.c:464 ++#: option.c:467 + msgid "Specify trust anchor key digest." + msgstr "" + +-#: option.c:465 ++#: option.c:468 + msgid "Disable upstream checking for DNSSEC debugging." + msgstr "" + +-#: option.c:466 ++#: option.c:469 + msgid "Ensure answers without DNSSEC are in unsigned zones." + msgstr "" + +-#: option.c:467 ++#: option.c:470 + msgid "Don't check DNSSEC signature timestamps until first cache-reload" + msgstr "" + +-#: option.c:468 ++#: option.c:471 + msgid "Timestamp file to verify system clock for DNSSEC" + msgstr "" + +-#: option.c:470 ++#: option.c:473 + msgid "Specify DHCPv6 prefix class" + msgstr "Spécifie le préfixe de classe DHCPv6" + +-#: option.c:472 ++#: option.c:475 + msgid "Set priority, resend-interval and router-lifetime" + msgstr "" + +-#: option.c:473 ++#: option.c:476 + msgid "Do not log routine DHCP." + msgstr "" + +-#: option.c:474 ++#: option.c:477 + msgid "Do not log routine DHCPv6." + msgstr "" + +-#: option.c:475 ++#: option.c:478 + msgid "Do not log RA." + msgstr "" + +-#: option.c:476 ++#: option.c:479 + msgid "Accept queries only from directly-connected networks" + msgstr "" + +-#: option.c:477 ++#: option.c:480 + msgid "Detect and remove DNS forwarding loops" + msgstr "" + +-#: option.c:478 ++#: option.c:481 + msgid "Ignore DNS responses containing ipaddr." + msgstr "" + +-#: option.c:680 ++#: option.c:683 + #, c-format + msgid "" + "Usage: dnsmasq [options]\n" +@@ -749,328 +753,328 @@ msgstr "" + "Usage : dnsmasq [options]\n" + "\n" + +-#: option.c:682 ++#: option.c:685 + #, c-format + msgid "Use short options only on the command line.\n" + msgstr "Utilisez les options courtes uniquement sur la ligne de commande.\n" + +-#: option.c:684 ++#: option.c:687 + #, c-format + msgid "Valid options are:\n" + msgstr "Les options valides sont :\n" + +-#: option.c:741 option.c:745 ++#: option.c:744 option.c:748 + msgid "bad port" + msgstr "numéro de port incorrect" + +-#: option.c:772 option.c:804 ++#: option.c:775 option.c:807 + msgid "interface binding not supported" + msgstr "association d'interface non supportée" + + # +-#: option.c:781 option.c:3570 ++#: option.c:784 option.c:3575 + msgid "bad interface name" + msgstr "nom d'interface invalide" + + # +-#: option.c:811 ++#: option.c:814 + msgid "bad address" + msgstr "mauvaise adresse" + +-#: option.c:993 ++#: option.c:996 + msgid "unsupported encapsulation for IPv6 option" + msgstr "encapsulation d'option non supportée pour IPv6" + +-#: option.c:1007 ++#: option.c:1010 + msgid "bad dhcp-option" + msgstr "mauvaise valeur de 'dhcp-option'" + + # +-#: option.c:1075 ++#: option.c:1078 + msgid "bad IP address" + msgstr "mauvaise adresse IP" + + # +-#: option.c:1078 option.c:1216 option.c:2888 ++#: option.c:1081 option.c:1219 option.c:2893 + msgid "bad IPv6 address" + msgstr "mauvaise adresse IPv6" + +-#: option.c:1243 option.c:1337 ++#: option.c:1246 option.c:1340 + msgid "bad domain in dhcp-option" + msgstr "mauvais domaine dans dhcp-option" + +-#: option.c:1375 ++#: option.c:1378 + msgid "dhcp-option too long" + msgstr "dhcp-option trop long" + +-#: option.c:1382 ++#: option.c:1385 + msgid "illegal dhcp-match" + msgstr "valeur illégale pour 'dhcp-match'" + +-#: option.c:1444 ++#: option.c:1447 + msgid "illegal repeated flag" + msgstr "Une option ne pouvant être spécifié qu'une seule fois à été donnée plusieurs fois" + +-#: option.c:1452 ++#: option.c:1455 + msgid "illegal repeated keyword" + msgstr "Mot-clef ne pouvant être répété" + +-#: option.c:1517 option.c:4186 ++#: option.c:1520 option.c:4191 + #, c-format + msgid "cannot access directory %s: %s" + msgstr "Ne peut pas lire le répertoire %s : %s" + +-#: option.c:1563 tftp.c:493 ++#: option.c:1566 tftp.c:493 + #, c-format + msgid "cannot access %s: %s" + msgstr "Ne peut pas lire %s : %s" + +-#: option.c:1615 ++#: option.c:1618 + msgid "setting log facility is not possible under Android" + msgstr "Sous android, impossible de positionner la cible (facility) pour les traces (logs)." + +-#: option.c:1624 ++#: option.c:1627 + msgid "bad log facility" + msgstr "Mauvaise cible (facility) pour les traces." + +-#: option.c:1677 ++#: option.c:1680 + msgid "bad MX preference" + msgstr "préference MX incorrecte" + +-#: option.c:1682 ++#: option.c:1685 + msgid "bad MX name" + msgstr "nom MX incorrect" + +-#: option.c:1696 ++#: option.c:1699 + msgid "bad MX target" + msgstr "valeur MX cible incorrecte" + +-#: option.c:1708 ++#: option.c:1711 + msgid "cannot run scripts under uClinux" + msgstr "ne peut exécuter de script sous uClinux" + +-#: option.c:1710 ++#: option.c:1713 + msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts" + msgstr "recompiler en définissant HAVE_SCRIPT pour permettre l'exécution de scripts shell au changement de bail (lease-change)" + +-#: option.c:1714 ++#: option.c:1717 + msgid "recompile with HAVE_LUASCRIPT defined to enable Lua scripts" + msgstr "recompiler en définissant HAVE_LUASCRIPT pour permettre l'exécution de scripts LUA au changement de bail (lease-change)" + +-#: option.c:1970 option.c:2015 option.c:2071 ++#: option.c:1973 option.c:2018 option.c:2074 + msgid "bad prefix" + msgstr "mauvais préfixe" + +-#: option.c:2352 ++#: option.c:2355 + msgid "recompile with HAVE_IPSET defined to enable ipset directives" + msgstr "recompiler en définissant HAVE_IPSET pour permettre l'utilisation de directives de groupes d'IP (IPset)" + + # +-#: option.c:2545 ++#: option.c:2548 + msgid "bad port range" + msgstr "gamme de ports incorrecte" + +-#: option.c:2561 ++#: option.c:2564 + msgid "bad bridge-interface" + msgstr "interface-pont incorrecte" + +-#: option.c:2621 ++#: option.c:2624 + msgid "only one tag allowed" + msgstr "une seule étiquette est autorisée" + +-#: option.c:2641 option.c:2653 option.c:2759 option.c:2800 ++#: option.c:2644 option.c:2656 option.c:2764 option.c:2805 + msgid "bad dhcp-range" + msgstr "plage d'adresses DHCP (dhcp-range) incorrecte" + +-#: option.c:2668 ++#: option.c:2671 + msgid "inconsistent DHCP range" + msgstr "plage d'adresses DHCP incohérente" + +-#: option.c:2727 ++#: option.c:2732 + msgid "prefix length must be exactly 64 for RA subnets" + msgstr "la taille du préfixe doit être exactement 64 pour les sous-réseaux d'annonces de routeurs (RA)" + +-#: option.c:2729 ++#: option.c:2734 + msgid "prefix length must be exactly 64 for subnet constructors" + msgstr "la taille du préfixe doit être exactement 64 pour le constructeur de sous-réseaux" + +-#: option.c:2733 ++#: option.c:2738 + msgid "prefix length must be at least 64" + msgstr "la taille de préfixe doit être au minimum 64" + +-#: option.c:2736 ++#: option.c:2741 + msgid "inconsistent DHCPv6 range" + msgstr "plage d'adresses DHCPv6 incohérente" + +-#: option.c:2747 ++#: option.c:2752 + msgid "prefix must be zero with \"constructor:\" argument" + msgstr "le préfixe doit avoir une taille de 0 lorsque l'argument \"constructor:\" est utilisé" + +-#: option.c:2858 option.c:2906 ++#: option.c:2863 option.c:2911 + msgid "bad hex constant" + msgstr "mauvaise constante hexadecimale" + +-#: option.c:2880 ++#: option.c:2885 + msgid "cannot match tags in --dhcp-host" + msgstr "L'utilisation de labels est prohibée dans --dhcp-host" + +-#: option.c:2928 ++#: option.c:2933 + #, c-format + msgid "duplicate dhcp-host IP address %s" + msgstr "adresse IP dhcp-host dupliquée dans %s." + + # +-#: option.c:2986 ++#: option.c:2991 + msgid "bad DHCP host name" + msgstr "nom d'hôte DHCP incorrect" + +-#: option.c:3068 ++#: option.c:3073 + msgid "bad tag-if" + msgstr "mauvaise étiquette tag-if" + +-#: option.c:3392 option.c:3786 ++#: option.c:3397 option.c:3791 + msgid "invalid port number" + msgstr "numéro de port invalide" + + # +-#: option.c:3454 ++#: option.c:3459 + msgid "bad dhcp-proxy address" + msgstr "adresse dhcp-proxy incorrecte" + +-#: option.c:3480 ++#: option.c:3485 + msgid "Bad dhcp-relay" + msgstr "valeur incorrecte pour le relais DHCP (dhcp-relay)" + +-#: option.c:3506 ++#: option.c:3511 + msgid "bad RA-params" + msgstr "" + +-#: option.c:3515 ++#: option.c:3520 + msgid "bad DUID" + msgstr "mauvais identifiant unique DHCP (DUID)" + + # +-#: option.c:3557 ++#: option.c:3562 + msgid "invalid alias range" + msgstr "poids invalide" + +-#: option.c:3611 ++#: option.c:3616 + msgid "bad CNAME" + msgstr "mauvais CNAME" + +-#: option.c:3616 ++#: option.c:3621 + msgid "duplicate CNAME" + msgstr "ce CNAME existe déja" + + # +-#: option.c:3636 ++#: option.c:3641 + msgid "bad PTR record" + msgstr "mauvais champ PTR" + + # +-#: option.c:3667 ++#: option.c:3672 + msgid "bad NAPTR record" + msgstr "mauvais champ NAPTR" + + # +-#: option.c:3701 ++#: option.c:3706 + msgid "bad RR record" + msgstr "mauvais enregistrement RR" + +-#: option.c:3731 ++#: option.c:3736 + msgid "bad TXT record" + msgstr "champ TXT invalide" + +-#: option.c:3772 ++#: option.c:3777 + msgid "bad SRV record" + msgstr "champ SRV invalide" + +-#: option.c:3779 ++#: option.c:3784 + msgid "bad SRV target" + msgstr "cible SRV invalide" + +-#: option.c:3793 ++#: option.c:3798 + msgid "invalid priority" + msgstr "priorité invalide" + +-#: option.c:3800 ++#: option.c:3805 + msgid "invalid weight" + msgstr "poids invalide" + + # +-#: option.c:3824 ++#: option.c:3829 + msgid "Bad host-record" + msgstr "mauvais champ host-record" + +-#: option.c:3841 ++#: option.c:3846 + msgid "Bad name in host-record" + msgstr "mauvais nom dans le champ host-record" + + # +-#: option.c:3906 ++#: option.c:3911 + #, fuzzy + msgid "bad trust anchor" + msgstr "gamme de ports incorrecte" + +-#: option.c:3920 ++#: option.c:3925 + msgid "bad HEX in trust anchor" + msgstr "" + +-#: option.c:3930 ++#: option.c:3935 + #, fuzzy + msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DNSSEC/DBus support)" + msgstr "option non supportée (vérifier que Dnsmasq a été compilé avec le support DHCP/TFTP/DBus)" + +-#: option.c:3989 ++#: option.c:3994 + msgid "missing \"" + msgstr "il manque \"" + +-#: option.c:4046 ++#: option.c:4051 + msgid "bad option" + msgstr "mauvaise option" + +-#: option.c:4048 ++#: option.c:4053 + msgid "extraneous parameter" + msgstr "paramètre en trop" + +-#: option.c:4050 ++#: option.c:4055 + msgid "missing parameter" + msgstr "paramètre manquant" + +-#: option.c:4052 ++#: option.c:4057 + #, fuzzy + msgid "illegal option" + msgstr "mauvaise option" + +-#: option.c:4059 ++#: option.c:4064 + msgid "error" + msgstr "erreur" + +-#: option.c:4061 ++#: option.c:4066 + #, c-format + msgid " at line %d of %s" + msgstr "à la ligne %d de %s" + +-#: option.c:4076 option.c:4323 option.c:4359 ++#: option.c:4081 option.c:4328 option.c:4364 + #, c-format + msgid "read %s" + msgstr "Lecture de %s" + +-#: option.c:4139 option.c:4262 tftp.c:667 ++#: option.c:4144 option.c:4267 tftp.c:667 + #, c-format + msgid "cannot read %s: %s" + msgstr "Ne peut pas lire %s : %s" + +-#: option.c:4425 ++#: option.c:4430 + msgid "junk found in command line" + msgstr "la ligne de commande contient des éléments indésirables ou incompréhensibles" + +-#: option.c:4460 ++#: option.c:4465 + #, c-format + msgid "Dnsmasq version %s %s\n" + msgstr "Version de Dnsmasq %s %s\n" + +-#: option.c:4461 ++#: option.c:4466 + #, c-format + msgid "" + "Compile time options: %s\n" +@@ -1079,62 +1083,62 @@ msgstr "" + "Options à la compilation %s\n" + "\n" + +-#: option.c:4462 ++#: option.c:4467 + #, c-format + msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" + msgstr "Ce logiciel est fourni sans AUCUNE GARANTIE.\n" + +-#: option.c:4463 ++#: option.c:4468 + #, c-format + msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" + msgstr "Dnsmasq est un logiciel libre, il vous est permis de le redistribuer\n" + +-#: option.c:4464 ++#: option.c:4469 + #, c-format + msgid "under the terms of the GNU General Public License, version 2 or 3.\n" + msgstr "sous les termes de la licence GPL (GNU General Public License), version 2 ou 3.\n" + +-#: option.c:4475 ++#: option.c:4480 + msgid "try --help" + msgstr "essayez avec --help" + +-#: option.c:4477 ++#: option.c:4482 + msgid "try -w" + msgstr "essayez avec -w" + +-#: option.c:4479 ++#: option.c:4484 + #, c-format + msgid "bad command line options: %s" + msgstr "mauvaises options en ligne de commande : %s." + +-#: option.c:4535 ++#: option.c:4544 + #, c-format + msgid "cannot get host-name: %s" + msgstr "ne peut pas obtenir le nom de la machine : %s" + +-#: option.c:4563 ++#: option.c:4572 + msgid "only one resolv.conf file allowed in no-poll mode." + msgstr "seul un fichier resolv.conf est autorisé dans le mode no-poll" + +-#: option.c:4573 ++#: option.c:4582 + msgid "must have exactly one resolv.conf to read domain from." + msgstr "un fichier resolv.conf (et un seul) est nécessaire pour y récuperer le nom de domaine." + +-#: option.c:4576 network.c:1506 dhcp.c:774 ++#: option.c:4585 network.c:1507 dhcp.c:777 + #, c-format + msgid "failed to read %s: %s" + msgstr "impossible de lire %s : %s" + +-#: option.c:4593 ++#: option.c:4602 + #, c-format + msgid "no search directive found in %s" + msgstr "pas de directive de recherche trouvée dans %s" + +-#: option.c:4614 ++#: option.c:4623 + msgid "there must be a default domain when --dhcp-fqdn is set" + msgstr "un domaine par défaut doit être spécifié lorsque l'option --dhcp-fqdn est utilisée" + +-#: option.c:4623 ++#: option.c:4632 + msgid "syntax check OK" + msgstr "vérification de syntaxe OK" + +@@ -1143,25 +1147,25 @@ msgstr "v + msgid "failed to send packet: %s" + msgstr "impossible d'envoyer le paquet : %s" + +-#: forward.c:572 ++#: forward.c:591 + msgid "discarding DNS reply: subnet option mismatch" + msgstr "" + +-#: forward.c:595 ++#: forward.c:614 + #, c-format + msgid "nameserver %s refused to do a recursive query" + msgstr "le serveur de nom %s a refusé de faire une recherche récursive" + +-#: forward.c:627 ++#: forward.c:646 + #, c-format + msgid "possible DNS-rebind attack detected: %s" + msgstr "détection d'une possible attaque de type DNS-rebind: %s" + +-#: forward.c:1156 forward.c:1722 ++#: forward.c:1209 forward.c:1785 + msgid "Ignoring query from non-local network" + msgstr "" + +-#: forward.c:2178 ++#: forward.c:2256 + #, c-format + msgid "Maximum number of concurrent DNS queries reached (max: %d)" + msgstr "Nombre maximum de requêtes DNS concurrentes atteint (maximum : %d)." +@@ -1195,342 +1199,352 @@ msgstr "impossible de faire rejoindre l'interface %s dans le groupe multicast DH + msgid "failed to bind server socket for %s: %s" + msgstr "impossible de lier la socket de serveur pour %s : %s" + +-#: network.c:1444 ++#: network.c:1445 + #, c-format + msgid "ignoring nameserver %s - local interface" + msgstr "ignore le serveur de nom %s - interface locale" + +-#: network.c:1455 ++#: network.c:1456 + #, c-format + msgid "ignoring nameserver %s - cannot make/bind socket: %s" + msgstr "ignore le serveur de nom %s - ne peut construire/lier la socket : %m" + +-#: network.c:1468 ++#: network.c:1469 + msgid "unqualified" + msgstr "non-qualifié(e)" + +-#: network.c:1468 ++#: network.c:1469 + msgid "names" + msgstr "noms" + +-#: network.c:1470 ++#: network.c:1471 + msgid "default" + msgstr "défaut" + +-#: network.c:1472 ++#: network.c:1473 + msgid "domain" + msgstr "domaine" + +-#: network.c:1475 ++#: network.c:1476 + #, c-format + msgid "using local addresses only for %s %s" + msgstr "utilise les adresses locales seulement pour %s %s" + +-#: network.c:1477 ++#: network.c:1478 + #, c-format + msgid "using standard nameservers for %s %s" + msgstr "utilisation des serveurs de nom standards pour %s %s" + +-#: network.c:1479 ++#: network.c:1480 + #, c-format + msgid "using nameserver %s#%d for %s %s" + msgstr "utilise le serveur de nom %s#%d pour %s %s" + +-#: network.c:1483 ++#: network.c:1484 + #, fuzzy, c-format + msgid "NOT using nameserver %s#%d - query loop detected" + msgstr "utilise le serveur de nom %s#%d pour %s %s" + +-#: network.c:1486 ++#: network.c:1487 + #, c-format + msgid "using nameserver %s#%d(via %s)" + msgstr "utilise le serveur de nom %s#%d (via %s)" + +-#: network.c:1488 ++#: network.c:1489 + #, c-format + msgid "using nameserver %s#%d" + msgstr "utilise le serveur de nom %s#%d" + +-#: dnsmasq.c:149 ++#: dnsmasq.c:163 + msgid "dhcp-hostsdir, dhcp-optsdir and hostsdir are not supported on this platform" + msgstr "" + +-#: dnsmasq.c:156 ++#: dnsmasq.c:170 + msgid "no trust anchors provided for DNSSEC" + msgstr "" + +-#: dnsmasq.c:159 ++#: dnsmasq.c:173 + msgid "cannot reduce cache size from default when DNSSEC enabled" + msgstr "" + +-#: dnsmasq.c:161 ++#: dnsmasq.c:175 + #, fuzzy + msgid "DNSSEC not available: set HAVE_DNSSEC in src/config.h" + msgstr "DBus n'est pas disponible : activez HAVE_DBUS dans src/config.h" + + # +-#: dnsmasq.c:167 ++#: dnsmasq.c:181 + msgid "TFTP server not available: set HAVE_TFTP in src/config.h" + msgstr "TFTP n'est pas disponible : activez HAVE_TFTP dans src/config.h" + +-#: dnsmasq.c:172 ++#: dnsmasq.c:186 + #, fuzzy + msgid "cannot use --conntrack AND --query-port" + msgstr "impossible d'utiliser conjointement --conntrack et --query-port" + + # +-#: dnsmasq.c:175 ++#: dnsmasq.c:189 + #, fuzzy + msgid "conntrack support not available: set HAVE_CONNTRACK in src/config.h" + msgstr "Support de suivi de connexion non disponible : activez HAVE_CONNTRACK dans src/config.h" + +-#: dnsmasq.c:180 ++#: dnsmasq.c:194 + msgid "asychronous logging is not available under Solaris" + msgstr "l'écriture de traces en mode asynchrone n'est pas disponible sous Solaris." + +-#: dnsmasq.c:185 ++#: dnsmasq.c:199 + msgid "asychronous logging is not available under Android" + msgstr "l'écriture de traces en mode asynchrone n'est pas disponible sous Android." + +-#: dnsmasq.c:190 ++#: dnsmasq.c:204 + msgid "authoritative DNS not available: set HAVE_AUTH in src/config.h" + msgstr "le mode « autorité DNS » n'est pas disponible : activez HAVE_AUTH dans src/config.h" + + # +-#: dnsmasq.c:195 ++#: dnsmasq.c:209 + #, fuzzy + msgid "loop detection not available: set HAVE_LOOP in src/config.h" + msgstr "TFTP n'est pas disponible : activez HAVE_TFTP dans src/config.h" + +-#: dnsmasq.c:203 ++#: dnsmasq.c:217 + msgid "zone serial must be configured in --auth-soa" + msgstr "le numéro de série de la zone doit être configuré dans --auth-soa" + +-#: dnsmasq.c:221 ++#: dnsmasq.c:235 + msgid "dhcp-range constructor not available on this platform" + msgstr "le constructeur de plage dhcp n'est pas disponible sur cette plate-forme" + +-#: dnsmasq.c:264 ++#: dnsmasq.c:278 + msgid "cannot set --bind-interfaces and --bind-dynamic" + msgstr "--bind-interfaces et --bind-dynamic sont mutuellement exclusives" + +-#: dnsmasq.c:267 ++#: dnsmasq.c:281 + #, c-format + msgid "failed to find list of interfaces: %s" + msgstr "impossible de trouver la liste des interfaces : %s" + +-#: dnsmasq.c:276 ++#: dnsmasq.c:290 + #, c-format + msgid "unknown interface %s" + msgstr "interface %s inconnue" + +-#: dnsmasq.c:340 dnsmasq.c:1004 ++#: dnsmasq.c:354 dnsmasq.c:1037 + #, c-format + msgid "DBus error: %s" + msgstr "Erreur DBus : %s" + +-#: dnsmasq.c:343 ++#: dnsmasq.c:357 + msgid "DBus not available: set HAVE_DBUS in src/config.h" + msgstr "DBus n'est pas disponible : activez HAVE_DBUS dans src/config.h" + +-#: dnsmasq.c:371 ++#: dnsmasq.c:385 + #, c-format + msgid "unknown user or group: %s" + msgstr "utilisateur ou groupe inconnu : %s" + +-#: dnsmasq.c:426 ++#: dnsmasq.c:440 + #, c-format + msgid "cannot chdir to filesystem root: %s" + msgstr "Ne peut effectuer un 'chdir' à la racine du système de fichier : %s" + +-#: dnsmasq.c:667 ++#: dnsmasq.c:692 + #, c-format + msgid "started, version %s DNS disabled" + msgstr "démarrage avec le DNS désactivé (version %s)" + +-#: dnsmasq.c:669 ++#: dnsmasq.c:694 + #, c-format + msgid "started, version %s cachesize %d" + msgstr "demarré, version %s (taille de cache %d)" + +-#: dnsmasq.c:671 ++#: dnsmasq.c:696 + #, c-format + msgid "started, version %s cache disabled" + msgstr "démarrage avec le cache désactivé (version %s)" + +-#: dnsmasq.c:673 ++#: dnsmasq.c:698 + #, c-format + msgid "compile time options: %s" + msgstr "options à la compilation : %s" + +-#: dnsmasq.c:679 ++#: dnsmasq.c:704 + msgid "DBus support enabled: connected to system bus" + msgstr "Support DBus autorisé : connecté au bus système" + +-#: dnsmasq.c:681 ++#: dnsmasq.c:706 + msgid "DBus support enabled: bus connection pending" + msgstr "Support DBus autorisé : connexion au bus en attente" + +-#: dnsmasq.c:686 ++#: dnsmasq.c:711 + msgid "DNS service limited to local subnets" + msgstr "" + +-#: dnsmasq.c:702 ++#: dnsmasq.c:727 + msgid "DNSSEC validation enabled" + msgstr "" + +-#: dnsmasq.c:705 ++#: dnsmasq.c:730 + msgid "DNSSEC signature timestamps not checked until first cache reload" + msgstr "" + +-#: dnsmasq.c:708 ++#: dnsmasq.c:733 + msgid "DNSSEC signature timestamps not checked until system time valid" + msgstr "" + +-#: dnsmasq.c:713 ++#: dnsmasq.c:738 + #, c-format + msgid "warning: failed to change owner of %s: %s" + msgstr "Impossible de changer pour l'utilisateur %s : %s" + +-#: dnsmasq.c:717 ++#: dnsmasq.c:742 + msgid "setting --bind-interfaces option because of OS limitations" + msgstr "active l'option --bind-interfaces à cause de limitations dans le système d'exploitation" + +-#: dnsmasq.c:727 ++#: dnsmasq.c:752 + #, c-format + msgid "warning: interface %s does not currently exist" + msgstr "attention : l'interface %s n'existe pas actuellement" + +-#: dnsmasq.c:732 ++#: dnsmasq.c:757 + msgid "warning: ignoring resolv-file flag because no-resolv is set" + msgstr "attention : l'option « resolv-file » sera ignorée car « no-resolv » a été spécifié" + + # +-#: dnsmasq.c:735 ++#: dnsmasq.c:760 + msgid "warning: no upstream servers configured" + msgstr "attention : aucun serveur amont n'est configuré" + +-#: dnsmasq.c:739 ++#: dnsmasq.c:764 + #, c-format + msgid "asynchronous logging enabled, queue limit is %d messages" + msgstr "mode asynchrone d'écriture de traces, la taille maximum de la queue est de %d messages." + +-#: dnsmasq.c:760 ++#: dnsmasq.c:785 + msgid "IPv6 router advertisement enabled" + msgstr "annonces de routeur IPv6 activées" + +-#: dnsmasq.c:765 ++#: dnsmasq.c:790 + #, c-format + msgid "DHCP, sockets bound exclusively to interface %s" + msgstr "" + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "root is " + msgstr "root est" + + # +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "enabled" + msgstr "activé" + +-#: dnsmasq.c:784 ++#: dnsmasq.c:810 + msgid "secure mode" + msgstr "mode sécurisé" + +-#: dnsmasq.c:810 ++#: dnsmasq.c:813 ++#, c-format ++msgid "warning: %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:817 ++#, fuzzy, c-format ++msgid "warning: TFTP directory %s inaccessible" ++msgstr "répertoire TFTP %s inaccessible : %s" ++ ++#: dnsmasq.c:843 + #, c-format + msgid "restricting maximum simultaneous TFTP transfers to %d" + msgstr "le nombre maximum de transferts TFTP simultanés sera restreint à %d" + +-#: dnsmasq.c:1006 ++#: dnsmasq.c:1039 + msgid "connected to system DBus" + msgstr "connecté au systeme DBus" + +-#: dnsmasq.c:1156 ++#: dnsmasq.c:1189 + #, c-format + msgid "cannot fork into background: %s" + msgstr "Ne peut se lancer en tâche de fond : %s" + +-#: dnsmasq.c:1159 ++#: dnsmasq.c:1192 + #, c-format + msgid "failed to create helper: %s" + msgstr "impossible de créer le 'helper' : %s" + +-#: dnsmasq.c:1162 ++#: dnsmasq.c:1195 + #, c-format + msgid "setting capabilities failed: %s" + msgstr "impossible de configurer la capacité %s" + +-#: dnsmasq.c:1165 ++#: dnsmasq.c:1198 + #, c-format + msgid "failed to change user-id to %s: %s" + msgstr "Impossible de changer l'identifiant utilisateur pour %s : %s" + +-#: dnsmasq.c:1168 ++#: dnsmasq.c:1201 + #, c-format + msgid "failed to change group-id to %s: %s" + msgstr "Impossible de changer l'identifiant de groupe pour %s : %s" + +-#: dnsmasq.c:1171 ++#: dnsmasq.c:1204 + #, c-format + msgid "failed to open pidfile %s: %s" + msgstr "impossible de lire le fichier de PID %s : %s" + +-#: dnsmasq.c:1174 ++#: dnsmasq.c:1207 + #, c-format + msgid "cannot open log %s: %s" + msgstr "Ne peut ouvrir le fichier de log %s : %s" + + # +-#: dnsmasq.c:1177 ++#: dnsmasq.c:1210 + #, c-format + msgid "failed to load Lua script: %s" + msgstr "impossible de charger le script Lua : %s" + +-#: dnsmasq.c:1180 ++#: dnsmasq.c:1213 + #, c-format + msgid "TFTP directory %s inaccessible: %s" + msgstr "répertoire TFTP %s inaccessible : %s" + +-#: dnsmasq.c:1183 ++#: dnsmasq.c:1216 + #, fuzzy, c-format + msgid "cannot create timestamp file %s: %s" + msgstr "ne peut ouvrir ou créer le fichiers de baux %s : %s" + +-#: dnsmasq.c:1204 ++#: dnsmasq.c:1237 + msgid "now checking DNSSEC signature timestamps" + msgstr "" + +-#: dnsmasq.c:1271 ++#: dnsmasq.c:1304 + #, c-format + msgid "script process killed by signal %d" + msgstr "Le script a été terminé par le signal %d" + +-#: dnsmasq.c:1275 ++#: dnsmasq.c:1308 + #, c-format + msgid "script process exited with status %d" + msgstr "Le script s'est terminé avec le statut %d" + +-#: dnsmasq.c:1279 ++#: dnsmasq.c:1312 + #, c-format + msgid "failed to execute %s: %s" + msgstr "impossible d'exécuter à %s : %s" + +-#: dnsmasq.c:1334 ++#: dnsmasq.c:1367 + msgid "exiting on receipt of SIGTERM" + msgstr "sortie sur réception du signal SIGTERM" + +-#: dnsmasq.c:1362 ++#: dnsmasq.c:1395 + #, c-format + msgid "failed to access %s: %s" + msgstr "impossible d'accéder à %s : %s" + +-#: dnsmasq.c:1392 ++#: dnsmasq.c:1425 + #, c-format + msgid "reading %s" + msgstr "Lecture de %s" + +-#: dnsmasq.c:1403 ++#: dnsmasq.c:1436 + #, c-format + msgid "no servers found in %s, will retry" + msgstr "aucun serveur trouvé dans %s, va réessayer" +@@ -1560,37 +1574,37 @@ msgstr "impossible de lier la socket serveur DHCP : %s" + msgid "cannot create ICMP raw socket: %s." + msgstr "ne peut créer de socket en mode raw pour ICMP : %s." + +-#: dhcp.c:239 ++#: dhcp.c:241 dhcp6.c:180 + #, c-format + msgid "unknown interface %s in bridge-interface" + msgstr "interface %s inconnue spécifiée comme interface de pont" + +-#: dhcp.c:278 ++#: dhcp.c:281 + #, c-format + msgid "DHCP packet received on %s which has no address" + msgstr "Paquet DHCP reçu sur %s qui n'a pas d'adresse" + +-#: dhcp.c:412 ++#: dhcp.c:415 + #, c-format + msgid "ARP-cache injection failed: %s" + msgstr "" + +-#: dhcp.c:511 ++#: dhcp.c:514 + #, c-format + msgid "DHCP range %s -- %s is not consistent with netmask %s" + msgstr "La plage d'adresses DHCP %s -- %s n'est pas cohérente avec le masque de réseau %s" + +-#: dhcp.c:812 ++#: dhcp.c:815 + #, c-format + msgid "bad line at %s line %d" + msgstr "mauvaise ligne dans %s ligne %d" + +-#: dhcp.c:855 ++#: dhcp.c:858 + #, c-format + msgid "ignoring %s line %d, duplicate name or IP address" + msgstr "ignore %s à la ligne %d : duplication de nom ou d'adresse IP" + +-#: dhcp.c:999 rfc3315.c:2139 ++#: dhcp.c:1002 rfc3315.c:2135 + #, c-format + msgid "DHCP relay %s -> %s" + msgstr "Relais DHCP %s -> %s" +@@ -1624,169 +1638,169 @@ msgstr "impossible de lire %s : %s (prochain essai dans %us)" + msgid "Ignoring domain %s for DHCP host name %s" + msgstr "Le domaine %s est ignoré pour l'hôte DHCP %s" + +-#: rfc2131.c:342 ++#: rfc2131.c:344 + #, c-format + msgid "no address range available for DHCP request %s %s" + msgstr "pas de plage d'adresse disponible pour la requête DHCP %s %s" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "with subnet selector" + msgstr "avec sélecteur de sous-reseau" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "via" + msgstr "par l'intermédiaire de" + +-#: rfc2131.c:355 ++#: rfc2131.c:357 + #, c-format + msgid "%u available DHCP subnet: %s/%s" + msgstr "%u sous-réseaux DHCP disponibles : %s/%s" + +-#: rfc2131.c:358 rfc3315.c:300 ++#: rfc2131.c:360 rfc3315.c:300 + #, c-format + msgid "%u available DHCP range: %s -- %s" + msgstr "%u la gamme DHCP disponible est : %s -- %s" + +-#: rfc2131.c:469 ++#: rfc2131.c:471 + #, c-format + msgid "%u vendor class: %s" + msgstr "%u Classe de vendeur ('Vendor Class') : %s" + +-#: rfc2131.c:471 ++#: rfc2131.c:473 + #, c-format + msgid "%u user class: %s" + msgstr "%u Classe d'utilisateur : %s" + +-#: rfc2131.c:498 ++#: rfc2131.c:500 + msgid "disabled" + msgstr "désactivé" + +-#: rfc2131.c:539 rfc2131.c:967 rfc2131.c:1385 rfc3315.c:603 rfc3315.c:860 +-#: rfc3315.c:1139 ++#: rfc2131.c:541 rfc2131.c:974 rfc2131.c:1380 rfc3315.c:603 rfc3315.c:856 ++#: rfc3315.c:1135 + msgid "ignored" + msgstr "ignoré" + +-#: rfc2131.c:554 rfc2131.c:1205 rfc3315.c:910 ++#: rfc2131.c:556 rfc2131.c:1207 rfc3315.c:906 + msgid "address in use" + msgstr "adresse déjà utilisée" + +-#: rfc2131.c:568 rfc2131.c:1021 ++#: rfc2131.c:570 rfc2131.c:1028 + msgid "no address available" + msgstr "pas d'adresse disponible" + +-#: rfc2131.c:575 rfc2131.c:1168 ++#: rfc2131.c:577 rfc2131.c:1170 + msgid "wrong network" + msgstr "mauvais réseau" + +-#: rfc2131.c:590 ++#: rfc2131.c:592 + msgid "no address configured" + msgstr "pas d'adresse configurée" + +-#: rfc2131.c:596 rfc2131.c:1218 ++#: rfc2131.c:598 rfc2131.c:1220 + msgid "no leases left" + msgstr "plus aucun bail disponible" + +-#: rfc2131.c:691 rfc3315.c:476 ++#: rfc2131.c:693 rfc3315.c:476 + #, c-format + msgid "%u client provides name: %s" + msgstr "le client %u fourni le nom : %s" + +-#: rfc2131.c:796 ++#: rfc2131.c:798 + msgid "PXE BIS not supported" + msgstr "Service PXE BIS (Boot Integrity Services) non supporté" + +-#: rfc2131.c:935 rfc3315.c:1233 ++#: rfc2131.c:942 rfc3315.c:1229 + #, c-format + msgid "disabling DHCP static address %s for %s" + msgstr "désactive l'adresse statique DHCP %s pour %s" + +-#: rfc2131.c:956 ++#: rfc2131.c:963 + msgid "unknown lease" + msgstr "bail inconnu" + +-#: rfc2131.c:990 ++#: rfc2131.c:997 + #, c-format + msgid "not using configured address %s because it is leased to %s" + msgstr "L'adresse statique %s ne sera pas utilisée car un bail est déjà attribué à %s" + +-#: rfc2131.c:1000 ++#: rfc2131.c:1007 + #, c-format + msgid "not using configured address %s because it is in use by the server or relay" + msgstr "L'adresse statique %s ne sera pas utilisée car elle est utilisée par le serveur ou un relai" + +-#: rfc2131.c:1003 ++#: rfc2131.c:1010 + #, c-format + msgid "not using configured address %s because it was previously declined" + msgstr "L'adresse statique %s ne sera pas utilisée car elle a préalablement été refusée" + +-#: rfc2131.c:1019 rfc2131.c:1211 ++#: rfc2131.c:1026 rfc2131.c:1213 + msgid "no unique-id" + msgstr "pas d'identifiant unique" + +-#: rfc2131.c:1106 ++#: rfc2131.c:1108 + msgid "wrong server-ID" + msgstr "mauvais identifiant de serveur" + +-#: rfc2131.c:1125 ++#: rfc2131.c:1127 + msgid "wrong address" + msgstr "mauvaise adresse" + +-#: rfc2131.c:1143 rfc3315.c:1006 ++#: rfc2131.c:1145 rfc3315.c:1002 + msgid "lease not found" + msgstr "bail non trouvé" + +-#: rfc2131.c:1176 ++#: rfc2131.c:1178 + msgid "address not available" + msgstr "adresse non disponible" + +-#: rfc2131.c:1187 ++#: rfc2131.c:1189 + msgid "static lease available" + msgstr "bail statique disponible" + +-#: rfc2131.c:1191 ++#: rfc2131.c:1193 + msgid "address reserved" + msgstr "adresse reservée" + +-#: rfc2131.c:1199 ++#: rfc2131.c:1201 + #, c-format + msgid "abandoning lease to %s of %s" + msgstr "abandon du bail de %s pour %s" + +-#: rfc2131.c:1712 ++#: rfc2131.c:1707 + #, c-format + msgid "%u bootfile name: %s" + msgstr "%u nom de fichier 'bootfile' : %s" + +-#: rfc2131.c:1721 ++#: rfc2131.c:1716 + #, c-format + msgid "%u server name: %s" + msgstr "%u nom du serveur : %s" + +-#: rfc2131.c:1729 ++#: rfc2131.c:1724 + #, c-format + msgid "%u next server: %s" + msgstr "%u serveur suivant : %s" + +-#: rfc2131.c:1732 ++#: rfc2131.c:1727 + #, c-format + msgid "%u broadcast response" + msgstr "%u réponse broadcast" + +-#: rfc2131.c:1795 ++#: rfc2131.c:1790 + #, c-format + msgid "cannot send DHCP/BOOTP option %d: no space left in packet" + msgstr "Impossible d'envoyer l'option DHCP/BOOTP %d : pas assez d'espace dans le paquet" + +-#: rfc2131.c:2036 ++#: rfc2131.c:2031 + msgid "PXE menu too large" + msgstr "menu PXE trop grand" + +-#: rfc2131.c:2173 rfc3315.c:1506 ++#: rfc2131.c:2170 rfc3315.c:1502 + #, c-format + msgid "%u requested options: %s" + msgstr "%u options demandées : %s" + +-#: rfc2131.c:2453 ++#: rfc2131.c:2487 + #, c-format + msgid "cannot send RFC3925 option: too many options for enterprise number %d" + msgstr "ne peux envoyer l'option RFC3925 : trop d'options pour le numéro d'entreprise %d" +@@ -1801,15 +1815,25 @@ msgstr "ne peux lier une socket netlink : %s" + msgid "netlink returns error: %s" + msgstr "Erreur netlink : %s" + +-#: dbus.c:171 ++#: dbus.c:186 + msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" + msgstr "tentative de lier une adresse serveur IPV6 via DBus - pas de support IPV6" + +-#: dbus.c:500 ++#: dbus.c:439 ++#, c-format ++msgid "Enabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:444 ++#, c-format ++msgid "Disabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:691 + msgid "setting upstream servers from DBus" + msgstr "configuration des serveurs amonts à partir de DBus" + +-#: dbus.c:547 ++#: dbus.c:738 + msgid "could not register a DBus message handler" + msgstr "ne peut enregistrer une routine de traitement des messages DBus" + +@@ -1929,47 +1953,47 @@ msgstr "%u MAC adresse du client : %s" + msgid "unknown prefix-class %d" + msgstr "préfixe de classe inconnu %d" + +-#: rfc3315.c:803 rfc3315.c:902 ++#: rfc3315.c:803 rfc3315.c:898 + msgid "address unavailable" + msgstr "adresse non disponible" + +-#: rfc3315.c:815 rfc3315.c:950 rfc3315.c:1283 ++#: rfc3315.c:815 rfc3315.c:946 rfc3315.c:1279 + msgid "success" + msgstr "réussi" + +-#: rfc3315.c:843 rfc3315.c:845 rfc3315.c:958 rfc3315.c:960 ++#: rfc3315.c:830 rfc3315.c:839 rfc3315.c:954 rfc3315.c:956 + msgid "no addresses available" + msgstr "pas d'adresse disponible" + +-#: rfc3315.c:937 ++#: rfc3315.c:933 + msgid "not on link" + msgstr "pas sur ce lien" + +-#: rfc3315.c:1010 rfc3315.c:1195 rfc3315.c:1272 ++#: rfc3315.c:1006 rfc3315.c:1191 rfc3315.c:1268 + msgid "no binding found" + msgstr "aucune liaison trouvée" + +-#: rfc3315.c:1048 ++#: rfc3315.c:1044 + msgid "deprecated" + msgstr "obsolète" + +-#: rfc3315.c:1053 ++#: rfc3315.c:1049 + msgid "address invalid" + msgstr "adresse non valide" + +-#: rfc3315.c:1100 ++#: rfc3315.c:1096 + msgid "confirm failed" + msgstr "confirmation d'échec" + +-#: rfc3315.c:1116 ++#: rfc3315.c:1112 + msgid "all addresses still on link" + msgstr "toutes les adresses sont toujours sur le lien" + +-#: rfc3315.c:1204 ++#: rfc3315.c:1200 + msgid "release received" + msgstr "libération reçue" + +-#: rfc3315.c:2130 ++#: rfc3315.c:2126 + msgid "Cannot multicast to DHCPv6 server without correct interface" + msgstr "Impossible de faire du multicast au server DHCPv6 sans interface valide" + +@@ -2057,12 +2081,12 @@ msgstr "Relais DHCP de %s + msgid "DHCP relay from %s to %s" + msgstr "Relais DHCP de %s à %s" + +-#: radv.c:98 ++#: radv.c:109 + #, c-format + msgid "cannot create ICMPv6 socket: %s" + msgstr "ne peut créer la socket ICMPv6: %s" + +-#: auth.c:436 ++#: auth.c:448 + #, c-format + msgid "ignoring zone transfer request from %s" + msgstr "la requête de transfert de zone en provenance de %s est ignorée" +@@ -2077,7 +2101,7 @@ msgstr "impossible de trouver la version de noyau : %s" + msgid "failed to create IPset control socket: %s" + msgstr "impossible de créer une socket de contrôle IPset : %s" + +-#: dnssec.c:425 dnssec.c:469 ++#: dnssec.c:449 dnssec.c:493 + #, fuzzy, c-format + msgid "failed to update mtime on %s: %s" + msgstr "impossible de lire le fichier de PID %s : %s" +diff --git a/po/id.po b/po/id.po +index a0ff0f062e8b..5414414756b6 100644 +--- a/po/id.po ++++ b/po/id.po +@@ -26,19 +26,19 @@ msgid "failed to load names from %s: %s" + msgstr "gagal memuat nama-nama dari %s: %s" + + # OK +-#: cache.c:967 dhcp.c:825 ++#: cache.c:967 dhcp.c:828 + #, fuzzy, c-format + msgid "bad address at %s line %d" + msgstr "kesalahan nama pada %s baris %d" + + # OK +-#: cache.c:1018 dhcp.c:841 ++#: cache.c:1018 dhcp.c:844 + #, c-format + msgid "bad name at %s line %d" + msgstr "kesalahan nama pada %s baris %d" + + # OK +-#: cache.c:1027 dhcp.c:916 ++#: cache.c:1027 dhcp.c:919 + #, c-format + msgid "read %s - %d addresses" + msgstr "membaca %s - %d alamat" +@@ -103,737 +103,741 @@ msgid "failed to allocate memory" + msgstr "gagal memuat %S: %m" + + # OK +-#: util.c:243 option.c:598 ++#: util.c:250 option.c:601 + msgid "could not get memory" + msgstr "tidak bisa mendapatkan memory" + + # OK +-#: util.c:253 ++#: util.c:260 + #, fuzzy, c-format + msgid "cannot create pipe: %s" + msgstr "tidak bisa membaca %s: %s" + + # OK +-#: util.c:261 ++#: util.c:268 + #, fuzzy, c-format + msgid "failed to allocate %d bytes" + msgstr "gagal memuat %S: %m" + + # OK +-#: util.c:430 ++#: util.c:437 + #, c-format + msgid "infinite" + msgstr "tak terbatas" + + # OK +-#: option.c:330 ++#: option.c:332 + msgid "Specify local address(es) to listen on." + msgstr "Tentukan alamat lokal untuk mendengarkan." + + # OK +-#: option.c:331 ++#: option.c:333 + msgid "Return ipaddr for all hosts in specified domains." + msgstr "Menghasilkan ipaddr untuk semua host dalam domain yang dipilih." + + # OK +-#: option.c:332 ++#: option.c:334 + msgid "Fake reverse lookups for RFC1918 private address ranges." + msgstr "Fake pencarian balik untuk alamat private sesuai dengan RFC1918." + + # OK +-#: option.c:333 ++#: option.c:335 + msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." + msgstr "Perlakukan ipaddr sebagai NXDOMAIN (mengalahkan wildcard Verisign)." + + # OK +-#: option.c:334 ++#: option.c:336 + #, c-format + msgid "Specify the size of the cache in entries (defaults to %s)." + msgstr "Tentukan ukuran cache, dalam jumlah isian (default %s)." + + # OK +-#: option.c:335 ++#: option.c:337 + #, c-format + msgid "Specify configuration file (defaults to %s)." + msgstr "Tentukan file konfigurasi (default %s)." + + # OK +-#: option.c:336 ++#: option.c:338 + msgid "Do NOT fork into the background: run in debug mode." + msgstr "JANGAN berjalan di background: berjalan dalam modus debug." + + # OK +-#: option.c:337 ++#: option.c:339 + msgid "Do NOT forward queries with no domain part." + msgstr "JANGAN teruskan permintaan tanpa bagian domain." + + # OK +-#: option.c:338 ++#: option.c:340 + msgid "Return self-pointing MX records for local hosts." + msgstr "Mengembalikan record MX untuk diri sendiri host-host lokal." + + # OK +-#: option.c:339 ++#: option.c:341 + msgid "Expand simple names in /etc/hosts with domain-suffix." + msgstr "Melengkapi nama-nama di /etc/hosts dengan akhiran domain." + + # OK +-#: option.c:340 ++#: option.c:342 + msgid "Don't forward spurious DNS requests from Windows hosts." + msgstr "Jangan meneruskan permintaan DNS spurious dari host-host Windows." + + # OK +-#: option.c:341 ++#: option.c:343 + msgid "Enable DHCP in the range given with lease duration." + msgstr "Bolehkan DHCP dalam jangkauan yang diberikan dengan durasi lease." + + # OK +-#: option.c:342 ++#: option.c:344 + #, c-format + msgid "Change to this group after startup (defaults to %s)." + msgstr "Ubah ke group ini setelah mulai (default %s)." + + # OK +-#: option.c:343 ++#: option.c:345 + msgid "Set address or hostname for a specified machine." + msgstr "Setel alamat atau nama host untuk mesin yang disebutkan." + + # OK +-#: option.c:344 ++#: option.c:346 + #, fuzzy + msgid "Read DHCP host specs from file." + msgstr "nama MX salah" + +-#: option.c:345 ++#: option.c:347 + msgid "Read DHCP option specs from file." + msgstr "" + + # OK +-#: option.c:346 ++#: option.c:348 + #, fuzzy + msgid "Read DHCP host specs from a directory." + msgstr "nama MX salah" + + # OK +-#: option.c:347 ++#: option.c:349 + #, fuzzy + msgid "Read DHCP options from a directory." + msgstr "nama MX salah" + +-#: option.c:348 ++#: option.c:350 + msgid "Evaluate conditional tag expression." + msgstr "" + + # OK +-#: option.c:349 ++#: option.c:351 + #, c-format + msgid "Do NOT load %s file." + msgstr "JANGAN muat file %s." + + # OK +-#: option.c:350 ++#: option.c:352 + #, c-format + msgid "Specify a hosts file to be read in addition to %s." + msgstr "Sebutkan sebuah file hosts yang harus dibaca sebagai tambahan untuk %s." + + # OK +-#: option.c:351 ++#: option.c:353 + #, fuzzy + msgid "Read hosts files from a directory." + msgstr "nama MX salah" + + # OK +-#: option.c:352 ++#: option.c:354 + msgid "Specify interface(s) to listen on." + msgstr "Sebutkan antarmuka untuk mendengarkan." + + # OK +-#: option.c:353 ++#: option.c:355 + msgid "Specify interface(s) NOT to listen on." + msgstr "Sebutkan antarmuka untuk TIDAK mendengarkan." + + # OK +-#: option.c:354 ++#: option.c:356 + #, fuzzy + msgid "Map DHCP user class to tag." + msgstr "Petakan kelas user DHCP ke setelan yang dipilih." + +-#: option.c:355 ++#: option.c:357 + msgid "Map RFC3046 circuit-id to tag." + msgstr "" + +-#: option.c:356 ++#: option.c:358 + msgid "Map RFC3046 remote-id to tag." + msgstr "" + +-#: option.c:357 ++#: option.c:359 + msgid "Map RFC3993 subscriber-id to tag." + msgstr "" + + # OK +-#: option.c:358 ++#: option.c:360 + #, fuzzy + msgid "Don't do DHCP for hosts with tag set." + msgstr "Jangan menggunakan DHCP untuk host-host yang dipilih." + + # OK +-#: option.c:359 ++#: option.c:361 + #, fuzzy + msgid "Force broadcast replies for hosts with tag set." + msgstr "Jangan menggunakan DHCP untuk host-host yang dipilih." + + # OK +-#: option.c:360 ++#: option.c:362 + msgid "Do NOT fork into the background, do NOT run in debug mode." + msgstr "JANGAN berjalan di background, jangan berjalan dalam modus debug." + + # OK +-#: option.c:361 ++#: option.c:363 + msgid "Assume we are the only DHCP server on the local network." + msgstr "Berpikir bahwa kita satu-satunya DHCP server dalam jaringan." + + # OK +-#: option.c:362 ++#: option.c:364 + #, c-format + msgid "Specify where to store DHCP leases (defaults to %s)." + msgstr "Sebutkan lokasi untuk menyimpan lease DHCP (default %s)." + + # OK +-#: option.c:363 ++#: option.c:365 + msgid "Return MX records for local hosts." + msgstr "Kembalikan rekord MX untuk host-host lokal." + + # OK +-#: option.c:364 ++#: option.c:366 + msgid "Specify an MX record." + msgstr "Sebutkan sebuah rekord MX." + + # OK +-#: option.c:365 ++#: option.c:367 + msgid "Specify BOOTP options to DHCP server." + msgstr "Sebutkan pilihan-pilihan BOOTP untuk DHCP server." + +-#: option.c:366 ++#: option.c:368 + #, c-format + msgid "Do NOT poll %s file, reload only on SIGHUP." + msgstr "Jangan kumpulkan file %s, muat kembali saat SIGHUP." + + # OK +-#: option.c:367 ++#: option.c:369 + msgid "Do NOT cache failed search results." + msgstr "JANGAN menyimpan hasil pencarian yang gagal." + + # OK +-#: option.c:368 ++#: option.c:370 + #, c-format + msgid "Use nameservers strictly in the order given in %s." + msgstr "Gunakan secara ketat namaserver yang disebutkan sesuai urutan di %s." + + # OK +-#: option.c:369 ++#: option.c:371 + #, fuzzy + msgid "Specify options to be sent to DHCP clients." + msgstr "Setel pilihan-pilihan tambahan yang akan disetel untuk klien-klien DHCP." + +-#: option.c:370 ++#: option.c:372 + msgid "DHCP option sent even if the client does not request it." + msgstr "" + + # OK +-#: option.c:371 ++#: option.c:373 + msgid "Specify port to listen for DNS requests on (defaults to 53)." + msgstr "Sebutkan port untuk mendengarkan permintaan DNS (default port 53)." + + # OK +-#: option.c:372 ++#: option.c:374 + #, c-format + msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." + msgstr "Ukuran maksimum paket UDP yang didukung untuk EDNS.0 (default %s)." + + # OK +-#: option.c:373 ++#: option.c:375 + #, fuzzy + msgid "Log DNS queries." + msgstr "Permintaan log." + + # OK +-#: option.c:374 ++#: option.c:376 + #, fuzzy + msgid "Force the originating port for upstream DNS queries." + msgstr "Paksa port asal untuk permintaan ke atas." + + # OK +-#: option.c:375 ++#: option.c:377 + msgid "Do NOT read resolv.conf." + msgstr "JANGAN baca resolv.conf." + + # OK +-#: option.c:376 ++#: option.c:378 + #, c-format + msgid "Specify path to resolv.conf (defaults to %s)." + msgstr "Sebutkan path ke resolv.conf (default %s)." + + # OK +-#: option.c:377 ++#: option.c:379 + #, fuzzy + msgid "Specify path to file with server= options" + msgstr "Sebutkan path file PID. (default %s)." + + # OK +-#: option.c:378 ++#: option.c:380 + msgid "Specify address(es) of upstream servers with optional domains." + msgstr "Sebutkan alamat-alamat server di atas, boleh dilengkapi dengan nama domain." + + # OK +-#: option.c:379 ++#: option.c:381 + #, fuzzy + msgid "Specify address of upstream servers for reverse address queries" + msgstr "Sebutkan alamat-alamat server di atas, boleh dilengkapi dengan nama domain." + + # OK +-#: option.c:380 ++#: option.c:382 + msgid "Never forward queries to specified domains." + msgstr "JANGAN pernah meneruskan permintaan ke domain yang disebutkan." + + # OK +-#: option.c:381 ++#: option.c:383 + msgid "Specify the domain to be assigned in DHCP leases." + msgstr "Sebutkan domain yang digunakan dalam lease DHCP." + + # OK +-#: option.c:382 ++#: option.c:384 + msgid "Specify default target in an MX record." + msgstr "Sebutkan tujuan default dalam rekord MX." + + # OK +-#: option.c:383 ++#: option.c:385 + msgid "Specify time-to-live in seconds for replies from /etc/hosts." + msgstr "Sebutkan time-to-live dalam detik untuk jawaban dari /etc/hosts." + + # OK +-#: option.c:384 ++#: option.c:386 + #, fuzzy + msgid "Specify time-to-live in seconds for negative caching." + msgstr "Sebutkan time-to-live dalam detik untuk jawaban dari /etc/hosts." + + # OK +-#: option.c:385 ++#: option.c:387 + #, fuzzy + msgid "Specify time-to-live in seconds for maximum TTL to send to clients." + msgstr "Sebutkan time-to-live dalam detik untuk jawaban dari /etc/hosts." + + # OK +-#: option.c:386 ++#: option.c:388 + #, fuzzy + msgid "Specify time-to-live ceiling for cache." + msgstr "Sebutkan time-to-live dalam detik untuk jawaban dari /etc/hosts." + + # OK +-#: option.c:387 ++#: option.c:389 + #, fuzzy + msgid "Specify time-to-live floor for cache." + msgstr "Sebutkan time-to-live dalam detik untuk jawaban dari /etc/hosts." + + # OK +-#: option.c:388 ++#: option.c:390 + #, c-format + msgid "Change to this user after startup. (defaults to %s)." + msgstr "Ubah ke user ini setelah mulai. (default %s)." + + # OK +-#: option.c:389 ++#: option.c:391 + #, fuzzy + msgid "Map DHCP vendor class to tag." + msgstr "Memetakan kelas vendor DHCP ke daftar pilihan." + + # OK +-#: option.c:390 ++#: option.c:392 + msgid "Display dnsmasq version and copyright information." + msgstr "Menampilkan versi dan informasi hak cipta dnsmasq." + + # OK +-#: option.c:391 ++#: option.c:393 + msgid "Translate IPv4 addresses from upstream servers." + msgstr "Terjemahkan alamat-alamat IPv4 dari server-server di atas." + + # OK +-#: option.c:392 ++#: option.c:394 + msgid "Specify a SRV record." + msgstr "Sebutkan rekord SRV." + +-#: option.c:393 ++#: option.c:395 + msgid "Display this message. Use --help dhcp for known DHCP options." + msgstr "" + + # OK +-#: option.c:394 ++#: option.c:396 + #, fuzzy, c-format + msgid "Specify path of PID file (defaults to %s)." + msgstr "Sebutkan path file PID. (default %s)." + + # OK +-#: option.c:395 ++#: option.c:397 + #, c-format + msgid "Specify maximum number of DHCP leases (defaults to %s)." + msgstr "Sebutkan jumlah maksimum lease DHCP (default %s)." + + # OK +-#: option.c:396 ++#: option.c:398 + msgid "Answer DNS queries based on the interface a query was sent to." + msgstr "Jawab permintaan DNS berdasarkan antarmuka dimana permintaan dikirimkan." + + # OK +-#: option.c:397 ++#: option.c:399 + msgid "Specify TXT DNS record." + msgstr "Sebutkan rekord TXT DNS." + + # OK +-#: option.c:398 ++#: option.c:400 + #, fuzzy + msgid "Specify PTR DNS record." + msgstr "Sebutkan rekord TXT DNS." + +-#: option.c:399 ++#: option.c:401 + msgid "Give DNS name to IPv4 address of interface." + msgstr "" + + # OK +-#: option.c:400 ++#: option.c:402 + msgid "Bind only to interfaces in use." + msgstr "Hanya kaitkan ke antarmuka yang sedang digunakan saja." + + # OK +-#: option.c:401 ++#: option.c:403 + #, c-format + msgid "Read DHCP static host information from %s." + msgstr "Baca informasi statik host DHCP dari %s." + + # OK +-#: option.c:402 ++#: option.c:404 + msgid "Enable the DBus interface for setting upstream servers, etc." + msgstr "Mungkinkan antar muka DBus untuk menyetel server-server di atas, dsb." + + # OK +-#: option.c:403 ++#: option.c:405 + msgid "Do not provide DHCP on this interface, only provide DNS." + msgstr "JANGAN menyediakan DHCP pada antarmuka ini, hanya menyediakan DNS." + + # OK +-#: option.c:404 ++#: option.c:406 + msgid "Enable dynamic address allocation for bootp." + msgstr "Mungkinkan alokasi alamat dinamis untuk bootp." + + # OK +-#: option.c:405 ++#: option.c:407 + #, fuzzy + msgid "Map MAC address (with wildcards) to option set." + msgstr "Memetakan kelas vendor DHCP ke daftar pilihan." + +-#: option.c:406 ++#: option.c:408 + msgid "Treat DHCP requests on aliases as arriving from interface." + msgstr "" + +-#: option.c:407 ++#: option.c:409 + msgid "Disable ICMP echo address checking in the DHCP server." + msgstr "" + +-#: option.c:408 ++#: option.c:410 + msgid "Shell script to run on DHCP lease creation and destruction." + msgstr "" + +-#: option.c:409 ++#: option.c:411 + msgid "Lua script to run on DHCP lease creation and destruction." + msgstr "" + +-#: option.c:410 ++#: option.c:412 + msgid "Run lease-change scripts as this user." + msgstr "" + +-#: option.c:411 ++#: option.c:413 + msgid "Read configuration from all the files in this directory." + msgstr "" + + # OK +-#: option.c:412 ++#: option.c:414 + #, fuzzy + msgid "Log to this syslog facility or file. (defaults to DAEMON)" + msgstr "Ubah ke user ini setelah mulai. (default %s)." + +-#: option.c:413 ++#: option.c:415 + msgid "Do not use leasefile." + msgstr "" + + # OK +-#: option.c:414 ++#: option.c:416 + #, fuzzy, c-format + msgid "Maximum number of concurrent DNS queries. (defaults to %s)" + msgstr "Sebutkan jumlah maksimum lease DHCP (default %s)." + +-#: option.c:415 ++#: option.c:417 + #, c-format + msgid "Clear DNS cache when reloading %s." + msgstr "" + +-#: option.c:416 ++#: option.c:418 + msgid "Ignore hostnames provided by DHCP clients." + msgstr "" + +-#: option.c:417 ++#: option.c:419 + msgid "Do NOT reuse filename and server fields for extra DHCP options." + msgstr "" + +-#: option.c:418 ++#: option.c:420 + msgid "Enable integrated read-only TFTP server." + msgstr "" + +-#: option.c:419 ++#: option.c:421 + msgid "Export files by TFTP only from the specified subtree." + msgstr "" + +-#: option.c:420 ++#: option.c:422 + msgid "Add client IP address to tftp-root." + msgstr "" + +-#: option.c:421 ++#: option.c:423 + msgid "Allow access only to files owned by the user running dnsmasq." + msgstr "" + ++#: option.c:424 ++msgid "Do not terminate the service if TFTP directories are inaccessible." ++msgstr "" ++ + # OK +-#: option.c:422 ++#: option.c:425 + #, fuzzy, c-format + msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." + msgstr "Sebutkan jumlah maksimum lease DHCP (default %s)." + +-#: option.c:423 ++#: option.c:426 + msgid "Disable the TFTP blocksize extension." + msgstr "" + +-#: option.c:424 ++#: option.c:427 + msgid "Convert TFTP filenames to lowercase" + msgstr "" + +-#: option.c:425 ++#: option.c:428 + msgid "Ephemeral port range for use by TFTP transfers." + msgstr "" + +-#: option.c:426 ++#: option.c:429 + msgid "Extra logging for DHCP." + msgstr "" + +-#: option.c:427 ++#: option.c:430 + msgid "Enable async. logging; optionally set queue length." + msgstr "" + +-#: option.c:428 ++#: option.c:431 + msgid "Stop DNS rebinding. Filter private IP ranges when resolving." + msgstr "" + +-#: option.c:429 ++#: option.c:432 + msgid "Allow rebinding of 127.0.0.0/8, for RBL servers." + msgstr "" + +-#: option.c:430 ++#: option.c:433 + msgid "Inhibit DNS-rebind protection on this domain." + msgstr "" + +-#: option.c:431 ++#: option.c:434 + msgid "Always perform DNS queries to all servers." + msgstr "" + +-#: option.c:432 ++#: option.c:435 + msgid "Set tag if client includes matching option in request." + msgstr "" + +-#: option.c:433 ++#: option.c:436 + msgid "Use alternative ports for DHCP." + msgstr "" + + # OK +-#: option.c:434 ++#: option.c:437 + #, fuzzy + msgid "Specify NAPTR DNS record." + msgstr "Sebutkan rekord TXT DNS." + +-#: option.c:435 ++#: option.c:438 + msgid "Specify lowest port available for DNS query transmission." + msgstr "" + +-#: option.c:436 ++#: option.c:439 + msgid "Use only fully qualified domain names for DHCP clients." + msgstr "" + +-#: option.c:437 ++#: option.c:440 + msgid "Generate hostnames based on MAC address for nameless clients." + msgstr "" + +-#: option.c:438 ++#: option.c:441 + msgid "Use these DHCP relays as full proxies." + msgstr "" + +-#: option.c:439 ++#: option.c:442 + msgid "Relay DHCP requests to a remote server" + msgstr "" + +-#: option.c:440 ++#: option.c:443 + msgid "Specify alias name for LOCAL DNS name." + msgstr "" + + # OK +-#: option.c:441 ++#: option.c:444 + #, fuzzy + msgid "Prompt to send to PXE clients." + msgstr "Setel pilihan-pilihan tambahan yang akan disetel untuk klien-klien DHCP." + +-#: option.c:442 ++#: option.c:445 + msgid "Boot service for PXE menu." + msgstr "" + +-#: option.c:443 ++#: option.c:446 + msgid "Check configuration syntax." + msgstr "" + +-#: option.c:444 ++#: option.c:447 + msgid "Add requestor's MAC address to forwarded DNS queries." + msgstr "" + +-#: option.c:445 ++#: option.c:448 + msgid "Add requestor's IP subnet to forwarded DNS queries." + msgstr "" + + # OK +-#: option.c:446 ++#: option.c:449 + #, fuzzy + msgid "Proxy DNSSEC validation results from upstream nameservers." + msgstr "Terjemahkan alamat-alamat IPv4 dari server-server di atas." + +-#: option.c:447 ++#: option.c:450 + msgid "Attempt to allocate sequential IP addresses to DHCP clients." + msgstr "" + +-#: option.c:448 ++#: option.c:451 + msgid "Copy connection-track mark from queries to upstream connections." + msgstr "" + +-#: option.c:449 ++#: option.c:452 + msgid "Allow DHCP clients to do their own DDNS updates." + msgstr "" + +-#: option.c:450 ++#: option.c:453 + msgid "Send router-advertisements for interfaces doing DHCPv6" + msgstr "" + +-#: option.c:451 ++#: option.c:454 + msgid "Specify DUID_EN-type DHCPv6 server DUID" + msgstr "" + + # OK +-#: option.c:452 ++#: option.c:455 + #, fuzzy + msgid "Specify host (A/AAAA and PTR) records" + msgstr "Sebutkan sebuah rekord MX." + + # OK +-#: option.c:453 ++#: option.c:456 + #, fuzzy + msgid "Specify arbitrary DNS resource record" + msgstr "Sebutkan rekord TXT DNS." + + # OK +-#: option.c:454 ++#: option.c:457 + #, fuzzy + msgid "Bind to interfaces in use - check for new interfaces" + msgstr "antarmuka tidak dikenal %s" + +-#: option.c:455 ++#: option.c:458 + msgid "Export local names to global DNS" + msgstr "" + +-#: option.c:456 ++#: option.c:459 + msgid "Domain to export to global DNS" + msgstr "" + +-#: option.c:457 ++#: option.c:460 + msgid "Set TTL for authoritative replies" + msgstr "" + +-#: option.c:458 ++#: option.c:461 + msgid "Set authoritive zone information" + msgstr "" + +-#: option.c:459 ++#: option.c:462 + msgid "Secondary authoritative nameservers for forward domains" + msgstr "" + +-#: option.c:460 ++#: option.c:463 + msgid "Peers which are allowed to do zone transfer" + msgstr "" + +-#: option.c:461 ++#: option.c:464 + msgid "Specify ipsets to which matching domains should be added" + msgstr "" + +-#: option.c:462 ++#: option.c:465 + msgid "Specify a domain and address range for synthesised names" + msgstr "" + +-#: option.c:463 ++#: option.c:466 + msgid "Activate DNSSEC validation" + msgstr "" + +-#: option.c:464 ++#: option.c:467 + msgid "Specify trust anchor key digest." + msgstr "" + +-#: option.c:465 ++#: option.c:468 + msgid "Disable upstream checking for DNSSEC debugging." + msgstr "" + +-#: option.c:466 ++#: option.c:469 + msgid "Ensure answers without DNSSEC are in unsigned zones." + msgstr "" + +-#: option.c:467 ++#: option.c:470 + msgid "Don't check DNSSEC signature timestamps until first cache-reload" + msgstr "" + +-#: option.c:468 ++#: option.c:471 + msgid "Timestamp file to verify system clock for DNSSEC" + msgstr "" + +-#: option.c:470 ++#: option.c:473 + msgid "Specify DHCPv6 prefix class" + msgstr "" + +-#: option.c:472 ++#: option.c:475 + msgid "Set priority, resend-interval and router-lifetime" + msgstr "" + +-#: option.c:473 ++#: option.c:476 + msgid "Do not log routine DHCP." + msgstr "" + +-#: option.c:474 ++#: option.c:477 + msgid "Do not log routine DHCPv6." + msgstr "" + +-#: option.c:475 ++#: option.c:478 + msgid "Do not log RA." + msgstr "" + +-#: option.c:476 ++#: option.c:479 + msgid "Accept queries only from directly-connected networks" + msgstr "" + +-#: option.c:477 ++#: option.c:480 + msgid "Detect and remove DNS forwarding loops" + msgstr "" + +-#: option.c:478 ++#: option.c:481 + msgid "Ignore DNS responses containing ipaddr." + msgstr "" + + # OK +-#: option.c:680 ++#: option.c:683 + #, c-format + msgid "" + "Usage: dnsmasq [options]\n" +@@ -843,381 +847,381 @@ msgstr "" + "\n" + + # OK +-#: option.c:682 ++#: option.c:685 + #, c-format + msgid "Use short options only on the command line.\n" + msgstr "Gunakan pilihan pendek saja pada perintah baris.\n" + + # OK +-#: option.c:684 ++#: option.c:687 + #, fuzzy, c-format + msgid "Valid options are:\n" + msgstr "Pilihan yang boleh adalah:\n" + + # OK +-#: option.c:741 option.c:745 ++#: option.c:744 option.c:748 + msgid "bad port" + msgstr "port salah" + +-#: option.c:772 option.c:804 ++#: option.c:775 option.c:807 + msgid "interface binding not supported" + msgstr "" + + # OK +-#: option.c:781 option.c:3570 ++#: option.c:784 option.c:3575 + #, fuzzy + msgid "bad interface name" + msgstr "nama MX salah" + + # OK +-#: option.c:811 ++#: option.c:814 + #, fuzzy + msgid "bad address" + msgstr "membaca %s - %d alamat" + +-#: option.c:993 ++#: option.c:996 + msgid "unsupported encapsulation for IPv6 option" + msgstr "" + + # OK +-#: option.c:1007 ++#: option.c:1010 + msgid "bad dhcp-option" + msgstr "dhcp-option salah" + + # OK +-#: option.c:1075 ++#: option.c:1078 + #, fuzzy + msgid "bad IP address" + msgstr "membaca %s - %d alamat" + + # OK +-#: option.c:1078 option.c:1216 option.c:2888 ++#: option.c:1081 option.c:1219 option.c:2893 + #, fuzzy + msgid "bad IPv6 address" + msgstr "membaca %s - %d alamat" + + # OK +-#: option.c:1243 option.c:1337 ++#: option.c:1246 option.c:1340 + msgid "bad domain in dhcp-option" + msgstr "domain dalam dhcp-option salah" + + # OK +-#: option.c:1375 ++#: option.c:1378 + msgid "dhcp-option too long" + msgstr "dhcp-option terlalu panjang" + +-#: option.c:1382 ++#: option.c:1385 + msgid "illegal dhcp-match" + msgstr "" + +-#: option.c:1444 ++#: option.c:1447 + msgid "illegal repeated flag" + msgstr "" + +-#: option.c:1452 ++#: option.c:1455 + msgid "illegal repeated keyword" + msgstr "" + + # OK +-#: option.c:1517 option.c:4186 ++#: option.c:1520 option.c:4191 + #, fuzzy, c-format + msgid "cannot access directory %s: %s" + msgstr "tidak bisa membaca %s: %s" + + # OK +-#: option.c:1563 tftp.c:493 ++#: option.c:1566 tftp.c:493 + #, fuzzy, c-format + msgid "cannot access %s: %s" + msgstr "tidak bisa membaca %s: %s" + +-#: option.c:1615 ++#: option.c:1618 + msgid "setting log facility is not possible under Android" + msgstr "" + +-#: option.c:1624 ++#: option.c:1627 + msgid "bad log facility" + msgstr "" + + # OK +-#: option.c:1677 ++#: option.c:1680 + msgid "bad MX preference" + msgstr "kesukaan MX salah" + + # OK +-#: option.c:1682 ++#: option.c:1685 + msgid "bad MX name" + msgstr "nama MX salah" + + # OK +-#: option.c:1696 ++#: option.c:1699 + msgid "bad MX target" + msgstr "target MX salah" + +-#: option.c:1708 ++#: option.c:1711 + msgid "cannot run scripts under uClinux" + msgstr "" + +-#: option.c:1710 ++#: option.c:1713 + msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts" + msgstr "" + +-#: option.c:1714 ++#: option.c:1717 + msgid "recompile with HAVE_LUASCRIPT defined to enable Lua scripts" + msgstr "" + + # OK +-#: option.c:1970 option.c:2015 option.c:2071 ++#: option.c:1973 option.c:2018 option.c:2074 + #, fuzzy + msgid "bad prefix" + msgstr "port salah" + +-#: option.c:2352 ++#: option.c:2355 + msgid "recompile with HAVE_IPSET defined to enable ipset directives" + msgstr "" + + # OK +-#: option.c:2545 ++#: option.c:2548 + #, fuzzy + msgid "bad port range" + msgstr "port salah" + +-#: option.c:2561 ++#: option.c:2564 + msgid "bad bridge-interface" + msgstr "" + +-#: option.c:2621 ++#: option.c:2624 + msgid "only one tag allowed" + msgstr "" + + # OK +-#: option.c:2641 option.c:2653 option.c:2759 option.c:2800 ++#: option.c:2644 option.c:2656 option.c:2764 option.c:2805 + msgid "bad dhcp-range" + msgstr "dhcp-range salah" + + # OK +-#: option.c:2668 ++#: option.c:2671 + msgid "inconsistent DHCP range" + msgstr "jangkauan DHCP tidak konsisten" + +-#: option.c:2727 ++#: option.c:2732 + msgid "prefix length must be exactly 64 for RA subnets" + msgstr "" + +-#: option.c:2729 ++#: option.c:2734 + msgid "prefix length must be exactly 64 for subnet constructors" + msgstr "" + +-#: option.c:2733 ++#: option.c:2738 + msgid "prefix length must be at least 64" + msgstr "" + + # OK +-#: option.c:2736 ++#: option.c:2741 + #, fuzzy + msgid "inconsistent DHCPv6 range" + msgstr "jangkauan DHCP tidak konsisten" + +-#: option.c:2747 ++#: option.c:2752 + msgid "prefix must be zero with \"constructor:\" argument" + msgstr "" + + # OK +-#: option.c:2858 option.c:2906 ++#: option.c:2863 option.c:2911 + #, fuzzy + msgid "bad hex constant" + msgstr "dhcp-host salah" + +-#: option.c:2880 ++#: option.c:2885 + msgid "cannot match tags in --dhcp-host" + msgstr "" + + # OK +-#: option.c:2928 ++#: option.c:2933 + #, fuzzy, c-format + msgid "duplicate dhcp-host IP address %s" + msgstr "alamat IP kembar %s dalam direktif dhcp-config" + + # OK +-#: option.c:2986 ++#: option.c:2991 + #, fuzzy + msgid "bad DHCP host name" + msgstr "nama MX salah" + + # OK +-#: option.c:3068 ++#: option.c:3073 + #, fuzzy + msgid "bad tag-if" + msgstr "target MX salah" + + # OK +-#: option.c:3392 option.c:3786 ++#: option.c:3397 option.c:3791 + msgid "invalid port number" + msgstr "nomor port tidak benar" + + # OK +-#: option.c:3454 ++#: option.c:3459 + #, fuzzy + msgid "bad dhcp-proxy address" + msgstr "membaca %s - %d alamat" + + # OK +-#: option.c:3480 ++#: option.c:3485 + #, fuzzy + msgid "Bad dhcp-relay" + msgstr "dhcp-range salah" + +-#: option.c:3506 ++#: option.c:3511 + msgid "bad RA-params" + msgstr "" + +-#: option.c:3515 ++#: option.c:3520 + msgid "bad DUID" + msgstr "" + + # OK +-#: option.c:3557 ++#: option.c:3562 + #, fuzzy + msgid "invalid alias range" + msgstr "weight tidak benar" + +-#: option.c:3611 ++#: option.c:3616 + msgid "bad CNAME" + msgstr "" + +-#: option.c:3616 ++#: option.c:3621 + msgid "duplicate CNAME" + msgstr "" + + # OK +-#: option.c:3636 ++#: option.c:3641 + #, fuzzy + msgid "bad PTR record" + msgstr "rekord SRV salah" + + # OK +-#: option.c:3667 ++#: option.c:3672 + #, fuzzy + msgid "bad NAPTR record" + msgstr "rekord SRV salah" + + # OK +-#: option.c:3701 ++#: option.c:3706 + #, fuzzy + msgid "bad RR record" + msgstr "rekord SRV salah" + + # OK +-#: option.c:3731 ++#: option.c:3736 + msgid "bad TXT record" + msgstr "rekord TXT salah" + + # OK +-#: option.c:3772 ++#: option.c:3777 + msgid "bad SRV record" + msgstr "rekord SRV salah" + + # OK +-#: option.c:3779 ++#: option.c:3784 + msgid "bad SRV target" + msgstr "target SRV salah" + + # OK +-#: option.c:3793 ++#: option.c:3798 + msgid "invalid priority" + msgstr "prioritas tidak benar" + + # OK +-#: option.c:3800 ++#: option.c:3805 + msgid "invalid weight" + msgstr "weight tidak benar" + + # OK +-#: option.c:3824 ++#: option.c:3829 + #, fuzzy + msgid "Bad host-record" + msgstr "rekord SRV salah" + + # OK +-#: option.c:3841 ++#: option.c:3846 + #, fuzzy + msgid "Bad name in host-record" + msgstr "kesalahan nama di %s" + + # OK +-#: option.c:3906 ++#: option.c:3911 + #, fuzzy + msgid "bad trust anchor" + msgstr "port salah" + +-#: option.c:3920 ++#: option.c:3925 + msgid "bad HEX in trust anchor" + msgstr "" + +-#: option.c:3930 ++#: option.c:3935 + msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DNSSEC/DBus support)" + msgstr "" + + # OK +-#: option.c:3989 ++#: option.c:3994 + msgid "missing \"" + msgstr "kurang \"" + + # OK +-#: option.c:4046 ++#: option.c:4051 + msgid "bad option" + msgstr "pilihan salah" + + # OK +-#: option.c:4048 ++#: option.c:4053 + msgid "extraneous parameter" + msgstr "parameter berlebihan" + + # OK +-#: option.c:4050 ++#: option.c:4055 + msgid "missing parameter" + msgstr "parameter kurang" + + # OK +-#: option.c:4052 ++#: option.c:4057 + #, fuzzy + msgid "illegal option" + msgstr "pilihan salah" + + # OK +-#: option.c:4059 ++#: option.c:4064 + msgid "error" + msgstr "kesalahan" + + # OK +-#: option.c:4061 ++#: option.c:4066 + #, fuzzy, c-format + msgid " at line %d of %s" + msgstr "%s pada baris %d dari %%s" + + # OK +-#: option.c:4076 option.c:4323 option.c:4359 ++#: option.c:4081 option.c:4328 option.c:4364 + #, fuzzy, c-format + msgid "read %s" + msgstr "membaca %s" + + # OK +-#: option.c:4139 option.c:4262 tftp.c:667 ++#: option.c:4144 option.c:4267 tftp.c:667 + #, c-format + msgid "cannot read %s: %s" + msgstr "tidak bisa membaca %s: %s" + +-#: option.c:4425 ++#: option.c:4430 + msgid "junk found in command line" + msgstr "" + + # OK +-#: option.c:4460 ++#: option.c:4465 + #, c-format + msgid "Dnsmasq version %s %s\n" + msgstr "Dnsmasq versi %s %s\n" + + # OK +-#: option.c:4461 ++#: option.c:4466 + #, fuzzy, c-format + msgid "" + "Compile time options: %s\n" +@@ -1227,70 +1231,70 @@ msgstr "" + "\n" + + # OK +-#: option.c:4462 ++#: option.c:4467 + #, c-format + msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" + msgstr "Perangkat lunak ini tersedia TANPA JAMINAN SEDIKITPUN.\n" + + # OK +-#: option.c:4463 ++#: option.c:4468 + #, c-format + msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" + msgstr "Dnsdmasq adalah perangkat lunak bebas, dan Anda dipersilahkan untuk membagikannya\n" + + # OK +-#: option.c:4464 ++#: option.c:4469 + #, fuzzy, c-format + msgid "under the terms of the GNU General Public License, version 2 or 3.\n" + msgstr "dengan aturan GNU General Public License, versi 2.\n" + +-#: option.c:4475 ++#: option.c:4480 + msgid "try --help" + msgstr "" + +-#: option.c:4477 ++#: option.c:4482 + msgid "try -w" + msgstr "" + + # OK +-#: option.c:4479 ++#: option.c:4484 + #, fuzzy, c-format + msgid "bad command line options: %s" + msgstr "pilihan baris perintah salah: %s." + + # OK +-#: option.c:4535 ++#: option.c:4544 + #, c-format + msgid "cannot get host-name: %s" + msgstr "tidak bisa mendapatkan host-name: %s" + + # OK +-#: option.c:4563 ++#: option.c:4572 + msgid "only one resolv.conf file allowed in no-poll mode." + msgstr "hanya satu file resolv.conf yang diperbolehkan dalam modus no-poll." + + # OK +-#: option.c:4573 ++#: option.c:4582 + msgid "must have exactly one resolv.conf to read domain from." + msgstr "harus mempunyai tepat satu resolv.conf untuk mendapatkan nama domain." + + # OK +-#: option.c:4576 network.c:1506 dhcp.c:774 ++#: option.c:4585 network.c:1507 dhcp.c:777 + #, fuzzy, c-format + msgid "failed to read %s: %s" + msgstr "gagal membaca %s: %s" + + # OK +-#: option.c:4593 ++#: option.c:4602 + #, c-format + msgid "no search directive found in %s" + msgstr "tidak ditemukan direktif search di %s" + +-#: option.c:4614 ++#: option.c:4623 + msgid "there must be a default domain when --dhcp-fqdn is set" + msgstr "" + +-#: option.c:4623 ++#: option.c:4632 + msgid "syntax check OK" + msgstr "" + +@@ -1300,27 +1304,27 @@ msgstr "" + msgid "failed to send packet: %s" + msgstr "gagal mendengarkan di socket: %s" + +-#: forward.c:572 ++#: forward.c:591 + msgid "discarding DNS reply: subnet option mismatch" + msgstr "" + + # OK +-#: forward.c:595 ++#: forward.c:614 + #, c-format + msgid "nameserver %s refused to do a recursive query" + msgstr "nameserver %s menolak melakukan resolusi rekursif" + +-#: forward.c:627 ++#: forward.c:646 + #, c-format + msgid "possible DNS-rebind attack detected: %s" + msgstr "" + +-#: forward.c:1156 forward.c:1722 ++#: forward.c:1209 forward.c:1785 + msgid "Ignoring query from non-local network" + msgstr "" + + # OK +-#: forward.c:2178 ++#: forward.c:2256 + #, fuzzy, c-format + msgid "Maximum number of concurrent DNS queries reached (max: %d)" + msgstr "Sebutkan jumlah maksimum lease DHCP (default %s)." +@@ -1358,380 +1362,390 @@ msgid "failed to bind server socket for %s: %s" + msgstr "gagal mem-bind socket untuk mendengarkan %s: %s" + + # OK +-#: network.c:1444 ++#: network.c:1445 + #, c-format + msgid "ignoring nameserver %s - local interface" + msgstr "mengabaikan nameserver %s - antarmuka lokal" + + # OK +-#: network.c:1455 ++#: network.c:1456 + #, fuzzy, c-format + msgid "ignoring nameserver %s - cannot make/bind socket: %s" + msgstr "mengabaikan nameserver %s - tak dapat membuat/mem-bind socket: %s" + + # OK +-#: network.c:1468 ++#: network.c:1469 + msgid "unqualified" + msgstr "tidak memenuhi syarat" + +-#: network.c:1468 ++#: network.c:1469 + msgid "names" + msgstr "" + +-#: network.c:1470 ++#: network.c:1471 + msgid "default" + msgstr "" + + # OK +-#: network.c:1472 ++#: network.c:1473 + msgid "domain" + msgstr "domain" + + # OK +-#: network.c:1475 ++#: network.c:1476 + #, c-format + msgid "using local addresses only for %s %s" + msgstr "menggunakan alamat lokal saja untuk %s %s" + + # OK +-#: network.c:1477 ++#: network.c:1478 + #, fuzzy, c-format + msgid "using standard nameservers for %s %s" + msgstr "menggunakan nameserver %s#%d untuk %s %s" + + # OK +-#: network.c:1479 ++#: network.c:1480 + #, c-format + msgid "using nameserver %s#%d for %s %s" + msgstr "menggunakan nameserver %s#%d untuk %s %s" + + # OK +-#: network.c:1483 ++#: network.c:1484 + #, fuzzy, c-format + msgid "NOT using nameserver %s#%d - query loop detected" + msgstr "menggunakan nameserver %s#%d untuk %s %s" + + # OK +-#: network.c:1486 ++#: network.c:1487 + #, fuzzy, c-format + msgid "using nameserver %s#%d(via %s)" + msgstr "menggunakan nameserver %s#%d" + + # OK +-#: network.c:1488 ++#: network.c:1489 + #, c-format + msgid "using nameserver %s#%d" + msgstr "menggunakan nameserver %s#%d" + +-#: dnsmasq.c:149 ++#: dnsmasq.c:163 + msgid "dhcp-hostsdir, dhcp-optsdir and hostsdir are not supported on this platform" + msgstr "" + +-#: dnsmasq.c:156 ++#: dnsmasq.c:170 + msgid "no trust anchors provided for DNSSEC" + msgstr "" + +-#: dnsmasq.c:159 ++#: dnsmasq.c:173 + msgid "cannot reduce cache size from default when DNSSEC enabled" + msgstr "" + + # OK +-#: dnsmasq.c:161 ++#: dnsmasq.c:175 + #, fuzzy + msgid "DNSSEC not available: set HAVE_DNSSEC in src/config.h" + msgstr "DBus tidak tersedia: setel HAVE_DBUS dalam src/config.h" + + # OK +-#: dnsmasq.c:167 ++#: dnsmasq.c:181 + #, fuzzy + msgid "TFTP server not available: set HAVE_TFTP in src/config.h" + msgstr "DBus tidak tersedia: setel HAVE_DBUS dalam src/config.h" + +-#: dnsmasq.c:172 ++#: dnsmasq.c:186 + msgid "cannot use --conntrack AND --query-port" + msgstr "" + + # OK +-#: dnsmasq.c:175 ++#: dnsmasq.c:189 + #, fuzzy + msgid "conntrack support not available: set HAVE_CONNTRACK in src/config.h" + msgstr "DBus tidak tersedia: setel HAVE_DBUS dalam src/config.h" + +-#: dnsmasq.c:180 ++#: dnsmasq.c:194 + msgid "asychronous logging is not available under Solaris" + msgstr "" + +-#: dnsmasq.c:185 ++#: dnsmasq.c:199 + msgid "asychronous logging is not available under Android" + msgstr "" + + # OK +-#: dnsmasq.c:190 ++#: dnsmasq.c:204 + #, fuzzy + msgid "authoritative DNS not available: set HAVE_AUTH in src/config.h" + msgstr "DBus tidak tersedia: setel HAVE_DBUS dalam src/config.h" + + # OK +-#: dnsmasq.c:195 ++#: dnsmasq.c:209 + #, fuzzy + msgid "loop detection not available: set HAVE_LOOP in src/config.h" + msgstr "DBus tidak tersedia: setel HAVE_DBUS dalam src/config.h" + +-#: dnsmasq.c:203 ++#: dnsmasq.c:217 + msgid "zone serial must be configured in --auth-soa" + msgstr "" + +-#: dnsmasq.c:221 ++#: dnsmasq.c:235 + msgid "dhcp-range constructor not available on this platform" + msgstr "" + +-#: dnsmasq.c:264 ++#: dnsmasq.c:278 + msgid "cannot set --bind-interfaces and --bind-dynamic" + msgstr "" + + # OK +-#: dnsmasq.c:267 ++#: dnsmasq.c:281 + #, c-format + msgid "failed to find list of interfaces: %s" + msgstr "gagal mendapatkan daftar antarmuka: %s" + + # OK +-#: dnsmasq.c:276 ++#: dnsmasq.c:290 + #, c-format + msgid "unknown interface %s" + msgstr "antarmuka tidak dikenal %s" + + # OK +-#: dnsmasq.c:340 dnsmasq.c:1004 ++#: dnsmasq.c:354 dnsmasq.c:1037 + #, c-format + msgid "DBus error: %s" + msgstr "DBus error: %s" + + # OK +-#: dnsmasq.c:343 ++#: dnsmasq.c:357 + msgid "DBus not available: set HAVE_DBUS in src/config.h" + msgstr "DBus tidak tersedia: setel HAVE_DBUS dalam src/config.h" + +-#: dnsmasq.c:371 ++#: dnsmasq.c:385 + #, c-format + msgid "unknown user or group: %s" + msgstr "" + +-#: dnsmasq.c:426 ++#: dnsmasq.c:440 + #, c-format + msgid "cannot chdir to filesystem root: %s" + msgstr "" + + # OK +-#: dnsmasq.c:667 ++#: dnsmasq.c:692 + #, fuzzy, c-format + msgid "started, version %s DNS disabled" + msgstr "dimulai, cache versi %s di disable" + + # OK +-#: dnsmasq.c:669 ++#: dnsmasq.c:694 + #, c-format + msgid "started, version %s cachesize %d" + msgstr "dimulai, versi %s ukuran cache %d" + + # OK +-#: dnsmasq.c:671 ++#: dnsmasq.c:696 + #, c-format + msgid "started, version %s cache disabled" + msgstr "dimulai, cache versi %s di disable" + + # OK +-#: dnsmasq.c:673 ++#: dnsmasq.c:698 + #, c-format + msgid "compile time options: %s" + msgstr "pilihan-pilihan saat kompilasi: %s" + + # OK +-#: dnsmasq.c:679 ++#: dnsmasq.c:704 + msgid "DBus support enabled: connected to system bus" + msgstr "dukungan DBus dimungkinkan: terkoneksi pada bus sistem" + + # OK +-#: dnsmasq.c:681 ++#: dnsmasq.c:706 + msgid "DBus support enabled: bus connection pending" + msgstr "dukungan DBus dimungkinkan: koneksi bus ditunda" + +-#: dnsmasq.c:686 ++#: dnsmasq.c:711 + msgid "DNS service limited to local subnets" + msgstr "" + +-#: dnsmasq.c:702 ++#: dnsmasq.c:727 + msgid "DNSSEC validation enabled" + msgstr "" + +-#: dnsmasq.c:705 ++#: dnsmasq.c:730 + msgid "DNSSEC signature timestamps not checked until first cache reload" + msgstr "" + +-#: dnsmasq.c:708 ++#: dnsmasq.c:733 + msgid "DNSSEC signature timestamps not checked until system time valid" + msgstr "" + + # OK +-#: dnsmasq.c:713 ++#: dnsmasq.c:738 + #, fuzzy, c-format + msgid "warning: failed to change owner of %s: %s" + msgstr "gagal memuat nama-nama dari %s: %s" + + # OK +-#: dnsmasq.c:717 ++#: dnsmasq.c:742 + msgid "setting --bind-interfaces option because of OS limitations" + msgstr "setelan opsi --bind-interfaces disebabkan keterbatasan OS" + + # OK +-#: dnsmasq.c:727 ++#: dnsmasq.c:752 + #, c-format + msgid "warning: interface %s does not currently exist" + msgstr "peringatan: antarmuka %s tidak ada" + +-#: dnsmasq.c:732 ++#: dnsmasq.c:757 + msgid "warning: ignoring resolv-file flag because no-resolv is set" + msgstr "" + + # OK +-#: dnsmasq.c:735 ++#: dnsmasq.c:760 + #, fuzzy + msgid "warning: no upstream servers configured" + msgstr "menyetel server-server di atas dengan DBus" + +-#: dnsmasq.c:739 ++#: dnsmasq.c:764 + #, c-format + msgid "asynchronous logging enabled, queue limit is %d messages" + msgstr "" + +-#: dnsmasq.c:760 ++#: dnsmasq.c:785 + msgid "IPv6 router advertisement enabled" + msgstr "" + +-#: dnsmasq.c:765 ++#: dnsmasq.c:790 + #, c-format + msgid "DHCP, sockets bound exclusively to interface %s" + msgstr "" + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "root is " + msgstr "" + + # OK +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + #, fuzzy + msgid "enabled" + msgstr "di disable" + +-#: dnsmasq.c:784 ++#: dnsmasq.c:810 + msgid "secure mode" + msgstr "" + +-#: dnsmasq.c:810 ++#: dnsmasq.c:813 ++#, c-format ++msgid "warning: %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:817 ++#, c-format ++msgid "warning: TFTP directory %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:843 + #, c-format + msgid "restricting maximum simultaneous TFTP transfers to %d" + msgstr "" + + # OK +-#: dnsmasq.c:1006 ++#: dnsmasq.c:1039 + msgid "connected to system DBus" + msgstr "terhubung ke sistem DBus" + +-#: dnsmasq.c:1156 ++#: dnsmasq.c:1189 + #, c-format + msgid "cannot fork into background: %s" + msgstr "" + + # OK +-#: dnsmasq.c:1159 ++#: dnsmasq.c:1192 + #, fuzzy, c-format + msgid "failed to create helper: %s" + msgstr "gagal membaca %s: %s" + +-#: dnsmasq.c:1162 ++#: dnsmasq.c:1195 + #, c-format + msgid "setting capabilities failed: %s" + msgstr "" + + # OK +-#: dnsmasq.c:1165 ++#: dnsmasq.c:1198 + #, fuzzy, c-format + msgid "failed to change user-id to %s: %s" + msgstr "gagal memuat nama-nama dari %s: %s" + + # OK +-#: dnsmasq.c:1168 ++#: dnsmasq.c:1201 + #, fuzzy, c-format + msgid "failed to change group-id to %s: %s" + msgstr "gagal memuat nama-nama dari %s: %s" + + # OK +-#: dnsmasq.c:1171 ++#: dnsmasq.c:1204 + #, fuzzy, c-format + msgid "failed to open pidfile %s: %s" + msgstr "gagal membaca %s: %s" + + # OK +-#: dnsmasq.c:1174 ++#: dnsmasq.c:1207 + #, fuzzy, c-format + msgid "cannot open log %s: %s" + msgstr "tidak bisa membuka %s:%s" + + # OK +-#: dnsmasq.c:1177 ++#: dnsmasq.c:1210 + #, fuzzy, c-format + msgid "failed to load Lua script: %s" + msgstr "gagal memuat %S: %s" + +-#: dnsmasq.c:1180 ++#: dnsmasq.c:1213 + #, c-format + msgid "TFTP directory %s inaccessible: %s" + msgstr "" + + # OK +-#: dnsmasq.c:1183 ++#: dnsmasq.c:1216 + #, fuzzy, c-format + msgid "cannot create timestamp file %s: %s" + msgstr "tidak dapat membuka atau membuat file lease: %s" + +-#: dnsmasq.c:1204 ++#: dnsmasq.c:1237 + msgid "now checking DNSSEC signature timestamps" + msgstr "" + +-#: dnsmasq.c:1271 ++#: dnsmasq.c:1304 + #, c-format + msgid "script process killed by signal %d" + msgstr "" + +-#: dnsmasq.c:1275 ++#: dnsmasq.c:1308 + #, c-format + msgid "script process exited with status %d" + msgstr "" + + # OK +-#: dnsmasq.c:1279 ++#: dnsmasq.c:1312 + #, fuzzy, c-format + msgid "failed to execute %s: %s" + msgstr "gagal mengakses %s: %s" + +-#: dnsmasq.c:1334 ++#: dnsmasq.c:1367 + msgid "exiting on receipt of SIGTERM" + msgstr "keluar karena menerima SIGTERM" + + # OK +-#: dnsmasq.c:1362 ++#: dnsmasq.c:1395 + #, fuzzy, c-format + msgid "failed to access %s: %s" + msgstr "gagal mengakses %s: %s" + + # OK +-#: dnsmasq.c:1392 ++#: dnsmasq.c:1425 + #, c-format + msgid "reading %s" + msgstr "membaca %s" + + # OK +-#: dnsmasq.c:1403 ++#: dnsmasq.c:1436 + #, fuzzy, c-format + msgid "no servers found in %s, will retry" + msgstr "tidak ditemukan direktif search di %s" +@@ -1767,39 +1781,39 @@ msgid "cannot create ICMP raw socket: %s." + msgstr "tidak dapat membuat socket ICMP raw: %s" + + # OK +-#: dhcp.c:239 ++#: dhcp.c:241 dhcp6.c:180 + #, fuzzy, c-format + msgid "unknown interface %s in bridge-interface" + msgstr "antarmuka tidak dikenal %s" + +-#: dhcp.c:278 ++#: dhcp.c:281 + #, c-format + msgid "DHCP packet received on %s which has no address" + msgstr "" + +-#: dhcp.c:412 ++#: dhcp.c:415 + #, c-format + msgid "ARP-cache injection failed: %s" + msgstr "" + + # OK +-#: dhcp.c:511 ++#: dhcp.c:514 + #, c-format + msgid "DHCP range %s -- %s is not consistent with netmask %s" + msgstr "jangkauan DHCP %s -- %s tidak konsisten dengan netmask %s" + + # OK +-#: dhcp.c:812 ++#: dhcp.c:815 + #, fuzzy, c-format + msgid "bad line at %s line %d" + msgstr "kesalahan nama pada %s baris %d" + +-#: dhcp.c:855 ++#: dhcp.c:858 + #, c-format + msgid "ignoring %s line %d, duplicate name or IP address" + msgstr "" + +-#: dhcp.c:999 rfc3315.c:2139 ++#: dhcp.c:1002 rfc3315.c:2135 + #, c-format + msgid "DHCP relay %s -> %s" + msgstr "" +@@ -1838,191 +1852,191 @@ msgid "Ignoring domain %s for DHCP host name %s" + msgstr "" + + # OK +-#: rfc2131.c:342 ++#: rfc2131.c:344 + #, c-format + msgid "no address range available for DHCP request %s %s" + msgstr "tidak ada alamat yang bisa dipakai untuk permintaan DHCP %s %s" + + # OK +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "with subnet selector" + msgstr "dengan pemilih subnet" + + # OK +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "via" + msgstr "lewat" + + # OK +-#: rfc2131.c:355 ++#: rfc2131.c:357 + #, fuzzy, c-format + msgid "%u available DHCP subnet: %s/%s" + msgstr "tidak ada alamat yang bisa dipakai untuk permintaan DHCP %s %s" + +-#: rfc2131.c:358 rfc3315.c:300 ++#: rfc2131.c:360 rfc3315.c:300 + #, c-format + msgid "%u available DHCP range: %s -- %s" + msgstr "" + + # OK +-#: rfc2131.c:469 ++#: rfc2131.c:471 + #, fuzzy, c-format + msgid "%u vendor class: %s" + msgstr "DBus error: %s" + + # OK +-#: rfc2131.c:471 ++#: rfc2131.c:473 + #, fuzzy, c-format + msgid "%u user class: %s" + msgstr "DBus error: %s" + + # OK +-#: rfc2131.c:498 ++#: rfc2131.c:500 + msgid "disabled" + msgstr "di disable" + + # OK +-#: rfc2131.c:539 rfc2131.c:967 rfc2131.c:1385 rfc3315.c:603 rfc3315.c:860 +-#: rfc3315.c:1139 ++#: rfc2131.c:541 rfc2131.c:974 rfc2131.c:1380 rfc3315.c:603 rfc3315.c:856 ++#: rfc3315.c:1135 + msgid "ignored" + msgstr "diabaikan" + + # OK +-#: rfc2131.c:554 rfc2131.c:1205 rfc3315.c:910 ++#: rfc2131.c:556 rfc2131.c:1207 rfc3315.c:906 + msgid "address in use" + msgstr "alamat telah digunakan" + + # OK +-#: rfc2131.c:568 rfc2131.c:1021 ++#: rfc2131.c:570 rfc2131.c:1028 + msgid "no address available" + msgstr "tak ada alamat yang tersedia" + + # OK +-#: rfc2131.c:575 rfc2131.c:1168 ++#: rfc2131.c:577 rfc2131.c:1170 + msgid "wrong network" + msgstr "jaringan yang salah" + + # OK +-#: rfc2131.c:590 ++#: rfc2131.c:592 + msgid "no address configured" + msgstr "tak ada alamat yang disetel" + + # OK +-#: rfc2131.c:596 rfc2131.c:1218 ++#: rfc2131.c:598 rfc2131.c:1220 + msgid "no leases left" + msgstr "tak ada lease yang tersisa" + +-#: rfc2131.c:691 rfc3315.c:476 ++#: rfc2131.c:693 rfc3315.c:476 + #, c-format + msgid "%u client provides name: %s" + msgstr "" + +-#: rfc2131.c:796 ++#: rfc2131.c:798 + msgid "PXE BIS not supported" + msgstr "" + + # OK +-#: rfc2131.c:935 rfc3315.c:1233 ++#: rfc2131.c:942 rfc3315.c:1229 + #, fuzzy, c-format + msgid "disabling DHCP static address %s for %s" + msgstr "men-disable alamat statik DHCP %s" + + # OK +-#: rfc2131.c:956 ++#: rfc2131.c:963 + msgid "unknown lease" + msgstr "lease tidak diketahui" + +-#: rfc2131.c:990 ++#: rfc2131.c:997 + #, c-format + msgid "not using configured address %s because it is leased to %s" + msgstr "" + +-#: rfc2131.c:1000 ++#: rfc2131.c:1007 + #, c-format + msgid "not using configured address %s because it is in use by the server or relay" + msgstr "" + +-#: rfc2131.c:1003 ++#: rfc2131.c:1010 + #, c-format + msgid "not using configured address %s because it was previously declined" + msgstr "" + +-#: rfc2131.c:1019 rfc2131.c:1211 ++#: rfc2131.c:1026 rfc2131.c:1213 + msgid "no unique-id" + msgstr "" + +-#: rfc2131.c:1106 ++#: rfc2131.c:1108 + msgid "wrong server-ID" + msgstr "" + + # OK +-#: rfc2131.c:1125 ++#: rfc2131.c:1127 + msgid "wrong address" + msgstr "alamat salah" + + # OK +-#: rfc2131.c:1143 rfc3315.c:1006 ++#: rfc2131.c:1145 rfc3315.c:1002 + msgid "lease not found" + msgstr "lease tak ditemukan" + + # OK +-#: rfc2131.c:1176 ++#: rfc2131.c:1178 + msgid "address not available" + msgstr "alamat tak tersedia" + + # OK +-#: rfc2131.c:1187 ++#: rfc2131.c:1189 + msgid "static lease available" + msgstr "lease statik tak tersedia" + + # OK +-#: rfc2131.c:1191 ++#: rfc2131.c:1193 + msgid "address reserved" + msgstr "alamat telah dipesan" + +-#: rfc2131.c:1199 ++#: rfc2131.c:1201 + #, c-format + msgid "abandoning lease to %s of %s" + msgstr "" + +-#: rfc2131.c:1712 ++#: rfc2131.c:1707 + #, c-format + msgid "%u bootfile name: %s" + msgstr "" + + # OK +-#: rfc2131.c:1721 ++#: rfc2131.c:1716 + #, fuzzy, c-format + msgid "%u server name: %s" + msgstr "DBus error: %s" + + # OK +-#: rfc2131.c:1729 ++#: rfc2131.c:1724 + #, fuzzy, c-format + msgid "%u next server: %s" + msgstr "DBus error: %s" + +-#: rfc2131.c:1732 ++#: rfc2131.c:1727 + #, c-format + msgid "%u broadcast response" + msgstr "" + +-#: rfc2131.c:1795 ++#: rfc2131.c:1790 + #, c-format + msgid "cannot send DHCP/BOOTP option %d: no space left in packet" + msgstr "" + +-#: rfc2131.c:2036 ++#: rfc2131.c:2031 + msgid "PXE menu too large" + msgstr "" + + # OK +-#: rfc2131.c:2173 rfc3315.c:1506 ++#: rfc2131.c:2170 rfc3315.c:1502 + #, fuzzy, c-format + msgid "%u requested options: %s" + msgstr "pilihan-pilihan saat kompilasi: %s" + +-#: rfc2131.c:2453 ++#: rfc2131.c:2487 + #, c-format + msgid "cannot send RFC3925 option: too many options for enterprise number %d" + msgstr "" +@@ -2040,17 +2054,27 @@ msgid "netlink returns error: %s" + msgstr "DBus error: %s" + + # OK +-#: dbus.c:171 ++#: dbus.c:186 + msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" + msgstr "mencoba menyetel sebuah alamat IPv6 server lewat DBus - tidak ada dukungan untuk IPv6" + ++#: dbus.c:439 ++#, c-format ++msgid "Enabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:444 ++#, c-format ++msgid "Disabling --%s option from D-Bus" ++msgstr "" ++ + # OK +-#: dbus.c:500 ++#: dbus.c:691 + msgid "setting upstream servers from DBus" + msgstr "menyetel server-server di atas dengan DBus" + + # OK +-#: dbus.c:547 ++#: dbus.c:738 + msgid "could not register a DBus message handler" + msgstr "tidak bisa mendaftar sebuah DBus message handler" + +@@ -2186,54 +2210,54 @@ msgid "unknown prefix-class %d" + msgstr "lease tidak diketahui" + + # OK +-#: rfc3315.c:803 rfc3315.c:902 ++#: rfc3315.c:803 rfc3315.c:898 + #, fuzzy + msgid "address unavailable" + msgstr "alamat tak tersedia" + +-#: rfc3315.c:815 rfc3315.c:950 rfc3315.c:1283 ++#: rfc3315.c:815 rfc3315.c:946 rfc3315.c:1279 + msgid "success" + msgstr "" + + # OK +-#: rfc3315.c:843 rfc3315.c:845 rfc3315.c:958 rfc3315.c:960 ++#: rfc3315.c:830 rfc3315.c:839 rfc3315.c:954 rfc3315.c:956 + #, fuzzy + msgid "no addresses available" + msgstr "tak ada alamat yang tersedia" + +-#: rfc3315.c:937 ++#: rfc3315.c:933 + msgid "not on link" + msgstr "" + +-#: rfc3315.c:1010 rfc3315.c:1195 rfc3315.c:1272 ++#: rfc3315.c:1006 rfc3315.c:1191 rfc3315.c:1268 + msgid "no binding found" + msgstr "" + +-#: rfc3315.c:1048 ++#: rfc3315.c:1044 + msgid "deprecated" + msgstr "" + + # OK +-#: rfc3315.c:1053 ++#: rfc3315.c:1049 + #, fuzzy + msgid "address invalid" + msgstr "alamat telah digunakan" + +-#: rfc3315.c:1100 ++#: rfc3315.c:1096 + msgid "confirm failed" + msgstr "" + + # OK +-#: rfc3315.c:1116 ++#: rfc3315.c:1112 + #, fuzzy + msgid "all addresses still on link" + msgstr "kesalahan nama pada %s baris %d" + +-#: rfc3315.c:1204 ++#: rfc3315.c:1200 + msgid "release received" + msgstr "" + +-#: rfc3315.c:2130 ++#: rfc3315.c:2126 + msgid "Cannot multicast to DHCPv6 server without correct interface" + msgstr "" + +@@ -2327,12 +2351,12 @@ msgid "DHCP relay from %s to %s" + msgstr "" + + # OK +-#: radv.c:98 ++#: radv.c:109 + #, fuzzy, c-format + msgid "cannot create ICMPv6 socket: %s" + msgstr "tidak bisa membuat socket DHCP: %s" + +-#: auth.c:436 ++#: auth.c:448 + #, c-format + msgid "ignoring zone transfer request from %s" + msgstr "" +@@ -2350,7 +2374,7 @@ msgid "failed to create IPset control socket: %s" + msgstr "gagal membuat socket: %s " + + # OK +-#: dnssec.c:425 dnssec.c:469 ++#: dnssec.c:449 dnssec.c:493 + #, fuzzy, c-format + msgid "failed to update mtime on %s: %s" + msgstr "gagal membaca %s: %s" +diff --git a/po/it.po b/po/it.po +index 64342c9804ba..ed9376b41695 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -25,17 +25,17 @@ msgstr "" + msgid "failed to load names from %s: %s" + msgstr "" + +-#: cache.c:967 dhcp.c:825 ++#: cache.c:967 dhcp.c:828 + #, c-format + msgid "bad address at %s line %d" + msgstr "" + +-#: cache.c:1018 dhcp.c:841 ++#: cache.c:1018 dhcp.c:844 + #, c-format + msgid "bad name at %s line %d" + msgstr "" + +-#: cache.c:1027 dhcp.c:916 ++#: cache.c:1027 dhcp.c:919 + #, c-format + msgid "read %s - %d addresses" + msgstr "" +@@ -93,1005 +93,1009 @@ msgstr "" + msgid "failed to allocate memory" + msgstr "" + +-#: util.c:243 option.c:598 ++#: util.c:250 option.c:601 + msgid "could not get memory" + msgstr "" + +-#: util.c:253 ++#: util.c:260 + #, c-format + msgid "cannot create pipe: %s" + msgstr "" + +-#: util.c:261 ++#: util.c:268 + #, c-format + msgid "failed to allocate %d bytes" + msgstr "" + +-#: util.c:430 ++#: util.c:437 + #, c-format + msgid "infinite" + msgstr "" + +-#: option.c:330 ++#: option.c:332 + msgid "Specify local address(es) to listen on." + msgstr "" + +-#: option.c:331 ++#: option.c:333 + msgid "Return ipaddr for all hosts in specified domains." + msgstr "" + +-#: option.c:332 ++#: option.c:334 + msgid "Fake reverse lookups for RFC1918 private address ranges." + msgstr "" + +-#: option.c:333 ++#: option.c:335 + msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." + msgstr "" + +-#: option.c:334 ++#: option.c:336 + #, c-format + msgid "Specify the size of the cache in entries (defaults to %s)." + msgstr "" + +-#: option.c:335 ++#: option.c:337 + #, c-format + msgid "Specify configuration file (defaults to %s)." + msgstr "" + +-#: option.c:336 ++#: option.c:338 + msgid "Do NOT fork into the background: run in debug mode." + msgstr "" + +-#: option.c:337 ++#: option.c:339 + msgid "Do NOT forward queries with no domain part." + msgstr "" + +-#: option.c:338 ++#: option.c:340 + msgid "Return self-pointing MX records for local hosts." + msgstr "" + +-#: option.c:339 ++#: option.c:341 + msgid "Expand simple names in /etc/hosts with domain-suffix." + msgstr "" + +-#: option.c:340 ++#: option.c:342 + msgid "Don't forward spurious DNS requests from Windows hosts." + msgstr "" + +-#: option.c:341 ++#: option.c:343 + msgid "Enable DHCP in the range given with lease duration." + msgstr "" + +-#: option.c:342 ++#: option.c:344 + #, c-format + msgid "Change to this group after startup (defaults to %s)." + msgstr "" + +-#: option.c:343 ++#: option.c:345 + msgid "Set address or hostname for a specified machine." + msgstr "" + +-#: option.c:344 ++#: option.c:346 + msgid "Read DHCP host specs from file." + msgstr "" + +-#: option.c:345 ++#: option.c:347 + msgid "Read DHCP option specs from file." + msgstr "" + +-#: option.c:346 ++#: option.c:348 + msgid "Read DHCP host specs from a directory." + msgstr "" + +-#: option.c:347 ++#: option.c:349 + msgid "Read DHCP options from a directory." + msgstr "" + +-#: option.c:348 ++#: option.c:350 + msgid "Evaluate conditional tag expression." + msgstr "" + +-#: option.c:349 ++#: option.c:351 + #, c-format + msgid "Do NOT load %s file." + msgstr "" + +-#: option.c:350 ++#: option.c:352 + #, c-format + msgid "Specify a hosts file to be read in addition to %s." + msgstr "" + +-#: option.c:351 ++#: option.c:353 + msgid "Read hosts files from a directory." + msgstr "" + +-#: option.c:352 ++#: option.c:354 + msgid "Specify interface(s) to listen on." + msgstr "" + +-#: option.c:353 ++#: option.c:355 + msgid "Specify interface(s) NOT to listen on." + msgstr "" + +-#: option.c:354 ++#: option.c:356 + msgid "Map DHCP user class to tag." + msgstr "" + +-#: option.c:355 ++#: option.c:357 + msgid "Map RFC3046 circuit-id to tag." + msgstr "" + +-#: option.c:356 ++#: option.c:358 + msgid "Map RFC3046 remote-id to tag." + msgstr "" + +-#: option.c:357 ++#: option.c:359 + msgid "Map RFC3993 subscriber-id to tag." + msgstr "" + +-#: option.c:358 ++#: option.c:360 + msgid "Don't do DHCP for hosts with tag set." + msgstr "" + +-#: option.c:359 ++#: option.c:361 + msgid "Force broadcast replies for hosts with tag set." + msgstr "" + +-#: option.c:360 ++#: option.c:362 + msgid "Do NOT fork into the background, do NOT run in debug mode." + msgstr "" + +-#: option.c:361 ++#: option.c:363 + msgid "Assume we are the only DHCP server on the local network." + msgstr "" + +-#: option.c:362 ++#: option.c:364 + #, c-format + msgid "Specify where to store DHCP leases (defaults to %s)." + msgstr "" + +-#: option.c:363 ++#: option.c:365 + msgid "Return MX records for local hosts." + msgstr "" + +-#: option.c:364 ++#: option.c:366 + msgid "Specify an MX record." + msgstr "" + +-#: option.c:365 ++#: option.c:367 + msgid "Specify BOOTP options to DHCP server." + msgstr "" + +-#: option.c:366 ++#: option.c:368 + #, c-format + msgid "Do NOT poll %s file, reload only on SIGHUP." + msgstr "" + +-#: option.c:367 ++#: option.c:369 + msgid "Do NOT cache failed search results." + msgstr "" + +-#: option.c:368 ++#: option.c:370 + #, c-format + msgid "Use nameservers strictly in the order given in %s." + msgstr "" + +-#: option.c:369 ++#: option.c:371 + msgid "Specify options to be sent to DHCP clients." + msgstr "" + +-#: option.c:370 ++#: option.c:372 + msgid "DHCP option sent even if the client does not request it." + msgstr "" + +-#: option.c:371 ++#: option.c:373 + msgid "Specify port to listen for DNS requests on (defaults to 53)." + msgstr "" + +-#: option.c:372 ++#: option.c:374 + #, c-format + msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." + msgstr "" + +-#: option.c:373 ++#: option.c:375 + msgid "Log DNS queries." + msgstr "" + +-#: option.c:374 ++#: option.c:376 + msgid "Force the originating port for upstream DNS queries." + msgstr "" + +-#: option.c:375 ++#: option.c:377 + msgid "Do NOT read resolv.conf." + msgstr "" + +-#: option.c:376 ++#: option.c:378 + #, c-format + msgid "Specify path to resolv.conf (defaults to %s)." + msgstr "" + +-#: option.c:377 ++#: option.c:379 + msgid "Specify path to file with server= options" + msgstr "" + +-#: option.c:378 ++#: option.c:380 + msgid "Specify address(es) of upstream servers with optional domains." + msgstr "" + +-#: option.c:379 ++#: option.c:381 + msgid "Specify address of upstream servers for reverse address queries" + msgstr "" + +-#: option.c:380 ++#: option.c:382 + msgid "Never forward queries to specified domains." + msgstr "" + +-#: option.c:381 ++#: option.c:383 + msgid "Specify the domain to be assigned in DHCP leases." + msgstr "" + +-#: option.c:382 ++#: option.c:384 + msgid "Specify default target in an MX record." + msgstr "" + +-#: option.c:383 ++#: option.c:385 + msgid "Specify time-to-live in seconds for replies from /etc/hosts." + msgstr "" + +-#: option.c:384 ++#: option.c:386 + msgid "Specify time-to-live in seconds for negative caching." + msgstr "" + +-#: option.c:385 ++#: option.c:387 + msgid "Specify time-to-live in seconds for maximum TTL to send to clients." + msgstr "" + +-#: option.c:386 ++#: option.c:388 + msgid "Specify time-to-live ceiling for cache." + msgstr "" + +-#: option.c:387 ++#: option.c:389 + msgid "Specify time-to-live floor for cache." + msgstr "" + +-#: option.c:388 ++#: option.c:390 + #, c-format + msgid "Change to this user after startup. (defaults to %s)." + msgstr "" + +-#: option.c:389 ++#: option.c:391 + msgid "Map DHCP vendor class to tag." + msgstr "" + +-#: option.c:390 ++#: option.c:392 + msgid "Display dnsmasq version and copyright information." + msgstr "" + +-#: option.c:391 ++#: option.c:393 + msgid "Translate IPv4 addresses from upstream servers." + msgstr "" + +-#: option.c:392 ++#: option.c:394 + msgid "Specify a SRV record." + msgstr "" + +-#: option.c:393 ++#: option.c:395 + msgid "Display this message. Use --help dhcp for known DHCP options." + msgstr "" + +-#: option.c:394 ++#: option.c:396 + #, c-format + msgid "Specify path of PID file (defaults to %s)." + msgstr "" + +-#: option.c:395 ++#: option.c:397 + #, c-format + msgid "Specify maximum number of DHCP leases (defaults to %s)." + msgstr "" + +-#: option.c:396 ++#: option.c:398 + msgid "Answer DNS queries based on the interface a query was sent to." + msgstr "" + +-#: option.c:397 ++#: option.c:399 + msgid "Specify TXT DNS record." + msgstr "" + +-#: option.c:398 ++#: option.c:400 + msgid "Specify PTR DNS record." + msgstr "" + +-#: option.c:399 ++#: option.c:401 + msgid "Give DNS name to IPv4 address of interface." + msgstr "" + +-#: option.c:400 ++#: option.c:402 + msgid "Bind only to interfaces in use." + msgstr "" + +-#: option.c:401 ++#: option.c:403 + #, c-format + msgid "Read DHCP static host information from %s." + msgstr "" + +-#: option.c:402 ++#: option.c:404 + msgid "Enable the DBus interface for setting upstream servers, etc." + msgstr "" + +-#: option.c:403 ++#: option.c:405 + msgid "Do not provide DHCP on this interface, only provide DNS." + msgstr "" + +-#: option.c:404 ++#: option.c:406 + msgid "Enable dynamic address allocation for bootp." + msgstr "" + +-#: option.c:405 ++#: option.c:407 + msgid "Map MAC address (with wildcards) to option set." + msgstr "" + +-#: option.c:406 ++#: option.c:408 + msgid "Treat DHCP requests on aliases as arriving from interface." + msgstr "" + +-#: option.c:407 ++#: option.c:409 + msgid "Disable ICMP echo address checking in the DHCP server." + msgstr "" + +-#: option.c:408 ++#: option.c:410 + msgid "Shell script to run on DHCP lease creation and destruction." + msgstr "" + +-#: option.c:409 ++#: option.c:411 + msgid "Lua script to run on DHCP lease creation and destruction." + msgstr "" + +-#: option.c:410 ++#: option.c:412 + msgid "Run lease-change scripts as this user." + msgstr "" + +-#: option.c:411 ++#: option.c:413 + msgid "Read configuration from all the files in this directory." + msgstr "" + +-#: option.c:412 ++#: option.c:414 + msgid "Log to this syslog facility or file. (defaults to DAEMON)" + msgstr "" + +-#: option.c:413 ++#: option.c:415 + msgid "Do not use leasefile." + msgstr "" + +-#: option.c:414 ++#: option.c:416 + #, c-format + msgid "Maximum number of concurrent DNS queries. (defaults to %s)" + msgstr "" + +-#: option.c:415 ++#: option.c:417 + #, c-format + msgid "Clear DNS cache when reloading %s." + msgstr "" + +-#: option.c:416 ++#: option.c:418 + msgid "Ignore hostnames provided by DHCP clients." + msgstr "" + +-#: option.c:417 ++#: option.c:419 + msgid "Do NOT reuse filename and server fields for extra DHCP options." + msgstr "" + +-#: option.c:418 ++#: option.c:420 + msgid "Enable integrated read-only TFTP server." + msgstr "" + +-#: option.c:419 ++#: option.c:421 + msgid "Export files by TFTP only from the specified subtree." + msgstr "" + +-#: option.c:420 ++#: option.c:422 + msgid "Add client IP address to tftp-root." + msgstr "" + +-#: option.c:421 ++#: option.c:423 + msgid "Allow access only to files owned by the user running dnsmasq." + msgstr "" + +-#: option.c:422 ++#: option.c:424 ++msgid "Do not terminate the service if TFTP directories are inaccessible." ++msgstr "" ++ ++#: option.c:425 + #, c-format + msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." + msgstr "" + +-#: option.c:423 ++#: option.c:426 + msgid "Disable the TFTP blocksize extension." + msgstr "" + +-#: option.c:424 ++#: option.c:427 + msgid "Convert TFTP filenames to lowercase" + msgstr "" + +-#: option.c:425 ++#: option.c:428 + msgid "Ephemeral port range for use by TFTP transfers." + msgstr "" + +-#: option.c:426 ++#: option.c:429 + msgid "Extra logging for DHCP." + msgstr "" + +-#: option.c:427 ++#: option.c:430 + msgid "Enable async. logging; optionally set queue length." + msgstr "" + +-#: option.c:428 ++#: option.c:431 + msgid "Stop DNS rebinding. Filter private IP ranges when resolving." + msgstr "" + +-#: option.c:429 ++#: option.c:432 + msgid "Allow rebinding of 127.0.0.0/8, for RBL servers." + msgstr "" + +-#: option.c:430 ++#: option.c:433 + msgid "Inhibit DNS-rebind protection on this domain." + msgstr "" + +-#: option.c:431 ++#: option.c:434 + msgid "Always perform DNS queries to all servers." + msgstr "" + +-#: option.c:432 ++#: option.c:435 + msgid "Set tag if client includes matching option in request." + msgstr "" + +-#: option.c:433 ++#: option.c:436 + msgid "Use alternative ports for DHCP." + msgstr "" + +-#: option.c:434 ++#: option.c:437 + msgid "Specify NAPTR DNS record." + msgstr "" + +-#: option.c:435 ++#: option.c:438 + msgid "Specify lowest port available for DNS query transmission." + msgstr "" + +-#: option.c:436 ++#: option.c:439 + msgid "Use only fully qualified domain names for DHCP clients." + msgstr "" + +-#: option.c:437 ++#: option.c:440 + msgid "Generate hostnames based on MAC address for nameless clients." + msgstr "" + +-#: option.c:438 ++#: option.c:441 + msgid "Use these DHCP relays as full proxies." + msgstr "" + +-#: option.c:439 ++#: option.c:442 + msgid "Relay DHCP requests to a remote server" + msgstr "" + +-#: option.c:440 ++#: option.c:443 + msgid "Specify alias name for LOCAL DNS name." + msgstr "" + +-#: option.c:441 ++#: option.c:444 + msgid "Prompt to send to PXE clients." + msgstr "" + +-#: option.c:442 ++#: option.c:445 + msgid "Boot service for PXE menu." + msgstr "" + +-#: option.c:443 ++#: option.c:446 + msgid "Check configuration syntax." + msgstr "" + +-#: option.c:444 ++#: option.c:447 + msgid "Add requestor's MAC address to forwarded DNS queries." + msgstr "" + +-#: option.c:445 ++#: option.c:448 + msgid "Add requestor's IP subnet to forwarded DNS queries." + msgstr "" + +-#: option.c:446 ++#: option.c:449 + msgid "Proxy DNSSEC validation results from upstream nameservers." + msgstr "" + +-#: option.c:447 ++#: option.c:450 + msgid "Attempt to allocate sequential IP addresses to DHCP clients." + msgstr "" + +-#: option.c:448 ++#: option.c:451 + msgid "Copy connection-track mark from queries to upstream connections." + msgstr "" + +-#: option.c:449 ++#: option.c:452 + msgid "Allow DHCP clients to do their own DDNS updates." + msgstr "" + +-#: option.c:450 ++#: option.c:453 + msgid "Send router-advertisements for interfaces doing DHCPv6" + msgstr "" + +-#: option.c:451 ++#: option.c:454 + msgid "Specify DUID_EN-type DHCPv6 server DUID" + msgstr "" + +-#: option.c:452 ++#: option.c:455 + msgid "Specify host (A/AAAA and PTR) records" + msgstr "" + +-#: option.c:453 ++#: option.c:456 + msgid "Specify arbitrary DNS resource record" + msgstr "" + +-#: option.c:454 ++#: option.c:457 + msgid "Bind to interfaces in use - check for new interfaces" + msgstr "" + +-#: option.c:455 ++#: option.c:458 + msgid "Export local names to global DNS" + msgstr "" + +-#: option.c:456 ++#: option.c:459 + msgid "Domain to export to global DNS" + msgstr "" + +-#: option.c:457 ++#: option.c:460 + msgid "Set TTL for authoritative replies" + msgstr "" + +-#: option.c:458 ++#: option.c:461 + msgid "Set authoritive zone information" + msgstr "" + +-#: option.c:459 ++#: option.c:462 + msgid "Secondary authoritative nameservers for forward domains" + msgstr "" + +-#: option.c:460 ++#: option.c:463 + msgid "Peers which are allowed to do zone transfer" + msgstr "" + +-#: option.c:461 ++#: option.c:464 + msgid "Specify ipsets to which matching domains should be added" + msgstr "" + +-#: option.c:462 ++#: option.c:465 + msgid "Specify a domain and address range for synthesised names" + msgstr "" + +-#: option.c:463 ++#: option.c:466 + msgid "Activate DNSSEC validation" + msgstr "" + +-#: option.c:464 ++#: option.c:467 + msgid "Specify trust anchor key digest." + msgstr "" + +-#: option.c:465 ++#: option.c:468 + msgid "Disable upstream checking for DNSSEC debugging." + msgstr "" + +-#: option.c:466 ++#: option.c:469 + msgid "Ensure answers without DNSSEC are in unsigned zones." + msgstr "" + +-#: option.c:467 ++#: option.c:470 + msgid "Don't check DNSSEC signature timestamps until first cache-reload" + msgstr "" + +-#: option.c:468 ++#: option.c:471 + msgid "Timestamp file to verify system clock for DNSSEC" + msgstr "" + +-#: option.c:470 ++#: option.c:473 + msgid "Specify DHCPv6 prefix class" + msgstr "" + +-#: option.c:472 ++#: option.c:475 + msgid "Set priority, resend-interval and router-lifetime" + msgstr "" + +-#: option.c:473 ++#: option.c:476 + msgid "Do not log routine DHCP." + msgstr "" + +-#: option.c:474 ++#: option.c:477 + msgid "Do not log routine DHCPv6." + msgstr "" + +-#: option.c:475 ++#: option.c:478 + msgid "Do not log RA." + msgstr "" + +-#: option.c:476 ++#: option.c:479 + msgid "Accept queries only from directly-connected networks" + msgstr "" + +-#: option.c:477 ++#: option.c:480 + msgid "Detect and remove DNS forwarding loops" + msgstr "" + +-#: option.c:478 ++#: option.c:481 + msgid "Ignore DNS responses containing ipaddr." + msgstr "" + +-#: option.c:680 ++#: option.c:683 + #, c-format + msgid "" + "Usage: dnsmasq [options]\n" + "\n" + msgstr "" + +-#: option.c:682 ++#: option.c:685 + #, c-format + msgid "Use short options only on the command line.\n" + msgstr "" + +-#: option.c:684 ++#: option.c:687 + #, c-format + msgid "Valid options are:\n" + msgstr "" + +-#: option.c:741 option.c:745 ++#: option.c:744 option.c:748 + msgid "bad port" + msgstr "" + +-#: option.c:772 option.c:804 ++#: option.c:775 option.c:807 + msgid "interface binding not supported" + msgstr "" + +-#: option.c:781 option.c:3570 ++#: option.c:784 option.c:3575 + msgid "bad interface name" + msgstr "" + +-#: option.c:811 ++#: option.c:814 + msgid "bad address" + msgstr "" + +-#: option.c:993 ++#: option.c:996 + msgid "unsupported encapsulation for IPv6 option" + msgstr "" + +-#: option.c:1007 ++#: option.c:1010 + msgid "bad dhcp-option" + msgstr "" + +-#: option.c:1075 ++#: option.c:1078 + msgid "bad IP address" + msgstr "" + +-#: option.c:1078 option.c:1216 option.c:2888 ++#: option.c:1081 option.c:1219 option.c:2893 + msgid "bad IPv6 address" + msgstr "" + +-#: option.c:1243 option.c:1337 ++#: option.c:1246 option.c:1340 + msgid "bad domain in dhcp-option" + msgstr "" + +-#: option.c:1375 ++#: option.c:1378 + msgid "dhcp-option too long" + msgstr "" + +-#: option.c:1382 ++#: option.c:1385 + msgid "illegal dhcp-match" + msgstr "" + +-#: option.c:1444 ++#: option.c:1447 + msgid "illegal repeated flag" + msgstr "" + +-#: option.c:1452 ++#: option.c:1455 + msgid "illegal repeated keyword" + msgstr "" + +-#: option.c:1517 option.c:4186 ++#: option.c:1520 option.c:4191 + #, c-format + msgid "cannot access directory %s: %s" + msgstr "" + +-#: option.c:1563 tftp.c:493 ++#: option.c:1566 tftp.c:493 + #, c-format + msgid "cannot access %s: %s" + msgstr "" + +-#: option.c:1615 ++#: option.c:1618 + msgid "setting log facility is not possible under Android" + msgstr "" + +-#: option.c:1624 ++#: option.c:1627 + msgid "bad log facility" + msgstr "" + +-#: option.c:1677 ++#: option.c:1680 + msgid "bad MX preference" + msgstr "" + +-#: option.c:1682 ++#: option.c:1685 + msgid "bad MX name" + msgstr "" + +-#: option.c:1696 ++#: option.c:1699 + msgid "bad MX target" + msgstr "" + +-#: option.c:1708 ++#: option.c:1711 + msgid "cannot run scripts under uClinux" + msgstr "" + +-#: option.c:1710 ++#: option.c:1713 + msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts" + msgstr "" + +-#: option.c:1714 ++#: option.c:1717 + msgid "recompile with HAVE_LUASCRIPT defined to enable Lua scripts" + msgstr "" + +-#: option.c:1970 option.c:2015 option.c:2071 ++#: option.c:1973 option.c:2018 option.c:2074 + msgid "bad prefix" + msgstr "" + +-#: option.c:2352 ++#: option.c:2355 + msgid "recompile with HAVE_IPSET defined to enable ipset directives" + msgstr "" + +-#: option.c:2545 ++#: option.c:2548 + msgid "bad port range" + msgstr "" + +-#: option.c:2561 ++#: option.c:2564 + msgid "bad bridge-interface" + msgstr "" + +-#: option.c:2621 ++#: option.c:2624 + msgid "only one tag allowed" + msgstr "" + +-#: option.c:2641 option.c:2653 option.c:2759 option.c:2800 ++#: option.c:2644 option.c:2656 option.c:2764 option.c:2805 + msgid "bad dhcp-range" + msgstr "" + +-#: option.c:2668 ++#: option.c:2671 + msgid "inconsistent DHCP range" + msgstr "" + +-#: option.c:2727 ++#: option.c:2732 + msgid "prefix length must be exactly 64 for RA subnets" + msgstr "" + +-#: option.c:2729 ++#: option.c:2734 + msgid "prefix length must be exactly 64 for subnet constructors" + msgstr "" + +-#: option.c:2733 ++#: option.c:2738 + msgid "prefix length must be at least 64" + msgstr "" + +-#: option.c:2736 ++#: option.c:2741 + msgid "inconsistent DHCPv6 range" + msgstr "" + +-#: option.c:2747 ++#: option.c:2752 + msgid "prefix must be zero with \"constructor:\" argument" + msgstr "" + +-#: option.c:2858 option.c:2906 ++#: option.c:2863 option.c:2911 + msgid "bad hex constant" + msgstr "" + +-#: option.c:2880 ++#: option.c:2885 + msgid "cannot match tags in --dhcp-host" + msgstr "" + +-#: option.c:2928 ++#: option.c:2933 + #, c-format + msgid "duplicate dhcp-host IP address %s" + msgstr "" + +-#: option.c:2986 ++#: option.c:2991 + msgid "bad DHCP host name" + msgstr "" + +-#: option.c:3068 ++#: option.c:3073 + msgid "bad tag-if" + msgstr "" + +-#: option.c:3392 option.c:3786 ++#: option.c:3397 option.c:3791 + msgid "invalid port number" + msgstr "" + +-#: option.c:3454 ++#: option.c:3459 + msgid "bad dhcp-proxy address" + msgstr "" + +-#: option.c:3480 ++#: option.c:3485 + msgid "Bad dhcp-relay" + msgstr "" + +-#: option.c:3506 ++#: option.c:3511 + msgid "bad RA-params" + msgstr "" + +-#: option.c:3515 ++#: option.c:3520 + msgid "bad DUID" + msgstr "" + +-#: option.c:3557 ++#: option.c:3562 + msgid "invalid alias range" + msgstr "" + +-#: option.c:3611 ++#: option.c:3616 + msgid "bad CNAME" + msgstr "" + +-#: option.c:3616 ++#: option.c:3621 + msgid "duplicate CNAME" + msgstr "" + +-#: option.c:3636 ++#: option.c:3641 + msgid "bad PTR record" + msgstr "" + +-#: option.c:3667 ++#: option.c:3672 + msgid "bad NAPTR record" + msgstr "" + +-#: option.c:3701 ++#: option.c:3706 + msgid "bad RR record" + msgstr "" + +-#: option.c:3731 ++#: option.c:3736 + msgid "bad TXT record" + msgstr "" + +-#: option.c:3772 ++#: option.c:3777 + msgid "bad SRV record" + msgstr "" + +-#: option.c:3779 ++#: option.c:3784 + msgid "bad SRV target" + msgstr "" + +-#: option.c:3793 ++#: option.c:3798 + msgid "invalid priority" + msgstr "" + +-#: option.c:3800 ++#: option.c:3805 + msgid "invalid weight" + msgstr "" + +-#: option.c:3824 ++#: option.c:3829 + msgid "Bad host-record" + msgstr "" + +-#: option.c:3841 ++#: option.c:3846 + msgid "Bad name in host-record" + msgstr "" + +-#: option.c:3906 ++#: option.c:3911 + msgid "bad trust anchor" + msgstr "" + +-#: option.c:3920 ++#: option.c:3925 + msgid "bad HEX in trust anchor" + msgstr "" + +-#: option.c:3930 ++#: option.c:3935 + msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DNSSEC/DBus support)" + msgstr "" + +-#: option.c:3989 ++#: option.c:3994 + msgid "missing \"" + msgstr "" + +-#: option.c:4046 ++#: option.c:4051 + msgid "bad option" + msgstr "" + +-#: option.c:4048 ++#: option.c:4053 + msgid "extraneous parameter" + msgstr "" + +-#: option.c:4050 ++#: option.c:4055 + msgid "missing parameter" + msgstr "" + +-#: option.c:4052 ++#: option.c:4057 + msgid "illegal option" + msgstr "" + +-#: option.c:4059 ++#: option.c:4064 + msgid "error" + msgstr "" + +-#: option.c:4061 ++#: option.c:4066 + #, c-format + msgid " at line %d of %s" + msgstr "" + +-#: option.c:4076 option.c:4323 option.c:4359 ++#: option.c:4081 option.c:4328 option.c:4364 + #, c-format + msgid "read %s" + msgstr "" + +-#: option.c:4139 option.c:4262 tftp.c:667 ++#: option.c:4144 option.c:4267 tftp.c:667 + #, c-format + msgid "cannot read %s: %s" + msgstr "" + +-#: option.c:4425 ++#: option.c:4430 + msgid "junk found in command line" + msgstr "" + +-#: option.c:4460 ++#: option.c:4465 + #, c-format + msgid "Dnsmasq version %s %s\n" + msgstr "" + +-#: option.c:4461 ++#: option.c:4466 + #, c-format + msgid "" + "Compile time options: %s\n" + "\n" + msgstr "" + +-#: option.c:4462 ++#: option.c:4467 + #, c-format + msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" + msgstr "" + +-#: option.c:4463 ++#: option.c:4468 + #, c-format + msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" + msgstr "" + +-#: option.c:4464 ++#: option.c:4469 + #, c-format + msgid "under the terms of the GNU General Public License, version 2 or 3.\n" + msgstr "" + +-#: option.c:4475 ++#: option.c:4480 + msgid "try --help" + msgstr "" + +-#: option.c:4477 ++#: option.c:4482 + msgid "try -w" + msgstr "" + +-#: option.c:4479 ++#: option.c:4484 + #, c-format + msgid "bad command line options: %s" + msgstr "" + +-#: option.c:4535 ++#: option.c:4544 + #, c-format + msgid "cannot get host-name: %s" + msgstr "" + +-#: option.c:4563 ++#: option.c:4572 + msgid "only one resolv.conf file allowed in no-poll mode." + msgstr "" + +-#: option.c:4573 ++#: option.c:4582 + msgid "must have exactly one resolv.conf to read domain from." + msgstr "" + +-#: option.c:4576 network.c:1506 dhcp.c:774 ++#: option.c:4585 network.c:1507 dhcp.c:777 + #, c-format + msgid "failed to read %s: %s" + msgstr "" + +-#: option.c:4593 ++#: option.c:4602 + #, c-format + msgid "no search directive found in %s" + msgstr "" + +-#: option.c:4614 ++#: option.c:4623 + msgid "there must be a default domain when --dhcp-fqdn is set" + msgstr "" + +-#: option.c:4623 ++#: option.c:4632 + msgid "syntax check OK" + msgstr "" + +@@ -1100,25 +1104,25 @@ msgstr "" + msgid "failed to send packet: %s" + msgstr "" + +-#: forward.c:572 ++#: forward.c:591 + msgid "discarding DNS reply: subnet option mismatch" + msgstr "" + +-#: forward.c:595 ++#: forward.c:614 + #, c-format + msgid "nameserver %s refused to do a recursive query" + msgstr "" + +-#: forward.c:627 ++#: forward.c:646 + #, c-format + msgid "possible DNS-rebind attack detected: %s" + msgstr "" + +-#: forward.c:1156 forward.c:1722 ++#: forward.c:1209 forward.c:1785 + msgid "Ignoring query from non-local network" + msgstr "" + +-#: forward.c:2178 ++#: forward.c:2256 + #, c-format + msgid "Maximum number of concurrent DNS queries reached (max: %d)" + msgstr "" +@@ -1152,332 +1156,342 @@ msgstr "" + msgid "failed to bind server socket for %s: %s" + msgstr "" + +-#: network.c:1444 ++#: network.c:1445 + #, c-format + msgid "ignoring nameserver %s - local interface" + msgstr "" + +-#: network.c:1455 ++#: network.c:1456 + #, c-format + msgid "ignoring nameserver %s - cannot make/bind socket: %s" + msgstr "" + +-#: network.c:1468 ++#: network.c:1469 + msgid "unqualified" + msgstr "" + +-#: network.c:1468 ++#: network.c:1469 + msgid "names" + msgstr "" + +-#: network.c:1470 ++#: network.c:1471 + msgid "default" + msgstr "" + +-#: network.c:1472 ++#: network.c:1473 + msgid "domain" + msgstr "" + +-#: network.c:1475 ++#: network.c:1476 + #, c-format + msgid "using local addresses only for %s %s" + msgstr "" + +-#: network.c:1477 ++#: network.c:1478 + #, c-format + msgid "using standard nameservers for %s %s" + msgstr "" + +-#: network.c:1479 ++#: network.c:1480 + #, c-format + msgid "using nameserver %s#%d for %s %s" + msgstr "" + +-#: network.c:1483 ++#: network.c:1484 + #, c-format + msgid "NOT using nameserver %s#%d - query loop detected" + msgstr "" + +-#: network.c:1486 ++#: network.c:1487 + #, c-format + msgid "using nameserver %s#%d(via %s)" + msgstr "" + +-#: network.c:1488 ++#: network.c:1489 + #, c-format + msgid "using nameserver %s#%d" + msgstr "" + +-#: dnsmasq.c:149 ++#: dnsmasq.c:163 + msgid "dhcp-hostsdir, dhcp-optsdir and hostsdir are not supported on this platform" + msgstr "" + +-#: dnsmasq.c:156 ++#: dnsmasq.c:170 + msgid "no trust anchors provided for DNSSEC" + msgstr "" + +-#: dnsmasq.c:159 ++#: dnsmasq.c:173 + msgid "cannot reduce cache size from default when DNSSEC enabled" + msgstr "" + +-#: dnsmasq.c:161 ++#: dnsmasq.c:175 + msgid "DNSSEC not available: set HAVE_DNSSEC in src/config.h" + msgstr "" + +-#: dnsmasq.c:167 ++#: dnsmasq.c:181 + msgid "TFTP server not available: set HAVE_TFTP in src/config.h" + msgstr "" + +-#: dnsmasq.c:172 ++#: dnsmasq.c:186 + msgid "cannot use --conntrack AND --query-port" + msgstr "" + +-#: dnsmasq.c:175 ++#: dnsmasq.c:189 + msgid "conntrack support not available: set HAVE_CONNTRACK in src/config.h" + msgstr "" + +-#: dnsmasq.c:180 ++#: dnsmasq.c:194 + msgid "asychronous logging is not available under Solaris" + msgstr "" + +-#: dnsmasq.c:185 ++#: dnsmasq.c:199 + msgid "asychronous logging is not available under Android" + msgstr "" + +-#: dnsmasq.c:190 ++#: dnsmasq.c:204 + msgid "authoritative DNS not available: set HAVE_AUTH in src/config.h" + msgstr "" + +-#: dnsmasq.c:195 ++#: dnsmasq.c:209 + msgid "loop detection not available: set HAVE_LOOP in src/config.h" + msgstr "" + +-#: dnsmasq.c:203 ++#: dnsmasq.c:217 + msgid "zone serial must be configured in --auth-soa" + msgstr "" + +-#: dnsmasq.c:221 ++#: dnsmasq.c:235 + msgid "dhcp-range constructor not available on this platform" + msgstr "" + +-#: dnsmasq.c:264 ++#: dnsmasq.c:278 + msgid "cannot set --bind-interfaces and --bind-dynamic" + msgstr "" + +-#: dnsmasq.c:267 ++#: dnsmasq.c:281 + #, c-format + msgid "failed to find list of interfaces: %s" + msgstr "" + +-#: dnsmasq.c:276 ++#: dnsmasq.c:290 + #, c-format + msgid "unknown interface %s" + msgstr "" + +-#: dnsmasq.c:340 dnsmasq.c:1004 ++#: dnsmasq.c:354 dnsmasq.c:1037 + #, c-format + msgid "DBus error: %s" + msgstr "" + +-#: dnsmasq.c:343 ++#: dnsmasq.c:357 + msgid "DBus not available: set HAVE_DBUS in src/config.h" + msgstr "" + +-#: dnsmasq.c:371 ++#: dnsmasq.c:385 + #, c-format + msgid "unknown user or group: %s" + msgstr "" + +-#: dnsmasq.c:426 ++#: dnsmasq.c:440 + #, c-format + msgid "cannot chdir to filesystem root: %s" + msgstr "" + +-#: dnsmasq.c:667 ++#: dnsmasq.c:692 + #, c-format + msgid "started, version %s DNS disabled" + msgstr "" + +-#: dnsmasq.c:669 ++#: dnsmasq.c:694 + #, c-format + msgid "started, version %s cachesize %d" + msgstr "" + +-#: dnsmasq.c:671 ++#: dnsmasq.c:696 + #, c-format + msgid "started, version %s cache disabled" + msgstr "" + +-#: dnsmasq.c:673 ++#: dnsmasq.c:698 + #, c-format + msgid "compile time options: %s" + msgstr "" + +-#: dnsmasq.c:679 ++#: dnsmasq.c:704 + msgid "DBus support enabled: connected to system bus" + msgstr "" + +-#: dnsmasq.c:681 ++#: dnsmasq.c:706 + msgid "DBus support enabled: bus connection pending" + msgstr "" + +-#: dnsmasq.c:686 ++#: dnsmasq.c:711 + msgid "DNS service limited to local subnets" + msgstr "" + +-#: dnsmasq.c:702 ++#: dnsmasq.c:727 + msgid "DNSSEC validation enabled" + msgstr "" + +-#: dnsmasq.c:705 ++#: dnsmasq.c:730 + msgid "DNSSEC signature timestamps not checked until first cache reload" + msgstr "" + +-#: dnsmasq.c:708 ++#: dnsmasq.c:733 + msgid "DNSSEC signature timestamps not checked until system time valid" + msgstr "" + +-#: dnsmasq.c:713 ++#: dnsmasq.c:738 + #, c-format + msgid "warning: failed to change owner of %s: %s" + msgstr "" + +-#: dnsmasq.c:717 ++#: dnsmasq.c:742 + msgid "setting --bind-interfaces option because of OS limitations" + msgstr "" + +-#: dnsmasq.c:727 ++#: dnsmasq.c:752 + #, c-format + msgid "warning: interface %s does not currently exist" + msgstr "" + +-#: dnsmasq.c:732 ++#: dnsmasq.c:757 + msgid "warning: ignoring resolv-file flag because no-resolv is set" + msgstr "" + +-#: dnsmasq.c:735 ++#: dnsmasq.c:760 + msgid "warning: no upstream servers configured" + msgstr "" + +-#: dnsmasq.c:739 ++#: dnsmasq.c:764 + #, c-format + msgid "asynchronous logging enabled, queue limit is %d messages" + msgstr "" + +-#: dnsmasq.c:760 ++#: dnsmasq.c:785 + msgid "IPv6 router advertisement enabled" + msgstr "" + +-#: dnsmasq.c:765 ++#: dnsmasq.c:790 + #, c-format + msgid "DHCP, sockets bound exclusively to interface %s" + msgstr "" + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "root is " + msgstr "" + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "enabled" + msgstr "" + +-#: dnsmasq.c:784 ++#: dnsmasq.c:810 + msgid "secure mode" + msgstr "" + +-#: dnsmasq.c:810 ++#: dnsmasq.c:813 ++#, c-format ++msgid "warning: %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:817 ++#, c-format ++msgid "warning: TFTP directory %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:843 + #, c-format + msgid "restricting maximum simultaneous TFTP transfers to %d" + msgstr "" + +-#: dnsmasq.c:1006 ++#: dnsmasq.c:1039 + msgid "connected to system DBus" + msgstr "" + +-#: dnsmasq.c:1156 ++#: dnsmasq.c:1189 + #, c-format + msgid "cannot fork into background: %s" + msgstr "" + +-#: dnsmasq.c:1159 ++#: dnsmasq.c:1192 + #, c-format + msgid "failed to create helper: %s" + msgstr "" + +-#: dnsmasq.c:1162 ++#: dnsmasq.c:1195 + #, c-format + msgid "setting capabilities failed: %s" + msgstr "" + +-#: dnsmasq.c:1165 ++#: dnsmasq.c:1198 + #, c-format + msgid "failed to change user-id to %s: %s" + msgstr "" + +-#: dnsmasq.c:1168 ++#: dnsmasq.c:1201 + #, c-format + msgid "failed to change group-id to %s: %s" + msgstr "" + +-#: dnsmasq.c:1171 ++#: dnsmasq.c:1204 + #, c-format + msgid "failed to open pidfile %s: %s" + msgstr "" + +-#: dnsmasq.c:1174 ++#: dnsmasq.c:1207 + #, c-format + msgid "cannot open log %s: %s" + msgstr "" + +-#: dnsmasq.c:1177 ++#: dnsmasq.c:1210 + #, c-format + msgid "failed to load Lua script: %s" + msgstr "" + +-#: dnsmasq.c:1180 ++#: dnsmasq.c:1213 + #, c-format + msgid "TFTP directory %s inaccessible: %s" + msgstr "" + +-#: dnsmasq.c:1183 ++#: dnsmasq.c:1216 + #, c-format + msgid "cannot create timestamp file %s: %s" + msgstr "" + +-#: dnsmasq.c:1204 ++#: dnsmasq.c:1237 + msgid "now checking DNSSEC signature timestamps" + msgstr "" + +-#: dnsmasq.c:1271 ++#: dnsmasq.c:1304 + #, c-format + msgid "script process killed by signal %d" + msgstr "" + +-#: dnsmasq.c:1275 ++#: dnsmasq.c:1308 + #, c-format + msgid "script process exited with status %d" + msgstr "" + +-#: dnsmasq.c:1279 ++#: dnsmasq.c:1312 + #, c-format + msgid "failed to execute %s: %s" + msgstr "" + +-#: dnsmasq.c:1334 ++#: dnsmasq.c:1367 + msgid "exiting on receipt of SIGTERM" + msgstr "" + +-#: dnsmasq.c:1362 ++#: dnsmasq.c:1395 + #, c-format + msgid "failed to access %s: %s" + msgstr "" + +-#: dnsmasq.c:1392 ++#: dnsmasq.c:1425 + #, c-format + msgid "reading %s" + msgstr "" + +-#: dnsmasq.c:1403 ++#: dnsmasq.c:1436 + #, c-format + msgid "no servers found in %s, will retry" + msgstr "" +@@ -1507,37 +1521,37 @@ msgstr "" + msgid "cannot create ICMP raw socket: %s." + msgstr "" + +-#: dhcp.c:239 ++#: dhcp.c:241 dhcp6.c:180 + #, c-format + msgid "unknown interface %s in bridge-interface" + msgstr "" + +-#: dhcp.c:278 ++#: dhcp.c:281 + #, c-format + msgid "DHCP packet received on %s which has no address" + msgstr "" + +-#: dhcp.c:412 ++#: dhcp.c:415 + #, c-format + msgid "ARP-cache injection failed: %s" + msgstr "" + +-#: dhcp.c:511 ++#: dhcp.c:514 + #, c-format + msgid "DHCP range %s -- %s is not consistent with netmask %s" + msgstr "" + +-#: dhcp.c:812 ++#: dhcp.c:815 + #, c-format + msgid "bad line at %s line %d" + msgstr "" + +-#: dhcp.c:855 ++#: dhcp.c:858 + #, c-format + msgid "ignoring %s line %d, duplicate name or IP address" + msgstr "" + +-#: dhcp.c:999 rfc3315.c:2139 ++#: dhcp.c:1002 rfc3315.c:2135 + #, c-format + msgid "DHCP relay %s -> %s" + msgstr "" +@@ -1571,169 +1585,169 @@ msgstr "" + msgid "Ignoring domain %s for DHCP host name %s" + msgstr "" + +-#: rfc2131.c:342 ++#: rfc2131.c:344 + #, c-format + msgid "no address range available for DHCP request %s %s" + msgstr "" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "with subnet selector" + msgstr "" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "via" + msgstr "" + +-#: rfc2131.c:355 ++#: rfc2131.c:357 + #, c-format + msgid "%u available DHCP subnet: %s/%s" + msgstr "" + +-#: rfc2131.c:358 rfc3315.c:300 ++#: rfc2131.c:360 rfc3315.c:300 + #, c-format + msgid "%u available DHCP range: %s -- %s" + msgstr "" + +-#: rfc2131.c:469 ++#: rfc2131.c:471 + #, c-format + msgid "%u vendor class: %s" + msgstr "" + +-#: rfc2131.c:471 ++#: rfc2131.c:473 + #, c-format + msgid "%u user class: %s" + msgstr "" + +-#: rfc2131.c:498 ++#: rfc2131.c:500 + msgid "disabled" + msgstr "" + +-#: rfc2131.c:539 rfc2131.c:967 rfc2131.c:1385 rfc3315.c:603 rfc3315.c:860 +-#: rfc3315.c:1139 ++#: rfc2131.c:541 rfc2131.c:974 rfc2131.c:1380 rfc3315.c:603 rfc3315.c:856 ++#: rfc3315.c:1135 + msgid "ignored" + msgstr "" + +-#: rfc2131.c:554 rfc2131.c:1205 rfc3315.c:910 ++#: rfc2131.c:556 rfc2131.c:1207 rfc3315.c:906 + msgid "address in use" + msgstr "" + +-#: rfc2131.c:568 rfc2131.c:1021 ++#: rfc2131.c:570 rfc2131.c:1028 + msgid "no address available" + msgstr "" + +-#: rfc2131.c:575 rfc2131.c:1168 ++#: rfc2131.c:577 rfc2131.c:1170 + msgid "wrong network" + msgstr "" + +-#: rfc2131.c:590 ++#: rfc2131.c:592 + msgid "no address configured" + msgstr "" + +-#: rfc2131.c:596 rfc2131.c:1218 ++#: rfc2131.c:598 rfc2131.c:1220 + msgid "no leases left" + msgstr "" + +-#: rfc2131.c:691 rfc3315.c:476 ++#: rfc2131.c:693 rfc3315.c:476 + #, c-format + msgid "%u client provides name: %s" + msgstr "" + +-#: rfc2131.c:796 ++#: rfc2131.c:798 + msgid "PXE BIS not supported" + msgstr "" + +-#: rfc2131.c:935 rfc3315.c:1233 ++#: rfc2131.c:942 rfc3315.c:1229 + #, c-format + msgid "disabling DHCP static address %s for %s" + msgstr "" + +-#: rfc2131.c:956 ++#: rfc2131.c:963 + msgid "unknown lease" + msgstr "" + +-#: rfc2131.c:990 ++#: rfc2131.c:997 + #, c-format + msgid "not using configured address %s because it is leased to %s" + msgstr "" + +-#: rfc2131.c:1000 ++#: rfc2131.c:1007 + #, c-format + msgid "not using configured address %s because it is in use by the server or relay" + msgstr "" + +-#: rfc2131.c:1003 ++#: rfc2131.c:1010 + #, c-format + msgid "not using configured address %s because it was previously declined" + msgstr "" + +-#: rfc2131.c:1019 rfc2131.c:1211 ++#: rfc2131.c:1026 rfc2131.c:1213 + msgid "no unique-id" + msgstr "" + +-#: rfc2131.c:1106 ++#: rfc2131.c:1108 + msgid "wrong server-ID" + msgstr "" + +-#: rfc2131.c:1125 ++#: rfc2131.c:1127 + msgid "wrong address" + msgstr "" + +-#: rfc2131.c:1143 rfc3315.c:1006 ++#: rfc2131.c:1145 rfc3315.c:1002 + msgid "lease not found" + msgstr "" + +-#: rfc2131.c:1176 ++#: rfc2131.c:1178 + msgid "address not available" + msgstr "" + +-#: rfc2131.c:1187 ++#: rfc2131.c:1189 + msgid "static lease available" + msgstr "" + +-#: rfc2131.c:1191 ++#: rfc2131.c:1193 + msgid "address reserved" + msgstr "" + +-#: rfc2131.c:1199 ++#: rfc2131.c:1201 + #, c-format + msgid "abandoning lease to %s of %s" + msgstr "" + +-#: rfc2131.c:1712 ++#: rfc2131.c:1707 + #, c-format + msgid "%u bootfile name: %s" + msgstr "" + +-#: rfc2131.c:1721 ++#: rfc2131.c:1716 + #, c-format + msgid "%u server name: %s" + msgstr "" + +-#: rfc2131.c:1729 ++#: rfc2131.c:1724 + #, c-format + msgid "%u next server: %s" + msgstr "" + +-#: rfc2131.c:1732 ++#: rfc2131.c:1727 + #, c-format + msgid "%u broadcast response" + msgstr "" + +-#: rfc2131.c:1795 ++#: rfc2131.c:1790 + #, c-format + msgid "cannot send DHCP/BOOTP option %d: no space left in packet" + msgstr "" + +-#: rfc2131.c:2036 ++#: rfc2131.c:2031 + msgid "PXE menu too large" + msgstr "" + +-#: rfc2131.c:2173 rfc3315.c:1506 ++#: rfc2131.c:2170 rfc3315.c:1502 + #, c-format + msgid "%u requested options: %s" + msgstr "" + +-#: rfc2131.c:2453 ++#: rfc2131.c:2487 + #, c-format + msgid "cannot send RFC3925 option: too many options for enterprise number %d" + msgstr "" +@@ -1748,15 +1762,25 @@ msgstr "" + msgid "netlink returns error: %s" + msgstr "" + +-#: dbus.c:171 ++#: dbus.c:186 + msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" + msgstr "" + +-#: dbus.c:500 ++#: dbus.c:439 ++#, c-format ++msgid "Enabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:444 ++#, c-format ++msgid "Disabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:691 + msgid "setting upstream servers from DBus" + msgstr "" + +-#: dbus.c:547 ++#: dbus.c:738 + msgid "could not register a DBus message handler" + msgstr "" + +@@ -1876,47 +1900,47 @@ msgstr "" + msgid "unknown prefix-class %d" + msgstr "" + +-#: rfc3315.c:803 rfc3315.c:902 ++#: rfc3315.c:803 rfc3315.c:898 + msgid "address unavailable" + msgstr "" + +-#: rfc3315.c:815 rfc3315.c:950 rfc3315.c:1283 ++#: rfc3315.c:815 rfc3315.c:946 rfc3315.c:1279 + msgid "success" + msgstr "" + +-#: rfc3315.c:843 rfc3315.c:845 rfc3315.c:958 rfc3315.c:960 ++#: rfc3315.c:830 rfc3315.c:839 rfc3315.c:954 rfc3315.c:956 + msgid "no addresses available" + msgstr "" + +-#: rfc3315.c:937 ++#: rfc3315.c:933 + msgid "not on link" + msgstr "" + +-#: rfc3315.c:1010 rfc3315.c:1195 rfc3315.c:1272 ++#: rfc3315.c:1006 rfc3315.c:1191 rfc3315.c:1268 + msgid "no binding found" + msgstr "" + +-#: rfc3315.c:1048 ++#: rfc3315.c:1044 + msgid "deprecated" + msgstr "" + +-#: rfc3315.c:1053 ++#: rfc3315.c:1049 + msgid "address invalid" + msgstr "" + +-#: rfc3315.c:1100 ++#: rfc3315.c:1096 + msgid "confirm failed" + msgstr "" + +-#: rfc3315.c:1116 ++#: rfc3315.c:1112 + msgid "all addresses still on link" + msgstr "" + +-#: rfc3315.c:1204 ++#: rfc3315.c:1200 + msgid "release received" + msgstr "" + +-#: rfc3315.c:2130 ++#: rfc3315.c:2126 + msgid "Cannot multicast to DHCPv6 server without correct interface" + msgstr "" + +@@ -2004,12 +2028,12 @@ msgstr "" + msgid "DHCP relay from %s to %s" + msgstr "" + +-#: radv.c:98 ++#: radv.c:109 + #, c-format + msgid "cannot create ICMPv6 socket: %s" + msgstr "" + +-#: auth.c:436 ++#: auth.c:448 + #, c-format + msgid "ignoring zone transfer request from %s" + msgstr "" +@@ -2024,7 +2048,7 @@ msgstr "" + msgid "failed to create IPset control socket: %s" + msgstr "" + +-#: dnssec.c:425 dnssec.c:469 ++#: dnssec.c:449 dnssec.c:493 + #, c-format + msgid "failed to update mtime on %s: %s" + msgstr "" +diff --git a/po/no.po b/po/no.po +index c2e7067d2304..1681e06908a7 100644 +--- a/po/no.po ++++ b/po/no.po +@@ -27,17 +27,17 @@ msgstr "" + msgid "failed to load names from %s: %s" + msgstr "feilet å laste navn fra %s: %s" + +-#: cache.c:967 dhcp.c:825 ++#: cache.c:967 dhcp.c:828 + #, c-format + msgid "bad address at %s line %d" + msgstr "dårlig adresse ved %s linje %d" + +-#: cache.c:1018 dhcp.c:841 ++#: cache.c:1018 dhcp.c:844 + #, c-format + msgid "bad name at %s line %d" + msgstr "dårlig navn ved %s linje %d" + +-#: cache.c:1027 dhcp.c:916 ++#: cache.c:1027 dhcp.c:919 + #, c-format + msgid "read %s - %d addresses" + msgstr "les %s - %d adresser" +@@ -96,657 +96,661 @@ msgstr "feilet + msgid "failed to allocate memory" + msgstr "feilet å laste %d bytes" + +-#: util.c:243 option.c:598 ++#: util.c:250 option.c:601 + msgid "could not get memory" + msgstr "kunne ikke få minne" + +-#: util.c:253 ++#: util.c:260 + #, fuzzy, c-format + msgid "cannot create pipe: %s" + msgstr "kan ikke lese %s: %s" + +-#: util.c:261 ++#: util.c:268 + #, fuzzy, c-format + msgid "failed to allocate %d bytes" + msgstr "feilet å laste %d bytes" + +-#: util.c:430 ++#: util.c:437 + #, c-format + msgid "infinite" + msgstr "uendelig" + +-#: option.c:330 ++#: option.c:332 + msgid "Specify local address(es) to listen on." + msgstr "Spesifiser lokal(e) adresse(r) å lytte på." + +-#: option.c:331 ++#: option.c:333 + msgid "Return ipaddr for all hosts in specified domains." + msgstr "Returner ipaddr for alle verter i det spesifiserte domenet." + +-#: option.c:332 ++#: option.c:334 + msgid "Fake reverse lookups for RFC1918 private address ranges." + msgstr "Forfalsk revers oppslag for RFC1918 private adresse områder." + +-#: option.c:333 ++#: option.c:335 + msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." + msgstr "Behandle ipaddr som NXDOMAIN (omgår Verisign wildcard)." + +-#: option.c:334 ++#: option.c:336 + #, c-format + msgid "Specify the size of the cache in entries (defaults to %s)." + msgstr "Spesifiser størrelsen på mellomlager plassene (standard er %s)." + +-#: option.c:335 ++#: option.c:337 + #, c-format + msgid "Specify configuration file (defaults to %s)." + msgstr "Spesifiser konfigurasjonsfil (standard er %s)." + +-#: option.c:336 ++#: option.c:338 + msgid "Do NOT fork into the background: run in debug mode." + msgstr "IKKE legg (fork) som bakgrunnsprosess: kjør i debug modus." + +-#: option.c:337 ++#: option.c:339 + msgid "Do NOT forward queries with no domain part." + msgstr "IKKE videresend oppslag som mangler domene del." + +-#: option.c:338 ++#: option.c:340 + msgid "Return self-pointing MX records for local hosts." + msgstr "Returner selv-pekende MX post for lokale verter." + +-#: option.c:339 ++#: option.c:341 + msgid "Expand simple names in /etc/hosts with domain-suffix." + msgstr "Utvid enkle navn i /etc/hosts med domene-suffiks." + +-#: option.c:340 ++#: option.c:342 + msgid "Don't forward spurious DNS requests from Windows hosts." + msgstr "Ikke videresend falske/uekte DNS forespørsler fra Windows verter." + +-#: option.c:341 ++#: option.c:343 + msgid "Enable DHCP in the range given with lease duration." + msgstr "Aktiver DHCP i det gitte området med leie varighet" + +-#: option.c:342 ++#: option.c:344 + #, c-format + msgid "Change to this group after startup (defaults to %s)." + msgstr "Skift til denne gruppen etter oppstart (standard er %s)." + +-#: option.c:343 ++#: option.c:345 + msgid "Set address or hostname for a specified machine." + msgstr "Sett adresse eller vertsnavn for en spesifikk maskin." + +-#: option.c:344 ++#: option.c:346 + #, fuzzy + msgid "Read DHCP host specs from file." + msgstr "dårlig MX navn" + +-#: option.c:345 ++#: option.c:347 + msgid "Read DHCP option specs from file." + msgstr "" + +-#: option.c:346 ++#: option.c:348 + #, fuzzy + msgid "Read DHCP host specs from a directory." + msgstr "dårlig MX navn" + +-#: option.c:347 ++#: option.c:349 + #, fuzzy + msgid "Read DHCP options from a directory." + msgstr "dårlig MX navn" + +-#: option.c:348 ++#: option.c:350 + msgid "Evaluate conditional tag expression." + msgstr "" + +-#: option.c:349 ++#: option.c:351 + #, c-format + msgid "Do NOT load %s file." + msgstr "IKKE last %s filen." + +-#: option.c:350 ++#: option.c:352 + #, c-format + msgid "Specify a hosts file to be read in addition to %s." + msgstr "Spesifiser en verts (hosts) fil som skal leses i tilleg til %s." + +-#: option.c:351 ++#: option.c:353 + #, fuzzy + msgid "Read hosts files from a directory." + msgstr "dårlig MX navn" + +-#: option.c:352 ++#: option.c:354 + msgid "Specify interface(s) to listen on." + msgstr "Spesifiser nettverkskort det skal lyttes på." + +-#: option.c:353 ++#: option.c:355 + msgid "Specify interface(s) NOT to listen on." + msgstr "Spesifiser nettverkskort det IKKE skal lyttes på." + +-#: option.c:354 ++#: option.c:356 + #, fuzzy + msgid "Map DHCP user class to tag." + msgstr "Map DHCP bruker klasse til opsjon sett." + +-#: option.c:355 ++#: option.c:357 + msgid "Map RFC3046 circuit-id to tag." + msgstr "" + +-#: option.c:356 ++#: option.c:358 + msgid "Map RFC3046 remote-id to tag." + msgstr "" + +-#: option.c:357 ++#: option.c:359 + msgid "Map RFC3993 subscriber-id to tag." + msgstr "" + +-#: option.c:358 ++#: option.c:360 + #, fuzzy + msgid "Don't do DHCP for hosts with tag set." + msgstr "Ikke utfør DHCP for klienter i opsjon sett." + +-#: option.c:359 ++#: option.c:361 + #, fuzzy + msgid "Force broadcast replies for hosts with tag set." + msgstr "Ikke utfør DHCP for klienter i opsjon sett." + +-#: option.c:360 ++#: option.c:362 + msgid "Do NOT fork into the background, do NOT run in debug mode." + msgstr "IKKE last (fork) som bakgrunnsprosess, IKKE kjør i debug modus." + +-#: option.c:361 ++#: option.c:363 + msgid "Assume we are the only DHCP server on the local network." + msgstr "Anta at vi er den eneste DHCP tjeneren på det lokale nettverket." + +-#: option.c:362 ++#: option.c:364 + #, c-format + msgid "Specify where to store DHCP leases (defaults to %s)." + msgstr "Spesifiser hvor DHCP leiene skal lagres (standard er %s)." + +-#: option.c:363 ++#: option.c:365 + msgid "Return MX records for local hosts." + msgstr "Returner MX records for lokale verter." + +-#: option.c:364 ++#: option.c:366 + msgid "Specify an MX record." + msgstr "Spesifiser en MX post." + +-#: option.c:365 ++#: option.c:367 + msgid "Specify BOOTP options to DHCP server." + msgstr "Spesifiser BOOTP opsjoner til DHCP tjener." + +-#: option.c:366 ++#: option.c:368 + #, c-format + msgid "Do NOT poll %s file, reload only on SIGHUP." + msgstr "IKKE spør (poll) %s fil, les på nytt kun ved SIGHUP" + +-#: option.c:367 ++#: option.c:369 + msgid "Do NOT cache failed search results." + msgstr "IKKE mellomlagre søkeresultater som feiler." + +-#: option.c:368 ++#: option.c:370 + #, c-format + msgid "Use nameservers strictly in the order given in %s." + msgstr "Bruk navnetjenere kun som bestemt i rekkefølgen gitt i %s." + +-#: option.c:369 ++#: option.c:371 + #, fuzzy + msgid "Specify options to be sent to DHCP clients." + msgstr "Sett ekstra opsjoner som skal fordeles til DHCP klientene." + +-#: option.c:370 ++#: option.c:372 + msgid "DHCP option sent even if the client does not request it." + msgstr "" + +-#: option.c:371 ++#: option.c:373 + msgid "Specify port to listen for DNS requests on (defaults to 53)." + msgstr "Spesifiser lytteport for DNS oppslag (standard er 53)." + +-#: option.c:372 ++#: option.c:374 + #, c-format + msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." + msgstr "Maksimal støttet UDP pakkestørrelse for EDNS.0 (standard er %s)." + +-#: option.c:373 ++#: option.c:375 + #, fuzzy + msgid "Log DNS queries." + msgstr "Logg oppslag." + +-#: option.c:374 ++#: option.c:376 + #, fuzzy + msgid "Force the originating port for upstream DNS queries." + msgstr "Tving bruk av opprinnelig port for oppstrøms oppslag." + +-#: option.c:375 ++#: option.c:377 + msgid "Do NOT read resolv.conf." + msgstr "IKKE les resolv.conf." + +-#: option.c:376 ++#: option.c:378 + #, c-format + msgid "Specify path to resolv.conf (defaults to %s)." + msgstr "Spesifiser stien til resolv.conf (standard er %s)." + +-#: option.c:377 ++#: option.c:379 + #, fuzzy + msgid "Specify path to file with server= options" + msgstr "Spesifiser stien til PID fil. (standard er %s)." + +-#: option.c:378 ++#: option.c:380 + msgid "Specify address(es) of upstream servers with optional domains." + msgstr "Spesifiser adressen(e) til oppstrøms tjenere med valgfrie domener." + +-#: option.c:379 ++#: option.c:381 + #, fuzzy + msgid "Specify address of upstream servers for reverse address queries" + msgstr "Spesifiser adressen(e) til oppstrøms tjenere med valgfrie domener." + +-#: option.c:380 ++#: option.c:382 + msgid "Never forward queries to specified domains." + msgstr "Aldri videresend oppslag til spesifiserte domener." + +-#: option.c:381 ++#: option.c:383 + msgid "Specify the domain to be assigned in DHCP leases." + msgstr "Spesifiser domenet som skal tildeles i DHCP leien." + +-#: option.c:382 ++#: option.c:384 + msgid "Specify default target in an MX record." + msgstr "Spesifiser default mål i en MX post." + +-#: option.c:383 ++#: option.c:385 + msgid "Specify time-to-live in seconds for replies from /etc/hosts." + msgstr "Spesifiser time-to-live i sekunder for svar fra /etc/hosts." + +-#: option.c:384 ++#: option.c:386 + #, fuzzy + msgid "Specify time-to-live in seconds for negative caching." + msgstr "Spesifiser time-to-live i sekunder for svar fra /etc/hosts." + +-#: option.c:385 ++#: option.c:387 + #, fuzzy + msgid "Specify time-to-live in seconds for maximum TTL to send to clients." + msgstr "Spesifiser time-to-live i sekunder for svar fra /etc/hosts." + +-#: option.c:386 ++#: option.c:388 + #, fuzzy + msgid "Specify time-to-live ceiling for cache." + msgstr "Spesifiser time-to-live i sekunder for svar fra /etc/hosts." + +-#: option.c:387 ++#: option.c:389 + #, fuzzy + msgid "Specify time-to-live floor for cache." + msgstr "Spesifiser time-to-live i sekunder for svar fra /etc/hosts." + +-#: option.c:388 ++#: option.c:390 + #, c-format + msgid "Change to this user after startup. (defaults to %s)." + msgstr "Skift til denne bruker etter oppstart (standard er %s)." + +-#: option.c:389 ++#: option.c:391 + #, fuzzy + msgid "Map DHCP vendor class to tag." + msgstr "Map DHCP produsent klasse til opsjon sett." + +-#: option.c:390 ++#: option.c:392 + msgid "Display dnsmasq version and copyright information." + msgstr "Vis dnsmasq versjon og copyright informasjon." + +-#: option.c:391 ++#: option.c:393 + msgid "Translate IPv4 addresses from upstream servers." + msgstr "Oversett IPv4 adresser fra oppstrøms tjenere." + +-#: option.c:392 ++#: option.c:394 + msgid "Specify a SRV record." + msgstr "Spesifiser en SRV post." + +-#: option.c:393 ++#: option.c:395 + msgid "Display this message. Use --help dhcp for known DHCP options." + msgstr "" + +-#: option.c:394 ++#: option.c:396 + #, fuzzy, c-format + msgid "Specify path of PID file (defaults to %s)." + msgstr "Spesifiser stien til PID fil. (standard er %s)." + +-#: option.c:395 ++#: option.c:397 + #, c-format + msgid "Specify maximum number of DHCP leases (defaults to %s)." + msgstr "Spesifiser maksimum antall DHCP leier (standard er %s)" + +-#: option.c:396 ++#: option.c:398 + msgid "Answer DNS queries based on the interface a query was sent to." + msgstr "Svar DNS oppslag basert på nettverkskortet oppslaget ble sendt til." + +-#: option.c:397 ++#: option.c:399 + msgid "Specify TXT DNS record." + msgstr "Spesifiser TXT DNS post." + +-#: option.c:398 ++#: option.c:400 + #, fuzzy + msgid "Specify PTR DNS record." + msgstr "Spesifiser TXT DNS post." + +-#: option.c:399 ++#: option.c:401 + msgid "Give DNS name to IPv4 address of interface." + msgstr "" + +-#: option.c:400 ++#: option.c:402 + msgid "Bind only to interfaces in use." + msgstr "Bind kun til nettverkskort som er i bruk." + +-#: option.c:401 ++#: option.c:403 + #, c-format + msgid "Read DHCP static host information from %s." + msgstr "Les DHCP statisk vert informasjon fra %s." + +-#: option.c:402 ++#: option.c:404 + msgid "Enable the DBus interface for setting upstream servers, etc." + msgstr "Aktiver DBus interface for å sette oppstrøms tjenere, osv." + +-#: option.c:403 ++#: option.c:405 + msgid "Do not provide DHCP on this interface, only provide DNS." + msgstr "Ikke lever DHCP på dette nettverkskortet, kun lever DNS." + +-#: option.c:404 ++#: option.c:406 + msgid "Enable dynamic address allocation for bootp." + msgstr "Aktiver dynamisk adresse allokering for bootp." + +-#: option.c:405 ++#: option.c:407 + #, fuzzy + msgid "Map MAC address (with wildcards) to option set." + msgstr "Map DHCP produsent klasse til opsjon sett." + +-#: option.c:406 ++#: option.c:408 + msgid "Treat DHCP requests on aliases as arriving from interface." + msgstr "" + +-#: option.c:407 ++#: option.c:409 + msgid "Disable ICMP echo address checking in the DHCP server." + msgstr "" + +-#: option.c:408 ++#: option.c:410 + msgid "Shell script to run on DHCP lease creation and destruction." + msgstr "" + +-#: option.c:409 ++#: option.c:411 + msgid "Lua script to run on DHCP lease creation and destruction." + msgstr "" + +-#: option.c:410 ++#: option.c:412 + msgid "Run lease-change scripts as this user." + msgstr "" + +-#: option.c:411 ++#: option.c:413 + msgid "Read configuration from all the files in this directory." + msgstr "" + +-#: option.c:412 ++#: option.c:414 + #, fuzzy + msgid "Log to this syslog facility or file. (defaults to DAEMON)" + msgstr "Skift til denne bruker etter oppstart (standard er %s)." + +-#: option.c:413 ++#: option.c:415 + msgid "Do not use leasefile." + msgstr "" + +-#: option.c:414 ++#: option.c:416 + #, fuzzy, c-format + msgid "Maximum number of concurrent DNS queries. (defaults to %s)" + msgstr "Spesifiser maksimum antall DHCP leier (standard er %s)" + +-#: option.c:415 ++#: option.c:417 + #, c-format + msgid "Clear DNS cache when reloading %s." + msgstr "" + +-#: option.c:416 ++#: option.c:418 + msgid "Ignore hostnames provided by DHCP clients." + msgstr "" + +-#: option.c:417 ++#: option.c:419 + msgid "Do NOT reuse filename and server fields for extra DHCP options." + msgstr "" + +-#: option.c:418 ++#: option.c:420 + msgid "Enable integrated read-only TFTP server." + msgstr "" + +-#: option.c:419 ++#: option.c:421 + msgid "Export files by TFTP only from the specified subtree." + msgstr "" + +-#: option.c:420 ++#: option.c:422 + msgid "Add client IP address to tftp-root." + msgstr "" + +-#: option.c:421 ++#: option.c:423 + msgid "Allow access only to files owned by the user running dnsmasq." + msgstr "" + +-#: option.c:422 ++#: option.c:424 ++msgid "Do not terminate the service if TFTP directories are inaccessible." ++msgstr "" ++ ++#: option.c:425 + #, fuzzy, c-format + msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." + msgstr "Spesifiser maksimum antall DHCP leier (standard er %s)" + +-#: option.c:423 ++#: option.c:426 + msgid "Disable the TFTP blocksize extension." + msgstr "" + +-#: option.c:424 ++#: option.c:427 + msgid "Convert TFTP filenames to lowercase" + msgstr "" + +-#: option.c:425 ++#: option.c:428 + msgid "Ephemeral port range for use by TFTP transfers." + msgstr "" + +-#: option.c:426 ++#: option.c:429 + msgid "Extra logging for DHCP." + msgstr "" + +-#: option.c:427 ++#: option.c:430 + msgid "Enable async. logging; optionally set queue length." + msgstr "" + +-#: option.c:428 ++#: option.c:431 + msgid "Stop DNS rebinding. Filter private IP ranges when resolving." + msgstr "" + +-#: option.c:429 ++#: option.c:432 + msgid "Allow rebinding of 127.0.0.0/8, for RBL servers." + msgstr "" + +-#: option.c:430 ++#: option.c:433 + msgid "Inhibit DNS-rebind protection on this domain." + msgstr "" + +-#: option.c:431 ++#: option.c:434 + msgid "Always perform DNS queries to all servers." + msgstr "" + +-#: option.c:432 ++#: option.c:435 + msgid "Set tag if client includes matching option in request." + msgstr "" + +-#: option.c:433 ++#: option.c:436 + msgid "Use alternative ports for DHCP." + msgstr "" + +-#: option.c:434 ++#: option.c:437 + #, fuzzy + msgid "Specify NAPTR DNS record." + msgstr "Spesifiser TXT DNS post." + +-#: option.c:435 ++#: option.c:438 + msgid "Specify lowest port available for DNS query transmission." + msgstr "" + +-#: option.c:436 ++#: option.c:439 + msgid "Use only fully qualified domain names for DHCP clients." + msgstr "" + +-#: option.c:437 ++#: option.c:440 + msgid "Generate hostnames based on MAC address for nameless clients." + msgstr "" + +-#: option.c:438 ++#: option.c:441 + msgid "Use these DHCP relays as full proxies." + msgstr "" + +-#: option.c:439 ++#: option.c:442 + msgid "Relay DHCP requests to a remote server" + msgstr "" + +-#: option.c:440 ++#: option.c:443 + msgid "Specify alias name for LOCAL DNS name." + msgstr "" + +-#: option.c:441 ++#: option.c:444 + #, fuzzy + msgid "Prompt to send to PXE clients." + msgstr "Sett ekstra opsjoner som skal fordeles til DHCP klientene." + +-#: option.c:442 ++#: option.c:445 + msgid "Boot service for PXE menu." + msgstr "" + +-#: option.c:443 ++#: option.c:446 + msgid "Check configuration syntax." + msgstr "" + +-#: option.c:444 ++#: option.c:447 + msgid "Add requestor's MAC address to forwarded DNS queries." + msgstr "" + +-#: option.c:445 ++#: option.c:448 + msgid "Add requestor's IP subnet to forwarded DNS queries." + msgstr "" + +-#: option.c:446 ++#: option.c:449 + #, fuzzy + msgid "Proxy DNSSEC validation results from upstream nameservers." + msgstr "Oversett IPv4 adresser fra oppstrøms tjenere." + +-#: option.c:447 ++#: option.c:450 + msgid "Attempt to allocate sequential IP addresses to DHCP clients." + msgstr "" + +-#: option.c:448 ++#: option.c:451 + msgid "Copy connection-track mark from queries to upstream connections." + msgstr "" + +-#: option.c:449 ++#: option.c:452 + msgid "Allow DHCP clients to do their own DDNS updates." + msgstr "" + +-#: option.c:450 ++#: option.c:453 + msgid "Send router-advertisements for interfaces doing DHCPv6" + msgstr "" + +-#: option.c:451 ++#: option.c:454 + msgid "Specify DUID_EN-type DHCPv6 server DUID" + msgstr "" + +-#: option.c:452 ++#: option.c:455 + #, fuzzy + msgid "Specify host (A/AAAA and PTR) records" + msgstr "Spesifiser en MX post." + +-#: option.c:453 ++#: option.c:456 + #, fuzzy + msgid "Specify arbitrary DNS resource record" + msgstr "Spesifiser TXT DNS post." + +-#: option.c:454 ++#: option.c:457 + #, fuzzy + msgid "Bind to interfaces in use - check for new interfaces" + msgstr "ukjent tilknytning (interface) %s" + +-#: option.c:455 ++#: option.c:458 + msgid "Export local names to global DNS" + msgstr "" + +-#: option.c:456 ++#: option.c:459 + msgid "Domain to export to global DNS" + msgstr "" + +-#: option.c:457 ++#: option.c:460 + msgid "Set TTL for authoritative replies" + msgstr "" + +-#: option.c:458 ++#: option.c:461 + msgid "Set authoritive zone information" + msgstr "" + +-#: option.c:459 ++#: option.c:462 + msgid "Secondary authoritative nameservers for forward domains" + msgstr "" + +-#: option.c:460 ++#: option.c:463 + msgid "Peers which are allowed to do zone transfer" + msgstr "" + +-#: option.c:461 ++#: option.c:464 + msgid "Specify ipsets to which matching domains should be added" + msgstr "" + +-#: option.c:462 ++#: option.c:465 + msgid "Specify a domain and address range for synthesised names" + msgstr "" + +-#: option.c:463 ++#: option.c:466 + msgid "Activate DNSSEC validation" + msgstr "" + +-#: option.c:464 ++#: option.c:467 + msgid "Specify trust anchor key digest." + msgstr "" + +-#: option.c:465 ++#: option.c:468 + msgid "Disable upstream checking for DNSSEC debugging." + msgstr "" + +-#: option.c:466 ++#: option.c:469 + msgid "Ensure answers without DNSSEC are in unsigned zones." + msgstr "" + +-#: option.c:467 ++#: option.c:470 + msgid "Don't check DNSSEC signature timestamps until first cache-reload" + msgstr "" + +-#: option.c:468 ++#: option.c:471 + msgid "Timestamp file to verify system clock for DNSSEC" + msgstr "" + +-#: option.c:470 ++#: option.c:473 + msgid "Specify DHCPv6 prefix class" + msgstr "" + +-#: option.c:472 ++#: option.c:475 + msgid "Set priority, resend-interval and router-lifetime" + msgstr "" + +-#: option.c:473 ++#: option.c:476 + msgid "Do not log routine DHCP." + msgstr "" + +-#: option.c:474 ++#: option.c:477 + msgid "Do not log routine DHCPv6." + msgstr "" + +-#: option.c:475 ++#: option.c:478 + msgid "Do not log RA." + msgstr "" + +-#: option.c:476 ++#: option.c:479 + msgid "Accept queries only from directly-connected networks" + msgstr "" + +-#: option.c:477 ++#: option.c:480 + msgid "Detect and remove DNS forwarding loops" + msgstr "" + +-#: option.c:478 ++#: option.c:481 + msgid "Ignore DNS responses containing ipaddr." + msgstr "" + +-#: option.c:680 ++#: option.c:683 + #, c-format + msgid "" + "Usage: dnsmasq [options]\n" +@@ -755,332 +759,332 @@ msgstr "" + "Bruk: dnsmasq [opsjoner]\n" + "\n" + +-#: option.c:682 ++#: option.c:685 + #, c-format + msgid "Use short options only on the command line.\n" + msgstr "Bruk korte opsjoner kun på kommandolinjen.\n" + +-#: option.c:684 ++#: option.c:687 + #, fuzzy, c-format + msgid "Valid options are:\n" + msgstr "Gyldige opsjoner er :\n" + +-#: option.c:741 option.c:745 ++#: option.c:744 option.c:748 + msgid "bad port" + msgstr "dårlig port" + +-#: option.c:772 option.c:804 ++#: option.c:775 option.c:807 + msgid "interface binding not supported" + msgstr "" + +-#: option.c:781 option.c:3570 ++#: option.c:784 option.c:3575 + #, fuzzy + msgid "bad interface name" + msgstr "dårlig MX navn" + +-#: option.c:811 ++#: option.c:814 + #, fuzzy + msgid "bad address" + msgstr "les %s - %d adresser" + +-#: option.c:993 ++#: option.c:996 + msgid "unsupported encapsulation for IPv6 option" + msgstr "" + +-#: option.c:1007 ++#: option.c:1010 + msgid "bad dhcp-option" + msgstr "dårlig dhcp-opsjon" + +-#: option.c:1075 ++#: option.c:1078 + #, fuzzy + msgid "bad IP address" + msgstr "les %s - %d adresser" + +-#: option.c:1078 option.c:1216 option.c:2888 ++#: option.c:1081 option.c:1219 option.c:2893 + #, fuzzy + msgid "bad IPv6 address" + msgstr "les %s - %d adresser" + +-#: option.c:1243 option.c:1337 ++#: option.c:1246 option.c:1340 + msgid "bad domain in dhcp-option" + msgstr "dårlig domene i dhcp-opsjon" + +-#: option.c:1375 ++#: option.c:1378 + msgid "dhcp-option too long" + msgstr "dhcp-opsjon for lang" + +-#: option.c:1382 ++#: option.c:1385 + msgid "illegal dhcp-match" + msgstr "" + +-#: option.c:1444 ++#: option.c:1447 + msgid "illegal repeated flag" + msgstr "" + +-#: option.c:1452 ++#: option.c:1455 + msgid "illegal repeated keyword" + msgstr "" + +-#: option.c:1517 option.c:4186 ++#: option.c:1520 option.c:4191 + #, fuzzy, c-format + msgid "cannot access directory %s: %s" + msgstr "kan ikke lese %s: %s" + +-#: option.c:1563 tftp.c:493 ++#: option.c:1566 tftp.c:493 + #, fuzzy, c-format + msgid "cannot access %s: %s" + msgstr "kan ikke lese %s: %s" + +-#: option.c:1615 ++#: option.c:1618 + msgid "setting log facility is not possible under Android" + msgstr "" + +-#: option.c:1624 ++#: option.c:1627 + msgid "bad log facility" + msgstr "" + +-#: option.c:1677 ++#: option.c:1680 + msgid "bad MX preference" + msgstr "dårlig MX preferanse" + +-#: option.c:1682 ++#: option.c:1685 + msgid "bad MX name" + msgstr "dårlig MX navn" + +-#: option.c:1696 ++#: option.c:1699 + msgid "bad MX target" + msgstr "dårlig MX mål" + +-#: option.c:1708 ++#: option.c:1711 + msgid "cannot run scripts under uClinux" + msgstr "" + +-#: option.c:1710 ++#: option.c:1713 + msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts" + msgstr "" + +-#: option.c:1714 ++#: option.c:1717 + msgid "recompile with HAVE_LUASCRIPT defined to enable Lua scripts" + msgstr "" + +-#: option.c:1970 option.c:2015 option.c:2071 ++#: option.c:1973 option.c:2018 option.c:2074 + #, fuzzy + msgid "bad prefix" + msgstr "dårlig port" + +-#: option.c:2352 ++#: option.c:2355 + msgid "recompile with HAVE_IPSET defined to enable ipset directives" + msgstr "" + +-#: option.c:2545 ++#: option.c:2548 + #, fuzzy + msgid "bad port range" + msgstr "dårlig port" + +-#: option.c:2561 ++#: option.c:2564 + msgid "bad bridge-interface" + msgstr "" + +-#: option.c:2621 ++#: option.c:2624 + msgid "only one tag allowed" + msgstr "" + +-#: option.c:2641 option.c:2653 option.c:2759 option.c:2800 ++#: option.c:2644 option.c:2656 option.c:2764 option.c:2805 + msgid "bad dhcp-range" + msgstr "dårlig dhcp-område" + +-#: option.c:2668 ++#: option.c:2671 + msgid "inconsistent DHCP range" + msgstr "ikke konsistent DHCP område" + +-#: option.c:2727 ++#: option.c:2732 + msgid "prefix length must be exactly 64 for RA subnets" + msgstr "" + +-#: option.c:2729 ++#: option.c:2734 + msgid "prefix length must be exactly 64 for subnet constructors" + msgstr "" + +-#: option.c:2733 ++#: option.c:2738 + msgid "prefix length must be at least 64" + msgstr "" + +-#: option.c:2736 ++#: option.c:2741 + #, fuzzy + msgid "inconsistent DHCPv6 range" + msgstr "ikke konsistent DHCP område" + +-#: option.c:2747 ++#: option.c:2752 + msgid "prefix must be zero with \"constructor:\" argument" + msgstr "" + +-#: option.c:2858 option.c:2906 ++#: option.c:2863 option.c:2911 + #, fuzzy + msgid "bad hex constant" + msgstr "dårlig dhcp-vert" + +-#: option.c:2880 ++#: option.c:2885 + msgid "cannot match tags in --dhcp-host" + msgstr "" + +-#: option.c:2928 ++#: option.c:2933 + #, fuzzy, c-format + msgid "duplicate dhcp-host IP address %s" + msgstr "dubliserte IP adresser i %s dhcp-config direktiv." + +-#: option.c:2986 ++#: option.c:2991 + #, fuzzy + msgid "bad DHCP host name" + msgstr "dårlig MX navn" + +-#: option.c:3068 ++#: option.c:3073 + #, fuzzy + msgid "bad tag-if" + msgstr "dårlig MX mål" + +-#: option.c:3392 option.c:3786 ++#: option.c:3397 option.c:3791 + msgid "invalid port number" + msgstr "ugyldig portnummer" + +-#: option.c:3454 ++#: option.c:3459 + #, fuzzy + msgid "bad dhcp-proxy address" + msgstr "les %s - %d adresser" + +-#: option.c:3480 ++#: option.c:3485 + #, fuzzy + msgid "Bad dhcp-relay" + msgstr "dårlig dhcp-område" + +-#: option.c:3506 ++#: option.c:3511 + msgid "bad RA-params" + msgstr "" + +-#: option.c:3515 ++#: option.c:3520 + msgid "bad DUID" + msgstr "" + +-#: option.c:3557 ++#: option.c:3562 + #, fuzzy + msgid "invalid alias range" + msgstr "ugyldig vekt" + +-#: option.c:3611 ++#: option.c:3616 + msgid "bad CNAME" + msgstr "" + +-#: option.c:3616 ++#: option.c:3621 + msgid "duplicate CNAME" + msgstr "" + +-#: option.c:3636 ++#: option.c:3641 + #, fuzzy + msgid "bad PTR record" + msgstr "dårlig SRV post" + +-#: option.c:3667 ++#: option.c:3672 + #, fuzzy + msgid "bad NAPTR record" + msgstr "dårlig SRV post" + +-#: option.c:3701 ++#: option.c:3706 + #, fuzzy + msgid "bad RR record" + msgstr "dårlig SRV post" + +-#: option.c:3731 ++#: option.c:3736 + msgid "bad TXT record" + msgstr "dårlig TXT post" + +-#: option.c:3772 ++#: option.c:3777 + msgid "bad SRV record" + msgstr "dårlig SRV post" + +-#: option.c:3779 ++#: option.c:3784 + msgid "bad SRV target" + msgstr "dårlig SRV mål" + +-#: option.c:3793 ++#: option.c:3798 + msgid "invalid priority" + msgstr "ugyldig prioritet" + +-#: option.c:3800 ++#: option.c:3805 + msgid "invalid weight" + msgstr "ugyldig vekt" + +-#: option.c:3824 ++#: option.c:3829 + #, fuzzy + msgid "Bad host-record" + msgstr "dårlig SRV post" + +-#: option.c:3841 ++#: option.c:3846 + #, fuzzy + msgid "Bad name in host-record" + msgstr "dårlig navn i %s" + +-#: option.c:3906 ++#: option.c:3911 + #, fuzzy + msgid "bad trust anchor" + msgstr "dårlig port" + +-#: option.c:3920 ++#: option.c:3925 + msgid "bad HEX in trust anchor" + msgstr "" + +-#: option.c:3930 ++#: option.c:3935 + msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DNSSEC/DBus support)" + msgstr "" + +-#: option.c:3989 ++#: option.c:3994 + msgid "missing \"" + msgstr "mangler \"" + +-#: option.c:4046 ++#: option.c:4051 + msgid "bad option" + msgstr "dårlig opsjon" + +-#: option.c:4048 ++#: option.c:4053 + msgid "extraneous parameter" + msgstr "overflødig parameter" + +-#: option.c:4050 ++#: option.c:4055 + msgid "missing parameter" + msgstr "mangler parameter" + +-#: option.c:4052 ++#: option.c:4057 + #, fuzzy + msgid "illegal option" + msgstr "dårlig opsjon" + +-#: option.c:4059 ++#: option.c:4064 + msgid "error" + msgstr "feil" + +-#: option.c:4061 ++#: option.c:4066 + #, fuzzy, c-format + msgid " at line %d of %s" + msgstr "%s på linje %d av %%s" + +-#: option.c:4076 option.c:4323 option.c:4359 ++#: option.c:4081 option.c:4328 option.c:4364 + #, fuzzy, c-format + msgid "read %s" + msgstr "leser %s" + +-#: option.c:4139 option.c:4262 tftp.c:667 ++#: option.c:4144 option.c:4267 tftp.c:667 + #, c-format + msgid "cannot read %s: %s" + msgstr "kan ikke lese %s: %s" + +-#: option.c:4425 ++#: option.c:4430 + msgid "junk found in command line" + msgstr "" + +-#: option.c:4460 ++#: option.c:4465 + #, c-format + msgid "Dnsmasq version %s %s\n" + msgstr "Dnsmasq versjon %s %s\n" + +-#: option.c:4461 ++#: option.c:4466 + #, fuzzy, c-format + msgid "" + "Compile time options: %s\n" +@@ -1089,62 +1093,62 @@ msgstr "" + "Kompileringsopsjoner %s\n" + "\n" + +-#: option.c:4462 ++#: option.c:4467 + #, c-format + msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" + msgstr "Denne programvaren kommer med ABSOLUTT INGEN GARANTI.\n" + +-#: option.c:4463 ++#: option.c:4468 + #, c-format + msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" + msgstr "DNsmasq er fri programvare, du er velkommen til å redistribuere den\n" + +-#: option.c:4464 ++#: option.c:4469 + #, fuzzy, c-format + msgid "under the terms of the GNU General Public License, version 2 or 3.\n" + msgstr "under vilkårene gitt i GNU General Public License, versjon 2.\n" + +-#: option.c:4475 ++#: option.c:4480 + msgid "try --help" + msgstr "" + +-#: option.c:4477 ++#: option.c:4482 + msgid "try -w" + msgstr "" + +-#: option.c:4479 ++#: option.c:4484 + #, fuzzy, c-format + msgid "bad command line options: %s" + msgstr "dårlige kommandlinje opsjoner: %s." + +-#: option.c:4535 ++#: option.c:4544 + #, c-format + msgid "cannot get host-name: %s" + msgstr "klarer ikke å få vertsnavn: %s" + +-#: option.c:4563 ++#: option.c:4572 + msgid "only one resolv.conf file allowed in no-poll mode." + msgstr "kun en resolv.conf fil tillat i no-poll modus." + +-#: option.c:4573 ++#: option.c:4582 + msgid "must have exactly one resolv.conf to read domain from." + msgstr "må ha nøyaktig en resolv.conf å lese domene fra." + +-#: option.c:4576 network.c:1506 dhcp.c:774 ++#: option.c:4585 network.c:1507 dhcp.c:777 + #, fuzzy, c-format + msgid "failed to read %s: %s" + msgstr "feilet å lese %s: %s" + +-#: option.c:4593 ++#: option.c:4602 + #, c-format + msgid "no search directive found in %s" + msgstr "intet søke direktiv funnet i %s" + +-#: option.c:4614 ++#: option.c:4623 + msgid "there must be a default domain when --dhcp-fqdn is set" + msgstr "" + +-#: option.c:4623 ++#: option.c:4632 + msgid "syntax check OK" + msgstr "" + +@@ -1153,25 +1157,25 @@ msgstr "" + msgid "failed to send packet: %s" + msgstr "feilet å lytte på socket: %s" + +-#: forward.c:572 ++#: forward.c:591 + msgid "discarding DNS reply: subnet option mismatch" + msgstr "" + +-#: forward.c:595 ++#: forward.c:614 + #, c-format + msgid "nameserver %s refused to do a recursive query" + msgstr "navnetjener %s nektet å gjøre et rekursivt oppslag" + +-#: forward.c:627 ++#: forward.c:646 + #, c-format + msgid "possible DNS-rebind attack detected: %s" + msgstr "" + +-#: forward.c:1156 forward.c:1722 ++#: forward.c:1209 forward.c:1785 + msgid "Ignoring query from non-local network" + msgstr "" + +-#: forward.c:2178 ++#: forward.c:2256 + #, fuzzy, c-format + msgid "Maximum number of concurrent DNS queries reached (max: %d)" + msgstr "Spesifiser maksimum antall DHCP leier (standard er %s)" +@@ -1205,339 +1209,349 @@ msgstr "feilet + msgid "failed to bind server socket for %s: %s" + msgstr "feilet å binde lytte socket for %s: %s" + +-#: network.c:1444 ++#: network.c:1445 + #, c-format + msgid "ignoring nameserver %s - local interface" + msgstr "ignorerer navnetjener %s - lokal tilknytning" + +-#: network.c:1455 ++#: network.c:1456 + #, fuzzy, c-format + msgid "ignoring nameserver %s - cannot make/bind socket: %s" + msgstr "ignorerer navnetjener %s - kan ikke lage/dinde socket: %s" + +-#: network.c:1468 ++#: network.c:1469 + msgid "unqualified" + msgstr "ikke kvalifisert" + +-#: network.c:1468 ++#: network.c:1469 + msgid "names" + msgstr "" + +-#: network.c:1470 ++#: network.c:1471 + msgid "default" + msgstr "" + +-#: network.c:1472 ++#: network.c:1473 + msgid "domain" + msgstr "domene" + +-#: network.c:1475 ++#: network.c:1476 + #, c-format + msgid "using local addresses only for %s %s" + msgstr "benytter lokale adresser kun for %s %s" + +-#: network.c:1477 ++#: network.c:1478 + #, fuzzy, c-format + msgid "using standard nameservers for %s %s" + msgstr "benytter navnetjener %s#%d for %s %s" + +-#: network.c:1479 ++#: network.c:1480 + #, c-format + msgid "using nameserver %s#%d for %s %s" + msgstr "benytter navnetjener %s#%d for %s %s" + +-#: network.c:1483 ++#: network.c:1484 + #, fuzzy, c-format + msgid "NOT using nameserver %s#%d - query loop detected" + msgstr "benytter navnetjener %s#%d for %s %s" + +-#: network.c:1486 ++#: network.c:1487 + #, fuzzy, c-format + msgid "using nameserver %s#%d(via %s)" + msgstr "benytter navnetjener %s#%d" + +-#: network.c:1488 ++#: network.c:1489 + #, c-format + msgid "using nameserver %s#%d" + msgstr "benytter navnetjener %s#%d" + +-#: dnsmasq.c:149 ++#: dnsmasq.c:163 + msgid "dhcp-hostsdir, dhcp-optsdir and hostsdir are not supported on this platform" + msgstr "" + +-#: dnsmasq.c:156 ++#: dnsmasq.c:170 + msgid "no trust anchors provided for DNSSEC" + msgstr "" + +-#: dnsmasq.c:159 ++#: dnsmasq.c:173 + msgid "cannot reduce cache size from default when DNSSEC enabled" + msgstr "" + +-#: dnsmasq.c:161 ++#: dnsmasq.c:175 + #, fuzzy + msgid "DNSSEC not available: set HAVE_DNSSEC in src/config.h" + msgstr "DBus ikke tilgjengelig: sett HAVE_DBUS i src/config.h" + +-#: dnsmasq.c:167 ++#: dnsmasq.c:181 + #, fuzzy + msgid "TFTP server not available: set HAVE_TFTP in src/config.h" + msgstr "DBus ikke tilgjengelig: sett HAVE_DBUS i src/config.h" + +-#: dnsmasq.c:172 ++#: dnsmasq.c:186 + msgid "cannot use --conntrack AND --query-port" + msgstr "" + +-#: dnsmasq.c:175 ++#: dnsmasq.c:189 + #, fuzzy + msgid "conntrack support not available: set HAVE_CONNTRACK in src/config.h" + msgstr "DBus ikke tilgjengelig: sett HAVE_DBUS i src/config.h" + +-#: dnsmasq.c:180 ++#: dnsmasq.c:194 + msgid "asychronous logging is not available under Solaris" + msgstr "" + +-#: dnsmasq.c:185 ++#: dnsmasq.c:199 + msgid "asychronous logging is not available under Android" + msgstr "" + +-#: dnsmasq.c:190 ++#: dnsmasq.c:204 + #, fuzzy + msgid "authoritative DNS not available: set HAVE_AUTH in src/config.h" + msgstr "DBus ikke tilgjengelig: sett HAVE_DBUS i src/config.h" + +-#: dnsmasq.c:195 ++#: dnsmasq.c:209 + #, fuzzy + msgid "loop detection not available: set HAVE_LOOP in src/config.h" + msgstr "DBus ikke tilgjengelig: sett HAVE_DBUS i src/config.h" + +-#: dnsmasq.c:203 ++#: dnsmasq.c:217 + msgid "zone serial must be configured in --auth-soa" + msgstr "" + +-#: dnsmasq.c:221 ++#: dnsmasq.c:235 + msgid "dhcp-range constructor not available on this platform" + msgstr "" + +-#: dnsmasq.c:264 ++#: dnsmasq.c:278 + msgid "cannot set --bind-interfaces and --bind-dynamic" + msgstr "" + +-#: dnsmasq.c:267 ++#: dnsmasq.c:281 + #, c-format + msgid "failed to find list of interfaces: %s" + msgstr "feilet å finne liste av tilknytninger (interfaces): %s" + +-#: dnsmasq.c:276 ++#: dnsmasq.c:290 + #, c-format + msgid "unknown interface %s" + msgstr "ukjent tilknytning (interface) %s" + +-#: dnsmasq.c:340 dnsmasq.c:1004 ++#: dnsmasq.c:354 dnsmasq.c:1037 + #, c-format + msgid "DBus error: %s" + msgstr "DBus feil: %s" + +-#: dnsmasq.c:343 ++#: dnsmasq.c:357 + msgid "DBus not available: set HAVE_DBUS in src/config.h" + msgstr "DBus ikke tilgjengelig: sett HAVE_DBUS i src/config.h" + +-#: dnsmasq.c:371 ++#: dnsmasq.c:385 + #, c-format + msgid "unknown user or group: %s" + msgstr "" + +-#: dnsmasq.c:426 ++#: dnsmasq.c:440 + #, c-format + msgid "cannot chdir to filesystem root: %s" + msgstr "" + +-#: dnsmasq.c:667 ++#: dnsmasq.c:692 + #, fuzzy, c-format + msgid "started, version %s DNS disabled" + msgstr "startet, versjon %s mellomlager deaktivert" + +-#: dnsmasq.c:669 ++#: dnsmasq.c:694 + #, c-format + msgid "started, version %s cachesize %d" + msgstr "startet, versjon %s mellomlager størrelse %d" + +-#: dnsmasq.c:671 ++#: dnsmasq.c:696 + #, c-format + msgid "started, version %s cache disabled" + msgstr "startet, versjon %s mellomlager deaktivert" + +-#: dnsmasq.c:673 ++#: dnsmasq.c:698 + #, c-format + msgid "compile time options: %s" + msgstr "kompilerings opsjoner: %s" + +-#: dnsmasq.c:679 ++#: dnsmasq.c:704 + msgid "DBus support enabled: connected to system bus" + msgstr "DBus støtte aktivert: koblet til system buss" + +-#: dnsmasq.c:681 ++#: dnsmasq.c:706 + msgid "DBus support enabled: bus connection pending" + msgstr "DBus støtte aktivert: avventer buss tilkobling" + +-#: dnsmasq.c:686 ++#: dnsmasq.c:711 + msgid "DNS service limited to local subnets" + msgstr "" + +-#: dnsmasq.c:702 ++#: dnsmasq.c:727 + msgid "DNSSEC validation enabled" + msgstr "" + +-#: dnsmasq.c:705 ++#: dnsmasq.c:730 + msgid "DNSSEC signature timestamps not checked until first cache reload" + msgstr "" + +-#: dnsmasq.c:708 ++#: dnsmasq.c:733 + msgid "DNSSEC signature timestamps not checked until system time valid" + msgstr "" + +-#: dnsmasq.c:713 ++#: dnsmasq.c:738 + #, fuzzy, c-format + msgid "warning: failed to change owner of %s: %s" + msgstr "feilet å laste navn fra %s: %s" + +-#: dnsmasq.c:717 ++#: dnsmasq.c:742 + msgid "setting --bind-interfaces option because of OS limitations" + msgstr "setter --bind-interfaces opsjon på grunn av OS begrensninger" + +-#: dnsmasq.c:727 ++#: dnsmasq.c:752 + #, c-format + msgid "warning: interface %s does not currently exist" + msgstr "advarsel: nettverkskort %s eksisterer ikke for tiden" + +-#: dnsmasq.c:732 ++#: dnsmasq.c:757 + msgid "warning: ignoring resolv-file flag because no-resolv is set" + msgstr "" + +-#: dnsmasq.c:735 ++#: dnsmasq.c:760 + #, fuzzy + msgid "warning: no upstream servers configured" + msgstr "setter oppstrøms tjener fra DBus" + +-#: dnsmasq.c:739 ++#: dnsmasq.c:764 + #, c-format + msgid "asynchronous logging enabled, queue limit is %d messages" + msgstr "" + +-#: dnsmasq.c:760 ++#: dnsmasq.c:785 + msgid "IPv6 router advertisement enabled" + msgstr "" + +-#: dnsmasq.c:765 ++#: dnsmasq.c:790 + #, c-format + msgid "DHCP, sockets bound exclusively to interface %s" + msgstr "" + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "root is " + msgstr "" + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + #, fuzzy + msgid "enabled" + msgstr "deaktivert" + +-#: dnsmasq.c:784 ++#: dnsmasq.c:810 + msgid "secure mode" + msgstr "" + +-#: dnsmasq.c:810 ++#: dnsmasq.c:813 ++#, c-format ++msgid "warning: %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:817 ++#, c-format ++msgid "warning: TFTP directory %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:843 + #, c-format + msgid "restricting maximum simultaneous TFTP transfers to %d" + msgstr "" + +-#: dnsmasq.c:1006 ++#: dnsmasq.c:1039 + msgid "connected to system DBus" + msgstr "tilkoblet til system DBus" + +-#: dnsmasq.c:1156 ++#: dnsmasq.c:1189 + #, c-format + msgid "cannot fork into background: %s" + msgstr "" + +-#: dnsmasq.c:1159 ++#: dnsmasq.c:1192 + #, fuzzy, c-format + msgid "failed to create helper: %s" + msgstr "feilet å lese %s: %s" + +-#: dnsmasq.c:1162 ++#: dnsmasq.c:1195 + #, c-format + msgid "setting capabilities failed: %s" + msgstr "" + +-#: dnsmasq.c:1165 ++#: dnsmasq.c:1198 + #, fuzzy, c-format + msgid "failed to change user-id to %s: %s" + msgstr "feilet å laste navn fra %s: %s" + +-#: dnsmasq.c:1168 ++#: dnsmasq.c:1201 + #, fuzzy, c-format + msgid "failed to change group-id to %s: %s" + msgstr "feilet å laste navn fra %s: %s" + +-#: dnsmasq.c:1171 ++#: dnsmasq.c:1204 + #, fuzzy, c-format + msgid "failed to open pidfile %s: %s" + msgstr "feilet å lese %s: %s" + +-#: dnsmasq.c:1174 ++#: dnsmasq.c:1207 + #, fuzzy, c-format + msgid "cannot open log %s: %s" + msgstr "kan ikke åpne %s:%s" + +-#: dnsmasq.c:1177 ++#: dnsmasq.c:1210 + #, fuzzy, c-format + msgid "failed to load Lua script: %s" + msgstr "feilet å laste %s: %s" + +-#: dnsmasq.c:1180 ++#: dnsmasq.c:1213 + #, c-format + msgid "TFTP directory %s inaccessible: %s" + msgstr "" + +-#: dnsmasq.c:1183 ++#: dnsmasq.c:1216 + #, fuzzy, c-format + msgid "cannot create timestamp file %s: %s" + msgstr "kan ikke åpne eller lage leie fil: %s" + +-#: dnsmasq.c:1204 ++#: dnsmasq.c:1237 + msgid "now checking DNSSEC signature timestamps" + msgstr "" + +-#: dnsmasq.c:1271 ++#: dnsmasq.c:1304 + #, c-format + msgid "script process killed by signal %d" + msgstr "" + +-#: dnsmasq.c:1275 ++#: dnsmasq.c:1308 + #, c-format + msgid "script process exited with status %d" + msgstr "" + +-#: dnsmasq.c:1279 ++#: dnsmasq.c:1312 + #, fuzzy, c-format + msgid "failed to execute %s: %s" + msgstr "feilet å få tilgang til %s: %s" + +-#: dnsmasq.c:1334 ++#: dnsmasq.c:1367 + msgid "exiting on receipt of SIGTERM" + msgstr "avslutter etter mottak av SIGTERM" + +-#: dnsmasq.c:1362 ++#: dnsmasq.c:1395 + #, fuzzy, c-format + msgid "failed to access %s: %s" + msgstr "feilet å få tilgang til %s: %s" + +-#: dnsmasq.c:1392 ++#: dnsmasq.c:1425 + #, c-format + msgid "reading %s" + msgstr "leser %s" + +-#: dnsmasq.c:1403 ++#: dnsmasq.c:1436 + #, fuzzy, c-format + msgid "no servers found in %s, will retry" + msgstr "intet søke direktiv funnet i %s" +@@ -1567,37 +1581,37 @@ msgstr "feilet + msgid "cannot create ICMP raw socket: %s." + msgstr "kan ikke lage ICMP raw socket: %s" + +-#: dhcp.c:239 ++#: dhcp.c:241 dhcp6.c:180 + #, fuzzy, c-format + msgid "unknown interface %s in bridge-interface" + msgstr "ukjent tilknytning (interface) %s" + +-#: dhcp.c:278 ++#: dhcp.c:281 + #, c-format + msgid "DHCP packet received on %s which has no address" + msgstr "" + +-#: dhcp.c:412 ++#: dhcp.c:415 + #, c-format + msgid "ARP-cache injection failed: %s" + msgstr "" + +-#: dhcp.c:511 ++#: dhcp.c:514 + #, c-format + msgid "DHCP range %s -- %s is not consistent with netmask %s" + msgstr "DHCP område %s -- %s er ikke konsistent med nettmaske %s" + +-#: dhcp.c:812 ++#: dhcp.c:815 + #, c-format + msgid "bad line at %s line %d" + msgstr "dårlig linje ved %s linje %d" + +-#: dhcp.c:855 ++#: dhcp.c:858 + #, c-format + msgid "ignoring %s line %d, duplicate name or IP address" + msgstr "" + +-#: dhcp.c:999 rfc3315.c:2139 ++#: dhcp.c:1002 rfc3315.c:2135 + #, c-format + msgid "DHCP relay %s -> %s" + msgstr "" +@@ -1631,169 +1645,169 @@ msgstr "feilet + msgid "Ignoring domain %s for DHCP host name %s" + msgstr "" + +-#: rfc2131.c:342 ++#: rfc2131.c:344 + #, c-format + msgid "no address range available for DHCP request %s %s" + msgstr "ingen adresse område tilgjengelig for DHCP krav %s %s" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "with subnet selector" + msgstr "med subnet velger" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "via" + msgstr "via" + +-#: rfc2131.c:355 ++#: rfc2131.c:357 + #, fuzzy, c-format + msgid "%u available DHCP subnet: %s/%s" + msgstr "ingen adresse område tilgjengelig for DHCP krav %s %s" + +-#: rfc2131.c:358 rfc3315.c:300 ++#: rfc2131.c:360 rfc3315.c:300 + #, c-format + msgid "%u available DHCP range: %s -- %s" + msgstr "" + +-#: rfc2131.c:469 ++#: rfc2131.c:471 + #, fuzzy, c-format + msgid "%u vendor class: %s" + msgstr "DBus feil: %s" + +-#: rfc2131.c:471 ++#: rfc2131.c:473 + #, fuzzy, c-format + msgid "%u user class: %s" + msgstr "DBus feil: %s" + +-#: rfc2131.c:498 ++#: rfc2131.c:500 + msgid "disabled" + msgstr "deaktivert" + +-#: rfc2131.c:539 rfc2131.c:967 rfc2131.c:1385 rfc3315.c:603 rfc3315.c:860 +-#: rfc3315.c:1139 ++#: rfc2131.c:541 rfc2131.c:974 rfc2131.c:1380 rfc3315.c:603 rfc3315.c:856 ++#: rfc3315.c:1135 + msgid "ignored" + msgstr "oversett" + +-#: rfc2131.c:554 rfc2131.c:1205 rfc3315.c:910 ++#: rfc2131.c:556 rfc2131.c:1207 rfc3315.c:906 + msgid "address in use" + msgstr "adresse i bruk" + +-#: rfc2131.c:568 rfc2131.c:1021 ++#: rfc2131.c:570 rfc2131.c:1028 + msgid "no address available" + msgstr "ingen adresse tilgjengelig" + +-#: rfc2131.c:575 rfc2131.c:1168 ++#: rfc2131.c:577 rfc2131.c:1170 + msgid "wrong network" + msgstr "galt nettverk" + +-#: rfc2131.c:590 ++#: rfc2131.c:592 + msgid "no address configured" + msgstr "ingen adresse konfigurert" + +-#: rfc2131.c:596 rfc2131.c:1218 ++#: rfc2131.c:598 rfc2131.c:1220 + msgid "no leases left" + msgstr "ingen leier igjen" + +-#: rfc2131.c:691 rfc3315.c:476 ++#: rfc2131.c:693 rfc3315.c:476 + #, c-format + msgid "%u client provides name: %s" + msgstr "" + +-#: rfc2131.c:796 ++#: rfc2131.c:798 + msgid "PXE BIS not supported" + msgstr "" + +-#: rfc2131.c:935 rfc3315.c:1233 ++#: rfc2131.c:942 rfc3315.c:1229 + #, fuzzy, c-format + msgid "disabling DHCP static address %s for %s" + msgstr "deaktiverer DHCP statisk adresse %s" + +-#: rfc2131.c:956 ++#: rfc2131.c:963 + msgid "unknown lease" + msgstr "ukjent leie" + +-#: rfc2131.c:990 ++#: rfc2131.c:997 + #, c-format + msgid "not using configured address %s because it is leased to %s" + msgstr "" + +-#: rfc2131.c:1000 ++#: rfc2131.c:1007 + #, c-format + msgid "not using configured address %s because it is in use by the server or relay" + msgstr "" + +-#: rfc2131.c:1003 ++#: rfc2131.c:1010 + #, c-format + msgid "not using configured address %s because it was previously declined" + msgstr "" + +-#: rfc2131.c:1019 rfc2131.c:1211 ++#: rfc2131.c:1026 rfc2131.c:1213 + msgid "no unique-id" + msgstr "" + +-#: rfc2131.c:1106 ++#: rfc2131.c:1108 + msgid "wrong server-ID" + msgstr "" + +-#: rfc2131.c:1125 ++#: rfc2131.c:1127 + msgid "wrong address" + msgstr "gal adresse" + +-#: rfc2131.c:1143 rfc3315.c:1006 ++#: rfc2131.c:1145 rfc3315.c:1002 + msgid "lease not found" + msgstr "leie ikke funnet" + +-#: rfc2131.c:1176 ++#: rfc2131.c:1178 + msgid "address not available" + msgstr "adresse ikke tilgjengelig" + +-#: rfc2131.c:1187 ++#: rfc2131.c:1189 + msgid "static lease available" + msgstr "statisk leie tilgjengelig" + +-#: rfc2131.c:1191 ++#: rfc2131.c:1193 + msgid "address reserved" + msgstr "adresse reservert" + +-#: rfc2131.c:1199 ++#: rfc2131.c:1201 + #, c-format + msgid "abandoning lease to %s of %s" + msgstr "" + +-#: rfc2131.c:1712 ++#: rfc2131.c:1707 + #, c-format + msgid "%u bootfile name: %s" + msgstr "" + +-#: rfc2131.c:1721 ++#: rfc2131.c:1716 + #, fuzzy, c-format + msgid "%u server name: %s" + msgstr "DBus feil: %s" + +-#: rfc2131.c:1729 ++#: rfc2131.c:1724 + #, fuzzy, c-format + msgid "%u next server: %s" + msgstr "DBus feil: %s" + +-#: rfc2131.c:1732 ++#: rfc2131.c:1727 + #, c-format + msgid "%u broadcast response" + msgstr "" + +-#: rfc2131.c:1795 ++#: rfc2131.c:1790 + #, fuzzy, c-format + msgid "cannot send DHCP/BOOTP option %d: no space left in packet" + msgstr "kan ikke sende DHCP opsjon %d: ikke mer plass i pakken" + +-#: rfc2131.c:2036 ++#: rfc2131.c:2031 + msgid "PXE menu too large" + msgstr "" + +-#: rfc2131.c:2173 rfc3315.c:1506 ++#: rfc2131.c:2170 rfc3315.c:1502 + #, fuzzy, c-format + msgid "%u requested options: %s" + msgstr "kompilerings opsjoner: %s" + +-#: rfc2131.c:2453 ++#: rfc2131.c:2487 + #, c-format + msgid "cannot send RFC3925 option: too many options for enterprise number %d" + msgstr "" +@@ -1808,15 +1822,25 @@ msgstr "kan ikke binde netlink socket: %s" + msgid "netlink returns error: %s" + msgstr "DBus feil: %s" + +-#: dbus.c:171 ++#: dbus.c:186 + msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" + msgstr "forsøk på å sette en IPv6 tjener adresse via DBus - ingen IPv6 støtte" + +-#: dbus.c:500 ++#: dbus.c:439 ++#, c-format ++msgid "Enabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:444 ++#, c-format ++msgid "Disabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:691 + msgid "setting upstream servers from DBus" + msgstr "setter oppstrøms tjener fra DBus" + +-#: dbus.c:547 ++#: dbus.c:738 + msgid "could not register a DBus message handler" + msgstr "kunne ikke registrere en DBus meldingshåndterer" + +@@ -1936,51 +1960,51 @@ msgstr "ingen tilknytning (interface) med adresse %s" + msgid "unknown prefix-class %d" + msgstr "ukjent leie" + +-#: rfc3315.c:803 rfc3315.c:902 ++#: rfc3315.c:803 rfc3315.c:898 + #, fuzzy + msgid "address unavailable" + msgstr "adresse ikke tilgjengelig" + +-#: rfc3315.c:815 rfc3315.c:950 rfc3315.c:1283 ++#: rfc3315.c:815 rfc3315.c:946 rfc3315.c:1279 + msgid "success" + msgstr "" + +-#: rfc3315.c:843 rfc3315.c:845 rfc3315.c:958 rfc3315.c:960 ++#: rfc3315.c:830 rfc3315.c:839 rfc3315.c:954 rfc3315.c:956 + #, fuzzy + msgid "no addresses available" + msgstr "ingen adresse tilgjengelig" + +-#: rfc3315.c:937 ++#: rfc3315.c:933 + msgid "not on link" + msgstr "" + +-#: rfc3315.c:1010 rfc3315.c:1195 rfc3315.c:1272 ++#: rfc3315.c:1006 rfc3315.c:1191 rfc3315.c:1268 + msgid "no binding found" + msgstr "" + +-#: rfc3315.c:1048 ++#: rfc3315.c:1044 + msgid "deprecated" + msgstr "" + +-#: rfc3315.c:1053 ++#: rfc3315.c:1049 + #, fuzzy + msgid "address invalid" + msgstr "adresse i bruk" + +-#: rfc3315.c:1100 ++#: rfc3315.c:1096 + msgid "confirm failed" + msgstr "" + +-#: rfc3315.c:1116 ++#: rfc3315.c:1112 + #, fuzzy + msgid "all addresses still on link" + msgstr "dårlig adresse ved %s linje %d" + +-#: rfc3315.c:1204 ++#: rfc3315.c:1200 + msgid "release received" + msgstr "" + +-#: rfc3315.c:2130 ++#: rfc3315.c:2126 + msgid "Cannot multicast to DHCPv6 server without correct interface" + msgstr "" + +@@ -2068,12 +2092,12 @@ msgstr "" + msgid "DHCP relay from %s to %s" + msgstr "" + +-#: radv.c:98 ++#: radv.c:109 + #, fuzzy, c-format + msgid "cannot create ICMPv6 socket: %s" + msgstr "kan ikke lage DHCP socket: %s" + +-#: auth.c:436 ++#: auth.c:448 + #, c-format + msgid "ignoring zone transfer request from %s" + msgstr "" +@@ -2088,7 +2112,7 @@ msgstr "feilet + msgid "failed to create IPset control socket: %s" + msgstr "feilet å lage lytte socket: %s" + +-#: dnssec.c:425 dnssec.c:469 ++#: dnssec.c:449 dnssec.c:493 + #, fuzzy, c-format + msgid "failed to update mtime on %s: %s" + msgstr "feilet å lese %s: %s" +diff --git a/po/pl.po b/po/pl.po +index 362e41226644..9b0386e57bb3 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -30,17 +30,17 @@ msgstr "WewnÄtrzny bÅÄd w pamiÄci podrÄcznej." + msgid "failed to load names from %s: %s" + msgstr "nie potrafiÄ wczytaÄ nazw z %s: %s" + +-#: cache.c:967 dhcp.c:825 ++#: cache.c:967 dhcp.c:828 + #, c-format + msgid "bad address at %s line %d" + msgstr "bÅÄdny adres w pliku %s, w linii %d" + +-#: cache.c:1018 dhcp.c:841 ++#: cache.c:1018 dhcp.c:844 + #, c-format + msgid "bad name at %s line %d" + msgstr "bÅÄdna nazwa w pliku %s, w linii %d" + +-#: cache.c:1027 dhcp.c:916 ++#: cache.c:1027 dhcp.c:919 + #, c-format + msgid "read %s - %d addresses" + msgstr "wczytaÅem %s - %d adresÃ³w" +@@ -98,636 +98,640 @@ msgstr "brak moÅŒliwoÅci uÅŒycia generatora liczb losowych: %s" + msgid "failed to allocate memory" + msgstr "nie udaÅo siÄ przydzieliÄ pamiÄci" + +-#: util.c:243 option.c:598 ++#: util.c:250 option.c:601 + msgid "could not get memory" + msgstr "nie moÅŒna dostaÄ pamiÄci" + +-#: util.c:253 ++#: util.c:260 + #, c-format + msgid "cannot create pipe: %s" + msgstr "bÅÄd podczas prÃ³by utworzenia potoku: %s" + +-#: util.c:261 ++#: util.c:268 + #, c-format + msgid "failed to allocate %d bytes" + msgstr "niemoÅŒliwoÅÄ przydzielenia %d bajtÃ³w pamiÄci" + +-#: util.c:430 ++#: util.c:437 + #, c-format + msgid "infinite" + msgstr "nieskoÅczona" + +-#: option.c:330 ++#: option.c:332 + msgid "Specify local address(es) to listen on." + msgstr "Wskazanie adresÃ³w, na ktÃ³rych naleÅŒy nasÅuchiwaÄ." + +-#: option.c:331 ++#: option.c:333 + msgid "Return ipaddr for all hosts in specified domains." + msgstr "Zwracanie adresu IP dla wszystkich hostÃ³w we wskazanych domenach." + +-#: option.c:332 ++#: option.c:334 + msgid "Fake reverse lookups for RFC1918 private address ranges." + msgstr "WyÅÄczenie przekazywania zapytaÅ odwrotnych dla prywatnych zakresÃ³w IP." + +-#: option.c:333 ++#: option.c:335 + msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." + msgstr "Traktowanie adresu IP jako NXDOMAIN (uniewaÅŒnia ,,Verisign wildcard'')." + +-#: option.c:334 ++#: option.c:336 + #, c-format + msgid "Specify the size of the cache in entries (defaults to %s)." + msgstr "Wskazanie wielkoÅci pamiÄci podrÄcznej (domyÅlnie: %s miejsc)." + +-#: option.c:335 ++#: option.c:337 + #, c-format + msgid "Specify configuration file (defaults to %s)." + msgstr "Wskazanie pliku konfiguracyjnego (domyÅlnie: %s)." + +-#: option.c:336 ++#: option.c:338 + msgid "Do NOT fork into the background: run in debug mode." + msgstr "NIE twÃ³rz procesu potomnego w tle: dziaÅanie w trybie debugowania." + +-#: option.c:337 ++#: option.c:339 + msgid "Do NOT forward queries with no domain part." + msgstr "WyÅÄczenie przekazywania zapytaÅ bez podanej czÄÅci domenowej." + +-#: option.c:338 ++#: option.c:340 + msgid "Return self-pointing MX records for local hosts." + msgstr "Zwracanie samowskazujÄcego rekordu MX dla lokalnych hostÃ³w." + +-#: option.c:339 ++#: option.c:341 + msgid "Expand simple names in /etc/hosts with domain-suffix." + msgstr "Rozwijanie prostych nazw z /etc/hosts przyrostkiem domenowym." + +-#: option.c:340 ++#: option.c:342 + msgid "Don't forward spurious DNS requests from Windows hosts." + msgstr "WyÅÄczenie przekazywania pozornych zapytaÅ DNS z komputerÃ³w dziaÅajÄcych pod Windows." + +-#: option.c:341 ++#: option.c:343 + msgid "Enable DHCP in the range given with lease duration." + msgstr "WÅÄczenie serwera DHCP dla wskazanego zakresu adresÃ³w." + +-#: option.c:342 ++#: option.c:344 + #, c-format + msgid "Change to this group after startup (defaults to %s)." + msgstr "Po uruchomieniu zmiana grupy procesu na podanÄ (domyÅlnie: %s)." + +-#: option.c:343 ++#: option.c:345 + msgid "Set address or hostname for a specified machine." + msgstr "Ustawienie adresu lub nazwy dla wskazanego komputera." + +-#: option.c:344 ++#: option.c:346 + msgid "Read DHCP host specs from file." + msgstr "Wskazanie pliku z wartoÅciami 'dhcp-host='." + +-#: option.c:345 ++#: option.c:347 + msgid "Read DHCP option specs from file." + msgstr "Wskazanie pliku z wartoÅciami 'dhcp-option='." + +-#: option.c:346 ++#: option.c:348 + #, fuzzy + msgid "Read DHCP host specs from a directory." + msgstr "Wskazanie pliku z wartoÅciami 'dhcp-host='." + +-#: option.c:347 ++#: option.c:349 + #, fuzzy + msgid "Read DHCP options from a directory." + msgstr "Wskazanie pliku z wartoÅciami 'dhcp-option='." + +-#: option.c:348 ++#: option.c:350 + msgid "Evaluate conditional tag expression." + msgstr "Warunkowe ustawianie znacznikÃ³w." + +-#: option.c:349 ++#: option.c:351 + #, c-format + msgid "Do NOT load %s file." + msgstr "NIE wczytywanie pliku %s." + +-#: option.c:350 ++#: option.c:352 + #, c-format + msgid "Specify a hosts file to be read in addition to %s." + msgstr "Wskazanie dodatkowego pliku 'hosts' oprÃ³cz %s." + +-#: option.c:351 ++#: option.c:353 + #, fuzzy + msgid "Read hosts files from a directory." + msgstr "Wskazanie pliku z wartoÅciami 'dhcp-host='." + +-#: option.c:352 ++#: option.c:354 + msgid "Specify interface(s) to listen on." + msgstr "Interfejsy, na ktÃ³rych nasÅuchiwaÄ." + +-#: option.c:353 ++#: option.c:355 + msgid "Specify interface(s) NOT to listen on." + msgstr "Interfejsy, na ktÃ³rych NIE nasÅuchiwaÄ." + +-#: option.c:354 ++#: option.c:356 + msgid "Map DHCP user class to tag." + msgstr "PrzyporzÄdkowanie znacznika w zaleÅŒnoÅci od klasy uÅŒytkownika DHCP." + +-#: option.c:355 ++#: option.c:357 + msgid "Map RFC3046 circuit-id to tag." + msgstr "PrzyporzÄdkowanie znacznika w zaleÅŒnoÅci od numeru obwodu (w rozumieniu RFC3046)." + +-#: option.c:356 ++#: option.c:358 + msgid "Map RFC3046 remote-id to tag." + msgstr "PrzyporzÄdkowanie znacznika w zaleÅŒnoÅci od numeru agenta (w rozumieniu RFC3046)." + +-#: option.c:357 ++#: option.c:359 + msgid "Map RFC3993 subscriber-id to tag." + msgstr "PrzyporzÄdkowanie znacznika w zaleÅŒnoÅci od numeru subskrybenta (w rozumieniu RFC3993)." + +-#: option.c:358 ++#: option.c:360 + msgid "Don't do DHCP for hosts with tag set." + msgstr "WyÅÄczenie DHCP dla hostÃ³w z okreÅlonym znacznikiem." + +-#: option.c:359 ++#: option.c:361 + msgid "Force broadcast replies for hosts with tag set." + msgstr "Wymuszenie odpowiedzi w trybie rozgÅoszeniowym dla hostÃ³w z okreÅlonym znacznikiem." + +-#: option.c:360 ++#: option.c:362 + msgid "Do NOT fork into the background, do NOT run in debug mode." + msgstr "NIE twÃ³rz procesu potomnego w tle i NIE wÅÄczaj trybu debugowania." + +-#: option.c:361 ++#: option.c:363 + msgid "Assume we are the only DHCP server on the local network." + msgstr "ZakÅadanie, ÅŒe jesteÅmy jedynym serwerem DHCP w sieci lokalnej." + +-#: option.c:362 ++#: option.c:364 + #, c-format + msgid "Specify where to store DHCP leases (defaults to %s)." + msgstr "ÅcieÅŒka przechowywania pliku dzierÅŒaw DHCP (domyÅlnie: %s)." + +-#: option.c:363 ++#: option.c:365 + msgid "Return MX records for local hosts." + msgstr "WÅÄczenie zwracania rekordu MX dla hostÃ³w lokalnych." + +-#: option.c:364 ++#: option.c:366 + msgid "Specify an MX record." + msgstr "Specyfikacja rekordu MX." + +-#: option.c:365 ++#: option.c:367 + msgid "Specify BOOTP options to DHCP server." + msgstr "OkreÅlenie opcji BOOTP serwera DHCP." + +-#: option.c:366 ++#: option.c:368 + #, c-format + msgid "Do NOT poll %s file, reload only on SIGHUP." + msgstr "WyÅÄczenie obserwowania pliku %s; ponowne odczytywanie tylko po odebraniu sygnaÅu SIGHUP." + +-#: option.c:367 ++#: option.c:369 + msgid "Do NOT cache failed search results." + msgstr "WyÅÄczenie przechowywania w pamiÄci podrÄcznej wynikÃ³w nieudanych wyszukiwaÅ." + +-#: option.c:368 ++#: option.c:370 + #, c-format + msgid "Use nameservers strictly in the order given in %s." + msgstr "Odpytywanie serwerÃ³w nazw w kolejnoÅci ich wystÄpienia w %s." + +-#: option.c:369 ++#: option.c:371 + msgid "Specify options to be sent to DHCP clients." + msgstr "Specyfikacja opcji wysyÅanej do klientÃ³w DHCP." + +-#: option.c:370 ++#: option.c:372 + msgid "DHCP option sent even if the client does not request it." + msgstr "Opcja DHCP wysyÅana nawet jeÅŒeli klient o niÄ nie prosi." + +-#: option.c:371 ++#: option.c:373 + msgid "Specify port to listen for DNS requests on (defaults to 53)." + msgstr "Wskazanie portu do nasÅuchiwania zapytaÅ DNS (domyÅlnie: 53)." + +-#: option.c:372 ++#: option.c:374 + #, c-format + msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." + msgstr "Maksymalna obsÅugiwana wielkoÅÄ pakietu EDNS.0 (domyÅlnie: %s)." + +-#: option.c:373 ++#: option.c:375 + msgid "Log DNS queries." + msgstr "WÅÄczenie spisywania zapytaÅ DNS do logu." + +-#: option.c:374 ++#: option.c:376 + msgid "Force the originating port for upstream DNS queries." + msgstr "Wymuszenie uÅŒycia wskazanego portu UDP do odpytywania nadrzÄdnych serwerÃ³w DNS i odbierania od nich odpowiedzi." + +-#: option.c:375 ++#: option.c:377 + msgid "Do NOT read resolv.conf." + msgstr "WyÅÄczenie czytania pliku resolv.conf." + +-#: option.c:376 ++#: option.c:378 + #, c-format + msgid "Specify path to resolv.conf (defaults to %s)." + msgstr "Wskazanie poÅoÅŒenia pliku resolv.conf (domyÅlnie: %s)." + +-#: option.c:377 ++#: option.c:379 + msgid "Specify path to file with server= options" + msgstr "Wskazanie poÅoÅŒenia pliku z opcjami server=" + +-#: option.c:378 ++#: option.c:380 + msgid "Specify address(es) of upstream servers with optional domains." + msgstr "Wskazywanie adresÃ³w serwerÃ³w nazw, opcjonalnie z przypisaniem do domeny." + +-#: option.c:379 ++#: option.c:381 + msgid "Specify address of upstream servers for reverse address queries" + msgstr "Wskazanie serwerÃ³w nazw do odwrotnej translacji adresÃ³w." + +-#: option.c:380 ++#: option.c:382 + msgid "Never forward queries to specified domains." + msgstr "WyÅÄczenie przekazywania zapytaÅ do wskazanych domen." + +-#: option.c:381 ++#: option.c:383 + msgid "Specify the domain to be assigned in DHCP leases." + msgstr "Wskazanie domeny dla serwera DHCP." + +-#: option.c:382 ++#: option.c:384 + msgid "Specify default target in an MX record." + msgstr "OkreÅlenie domyÅlnego celu w rekordzie MX." + +-#: option.c:383 ++#: option.c:385 + msgid "Specify time-to-live in seconds for replies from /etc/hosts." + msgstr "OkreÅlenie (w sekundach) czasu waÅŒnoÅci odpowiedzi udzielonych na podstawie /etc/hosts (domyÅlnie 0)." + +-#: option.c:384 ++#: option.c:386 + msgid "Specify time-to-live in seconds for negative caching." + msgstr "OkreÅlenie (w sekundach) czasu waÅŒnoÅci negatywnych odpowiedzi." + +-#: option.c:385 ++#: option.c:387 + msgid "Specify time-to-live in seconds for maximum TTL to send to clients." + msgstr "Ograniczenie maksymalnego czasu waÅŒnoÅci odpowiedzi (TTL) podawanego klientom [w sekundach]." + +-#: option.c:386 ++#: option.c:388 + #, fuzzy + msgid "Specify time-to-live ceiling for cache." + msgstr "OkreÅlenie (w sekundach) czasu waÅŒnoÅci negatywnych odpowiedzi." + +-#: option.c:387 ++#: option.c:389 + #, fuzzy + msgid "Specify time-to-live floor for cache." + msgstr "OkreÅlenie (w sekundach) czasu waÅŒnoÅci negatywnych odpowiedzi." + +-#: option.c:388 ++#: option.c:390 + #, c-format + msgid "Change to this user after startup. (defaults to %s)." + msgstr "Zmiana uÅŒytkownika procesu na wskazanego (po uruchomieniu, domyÅlnie: %s)." + +-#: option.c:389 ++#: option.c:391 + msgid "Map DHCP vendor class to tag." + msgstr "PrzyporzÄdkowanie znacznika w zaleÅŒnoÅci od typu klienta DHCP." + +-#: option.c:390 ++#: option.c:392 + msgid "Display dnsmasq version and copyright information." + msgstr "Wydrukowanie informacji o programie i ochronie praw autorskich." + +-#: option.c:391 ++#: option.c:393 + msgid "Translate IPv4 addresses from upstream servers." + msgstr "TÅumaczenie adresÃ³w IPv4 z serwerÃ³w nadrzÄdnych." + +-#: option.c:392 ++#: option.c:394 + msgid "Specify a SRV record." + msgstr "OkreÅlenie rekordu SRV." + +-#: option.c:393 ++#: option.c:395 + msgid "Display this message. Use --help dhcp for known DHCP options." + msgstr "WyÅwietla ten komunikat. UÅŒyj '--help dhcp' chcÄc przejrzeÄ listÄ opcji DHCP (dhcp-option=xxx,...)." + +-#: option.c:394 ++#: option.c:396 + #, c-format + msgid "Specify path of PID file (defaults to %s)." + msgstr "OkreÅlenie ÅcieÅŒki do pliku PID (domyÅlnie: %s)." + +-#: option.c:395 ++#: option.c:397 + #, c-format + msgid "Specify maximum number of DHCP leases (defaults to %s)." + msgstr "Maksymalna liczba dzierÅŒaw DHCP (domyÅlnie: %s)." + +-#: option.c:396 ++#: option.c:398 + msgid "Answer DNS queries based on the interface a query was sent to." + msgstr "UzaleÅŒnienie odpowiedzi DNS od interfejsu, na ktÃ³rym odebrano zapytanie (wygodne dla serwerÃ³w kilku podsieci z rÃ³ÅŒnymi adresami w /etc/hosts)." + +-#: option.c:397 ++#: option.c:399 + msgid "Specify TXT DNS record." + msgstr "Specyfikacja rekordu DNS TXT." + +-#: option.c:398 ++#: option.c:400 + msgid "Specify PTR DNS record." + msgstr "Specyfikacja rekordu DNS PTR." + +-#: option.c:399 ++#: option.c:401 + msgid "Give DNS name to IPv4 address of interface." + msgstr "Zwraca nazwÄ domenowÄ powiÄzanÄ z adresem interfejsu sieciowego." + +-#: option.c:400 ++#: option.c:402 + msgid "Bind only to interfaces in use." + msgstr "NasÅuchiwanie tylko na wykorzystywanych interfejsach (umoÅŒliwia uruchomienie osobnych serwerÃ³w dla rÃ³ÅŒnych kart)." + +-#: option.c:401 ++#: option.c:403 + #, c-format + msgid "Read DHCP static host information from %s." + msgstr "Wczytanie przyporzÄdkowaÅ adresÃ³w z %s." + +-#: option.c:402 ++#: option.c:404 + msgid "Enable the DBus interface for setting upstream servers, etc." + msgstr "WÅÄczenie uÅŒywania interfejsu DBus do informowania o zmianach konfiguracji." + +-#: option.c:403 ++#: option.c:405 + msgid "Do not provide DHCP on this interface, only provide DNS." + msgstr "Uruchomienie na wskazanym interfejsie tylko DNS-a, bez usÅug DHCP i TFTP." + +-#: option.c:404 ++#: option.c:406 + msgid "Enable dynamic address allocation for bootp." + msgstr "WÅÄczenie dynamicznego przydzielania adresÃ³w dla klientÃ³w BOOTP." + +-#: option.c:405 ++#: option.c:407 + msgid "Map MAC address (with wildcards) to option set." + msgstr "PrzyporzÄdkowanie znacznika w zaleÅŒnoÅci od adresu MAC (moÅŒna uÅŒywaÄ uogÃ³lnieÅ: *)." + +-#: option.c:406 ++#: option.c:408 + msgid "Treat DHCP requests on aliases as arriving from interface." + msgstr "Traktowanie ÅŒÄdaÅ DHCP odebranych na interfejsach alias, ..., jako odebranych na iface." + +-#: option.c:407 ++#: option.c:409 + msgid "Disable ICMP echo address checking in the DHCP server." + msgstr "PominiÄcie sprawdzania za pomocÄ ICMP niezajÄtoÅci adresu przed jego wydzierÅŒawieniem." + +-#: option.c:408 ++#: option.c:410 + msgid "Shell script to run on DHCP lease creation and destruction." + msgstr "Skrypt powÅoki uruchamiany po przyznaniu lub zwolnieniu adresu." + +-#: option.c:409 ++#: option.c:411 + msgid "Lua script to run on DHCP lease creation and destruction." + msgstr "Skrypt Lua uruchamiany po przyznaniu lub zwolnieniu adresu." + +-#: option.c:410 ++#: option.c:412 + msgid "Run lease-change scripts as this user." + msgstr "Wskazanie uÅŒytkownika z ktÃ³rego uprawnieniami bÄdÄ uruchamiane skrypty." + +-#: option.c:411 ++#: option.c:413 + msgid "Read configuration from all the files in this directory." + msgstr "Wczytanie wszystkich plikÃ³w ze wskazanego katalogu jako konfiguracyjnych." + +-#: option.c:412 ++#: option.c:414 + msgid "Log to this syslog facility or file. (defaults to DAEMON)" + msgstr "Wskazanie kanaÅu syslog-a do ktÃ³rego majÄ trafiaÄ komunikaty (domyÅlnie: DAEMON)" + +-#: option.c:413 ++#: option.c:415 + msgid "Do not use leasefile." + msgstr "NieuÅŒywanie bazy dzierÅŒaw." + +-#: option.c:414 ++#: option.c:416 + #, c-format + msgid "Maximum number of concurrent DNS queries. (defaults to %s)" + msgstr "Maksymalna liczba jednoczeÅnie obsÅugiwanych zapytaÅ DNS (domyÅlnie: %s)" + +-#: option.c:415 ++#: option.c:417 + #, c-format + msgid "Clear DNS cache when reloading %s." + msgstr "Czyszczenie pamiÄci podrÄcznej serwera nazw w przypadku ponownego odczytu %s." + +-#: option.c:416 ++#: option.c:418 + msgid "Ignore hostnames provided by DHCP clients." + msgstr "Nie zwracanie uwagi na nazwÄ podawanÄ przez klienta w przypadku dopasowania wszystkich wymienionych znacznikÃ³w." + +-#: option.c:417 ++#: option.c:419 + msgid "Do NOT reuse filename and server fields for extra DHCP options." + msgstr "WyÅÄczenie oszczÄdzania miejsca w pakiecie DHCP przez przesuwanie pÃ³l servername i filename do opcji DHCP. Wymusza prostszy tryb budowy pakietu rozwiÄzujÄc problemy z nieprzystosowanymi klientami DHCP." + +-#: option.c:418 ++#: option.c:420 + msgid "Enable integrated read-only TFTP server." + msgstr "WÅÄczenie wbudowanego serwera TFTP (tylko do wysyÅania)." + +-#: option.c:419 ++#: option.c:421 + msgid "Export files by TFTP only from the specified subtree." + msgstr "Ograniczenie dziaÅania serwera TFTP do wskazanego katalogu i podkatalogÃ³w. Nazwy z .. sÄ odrzucane, / odnosi siÄ do wskazanego katalogu." + +-#: option.c:420 ++#: option.c:422 + msgid "Add client IP address to tftp-root." + msgstr "Doklejanie adresu IP klienta do gÅÃ³wnego katalogu TFTP. JeÅŒeli wynikowy katalog nie istnieje, nadal wykorzystuje siÄ tftp-root." + +-#: option.c:421 ++#: option.c:423 + msgid "Allow access only to files owned by the user running dnsmasq." + msgstr "Ograniczenie dostÄpu do plikÃ³w przez TFTP do tych, ktÃ³rych wÅaÅcicielem jest uÅŒytkownik uruchamiajÄcy dnsmasq-a." + +-#: option.c:422 ++#: option.c:424 ++msgid "Do not terminate the service if TFTP directories are inaccessible." ++msgstr "" ++ ++#: option.c:425 + #, c-format + msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." + msgstr "Maksymalna liczba jednoczeÅnie obsÅugiwanych poÅÄczeÅ TFTP (domyÅlnie %s)." + +-#: option.c:423 ++#: option.c:426 + msgid "Disable the TFTP blocksize extension." + msgstr "WyÅÄczenie moÅŒliwoÅci negocjowania wielkoÅci bloku dla przesyÅÃ³w przez TFTP." + +-#: option.c:424 ++#: option.c:427 + msgid "Convert TFTP filenames to lowercase" + msgstr "Konwertowanie nazw plikÃ³w ÅŒÄdanych przez TFTP do maÅych liter" + +-#: option.c:425 ++#: option.c:428 + msgid "Ephemeral port range for use by TFTP transfers." + msgstr "Wskazanie zakresu portÃ³w do uÅŒytku TFTP." + +-#: option.c:426 ++#: option.c:429 + msgid "Extra logging for DHCP." + msgstr "WÅÄczenie spisywania w logu operacji DHCP." + +-#: option.c:427 ++#: option.c:430 + msgid "Enable async. logging; optionally set queue length." + msgstr "WÅÄczenie asynchronicznego zapisywania do logu z ewentualnym wskazaniem dÅugoÅci kolejki." + +-#: option.c:428 ++#: option.c:431 + msgid "Stop DNS rebinding. Filter private IP ranges when resolving." + msgstr "Odfiltrowywanie adresÃ³w wskazujÄcych na komputery w sieciach wewnÄtrznych spoÅrÃ³d odpowiedzi od zewnÄtrznych serwerÃ³w DNS." + +-#: option.c:429 ++#: option.c:432 + msgid "Allow rebinding of 127.0.0.0/8, for RBL servers." + msgstr "Zezwolenie na przekazywanie odpowiedzi w klasie 127.0.0.0/8. Dla serwerÃ³w RBL." + +-#: option.c:430 ++#: option.c:433 + msgid "Inhibit DNS-rebind protection on this domain." + msgstr "Dezaktywacja zabezpieczenia przed atakami DNS-rebind dla wskazanych domen." + +-#: option.c:431 ++#: option.c:434 + msgid "Always perform DNS queries to all servers." + msgstr "Jednoczesne odpytywanie wszystkich serwerÃ³w nadrzÄdnych; klientowi przekazywana jest pierwsza odpowiedÅº." + +-#: option.c:432 ++#: option.c:435 + msgid "Set tag if client includes matching option in request." + msgstr "Ustawienie znacznika jeÅŒeli w ÅŒÄdaniu DHCP pojawi siÄ wskazana opcja, ewentualnie o konkretnej wartoÅci." + +-#: option.c:433 ++#: option.c:436 + msgid "Use alternative ports for DHCP." + msgstr "UÅŒycie alternatywnych portÃ³w dla usÅugi DHCP." + +-#: option.c:434 ++#: option.c:437 + msgid "Specify NAPTR DNS record." + msgstr "Specyfikacja rekordu DNS NAPTR." + +-#: option.c:435 ++#: option.c:438 + msgid "Specify lowest port available for DNS query transmission." + msgstr "Ustawienie dolnej granicy numerÃ³w portÃ³w do przesyÅania zapytaÅ DNS." + +-#: option.c:436 ++#: option.c:439 + msgid "Use only fully qualified domain names for DHCP clients." + msgstr "Przechowywanie w serwerze DNS dnsmasq-a tylko w peÅni kwalifikowanych nazw zgÅaszanych przez klientÃ³w DHCP." + +-#: option.c:437 ++#: option.c:440 + msgid "Generate hostnames based on MAC address for nameless clients." + msgstr "Generowanie nazw na podstawie MAC-adresÃ³w dla klientÃ³w bez nazwy." + +-#: option.c:438 ++#: option.c:441 + msgid "Use these DHCP relays as full proxies." + msgstr "Traktowanie wskazanych serwerÃ³w poÅredniczÄcych DHCP jako dziaÅajÄcych w trybie \"peÅnomocnika\" (full-proxy)." + +-#: option.c:439 ++#: option.c:442 + msgid "Relay DHCP requests to a remote server" + msgstr "Przekazywanie ÅŒÄdaÅ DHCP do zdalnego serwera" + +-#: option.c:440 ++#: option.c:443 + msgid "Specify alias name for LOCAL DNS name." + msgstr "Wskazanie synonimu nazwy komputera lokalnego - znanego z /etc/hosts albo z DHCP." + +-#: option.c:441 ++#: option.c:444 + msgid "Prompt to send to PXE clients." + msgstr "ZgÅoszenie wysyÅane klientom PXE." + +-#: option.c:442 ++#: option.c:445 + msgid "Boot service for PXE menu." + msgstr "SkÅadnik menu PXE (--> man)." + +-#: option.c:443 ++#: option.c:446 + msgid "Check configuration syntax." + msgstr "Sprawdzenie skÅadni." + +-#: option.c:444 ++#: option.c:447 + msgid "Add requestor's MAC address to forwarded DNS queries." + msgstr "Przekazywanie MAC-adresu komputera pytajÄcego w ruchu wychodzÄcym DNS." + +-#: option.c:445 ++#: option.c:448 + msgid "Add requestor's IP subnet to forwarded DNS queries." + msgstr "Zamieszczanie adresu IP pytajÄcego w przekazywanych zapytaniach DNS." + +-#: option.c:446 ++#: option.c:449 + msgid "Proxy DNSSEC validation results from upstream nameservers." + msgstr "Przekazywanie wynikÃ³w weryfikacji DNSSEC z serwerÃ³w nadrzÄdnych." + +-#: option.c:447 ++#: option.c:450 + msgid "Attempt to allocate sequential IP addresses to DHCP clients." + msgstr "Zmiana sposobu przydzielania adresÃ³w IP na sekwencyjny." + +-#: option.c:448 ++#: option.c:451 + msgid "Copy connection-track mark from queries to upstream connections." + msgstr "Zachowanie znacznika poÅÄczenia z odebranego zapytania DNS w ruchu zewnÄtrznym." + +-#: option.c:449 ++#: option.c:452 + msgid "Allow DHCP clients to do their own DDNS updates." + msgstr "Zezwolenie klientom DHCP na uaktualnianie DDNS-Ã³w." + +-#: option.c:450 ++#: option.c:453 + msgid "Send router-advertisements for interfaces doing DHCPv6" + msgstr "ZaÅÄczenie anonsowania (RA) na interfejsach serwujÄcych DHCPv6" + +-#: option.c:451 ++#: option.c:454 + msgid "Specify DUID_EN-type DHCPv6 server DUID" + msgstr "OkreÅlenie DHCPv6 DUID" + +-#: option.c:452 ++#: option.c:455 + msgid "Specify host (A/AAAA and PTR) records" + msgstr "OkreÅlenie rekordÃ³w A/AAAA i PTR" + +-#: option.c:453 ++#: option.c:456 + msgid "Specify arbitrary DNS resource record" + msgstr "OkreÅlenie rekordu TXT" + +-#: option.c:454 ++#: option.c:457 + msgid "Bind to interfaces in use - check for new interfaces" + msgstr "Dynamiczne podpinanie do interfejsÃ³w sieciowych" + +-#: option.c:455 ++#: option.c:458 + msgid "Export local names to global DNS" + msgstr "Eksportowanie lokalnych nazw hostÃ³w do globalnego DNS-a" + +-#: option.c:456 ++#: option.c:459 + msgid "Domain to export to global DNS" + msgstr "Domena pod ktÃ³rÄ bÄdÄ eksportowane lokalne nazwy" + +-#: option.c:457 ++#: option.c:460 + msgid "Set TTL for authoritative replies" + msgstr "OkreÅlenie TTL dla odpowiedzi autorytatywnych" + +-#: option.c:458 ++#: option.c:461 + msgid "Set authoritive zone information" + msgstr "OkreÅlenie danych strefy autorytatywnej (SOA)" + +-#: option.c:459 ++#: option.c:462 + msgid "Secondary authoritative nameservers for forward domains" + msgstr "Pomocnicze serwery autorytatywne dla forwardowanych domen" + +-#: option.c:460 ++#: option.c:463 + msgid "Peers which are allowed to do zone transfer" + msgstr "Wskazanie serwerÃ³w uprawnionych do transferu stref" + +-#: option.c:461 ++#: option.c:464 + msgid "Specify ipsets to which matching domains should be added" + msgstr "WyszczegÃ³lnienie ipset-Ã³w, do ktÃ³rych bÄdÄ dopisywane adresy IP leÅŒÄce we wskazanych domenach" + +-#: option.c:462 ++#: option.c:465 + msgid "Specify a domain and address range for synthesised names" + msgstr "Wskazanie domeny i zakresu adresÃ³w dla generowanych nazw" + +-#: option.c:463 ++#: option.c:466 + msgid "Activate DNSSEC validation" + msgstr "Uaktywnienie walidacji DNSSEC" + +-#: option.c:464 ++#: option.c:467 + msgid "Specify trust anchor key digest." + msgstr "Wskazanie punktu zaufania dla uwierzytelniania DNSSEC." + +-#: option.c:465 ++#: option.c:468 + msgid "Disable upstream checking for DNSSEC debugging." + msgstr "Akceptowanie nieuwiarygodnionych odpowiedzi DNSSEC (ustawienie bitu CD w zapytaniach)." + +-#: option.c:466 ++#: option.c:469 + msgid "Ensure answers without DNSSEC are in unsigned zones." + msgstr "Upewnianie siÄ, ÅŒe odpowiedzi bez DNSSEC pochodzÄ ze stref niepodpisanych." + +-#: option.c:467 ++#: option.c:470 + msgid "Don't check DNSSEC signature timestamps until first cache-reload" + msgstr "WyÅÄczenie sprawdzania sygnatur czasowych DNSSEC do pierwszego przeÅadowania pamiÄci podrÄcznej." + +-#: option.c:468 ++#: option.c:471 + msgid "Timestamp file to verify system clock for DNSSEC" + msgstr "" + +-#: option.c:470 ++#: option.c:473 + msgid "Specify DHCPv6 prefix class" + msgstr "OkreÅlenie prefiksu klasy DHCPv6" + +-#: option.c:472 ++#: option.c:475 + msgid "Set priority, resend-interval and router-lifetime" + msgstr "Ustawianie priorytetu, okresu rozsyÅania oraz czasu ÅŒycia rutera (RA)." + +-#: option.c:473 ++#: option.c:476 + msgid "Do not log routine DHCP." + msgstr "WyÅÄczenie logowania zwyczajnego DHCP." + +-#: option.c:474 ++#: option.c:477 + msgid "Do not log routine DHCPv6." + msgstr "WyÅÄczenie logowania zwyczajnego DHCPv6." + +-#: option.c:475 ++#: option.c:478 + msgid "Do not log RA." + msgstr "WyÅÄczenie logowania RA." + +-#: option.c:476 ++#: option.c:479 + msgid "Accept queries only from directly-connected networks" + msgstr "Akceptowanie zapytaÅ wyÅÄcznie z sieci podpiÄtych bezpoÅrednio." + +-#: option.c:477 ++#: option.c:480 + msgid "Detect and remove DNS forwarding loops" + msgstr "Wykrywanie i usuwanie pÄtli zapytaÅ DNS." + +-#: option.c:478 ++#: option.c:481 + msgid "Ignore DNS responses containing ipaddr." + msgstr "" + +-#: option.c:680 ++#: option.c:683 + #, c-format + msgid "" + "Usage: dnsmasq [options]\n" +@@ -736,312 +740,312 @@ msgstr "" + "UÅŒycie: dnsmasq [opcje]\n" + "\n" + +-#: option.c:682 ++#: option.c:685 + #, c-format + msgid "Use short options only on the command line.\n" + msgstr "W tym systemie w linii poleceÅ moÅŒna uÅŒywaÄ wyÅÄcznie jednoliterowych opcji.\n" + +-#: option.c:684 ++#: option.c:687 + #, c-format + msgid "Valid options are:\n" + msgstr "DostÄpne opcje:\n" + +-#: option.c:741 option.c:745 ++#: option.c:744 option.c:748 + msgid "bad port" + msgstr "nieprawidÅowy numer portu" + +-#: option.c:772 option.c:804 ++#: option.c:775 option.c:807 + msgid "interface binding not supported" + msgstr "nie ma moÅŒliwoÅci dowiÄzywania do interfejsu" + +-#: option.c:781 option.c:3570 ++#: option.c:784 option.c:3575 + msgid "bad interface name" + msgstr "nieprawidÅowa nazwa interfejsu" + +-#: option.c:811 ++#: option.c:814 + msgid "bad address" + msgstr "zÅy adres" + +-#: option.c:993 ++#: option.c:996 + msgid "unsupported encapsulation for IPv6 option" + msgstr "nieobsÅugiwany rodzaj enkapsulacji opcji IPv6" + +-#: option.c:1007 ++#: option.c:1010 + msgid "bad dhcp-option" + msgstr "bÅÄd w dhcp-option" + +-#: option.c:1075 ++#: option.c:1078 + msgid "bad IP address" + msgstr "zÅy adres IP" + +-#: option.c:1078 option.c:1216 option.c:2888 ++#: option.c:1081 option.c:1219 option.c:2893 + msgid "bad IPv6 address" + msgstr "zÅy adres IPv6" + +-#: option.c:1243 option.c:1337 ++#: option.c:1246 option.c:1340 + msgid "bad domain in dhcp-option" + msgstr "nieprawidÅowa nazwa domeny w dhcp-option" + +-#: option.c:1375 ++#: option.c:1378 + msgid "dhcp-option too long" + msgstr "zbyt dÅuga dhcp-option (>255 znakÃ³w)" + +-#: option.c:1382 ++#: option.c:1385 + msgid "illegal dhcp-match" + msgstr "niedopuszczalne dhcp-match" + +-#: option.c:1444 ++#: option.c:1447 + msgid "illegal repeated flag" + msgstr "wielokrotne uÅŒycie opcji niedozwolone (pojawiÅa siÄ wczeÅniej w linii poleceÅ)" + +-#: option.c:1452 ++#: option.c:1455 + msgid "illegal repeated keyword" + msgstr "wielokrotne uÅŒycie opcji niedozwolone (pojawiÅa siÄ wszeÅniej w pliku konfiguracyjnym)" + +-#: option.c:1517 option.c:4186 ++#: option.c:1520 option.c:4191 + #, c-format + msgid "cannot access directory %s: %s" + msgstr "brak dostÄpu do katalogu %s: %s" + +-#: option.c:1563 tftp.c:493 ++#: option.c:1566 tftp.c:493 + #, c-format + msgid "cannot access %s: %s" + msgstr "brak dostÄpu do %s: %s" + +-#: option.c:1615 ++#: option.c:1618 + msgid "setting log facility is not possible under Android" + msgstr "zmiana log-facility w systemie Android nie jest moÅŒliwa" + +-#: option.c:1624 ++#: option.c:1627 + msgid "bad log facility" + msgstr "nierozpoznany znacznik logÃ³w" + +-#: option.c:1677 ++#: option.c:1680 + msgid "bad MX preference" + msgstr "nieprawidÅowa wartoÅÄ preferencji MX" + +-#: option.c:1682 ++#: option.c:1685 + msgid "bad MX name" + msgstr "nieprawidÅowa nazwa MX" + +-#: option.c:1696 ++#: option.c:1699 + msgid "bad MX target" + msgstr "nieprawidÅowa wartoÅÄ celu MX" + +-#: option.c:1708 ++#: option.c:1711 + msgid "cannot run scripts under uClinux" + msgstr "w uClinuksie nie ma moÅŒliwoÅci uruchamiania skryptÃ³w" + +-#: option.c:1710 ++#: option.c:1713 + msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts" + msgstr "ÅŒeby mieÄ moÅŒliwoÅÄ uÅŒywania skryptÃ³w wywoÅywanych przy zmianie dzierÅŒawy, przekompiluj dnsmasq-a z wÅÄczonÄ flagÄ HAVE_SCRIPT" + +-#: option.c:1714 ++#: option.c:1717 + msgid "recompile with HAVE_LUASCRIPT defined to enable Lua scripts" + msgstr "uÅŒywanie skryptÃ³w Lua, wymaga skompilowania dnsmasq-a z flagÄ HAVE_LUASCRIPT" + +-#: option.c:1970 option.c:2015 option.c:2071 ++#: option.c:1973 option.c:2018 option.c:2074 + msgid "bad prefix" + msgstr "zÅa maska" + +-#: option.c:2352 ++#: option.c:2355 + msgid "recompile with HAVE_IPSET defined to enable ipset directives" + msgstr "chcÄc korzystaÄ z ipsets przekompiluj dnsmasq-a z HAVE_IPSET" + +-#: option.c:2545 ++#: option.c:2548 + msgid "bad port range" + msgstr "nieprawidÅowy zakres numerÃ³w portÃ³w" + +-#: option.c:2561 ++#: option.c:2564 + msgid "bad bridge-interface" + msgstr "nieprawidÅowa nazwa urzÄdzenia w bridge-interface" + +-#: option.c:2621 ++#: option.c:2624 + msgid "only one tag allowed" + msgstr "moÅŒna wskazaÄ tylko jeden znacznik sieci" + +-#: option.c:2641 option.c:2653 option.c:2759 option.c:2800 ++#: option.c:2644 option.c:2656 option.c:2764 option.c:2805 + msgid "bad dhcp-range" + msgstr "nieprawidÅowy zakres dhcp-range" + +-#: option.c:2668 ++#: option.c:2671 + msgid "inconsistent DHCP range" + msgstr "niespÃ³jny zakres adresÃ³w DHCP" + +-#: option.c:2727 ++#: option.c:2732 + msgid "prefix length must be exactly 64 for RA subnets" + msgstr "dÅugoÅÄ prefiksu musi wynosiÄ dokÅadnie 64 dla podsieci RA" + +-#: option.c:2729 ++#: option.c:2734 + msgid "prefix length must be exactly 64 for subnet constructors" + msgstr "dÅugoÅÄ prefiksu musi wynosiÄ dokÅadnie 64 dla konstruktorÃ³w podsieci" + +-#: option.c:2733 ++#: option.c:2738 + msgid "prefix length must be at least 64" + msgstr "dÅugoÅÄ prefiksu musi wynosiÄ co najmniej 64" + +-#: option.c:2736 ++#: option.c:2741 + msgid "inconsistent DHCPv6 range" + msgstr "niespÃ³jny zakres adresÃ³w DHCPv6" + +-#: option.c:2747 ++#: option.c:2752 + msgid "prefix must be zero with \"constructor:\" argument" + msgstr "prefiks musi wynosiÄ zero z argumentem \"constructor:\"" + +-#: option.c:2858 option.c:2906 ++#: option.c:2863 option.c:2911 + msgid "bad hex constant" + msgstr "zapis niezgodny z formatem szesnastkowym" + +-#: option.c:2880 ++#: option.c:2885 + msgid "cannot match tags in --dhcp-host" + msgstr "--dhcp-host nie dopuszcza dopasowywania na podstawie znacznikÃ³w" + +-#: option.c:2928 ++#: option.c:2933 + #, c-format + msgid "duplicate dhcp-host IP address %s" + msgstr "powtÃ³rzony adres IP %s w specyfikacji dhcp-host" + +-#: option.c:2986 ++#: option.c:2991 + msgid "bad DHCP host name" + msgstr "niedopuszczalna nazwa komputera w dhcp-host" + +-#: option.c:3068 ++#: option.c:3073 + msgid "bad tag-if" + msgstr "nieprawidÅowa skÅadnia 'tag-if'" + +-#: option.c:3392 option.c:3786 ++#: option.c:3397 option.c:3791 + msgid "invalid port number" + msgstr "nieprawidÅowy numer portu" + +-#: option.c:3454 ++#: option.c:3459 + msgid "bad dhcp-proxy address" + msgstr "zÅy adres dhcp-proxy" + +-#: option.c:3480 ++#: option.c:3485 + msgid "Bad dhcp-relay" + msgstr "zÅy dhcp-relay" + +-#: option.c:3506 ++#: option.c:3511 + msgid "bad RA-params" + msgstr "nieprawidÅowe argumenty RA" + +-#: option.c:3515 ++#: option.c:3520 + msgid "bad DUID" + msgstr "zÅy DUID" + +-#: option.c:3557 ++#: option.c:3562 + msgid "invalid alias range" + msgstr "nieprawidÅowy zakres adresÃ³w w --alias" + +-#: option.c:3611 ++#: option.c:3616 + msgid "bad CNAME" + msgstr "zÅa CNAME" + +-#: option.c:3616 ++#: option.c:3621 + msgid "duplicate CNAME" + msgstr "powtÃ³rzona CNAME" + +-#: option.c:3636 ++#: option.c:3641 + msgid "bad PTR record" + msgstr "nieprawidÅowy zapis rekordu PTR" + +-#: option.c:3667 ++#: option.c:3672 + msgid "bad NAPTR record" + msgstr "nieprawidÅowy zapis rekordu NAPTR" + +-#: option.c:3701 ++#: option.c:3706 + msgid "bad RR record" + msgstr "nieprawidÅowy zapis rekordu RR" + +-#: option.c:3731 ++#: option.c:3736 + msgid "bad TXT record" + msgstr "nieprawidÅowy zapis rekordu TXT" + +-#: option.c:3772 ++#: option.c:3777 + msgid "bad SRV record" + msgstr "nieprawidÅowy zapis rekordu SRV" + +-#: option.c:3779 ++#: option.c:3784 + msgid "bad SRV target" + msgstr "nieprawidÅowa wartoÅÄ celu SRV" + +-#: option.c:3793 ++#: option.c:3798 + msgid "invalid priority" + msgstr "nieprawidÅowy priorytet" + +-#: option.c:3800 ++#: option.c:3805 + msgid "invalid weight" + msgstr "nieprawidÅowa waga" + +-#: option.c:3824 ++#: option.c:3829 + msgid "Bad host-record" + msgstr "nieprawidÅowy zapis host-record" + +-#: option.c:3841 ++#: option.c:3846 + msgid "Bad name in host-record" + msgstr "niedopuszczalna nazwa w host-record" + +-#: option.c:3906 ++#: option.c:3911 + msgid "bad trust anchor" + msgstr "nieprawidÅowa specyfikacja punktu zaufania" + +-#: option.c:3920 ++#: option.c:3925 + msgid "bad HEX in trust anchor" + msgstr "zÅy zapis szesnastkowy" + +-#: option.c:3930 ++#: option.c:3935 + msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DNSSEC/DBus support)" + msgstr "nieobsÅugiwana opcja (sprawdÅº, czy obsÅuga DHCP/TFTP/DNSSEC/DBus zostaÅa wkompilowana)" + +-#: option.c:3989 ++#: option.c:3994 + msgid "missing \"" + msgstr "brakuje \"" + +-#: option.c:4046 ++#: option.c:4051 + msgid "bad option" + msgstr "nieprawidÅowa opcja" + +-#: option.c:4048 ++#: option.c:4053 + msgid "extraneous parameter" + msgstr "nadwyÅŒkowy parametr" + +-#: option.c:4050 ++#: option.c:4055 + msgid "missing parameter" + msgstr "brak parametru" + +-#: option.c:4052 ++#: option.c:4057 + msgid "illegal option" + msgstr "niedopuszczalna opcja" + +-#: option.c:4059 ++#: option.c:4064 + msgid "error" + msgstr "bÅÄd" + +-#: option.c:4061 ++#: option.c:4066 + #, c-format + msgid " at line %d of %s" + msgstr " w linii %d pliku %s" + +-#: option.c:4076 option.c:4323 option.c:4359 ++#: option.c:4081 option.c:4328 option.c:4364 + #, c-format + msgid "read %s" + msgstr "przeczytaÅem %s" + +-#: option.c:4139 option.c:4262 tftp.c:667 ++#: option.c:4144 option.c:4267 tftp.c:667 + #, c-format + msgid "cannot read %s: %s" + msgstr "bÅÄd odczytu z pliku %s: %s" + +-#: option.c:4425 ++#: option.c:4430 + msgid "junk found in command line" + msgstr "jakieÅ Åmieci w linii poleceÅ" + +-#: option.c:4460 ++#: option.c:4465 + #, c-format + msgid "Dnsmasq version %s %s\n" + msgstr "Dnsmasq, wersja %s %s\n" + +-#: option.c:4461 ++#: option.c:4466 + #, c-format + msgid "" + "Compile time options: %s\n" +@@ -1050,62 +1054,62 @@ msgstr "" + "Wkompilowane opcje %s\n" + "\n" + +-#: option.c:4462 ++#: option.c:4467 + #, c-format + msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" + msgstr "Autor nie daje Å»ADNYCH GWARANCJI egzekwowalnych prawnie.\n" + +-#: option.c:4463 ++#: option.c:4468 + #, c-format + msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" + msgstr "Dnsmasq jest wolnym oprogramowaniem, moÅŒesz go rozprowadzaÄ\n" + +-#: option.c:4464 ++#: option.c:4469 + #, c-format + msgid "under the terms of the GNU General Public License, version 2 or 3.\n" + msgstr "na warunkach okreÅlonych w GNU General Public Licence, w wersji 2 lub 3.\n" + +-#: option.c:4475 ++#: option.c:4480 + msgid "try --help" + msgstr "sprÃ³buj: --help" + +-#: option.c:4477 ++#: option.c:4482 + msgid "try -w" + msgstr "sprÃ³buj: -w" + +-#: option.c:4479 ++#: option.c:4484 + #, c-format + msgid "bad command line options: %s" + msgstr "nieprawidÅowa opcja w linii poleceÅ %s" + +-#: option.c:4535 ++#: option.c:4544 + #, c-format + msgid "cannot get host-name: %s" + msgstr "nie moÅŒna pobraÄ nazwy hosta: %s" + +-#: option.c:4563 ++#: option.c:4572 + msgid "only one resolv.conf file allowed in no-poll mode." + msgstr "w trybie no-poll moÅŒna wskazaÄ najwyÅŒej jeden plik resolv.conf." + +-#: option.c:4573 ++#: option.c:4582 + msgid "must have exactly one resolv.conf to read domain from." + msgstr "musisz mieÄ dokÅadnie jeden plik resolv.conf do odczytu domen." + +-#: option.c:4576 network.c:1506 dhcp.c:774 ++#: option.c:4585 network.c:1507 dhcp.c:777 + #, c-format + msgid "failed to read %s: %s" + msgstr "nie udaÅo siÄ odczytaÄ %s: %s" + +-#: option.c:4593 ++#: option.c:4602 + #, c-format + msgid "no search directive found in %s" + msgstr "brak wytycznych wyszukiwania w %s" + +-#: option.c:4614 ++#: option.c:4623 + msgid "there must be a default domain when --dhcp-fqdn is set" + msgstr "w przypadku uÅŒywania --dhcp-fqdn trzeba wskazaÄ domyÅlnÄ domenÄ" + +-#: option.c:4623 ++#: option.c:4632 + msgid "syntax check OK" + msgstr "skÅadnia sprawdzona, jest prawidÅowa" + +@@ -1114,25 +1118,25 @@ msgstr "skÅadnia sprawdzona, jest prawidÅowa" + msgid "failed to send packet: %s" + msgstr "wysyÅanie pakietu nie powiodÅo siÄ: %s" + +-#: forward.c:572 ++#: forward.c:591 + msgid "discarding DNS reply: subnet option mismatch" + msgstr "odrzucam odpowiedÅº DNS: nie zgadza siÄ specyfikacja podsieci" + +-#: forward.c:595 ++#: forward.c:614 + #, c-format + msgid "nameserver %s refused to do a recursive query" + msgstr "serwer nazw %s odmawia wykonania zapytania rekurencyjnego" + +-#: forward.c:627 ++#: forward.c:646 + #, c-format + msgid "possible DNS-rebind attack detected: %s" + msgstr "prawdopodobnie wykryto atak DNS-rebind: %s" + +-#: forward.c:1156 forward.c:1722 ++#: forward.c:1209 forward.c:1785 + msgid "Ignoring query from non-local network" + msgstr "Ignorowanie zapytaÅ z sieci pozalokalnych." + +-#: forward.c:2178 ++#: forward.c:2256 + #, c-format + msgid "Maximum number of concurrent DNS queries reached (max: %d)" + msgstr "OsiÄgniÄto granicznÄ iloÅÄ jednoczeÅnie obsÅugiwanych zapytaÅ DNS (maks: %d)" +@@ -1166,338 +1170,348 @@ msgstr "interfejs %s nie pozwoliÅ siÄ przyÅÄczyÄ do grupy rozgÅoszeniowej + msgid "failed to bind server socket for %s: %s" + msgstr "bÅÄd przy przyznawaniu nazwy gniazdu serwera %s: %s" + +-#: network.c:1444 ++#: network.c:1445 + #, c-format + msgid "ignoring nameserver %s - local interface" + msgstr "ignorowanie serwera nazw %s - interfejs lokalny" + +-#: network.c:1455 ++#: network.c:1456 + #, c-format + msgid "ignoring nameserver %s - cannot make/bind socket: %s" + msgstr "ignorowanie serwera nazw %s - nie moÅŒna utworzyÄ/dowiÄzaÄ gniazda: %s" + +-#: network.c:1468 ++#: network.c:1469 + msgid "unqualified" + msgstr "niekwalifikowane(-a)" + +-#: network.c:1468 ++#: network.c:1469 + msgid "names" + msgstr "nazwy" + +-#: network.c:1470 ++#: network.c:1471 + msgid "default" + msgstr "domyÅlne" + +-#: network.c:1472 ++#: network.c:1473 + msgid "domain" + msgstr "domeny" + +-#: network.c:1475 ++#: network.c:1476 + #, c-format + msgid "using local addresses only for %s %s" + msgstr "uÅŒywam adresÃ³w lokalnych tylko dla %s %s" + +-#: network.c:1477 ++#: network.c:1478 + #, c-format + msgid "using standard nameservers for %s %s" + msgstr "uÅŒywam standardowych serwerÃ³w nazw dla %s %s" + +-#: network.c:1479 ++#: network.c:1480 + #, c-format + msgid "using nameserver %s#%d for %s %s" + msgstr "uÅŒywam serwera nazw %s#%d dla %s %s" + +-#: network.c:1483 ++#: network.c:1484 + #, c-format + msgid "NOT using nameserver %s#%d - query loop detected" + msgstr "NIE uÅŒywam serwera nazw %s#%d - wykryto pÄtlÄ zapytaÅ" + +-#: network.c:1486 ++#: network.c:1487 + #, c-format + msgid "using nameserver %s#%d(via %s)" + msgstr "uÅŒywam serwera nazw %s#%d (przez %s)" + +-#: network.c:1488 ++#: network.c:1489 + #, c-format + msgid "using nameserver %s#%d" + msgstr "uÅŒywam serwera nazw %s#%d" + +-#: dnsmasq.c:149 ++#: dnsmasq.c:163 + msgid "dhcp-hostsdir, dhcp-optsdir and hostsdir are not supported on this platform" + msgstr "" + +-#: dnsmasq.c:156 ++#: dnsmasq.c:170 + #, fuzzy + msgid "no trust anchors provided for DNSSEC" + msgstr "Nie wskazano punktÃ³w zaufania dla DNSSEC." + +-#: dnsmasq.c:159 ++#: dnsmasq.c:173 + #, fuzzy + msgid "cannot reduce cache size from default when DNSSEC enabled" + msgstr "Brak moÅŒliwoÅci zmniejszenia pamiÄci podrÄcznej poniÅŒej wielkoÅci domyÅlnej w przypadku uÅŒywania DNSSEC." + +-#: dnsmasq.c:161 ++#: dnsmasq.c:175 + msgid "DNSSEC not available: set HAVE_DNSSEC in src/config.h" + msgstr "obsÅuga DNSSEC niedostÄpna - ustaw HAVE_DNSSEC w src/config.h" + +-#: dnsmasq.c:167 ++#: dnsmasq.c:181 + msgid "TFTP server not available: set HAVE_TFTP in src/config.h" + msgstr "Serwer TFTP nie zostaÅ wkompilowany -- ustaw HAVE_TFTP w src/config.h" + +-#: dnsmasq.c:172 ++#: dnsmasq.c:186 + #, fuzzy + msgid "cannot use --conntrack AND --query-port" + msgstr "--conntrack i --query-port wykluczajÄ siÄ wzajemnie" + +-#: dnsmasq.c:175 ++#: dnsmasq.c:189 + #, fuzzy + msgid "conntrack support not available: set HAVE_CONNTRACK in src/config.h" + msgstr "Wsparcie dla przekazywania znacznikÃ³w poÅÄczeÅ (conntrack) nie zostaÅo wkompilowane - ustaw HAVE_CONNTRACK w src/config.h" + +-#: dnsmasq.c:180 ++#: dnsmasq.c:194 + msgid "asychronous logging is not available under Solaris" + msgstr "zapis do logÃ³w w trybie asynchronicznym nie jest dostÄpny w Solarisie" + +-#: dnsmasq.c:185 ++#: dnsmasq.c:199 + msgid "asychronous logging is not available under Android" + msgstr "zapis do logÃ³w w trybie asynchronicznym nie jest dostÄpny w Androidzie" + +-#: dnsmasq.c:190 ++#: dnsmasq.c:204 + msgid "authoritative DNS not available: set HAVE_AUTH in src/config.h" + msgstr "tryb autorytatywny DNS-a niedostÄpny - ustaw HAVE_AUTH w src/config.h" + +-#: dnsmasq.c:195 ++#: dnsmasq.c:209 + #, fuzzy + msgid "loop detection not available: set HAVE_LOOP in src/config.h" + msgstr "Wykrywanie pÄtli zapytaÅ nie zostaÅo wkompilowane - ustaw HAVE_LOOP w src/config.h" + +-#: dnsmasq.c:203 ++#: dnsmasq.c:217 + msgid "zone serial must be configured in --auth-soa" + msgstr "za pomocÄ --auth-soa musi zostaÄ ustawiony numer seryjny strefy" + +-#: dnsmasq.c:221 ++#: dnsmasq.c:235 + msgid "dhcp-range constructor not available on this platform" + msgstr "konstrukcja dhcp-range nie jest dostÄpna w tym systemie" + +-#: dnsmasq.c:264 ++#: dnsmasq.c:278 + msgid "cannot set --bind-interfaces and --bind-dynamic" + msgstr "--bind-interfaces i --bind-dynamic wzajemnie siÄ wykluczajÄ" + +-#: dnsmasq.c:267 ++#: dnsmasq.c:281 + #, c-format + msgid "failed to find list of interfaces: %s" + msgstr "bÅÄd podczas tworzenia listy interfejsÃ³w sieciowych: %s" + +-#: dnsmasq.c:276 ++#: dnsmasq.c:290 + #, c-format + msgid "unknown interface %s" + msgstr "nieznany interfejs %s" + +-#: dnsmasq.c:340 dnsmasq.c:1004 ++#: dnsmasq.c:354 dnsmasq.c:1037 + #, c-format + msgid "DBus error: %s" + msgstr "bÅÄd DBus: %s" + +-#: dnsmasq.c:343 ++#: dnsmasq.c:357 + msgid "DBus not available: set HAVE_DBUS in src/config.h" + msgstr "ObsÅuga DBus nie zostaÅa wkompilowana -- ustaw HAVE_DBUS w src/config.h" + +-#: dnsmasq.c:371 ++#: dnsmasq.c:385 + #, c-format + msgid "unknown user or group: %s" + msgstr "nieznany uÅŒytkownik lub grupa: %s" + +-#: dnsmasq.c:426 ++#: dnsmasq.c:440 + #, c-format + msgid "cannot chdir to filesystem root: %s" + msgstr "nie potrafiÄ wejÅÄ do gÅÃ³wnego katalogu: %s" + +-#: dnsmasq.c:667 ++#: dnsmasq.c:692 + #, c-format + msgid "started, version %s DNS disabled" + msgstr "uruchomiony, wersja %s, DNS wyÅÄczony" + +-#: dnsmasq.c:669 ++#: dnsmasq.c:694 + #, c-format + msgid "started, version %s cachesize %d" + msgstr "uruchomiony, wersja %s, %d miejsc w pamiÄci podrÄcznej" + +-#: dnsmasq.c:671 ++#: dnsmasq.c:696 + #, c-format + msgid "started, version %s cache disabled" + msgstr "uruchomiony, wersja %s, pamiÄÄ podrÄczna wyÅÄczona" + +-#: dnsmasq.c:673 ++#: dnsmasq.c:698 + #, c-format + msgid "compile time options: %s" + msgstr "opcje kompilacji: %s" + +-#: dnsmasq.c:679 ++#: dnsmasq.c:704 + msgid "DBus support enabled: connected to system bus" + msgstr "obsÅuga DBus wÅÄczona, podÅÄczono do serwera DBus" + +-#: dnsmasq.c:681 ++#: dnsmasq.c:706 + msgid "DBus support enabled: bus connection pending" + msgstr "obsÅuga DBus wÅÄczona, trwa podÅÄczanie do serwera DBus" + +-#: dnsmasq.c:686 ++#: dnsmasq.c:711 + msgid "DNS service limited to local subnets" + msgstr "usÅuga DNS ograniczona do lokalnych podsieci" + +-#: dnsmasq.c:702 ++#: dnsmasq.c:727 + msgid "DNSSEC validation enabled" + msgstr "walidacja DNSSEC wÅÄczona" + +-#: dnsmasq.c:705 ++#: dnsmasq.c:730 + msgid "DNSSEC signature timestamps not checked until first cache reload" + msgstr "sprawdzanie sygnatur czasowych DNSSEC wyÅÄczone do czasu przeÅadowania pamiÄci podrÄcznej" + +-#: dnsmasq.c:708 ++#: dnsmasq.c:733 + #, fuzzy + msgid "DNSSEC signature timestamps not checked until system time valid" + msgstr "sprawdzanie sygnatur czasowych DNSSEC wyÅÄczone do czasu przeÅadowania pamiÄci podrÄcznej" + +-#: dnsmasq.c:713 ++#: dnsmasq.c:738 + #, c-format + msgid "warning: failed to change owner of %s: %s" + msgstr "UWAGA! Nie udaÅo siÄ zmieniÄ uÅŒytkownika pliku %s: %s" + +-#: dnsmasq.c:717 ++#: dnsmasq.c:742 + msgid "setting --bind-interfaces option because of OS limitations" + msgstr "ustawiam --bind-interfaces z powodu ograniczeÅ systemu operacyjnego" + +-#: dnsmasq.c:727 ++#: dnsmasq.c:752 + #, c-format + msgid "warning: interface %s does not currently exist" + msgstr "uwaga: interfejs %s nie jest wÅÄczony" + +-#: dnsmasq.c:732 ++#: dnsmasq.c:757 + msgid "warning: ignoring resolv-file flag because no-resolv is set" + msgstr "uwaga: ignorujÄ opcjÄ resolv-file, poniewaÅŒ wybrano tryb no-resolv" + +-#: dnsmasq.c:735 ++#: dnsmasq.c:760 + msgid "warning: no upstream servers configured" + msgstr "uwaga: nie wskazano nadrzÄdnych serwerÃ³w DNS" + +-#: dnsmasq.c:739 ++#: dnsmasq.c:764 + #, c-format + msgid "asynchronous logging enabled, queue limit is %d messages" + msgstr "wÅÄczono asynchroniczny tryb zapisu do logÃ³w z kolejkÄ na %d komunikatÃ³w" + +-#: dnsmasq.c:760 ++#: dnsmasq.c:785 + msgid "IPv6 router advertisement enabled" + msgstr "anonsowanie rutera IPv6 wÅÄczone" + +-#: dnsmasq.c:765 ++#: dnsmasq.c:790 + #, c-format + msgid "DHCP, sockets bound exclusively to interface %s" + msgstr "DHCP, gniazda dowiÄzane na wyÅÄcznoÅÄ interfejsowi %s" + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "root is " + msgstr "z gÅÃ³wnym katalogiem w " + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "enabled" + msgstr "wÅÄczony" + +-#: dnsmasq.c:784 ++#: dnsmasq.c:810 + msgid "secure mode" + msgstr "w trybie bezpiecznym" + +-#: dnsmasq.c:810 ++#: dnsmasq.c:813 ++#, c-format ++msgid "warning: %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:817 ++#, fuzzy, c-format ++msgid "warning: TFTP directory %s inaccessible" ++msgstr "katalog TFTP %s nie jest dostÄpny: %s" ++ ++#: dnsmasq.c:843 + #, c-format + msgid "restricting maximum simultaneous TFTP transfers to %d" + msgstr "ograniczam iloÅÄ jednoczesnych przesÅaÅ TFTP do %d" + +-#: dnsmasq.c:1006 ++#: dnsmasq.c:1039 + msgid "connected to system DBus" + msgstr "podÅÄczono do DBus-a" + +-#: dnsmasq.c:1156 ++#: dnsmasq.c:1189 + #, c-format + msgid "cannot fork into background: %s" + msgstr "nie potrafiÄ przeÅÄczyÄ siÄ do pracy w tle: %s" + +-#: dnsmasq.c:1159 ++#: dnsmasq.c:1192 + #, c-format + msgid "failed to create helper: %s" + msgstr "nie udaÅo siÄ utworzyÄ procesu pomocniczego: %s" + +-#: dnsmasq.c:1162 ++#: dnsmasq.c:1195 + #, c-format + msgid "setting capabilities failed: %s" + msgstr "nie powiodÅo siÄ ustawianie ograniczeÅ (capabilities): %s" + +-#: dnsmasq.c:1165 ++#: dnsmasq.c:1198 + #, c-format + msgid "failed to change user-id to %s: %s" + msgstr "nie udaÅo siÄ zmieniÄ uÅŒytkownika procesu na %s: %s" + +-#: dnsmasq.c:1168 ++#: dnsmasq.c:1201 + #, c-format + msgid "failed to change group-id to %s: %s" + msgstr "nie udaÅo siÄ zmieniÄ grupy procesu na %s: %s" + +-#: dnsmasq.c:1171 ++#: dnsmasq.c:1204 + #, c-format + msgid "failed to open pidfile %s: %s" + msgstr "nie udaÅo siÄ otworzyÄ pliku z PID-em %s: %s" + +-#: dnsmasq.c:1174 ++#: dnsmasq.c:1207 + #, c-format + msgid "cannot open log %s: %s" + msgstr "nie udaÅo siÄ otworzyÄ logu %s: %s" + +-#: dnsmasq.c:1177 ++#: dnsmasq.c:1210 + #, c-format + msgid "failed to load Lua script: %s" + msgstr "nie udaÅo siÄ wczytaÄ skryptu Lua: %s" + +-#: dnsmasq.c:1180 ++#: dnsmasq.c:1213 + #, c-format + msgid "TFTP directory %s inaccessible: %s" + msgstr "katalog TFTP %s nie jest dostÄpny: %s" + +-#: dnsmasq.c:1183 ++#: dnsmasq.c:1216 + #, fuzzy, c-format + msgid "cannot create timestamp file %s: %s" + msgstr "nie potrafiÄ otworzyÄ albo utworzyÄ pliku dzierÅŒaw %s: %s" + +-#: dnsmasq.c:1204 ++#: dnsmasq.c:1237 + msgid "now checking DNSSEC signature timestamps" + msgstr "trwa sprawdzanie sygnatur czasowych podpisÃ³w DNSSEC" + +-#: dnsmasq.c:1271 ++#: dnsmasq.c:1304 + #, c-format + msgid "script process killed by signal %d" + msgstr "skrypt zostaÅ zabity sygnaÅem %d" + +-#: dnsmasq.c:1275 ++#: dnsmasq.c:1308 + #, c-format + msgid "script process exited with status %d" + msgstr "skrypt zakoÅczyÅ siÄ z kodem powrotu %d" + +-#: dnsmasq.c:1279 ++#: dnsmasq.c:1312 + #, c-format + msgid "failed to execute %s: %s" + msgstr "nie udaÅo siÄ uruchomiÄ %s: %s" + +-#: dnsmasq.c:1334 ++#: dnsmasq.c:1367 + msgid "exiting on receipt of SIGTERM" + msgstr "zakoÅczyÅem dziaÅanie z powodu odebrania SIGTERM" + +-#: dnsmasq.c:1362 ++#: dnsmasq.c:1395 + #, c-format + msgid "failed to access %s: %s" + msgstr "brak dostÄpu do %s: %s" + +-#: dnsmasq.c:1392 ++#: dnsmasq.c:1425 + #, c-format + msgid "reading %s" + msgstr "czytanie %s" + +-#: dnsmasq.c:1403 ++#: dnsmasq.c:1436 + #, c-format + msgid "no servers found in %s, will retry" + msgstr "w %s nie znalazÅem serwerÃ³w, sprÃ³bujÄ ponownie pÃ³Åºniej" +@@ -1527,37 +1541,37 @@ msgstr "bÅÄd przy przyznawaniu nazwy gniazdu serwera DHCP: %s" + msgid "cannot create ICMP raw socket: %s." + msgstr "nie udaÅo siÄ utworzyÄ surowego gniazda ICMP: %s." + +-#: dhcp.c:239 ++#: dhcp.c:241 dhcp6.c:180 + #, c-format + msgid "unknown interface %s in bridge-interface" + msgstr "nieznany interfejs %s w bridge-u" + +-#: dhcp.c:278 ++#: dhcp.c:281 + #, c-format + msgid "DHCP packet received on %s which has no address" + msgstr "ÅŒÄdanie DHCP odebrano na interfejsie %s, ktÃ³ry nie ma adresu" + +-#: dhcp.c:412 ++#: dhcp.c:415 + #, c-format + msgid "ARP-cache injection failed: %s" + msgstr "uzupeÅnienie pamiÄci podrÄcznej ARP nie powiodÅo siÄ: %s" + +-#: dhcp.c:511 ++#: dhcp.c:514 + #, c-format + msgid "DHCP range %s -- %s is not consistent with netmask %s" + msgstr "zakres adresÃ³w DHCP %s -- %s jest niespÃ³jny z maskÄ sieci %s" + +-#: dhcp.c:812 ++#: dhcp.c:815 + #, c-format + msgid "bad line at %s line %d" + msgstr "zÅa zawartoÅÄ pliku %s, w linii %d" + +-#: dhcp.c:855 ++#: dhcp.c:858 + #, c-format + msgid "ignoring %s line %d, duplicate name or IP address" + msgstr "w %s pomijam liniÄ %d -- powtÃ³rzona nazwa lub adres IP" + +-#: dhcp.c:999 rfc3315.c:2139 ++#: dhcp.c:1002 rfc3315.c:2135 + #, c-format + msgid "DHCP relay %s -> %s" + msgstr "przekazywanie DHCP %s -> %s" +@@ -1591,169 +1605,169 @@ msgstr "bÅÄd zapisu do %s: %s (sprÃ³bujÄ ponownie za %us)" + msgid "Ignoring domain %s for DHCP host name %s" + msgstr "Nie uwzglÄdniam czÄÅci domenowej (%s) dla komputera %s" + +-#: rfc2131.c:342 ++#: rfc2131.c:344 + #, c-format + msgid "no address range available for DHCP request %s %s" + msgstr "nie zdefiniowano zakresu adresÃ³w odpowiedniego dla ÅŒÄdania %s %s" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "with subnet selector" + msgstr "z wyborem podsieci" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "via" + msgstr "przez" + +-#: rfc2131.c:355 ++#: rfc2131.c:357 + #, c-format + msgid "%u available DHCP subnet: %s/%s" + msgstr "%u dostÄpna podsieÄ DHCP: %s/%s" + +-#: rfc2131.c:358 rfc3315.c:300 ++#: rfc2131.c:360 rfc3315.c:300 + #, c-format + msgid "%u available DHCP range: %s -- %s" + msgstr "%u dostÄpny zakres adresÃ³w DHCP: %s -- %s" + +-#: rfc2131.c:469 ++#: rfc2131.c:471 + #, c-format + msgid "%u vendor class: %s" + msgstr "%u klasa dostawcy: %s" + +-#: rfc2131.c:471 ++#: rfc2131.c:473 + #, c-format + msgid "%u user class: %s" + msgstr "%u klasa uÅŒytkownika: %s" + +-#: rfc2131.c:498 ++#: rfc2131.c:500 + msgid "disabled" + msgstr "wyÅÄczony(a)" + +-#: rfc2131.c:539 rfc2131.c:967 rfc2131.c:1385 rfc3315.c:603 rfc3315.c:860 +-#: rfc3315.c:1139 ++#: rfc2131.c:541 rfc2131.c:974 rfc2131.c:1380 rfc3315.c:603 rfc3315.c:856 ++#: rfc3315.c:1135 + msgid "ignored" + msgstr "ignorujÄ" + +-#: rfc2131.c:554 rfc2131.c:1205 rfc3315.c:910 ++#: rfc2131.c:556 rfc2131.c:1207 rfc3315.c:906 + msgid "address in use" + msgstr "adres jest w uÅŒyciu" + +-#: rfc2131.c:568 rfc2131.c:1021 ++#: rfc2131.c:570 rfc2131.c:1028 + msgid "no address available" + msgstr "brak dostÄpnego adresu" + +-#: rfc2131.c:575 rfc2131.c:1168 ++#: rfc2131.c:577 rfc2131.c:1170 + msgid "wrong network" + msgstr "nieprawidÅowa sieÄ" + +-#: rfc2131.c:590 ++#: rfc2131.c:592 + msgid "no address configured" + msgstr "brak skonfigurowanego adresu" + +-#: rfc2131.c:596 rfc2131.c:1218 ++#: rfc2131.c:598 rfc2131.c:1220 + msgid "no leases left" + msgstr "brak wolnych dzierÅŒaw" + +-#: rfc2131.c:691 rfc3315.c:476 ++#: rfc2131.c:693 rfc3315.c:476 + #, c-format + msgid "%u client provides name: %s" + msgstr "klient %u przedstawia siÄ jako %s" + +-#: rfc2131.c:796 ++#: rfc2131.c:798 + msgid "PXE BIS not supported" + msgstr "PXE BIS nie jest obsÅugiwane" + +-#: rfc2131.c:935 rfc3315.c:1233 ++#: rfc2131.c:942 rfc3315.c:1229 + #, c-format + msgid "disabling DHCP static address %s for %s" + msgstr "wyÅÄczam statyczne przypisanie adresu %s dla %s" + +-#: rfc2131.c:956 ++#: rfc2131.c:963 + msgid "unknown lease" + msgstr "nieznana dzierÅŒawa" + +-#: rfc2131.c:990 ++#: rfc2131.c:997 + #, c-format + msgid "not using configured address %s because it is leased to %s" + msgstr "nie proponujÄ zakÅadanego w konfiguracji adresu %s, bo jest on juÅŒ wydzierÅŒawiony komputerowi %s" + +-#: rfc2131.c:1000 ++#: rfc2131.c:1007 + #, c-format + msgid "not using configured address %s because it is in use by the server or relay" + msgstr "nie proponujÄ zakÅadanego w konfiguracji adresu %s, bo uÅŒywa go ktÃ³ryÅ z serwerÃ³w" + +-#: rfc2131.c:1003 ++#: rfc2131.c:1010 + #, c-format + msgid "not using configured address %s because it was previously declined" + msgstr "nie proponujÄ zakÅadanego w konfiguracji adresu %s, bo juÅŒ poprzednio zostaÅ odrzucony" + +-#: rfc2131.c:1019 rfc2131.c:1211 ++#: rfc2131.c:1026 rfc2131.c:1213 + msgid "no unique-id" + msgstr "brak unikalnego id" + +-#: rfc2131.c:1106 ++#: rfc2131.c:1108 + msgid "wrong server-ID" + msgstr "nieprawidÅowy identyfikator serwera (server-ID)" + +-#: rfc2131.c:1125 ++#: rfc2131.c:1127 + msgid "wrong address" + msgstr "bÅÄdny adres" + +-#: rfc2131.c:1143 rfc3315.c:1006 ++#: rfc2131.c:1145 rfc3315.c:1002 + msgid "lease not found" + msgstr "dzierÅŒawa nieznaleziona" + +-#: rfc2131.c:1176 ++#: rfc2131.c:1178 + msgid "address not available" + msgstr "adres niedostÄpny" + +-#: rfc2131.c:1187 ++#: rfc2131.c:1189 + msgid "static lease available" + msgstr "dostÄpna statyczna dzierÅŒawa" + +-#: rfc2131.c:1191 ++#: rfc2131.c:1193 + msgid "address reserved" + msgstr "adres zarezerwowany" + +-#: rfc2131.c:1199 ++#: rfc2131.c:1201 + #, c-format + msgid "abandoning lease to %s of %s" + msgstr "porzucam przypisanie do %s nazwy %s" + +-#: rfc2131.c:1712 ++#: rfc2131.c:1707 + #, c-format + msgid "%u bootfile name: %s" + msgstr "%u nazwa pliku bootowania: %s" + +-#: rfc2131.c:1721 ++#: rfc2131.c:1716 + #, c-format + msgid "%u server name: %s" + msgstr "%u nazwa serwera: %s" + +-#: rfc2131.c:1729 ++#: rfc2131.c:1724 + #, c-format + msgid "%u next server: %s" + msgstr "%u nastÄpny serwer: %s" + +-#: rfc2131.c:1732 ++#: rfc2131.c:1727 + #, c-format + msgid "%u broadcast response" + msgstr "%u odpowiedÅº rozgÅoszeniowa" + +-#: rfc2131.c:1795 ++#: rfc2131.c:1790 + #, c-format + msgid "cannot send DHCP/BOOTP option %d: no space left in packet" + msgstr "nie mam moÅŒliwoÅci wysÅania opcji %d DHCP/BOOTP: niedostateczna iloÅÄ miejsca w pakiecie" + +-#: rfc2131.c:2036 ++#: rfc2131.c:2031 + msgid "PXE menu too large" + msgstr "menu PXE zbyt duÅŒe" + +-#: rfc2131.c:2173 rfc3315.c:1506 ++#: rfc2131.c:2170 rfc3315.c:1502 + #, c-format + msgid "%u requested options: %s" + msgstr "%u zaÅŒÄdano: %s" + +-#: rfc2131.c:2453 ++#: rfc2131.c:2487 + #, c-format + msgid "cannot send RFC3925 option: too many options for enterprise number %d" + msgstr "nie mogÄ wysÅaÄ opcji RFC3925: za dÅugi ÅaÅcuch opcji przy numerze %d" +@@ -1768,15 +1782,25 @@ msgstr "nie potrafiÄ utworzyÄ poÅÄczenia netlink %s" + msgid "netlink returns error: %s" + msgstr "wystÄpiÅ bÅÄd w poÅÄczeniu netlink %s" + +-#: dbus.c:171 ++#: dbus.c:186 + msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" + msgstr "prÃ³ba ustawienia adresu IPv6 serwera przez DBus, ale brak obsÅugi IPv6" + +-#: dbus.c:500 ++#: dbus.c:439 ++#, c-format ++msgid "Enabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:444 ++#, c-format ++msgid "Disabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:691 + msgid "setting upstream servers from DBus" + msgstr "ustawiam adresy serwerÃ³w nadrzÄdnych na podstawie informacji odebranych z DBus" + +-#: dbus.c:547 ++#: dbus.c:738 + msgid "could not register a DBus message handler" + msgstr "nie moÅŒna zarejestrowaÄ uchwytu DBus" + +@@ -1896,47 +1920,47 @@ msgstr "adres MAC klienta %u: %s" + msgid "unknown prefix-class %d" + msgstr "nieznana klasa sieci %d" + +-#: rfc3315.c:803 rfc3315.c:902 ++#: rfc3315.c:803 rfc3315.c:898 + msgid "address unavailable" + msgstr "adres niedostÄpny" + +-#: rfc3315.c:815 rfc3315.c:950 rfc3315.c:1283 ++#: rfc3315.c:815 rfc3315.c:946 rfc3315.c:1279 + msgid "success" + msgstr "udane" + +-#: rfc3315.c:843 rfc3315.c:845 rfc3315.c:958 rfc3315.c:960 ++#: rfc3315.c:830 rfc3315.c:839 rfc3315.c:954 rfc3315.c:956 + msgid "no addresses available" + msgstr "brak wolnych adresÃ³w" + +-#: rfc3315.c:937 ++#: rfc3315.c:933 + msgid "not on link" + msgstr "poza zasiÄgiem" + +-#: rfc3315.c:1010 rfc3315.c:1195 rfc3315.c:1272 ++#: rfc3315.c:1006 rfc3315.c:1191 rfc3315.c:1268 + msgid "no binding found" + msgstr "brak powiÄzania" + +-#: rfc3315.c:1048 ++#: rfc3315.c:1044 + msgid "deprecated" + msgstr "przestarzaÅy" + +-#: rfc3315.c:1053 ++#: rfc3315.c:1049 + msgid "address invalid" + msgstr "niepoprawny adres" + +-#: rfc3315.c:1100 ++#: rfc3315.c:1096 + msgid "confirm failed" + msgstr "brak potwierdzenia" + +-#: rfc3315.c:1116 ++#: rfc3315.c:1112 + msgid "all addresses still on link" + msgstr "wszystkie adresy ciÄgle w uÅŒyciu" + +-#: rfc3315.c:1204 ++#: rfc3315.c:1200 + msgid "release received" + msgstr "adres zostaÅ zwolniony" + +-#: rfc3315.c:2130 ++#: rfc3315.c:2126 + msgid "Cannot multicast to DHCPv6 server without correct interface" + msgstr "Nie mogÄ rozesÅaÄ do serwerÃ³w DHCPv6 nie majÄc prawidÅowego interfejsu" + +@@ -2024,12 +2048,12 @@ msgstr "przekazywanie DHCP z %s do %s za pomocÄ %s" + msgid "DHCP relay from %s to %s" + msgstr "przekazywanie DHCP z %s do %s" + +-#: radv.c:98 ++#: radv.c:109 + #, c-format + msgid "cannot create ICMPv6 socket: %s" + msgstr "nie udaÅo siÄ utworzyÄ gniazda dla ICMPv6: %s" + +-#: auth.c:436 ++#: auth.c:448 + #, c-format + msgid "ignoring zone transfer request from %s" + msgstr "ignorujÄ ÅŒÄdanie transferu strefy od %s" +@@ -2044,7 +2068,7 @@ msgstr "niezgodna wersja jÄdra: %s" + msgid "failed to create IPset control socket: %s" + msgstr "nie powiodÅo siÄ otwieranie gniazda sterujÄcego IPset: %s" + +-#: dnssec.c:425 dnssec.c:469 ++#: dnssec.c:449 dnssec.c:493 + #, fuzzy, c-format + msgid "failed to update mtime on %s: %s" + msgstr "nie udaÅo siÄ otworzyÄ pliku z PID-em %s: %s" +diff --git a/po/pt_BR.po b/po/pt_BR.po +index ef6e4cbf529b..9849aaf2e91f 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -25,17 +25,17 @@ msgstr "" + msgid "failed to load names from %s: %s" + msgstr "" + +-#: cache.c:967 dhcp.c:825 ++#: cache.c:967 dhcp.c:828 + #, c-format + msgid "bad address at %s line %d" + msgstr "" + +-#: cache.c:1018 dhcp.c:841 ++#: cache.c:1018 dhcp.c:844 + #, c-format + msgid "bad name at %s line %d" + msgstr "" + +-#: cache.c:1027 dhcp.c:916 ++#: cache.c:1027 dhcp.c:919 + #, c-format + msgid "read %s - %d addresses" + msgstr "" +@@ -93,1005 +93,1009 @@ msgstr "" + msgid "failed to allocate memory" + msgstr "" + +-#: util.c:243 option.c:598 ++#: util.c:250 option.c:601 + msgid "could not get memory" + msgstr "" + +-#: util.c:253 ++#: util.c:260 + #, c-format + msgid "cannot create pipe: %s" + msgstr "" + +-#: util.c:261 ++#: util.c:268 + #, c-format + msgid "failed to allocate %d bytes" + msgstr "" + +-#: util.c:430 ++#: util.c:437 + #, c-format + msgid "infinite" + msgstr "" + +-#: option.c:330 ++#: option.c:332 + msgid "Specify local address(es) to listen on." + msgstr "" + +-#: option.c:331 ++#: option.c:333 + msgid "Return ipaddr for all hosts in specified domains." + msgstr "" + +-#: option.c:332 ++#: option.c:334 + msgid "Fake reverse lookups for RFC1918 private address ranges." + msgstr "" + +-#: option.c:333 ++#: option.c:335 + msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." + msgstr "" + +-#: option.c:334 ++#: option.c:336 + #, c-format + msgid "Specify the size of the cache in entries (defaults to %s)." + msgstr "" + +-#: option.c:335 ++#: option.c:337 + #, c-format + msgid "Specify configuration file (defaults to %s)." + msgstr "" + +-#: option.c:336 ++#: option.c:338 + msgid "Do NOT fork into the background: run in debug mode." + msgstr "" + +-#: option.c:337 ++#: option.c:339 + msgid "Do NOT forward queries with no domain part." + msgstr "" + +-#: option.c:338 ++#: option.c:340 + msgid "Return self-pointing MX records for local hosts." + msgstr "" + +-#: option.c:339 ++#: option.c:341 + msgid "Expand simple names in /etc/hosts with domain-suffix." + msgstr "" + +-#: option.c:340 ++#: option.c:342 + msgid "Don't forward spurious DNS requests from Windows hosts." + msgstr "" + +-#: option.c:341 ++#: option.c:343 + msgid "Enable DHCP in the range given with lease duration." + msgstr "" + +-#: option.c:342 ++#: option.c:344 + #, c-format + msgid "Change to this group after startup (defaults to %s)." + msgstr "" + +-#: option.c:343 ++#: option.c:345 + msgid "Set address or hostname for a specified machine." + msgstr "" + +-#: option.c:344 ++#: option.c:346 + msgid "Read DHCP host specs from file." + msgstr "" + +-#: option.c:345 ++#: option.c:347 + msgid "Read DHCP option specs from file." + msgstr "" + +-#: option.c:346 ++#: option.c:348 + msgid "Read DHCP host specs from a directory." + msgstr "" + +-#: option.c:347 ++#: option.c:349 + msgid "Read DHCP options from a directory." + msgstr "" + +-#: option.c:348 ++#: option.c:350 + msgid "Evaluate conditional tag expression." + msgstr "" + +-#: option.c:349 ++#: option.c:351 + #, c-format + msgid "Do NOT load %s file." + msgstr "" + +-#: option.c:350 ++#: option.c:352 + #, c-format + msgid "Specify a hosts file to be read in addition to %s." + msgstr "" + +-#: option.c:351 ++#: option.c:353 + msgid "Read hosts files from a directory." + msgstr "" + +-#: option.c:352 ++#: option.c:354 + msgid "Specify interface(s) to listen on." + msgstr "" + +-#: option.c:353 ++#: option.c:355 + msgid "Specify interface(s) NOT to listen on." + msgstr "" + +-#: option.c:354 ++#: option.c:356 + msgid "Map DHCP user class to tag." + msgstr "" + +-#: option.c:355 ++#: option.c:357 + msgid "Map RFC3046 circuit-id to tag." + msgstr "" + +-#: option.c:356 ++#: option.c:358 + msgid "Map RFC3046 remote-id to tag." + msgstr "" + +-#: option.c:357 ++#: option.c:359 + msgid "Map RFC3993 subscriber-id to tag." + msgstr "" + +-#: option.c:358 ++#: option.c:360 + msgid "Don't do DHCP for hosts with tag set." + msgstr "" + +-#: option.c:359 ++#: option.c:361 + msgid "Force broadcast replies for hosts with tag set." + msgstr "" + +-#: option.c:360 ++#: option.c:362 + msgid "Do NOT fork into the background, do NOT run in debug mode." + msgstr "" + +-#: option.c:361 ++#: option.c:363 + msgid "Assume we are the only DHCP server on the local network." + msgstr "" + +-#: option.c:362 ++#: option.c:364 + #, c-format + msgid "Specify where to store DHCP leases (defaults to %s)." + msgstr "" + +-#: option.c:363 ++#: option.c:365 + msgid "Return MX records for local hosts." + msgstr "" + +-#: option.c:364 ++#: option.c:366 + msgid "Specify an MX record." + msgstr "" + +-#: option.c:365 ++#: option.c:367 + msgid "Specify BOOTP options to DHCP server." + msgstr "" + +-#: option.c:366 ++#: option.c:368 + #, c-format + msgid "Do NOT poll %s file, reload only on SIGHUP." + msgstr "" + +-#: option.c:367 ++#: option.c:369 + msgid "Do NOT cache failed search results." + msgstr "" + +-#: option.c:368 ++#: option.c:370 + #, c-format + msgid "Use nameservers strictly in the order given in %s." + msgstr "" + +-#: option.c:369 ++#: option.c:371 + msgid "Specify options to be sent to DHCP clients." + msgstr "" + +-#: option.c:370 ++#: option.c:372 + msgid "DHCP option sent even if the client does not request it." + msgstr "" + +-#: option.c:371 ++#: option.c:373 + msgid "Specify port to listen for DNS requests on (defaults to 53)." + msgstr "" + +-#: option.c:372 ++#: option.c:374 + #, c-format + msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." + msgstr "" + +-#: option.c:373 ++#: option.c:375 + msgid "Log DNS queries." + msgstr "" + +-#: option.c:374 ++#: option.c:376 + msgid "Force the originating port for upstream DNS queries." + msgstr "" + +-#: option.c:375 ++#: option.c:377 + msgid "Do NOT read resolv.conf." + msgstr "" + +-#: option.c:376 ++#: option.c:378 + #, c-format + msgid "Specify path to resolv.conf (defaults to %s)." + msgstr "" + +-#: option.c:377 ++#: option.c:379 + msgid "Specify path to file with server= options" + msgstr "" + +-#: option.c:378 ++#: option.c:380 + msgid "Specify address(es) of upstream servers with optional domains." + msgstr "" + +-#: option.c:379 ++#: option.c:381 + msgid "Specify address of upstream servers for reverse address queries" + msgstr "" + +-#: option.c:380 ++#: option.c:382 + msgid "Never forward queries to specified domains." + msgstr "" + +-#: option.c:381 ++#: option.c:383 + msgid "Specify the domain to be assigned in DHCP leases." + msgstr "" + +-#: option.c:382 ++#: option.c:384 + msgid "Specify default target in an MX record." + msgstr "" + +-#: option.c:383 ++#: option.c:385 + msgid "Specify time-to-live in seconds for replies from /etc/hosts." + msgstr "" + +-#: option.c:384 ++#: option.c:386 + msgid "Specify time-to-live in seconds for negative caching." + msgstr "" + +-#: option.c:385 ++#: option.c:387 + msgid "Specify time-to-live in seconds for maximum TTL to send to clients." + msgstr "" + +-#: option.c:386 ++#: option.c:388 + msgid "Specify time-to-live ceiling for cache." + msgstr "" + +-#: option.c:387 ++#: option.c:389 + msgid "Specify time-to-live floor for cache." + msgstr "" + +-#: option.c:388 ++#: option.c:390 + #, c-format + msgid "Change to this user after startup. (defaults to %s)." + msgstr "" + +-#: option.c:389 ++#: option.c:391 + msgid "Map DHCP vendor class to tag." + msgstr "" + +-#: option.c:390 ++#: option.c:392 + msgid "Display dnsmasq version and copyright information." + msgstr "" + +-#: option.c:391 ++#: option.c:393 + msgid "Translate IPv4 addresses from upstream servers." + msgstr "" + +-#: option.c:392 ++#: option.c:394 + msgid "Specify a SRV record." + msgstr "" + +-#: option.c:393 ++#: option.c:395 + msgid "Display this message. Use --help dhcp for known DHCP options." + msgstr "" + +-#: option.c:394 ++#: option.c:396 + #, c-format + msgid "Specify path of PID file (defaults to %s)." + msgstr "" + +-#: option.c:395 ++#: option.c:397 + #, c-format + msgid "Specify maximum number of DHCP leases (defaults to %s)." + msgstr "" + +-#: option.c:396 ++#: option.c:398 + msgid "Answer DNS queries based on the interface a query was sent to." + msgstr "" + +-#: option.c:397 ++#: option.c:399 + msgid "Specify TXT DNS record." + msgstr "" + +-#: option.c:398 ++#: option.c:400 + msgid "Specify PTR DNS record." + msgstr "" + +-#: option.c:399 ++#: option.c:401 + msgid "Give DNS name to IPv4 address of interface." + msgstr "" + +-#: option.c:400 ++#: option.c:402 + msgid "Bind only to interfaces in use." + msgstr "" + +-#: option.c:401 ++#: option.c:403 + #, c-format + msgid "Read DHCP static host information from %s." + msgstr "" + +-#: option.c:402 ++#: option.c:404 + msgid "Enable the DBus interface for setting upstream servers, etc." + msgstr "" + +-#: option.c:403 ++#: option.c:405 + msgid "Do not provide DHCP on this interface, only provide DNS." + msgstr "" + +-#: option.c:404 ++#: option.c:406 + msgid "Enable dynamic address allocation for bootp." + msgstr "" + +-#: option.c:405 ++#: option.c:407 + msgid "Map MAC address (with wildcards) to option set." + msgstr "" + +-#: option.c:406 ++#: option.c:408 + msgid "Treat DHCP requests on aliases as arriving from interface." + msgstr "" + +-#: option.c:407 ++#: option.c:409 + msgid "Disable ICMP echo address checking in the DHCP server." + msgstr "" + +-#: option.c:408 ++#: option.c:410 + msgid "Shell script to run on DHCP lease creation and destruction." + msgstr "" + +-#: option.c:409 ++#: option.c:411 + msgid "Lua script to run on DHCP lease creation and destruction." + msgstr "" + +-#: option.c:410 ++#: option.c:412 + msgid "Run lease-change scripts as this user." + msgstr "" + +-#: option.c:411 ++#: option.c:413 + msgid "Read configuration from all the files in this directory." + msgstr "" + +-#: option.c:412 ++#: option.c:414 + msgid "Log to this syslog facility or file. (defaults to DAEMON)" + msgstr "" + +-#: option.c:413 ++#: option.c:415 + msgid "Do not use leasefile." + msgstr "" + +-#: option.c:414 ++#: option.c:416 + #, c-format + msgid "Maximum number of concurrent DNS queries. (defaults to %s)" + msgstr "" + +-#: option.c:415 ++#: option.c:417 + #, c-format + msgid "Clear DNS cache when reloading %s." + msgstr "" + +-#: option.c:416 ++#: option.c:418 + msgid "Ignore hostnames provided by DHCP clients." + msgstr "" + +-#: option.c:417 ++#: option.c:419 + msgid "Do NOT reuse filename and server fields for extra DHCP options." + msgstr "" + +-#: option.c:418 ++#: option.c:420 + msgid "Enable integrated read-only TFTP server." + msgstr "" + +-#: option.c:419 ++#: option.c:421 + msgid "Export files by TFTP only from the specified subtree." + msgstr "" + +-#: option.c:420 ++#: option.c:422 + msgid "Add client IP address to tftp-root." + msgstr "" + +-#: option.c:421 ++#: option.c:423 + msgid "Allow access only to files owned by the user running dnsmasq." + msgstr "" + +-#: option.c:422 ++#: option.c:424 ++msgid "Do not terminate the service if TFTP directories are inaccessible." ++msgstr "" ++ ++#: option.c:425 + #, c-format + msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." + msgstr "" + +-#: option.c:423 ++#: option.c:426 + msgid "Disable the TFTP blocksize extension." + msgstr "" + +-#: option.c:424 ++#: option.c:427 + msgid "Convert TFTP filenames to lowercase" + msgstr "" + +-#: option.c:425 ++#: option.c:428 + msgid "Ephemeral port range for use by TFTP transfers." + msgstr "" + +-#: option.c:426 ++#: option.c:429 + msgid "Extra logging for DHCP." + msgstr "" + +-#: option.c:427 ++#: option.c:430 + msgid "Enable async. logging; optionally set queue length." + msgstr "" + +-#: option.c:428 ++#: option.c:431 + msgid "Stop DNS rebinding. Filter private IP ranges when resolving." + msgstr "" + +-#: option.c:429 ++#: option.c:432 + msgid "Allow rebinding of 127.0.0.0/8, for RBL servers." + msgstr "" + +-#: option.c:430 ++#: option.c:433 + msgid "Inhibit DNS-rebind protection on this domain." + msgstr "" + +-#: option.c:431 ++#: option.c:434 + msgid "Always perform DNS queries to all servers." + msgstr "" + +-#: option.c:432 ++#: option.c:435 + msgid "Set tag if client includes matching option in request." + msgstr "" + +-#: option.c:433 ++#: option.c:436 + msgid "Use alternative ports for DHCP." + msgstr "" + +-#: option.c:434 ++#: option.c:437 + msgid "Specify NAPTR DNS record." + msgstr "" + +-#: option.c:435 ++#: option.c:438 + msgid "Specify lowest port available for DNS query transmission." + msgstr "" + +-#: option.c:436 ++#: option.c:439 + msgid "Use only fully qualified domain names for DHCP clients." + msgstr "" + +-#: option.c:437 ++#: option.c:440 + msgid "Generate hostnames based on MAC address for nameless clients." + msgstr "" + +-#: option.c:438 ++#: option.c:441 + msgid "Use these DHCP relays as full proxies." + msgstr "" + +-#: option.c:439 ++#: option.c:442 + msgid "Relay DHCP requests to a remote server" + msgstr "" + +-#: option.c:440 ++#: option.c:443 + msgid "Specify alias name for LOCAL DNS name." + msgstr "" + +-#: option.c:441 ++#: option.c:444 + msgid "Prompt to send to PXE clients." + msgstr "" + +-#: option.c:442 ++#: option.c:445 + msgid "Boot service for PXE menu." + msgstr "" + +-#: option.c:443 ++#: option.c:446 + msgid "Check configuration syntax." + msgstr "" + +-#: option.c:444 ++#: option.c:447 + msgid "Add requestor's MAC address to forwarded DNS queries." + msgstr "" + +-#: option.c:445 ++#: option.c:448 + msgid "Add requestor's IP subnet to forwarded DNS queries." + msgstr "" + +-#: option.c:446 ++#: option.c:449 + msgid "Proxy DNSSEC validation results from upstream nameservers." + msgstr "" + +-#: option.c:447 ++#: option.c:450 + msgid "Attempt to allocate sequential IP addresses to DHCP clients." + msgstr "" + +-#: option.c:448 ++#: option.c:451 + msgid "Copy connection-track mark from queries to upstream connections." + msgstr "" + +-#: option.c:449 ++#: option.c:452 + msgid "Allow DHCP clients to do their own DDNS updates." + msgstr "" + +-#: option.c:450 ++#: option.c:453 + msgid "Send router-advertisements for interfaces doing DHCPv6" + msgstr "" + +-#: option.c:451 ++#: option.c:454 + msgid "Specify DUID_EN-type DHCPv6 server DUID" + msgstr "" + +-#: option.c:452 ++#: option.c:455 + msgid "Specify host (A/AAAA and PTR) records" + msgstr "" + +-#: option.c:453 ++#: option.c:456 + msgid "Specify arbitrary DNS resource record" + msgstr "" + +-#: option.c:454 ++#: option.c:457 + msgid "Bind to interfaces in use - check for new interfaces" + msgstr "" + +-#: option.c:455 ++#: option.c:458 + msgid "Export local names to global DNS" + msgstr "" + +-#: option.c:456 ++#: option.c:459 + msgid "Domain to export to global DNS" + msgstr "" + +-#: option.c:457 ++#: option.c:460 + msgid "Set TTL for authoritative replies" + msgstr "" + +-#: option.c:458 ++#: option.c:461 + msgid "Set authoritive zone information" + msgstr "" + +-#: option.c:459 ++#: option.c:462 + msgid "Secondary authoritative nameservers for forward domains" + msgstr "" + +-#: option.c:460 ++#: option.c:463 + msgid "Peers which are allowed to do zone transfer" + msgstr "" + +-#: option.c:461 ++#: option.c:464 + msgid "Specify ipsets to which matching domains should be added" + msgstr "" + +-#: option.c:462 ++#: option.c:465 + msgid "Specify a domain and address range for synthesised names" + msgstr "" + +-#: option.c:463 ++#: option.c:466 + msgid "Activate DNSSEC validation" + msgstr "" + +-#: option.c:464 ++#: option.c:467 + msgid "Specify trust anchor key digest." + msgstr "" + +-#: option.c:465 ++#: option.c:468 + msgid "Disable upstream checking for DNSSEC debugging." + msgstr "" + +-#: option.c:466 ++#: option.c:469 + msgid "Ensure answers without DNSSEC are in unsigned zones." + msgstr "" + +-#: option.c:467 ++#: option.c:470 + msgid "Don't check DNSSEC signature timestamps until first cache-reload" + msgstr "" + +-#: option.c:468 ++#: option.c:471 + msgid "Timestamp file to verify system clock for DNSSEC" + msgstr "" + +-#: option.c:470 ++#: option.c:473 + msgid "Specify DHCPv6 prefix class" + msgstr "" + +-#: option.c:472 ++#: option.c:475 + msgid "Set priority, resend-interval and router-lifetime" + msgstr "" + +-#: option.c:473 ++#: option.c:476 + msgid "Do not log routine DHCP." + msgstr "" + +-#: option.c:474 ++#: option.c:477 + msgid "Do not log routine DHCPv6." + msgstr "" + +-#: option.c:475 ++#: option.c:478 + msgid "Do not log RA." + msgstr "" + +-#: option.c:476 ++#: option.c:479 + msgid "Accept queries only from directly-connected networks" + msgstr "" + +-#: option.c:477 ++#: option.c:480 + msgid "Detect and remove DNS forwarding loops" + msgstr "" + +-#: option.c:478 ++#: option.c:481 + msgid "Ignore DNS responses containing ipaddr." + msgstr "" + +-#: option.c:680 ++#: option.c:683 + #, c-format + msgid "" + "Usage: dnsmasq [options]\n" + "\n" + msgstr "" + +-#: option.c:682 ++#: option.c:685 + #, c-format + msgid "Use short options only on the command line.\n" + msgstr "" + +-#: option.c:684 ++#: option.c:687 + #, c-format + msgid "Valid options are:\n" + msgstr "" + +-#: option.c:741 option.c:745 ++#: option.c:744 option.c:748 + msgid "bad port" + msgstr "" + +-#: option.c:772 option.c:804 ++#: option.c:775 option.c:807 + msgid "interface binding not supported" + msgstr "" + +-#: option.c:781 option.c:3570 ++#: option.c:784 option.c:3575 + msgid "bad interface name" + msgstr "" + +-#: option.c:811 ++#: option.c:814 + msgid "bad address" + msgstr "" + +-#: option.c:993 ++#: option.c:996 + msgid "unsupported encapsulation for IPv6 option" + msgstr "" + +-#: option.c:1007 ++#: option.c:1010 + msgid "bad dhcp-option" + msgstr "" + +-#: option.c:1075 ++#: option.c:1078 + msgid "bad IP address" + msgstr "" + +-#: option.c:1078 option.c:1216 option.c:2888 ++#: option.c:1081 option.c:1219 option.c:2893 + msgid "bad IPv6 address" + msgstr "" + +-#: option.c:1243 option.c:1337 ++#: option.c:1246 option.c:1340 + msgid "bad domain in dhcp-option" + msgstr "" + +-#: option.c:1375 ++#: option.c:1378 + msgid "dhcp-option too long" + msgstr "" + +-#: option.c:1382 ++#: option.c:1385 + msgid "illegal dhcp-match" + msgstr "" + +-#: option.c:1444 ++#: option.c:1447 + msgid "illegal repeated flag" + msgstr "" + +-#: option.c:1452 ++#: option.c:1455 + msgid "illegal repeated keyword" + msgstr "" + +-#: option.c:1517 option.c:4186 ++#: option.c:1520 option.c:4191 + #, c-format + msgid "cannot access directory %s: %s" + msgstr "" + +-#: option.c:1563 tftp.c:493 ++#: option.c:1566 tftp.c:493 + #, c-format + msgid "cannot access %s: %s" + msgstr "" + +-#: option.c:1615 ++#: option.c:1618 + msgid "setting log facility is not possible under Android" + msgstr "" + +-#: option.c:1624 ++#: option.c:1627 + msgid "bad log facility" + msgstr "" + +-#: option.c:1677 ++#: option.c:1680 + msgid "bad MX preference" + msgstr "" + +-#: option.c:1682 ++#: option.c:1685 + msgid "bad MX name" + msgstr "" + +-#: option.c:1696 ++#: option.c:1699 + msgid "bad MX target" + msgstr "" + +-#: option.c:1708 ++#: option.c:1711 + msgid "cannot run scripts under uClinux" + msgstr "" + +-#: option.c:1710 ++#: option.c:1713 + msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts" + msgstr "" + +-#: option.c:1714 ++#: option.c:1717 + msgid "recompile with HAVE_LUASCRIPT defined to enable Lua scripts" + msgstr "" + +-#: option.c:1970 option.c:2015 option.c:2071 ++#: option.c:1973 option.c:2018 option.c:2074 + msgid "bad prefix" + msgstr "" + +-#: option.c:2352 ++#: option.c:2355 + msgid "recompile with HAVE_IPSET defined to enable ipset directives" + msgstr "" + +-#: option.c:2545 ++#: option.c:2548 + msgid "bad port range" + msgstr "" + +-#: option.c:2561 ++#: option.c:2564 + msgid "bad bridge-interface" + msgstr "" + +-#: option.c:2621 ++#: option.c:2624 + msgid "only one tag allowed" + msgstr "" + +-#: option.c:2641 option.c:2653 option.c:2759 option.c:2800 ++#: option.c:2644 option.c:2656 option.c:2764 option.c:2805 + msgid "bad dhcp-range" + msgstr "" + +-#: option.c:2668 ++#: option.c:2671 + msgid "inconsistent DHCP range" + msgstr "" + +-#: option.c:2727 ++#: option.c:2732 + msgid "prefix length must be exactly 64 for RA subnets" + msgstr "" + +-#: option.c:2729 ++#: option.c:2734 + msgid "prefix length must be exactly 64 for subnet constructors" + msgstr "" + +-#: option.c:2733 ++#: option.c:2738 + msgid "prefix length must be at least 64" + msgstr "" + +-#: option.c:2736 ++#: option.c:2741 + msgid "inconsistent DHCPv6 range" + msgstr "" + +-#: option.c:2747 ++#: option.c:2752 + msgid "prefix must be zero with \"constructor:\" argument" + msgstr "" + +-#: option.c:2858 option.c:2906 ++#: option.c:2863 option.c:2911 + msgid "bad hex constant" + msgstr "" + +-#: option.c:2880 ++#: option.c:2885 + msgid "cannot match tags in --dhcp-host" + msgstr "" + +-#: option.c:2928 ++#: option.c:2933 + #, c-format + msgid "duplicate dhcp-host IP address %s" + msgstr "" + +-#: option.c:2986 ++#: option.c:2991 + msgid "bad DHCP host name" + msgstr "" + +-#: option.c:3068 ++#: option.c:3073 + msgid "bad tag-if" + msgstr "" + +-#: option.c:3392 option.c:3786 ++#: option.c:3397 option.c:3791 + msgid "invalid port number" + msgstr "" + +-#: option.c:3454 ++#: option.c:3459 + msgid "bad dhcp-proxy address" + msgstr "" + +-#: option.c:3480 ++#: option.c:3485 + msgid "Bad dhcp-relay" + msgstr "" + +-#: option.c:3506 ++#: option.c:3511 + msgid "bad RA-params" + msgstr "" + +-#: option.c:3515 ++#: option.c:3520 + msgid "bad DUID" + msgstr "" + +-#: option.c:3557 ++#: option.c:3562 + msgid "invalid alias range" + msgstr "" + +-#: option.c:3611 ++#: option.c:3616 + msgid "bad CNAME" + msgstr "" + +-#: option.c:3616 ++#: option.c:3621 + msgid "duplicate CNAME" + msgstr "" + +-#: option.c:3636 ++#: option.c:3641 + msgid "bad PTR record" + msgstr "" + +-#: option.c:3667 ++#: option.c:3672 + msgid "bad NAPTR record" + msgstr "" + +-#: option.c:3701 ++#: option.c:3706 + msgid "bad RR record" + msgstr "" + +-#: option.c:3731 ++#: option.c:3736 + msgid "bad TXT record" + msgstr "" + +-#: option.c:3772 ++#: option.c:3777 + msgid "bad SRV record" + msgstr "" + +-#: option.c:3779 ++#: option.c:3784 + msgid "bad SRV target" + msgstr "" + +-#: option.c:3793 ++#: option.c:3798 + msgid "invalid priority" + msgstr "" + +-#: option.c:3800 ++#: option.c:3805 + msgid "invalid weight" + msgstr "" + +-#: option.c:3824 ++#: option.c:3829 + msgid "Bad host-record" + msgstr "" + +-#: option.c:3841 ++#: option.c:3846 + msgid "Bad name in host-record" + msgstr "" + +-#: option.c:3906 ++#: option.c:3911 + msgid "bad trust anchor" + msgstr "" + +-#: option.c:3920 ++#: option.c:3925 + msgid "bad HEX in trust anchor" + msgstr "" + +-#: option.c:3930 ++#: option.c:3935 + msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DNSSEC/DBus support)" + msgstr "" + +-#: option.c:3989 ++#: option.c:3994 + msgid "missing \"" + msgstr "" + +-#: option.c:4046 ++#: option.c:4051 + msgid "bad option" + msgstr "" + +-#: option.c:4048 ++#: option.c:4053 + msgid "extraneous parameter" + msgstr "" + +-#: option.c:4050 ++#: option.c:4055 + msgid "missing parameter" + msgstr "" + +-#: option.c:4052 ++#: option.c:4057 + msgid "illegal option" + msgstr "" + +-#: option.c:4059 ++#: option.c:4064 + msgid "error" + msgstr "" + +-#: option.c:4061 ++#: option.c:4066 + #, c-format + msgid " at line %d of %s" + msgstr "" + +-#: option.c:4076 option.c:4323 option.c:4359 ++#: option.c:4081 option.c:4328 option.c:4364 + #, c-format + msgid "read %s" + msgstr "" + +-#: option.c:4139 option.c:4262 tftp.c:667 ++#: option.c:4144 option.c:4267 tftp.c:667 + #, c-format + msgid "cannot read %s: %s" + msgstr "" + +-#: option.c:4425 ++#: option.c:4430 + msgid "junk found in command line" + msgstr "" + +-#: option.c:4460 ++#: option.c:4465 + #, c-format + msgid "Dnsmasq version %s %s\n" + msgstr "" + +-#: option.c:4461 ++#: option.c:4466 + #, c-format + msgid "" + "Compile time options: %s\n" + "\n" + msgstr "" + +-#: option.c:4462 ++#: option.c:4467 + #, c-format + msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" + msgstr "" + +-#: option.c:4463 ++#: option.c:4468 + #, c-format + msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" + msgstr "" + +-#: option.c:4464 ++#: option.c:4469 + #, c-format + msgid "under the terms of the GNU General Public License, version 2 or 3.\n" + msgstr "" + +-#: option.c:4475 ++#: option.c:4480 + msgid "try --help" + msgstr "" + +-#: option.c:4477 ++#: option.c:4482 + msgid "try -w" + msgstr "" + +-#: option.c:4479 ++#: option.c:4484 + #, c-format + msgid "bad command line options: %s" + msgstr "" + +-#: option.c:4535 ++#: option.c:4544 + #, c-format + msgid "cannot get host-name: %s" + msgstr "" + +-#: option.c:4563 ++#: option.c:4572 + msgid "only one resolv.conf file allowed in no-poll mode." + msgstr "" + +-#: option.c:4573 ++#: option.c:4582 + msgid "must have exactly one resolv.conf to read domain from." + msgstr "" + +-#: option.c:4576 network.c:1506 dhcp.c:774 ++#: option.c:4585 network.c:1507 dhcp.c:777 + #, c-format + msgid "failed to read %s: %s" + msgstr "" + +-#: option.c:4593 ++#: option.c:4602 + #, c-format + msgid "no search directive found in %s" + msgstr "" + +-#: option.c:4614 ++#: option.c:4623 + msgid "there must be a default domain when --dhcp-fqdn is set" + msgstr "" + +-#: option.c:4623 ++#: option.c:4632 + msgid "syntax check OK" + msgstr "" + +@@ -1100,25 +1104,25 @@ msgstr "" + msgid "failed to send packet: %s" + msgstr "" + +-#: forward.c:572 ++#: forward.c:591 + msgid "discarding DNS reply: subnet option mismatch" + msgstr "" + +-#: forward.c:595 ++#: forward.c:614 + #, c-format + msgid "nameserver %s refused to do a recursive query" + msgstr "" + +-#: forward.c:627 ++#: forward.c:646 + #, c-format + msgid "possible DNS-rebind attack detected: %s" + msgstr "" + +-#: forward.c:1156 forward.c:1722 ++#: forward.c:1209 forward.c:1785 + msgid "Ignoring query from non-local network" + msgstr "" + +-#: forward.c:2178 ++#: forward.c:2256 + #, c-format + msgid "Maximum number of concurrent DNS queries reached (max: %d)" + msgstr "" +@@ -1152,332 +1156,342 @@ msgstr "" + msgid "failed to bind server socket for %s: %s" + msgstr "" + +-#: network.c:1444 ++#: network.c:1445 + #, c-format + msgid "ignoring nameserver %s - local interface" + msgstr "" + +-#: network.c:1455 ++#: network.c:1456 + #, c-format + msgid "ignoring nameserver %s - cannot make/bind socket: %s" + msgstr "" + +-#: network.c:1468 ++#: network.c:1469 + msgid "unqualified" + msgstr "" + +-#: network.c:1468 ++#: network.c:1469 + msgid "names" + msgstr "" + +-#: network.c:1470 ++#: network.c:1471 + msgid "default" + msgstr "" + +-#: network.c:1472 ++#: network.c:1473 + msgid "domain" + msgstr "" + +-#: network.c:1475 ++#: network.c:1476 + #, c-format + msgid "using local addresses only for %s %s" + msgstr "" + +-#: network.c:1477 ++#: network.c:1478 + #, c-format + msgid "using standard nameservers for %s %s" + msgstr "" + +-#: network.c:1479 ++#: network.c:1480 + #, c-format + msgid "using nameserver %s#%d for %s %s" + msgstr "" + +-#: network.c:1483 ++#: network.c:1484 + #, c-format + msgid "NOT using nameserver %s#%d - query loop detected" + msgstr "" + +-#: network.c:1486 ++#: network.c:1487 + #, c-format + msgid "using nameserver %s#%d(via %s)" + msgstr "" + +-#: network.c:1488 ++#: network.c:1489 + #, c-format + msgid "using nameserver %s#%d" + msgstr "" + +-#: dnsmasq.c:149 ++#: dnsmasq.c:163 + msgid "dhcp-hostsdir, dhcp-optsdir and hostsdir are not supported on this platform" + msgstr "" + +-#: dnsmasq.c:156 ++#: dnsmasq.c:170 + msgid "no trust anchors provided for DNSSEC" + msgstr "" + +-#: dnsmasq.c:159 ++#: dnsmasq.c:173 + msgid "cannot reduce cache size from default when DNSSEC enabled" + msgstr "" + +-#: dnsmasq.c:161 ++#: dnsmasq.c:175 + msgid "DNSSEC not available: set HAVE_DNSSEC in src/config.h" + msgstr "" + +-#: dnsmasq.c:167 ++#: dnsmasq.c:181 + msgid "TFTP server not available: set HAVE_TFTP in src/config.h" + msgstr "" + +-#: dnsmasq.c:172 ++#: dnsmasq.c:186 + msgid "cannot use --conntrack AND --query-port" + msgstr "" + +-#: dnsmasq.c:175 ++#: dnsmasq.c:189 + msgid "conntrack support not available: set HAVE_CONNTRACK in src/config.h" + msgstr "" + +-#: dnsmasq.c:180 ++#: dnsmasq.c:194 + msgid "asychronous logging is not available under Solaris" + msgstr "" + +-#: dnsmasq.c:185 ++#: dnsmasq.c:199 + msgid "asychronous logging is not available under Android" + msgstr "" + +-#: dnsmasq.c:190 ++#: dnsmasq.c:204 + msgid "authoritative DNS not available: set HAVE_AUTH in src/config.h" + msgstr "" + +-#: dnsmasq.c:195 ++#: dnsmasq.c:209 + msgid "loop detection not available: set HAVE_LOOP in src/config.h" + msgstr "" + +-#: dnsmasq.c:203 ++#: dnsmasq.c:217 + msgid "zone serial must be configured in --auth-soa" + msgstr "" + +-#: dnsmasq.c:221 ++#: dnsmasq.c:235 + msgid "dhcp-range constructor not available on this platform" + msgstr "" + +-#: dnsmasq.c:264 ++#: dnsmasq.c:278 + msgid "cannot set --bind-interfaces and --bind-dynamic" + msgstr "" + +-#: dnsmasq.c:267 ++#: dnsmasq.c:281 + #, c-format + msgid "failed to find list of interfaces: %s" + msgstr "" + +-#: dnsmasq.c:276 ++#: dnsmasq.c:290 + #, c-format + msgid "unknown interface %s" + msgstr "" + +-#: dnsmasq.c:340 dnsmasq.c:1004 ++#: dnsmasq.c:354 dnsmasq.c:1037 + #, c-format + msgid "DBus error: %s" + msgstr "" + +-#: dnsmasq.c:343 ++#: dnsmasq.c:357 + msgid "DBus not available: set HAVE_DBUS in src/config.h" + msgstr "" + +-#: dnsmasq.c:371 ++#: dnsmasq.c:385 + #, c-format + msgid "unknown user or group: %s" + msgstr "" + +-#: dnsmasq.c:426 ++#: dnsmasq.c:440 + #, c-format + msgid "cannot chdir to filesystem root: %s" + msgstr "" + +-#: dnsmasq.c:667 ++#: dnsmasq.c:692 + #, c-format + msgid "started, version %s DNS disabled" + msgstr "" + +-#: dnsmasq.c:669 ++#: dnsmasq.c:694 + #, c-format + msgid "started, version %s cachesize %d" + msgstr "" + +-#: dnsmasq.c:671 ++#: dnsmasq.c:696 + #, c-format + msgid "started, version %s cache disabled" + msgstr "" + +-#: dnsmasq.c:673 ++#: dnsmasq.c:698 + #, c-format + msgid "compile time options: %s" + msgstr "" + +-#: dnsmasq.c:679 ++#: dnsmasq.c:704 + msgid "DBus support enabled: connected to system bus" + msgstr "" + +-#: dnsmasq.c:681 ++#: dnsmasq.c:706 + msgid "DBus support enabled: bus connection pending" + msgstr "" + +-#: dnsmasq.c:686 ++#: dnsmasq.c:711 + msgid "DNS service limited to local subnets" + msgstr "" + +-#: dnsmasq.c:702 ++#: dnsmasq.c:727 + msgid "DNSSEC validation enabled" + msgstr "" + +-#: dnsmasq.c:705 ++#: dnsmasq.c:730 + msgid "DNSSEC signature timestamps not checked until first cache reload" + msgstr "" + +-#: dnsmasq.c:708 ++#: dnsmasq.c:733 + msgid "DNSSEC signature timestamps not checked until system time valid" + msgstr "" + +-#: dnsmasq.c:713 ++#: dnsmasq.c:738 + #, c-format + msgid "warning: failed to change owner of %s: %s" + msgstr "" + +-#: dnsmasq.c:717 ++#: dnsmasq.c:742 + msgid "setting --bind-interfaces option because of OS limitations" + msgstr "" + +-#: dnsmasq.c:727 ++#: dnsmasq.c:752 + #, c-format + msgid "warning: interface %s does not currently exist" + msgstr "" + +-#: dnsmasq.c:732 ++#: dnsmasq.c:757 + msgid "warning: ignoring resolv-file flag because no-resolv is set" + msgstr "" + +-#: dnsmasq.c:735 ++#: dnsmasq.c:760 + msgid "warning: no upstream servers configured" + msgstr "" + +-#: dnsmasq.c:739 ++#: dnsmasq.c:764 + #, c-format + msgid "asynchronous logging enabled, queue limit is %d messages" + msgstr "" + +-#: dnsmasq.c:760 ++#: dnsmasq.c:785 + msgid "IPv6 router advertisement enabled" + msgstr "" + +-#: dnsmasq.c:765 ++#: dnsmasq.c:790 + #, c-format + msgid "DHCP, sockets bound exclusively to interface %s" + msgstr "" + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "root is " + msgstr "" + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "enabled" + msgstr "" + +-#: dnsmasq.c:784 ++#: dnsmasq.c:810 + msgid "secure mode" + msgstr "" + +-#: dnsmasq.c:810 ++#: dnsmasq.c:813 ++#, c-format ++msgid "warning: %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:817 ++#, c-format ++msgid "warning: TFTP directory %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:843 + #, c-format + msgid "restricting maximum simultaneous TFTP transfers to %d" + msgstr "" + +-#: dnsmasq.c:1006 ++#: dnsmasq.c:1039 + msgid "connected to system DBus" + msgstr "" + +-#: dnsmasq.c:1156 ++#: dnsmasq.c:1189 + #, c-format + msgid "cannot fork into background: %s" + msgstr "" + +-#: dnsmasq.c:1159 ++#: dnsmasq.c:1192 + #, c-format + msgid "failed to create helper: %s" + msgstr "" + +-#: dnsmasq.c:1162 ++#: dnsmasq.c:1195 + #, c-format + msgid "setting capabilities failed: %s" + msgstr "" + +-#: dnsmasq.c:1165 ++#: dnsmasq.c:1198 + #, c-format + msgid "failed to change user-id to %s: %s" + msgstr "" + +-#: dnsmasq.c:1168 ++#: dnsmasq.c:1201 + #, c-format + msgid "failed to change group-id to %s: %s" + msgstr "" + +-#: dnsmasq.c:1171 ++#: dnsmasq.c:1204 + #, c-format + msgid "failed to open pidfile %s: %s" + msgstr "" + +-#: dnsmasq.c:1174 ++#: dnsmasq.c:1207 + #, c-format + msgid "cannot open log %s: %s" + msgstr "" + +-#: dnsmasq.c:1177 ++#: dnsmasq.c:1210 + #, c-format + msgid "failed to load Lua script: %s" + msgstr "" + +-#: dnsmasq.c:1180 ++#: dnsmasq.c:1213 + #, c-format + msgid "TFTP directory %s inaccessible: %s" + msgstr "" + +-#: dnsmasq.c:1183 ++#: dnsmasq.c:1216 + #, c-format + msgid "cannot create timestamp file %s: %s" + msgstr "" + +-#: dnsmasq.c:1204 ++#: dnsmasq.c:1237 + msgid "now checking DNSSEC signature timestamps" + msgstr "" + +-#: dnsmasq.c:1271 ++#: dnsmasq.c:1304 + #, c-format + msgid "script process killed by signal %d" + msgstr "" + +-#: dnsmasq.c:1275 ++#: dnsmasq.c:1308 + #, c-format + msgid "script process exited with status %d" + msgstr "" + +-#: dnsmasq.c:1279 ++#: dnsmasq.c:1312 + #, c-format + msgid "failed to execute %s: %s" + msgstr "" + +-#: dnsmasq.c:1334 ++#: dnsmasq.c:1367 + msgid "exiting on receipt of SIGTERM" + msgstr "" + +-#: dnsmasq.c:1362 ++#: dnsmasq.c:1395 + #, c-format + msgid "failed to access %s: %s" + msgstr "" + +-#: dnsmasq.c:1392 ++#: dnsmasq.c:1425 + #, c-format + msgid "reading %s" + msgstr "" + +-#: dnsmasq.c:1403 ++#: dnsmasq.c:1436 + #, c-format + msgid "no servers found in %s, will retry" + msgstr "" +@@ -1507,37 +1521,37 @@ msgstr "" + msgid "cannot create ICMP raw socket: %s." + msgstr "" + +-#: dhcp.c:239 ++#: dhcp.c:241 dhcp6.c:180 + #, c-format + msgid "unknown interface %s in bridge-interface" + msgstr "" + +-#: dhcp.c:278 ++#: dhcp.c:281 + #, c-format + msgid "DHCP packet received on %s which has no address" + msgstr "" + +-#: dhcp.c:412 ++#: dhcp.c:415 + #, c-format + msgid "ARP-cache injection failed: %s" + msgstr "" + +-#: dhcp.c:511 ++#: dhcp.c:514 + #, c-format + msgid "DHCP range %s -- %s is not consistent with netmask %s" + msgstr "" + +-#: dhcp.c:812 ++#: dhcp.c:815 + #, c-format + msgid "bad line at %s line %d" + msgstr "" + +-#: dhcp.c:855 ++#: dhcp.c:858 + #, c-format + msgid "ignoring %s line %d, duplicate name or IP address" + msgstr "" + +-#: dhcp.c:999 rfc3315.c:2139 ++#: dhcp.c:1002 rfc3315.c:2135 + #, c-format + msgid "DHCP relay %s -> %s" + msgstr "" +@@ -1571,169 +1585,169 @@ msgstr "" + msgid "Ignoring domain %s for DHCP host name %s" + msgstr "" + +-#: rfc2131.c:342 ++#: rfc2131.c:344 + #, c-format + msgid "no address range available for DHCP request %s %s" + msgstr "" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "with subnet selector" + msgstr "" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "via" + msgstr "" + +-#: rfc2131.c:355 ++#: rfc2131.c:357 + #, c-format + msgid "%u available DHCP subnet: %s/%s" + msgstr "" + +-#: rfc2131.c:358 rfc3315.c:300 ++#: rfc2131.c:360 rfc3315.c:300 + #, c-format + msgid "%u available DHCP range: %s -- %s" + msgstr "" + +-#: rfc2131.c:469 ++#: rfc2131.c:471 + #, c-format + msgid "%u vendor class: %s" + msgstr "" + +-#: rfc2131.c:471 ++#: rfc2131.c:473 + #, c-format + msgid "%u user class: %s" + msgstr "" + +-#: rfc2131.c:498 ++#: rfc2131.c:500 + msgid "disabled" + msgstr "" + +-#: rfc2131.c:539 rfc2131.c:967 rfc2131.c:1385 rfc3315.c:603 rfc3315.c:860 +-#: rfc3315.c:1139 ++#: rfc2131.c:541 rfc2131.c:974 rfc2131.c:1380 rfc3315.c:603 rfc3315.c:856 ++#: rfc3315.c:1135 + msgid "ignored" + msgstr "" + +-#: rfc2131.c:554 rfc2131.c:1205 rfc3315.c:910 ++#: rfc2131.c:556 rfc2131.c:1207 rfc3315.c:906 + msgid "address in use" + msgstr "" + +-#: rfc2131.c:568 rfc2131.c:1021 ++#: rfc2131.c:570 rfc2131.c:1028 + msgid "no address available" + msgstr "" + +-#: rfc2131.c:575 rfc2131.c:1168 ++#: rfc2131.c:577 rfc2131.c:1170 + msgid "wrong network" + msgstr "" + +-#: rfc2131.c:590 ++#: rfc2131.c:592 + msgid "no address configured" + msgstr "" + +-#: rfc2131.c:596 rfc2131.c:1218 ++#: rfc2131.c:598 rfc2131.c:1220 + msgid "no leases left" + msgstr "" + +-#: rfc2131.c:691 rfc3315.c:476 ++#: rfc2131.c:693 rfc3315.c:476 + #, c-format + msgid "%u client provides name: %s" + msgstr "" + +-#: rfc2131.c:796 ++#: rfc2131.c:798 + msgid "PXE BIS not supported" + msgstr "" + +-#: rfc2131.c:935 rfc3315.c:1233 ++#: rfc2131.c:942 rfc3315.c:1229 + #, c-format + msgid "disabling DHCP static address %s for %s" + msgstr "" + +-#: rfc2131.c:956 ++#: rfc2131.c:963 + msgid "unknown lease" + msgstr "" + +-#: rfc2131.c:990 ++#: rfc2131.c:997 + #, c-format + msgid "not using configured address %s because it is leased to %s" + msgstr "" + +-#: rfc2131.c:1000 ++#: rfc2131.c:1007 + #, c-format + msgid "not using configured address %s because it is in use by the server or relay" + msgstr "" + +-#: rfc2131.c:1003 ++#: rfc2131.c:1010 + #, c-format + msgid "not using configured address %s because it was previously declined" + msgstr "" + +-#: rfc2131.c:1019 rfc2131.c:1211 ++#: rfc2131.c:1026 rfc2131.c:1213 + msgid "no unique-id" + msgstr "" + +-#: rfc2131.c:1106 ++#: rfc2131.c:1108 + msgid "wrong server-ID" + msgstr "" + +-#: rfc2131.c:1125 ++#: rfc2131.c:1127 + msgid "wrong address" + msgstr "" + +-#: rfc2131.c:1143 rfc3315.c:1006 ++#: rfc2131.c:1145 rfc3315.c:1002 + msgid "lease not found" + msgstr "" + +-#: rfc2131.c:1176 ++#: rfc2131.c:1178 + msgid "address not available" + msgstr "" + +-#: rfc2131.c:1187 ++#: rfc2131.c:1189 + msgid "static lease available" + msgstr "" + +-#: rfc2131.c:1191 ++#: rfc2131.c:1193 + msgid "address reserved" + msgstr "" + +-#: rfc2131.c:1199 ++#: rfc2131.c:1201 + #, c-format + msgid "abandoning lease to %s of %s" + msgstr "" + +-#: rfc2131.c:1712 ++#: rfc2131.c:1707 + #, c-format + msgid "%u bootfile name: %s" + msgstr "" + +-#: rfc2131.c:1721 ++#: rfc2131.c:1716 + #, c-format + msgid "%u server name: %s" + msgstr "" + +-#: rfc2131.c:1729 ++#: rfc2131.c:1724 + #, c-format + msgid "%u next server: %s" + msgstr "" + +-#: rfc2131.c:1732 ++#: rfc2131.c:1727 + #, c-format + msgid "%u broadcast response" + msgstr "" + +-#: rfc2131.c:1795 ++#: rfc2131.c:1790 + #, c-format + msgid "cannot send DHCP/BOOTP option %d: no space left in packet" + msgstr "" + +-#: rfc2131.c:2036 ++#: rfc2131.c:2031 + msgid "PXE menu too large" + msgstr "" + +-#: rfc2131.c:2173 rfc3315.c:1506 ++#: rfc2131.c:2170 rfc3315.c:1502 + #, c-format + msgid "%u requested options: %s" + msgstr "" + +-#: rfc2131.c:2453 ++#: rfc2131.c:2487 + #, c-format + msgid "cannot send RFC3925 option: too many options for enterprise number %d" + msgstr "" +@@ -1748,15 +1762,25 @@ msgstr "" + msgid "netlink returns error: %s" + msgstr "" + +-#: dbus.c:171 ++#: dbus.c:186 + msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" + msgstr "" + +-#: dbus.c:500 ++#: dbus.c:439 ++#, c-format ++msgid "Enabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:444 ++#, c-format ++msgid "Disabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:691 + msgid "setting upstream servers from DBus" + msgstr "" + +-#: dbus.c:547 ++#: dbus.c:738 + msgid "could not register a DBus message handler" + msgstr "" + +@@ -1876,47 +1900,47 @@ msgstr "" + msgid "unknown prefix-class %d" + msgstr "" + +-#: rfc3315.c:803 rfc3315.c:902 ++#: rfc3315.c:803 rfc3315.c:898 + msgid "address unavailable" + msgstr "" + +-#: rfc3315.c:815 rfc3315.c:950 rfc3315.c:1283 ++#: rfc3315.c:815 rfc3315.c:946 rfc3315.c:1279 + msgid "success" + msgstr "" + +-#: rfc3315.c:843 rfc3315.c:845 rfc3315.c:958 rfc3315.c:960 ++#: rfc3315.c:830 rfc3315.c:839 rfc3315.c:954 rfc3315.c:956 + msgid "no addresses available" + msgstr "" + +-#: rfc3315.c:937 ++#: rfc3315.c:933 + msgid "not on link" + msgstr "" + +-#: rfc3315.c:1010 rfc3315.c:1195 rfc3315.c:1272 ++#: rfc3315.c:1006 rfc3315.c:1191 rfc3315.c:1268 + msgid "no binding found" + msgstr "" + +-#: rfc3315.c:1048 ++#: rfc3315.c:1044 + msgid "deprecated" + msgstr "" + +-#: rfc3315.c:1053 ++#: rfc3315.c:1049 + msgid "address invalid" + msgstr "" + +-#: rfc3315.c:1100 ++#: rfc3315.c:1096 + msgid "confirm failed" + msgstr "" + +-#: rfc3315.c:1116 ++#: rfc3315.c:1112 + msgid "all addresses still on link" + msgstr "" + +-#: rfc3315.c:1204 ++#: rfc3315.c:1200 + msgid "release received" + msgstr "" + +-#: rfc3315.c:2130 ++#: rfc3315.c:2126 + msgid "Cannot multicast to DHCPv6 server without correct interface" + msgstr "" + +@@ -2004,12 +2028,12 @@ msgstr "" + msgid "DHCP relay from %s to %s" + msgstr "" + +-#: radv.c:98 ++#: radv.c:109 + #, c-format + msgid "cannot create ICMPv6 socket: %s" + msgstr "" + +-#: auth.c:436 ++#: auth.c:448 + #, c-format + msgid "ignoring zone transfer request from %s" + msgstr "" +@@ -2024,7 +2048,7 @@ msgstr "" + msgid "failed to create IPset control socket: %s" + msgstr "" + +-#: dnssec.c:425 dnssec.c:469 ++#: dnssec.c:449 dnssec.c:493 + #, c-format + msgid "failed to update mtime on %s: %s" + msgstr "" +diff --git a/po/ro.po b/po/ro.po +index 0ac8bd63e25f..7bb9448be767 100644 +--- a/po/ro.po ++++ b/po/ro.po +@@ -25,17 +25,17 @@ msgstr "" + msgid "failed to load names from %s: %s" + msgstr "Ã®ncÄrcarea numelor din %s: %s a eÅuat" + +-#: cache.c:967 dhcp.c:825 ++#: cache.c:967 dhcp.c:828 + #, c-format + msgid "bad address at %s line %d" + msgstr "adresÄ greÅitÄ Ã®n %s, linia %d" + +-#: cache.c:1018 dhcp.c:841 ++#: cache.c:1018 dhcp.c:844 + #, c-format + msgid "bad name at %s line %d" + msgstr "nume greÅit Ã®n %s linia %d" + +-#: cache.c:1027 dhcp.c:916 ++#: cache.c:1027 dhcp.c:919 + #, c-format + msgid "read %s - %d addresses" + msgstr "citesc %s - %d adrese" +@@ -94,657 +94,661 @@ msgstr "ascultarea pe socket a eÅuat: %s" + msgid "failed to allocate memory" + msgstr "nu pot Ã®ncÄrca %d bytes" + +-#: util.c:243 option.c:598 ++#: util.c:250 option.c:601 + msgid "could not get memory" + msgstr "nu am putut aloca memorie" + +-#: util.c:253 ++#: util.c:260 + #, fuzzy, c-format + msgid "cannot create pipe: %s" + msgstr "nu pot citi %s: %s" + +-#: util.c:261 ++#: util.c:268 + #, fuzzy, c-format + msgid "failed to allocate %d bytes" + msgstr "nu pot Ã®ncÄrca %d bytes" + +-#: util.c:430 ++#: util.c:437 + #, c-format + msgid "infinite" + msgstr "infinit" + +-#: option.c:330 ++#: option.c:332 + msgid "Specify local address(es) to listen on." + msgstr "SpecificaÅ£i adresele locale deservite." + +-#: option.c:331 ++#: option.c:333 + msgid "Return ipaddr for all hosts in specified domains." + msgstr "AfiÅeazÄ adresele IP ale maÅinilor Ã®n domeniul dat." + +-#: option.c:332 ++#: option.c:334 + msgid "Fake reverse lookups for RFC1918 private address ranges." + msgstr "SimuleazÄ cÄutÄri dupÄ adresÄ pentru domenii de adresÄ private (RFC1918)." + +-#: option.c:333 ++#: option.c:335 + msgid "Treat ipaddr as NXDOMAIN (defeats Verisign wildcard)." + msgstr "InterpreteazÄ adresa IP ca NXDOMAIN (Ã®mpotriva manipulÄrilor Verisign)" + +-#: option.c:334 ++#: option.c:336 + #, c-format + msgid "Specify the size of the cache in entries (defaults to %s)." + msgstr "SpecificÄ mÄrimea Ã®nregistrÄrilor temporare (implicit e %s)." + +-#: option.c:335 ++#: option.c:337 + #, c-format + msgid "Specify configuration file (defaults to %s)." + msgstr "SpecificÄ fiÅier de configurare (implicit e %s)." + +-#: option.c:336 ++#: option.c:338 + msgid "Do NOT fork into the background: run in debug mode." + msgstr "NU porneÅte Ã®n fundal: ruleazÄ Ã®n modul depanare." + +-#: option.c:337 ++#: option.c:339 + msgid "Do NOT forward queries with no domain part." + msgstr "NU Ã®nainta cererile ce nu conÅ£in domeniu DNS." + +-#: option.c:338 ++#: option.c:340 + msgid "Return self-pointing MX records for local hosts." + msgstr "RÄspunde cu Ã®nregistrÄri MX spre el Ã®nsuÅi pentru maÅini locale." + +-#: option.c:339 ++#: option.c:341 + msgid "Expand simple names in /etc/hosts with domain-suffix." + msgstr "AdaugÄ numelor simple din /etc/hosts numele domeniului ca sufix." + +-#: option.c:340 ++#: option.c:342 + msgid "Don't forward spurious DNS requests from Windows hosts." + msgstr "Nu inainta cereri DNS defecte provenite de la maÅini Windows." + +-#: option.c:341 ++#: option.c:343 + msgid "Enable DHCP in the range given with lease duration." + msgstr "ActiveazÄ DHCP Ã®n domeniul dat cu duratÄ limitatÄ de Ã®mprumut." + +-#: option.c:342 ++#: option.c:344 + #, c-format + msgid "Change to this group after startup (defaults to %s)." + msgstr "RuleazÄ sub acest grup dupÄ pornire (implicit e %s)." + +-#: option.c:343 ++#: option.c:345 + msgid "Set address or hostname for a specified machine." + msgstr "SchimbÄ adresa sau numele maÅinii specificate." + +-#: option.c:344 ++#: option.c:346 + #, fuzzy + msgid "Read DHCP host specs from file." + msgstr "nume MX invalid" + +-#: option.c:345 ++#: option.c:347 + msgid "Read DHCP option specs from file." + msgstr "" + +-#: option.c:346 ++#: option.c:348 + #, fuzzy + msgid "Read DHCP host specs from a directory." + msgstr "nume MX invalid" + +-#: option.c:347 ++#: option.c:349 + #, fuzzy + msgid "Read DHCP options from a directory." + msgstr "nume MX invalid" + +-#: option.c:348 ++#: option.c:350 + msgid "Evaluate conditional tag expression." + msgstr "" + +-#: option.c:349 ++#: option.c:351 + #, c-format + msgid "Do NOT load %s file." + msgstr "Nu Ã®ncarcÄ fiÅierul %s." + +-#: option.c:350 ++#: option.c:352 + #, c-format + msgid "Specify a hosts file to be read in addition to %s." + msgstr "SpecificÄ spre citire un fiÅier hosts adiÅ£ional la %s." + +-#: option.c:351 ++#: option.c:353 + #, fuzzy + msgid "Read hosts files from a directory." + msgstr "nume MX invalid" + +-#: option.c:352 ++#: option.c:354 + msgid "Specify interface(s) to listen on." + msgstr "SpecificÄ interfeÅ£ele deservite." + +-#: option.c:353 ++#: option.c:355 + msgid "Specify interface(s) NOT to listen on." + msgstr "SpecificÄ interfeÅ£ele NE-deservite." + +-#: option.c:354 ++#: option.c:356 + #, fuzzy + msgid "Map DHCP user class to tag." + msgstr "LeagÄ clasa de utilizator DHCP cu grup de opÅ£iuni." + +-#: option.c:355 ++#: option.c:357 + msgid "Map RFC3046 circuit-id to tag." + msgstr "" + +-#: option.c:356 ++#: option.c:358 + msgid "Map RFC3046 remote-id to tag." + msgstr "" + +-#: option.c:357 ++#: option.c:359 + msgid "Map RFC3993 subscriber-id to tag." + msgstr "" + +-#: option.c:358 ++#: option.c:360 + #, fuzzy + msgid "Don't do DHCP for hosts with tag set." + msgstr "Nu furniza DHCP maÅinilor din grupul de opÅ£iuni." + +-#: option.c:359 ++#: option.c:361 + #, fuzzy + msgid "Force broadcast replies for hosts with tag set." + msgstr "Nu furniza DHCP maÅinilor din grupul de opÅ£iuni." + +-#: option.c:360 ++#: option.c:362 + msgid "Do NOT fork into the background, do NOT run in debug mode." + msgstr "NU porneÅte Ã®n fundal, NU ruleazÄ Ã®n modul depanare." + +-#: option.c:361 ++#: option.c:363 + msgid "Assume we are the only DHCP server on the local network." + msgstr "Presupune cÄ suntem singurul server DHCP din reÅ£eaua localÄ." + +-#: option.c:362 ++#: option.c:364 + #, c-format + msgid "Specify where to store DHCP leases (defaults to %s)." + msgstr "SpecificÄ fiÅierul de stocare a Ã®mprumuturilor DHCP (implicit e %s)." + +-#: option.c:363 ++#: option.c:365 + msgid "Return MX records for local hosts." + msgstr "RÄspunde cu Ã®ntregistrÄri MX pentru maÅini locale." + +-#: option.c:364 ++#: option.c:366 + msgid "Specify an MX record." + msgstr "SpecificÄ o Ã®nregistrare MX." + +-#: option.c:365 ++#: option.c:367 + msgid "Specify BOOTP options to DHCP server." + msgstr "SpecificÄ opÅ£iuni BOOTP serverului DHCP." + +-#: option.c:366 ++#: option.c:368 + #, c-format + msgid "Do NOT poll %s file, reload only on SIGHUP." + msgstr "Nu Ã®ncÄrca fiÅierul %s, citeÅte-l doar la SIGHUP." + +-#: option.c:367 ++#: option.c:369 + msgid "Do NOT cache failed search results." + msgstr "NU memora rezultatele de cÄutare DNS eÅuatatÄ." + +-#: option.c:368 ++#: option.c:370 + #, c-format + msgid "Use nameservers strictly in the order given in %s." + msgstr "FoloseÅte servere DNS strict Ã®n ordinea datÄ Ã®n %s." + +-#: option.c:369 ++#: option.c:371 + #, fuzzy + msgid "Specify options to be sent to DHCP clients." + msgstr "ConfigureazÄ opÅ£iuni Ã®n plusce trebuie trimise clienÅ£ilor DHCP." + +-#: option.c:370 ++#: option.c:372 + msgid "DHCP option sent even if the client does not request it." + msgstr "" + +-#: option.c:371 ++#: option.c:373 + msgid "Specify port to listen for DNS requests on (defaults to 53)." + msgstr "SpecificÄ numÄrul portului pentru cereri DNS (implicit e 53)." + +-#: option.c:372 ++#: option.c:374 + #, c-format + msgid "Maximum supported UDP packet size for EDNS.0 (defaults to %s)." + msgstr "Marimea maximÄ a pachetului UDP pentru EDNS.0 (implicit e %s)." + +-#: option.c:373 ++#: option.c:375 + #, fuzzy + msgid "Log DNS queries." + msgstr "ÃnregistreazÄ tranzacÅ£iile." + +-#: option.c:374 ++#: option.c:376 + #, fuzzy + msgid "Force the originating port for upstream DNS queries." + msgstr "ForÅ£eazÄ acest port pentru datele ce pleacÄ." + +-#: option.c:375 ++#: option.c:377 + msgid "Do NOT read resolv.conf." + msgstr "NU citi fiÅierul resolv.conf" + +-#: option.c:376 ++#: option.c:378 + #, c-format + msgid "Specify path to resolv.conf (defaults to %s)." + msgstr "SpecificÄ calea cÄtre resolv.conf (implicit e %s)." + +-#: option.c:377 ++#: option.c:379 + #, fuzzy + msgid "Specify path to file with server= options" + msgstr "SpecificÄ o cale pentru fiÅierul PID. (implicit %s)." + +-#: option.c:378 ++#: option.c:380 + msgid "Specify address(es) of upstream servers with optional domains." + msgstr "SpecificÄ adresele server(elor) superioare cu domenii opÅ£ionale." + +-#: option.c:379 ++#: option.c:381 + #, fuzzy + msgid "Specify address of upstream servers for reverse address queries" + msgstr "SpecificÄ adresele server(elor) superioare cu domenii opÅ£ionale." + +-#: option.c:380 ++#: option.c:382 + msgid "Never forward queries to specified domains." + msgstr "Nu Ã®nainteazÄ cererile spre domeniile specificate." + +-#: option.c:381 ++#: option.c:383 + msgid "Specify the domain to be assigned in DHCP leases." + msgstr "SpecificÄ domeniul de transmis prin DHCP." + +-#: option.c:382 ++#: option.c:384 + msgid "Specify default target in an MX record." + msgstr "SpecificÄ o Å£intÄ Ã®ntr-o Ã®nregistrare MX." + +-#: option.c:383 ++#: option.c:385 + msgid "Specify time-to-live in seconds for replies from /etc/hosts." + msgstr "SpecificÄ TTL Ã®n secunde pentru rÄspunsurile din /etc/hosts." + +-#: option.c:384 ++#: option.c:386 + #, fuzzy + msgid "Specify time-to-live in seconds for negative caching." + msgstr "SpecificÄ TTL Ã®n secunde pentru rÄspunsurile din /etc/hosts." + +-#: option.c:385 ++#: option.c:387 + #, fuzzy + msgid "Specify time-to-live in seconds for maximum TTL to send to clients." + msgstr "SpecificÄ TTL Ã®n secunde pentru rÄspunsurile din /etc/hosts." + +-#: option.c:386 ++#: option.c:388 + #, fuzzy + msgid "Specify time-to-live ceiling for cache." + msgstr "SpecificÄ TTL Ã®n secunde pentru rÄspunsurile din /etc/hosts." + +-#: option.c:387 ++#: option.c:389 + #, fuzzy + msgid "Specify time-to-live floor for cache." + msgstr "SpecificÄ TTL Ã®n secunde pentru rÄspunsurile din /etc/hosts." + +-#: option.c:388 ++#: option.c:390 + #, c-format + msgid "Change to this user after startup. (defaults to %s)." + msgstr "RuleazÄ sub acest utilizator dupÄ pornire. (implicit e %s)." + +-#: option.c:389 ++#: option.c:391 + #, fuzzy + msgid "Map DHCP vendor class to tag." + msgstr "Trimite opÅ£iuni DHCP Ã®n funcÅ£ie de marca plÄcii de reÅ£ea." + +-#: option.c:390 ++#: option.c:392 + msgid "Display dnsmasq version and copyright information." + msgstr "AfiÅeazÄ versiunea dnsmasq Åi drepturile de autor." + +-#: option.c:391 ++#: option.c:393 + msgid "Translate IPv4 addresses from upstream servers." + msgstr "Traduce adresele IPv4 de la serverele DNS superioare." + +-#: option.c:392 ++#: option.c:394 + msgid "Specify a SRV record." + msgstr "SpecificÄ o Ã®nregistrare SRV." + +-#: option.c:393 ++#: option.c:395 + msgid "Display this message. Use --help dhcp for known DHCP options." + msgstr "" + +-#: option.c:394 ++#: option.c:396 + #, fuzzy, c-format + msgid "Specify path of PID file (defaults to %s)." + msgstr "SpecificÄ o cale pentru fiÅierul PID. (implicit %s)." + +-#: option.c:395 ++#: option.c:397 + #, c-format + msgid "Specify maximum number of DHCP leases (defaults to %s)." + msgstr "SpecificÄ numÄrul maxim de Ã®mprumuturi DHCP (implicit %s)." + +-#: option.c:396 ++#: option.c:398 + msgid "Answer DNS queries based on the interface a query was sent to." + msgstr "RÄspunde cererilor DNS Ã®n funcÅ£ie de interfaÅ£a pe care a venit cererea." + +-#: option.c:397 ++#: option.c:399 + msgid "Specify TXT DNS record." + msgstr "SpecificÄ o Ã®nregistrare TXT." + +-#: option.c:398 ++#: option.c:400 + #, fuzzy + msgid "Specify PTR DNS record." + msgstr "SpecificÄ o Ã®nregistrare TXT." + +-#: option.c:399 ++#: option.c:401 + msgid "Give DNS name to IPv4 address of interface." + msgstr "" + +-#: option.c:400 ++#: option.c:402 + msgid "Bind only to interfaces in use." + msgstr "AscultÄ doar pe interfeÅ£ele active." + +-#: option.c:401 ++#: option.c:403 + #, c-format + msgid "Read DHCP static host information from %s." + msgstr "CiteÅte informaÅ£ii DHCP statice despre maÅinÄ din %s." + +-#: option.c:402 ++#: option.c:404 + msgid "Enable the DBus interface for setting upstream servers, etc." + msgstr "Activeaza interfaÅ£a DBus pentru configurarea serverelor superioare." + +-#: option.c:403 ++#: option.c:405 + msgid "Do not provide DHCP on this interface, only provide DNS." + msgstr "Nu activeazÄ DHCP ci doar DNS pe aceastÄ interfaÅ£Ä." + +-#: option.c:404 ++#: option.c:406 + msgid "Enable dynamic address allocation for bootp." + msgstr "ActiveazÄ alocarea dinamicÄ a adreselor pentru BOOTP." + +-#: option.c:405 ++#: option.c:407 + #, fuzzy + msgid "Map MAC address (with wildcards) to option set." + msgstr "Trimite opÅ£iuni DHCP Ã®n funcÅ£ie de marca plÄcii de reÅ£ea." + +-#: option.c:406 ++#: option.c:408 + msgid "Treat DHCP requests on aliases as arriving from interface." + msgstr "" + +-#: option.c:407 ++#: option.c:409 + msgid "Disable ICMP echo address checking in the DHCP server." + msgstr "" + +-#: option.c:408 ++#: option.c:410 + msgid "Shell script to run on DHCP lease creation and destruction." + msgstr "" + +-#: option.c:409 ++#: option.c:411 + msgid "Lua script to run on DHCP lease creation and destruction." + msgstr "" + +-#: option.c:410 ++#: option.c:412 + msgid "Run lease-change scripts as this user." + msgstr "" + +-#: option.c:411 ++#: option.c:413 + msgid "Read configuration from all the files in this directory." + msgstr "" + +-#: option.c:412 ++#: option.c:414 + #, fuzzy + msgid "Log to this syslog facility or file. (defaults to DAEMON)" + msgstr "RuleazÄ sub acest utilizator dupÄ pornire. (implicit e %s)." + +-#: option.c:413 ++#: option.c:415 + msgid "Do not use leasefile." + msgstr "" + +-#: option.c:414 ++#: option.c:416 + #, fuzzy, c-format + msgid "Maximum number of concurrent DNS queries. (defaults to %s)" + msgstr "SpecificÄ numÄrul maxim de Ã®mprumuturi DHCP (implicit %s)." + +-#: option.c:415 ++#: option.c:417 + #, c-format + msgid "Clear DNS cache when reloading %s." + msgstr "" + +-#: option.c:416 ++#: option.c:418 + msgid "Ignore hostnames provided by DHCP clients." + msgstr "" + +-#: option.c:417 ++#: option.c:419 + msgid "Do NOT reuse filename and server fields for extra DHCP options." + msgstr "" + +-#: option.c:418 ++#: option.c:420 + msgid "Enable integrated read-only TFTP server." + msgstr "" + +-#: option.c:419 ++#: option.c:421 + msgid "Export files by TFTP only from the specified subtree." + msgstr "" + +-#: option.c:420 ++#: option.c:422 + msgid "Add client IP address to tftp-root." + msgstr "" + +-#: option.c:421 ++#: option.c:423 + msgid "Allow access only to files owned by the user running dnsmasq." + msgstr "" + +-#: option.c:422 ++#: option.c:424 ++msgid "Do not terminate the service if TFTP directories are inaccessible." ++msgstr "" ++ ++#: option.c:425 + #, fuzzy, c-format + msgid "Maximum number of conncurrent TFTP transfers (defaults to %s)." + msgstr "SpecificÄ numÄrul maxim de Ã®mprumuturi DHCP (implicit %s)." + +-#: option.c:423 ++#: option.c:426 + msgid "Disable the TFTP blocksize extension." + msgstr "" + +-#: option.c:424 ++#: option.c:427 + msgid "Convert TFTP filenames to lowercase" + msgstr "" + +-#: option.c:425 ++#: option.c:428 + msgid "Ephemeral port range for use by TFTP transfers." + msgstr "" + +-#: option.c:426 ++#: option.c:429 + msgid "Extra logging for DHCP." + msgstr "" + +-#: option.c:427 ++#: option.c:430 + msgid "Enable async. logging; optionally set queue length." + msgstr "" + +-#: option.c:428 ++#: option.c:431 + msgid "Stop DNS rebinding. Filter private IP ranges when resolving." + msgstr "" + +-#: option.c:429 ++#: option.c:432 + msgid "Allow rebinding of 127.0.0.0/8, for RBL servers." + msgstr "" + +-#: option.c:430 ++#: option.c:433 + msgid "Inhibit DNS-rebind protection on this domain." + msgstr "" + +-#: option.c:431 ++#: option.c:434 + msgid "Always perform DNS queries to all servers." + msgstr "" + +-#: option.c:432 ++#: option.c:435 + msgid "Set tag if client includes matching option in request." + msgstr "" + +-#: option.c:433 ++#: option.c:436 + msgid "Use alternative ports for DHCP." + msgstr "" + +-#: option.c:434 ++#: option.c:437 + #, fuzzy + msgid "Specify NAPTR DNS record." + msgstr "SpecificÄ o Ã®nregistrare TXT." + +-#: option.c:435 ++#: option.c:438 + msgid "Specify lowest port available for DNS query transmission." + msgstr "" + +-#: option.c:436 ++#: option.c:439 + msgid "Use only fully qualified domain names for DHCP clients." + msgstr "" + +-#: option.c:437 ++#: option.c:440 + msgid "Generate hostnames based on MAC address for nameless clients." + msgstr "" + +-#: option.c:438 ++#: option.c:441 + msgid "Use these DHCP relays as full proxies." + msgstr "" + +-#: option.c:439 ++#: option.c:442 + msgid "Relay DHCP requests to a remote server" + msgstr "" + +-#: option.c:440 ++#: option.c:443 + msgid "Specify alias name for LOCAL DNS name." + msgstr "" + +-#: option.c:441 ++#: option.c:444 + #, fuzzy + msgid "Prompt to send to PXE clients." + msgstr "ConfigureazÄ opÅ£iuni Ã®n plusce trebuie trimise clienÅ£ilor DHCP." + +-#: option.c:442 ++#: option.c:445 + msgid "Boot service for PXE menu." + msgstr "" + +-#: option.c:443 ++#: option.c:446 + msgid "Check configuration syntax." + msgstr "" + +-#: option.c:444 ++#: option.c:447 + msgid "Add requestor's MAC address to forwarded DNS queries." + msgstr "" + +-#: option.c:445 ++#: option.c:448 + msgid "Add requestor's IP subnet to forwarded DNS queries." + msgstr "" + +-#: option.c:446 ++#: option.c:449 + #, fuzzy + msgid "Proxy DNSSEC validation results from upstream nameservers." + msgstr "Traduce adresele IPv4 de la serverele DNS superioare." + +-#: option.c:447 ++#: option.c:450 + msgid "Attempt to allocate sequential IP addresses to DHCP clients." + msgstr "" + +-#: option.c:448 ++#: option.c:451 + msgid "Copy connection-track mark from queries to upstream connections." + msgstr "" + +-#: option.c:449 ++#: option.c:452 + msgid "Allow DHCP clients to do their own DDNS updates." + msgstr "" + +-#: option.c:450 ++#: option.c:453 + msgid "Send router-advertisements for interfaces doing DHCPv6" + msgstr "" + +-#: option.c:451 ++#: option.c:454 + msgid "Specify DUID_EN-type DHCPv6 server DUID" + msgstr "" + +-#: option.c:452 ++#: option.c:455 + #, fuzzy + msgid "Specify host (A/AAAA and PTR) records" + msgstr "SpecificÄ o Ã®nregistrare MX." + +-#: option.c:453 ++#: option.c:456 + #, fuzzy + msgid "Specify arbitrary DNS resource record" + msgstr "SpecificÄ o Ã®nregistrare TXT." + +-#: option.c:454 ++#: option.c:457 + #, fuzzy + msgid "Bind to interfaces in use - check for new interfaces" + msgstr "interfaÅ£Ä necunoscutÄ %s" + +-#: option.c:455 ++#: option.c:458 + msgid "Export local names to global DNS" + msgstr "" + +-#: option.c:456 ++#: option.c:459 + msgid "Domain to export to global DNS" + msgstr "" + +-#: option.c:457 ++#: option.c:460 + msgid "Set TTL for authoritative replies" + msgstr "" + +-#: option.c:458 ++#: option.c:461 + msgid "Set authoritive zone information" + msgstr "" + +-#: option.c:459 ++#: option.c:462 + msgid "Secondary authoritative nameservers for forward domains" + msgstr "" + +-#: option.c:460 ++#: option.c:463 + msgid "Peers which are allowed to do zone transfer" + msgstr "" + +-#: option.c:461 ++#: option.c:464 + msgid "Specify ipsets to which matching domains should be added" + msgstr "" + +-#: option.c:462 ++#: option.c:465 + msgid "Specify a domain and address range for synthesised names" + msgstr "" + +-#: option.c:463 ++#: option.c:466 + msgid "Activate DNSSEC validation" + msgstr "" + +-#: option.c:464 ++#: option.c:467 + msgid "Specify trust anchor key digest." + msgstr "" + +-#: option.c:465 ++#: option.c:468 + msgid "Disable upstream checking for DNSSEC debugging." + msgstr "" + +-#: option.c:466 ++#: option.c:469 + msgid "Ensure answers without DNSSEC are in unsigned zones." + msgstr "" + +-#: option.c:467 ++#: option.c:470 + msgid "Don't check DNSSEC signature timestamps until first cache-reload" + msgstr "" + +-#: option.c:468 ++#: option.c:471 + msgid "Timestamp file to verify system clock for DNSSEC" + msgstr "" + +-#: option.c:470 ++#: option.c:473 + msgid "Specify DHCPv6 prefix class" + msgstr "" + +-#: option.c:472 ++#: option.c:475 + msgid "Set priority, resend-interval and router-lifetime" + msgstr "" + +-#: option.c:473 ++#: option.c:476 + msgid "Do not log routine DHCP." + msgstr "" + +-#: option.c:474 ++#: option.c:477 + msgid "Do not log routine DHCPv6." + msgstr "" + +-#: option.c:475 ++#: option.c:478 + msgid "Do not log RA." + msgstr "" + +-#: option.c:476 ++#: option.c:479 + msgid "Accept queries only from directly-connected networks" + msgstr "" + +-#: option.c:477 ++#: option.c:480 + msgid "Detect and remove DNS forwarding loops" + msgstr "" + +-#: option.c:478 ++#: option.c:481 + msgid "Ignore DNS responses containing ipaddr." + msgstr "" + +-#: option.c:680 ++#: option.c:683 + #, c-format + msgid "" + "Usage: dnsmasq [options]\n" +@@ -753,332 +757,332 @@ msgstr "" + "Utilizare: dnsmasq [opÅ£iuni]\n" + "\n" + +-#: option.c:682 ++#: option.c:685 + #, c-format + msgid "Use short options only on the command line.\n" + msgstr "FolosiÅ£i opÅ£iunile prescurtate doar Ã®n linie de comandÄ.\n" + +-#: option.c:684 ++#: option.c:687 + #, fuzzy, c-format + msgid "Valid options are:\n" + msgstr "OpÅ£iunile valide sunt:\n" + +-#: option.c:741 option.c:745 ++#: option.c:744 option.c:748 + msgid "bad port" + msgstr "port invalid" + +-#: option.c:772 option.c:804 ++#: option.c:775 option.c:807 + msgid "interface binding not supported" + msgstr "" + +-#: option.c:781 option.c:3570 ++#: option.c:784 option.c:3575 + #, fuzzy + msgid "bad interface name" + msgstr "nume MX invalid" + +-#: option.c:811 ++#: option.c:814 + #, fuzzy + msgid "bad address" + msgstr "citesc %s - %d adrese" + +-#: option.c:993 ++#: option.c:996 + msgid "unsupported encapsulation for IPv6 option" + msgstr "" + +-#: option.c:1007 ++#: option.c:1010 + msgid "bad dhcp-option" + msgstr "dhcp-option invalid" + +-#: option.c:1075 ++#: option.c:1078 + #, fuzzy + msgid "bad IP address" + msgstr "citesc %s - %d adrese" + +-#: option.c:1078 option.c:1216 option.c:2888 ++#: option.c:1081 option.c:1219 option.c:2893 + #, fuzzy + msgid "bad IPv6 address" + msgstr "citesc %s - %d adrese" + +-#: option.c:1243 option.c:1337 ++#: option.c:1246 option.c:1340 + msgid "bad domain in dhcp-option" + msgstr "domeniu DNS invalid Ã®n declaraÅ£ia dhcp-option" + +-#: option.c:1375 ++#: option.c:1378 + msgid "dhcp-option too long" + msgstr "declararea dhcp-option este prea lungÄ" + +-#: option.c:1382 ++#: option.c:1385 + msgid "illegal dhcp-match" + msgstr "" + +-#: option.c:1444 ++#: option.c:1447 + msgid "illegal repeated flag" + msgstr "" + +-#: option.c:1452 ++#: option.c:1455 + msgid "illegal repeated keyword" + msgstr "" + +-#: option.c:1517 option.c:4186 ++#: option.c:1520 option.c:4191 + #, fuzzy, c-format + msgid "cannot access directory %s: %s" + msgstr "nu pot citi %s: %s" + +-#: option.c:1563 tftp.c:493 ++#: option.c:1566 tftp.c:493 + #, fuzzy, c-format + msgid "cannot access %s: %s" + msgstr "nu pot citi %s: %s" + +-#: option.c:1615 ++#: option.c:1618 + msgid "setting log facility is not possible under Android" + msgstr "" + +-#: option.c:1624 ++#: option.c:1627 + msgid "bad log facility" + msgstr "" + +-#: option.c:1677 ++#: option.c:1680 + msgid "bad MX preference" + msgstr "preferinÅ£Ä MX invalidÄ" + +-#: option.c:1682 ++#: option.c:1685 + msgid "bad MX name" + msgstr "nume MX invalid" + +-#: option.c:1696 ++#: option.c:1699 + msgid "bad MX target" + msgstr "Å£intÄ MX invalidÄ" + +-#: option.c:1708 ++#: option.c:1711 + msgid "cannot run scripts under uClinux" + msgstr "" + +-#: option.c:1710 ++#: option.c:1713 + msgid "recompile with HAVE_SCRIPT defined to enable lease-change scripts" + msgstr "" + +-#: option.c:1714 ++#: option.c:1717 + msgid "recompile with HAVE_LUASCRIPT defined to enable Lua scripts" + msgstr "" + +-#: option.c:1970 option.c:2015 option.c:2071 ++#: option.c:1973 option.c:2018 option.c:2074 + #, fuzzy + msgid "bad prefix" + msgstr "port invalid" + +-#: option.c:2352 ++#: option.c:2355 + msgid "recompile with HAVE_IPSET defined to enable ipset directives" + msgstr "" + +-#: option.c:2545 ++#: option.c:2548 + #, fuzzy + msgid "bad port range" + msgstr "port invalid" + +-#: option.c:2561 ++#: option.c:2564 + msgid "bad bridge-interface" + msgstr "" + +-#: option.c:2621 ++#: option.c:2624 + msgid "only one tag allowed" + msgstr "" + +-#: option.c:2641 option.c:2653 option.c:2759 option.c:2800 ++#: option.c:2644 option.c:2656 option.c:2764 option.c:2805 + msgid "bad dhcp-range" + msgstr "dhcp-range invalid" + +-#: option.c:2668 ++#: option.c:2671 + msgid "inconsistent DHCP range" + msgstr "domeniu DHCP inconsistent" + +-#: option.c:2727 ++#: option.c:2732 + msgid "prefix length must be exactly 64 for RA subnets" + msgstr "" + +-#: option.c:2729 ++#: option.c:2734 + msgid "prefix length must be exactly 64 for subnet constructors" + msgstr "" + +-#: option.c:2733 ++#: option.c:2738 + msgid "prefix length must be at least 64" + msgstr "" + +-#: option.c:2736 ++#: option.c:2741 + #, fuzzy + msgid "inconsistent DHCPv6 range" + msgstr "domeniu DHCP inconsistent" + +-#: option.c:2747 ++#: option.c:2752 + msgid "prefix must be zero with \"constructor:\" argument" + msgstr "" + +-#: option.c:2858 option.c:2906 ++#: option.c:2863 option.c:2911 + #, fuzzy + msgid "bad hex constant" + msgstr "dhcp-host invalid" + +-#: option.c:2880 ++#: option.c:2885 + msgid "cannot match tags in --dhcp-host" + msgstr "" + +-#: option.c:2928 ++#: option.c:2933 + #, fuzzy, c-format + msgid "duplicate dhcp-host IP address %s" + msgstr "adresÄ IP duplicat %s Ã®n declaraÅ£ia dhcp-config." + +-#: option.c:2986 ++#: option.c:2991 + #, fuzzy + msgid "bad DHCP host name" + msgstr "nume MX invalid" + +-#: option.c:3068 ++#: option.c:3073 + #, fuzzy + msgid "bad tag-if" + msgstr "Å£intÄ MX invalidÄ" + +-#: option.c:3392 option.c:3786 ++#: option.c:3397 option.c:3791 + msgid "invalid port number" + msgstr "numÄr de port invalid" + +-#: option.c:3454 ++#: option.c:3459 + #, fuzzy + msgid "bad dhcp-proxy address" + msgstr "citesc %s - %d adrese" + +-#: option.c:3480 ++#: option.c:3485 + #, fuzzy + msgid "Bad dhcp-relay" + msgstr "dhcp-range invalid" + +-#: option.c:3506 ++#: option.c:3511 + msgid "bad RA-params" + msgstr "" + +-#: option.c:3515 ++#: option.c:3520 + msgid "bad DUID" + msgstr "" + +-#: option.c:3557 ++#: option.c:3562 + #, fuzzy + msgid "invalid alias range" + msgstr "pondere invalidÄ" + +-#: option.c:3611 ++#: option.c:3616 + msgid "bad CNAME" + msgstr "" + +-#: option.c:3616 ++#: option.c:3621 + msgid "duplicate CNAME" + msgstr "" + +-#: option.c:3636 ++#: option.c:3641 + #, fuzzy + msgid "bad PTR record" + msgstr "Ã®nregistrare SRV invalidÄ" + +-#: option.c:3667 ++#: option.c:3672 + #, fuzzy + msgid "bad NAPTR record" + msgstr "Ã®nregistrare SRV invalidÄ" + +-#: option.c:3701 ++#: option.c:3706 + #, fuzzy + msgid "bad RR record" + msgstr "Ã®nregistrare SRV invalidÄ" + +-#: option.c:3731 ++#: option.c:3736 + msgid "bad TXT record" + msgstr "Ã®nregistrare TXT invalidÄ" + +-#: option.c:3772 ++#: option.c:3777 + msgid "bad SRV record" + msgstr "Ã®nregistrare SRV invalidÄ" + +-#: option.c:3779 ++#: option.c:3784 + msgid "bad SRV target" + msgstr "Å£intÄ SRV invalidÄ" + +-#: option.c:3793 ++#: option.c:3798 + msgid "invalid priority" + msgstr "prioritate invalidÄ" + +-#: option.c:3800 ++#: option.c:3805 + msgid "invalid weight" + msgstr "pondere invalidÄ" + +-#: option.c:3824 ++#: option.c:3829 + #, fuzzy + msgid "Bad host-record" + msgstr "Ã®nregistrare SRV invalidÄ" + +-#: option.c:3841 ++#: option.c:3846 + #, fuzzy + msgid "Bad name in host-record" + msgstr "nume invalid Ã®n %s" + +-#: option.c:3906 ++#: option.c:3911 + #, fuzzy + msgid "bad trust anchor" + msgstr "port invalid" + +-#: option.c:3920 ++#: option.c:3925 + msgid "bad HEX in trust anchor" + msgstr "" + +-#: option.c:3930 ++#: option.c:3935 + msgid "unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DNSSEC/DBus support)" + msgstr "" + +-#: option.c:3989 ++#: option.c:3994 + msgid "missing \"" + msgstr "lipseÅte \"" + +-#: option.c:4046 ++#: option.c:4051 + msgid "bad option" + msgstr "opÅ£iune invalidÄ" + +-#: option.c:4048 ++#: option.c:4053 + msgid "extraneous parameter" + msgstr "parametru nerecunoscut" + +-#: option.c:4050 ++#: option.c:4055 + msgid "missing parameter" + msgstr "parametru lipsa" + +-#: option.c:4052 ++#: option.c:4057 + #, fuzzy + msgid "illegal option" + msgstr "opÅ£iune invalidÄ" + +-#: option.c:4059 ++#: option.c:4064 + msgid "error" + msgstr "eroare" + +-#: option.c:4061 ++#: option.c:4066 + #, fuzzy, c-format + msgid " at line %d of %s" + msgstr "%s la linia %d din %%s" + +-#: option.c:4076 option.c:4323 option.c:4359 ++#: option.c:4081 option.c:4328 option.c:4364 + #, fuzzy, c-format + msgid "read %s" + msgstr "citesc %s" + +-#: option.c:4139 option.c:4262 tftp.c:667 ++#: option.c:4144 option.c:4267 tftp.c:667 + #, c-format + msgid "cannot read %s: %s" + msgstr "nu pot citi %s: %s" + +-#: option.c:4425 ++#: option.c:4430 + msgid "junk found in command line" + msgstr "" + +-#: option.c:4460 ++#: option.c:4465 + #, c-format + msgid "Dnsmasq version %s %s\n" + msgstr "dnsmasq versiunea %s %s\n" + +-#: option.c:4461 ++#: option.c:4466 + #, fuzzy, c-format + msgid "" + "Compile time options: %s\n" +@@ -1087,62 +1091,62 @@ msgstr "" + "OpÅ£iuni cu care a fost compilat %s\n" + "\n" + +-#: option.c:4462 ++#: option.c:4467 + #, c-format + msgid "This software comes with ABSOLUTELY NO WARRANTY.\n" + msgstr "Acest program vine FÄRÄ NICI O GARANÅ¢IE.\n" + +-#: option.c:4463 ++#: option.c:4468 + #, c-format + msgid "Dnsmasq is free software, and you are welcome to redistribute it\n" + msgstr "Dnsmasq este un program gratuit, sunteÅ£i invitaÅ£i sÄ-l redistribuiÅ£i\n" + +-#: option.c:4464 ++#: option.c:4469 + #, fuzzy, c-format + msgid "under the terms of the GNU General Public License, version 2 or 3.\n" + msgstr "Ã®n termenii LicenÅ£ei publice generale GNU, versiunea 2.\n" + +-#: option.c:4475 ++#: option.c:4480 + msgid "try --help" + msgstr "" + +-#: option.c:4477 ++#: option.c:4482 + msgid "try -w" + msgstr "" + +-#: option.c:4479 ++#: option.c:4484 + #, fuzzy, c-format + msgid "bad command line options: %s" + msgstr "opÅ£iuni Ã®n linie de comandÄ invalide: %s." + +-#: option.c:4535 ++#: option.c:4544 + #, c-format + msgid "cannot get host-name: %s" + msgstr "nu pot citi numele maÅinii: %s" + +-#: option.c:4563 ++#: option.c:4572 + msgid "only one resolv.conf file allowed in no-poll mode." + msgstr "se permite un singur fiÅier resolv.conf Ã®n modul no-poll" + +-#: option.c:4573 ++#: option.c:4582 + msgid "must have exactly one resolv.conf to read domain from." + msgstr "am nevoie de un singur resolv.conf din care sÄ citesc numele domeniului." + +-#: option.c:4576 network.c:1506 dhcp.c:774 ++#: option.c:4585 network.c:1507 dhcp.c:777 + #, fuzzy, c-format + msgid "failed to read %s: %s" + msgstr "nu pot citi %s: %s" + +-#: option.c:4593 ++#: option.c:4602 + #, c-format + msgid "no search directive found in %s" + msgstr "nu s-a gÄsit nici un criteriu de cÄutare Ã®n %s" + +-#: option.c:4614 ++#: option.c:4623 + msgid "there must be a default domain when --dhcp-fqdn is set" + msgstr "" + +-#: option.c:4623 ++#: option.c:4632 + msgid "syntax check OK" + msgstr "" + +@@ -1151,25 +1155,25 @@ msgstr "" + msgid "failed to send packet: %s" + msgstr "ascultarea pe socket a eÅuat: %s" + +-#: forward.c:572 ++#: forward.c:591 + msgid "discarding DNS reply: subnet option mismatch" + msgstr "" + +-#: forward.c:595 ++#: forward.c:614 + #, c-format + msgid "nameserver %s refused to do a recursive query" + msgstr "serverul DNS %s refuzÄ interogÄrile recursive" + +-#: forward.c:627 ++#: forward.c:646 + #, c-format + msgid "possible DNS-rebind attack detected: %s" + msgstr "" + +-#: forward.c:1156 forward.c:1722 ++#: forward.c:1209 forward.c:1785 + msgid "Ignoring query from non-local network" + msgstr "" + +-#: forward.c:2178 ++#: forward.c:2256 + #, fuzzy, c-format + msgid "Maximum number of concurrent DNS queries reached (max: %d)" + msgstr "SpecificÄ numÄrul maxim de Ã®mprumuturi DHCP (implicit %s)." +@@ -1203,342 +1207,352 @@ msgstr "activarea socket-ului server-ului DHCP a eÅuat: %s" + msgid "failed to bind server socket for %s: %s" + msgstr "activarea socket-ului de ascultare pentru %s a eÅuat: %s" + +-#: network.c:1444 ++#: network.c:1445 + #, c-format + msgid "ignoring nameserver %s - local interface" + msgstr "ignorÄm serverul DNS %s - interfaÅ£Ä localÄ" + +-#: network.c:1455 ++#: network.c:1456 + #, fuzzy, c-format + msgid "ignoring nameserver %s - cannot make/bind socket: %s" + msgstr "ignorÄm serverul DNS %s - nu pot creea/activa socket-ul: %s" + +-#: network.c:1468 ++#: network.c:1469 + msgid "unqualified" + msgstr "invalid" + +-#: network.c:1468 ++#: network.c:1469 + msgid "names" + msgstr "" + +-#: network.c:1470 ++#: network.c:1471 + msgid "default" + msgstr "" + +-#: network.c:1472 ++#: network.c:1473 + msgid "domain" + msgstr "domeniu" + +-#: network.c:1475 ++#: network.c:1476 + #, c-format + msgid "using local addresses only for %s %s" + msgstr "folosim adresele locale doar pentru %S %s" + +-#: network.c:1477 ++#: network.c:1478 + #, fuzzy, c-format + msgid "using standard nameservers for %s %s" + msgstr "folosim serverul DNS %s#%d pentru %s %s" + +-#: network.c:1479 ++#: network.c:1480 + #, c-format + msgid "using nameserver %s#%d for %s %s" + msgstr "folosim serverul DNS %s#%d pentru %s %s" + +-#: network.c:1483 ++#: network.c:1484 + #, fuzzy, c-format + msgid "NOT using nameserver %s#%d - query loop detected" + msgstr "folosim serverul DNS %s#%d pentru %s %s" + +-#: network.c:1486 ++#: network.c:1487 + #, fuzzy, c-format + msgid "using nameserver %s#%d(via %s)" + msgstr "folosim serverul DNS %s#%d" + +-#: network.c:1488 ++#: network.c:1489 + #, c-format + msgid "using nameserver %s#%d" + msgstr "folosim serverul DNS %s#%d" + +-#: dnsmasq.c:149 ++#: dnsmasq.c:163 + msgid "dhcp-hostsdir, dhcp-optsdir and hostsdir are not supported on this platform" + msgstr "" + +-#: dnsmasq.c:156 ++#: dnsmasq.c:170 + msgid "no trust anchors provided for DNSSEC" + msgstr "" + +-#: dnsmasq.c:159 ++#: dnsmasq.c:173 + msgid "cannot reduce cache size from default when DNSSEC enabled" + msgstr "" + +-#: dnsmasq.c:161 ++#: dnsmasq.c:175 + #, fuzzy + msgid "DNSSEC not available: set HAVE_DNSSEC in src/config.h" + msgstr "DBus nu este disponibil: puneÅ£i HAVE_DBUS in src/config.h" + +-#: dnsmasq.c:167 ++#: dnsmasq.c:181 + #, fuzzy + msgid "TFTP server not available: set HAVE_TFTP in src/config.h" + msgstr "DBus nu este disponibil: puneÅ£i HAVE_DBUS in src/config.h" + +-#: dnsmasq.c:172 ++#: dnsmasq.c:186 + msgid "cannot use --conntrack AND --query-port" + msgstr "" + +-#: dnsmasq.c:175 ++#: dnsmasq.c:189 + #, fuzzy + msgid "conntrack support not available: set HAVE_CONNTRACK in src/config.h" + msgstr "DBus nu este disponibil: puneÅ£i HAVE_DBUS in src/config.h" + +-#: dnsmasq.c:180 ++#: dnsmasq.c:194 + msgid "asychronous logging is not available under Solaris" + msgstr "" + +-#: dnsmasq.c:185 ++#: dnsmasq.c:199 + msgid "asychronous logging is not available under Android" + msgstr "" + +-#: dnsmasq.c:190 ++#: dnsmasq.c:204 + #, fuzzy + msgid "authoritative DNS not available: set HAVE_AUTH in src/config.h" + msgstr "DBus nu este disponibil: puneÅ£i HAVE_DBUS in src/config.h" + +-#: dnsmasq.c:195 ++#: dnsmasq.c:209 + #, fuzzy + msgid "loop detection not available: set HAVE_LOOP in src/config.h" + msgstr "DBus nu este disponibil: puneÅ£i HAVE_DBUS in src/config.h" + +-#: dnsmasq.c:203 ++#: dnsmasq.c:217 + msgid "zone serial must be configured in --auth-soa" + msgstr "" + +-#: dnsmasq.c:221 ++#: dnsmasq.c:235 + msgid "dhcp-range constructor not available on this platform" + msgstr "" + +-#: dnsmasq.c:264 ++#: dnsmasq.c:278 + msgid "cannot set --bind-interfaces and --bind-dynamic" + msgstr "" + +-#: dnsmasq.c:267 ++#: dnsmasq.c:281 + #, c-format + msgid "failed to find list of interfaces: %s" + msgstr "enumerarea interfeÅ£elor a eÅuat: %s" + +-#: dnsmasq.c:276 ++#: dnsmasq.c:290 + #, c-format + msgid "unknown interface %s" + msgstr "interfaÅ£Ä necunoscutÄ %s" + +-#: dnsmasq.c:340 dnsmasq.c:1004 ++#: dnsmasq.c:354 dnsmasq.c:1037 + #, c-format + msgid "DBus error: %s" + msgstr "eroare DBus: %s" + +-#: dnsmasq.c:343 ++#: dnsmasq.c:357 + msgid "DBus not available: set HAVE_DBUS in src/config.h" + msgstr "DBus nu este disponibil: puneÅ£i HAVE_DBUS in src/config.h" + +-#: dnsmasq.c:371 ++#: dnsmasq.c:385 + #, c-format + msgid "unknown user or group: %s" + msgstr "" + +-#: dnsmasq.c:426 ++#: dnsmasq.c:440 + #, c-format + msgid "cannot chdir to filesystem root: %s" + msgstr "" + +-#: dnsmasq.c:667 ++#: dnsmasq.c:692 + #, fuzzy, c-format + msgid "started, version %s DNS disabled" + msgstr "am pornit, versiunea %s memorie temporarÄ dezactivatÄ" + +-#: dnsmasq.c:669 ++#: dnsmasq.c:694 + #, c-format + msgid "started, version %s cachesize %d" + msgstr "am ponit, versiunea %s memorie temporarÄ %d" + +-#: dnsmasq.c:671 ++#: dnsmasq.c:696 + #, c-format + msgid "started, version %s cache disabled" + msgstr "am pornit, versiunea %s memorie temporarÄ dezactivatÄ" + +-#: dnsmasq.c:673 ++#: dnsmasq.c:698 + #, c-format + msgid "compile time options: %s" + msgstr "compilat cu opÅ£iunile: %s" + +-#: dnsmasq.c:679 ++#: dnsmasq.c:704 + msgid "DBus support enabled: connected to system bus" + msgstr "suportul DBus activ: sunt conectat la magistrala sistem" + +-#: dnsmasq.c:681 ++#: dnsmasq.c:706 + msgid "DBus support enabled: bus connection pending" + msgstr "suportul DBus activ: aÅtept conexiunea la magistralÄ" + +-#: dnsmasq.c:686 ++#: dnsmasq.c:711 + msgid "DNS service limited to local subnets" + msgstr "" + +-#: dnsmasq.c:702 ++#: dnsmasq.c:727 + msgid "DNSSEC validation enabled" + msgstr "" + +-#: dnsmasq.c:705 ++#: dnsmasq.c:730 + msgid "DNSSEC signature timestamps not checked until first cache reload" + msgstr "" + +-#: dnsmasq.c:708 ++#: dnsmasq.c:733 + msgid "DNSSEC signature timestamps not checked until system time valid" + msgstr "" + + # for compatibility purposes the letters Ã¢, Ä, Å, Å£ and Ã® can be written as their look-alike correspondent. +-#: dnsmasq.c:713 ++#: dnsmasq.c:738 + #, fuzzy, c-format + msgid "warning: failed to change owner of %s: %s" + msgstr "Ã®ncÄrcarea numelor din %s: %s a eÅuat" + +-#: dnsmasq.c:717 ++#: dnsmasq.c:742 + msgid "setting --bind-interfaces option because of OS limitations" + msgstr "specific opÅ£iunea --bind-interfaces din cauza limitÄrilor SO" + +-#: dnsmasq.c:727 ++#: dnsmasq.c:752 + #, c-format + msgid "warning: interface %s does not currently exist" + msgstr "atenÅ£ie: interfaÅ£a %s nu existÄ momentan" + +-#: dnsmasq.c:732 ++#: dnsmasq.c:757 + msgid "warning: ignoring resolv-file flag because no-resolv is set" + msgstr "" + +-#: dnsmasq.c:735 ++#: dnsmasq.c:760 + #, fuzzy + msgid "warning: no upstream servers configured" + msgstr "configurÄm serverele superioare prin Dbus" + +-#: dnsmasq.c:739 ++#: dnsmasq.c:764 + #, c-format + msgid "asynchronous logging enabled, queue limit is %d messages" + msgstr "" + +-#: dnsmasq.c:760 ++#: dnsmasq.c:785 + msgid "IPv6 router advertisement enabled" + msgstr "" + +-#: dnsmasq.c:765 ++#: dnsmasq.c:790 + #, c-format + msgid "DHCP, sockets bound exclusively to interface %s" + msgstr "" + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + msgid "root is " + msgstr "" + +-#: dnsmasq.c:782 ++#: dnsmasq.c:808 + #, fuzzy + msgid "enabled" + msgstr "dezactivat" + +-#: dnsmasq.c:784 ++#: dnsmasq.c:810 + msgid "secure mode" + msgstr "" + +-#: dnsmasq.c:810 ++#: dnsmasq.c:813 ++#, c-format ++msgid "warning: %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:817 ++#, c-format ++msgid "warning: TFTP directory %s inaccessible" ++msgstr "" ++ ++#: dnsmasq.c:843 + #, c-format + msgid "restricting maximum simultaneous TFTP transfers to %d" + msgstr "" + +-#: dnsmasq.c:1006 ++#: dnsmasq.c:1039 + msgid "connected to system DBus" + msgstr "magistrala sistem Dbus conectatÄ" + +-#: dnsmasq.c:1156 ++#: dnsmasq.c:1189 + #, c-format + msgid "cannot fork into background: %s" + msgstr "" + +-#: dnsmasq.c:1159 ++#: dnsmasq.c:1192 + #, fuzzy, c-format + msgid "failed to create helper: %s" + msgstr "nu pot citi %s: %s" + +-#: dnsmasq.c:1162 ++#: dnsmasq.c:1195 + #, c-format + msgid "setting capabilities failed: %s" + msgstr "" + + # for compatibility purposes the letters Ã¢, Ä, Å, Å£ and Ã® can be written as their look-alike correspondent. +-#: dnsmasq.c:1165 ++#: dnsmasq.c:1198 + #, fuzzy, c-format + msgid "failed to change user-id to %s: %s" + msgstr "Ã®ncÄrcarea numelor din %s: %s a eÅuat" + + # for compatibility purposes the letters Ã¢, Ä, Å, Å£ and Ã® can be written as their look-alike correspondent. +-#: dnsmasq.c:1168 ++#: dnsmasq.c:1201 + #, fuzzy, c-format + msgid "failed to change group-id to %s: %s" + msgstr "Ã®ncÄrcarea numelor din %s: %s a eÅuat" + +-#: dnsmasq.c:1171 ++#: dnsmasq.c:1204 + #, fuzzy, c-format + msgid "failed to open pidfile %s: %s" + msgstr "nu pot citi %s: %s" + +-#: dnsmasq.c:1174 ++#: dnsmasq.c:1207 + #, fuzzy, c-format + msgid "cannot open log %s: %s" + msgstr "nu pot deschide %s:%s" + +-#: dnsmasq.c:1177 ++#: dnsmasq.c:1210 + #, fuzzy, c-format + msgid "failed to load Lua script: %s" + msgstr "nu pot Ã®ncÄrca %s: %s" + +-#: dnsmasq.c:1180 ++#: dnsmasq.c:1213 + #, c-format + msgid "TFTP directory %s inaccessible: %s" + msgstr "" + +-#: dnsmasq.c:1183 ++#: dnsmasq.c:1216 + #, fuzzy, c-format + msgid "cannot create timestamp file %s: %s" + msgstr "nu pot creea sau deschide fiÅierul cu Ã®mprumuturi: %s" + +-#: dnsmasq.c:1204 ++#: dnsmasq.c:1237 + msgid "now checking DNSSEC signature timestamps" + msgstr "" + +-#: dnsmasq.c:1271 ++#: dnsmasq.c:1304 + #, c-format + msgid "script process killed by signal %d" + msgstr "" + +-#: dnsmasq.c:1275 ++#: dnsmasq.c:1308 + #, c-format + msgid "script process exited with status %d" + msgstr "" + +-#: dnsmasq.c:1279 ++#: dnsmasq.c:1312 + #, fuzzy, c-format + msgid "failed to execute %s: %s" + msgstr "accesarea serverului %s a eÅuat: %s" + +-#: dnsmasq.c:1334 ++#: dnsmasq.c:1367 + msgid "exiting on receipt of SIGTERM" + msgstr "am primit SIGTERM, am terminat" + +-#: dnsmasq.c:1362 ++#: dnsmasq.c:1395 + #, fuzzy, c-format + msgid "failed to access %s: %s" + msgstr "accesarea serverului %s a eÅuat: %s" + +-#: dnsmasq.c:1392 ++#: dnsmasq.c:1425 + #, c-format + msgid "reading %s" + msgstr "citesc %s" + +-#: dnsmasq.c:1403 ++#: dnsmasq.c:1436 + #, fuzzy, c-format + msgid "no servers found in %s, will retry" + msgstr "nu s-a gÄsit nici un criteriu de cÄutare Ã®n %s" +@@ -1568,37 +1582,37 @@ msgstr "activarea socket-ului server-ului DHCP a eÅuat: %s" + msgid "cannot create ICMP raw socket: %s." + msgstr "nu pot creea socket ICMP raw: %s." + +-#: dhcp.c:239 ++#: dhcp.c:241 dhcp6.c:180 + #, fuzzy, c-format + msgid "unknown interface %s in bridge-interface" + msgstr "interfaÅ£Ä necunoscutÄ %s" + +-#: dhcp.c:278 ++#: dhcp.c:281 + #, c-format + msgid "DHCP packet received on %s which has no address" + msgstr "" + +-#: dhcp.c:412 ++#: dhcp.c:415 + #, c-format + msgid "ARP-cache injection failed: %s" + msgstr "" + +-#: dhcp.c:511 ++#: dhcp.c:514 + #, c-format + msgid "DHCP range %s -- %s is not consistent with netmask %s" + msgstr "domeniu DHCP %s -- %s nu este consistent cu masca de reÅ£ea %s" + +-#: dhcp.c:812 ++#: dhcp.c:815 + #, c-format + msgid "bad line at %s line %d" + msgstr "linie invalidÄ Ã®n %s rÃ¢ndul %d" + +-#: dhcp.c:855 ++#: dhcp.c:858 + #, c-format + msgid "ignoring %s line %d, duplicate name or IP address" + msgstr "" + +-#: dhcp.c:999 rfc3315.c:2139 ++#: dhcp.c:1002 rfc3315.c:2135 + #, c-format + msgid "DHCP relay %s -> %s" + msgstr "" +@@ -1632,169 +1646,169 @@ msgstr "nu pot citi %s: %s" + msgid "Ignoring domain %s for DHCP host name %s" + msgstr "" + +-#: rfc2131.c:342 ++#: rfc2131.c:344 + #, c-format + msgid "no address range available for DHCP request %s %s" + msgstr "nici un domeniu de adrese disponibil pentru cererea DHCP %s %s" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "with subnet selector" + msgstr "cu selectorul de subreÅ£ea" + +-#: rfc2131.c:343 ++#: rfc2131.c:345 + msgid "via" + msgstr "prin" + +-#: rfc2131.c:355 ++#: rfc2131.c:357 + #, fuzzy, c-format + msgid "%u available DHCP subnet: %s/%s" + msgstr "nici un domeniu de adrese disponibil pentru cererea DHCP %s %s" + +-#: rfc2131.c:358 rfc3315.c:300 ++#: rfc2131.c:360 rfc3315.c:300 + #, c-format + msgid "%u available DHCP range: %s -- %s" + msgstr "" + +-#: rfc2131.c:469 ++#: rfc2131.c:471 + #, fuzzy, c-format + msgid "%u vendor class: %s" + msgstr "eroare DBus: %s" + +-#: rfc2131.c:471 ++#: rfc2131.c:473 + #, fuzzy, c-format + msgid "%u user class: %s" + msgstr "eroare DBus: %s" + +-#: rfc2131.c:498 ++#: rfc2131.c:500 + msgid "disabled" + msgstr "dezactivat" + +-#: rfc2131.c:539 rfc2131.c:967 rfc2131.c:1385 rfc3315.c:603 rfc3315.c:860 +-#: rfc3315.c:1139 ++#: rfc2131.c:541 rfc2131.c:974 rfc2131.c:1380 rfc3315.c:603 rfc3315.c:856 ++#: rfc3315.c:1135 + msgid "ignored" + msgstr "ignorat" + +-#: rfc2131.c:554 rfc2131.c:1205 rfc3315.c:910 ++#: rfc2131.c:556 rfc2131.c:1207 rfc3315.c:906 + msgid "address in use" + msgstr "adresa este folositÄ" + +-#: rfc2131.c:568 rfc2131.c:1021 ++#: rfc2131.c:570 rfc2131.c:1028 + msgid "no address available" + msgstr "nici o adresÄ disponibilÄ" + +-#: rfc2131.c:575 rfc2131.c:1168 ++#: rfc2131.c:577 rfc2131.c:1170 + msgid "wrong network" + msgstr "reÅ£ea greÅitÄ" + +-#: rfc2131.c:590 ++#: rfc2131.c:592 + msgid "no address configured" + msgstr "adresÄ lipsÄ" + +-#: rfc2131.c:596 rfc2131.c:1218 ++#: rfc2131.c:598 rfc2131.c:1220 + msgid "no leases left" + msgstr "nu mai am de unde sÄ Ã®mprumut" + +-#: rfc2131.c:691 rfc3315.c:476 ++#: rfc2131.c:693 rfc3315.c:476 + #, c-format + msgid "%u client provides name: %s" + msgstr "" + +-#: rfc2131.c:796 ++#: rfc2131.c:798 + msgid "PXE BIS not supported" + msgstr "" + +-#: rfc2131.c:935 rfc3315.c:1233 ++#: rfc2131.c:942 rfc3315.c:1229 + #, fuzzy, c-format + msgid "disabling DHCP static address %s for %s" + msgstr "dezactivÄm adresele DHCP statice %s" + +-#: rfc2131.c:956 ++#: rfc2131.c:963 + msgid "unknown lease" + msgstr "Ã®mprumut necunoscut" + +-#: rfc2131.c:990 ++#: rfc2131.c:997 + #, c-format + msgid "not using configured address %s because it is leased to %s" + msgstr "" + +-#: rfc2131.c:1000 ++#: rfc2131.c:1007 + #, c-format + msgid "not using configured address %s because it is in use by the server or relay" + msgstr "" + +-#: rfc2131.c:1003 ++#: rfc2131.c:1010 + #, c-format + msgid "not using configured address %s because it was previously declined" + msgstr "" + +-#: rfc2131.c:1019 rfc2131.c:1211 ++#: rfc2131.c:1026 rfc2131.c:1213 + msgid "no unique-id" + msgstr "" + +-#: rfc2131.c:1106 ++#: rfc2131.c:1108 + msgid "wrong server-ID" + msgstr "" + +-#: rfc2131.c:1125 ++#: rfc2131.c:1127 + msgid "wrong address" + msgstr "adresÄ greÅitÄ" + +-#: rfc2131.c:1143 rfc3315.c:1006 ++#: rfc2131.c:1145 rfc3315.c:1002 + msgid "lease not found" + msgstr "Ã®mprumutul nu a fost gÄsit" + +-#: rfc2131.c:1176 ++#: rfc2131.c:1178 + msgid "address not available" + msgstr "adresÄ indisponibilÄ" + +-#: rfc2131.c:1187 ++#: rfc2131.c:1189 + msgid "static lease available" + msgstr "Ã®mprumut static este disponibil" + +-#: rfc2131.c:1191 ++#: rfc2131.c:1193 + msgid "address reserved" + msgstr "adresÄ rezervatÄ" + +-#: rfc2131.c:1199 ++#: rfc2131.c:1201 + #, c-format + msgid "abandoning lease to %s of %s" + msgstr "" + +-#: rfc2131.c:1712 ++#: rfc2131.c:1707 + #, c-format + msgid "%u bootfile name: %s" + msgstr "" + +-#: rfc2131.c:1721 ++#: rfc2131.c:1716 + #, fuzzy, c-format + msgid "%u server name: %s" + msgstr "eroare DBus: %s" + +-#: rfc2131.c:1729 ++#: rfc2131.c:1724 + #, fuzzy, c-format + msgid "%u next server: %s" + msgstr "eroare DBus: %s" + +-#: rfc2131.c:1732 ++#: rfc2131.c:1727 + #, c-format + msgid "%u broadcast response" + msgstr "" + +-#: rfc2131.c:1795 ++#: rfc2131.c:1790 + #, fuzzy, c-format + msgid "cannot send DHCP/BOOTP option %d: no space left in packet" + msgstr "nu pot trimite opÅ£iunea DHCP %d: nu mai este loc Ã®n pachet" + +-#: rfc2131.c:2036 ++#: rfc2131.c:2031 + msgid "PXE menu too large" + msgstr "" + +-#: rfc2131.c:2173 rfc3315.c:1506 ++#: rfc2131.c:2170 rfc3315.c:1502 + #, fuzzy, c-format + msgid "%u requested options: %s" + msgstr "compilat cu opÅ£iunile: %s" + +-#: rfc2131.c:2453 ++#: rfc2131.c:2487 + #, c-format + msgid "cannot send RFC3925 option: too many options for enterprise number %d" + msgstr "" +@@ -1809,15 +1823,25 @@ msgstr "nu pot sÄ activez socket-ul netlink: %s" + msgid "netlink returns error: %s" + msgstr "eroare DBus: %s" + +-#: dbus.c:171 ++#: dbus.c:186 + msgid "attempt to set an IPv6 server address via DBus - no IPv6 support" + msgstr "incerc sÄ configurez un server IPv6 prin Dbus - nu este suport IPv6" + +-#: dbus.c:500 ++#: dbus.c:439 ++#, c-format ++msgid "Enabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:444 ++#, c-format ++msgid "Disabling --%s option from D-Bus" ++msgstr "" ++ ++#: dbus.c:691 + msgid "setting upstream servers from DBus" + msgstr "configurÄm serverele superioare prin Dbus" + +-#: dbus.c:547 ++#: dbus.c:738 + msgid "could not register a DBus message handler" + msgstr "nu pot activa o interfaÅ£Ä de mesaje DBus" + +@@ -1937,51 +1961,51 @@ msgstr "nu exista interfaÅ£Ä pentru adresa %s" + msgid "unknown prefix-class %d" + msgstr "Ã®mprumut necunoscut" + +-#: rfc3315.c:803 rfc3315.c:902 ++#: rfc3315.c:803 rfc3315.c:898 + #, fuzzy + msgid "address unavailable" + msgstr "adresÄ indisponibilÄ" + +-#: rfc3315.c:815 rfc3315.c:950 rfc3315.c:1283 ++#: rfc3315.c:815 rfc3315.c:946 rfc3315.c:1279 + msgid "success" + msgstr "" + +-#: rfc3315.c:843 rfc3315.c:845 rfc3315.c:958 rfc3315.c:960 ++#: rfc3315.c:830 rfc3315.c:839 rfc3315.c:954 rfc3315.c:956 + #, fuzzy + msgid "no addresses available" + msgstr "nici o adresÄ disponibilÄ" + +-#: rfc3315.c:937 ++#: rfc3315.c:933 + msgid "not on link" + msgstr "" + +-#: rfc3315.c:1010 rfc3315.c:1195 rfc3315.c:1272 ++#: rfc3315.c:1006 rfc3315.c:1191 rfc3315.c:1268 + msgid "no binding found" + msgstr "" + +-#: rfc3315.c:1048 ++#: rfc3315.c:1044 + msgid "deprecated" + msgstr "" + +-#: rfc3315.c:1053 ++#: rfc3315.c:1049 + #, fuzzy + msgid "address invalid" + msgstr "adresa este folositÄ" + +-#: rfc3315.c:1100 ++#: rfc3315.c:1096 + msgid "confirm failed" + msgstr "" + +-#: rfc3315.c:1116 ++#: rfc3315.c:1112 + #, fuzzy + msgid "all addresses still on link" + msgstr "adresÄ greÅitÄ Ã®n %s, linia %d" + +-#: rfc3315.c:1204 ++#: rfc3315.c:1200 + msgid "release received" + msgstr "" + +-#: rfc3315.c:2130 ++#: rfc3315.c:2126 + msgid "Cannot multicast to DHCPv6 server without correct interface" + msgstr "" + +@@ -2069,12 +2093,12 @@ msgstr "" + msgid "DHCP relay from %s to %s" + msgstr "" + +-#: radv.c:98 ++#: radv.c:109 + #, fuzzy, c-format + msgid "cannot create ICMPv6 socket: %s" + msgstr "nu pot creea socket DHCP: %s" + +-#: auth.c:436 ++#: auth.c:448 + #, c-format + msgid "ignoring zone transfer request from %s" + msgstr "" +@@ -2089,7 +2113,7 @@ msgstr "activarea socket-ului server-ului DHCP a eÅuat: %s" + msgid "failed to create IPset control socket: %s" + msgstr "creearea socket-ului de ascultare a eÅuat: %s" + +-#: dnssec.c:425 dnssec.c:469 ++#: dnssec.c:449 dnssec.c:493 + #, fuzzy, c-format + msgid "failed to update mtime on %s: %s" + msgstr "nu pot citi %s: %s" +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0113-Handle-CNAMEs-to-DS-records-when-confirming-absence-.patch b/src/patches/dnsmasq/0113-Handle-CNAMEs-to-DS-records-when-confirming-absence-.patch new file mode 100644 index 0000000..751e188 --- /dev/null +++ b/src/patches/dnsmasq/0113-Handle-CNAMEs-to-DS-records-when-confirming-absence-.patch @@ -0,0 +1,173 @@ +From e3ec6f0bd7323b043faa9dffa20f0c9151fae1e3 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Fri, 12 Jun 2015 21:39:11 +0100 +Subject: [PATCH 113/113] Handle CNAMEs to DS records when confirming absence + of DS for DNSSEC. + +--- + src/dnssec.c | 40 ++++++++++++++++++++++++++++++++++------ + src/forward.c | 38 ++++++++++++++++++++++++++++++++++---- + 2 files changed, 68 insertions(+), 10 deletions(-) + +diff --git a/src/dnssec.c b/src/dnssec.c +index 93217b05a846..52d14548b8e2 100644 +--- a/src/dnssec.c ++++ b/src/dnssec.c +@@ -1223,8 +1223,11 @@ int dnssec_validate_ds(time_t now, struct dns_header *header, size_t plen, char + val = dnssec_validate_reply(now, header, plen, name, keyname, NULL, &neganswer, &nons); + /* Note dnssec_validate_reply() will have cached positive answers */ + +- if (val == STAT_NO_SIG || val == STAT_INSECURE) ++ if (val == STAT_INSECURE) + val = STAT_BOGUS; ++ ++ if (val == STAT_NO_SIG) ++ return val; + + p = (unsigned char *)(header+1); + extract_name(header, plen, &p, name, 1, 4); +@@ -1875,11 +1878,14 @@ int dnssec_validate_reply(time_t now, struct dns_header *header, size_t plen, ch + + if (neganswer && !have_answer) + *neganswer = 1; +- ++ + /* No data, therefore no sigs */ + if (ntohs(header->ancount) + ntohs(header->nscount) == 0) +- return STAT_NO_SIG; +- ++ { ++ *keyname = 0; ++ return STAT_NO_SIG; ++ } ++ + for (p1 = ans_start, i = 0; i < ntohs(header->ancount) + ntohs(header->nscount); i++) + { + if (!extract_name(header, plen, &p1, name, 1, 10)) +@@ -1948,6 +1954,19 @@ int dnssec_validate_reply(time_t now, struct dns_header *header, size_t plen, ch + { + if (class) + *class = class1; /* Class for DS or DNSKEY */ ++ ++ if (rc == STAT_NO_SIG) ++ { ++ /* If we dropped off the end of a CNAME chain, return ++ STAT_NO_SIG and the last name is keyname. This is used for proving non-existence ++ if DS records in CNAME chains. */ ++ if (cname_count == CNAME_CHAIN || i < ntohs(header->ancount)) ++ /* No CNAME chain, or no sig in answer section, return empty name. */ ++ *keyname = 0; ++ else if (!extract_name(header, plen, &qname, keyname, 1, 0)) ++ return STAT_BOGUS; ++ } ++ + return rc; + } + +@@ -2060,8 +2079,17 @@ int dnssec_validate_reply(time_t now, struct dns_header *header, size_t plen, ch + /* NXDOMAIN or NODATA reply, prove that (name, class1, type1) can't exist */ + /* First marshall the NSEC records, if we've not done it previously */ + if (!nsec_type && !(nsec_type = find_nsec_records(header, plen, &nsecs, &nsec_count, qclass))) +- return STAT_NO_SIG; /* No NSECs, this is probably a dangling CNAME pointing into +- an unsigned zone. Return STAT_NO_SIG to cause this to be proved. */ ++ { ++ /* No NSEC records. If we dropped off the end of a CNAME chain, return ++ STAT_NO_SIG and the last name is keyname. This is used for proving non-existence ++ if DS records in CNAME chains. */ ++ if (cname_count == CNAME_CHAIN) /* No CNAME chain, return empty name. */ ++ *keyname = 0; ++ else if (!extract_name(header, plen, &qname, keyname, 1, 0)) ++ return STAT_BOGUS; ++ return STAT_NO_SIG; /* No NSECs, this is probably a dangling CNAME pointing into ++ an unsigned zone. Return STAT_NO_SIG to cause this to be proved. */ ++ } + + /* Get name of missing answer */ + if (!extract_name(header, plen, &qname, name, 1, 0)) +diff --git a/src/forward.c b/src/forward.c +index 8c3e71cebe87..b40dda37eca2 100644 +--- a/src/forward.c ++++ b/src/forward.c +@@ -851,7 +851,7 @@ void reply_query(int fd, int family, time_t now) + Avoid caching a reply with sigs if there's a vaildated break in the + DS chain, so we don't return replies from cache missing sigs. */ + status = STAT_INSECURE_DS; +- else if (status == STAT_NO_NS) ++ else if (status == STAT_NO_NS || status == STAT_NO_SIG) + status = STAT_BOGUS; + } + else if (forward->flags & FREC_CHECK_NOSIGN) +@@ -997,7 +997,7 @@ void reply_query(int fd, int family, time_t now) + Avoid caching a reply with sigs if there's a vaildated break in the + DS chain, so we don't return replies from cache missing sigs. */ + status = STAT_INSECURE_DS; +- else if (status == STAT_NO_NS) ++ else if (status == STAT_NO_NS || status == STAT_NO_SIG) + status = STAT_BOGUS; + } + else if (forward->flags & FREC_CHECK_NOSIGN) +@@ -1456,6 +1456,21 @@ static int do_check_sign(struct frec *forward, int status, time_t now, char *nam + if (status == STAT_BOGUS) + return STAT_BOGUS; + ++ if (status == STAT_NO_SIG && *keyname != 0) ++ { ++ /* There is a validated CNAME chain that doesn't end in a DS record. Start ++ the search again in that domain. */ ++ blockdata_free(forward->orig_domain); ++ forward->name_start = strlen(keyname); ++ forward->name_len = forward->name_start + 1; ++ if (!(forward->orig_domain = blockdata_alloc(keyname, forward->name_len))) ++ return STAT_BOGUS; ++ ++ strcpy(name, keyname); ++ status = 0; /* force to cache when we iterate. */ ++ continue; ++ } ++ + /* There's a proven DS record, or we're within a zone, where there doesn't need + to be a DS record. Add a name and try again. + If we've already tried the whole name, then fail */ +@@ -1572,6 +1587,21 @@ static int tcp_check_for_unsigned_zone(time_t now, struct dns_header *header, s + return STAT_INSECURE; + } + ++ if (status == STAT_NO_SIG && *keyname != 0) ++ { ++ /* There is a validated CNAME chain that doesn't end in a DS record. Start ++ the search again in that domain. */ ++ blockdata_free(block); ++ name_len = strlen(keyname) + 1; ++ name_start = name + name_len - 1; ++ ++ if (!(block = blockdata_alloc(keyname, name_len))) ++ return STAT_BOGUS; ++ ++ strcpy(name, keyname); ++ continue; ++ } ++ + if (status == STAT_BOGUS) + { + free(packet); +@@ -1627,7 +1657,7 @@ static int tcp_key_recurse(time_t now, int status, struct dns_header *header, si + { + if (new_status == STAT_NO_DS) + new_status = STAT_INSECURE_DS; +- else if (new_status == STAT_NO_NS) ++ else if (new_status == STAT_NO_NS || new_status == STAT_NO_SIG) + new_status = STAT_BOGUS; + } + } +@@ -1692,7 +1722,7 @@ static int tcp_key_recurse(time_t now, int status, struct dns_header *header, si + { + if (new_status == STAT_NO_DS) + new_status = STAT_INSECURE_DS; +- else if (new_status == STAT_NO_NS) ++ else if (new_status == STAT_NO_NS || new_status == STAT_NO_SIG) + new_status = STAT_BOGUS; /* Validated no DS */ + } + } +-- +2.1.0 + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c0ba8eb2009100ed731b369de35f04729acac9e1
by git＠ipfire.org 17 Jun '15

17 Jun '15

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 c0ba8eb2009100ed731b369de35f04729acac9e1 (commit) via 0967d2ba02339adb85b54130c1cd3c6fb95fd53f (commit) via 37672a3d53aae800f6905472d27823a6a2a48d85 (commit) via 60c16cfdcfe017f0390ff60b7cbc1c08f6012487 (commit) via 96396af0437be1147fc59a23b22ea68c07c05e3b (commit) via 905a9dc346e08aab4ded6c92e9b0a04bcaf0f394 (commit) from dc0e82e56342e8bb6609e5f3aa8eedbf79119793 (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 c0ba8eb2009100ed731b369de35f04729acac9e1 Merge: 0967d2b dc0e82e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 17 20:40:14 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 0967d2ba02339adb85b54130c1cd3c6fb95fd53f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 16 18:03:54 2015 +0200 git: Depend on perl modules required for 'send-email' Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 37672a3d53aae800f6905472d27823a6a2a48d85 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 16 18:03:53 2015 +0200 perl-Authen-SASL: New package Required to do authentication in "git send-email". Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 60c16cfdcfe017f0390ff60b7cbc1c08f6012487 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 16 18:03:52 2015 +0200 perl-MIME-Base64: New package Required for "git send-email". Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 96396af0437be1147fc59a23b22ea68c07c05e3b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 16 18:03:51 2015 +0200 perl-Net-SMTP-SSL: New package This is needed for "git send-email" in order to send emails using TLS. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 905a9dc346e08aab4ded6c92e9b0a04bcaf0f394 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 16 17:08:49 2015 +0200 maniac theme: Remove unnecessary Thumbs.db file Reported-by: Lars Schuhmacher <larsen007(a)web.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/web-user-interface | 1 - config/rootfiles/packages/perl-Authen-SASL | 28 +++++++++++++++++++++ config/rootfiles/packages/perl-MIME-Base64 | 7 ++++++ .../HTML-Tagset => packages/perl-Net-SMTP-SSL} | 12 ++++----- html/html/themes/maniac/images/Thumbs.db | Bin 13312 -> 0 bytes lfs/git | 4 +-- lfs/{perl-Carp-Clan => perl-Authen-SASL} | 14 +++++------ lfs/{perl-Carp-Clan => perl-MIME-Base64} | 14 +++++------ lfs/{perl-Carp-Clan => perl-Net-SMTP-SSL} | 14 +++++------ make.sh | 3 +++ 10 files changed, 67 insertions(+), 30 deletions(-) create mode 100644 config/rootfiles/packages/perl-Authen-SASL create mode 100644 config/rootfiles/packages/perl-MIME-Base64 copy config/rootfiles/{common/HTML-Tagset => packages/perl-Net-SMTP-SSL} (53%) delete mode 100644 html/html/themes/maniac/images/Thumbs.db copy lfs/{perl-Carp-Clan => perl-Authen-SASL} (93%) copy lfs/{perl-Carp-Clan => perl-MIME-Base64} (93%) copy lfs/{perl-Carp-Clan => perl-Net-SMTP-SSL} (93%) Difference in files: diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index 3f22b72..dc22367 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -341,7 +341,6 @@ srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js srv/web/ipfire/html/themes/maniac srv/web/ipfire/html/themes/maniac/images srv/web/ipfire/html/themes/maniac/images/IPFire.png -srv/web/ipfire/html/themes/maniac/images/Thumbs.db srv/web/ipfire/html/themes/maniac/images/b1.gif srv/web/ipfire/html/themes/maniac/images/b2.gif srv/web/ipfire/html/themes/maniac/images/b3.gif diff --git a/config/rootfiles/packages/perl-Authen-SASL b/config/rootfiles/packages/perl-Authen-SASL new file mode 100644 index 0000000..a44b726 --- /dev/null +++ b/config/rootfiles/packages/perl-Authen-SASL @@ -0,0 +1,28 @@ +#usr/lib/perl5/site_perl/5.12.3/Authen +#usr/lib/perl5/site_perl/5.12.3/Authen/SASL +usr/lib/perl5/site_perl/5.12.3/Authen/SASL.pm +#usr/lib/perl5/site_perl/5.12.3/Authen/SASL.pod +usr/lib/perl5/site_perl/5.12.3/Authen/SASL/CRAM_MD5.pm +usr/lib/perl5/site_perl/5.12.3/Authen/SASL/EXTERNAL.pm +#usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl +usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl.pm +#usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl.pod +usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/ANONYMOUS.pm +usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/CRAM_MD5.pm +usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/DIGEST_MD5.pm +usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/EXTERNAL.pm +usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/GSSAPI.pm +usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/LOGIN.pm +usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/PLAIN.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Authen +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Authen/SASL +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Authen/SASL/.packlist +#usr/share/man/man3/Authen::SASL.3 +#usr/share/man/man3/Authen::SASL::Perl.3 +#usr/share/man/man3/Authen::SASL::Perl::ANONYMOUS.3 +#usr/share/man/man3/Authen::SASL::Perl::CRAM_MD5.3 +#usr/share/man/man3/Authen::SASL::Perl::DIGEST_MD5.3 +#usr/share/man/man3/Authen::SASL::Perl::EXTERNAL.3 +#usr/share/man/man3/Authen::SASL::Perl::GSSAPI.3 +#usr/share/man/man3/Authen::SASL::Perl::LOGIN.3 +#usr/share/man/man3/Authen::SASL::Perl::PLAIN.3 diff --git a/config/rootfiles/packages/perl-MIME-Base64 b/config/rootfiles/packages/perl-MIME-Base64 new file mode 100644 index 0000000..59ca61f --- /dev/null +++ b/config/rootfiles/packages/perl-MIME-Base64 @@ -0,0 +1,7 @@ +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/MIME +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/MIME/Base64.pm +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/MIME/QuotedPrint.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/MIME/Base64 +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/MIME/Base64/.packlist +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/MIME/Base64/Base64.bs +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/MIME/Base64/Base64.so diff --git a/config/rootfiles/packages/perl-Net-SMTP-SSL b/config/rootfiles/packages/perl-Net-SMTP-SSL new file mode 100644 index 0000000..c39425e --- /dev/null +++ b/config/rootfiles/packages/perl-Net-SMTP-SSL @@ -0,0 +1,6 @@ +#usr/lib/perl5/site_perl/5.12.3/Net/SMTP +usr/lib/perl5/site_perl/5.12.3/Net/SMTP/SSL.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Net/SMTP +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Net/SMTP/SSL +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Net/SMTP/SSL/.packlist +#usr/share/man/man3/Net::SMTP::SSL.3 diff --git a/html/html/themes/maniac/images/Thumbs.db b/html/html/themes/maniac/images/Thumbs.db deleted file mode 100644 index 37ec790..0000000 Binary files a/html/html/themes/maniac/images/Thumbs.db and /dev/null differ diff --git a/lfs/git b/lfs/git index 23838e4..51936ab 100644 --- a/lfs/git +++ b/lfs/git @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 10 +PAK_VER = 11 -DEPS = "" +DEPS = "perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL" ############################################################################### # Top-level Rules diff --git a/lfs/perl-Authen-SASL b/lfs/perl-Authen-SASL new file mode 100644 index 0000000..4052c44 --- /dev/null +++ b/lfs/perl-Authen-SASL @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2015 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 = 2.16 + +THISAPP = Authen-SASL-$(VER) +DL_FILE = ${THISAPP}.tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = perl-Authen-SASL +DEPS = "" +PAK_VER = 1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 7c03a689d4c689e5a9e2f18a1c586b2f + +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 zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/perl-MIME-Base64 b/lfs/perl-MIME-Base64 new file mode 100644 index 0000000..f406ae9 --- /dev/null +++ b/lfs/perl-MIME-Base64 @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2015 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.15 + +THISAPP = MIME-Base64-$(VER) +DL_FILE = ${THISAPP}.tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = perl-MIME-Base64 +DEPS = "" +PAK_VER = 1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = ef958dc2bf96be5f759391c6ac1debd4 + +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 zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/perl-Net-SMTP-SSL b/lfs/perl-Net-SMTP-SSL new file mode 100644 index 0000000..2e2ec57 --- /dev/null +++ b/lfs/perl-Net-SMTP-SSL @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2015 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 = 1.02 + +THISAPP = Net-SMTP-SSL-$(VER) +DL_FILE = ${THISAPP}.tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = perl-Net-SMTP-SSL +DEPS = "" +PAK_VER = 1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = e67b4d842a51b9a453aeeaeed45fb8e1 + +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 zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index bcbeffb..db16c55 100755 --- a/make.sh +++ b/make.sh @@ -702,6 +702,9 @@ buildipfire() { ipfiremake mpd ipfiremake libmpdclient ipfiremake mpc + ipfiremake perl-Net-SMTP-SSL + ipfiremake perl-MIME-Base64 + ipfiremake perl-Authen-SASL ipfiremake git ipfiremake squidclamav ipfiremake vnstat hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dc0e82e56342e8bb6609e5f3aa8eedbf79119793
by git＠ipfire.org 17 Jun '15

17 Jun '15

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 dc0e82e56342e8bb6609e5f3aa8eedbf79119793 (commit) via cef2c534b8ac70be6211c942f291d4dde93eef1d (commit) from e353470a8c8d64543960bdf4d20eb86725c939d5 (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 dc0e82e56342e8bb6609e5f3aa8eedbf79119793 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 17 14:50:40 2015 +0200 Move older core updates to archive Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cef2c534b8ac70be6211c942f291d4dde93eef1d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 17 14:48:57 2015 +0200 Start Core Update 92 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{91 => 92}/exclude | 0 config/rootfiles/core/92/filelists/files | 9 +++++++++ config/rootfiles/core/{91 => 92}/meta | 0 config/rootfiles/core/{91 => 92}/update.sh | 8 ++------ config/rootfiles/{core/89 => oldcore/88}/exclude | 0 config/rootfiles/{core => oldcore}/88/filelists/files | 0 config/rootfiles/{core/90 => oldcore/88}/filelists/fireinfo | 0 config/rootfiles/{core/91 => oldcore/88}/filelists/openssh | 0 config/rootfiles/{core/91 => oldcore/88}/filelists/openssl | 0 .../rootfiles/{core/89 => oldcore/88}/filelists/openssl-compat | 0 config/rootfiles/{core/90 => oldcore/88}/meta | 0 config/rootfiles/{core => oldcore}/88/update.sh | 0 config/rootfiles/{core/88 => oldcore/89}/exclude | 0 config/rootfiles/{core => oldcore}/89/filelists/collectd | 0 config/rootfiles/{core => oldcore}/89/filelists/daq | 0 config/rootfiles/{core/90 => oldcore/89}/filelists/ddns | 0 config/rootfiles/{core/90 => oldcore/89}/filelists/dnsmasq | 0 config/rootfiles/{core => oldcore}/89/filelists/ethtool | 0 config/rootfiles/{core => oldcore}/89/filelists/fcron | 0 config/rootfiles/{core => oldcore}/89/filelists/file | 0 config/rootfiles/{core => oldcore}/89/filelists/files | 0 config/rootfiles/{core => oldcore}/89/filelists/fuse | 0 config/rootfiles/{core => oldcore}/89/filelists/gnupg | 0 config/rootfiles/{core => oldcore}/89/filelists/grep | 0 config/rootfiles/{core => oldcore}/89/filelists/hdparm | 0 config/rootfiles/{core => oldcore}/89/filelists/libart | 0 config/rootfiles/{core => oldcore}/89/filelists/libcap | 0 config/rootfiles/{core => oldcore}/89/filelists/libffi | 0 config/rootfiles/{core => oldcore}/89/filelists/libpcap | 0 config/rootfiles/{core => oldcore}/89/filelists/ntfs-3g | 0 config/rootfiles/{core => oldcore}/89/filelists/openssh | 0 config/rootfiles/{core/90 => oldcore/89}/filelists/openssl | 0 .../rootfiles/{core/88 => oldcore/89}/filelists/openssl-compat | 0 config/rootfiles/{core/91 => oldcore/89}/filelists/pcre | 0 config/rootfiles/{core => oldcore}/89/filelists/screen | 0 config/rootfiles/{core => oldcore}/89/filelists/setup | 0 config/rootfiles/{core => oldcore}/89/filelists/smartmontools | 0 config/rootfiles/{core => oldcore}/89/filelists/snort | 0 config/rootfiles/{core => oldcore}/89/filelists/sqlite | 0 config/rootfiles/{core/90 => oldcore/89}/filelists/squid | 0 config/rootfiles/{core/91 => oldcore/89}/filelists/strongswan | 0 config/rootfiles/{core => oldcore}/89/filelists/tar | 0 config/rootfiles/{core/90 => oldcore/89}/filelists/tzdata | 0 config/rootfiles/{core => oldcore}/89/filelists/wget | 0 config/rootfiles/{core => oldcore}/89/filelists/zlib | 0 config/rootfiles/{core => oldcore}/89/meta | 0 config/rootfiles/{core => oldcore}/89/update.sh | 0 config/rootfiles/{core => oldcore}/90/exclude | 0 config/rootfiles/{core => oldcore}/90/filelists/Locale-Country | 0 config/rootfiles/{core => oldcore}/90/filelists/apache2 | 0 config/rootfiles/{core => oldcore}/90/filelists/armv5tel/glibc | 0 .../{core => oldcore}/90/filelists/armv5tel/linux-kirkwood | 0 .../{core => oldcore}/90/filelists/armv5tel/linux-multi | 0 .../rootfiles/{core => oldcore}/90/filelists/armv5tel/linux-rpi | 0 config/rootfiles/{core => oldcore}/90/filelists/curl | 0 config/rootfiles/{core => oldcore}/90/filelists/cyrus-sasl | 0 config/rootfiles/{core/89 => oldcore/90}/filelists/ddns | 0 config/rootfiles/{core => oldcore}/90/filelists/dhcp | 0 config/rootfiles/{core => oldcore}/90/filelists/dhcpcd | 0 config/rootfiles/{core/89 => oldcore/90}/filelists/dnsmasq | 0 config/rootfiles/{core => oldcore}/90/filelists/dracut | 0 config/rootfiles/{core => oldcore}/90/filelists/expat | 0 config/rootfiles/{core => oldcore}/90/filelists/files | 0 config/rootfiles/{core/88 => oldcore/90}/filelists/fireinfo | 0 config/rootfiles/{core => oldcore}/90/filelists/flag-icons | 0 config/rootfiles/{core => oldcore}/90/filelists/groff | 0 config/rootfiles/{core => oldcore}/90/filelists/i586/acpid | 0 config/rootfiles/{core => oldcore}/90/filelists/i586/glibc | 0 config/rootfiles/{core => oldcore}/90/filelists/i586/linux | 0 .../rootfiles/{core => oldcore}/90/filelists/i586/linux-initrd | 0 .../{core/91 => oldcore/90}/filelists/i586/openssl-sse2 | 0 config/rootfiles/{core => oldcore}/90/filelists/iptables | 0 config/rootfiles/{core => oldcore}/90/filelists/iputils | 0 config/rootfiles/{core => oldcore}/90/filelists/libjpeg | 0 config/rootfiles/{core => oldcore}/90/filelists/logrotate | 0 config/rootfiles/{core => oldcore}/90/filelists/logwatch | 0 config/rootfiles/{core => oldcore}/90/filelists/openldap | 0 config/rootfiles/{core/89 => oldcore/90}/filelists/openssl | 0 .../rootfiles/{core => oldcore}/90/filelists/openssl-0.9.8-files | 0 config/rootfiles/{core => oldcore}/90/filelists/perl-Text-CSV_XS | 0 config/rootfiles/{core/89 => oldcore/90}/filelists/squid | 0 config/rootfiles/{core => oldcore}/90/filelists/strongswan | 0 config/rootfiles/{core/89 => oldcore/90}/filelists/tzdata | 0 config/rootfiles/{core => oldcore}/90/filelists/udev | 0 config/rootfiles/{core => oldcore}/90/filelists/wpa_supplicant | 0 config/rootfiles/{core => oldcore}/90/filelists/xtables-addons | 0 config/rootfiles/{core => oldcore}/90/filelists/xz | 0 config/rootfiles/{core/88 => oldcore/90}/meta | 0 config/rootfiles/{core => oldcore}/90/update.sh | 0 config/rootfiles/oldcore/{85 => 91}/exclude | 0 config/rootfiles/{core => oldcore}/91/filelists/files | 0 .../{core/90 => oldcore/91}/filelists/i586/openssl-sse2 | 0 .../{core => oldcore}/91/filelists/i586/strongswan-padlock | 0 config/rootfiles/{core => oldcore}/91/filelists/libnet | 0 config/rootfiles/{core => oldcore}/91/filelists/libtool | 0 config/rootfiles/{core => oldcore}/91/filelists/libxml2 | 0 config/rootfiles/{core => oldcore}/91/filelists/libxslt | 0 config/rootfiles/{core => oldcore}/91/filelists/newt | 0 config/rootfiles/{core/88 => oldcore/91}/filelists/openssh | 0 config/rootfiles/{core/88 => oldcore/91}/filelists/openssl | 0 config/rootfiles/{core/89 => oldcore/91}/filelists/pcre | 0 config/rootfiles/{core => oldcore}/91/filelists/slang | 0 config/rootfiles/{core/89 => oldcore/91}/filelists/strongswan | 0 config/rootfiles/oldcore/{87 => 91}/meta | 0 config/rootfiles/{core => oldcore}/91/update.sh | 0 make.sh | 2 +- 106 files changed, 12 insertions(+), 7 deletions(-) rename config/rootfiles/core/{91 => 92}/exclude (100%) create mode 100644 config/rootfiles/core/92/filelists/files rename config/rootfiles/core/{91 => 92}/meta (100%) copy config/rootfiles/core/{91 => 92}/update.sh (92%) rename config/rootfiles/{core/89 => oldcore/88}/exclude (100%) rename config/rootfiles/{core => oldcore}/88/filelists/files (100%) rename config/rootfiles/{core/90 => oldcore/88}/filelists/fireinfo (100%) rename config/rootfiles/{core/91 => oldcore/88}/filelists/openssh (100%) rename config/rootfiles/{core/91 => oldcore/88}/filelists/openssl (100%) rename config/rootfiles/{core/89 => oldcore/88}/filelists/openssl-compat (100%) rename config/rootfiles/{core/90 => oldcore/88}/meta (100%) rename config/rootfiles/{core => oldcore}/88/update.sh (100%) rename config/rootfiles/{core/88 => oldcore/89}/exclude (100%) rename config/rootfiles/{core => oldcore}/89/filelists/collectd (100%) rename config/rootfiles/{core => oldcore}/89/filelists/daq (100%) rename config/rootfiles/{core/90 => oldcore/89}/filelists/ddns (100%) rename config/rootfiles/{core/90 => oldcore/89}/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/89/filelists/ethtool (100%) rename config/rootfiles/{core => oldcore}/89/filelists/fcron (100%) rename config/rootfiles/{core => oldcore}/89/filelists/file (100%) rename config/rootfiles/{core => oldcore}/89/filelists/files (100%) rename config/rootfiles/{core => oldcore}/89/filelists/fuse (100%) rename config/rootfiles/{core => oldcore}/89/filelists/gnupg (100%) rename config/rootfiles/{core => oldcore}/89/filelists/grep (100%) rename config/rootfiles/{core => oldcore}/89/filelists/hdparm (100%) rename config/rootfiles/{core => oldcore}/89/filelists/libart (100%) rename config/rootfiles/{core => oldcore}/89/filelists/libcap (100%) rename config/rootfiles/{core => oldcore}/89/filelists/libffi (100%) rename config/rootfiles/{core => oldcore}/89/filelists/libpcap (100%) rename config/rootfiles/{core => oldcore}/89/filelists/ntfs-3g (100%) rename config/rootfiles/{core => oldcore}/89/filelists/openssh (100%) rename config/rootfiles/{core/90 => oldcore/89}/filelists/openssl (100%) rename config/rootfiles/{core/88 => oldcore/89}/filelists/openssl-compat (100%) rename config/rootfiles/{core/91 => oldcore/89}/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/89/filelists/screen (100%) rename config/rootfiles/{core => oldcore}/89/filelists/setup (100%) rename config/rootfiles/{core => oldcore}/89/filelists/smartmontools (100%) rename config/rootfiles/{core => oldcore}/89/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/89/filelists/sqlite (100%) rename config/rootfiles/{core/90 => oldcore/89}/filelists/squid (100%) rename config/rootfiles/{core/91 => oldcore/89}/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/89/filelists/tar (100%) rename config/rootfiles/{core/90 => oldcore/89}/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/89/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/89/filelists/zlib (100%) rename config/rootfiles/{core => oldcore}/89/meta (100%) rename config/rootfiles/{core => oldcore}/89/update.sh (100%) rename config/rootfiles/{core => oldcore}/90/exclude (100%) rename config/rootfiles/{core => oldcore}/90/filelists/Locale-Country (100%) rename config/rootfiles/{core => oldcore}/90/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/90/filelists/armv5tel/glibc (100%) rename config/rootfiles/{core => oldcore}/90/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/90/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/90/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/{core => oldcore}/90/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/90/filelists/cyrus-sasl (100%) rename config/rootfiles/{core/89 => oldcore/90}/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/90/filelists/dhcp (100%) rename config/rootfiles/{core => oldcore}/90/filelists/dhcpcd (100%) rename config/rootfiles/{core/89 => oldcore/90}/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/90/filelists/dracut (100%) rename config/rootfiles/{core => oldcore}/90/filelists/expat (100%) rename config/rootfiles/{core => oldcore}/90/filelists/files (100%) rename config/rootfiles/{core/88 => oldcore/90}/filelists/fireinfo (100%) rename config/rootfiles/{core => oldcore}/90/filelists/flag-icons (100%) rename config/rootfiles/{core => oldcore}/90/filelists/groff (100%) rename config/rootfiles/{core => oldcore}/90/filelists/i586/acpid (100%) rename config/rootfiles/{core => oldcore}/90/filelists/i586/glibc (100%) rename config/rootfiles/{core => oldcore}/90/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/90/filelists/i586/linux-initrd (100%) rename config/rootfiles/{core/91 => oldcore/90}/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/90/filelists/iptables (100%) rename config/rootfiles/{core => oldcore}/90/filelists/iputils (100%) rename config/rootfiles/{core => oldcore}/90/filelists/libjpeg (100%) rename config/rootfiles/{core => oldcore}/90/filelists/logrotate (100%) rename config/rootfiles/{core => oldcore}/90/filelists/logwatch (100%) rename config/rootfiles/{core => oldcore}/90/filelists/openldap (100%) rename config/rootfiles/{core/89 => oldcore/90}/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/90/filelists/openssl-0.9.8-files (100%) rename config/rootfiles/{core => oldcore}/90/filelists/perl-Text-CSV_XS (100%) rename config/rootfiles/{core/89 => oldcore/90}/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/90/filelists/strongswan (100%) rename config/rootfiles/{core/89 => oldcore/90}/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/90/filelists/udev (100%) rename config/rootfiles/{core => oldcore}/90/filelists/wpa_supplicant (100%) rename config/rootfiles/{core => oldcore}/90/filelists/xtables-addons (100%) rename config/rootfiles/{core => oldcore}/90/filelists/xz (100%) rename config/rootfiles/{core/88 => oldcore/90}/meta (100%) rename config/rootfiles/{core => oldcore}/90/update.sh (100%) copy config/rootfiles/oldcore/{85 => 91}/exclude (100%) rename config/rootfiles/{core => oldcore}/91/filelists/files (100%) rename config/rootfiles/{core/90 => oldcore/91}/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/91/filelists/i586/strongswan-padlock (100%) rename config/rootfiles/{core => oldcore}/91/filelists/libnet (100%) rename config/rootfiles/{core => oldcore}/91/filelists/libtool (100%) rename config/rootfiles/{core => oldcore}/91/filelists/libxml2 (100%) rename config/rootfiles/{core => oldcore}/91/filelists/libxslt (100%) rename config/rootfiles/{core => oldcore}/91/filelists/newt (100%) rename config/rootfiles/{core/88 => oldcore/91}/filelists/openssh (100%) rename config/rootfiles/{core/88 => oldcore/91}/filelists/openssl (100%) rename config/rootfiles/{core/89 => oldcore/91}/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/91/filelists/slang (100%) rename config/rootfiles/{core/89 => oldcore/91}/filelists/strongswan (100%) copy config/rootfiles/oldcore/{87 => 91}/meta (100%) rename config/rootfiles/{core => oldcore}/91/update.sh (100%) Difference in files: diff --git a/config/rootfiles/core/88/exclude b/config/rootfiles/core/88/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/88/exclude +++ /dev/null @@ -1,20 +0,0 @@ -boot/config.txt -etc/collectd.custom -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/ovpn -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/88/filelists/files b/config/rootfiles/core/88/filelists/files deleted file mode 100644 index 409e5fe..0000000 --- a/config/rootfiles/core/88/filelists/files +++ /dev/null @@ -1,2 +0,0 @@ -etc/system-release -etc/issue diff --git a/config/rootfiles/core/88/filelists/fireinfo b/config/rootfiles/core/88/filelists/fireinfo deleted file mode 120000 index c461155..0000000 --- a/config/rootfiles/core/88/filelists/fireinfo +++ /dev/null @@ -1 +0,0 @@ -../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/openssh b/config/rootfiles/core/88/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/88/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/openssl b/config/rootfiles/core/88/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/88/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/openssl-compat b/config/rootfiles/core/88/filelists/openssl-compat deleted file mode 120000 index c9fa421..0000000 --- a/config/rootfiles/core/88/filelists/openssl-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/core/88/meta b/config/rootfiles/core/88/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/88/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/88/update.sh b/config/rootfiles/core/88/update.sh deleted file mode 100644 index 6ef1f48..0000000 --- a/config/rootfiles/core/88/update.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -# Remove old core updates from pakfire cache to save space... -core=88 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# Stop services - -# Remove old files - -# Extract files -extract_files - -# Start services - -# Update Language cache -#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - - -sync - -# This update need a reboot... -#touch /var/run/need_reboot - -# Finish -/etc/init.d/fireinfo start -sendprofile - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/89/exclude b/config/rootfiles/core/89/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/89/exclude +++ /dev/null @@ -1,20 +0,0 @@ -boot/config.txt -etc/collectd.custom -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/ovpn -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/89/filelists/collectd b/config/rootfiles/core/89/filelists/collectd deleted file mode 120000 index 871b32f..0000000 --- a/config/rootfiles/core/89/filelists/collectd +++ /dev/null @@ -1 +0,0 @@ -../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/daq b/config/rootfiles/core/89/filelists/daq deleted file mode 120000 index d0e0956..0000000 --- a/config/rootfiles/core/89/filelists/daq +++ /dev/null @@ -1 +0,0 @@ -../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/ddns b/config/rootfiles/core/89/filelists/ddns deleted file mode 120000 index 7395164..0000000 --- a/config/rootfiles/core/89/filelists/ddns +++ /dev/null @@ -1 +0,0 @@ -../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/dnsmasq b/config/rootfiles/core/89/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/89/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/ethtool b/config/rootfiles/core/89/filelists/ethtool deleted file mode 120000 index 494a53e..0000000 --- a/config/rootfiles/core/89/filelists/ethtool +++ /dev/null @@ -1 +0,0 @@ -../../../common/ethtool \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/fcron b/config/rootfiles/core/89/filelists/fcron deleted file mode 120000 index 4a454ea..0000000 --- a/config/rootfiles/core/89/filelists/fcron +++ /dev/null @@ -1 +0,0 @@ -../../../common/fcron \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/file b/config/rootfiles/core/89/filelists/file deleted file mode 120000 index 0c60e43..0000000 --- a/config/rootfiles/core/89/filelists/file +++ /dev/null @@ -1 +0,0 @@ -../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/files b/config/rootfiles/core/89/filelists/files deleted file mode 100644 index 70c5f3d..0000000 --- a/config/rootfiles/core/89/filelists/files +++ /dev/null @@ -1,22 +0,0 @@ -etc/system-release -etc/issue -etc/collectd.conf -etc/collectd.vpn -etc/rc.d/init.d/dnsmasq -srv/web/ipfire/cgi-bin/ddns.cgi -srv/web/ipfire/cgi-bin/firewall.cgi -srv/web/ipfire/cgi-bin/fwhosts.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/netovpnrw.cgi -srv/web/ipfire/cgi-bin/netovpnsrv.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -usr/local/bin/collectdctrl -usr/local/bin/openvpnctrl -usr/sbin/ovpn-collectd-convert -usr/sbin/setup -var/ipfire/backup/bin/backup.pl -var/ipfire/graphs.pl -var/ipfire/langs -var/ipfire/lang.pl -var/ipfire/menu.d/20-status.menu diff --git a/config/rootfiles/core/89/filelists/fuse b/config/rootfiles/core/89/filelists/fuse deleted file mode 120000 index 570edaa..0000000 --- a/config/rootfiles/core/89/filelists/fuse +++ /dev/null @@ -1 +0,0 @@ -../../../common/fuse \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/gnupg b/config/rootfiles/core/89/filelists/gnupg deleted file mode 120000 index a1a1564..0000000 --- a/config/rootfiles/core/89/filelists/gnupg +++ /dev/null @@ -1 +0,0 @@ -../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/grep b/config/rootfiles/core/89/filelists/grep deleted file mode 120000 index ab5ef8b..0000000 --- a/config/rootfiles/core/89/filelists/grep +++ /dev/null @@ -1 +0,0 @@ -../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/hdparm b/config/rootfiles/core/89/filelists/hdparm deleted file mode 120000 index b644751..0000000 --- a/config/rootfiles/core/89/filelists/hdparm +++ /dev/null @@ -1 +0,0 @@ -../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libart b/config/rootfiles/core/89/filelists/libart deleted file mode 120000 index bb1e078..0000000 --- a/config/rootfiles/core/89/filelists/libart +++ /dev/null @@ -1 +0,0 @@ -../../../common/libart \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libcap b/config/rootfiles/core/89/filelists/libcap deleted file mode 120000 index ed67d95..0000000 --- a/config/rootfiles/core/89/filelists/libcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libffi b/config/rootfiles/core/89/filelists/libffi deleted file mode 120000 index c391acd..0000000 --- a/config/rootfiles/core/89/filelists/libffi +++ /dev/null @@ -1 +0,0 @@ -../../../common/libffi \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libpcap b/config/rootfiles/core/89/filelists/libpcap deleted file mode 120000 index c7f9f52..0000000 --- a/config/rootfiles/core/89/filelists/libpcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/ntfs-3g b/config/rootfiles/core/89/filelists/ntfs-3g deleted file mode 120000 index d93adc2..0000000 --- a/config/rootfiles/core/89/filelists/ntfs-3g +++ /dev/null @@ -1 +0,0 @@ -../../../common/ntfs-3g \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/openssh b/config/rootfiles/core/89/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/89/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/openssl b/config/rootfiles/core/89/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/89/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/openssl-compat b/config/rootfiles/core/89/filelists/openssl-compat deleted file mode 120000 index c9fa421..0000000 --- a/config/rootfiles/core/89/filelists/openssl-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/pcre b/config/rootfiles/core/89/filelists/pcre deleted file mode 120000 index b390d9a..0000000 --- a/config/rootfiles/core/89/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/screen b/config/rootfiles/core/89/filelists/screen deleted file mode 120000 index 81008f4..0000000 --- a/config/rootfiles/core/89/filelists/screen +++ /dev/null @@ -1 +0,0 @@ -../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/setup b/config/rootfiles/core/89/filelists/setup deleted file mode 120000 index 209374b..0000000 --- a/config/rootfiles/core/89/filelists/setup +++ /dev/null @@ -1 +0,0 @@ -../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/smartmontools b/config/rootfiles/core/89/filelists/smartmontools deleted file mode 120000 index fb66daf..0000000 --- a/config/rootfiles/core/89/filelists/smartmontools +++ /dev/null @@ -1 +0,0 @@ -../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/snort b/config/rootfiles/core/89/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/89/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/sqlite b/config/rootfiles/core/89/filelists/sqlite deleted file mode 120000 index 4ea5697..0000000 --- a/config/rootfiles/core/89/filelists/sqlite +++ /dev/null @@ -1 +0,0 @@ -../../../common/sqlite \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/squid b/config/rootfiles/core/89/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/89/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/strongswan b/config/rootfiles/core/89/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/89/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/tar b/config/rootfiles/core/89/filelists/tar deleted file mode 120000 index 3e585d2..0000000 --- a/config/rootfiles/core/89/filelists/tar +++ /dev/null @@ -1 +0,0 @@ -../../../common/tar \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/tzdata b/config/rootfiles/core/89/filelists/tzdata deleted file mode 120000 index 5a6e325..0000000 --- a/config/rootfiles/core/89/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/wget b/config/rootfiles/core/89/filelists/wget deleted file mode 120000 index fcb57df..0000000 --- a/config/rootfiles/core/89/filelists/wget +++ /dev/null @@ -1 +0,0 @@ -../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/zlib b/config/rootfiles/core/89/filelists/zlib deleted file mode 120000 index e345663..0000000 --- a/config/rootfiles/core/89/filelists/zlib +++ /dev/null @@ -1 +0,0 @@ -../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/core/89/meta b/config/rootfiles/core/89/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/89/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh deleted file mode 100644 index 13c645a..0000000 --- a/config/rootfiles/core/89/update.sh +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -# Remove old core updates from pakfire cache to save space... -core=89 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# Stop services -/etc/init.d/ipsec stop - -# Remove old files -rm -f /usr/local/sbin/setup - -# Extract files -extract_files - -# Update /etc/sysconfig/createfiles -cat <<EOF >> /etc/sysconfig/createfiles -/var/run/ovpnserver.log file 644 nobody nobody -/var/run/openvpn dir 644 nobody nobody -EOF - -# Update /etc/collectd.conf -if ! grep -q "collectd.vpn" /etc/collectd.conf; then - echo "include \"/etc/collectd.vpn\"" >> /etc/collectd.conf -fi - -# Generate ddns configuration file -sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi - -# Start services -/etc/init.d/dnsmasq restart -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -# Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Prevent uninstall sqlite (now common package). -rm -f \ - /opt/pakfire/db/*/meta-sqlite \ - /opt/pakfire/db/rootfiles/sqlite - -mkdir -p /var/run/openvpn -touch /var/run/ovpnserver.log -chown nobody.nobody \ - /var/run/openvpn \ - /var/run/ovpnserver.log - -# Update OpenVPN/collectd configuration -for i in /var/ipfire/ovpn/n2nconf/*/*.conf; do - name="${i##*/}" - name="${name%*.conf}" - - if ! grep -qE "^status-version" ${i}; then - echo "# Logfile" >> ${i} - echo "status-version 1" >> ${i} - fi - - if ! grep -qE "^status " ${i}; then - echo "status /var/run/openvpn/${name}-n2n 10" >> ${i} - fi -done - -/usr/sbin/ovpn-collectd-convert -chown nobody.nobody /var/ipfire/ovpn/collectd.vpn - -# Fix permissions -chown nobody.nobody /var/ipfire/dns - -# Fix #10625 -mkdir -p /etc/logrotate.d - -sync - -# This update need a reboot... -#touch /var/run/need_reboot - -# Finish -/etc/init.d/fireinfo start -sendprofile - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/90/exclude b/config/rootfiles/core/90/exclude deleted file mode 100644 index 73b7b73..0000000 --- a/config/rootfiles/core/90/exclude +++ /dev/null @@ -1,27 +0,0 @@ -boot/config.txt -etc/collectd.custom -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/rc.d/rcsysinit.d/S19checkfstab -etc/rc.d/rcsysinit.d/S70console -etc/shadow -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/modules -etc/sysconfig/rc.local -srv/web/ipfire/html/proxy.pac -var/ipfire/firewall/geoipblock -var/ipfire/fwhosts/custmgeoipgrp -var/ipfire/ovpn/ccd.conf -var/ipfire/ovpn/ccdroute -var/ipfire/ovpn/ccdroute2 -var/ipfire/time -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/90/filelists/Locale-Country b/config/rootfiles/core/90/filelists/Locale-Country deleted file mode 120000 index 025c278..0000000 --- a/config/rootfiles/core/90/filelists/Locale-Country +++ /dev/null @@ -1 +0,0 @@ -../../../common/Locale-Country \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/apache2 b/config/rootfiles/core/90/filelists/apache2 deleted file mode 120000 index eef95ef..0000000 --- a/config/rootfiles/core/90/filelists/apache2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/armv5tel/glibc b/config/rootfiles/core/90/filelists/armv5tel/glibc deleted file mode 120000 index 4c70d72..0000000 --- a/config/rootfiles/core/90/filelists/armv5tel/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/90/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 7217107..0000000 --- a/config/rootfiles/core/90/filelists/armv5tel/linux-kirkwood +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/armv5tel/linux-multi b/config/rootfiles/core/90/filelists/armv5tel/linux-multi deleted file mode 120000 index 204eb4c..0000000 --- a/config/rootfiles/core/90/filelists/armv5tel/linux-multi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/armv5tel/linux-rpi b/config/rootfiles/core/90/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a49..0000000 --- a/config/rootfiles/core/90/filelists/armv5tel/linux-rpi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/curl b/config/rootfiles/core/90/filelists/curl deleted file mode 120000 index 4b84bef..0000000 --- a/config/rootfiles/core/90/filelists/curl +++ /dev/null @@ -1 +0,0 @@ -../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/cyrus-sasl b/config/rootfiles/core/90/filelists/cyrus-sasl deleted file mode 120000 index bb51b4c..0000000 --- a/config/rootfiles/core/90/filelists/cyrus-sasl +++ /dev/null @@ -1 +0,0 @@ -../../../common/cyrus-sasl \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/ddns b/config/rootfiles/core/90/filelists/ddns deleted file mode 120000 index 7395164..0000000 --- a/config/rootfiles/core/90/filelists/ddns +++ /dev/null @@ -1 +0,0 @@ -../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/dhcp b/config/rootfiles/core/90/filelists/dhcp deleted file mode 120000 index 32d8da4..0000000 --- a/config/rootfiles/core/90/filelists/dhcp +++ /dev/null @@ -1 +0,0 @@ -../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/dhcpcd b/config/rootfiles/core/90/filelists/dhcpcd deleted file mode 120000 index 1e799da..0000000 --- a/config/rootfiles/core/90/filelists/dhcpcd +++ /dev/null @@ -1 +0,0 @@ -../../../common/dhcpcd \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/dnsmasq b/config/rootfiles/core/90/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/90/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/dracut b/config/rootfiles/core/90/filelists/dracut deleted file mode 120000 index 1608699..0000000 --- a/config/rootfiles/core/90/filelists/dracut +++ /dev/null @@ -1 +0,0 @@ -../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/expat b/config/rootfiles/core/90/filelists/expat deleted file mode 120000 index e1923cf..0000000 --- a/config/rootfiles/core/90/filelists/expat +++ /dev/null @@ -1 +0,0 @@ -../../../common/expat \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files deleted file mode 100644 index ee596a0..0000000 --- a/config/rootfiles/core/90/filelists/files +++ /dev/null @@ -1,38 +0,0 @@ -etc/system-release -etc/issue -etc/rc.d/init.d/firewall -etc/rc.d/init.d/network-trigger -etc/rc.d/init.d/networking/functions.network -etc/rc.d/init.d/networking/red.up/99-geoip-database -etc/rc.d/rcsysinit.d/S90network-trigger -opt/pakfire/pakfire -opt/pakfire/lib/functions.pl -srv/web/ipfire/cgi-bin/country.cgi -srv/web/ipfire/cgi-bin/ddns.cgi -srv/web/ipfire/cgi-bin/firewall.cgi -srv/web/ipfire/cgi-bin/fwhosts.cgi -srv/web/ipfire/cgi-bin/geoip-block.cgi -srv/web/ipfire/cgi-bin/index.cgi -srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat -srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat -srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat -srv/web/ipfire/cgi-bin/netovpnsrv.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -srv/web/ipfire/html/themes/darkdos/include/style.css -srv/web/ipfire/html/themes/ipfire-legacy/include/style.css -srv/web/ipfire/html/themes/ipfire/include/css/style.css -srv/web/ipfire/html/themes/maniac/include/style.css -usr/lib/firewall/firewall-lib.pl -usr/lib/firewall/rules.pl -usr/local/bin/backupiso -usr/local/bin/ddnsctrl -usr/local/bin/ipsecctrl -usr/local/bin/xt_geoip_build -usr/local/bin/xt_geoip_update -var/ipfire/general-functions.pl -var/ipfire/geoip-functions.pl -var/ipfire/header.pl -var/ipfire/backup/include -var/ipfire/langs -var/ipfire/menu.d/50-firewall.menu diff --git a/config/rootfiles/core/90/filelists/fireinfo b/config/rootfiles/core/90/filelists/fireinfo deleted file mode 120000 index c461155..0000000 --- a/config/rootfiles/core/90/filelists/fireinfo +++ /dev/null @@ -1 +0,0 @@ -../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/flag-icons b/config/rootfiles/core/90/filelists/flag-icons deleted file mode 120000 index 8776b6b..0000000 --- a/config/rootfiles/core/90/filelists/flag-icons +++ /dev/null @@ -1 +0,0 @@ -../../../common/flag-icons \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/groff b/config/rootfiles/core/90/filelists/groff deleted file mode 120000 index 232291e..0000000 --- a/config/rootfiles/core/90/filelists/groff +++ /dev/null @@ -1 +0,0 @@ -../../../common/groff \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/acpid b/config/rootfiles/core/90/filelists/i586/acpid deleted file mode 120000 index 21d36ee..0000000 --- a/config/rootfiles/core/90/filelists/i586/acpid +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/glibc b/config/rootfiles/core/90/filelists/i586/glibc deleted file mode 120000 index 943021f..0000000 --- a/config/rootfiles/core/90/filelists/i586/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/linux b/config/rootfiles/core/90/filelists/i586/linux deleted file mode 120000 index 693ec4b..0000000 --- a/config/rootfiles/core/90/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/linux-initrd b/config/rootfiles/core/90/filelists/i586/linux-initrd deleted file mode 120000 index 32a03e6..0000000 --- a/config/rootfiles/core/90/filelists/i586/linux-initrd +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/i586/openssl-sse2 b/config/rootfiles/core/90/filelists/i586/openssl-sse2 deleted file mode 120000 index f424713..0000000 --- a/config/rootfiles/core/90/filelists/i586/openssl-sse2 +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/iptables b/config/rootfiles/core/90/filelists/iptables deleted file mode 120000 index 8caf12b..0000000 --- a/config/rootfiles/core/90/filelists/iptables +++ /dev/null @@ -1 +0,0 @@ -../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/iputils b/config/rootfiles/core/90/filelists/iputils deleted file mode 120000 index 361c28f..0000000 --- a/config/rootfiles/core/90/filelists/iputils +++ /dev/null @@ -1 +0,0 @@ -../../../common/iputils \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/libjpeg b/config/rootfiles/core/90/filelists/libjpeg deleted file mode 120000 index 3b1a782..0000000 --- a/config/rootfiles/core/90/filelists/libjpeg +++ /dev/null @@ -1 +0,0 @@ -../../../common/libjpeg \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/logrotate b/config/rootfiles/core/90/filelists/logrotate deleted file mode 120000 index bc192c0..0000000 --- a/config/rootfiles/core/90/filelists/logrotate +++ /dev/null @@ -1 +0,0 @@ -../../../common/logrotate \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/logwatch b/config/rootfiles/core/90/filelists/logwatch deleted file mode 120000 index f14eabd..0000000 --- a/config/rootfiles/core/90/filelists/logwatch +++ /dev/null @@ -1 +0,0 @@ -../../../common/logwatch \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/openldap b/config/rootfiles/core/90/filelists/openldap deleted file mode 120000 index 80c324f..0000000 --- a/config/rootfiles/core/90/filelists/openldap +++ /dev/null @@ -1 +0,0 @@ -../../../common/openldap \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/openssl b/config/rootfiles/core/90/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/90/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/openssl-0.9.8-files b/config/rootfiles/core/90/filelists/openssl-0.9.8-files deleted file mode 100644 index e80a57d..0000000 --- a/config/rootfiles/core/90/filelists/openssl-0.9.8-files +++ /dev/null @@ -1,19 +0,0 @@ -lib/security/pam_mysql.so -usr/lib/gnupg/gpgkeys_ldap -usr/lib/gnupg/gpgkeys_hkp -usr/lib/gnupg/gpgkeys_curl -usr/lib/apache/libphp5.so -usr/lib/squid/digest_ldap_auth -usr/lib/squid/basic_ldap_auth -usr/lib/squid/ext_kerberos_ldap_group_acl -usr/lib/squid/ext_edirectory_userip_acl -usr/lib/squid/ext_ldap_group_acl -usr/lib/python2.7/lib-dynload/_ssl.so -usr/lib/python2.7/lib-dynload/_hashlib.so -usr/lib/collectd/write_http.so -usr/lib/collectd/ascent.so -usr/lib/collectd/curl_xml.so -usr/lib/collectd/apache.so -usr/lib/collectd/bind.so -usr/lib/collectd/curl.so -usr/bin/php diff --git a/config/rootfiles/core/90/filelists/perl-Text-CSV_XS b/config/rootfiles/core/90/filelists/perl-Text-CSV_XS deleted file mode 120000 index ec1202f..0000000 --- a/config/rootfiles/core/90/filelists/perl-Text-CSV_XS +++ /dev/null @@ -1 +0,0 @@ -../../../common/perl-Text-CSV_XS \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/squid b/config/rootfiles/core/90/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/90/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/strongswan b/config/rootfiles/core/90/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/90/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/tzdata b/config/rootfiles/core/90/filelists/tzdata deleted file mode 120000 index 5a6e325..0000000 --- a/config/rootfiles/core/90/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/udev b/config/rootfiles/core/90/filelists/udev deleted file mode 120000 index e967a1c..0000000 --- a/config/rootfiles/core/90/filelists/udev +++ /dev/null @@ -1 +0,0 @@ -../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/wpa_supplicant b/config/rootfiles/core/90/filelists/wpa_supplicant deleted file mode 120000 index 1d04c03..0000000 --- a/config/rootfiles/core/90/filelists/wpa_supplicant +++ /dev/null @@ -1 +0,0 @@ -../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/xtables-addons b/config/rootfiles/core/90/filelists/xtables-addons deleted file mode 120000 index 2e24c42..0000000 --- a/config/rootfiles/core/90/filelists/xtables-addons +++ /dev/null @@ -1 +0,0 @@ -../../../common/xtables-addons \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/xz b/config/rootfiles/core/90/filelists/xz deleted file mode 120000 index 734e926..0000000 --- a/config/rootfiles/core/90/filelists/xz +++ /dev/null @@ -1 +0,0 @@ -../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/90/meta b/config/rootfiles/core/90/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/90/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh deleted file mode 100644 index 34dacf1..0000000 --- a/config/rootfiles/core/90/update.sh +++ /dev/null @@ -1,297 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - - -function find_device() { - local mountpoint="${1}" - - local root - local dev mp fs flags rest - while read -r dev mp fs flags rest; do - # Skip unwanted entries - [ "${dev}" = "rootfs" ] && continue - - if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then - root="$(basename "${dev}")" - break - fi - done < /proc/mounts - - # Get the actual device from the partition that holds / - while [ -n "${root}" ]; do - if [ -e "/sys/block/${root}" ]; then - echo "${root}" - return 0 - fi - - # Remove last character - root="${root::-1}" - done - - return 1 -} - - -# -# Remove old core updates from pakfire cache to save space... -core=90 -for (( i=1; i<=${core}; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -# Do some sanity checks. -case $(uname -r) in - *-ipfire-versatile ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update. versatile support is dropped." - # Report no error to pakfire. So it does not try to install it again. - exit 0 - ;; - *-ipfire* ) - # Ok. - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update. No IPFire Kernel." - exit 1 - ;; -esac - - -# -# -KVER="xxxKVERxxx" - -# Check diskspace on root -ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $ROOTSPACE -lt 100000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update because not enough free space on root." - exit 2 -fi - - -echo -echo Update Kernel to $KVER ... -# -# Remove old kernel, configs, initrd, modules, dtb's ... -# -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/initramfs-* -rm -rf /boot/vmlinuz-* -rm -rf /boot/uImage-ipfire-* -rm -rf /boot/uInit-ipfire-* -rm -rf /boot/dtb-*-ipfire-* -rm -rf /lib/modules - -case "$(uname -m)" in - armv*) - # Backup uEnv.txt if exist - if [ -e /boot/uEnv.txt ]; then - cp -vf /boot/uEnv.txt /boot/uEnv.txt.org - fi - - # work around the u-boot folder detection bug - mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood - mkdir -pv /boot/dtb-$KVER-ipfire-multi - ;; -esac - -# -#Stop services -/etc/init.d/snort stop -/etc/init.d/squid stop -/etc/init.d/ipsec stop -/etc/init.d/apache stop - -# Drop old flag icons, before extracting the new ones. -rm /srv/web/ipfire/html/images/flags/* - -# -#Extract files -tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / - -# -# restart init because glibc was updated. -telinit u - -# Remove old openssl libraries -rm -vf /usr/lib/libcrypto.so.0.9.8 /usr/lib/libssl.so.0.9.8 - -# Check diskspace on boot -BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $BOOTSPACE -lt 1000 ]; then - case $(uname -r) in - *-ipfire-kirkwood ) - # Special handling for old kirkwood images. - # (install only kirkwood kernel) - rm -rf /boot/* - # work around the u-boot folder detection bug - mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ - --numeric-owner -C / --wildcards 'boot/*-kirkwood*' - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." - /etc/init.d/apache start - exit 4 - ;; - esac -fi - -# Create GeoIP related files if they do not exist yet. -if [ ! -e "/var/ipfire/firewall/geoipblock" ]; then - touch /var/ipfire/firewall/geoipblock - chown nobody:nobody /var/ipfire/firewall/geoipblock - - # Insert default value into file. - echo "GEOIPBLOCK_ENABLED=off" >> /var/ipfire/firewall/geoipblock -fi -if [ ! -e "/var/ipfire/fwhosts/customgeoipgrp" ]; then - touch /var/ipfire/fwhosts/customgeoipgrp - chown nobody:nobody /var/ipfire/fwhosts/customgeoipgrp -fi - -#Fix BUG10812 (openvpn server.conf has wrong collectd logfile path) -if grep -q "status /var/log/ovpnserver.log 30" /var/ipfire/ovpn/server.conf; then - sed -i "s/\/var\/log\/ovpnserver.log 30/\/var\/run\/ovpnserver.log 30/" /var/ipfire/ovpn/server.conf -fi - -# Download/Update GeoIP databases. -/usr/local/bin/xt_geoip_update - -# Update crontab -grep -q /usr/local/bin/xt_geoip_update /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig - -# Update GeoIP database once a month. -%monthly,random * * * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/xt_geoip_update >/dev/null 2>&1 -EOF - -fcrontab -z &>/dev/null - -# Generate ddns configuration file -sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi - -# Regenerate IPsec configuration -sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi - -# Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Remove old udev configuration -rm -vf /etc/udev/rules.d/30-persistent-network.rules - -# Remove pids from dhcp client because it hang at normal shutdown -# so let the sysvinit kill it -rm -f /run/dhcpcd-*.pid - -# -# Start services -# -/etc/init.d/apache start -/etc/init.d/squid start -/etc/init.d/snort start -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -if [ -e /boot/grub/grub.cfg ]; then - grub-mkconfig > /boot/grub/grub.cfg -fi - -# Upadate Kernel version uEnv.txt -if [ -e /boot/uEnv.txt ]; then - sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt -fi - -# call user update script (needed for some arm boards) -if [ -e /boot/pakfire-kernel-update ]; then - /boot/pakfire-kernel-update ${KVER} -fi - - -# Force (re)install pae kernel if pae is supported -rm -rf /opt/pakfire/db/installed/meta-linux-pae -if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then - ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: WARNING not enough space for pae kernel." - else - echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae -# rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null - fi -fi - -# -# After pakfire has ended run it again and update the lists and do upgrade -# -echo '#!/bin/bash' > /tmp/pak_update -echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update -echo 'touch /var/run/need_reboot ' >> /tmp/pak_update -# -killall -KILL pak_update -chmod +x /tmp/pak_update -/tmp/pak_update & - -sync - -# -#Finish -( - /etc/init.d/fireinfo start - sendprofile -) >/dev/null 2>&1 & - -echo -echo Please wait until pakfire has ended... -echo - -# Don't report the exitcode last command -exit 0 - diff --git a/config/rootfiles/core/91/exclude b/config/rootfiles/core/91/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/91/exclude +++ /dev/null @@ -1,20 +0,0 @@ -boot/config.txt -etc/collectd.custom -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/ovpn -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/91/filelists/files b/config/rootfiles/core/91/filelists/files deleted file mode 100644 index 7cc5aa2..0000000 --- a/config/rootfiles/core/91/filelists/files +++ /dev/null @@ -1,7 +0,0 @@ -etc/system-release -etc/issue -opt/pakfire/lib/functions.pl -srv/web/ipfire/cgi-bin/connections.cgi -srv/web/ipfire/cgi-bin/dhcp.cgi -srv/web/ipfire/cgi-bin/pppsetup.cgi -var/ipfire/langs diff --git a/config/rootfiles/core/91/filelists/i586/openssl-sse2 b/config/rootfiles/core/91/filelists/i586/openssl-sse2 deleted file mode 120000 index f424713..0000000 --- a/config/rootfiles/core/91/filelists/i586/openssl-sse2 +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/i586/strongswan-padlock b/config/rootfiles/core/91/filelists/i586/strongswan-padlock deleted file mode 120000 index 2412824..0000000 --- a/config/rootfiles/core/91/filelists/i586/strongswan-padlock +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libnet b/config/rootfiles/core/91/filelists/libnet deleted file mode 120000 index 26e5f79..0000000 --- a/config/rootfiles/core/91/filelists/libnet +++ /dev/null @@ -1 +0,0 @@ -../../../common/libnet \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libtool b/config/rootfiles/core/91/filelists/libtool deleted file mode 120000 index 54f5666..0000000 --- a/config/rootfiles/core/91/filelists/libtool +++ /dev/null @@ -1 +0,0 @@ -../../../common/libtool \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libxml2 b/config/rootfiles/core/91/filelists/libxml2 deleted file mode 120000 index 242e69f..0000000 --- a/config/rootfiles/core/91/filelists/libxml2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/libxml2 \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libxslt b/config/rootfiles/core/91/filelists/libxslt deleted file mode 120000 index bf9d766..0000000 --- a/config/rootfiles/core/91/filelists/libxslt +++ /dev/null @@ -1 +0,0 @@ -../../../common/libxslt \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/newt b/config/rootfiles/core/91/filelists/newt deleted file mode 120000 index fb3eb20..0000000 --- a/config/rootfiles/core/91/filelists/newt +++ /dev/null @@ -1 +0,0 @@ -../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/openssh b/config/rootfiles/core/91/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/91/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/openssl b/config/rootfiles/core/91/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/91/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/pcre b/config/rootfiles/core/91/filelists/pcre deleted file mode 120000 index b390d9a..0000000 --- a/config/rootfiles/core/91/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/slang b/config/rootfiles/core/91/filelists/slang deleted file mode 120000 index 228e45e..0000000 --- a/config/rootfiles/core/91/filelists/slang +++ /dev/null @@ -1 +0,0 @@ -../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/strongswan b/config/rootfiles/core/91/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/91/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/91/meta b/config/rootfiles/core/91/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/91/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/core/91/update.sh deleted file mode 100644 index 1e55e8b..0000000 --- a/config/rootfiles/core/91/update.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2015 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -# Remove old core updates from pakfire cache to save space... -core=91 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# Stop services -/etc/init.d/ipsec stop - -# Extract files -extract_files - -# Create some missing graphs folders (core90) -mkdir -p /srv/web/ipfire/html/{accounting,graphs} -chmod 777 /srv/web/ipfire/html/{accounting,graphs} - -# Update Language cache -/usr/local/bin/update-lang-cache - -# Regenerate IPsec configuration -sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi - -sync - -# Start services -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -# This update need a reboot... -touch /var/run/need_reboot - -# Finish -/etc/init.d/fireinfo start -sendprofile - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/92/exclude b/config/rootfiles/core/92/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/core/92/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/92/filelists/files b/config/rootfiles/core/92/filelists/files new file mode 100644 index 0000000..fe764db --- /dev/null +++ b/config/rootfiles/core/92/filelists/files @@ -0,0 +1,9 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/webaccess.cgi +var/ipfire/network-functions.pl +var/ipfire/langs +var/ipfire/urlfilter/bin/autoupdate.pl diff --git a/config/rootfiles/core/92/meta b/config/rootfiles/core/92/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/92/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/92/update.sh b/config/rootfiles/core/92/update.sh new file mode 100644 index 0000000..0314d80 --- /dev/null +++ b/config/rootfiles/core/92/update.sh @@ -0,0 +1,61 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2015 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=92 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +/etc/init.d/ipsec stop + +# Extract files +extract_files + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi + +sync + +# Start services +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/88/exclude b/config/rootfiles/oldcore/88/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/oldcore/88/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/88/filelists/files b/config/rootfiles/oldcore/88/filelists/files new file mode 100644 index 0000000..409e5fe --- /dev/null +++ b/config/rootfiles/oldcore/88/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/oldcore/88/filelists/fireinfo b/config/rootfiles/oldcore/88/filelists/fireinfo new file mode 120000 index 0000000..c461155 --- /dev/null +++ b/config/rootfiles/oldcore/88/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/oldcore/88/filelists/openssh b/config/rootfiles/oldcore/88/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/88/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/88/filelists/openssl b/config/rootfiles/oldcore/88/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/88/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/88/filelists/openssl-compat b/config/rootfiles/oldcore/88/filelists/openssl-compat new file mode 120000 index 0000000..c9fa421 --- /dev/null +++ b/config/rootfiles/oldcore/88/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/oldcore/88/meta b/config/rootfiles/oldcore/88/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/88/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/88/update.sh b/config/rootfiles/oldcore/88/update.sh new file mode 100644 index 0000000..6ef1f48 --- /dev/null +++ b/config/rootfiles/oldcore/88/update.sh @@ -0,0 +1,57 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=88 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Remove old files + +# Extract files +extract_files + +# Start services + +# Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/89/exclude b/config/rootfiles/oldcore/89/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/oldcore/89/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/89/filelists/collectd b/config/rootfiles/oldcore/89/filelists/collectd new file mode 120000 index 0000000..871b32f --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/daq b/config/rootfiles/oldcore/89/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/ddns b/config/rootfiles/oldcore/89/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/dnsmasq b/config/rootfiles/oldcore/89/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/ethtool b/config/rootfiles/oldcore/89/filelists/ethtool new file mode 120000 index 0000000..494a53e --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/ethtool @@ -0,0 +1 @@ +../../../common/ethtool \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/fcron b/config/rootfiles/oldcore/89/filelists/fcron new file mode 120000 index 0000000..4a454ea --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/fcron @@ -0,0 +1 @@ +../../../common/fcron \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/file b/config/rootfiles/oldcore/89/filelists/file new file mode 120000 index 0000000..0c60e43 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/file @@ -0,0 +1 @@ +../../../common/file \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/files b/config/rootfiles/oldcore/89/filelists/files new file mode 100644 index 0000000..70c5f3d --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/files @@ -0,0 +1,22 @@ +etc/system-release +etc/issue +etc/collectd.conf +etc/collectd.vpn +etc/rc.d/init.d/dnsmasq +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/netovpnrw.cgi +srv/web/ipfire/cgi-bin/netovpnsrv.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +usr/local/bin/collectdctrl +usr/local/bin/openvpnctrl +usr/sbin/ovpn-collectd-convert +usr/sbin/setup +var/ipfire/backup/bin/backup.pl +var/ipfire/graphs.pl +var/ipfire/langs +var/ipfire/lang.pl +var/ipfire/menu.d/20-status.menu diff --git a/config/rootfiles/oldcore/89/filelists/fuse b/config/rootfiles/oldcore/89/filelists/fuse new file mode 120000 index 0000000..570edaa --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/fuse @@ -0,0 +1 @@ +../../../common/fuse \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/gnupg b/config/rootfiles/oldcore/89/filelists/gnupg new file mode 120000 index 0000000..a1a1564 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/gnupg @@ -0,0 +1 @@ +../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/grep b/config/rootfiles/oldcore/89/filelists/grep new file mode 120000 index 0000000..ab5ef8b --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/grep @@ -0,0 +1 @@ +../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/hdparm b/config/rootfiles/oldcore/89/filelists/hdparm new file mode 120000 index 0000000..b644751 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/hdparm @@ -0,0 +1 @@ +../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/libart b/config/rootfiles/oldcore/89/filelists/libart new file mode 120000 index 0000000..bb1e078 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/libart @@ -0,0 +1 @@ +../../../common/libart \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/libcap b/config/rootfiles/oldcore/89/filelists/libcap new file mode 120000 index 0000000..ed67d95 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/libcap @@ -0,0 +1 @@ +../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/libffi b/config/rootfiles/oldcore/89/filelists/libffi new file mode 120000 index 0000000..c391acd --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/libffi @@ -0,0 +1 @@ +../../../common/libffi \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/libpcap b/config/rootfiles/oldcore/89/filelists/libpcap new file mode 120000 index 0000000..c7f9f52 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/libpcap @@ -0,0 +1 @@ +../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/ntfs-3g b/config/rootfiles/oldcore/89/filelists/ntfs-3g new file mode 120000 index 0000000..d93adc2 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/ntfs-3g @@ -0,0 +1 @@ +../../../common/ntfs-3g \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/openssh b/config/rootfiles/oldcore/89/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/openssl b/config/rootfiles/oldcore/89/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/openssl-compat b/config/rootfiles/oldcore/89/filelists/openssl-compat new file mode 120000 index 0000000..c9fa421 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/pcre b/config/rootfiles/oldcore/89/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/screen b/config/rootfiles/oldcore/89/filelists/screen new file mode 120000 index 0000000..81008f4 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/screen @@ -0,0 +1 @@ +../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/setup b/config/rootfiles/oldcore/89/filelists/setup new file mode 120000 index 0000000..209374b --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/smartmontools b/config/rootfiles/oldcore/89/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/snort b/config/rootfiles/oldcore/89/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/sqlite b/config/rootfiles/oldcore/89/filelists/sqlite new file mode 120000 index 0000000..4ea5697 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/sqlite @@ -0,0 +1 @@ +../../../common/sqlite \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/squid b/config/rootfiles/oldcore/89/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/strongswan b/config/rootfiles/oldcore/89/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/tar b/config/rootfiles/oldcore/89/filelists/tar new file mode 120000 index 0000000..3e585d2 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/tar @@ -0,0 +1 @@ +../../../common/tar \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/tzdata b/config/rootfiles/oldcore/89/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/wget b/config/rootfiles/oldcore/89/filelists/wget new file mode 120000 index 0000000..fcb57df --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/filelists/zlib b/config/rootfiles/oldcore/89/filelists/zlib new file mode 120000 index 0000000..e345663 --- /dev/null +++ b/config/rootfiles/oldcore/89/filelists/zlib @@ -0,0 +1 @@ +../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/oldcore/89/meta b/config/rootfiles/oldcore/89/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/89/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/89/update.sh b/config/rootfiles/oldcore/89/update.sh new file mode 100644 index 0000000..13c645a --- /dev/null +++ b/config/rootfiles/oldcore/89/update.sh @@ -0,0 +1,111 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=89 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +/etc/init.d/ipsec stop + +# Remove old files +rm -f /usr/local/sbin/setup + +# Extract files +extract_files + +# Update /etc/sysconfig/createfiles +cat <<EOF >> /etc/sysconfig/createfiles +/var/run/ovpnserver.log file 644 nobody nobody +/var/run/openvpn dir 644 nobody nobody +EOF + +# Update /etc/collectd.conf +if ! grep -q "collectd.vpn" /etc/collectd.conf; then + echo "include \"/etc/collectd.vpn\"" >> /etc/collectd.conf +fi + +# Generate ddns configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi + +# Start services +/etc/init.d/dnsmasq restart +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Prevent uninstall sqlite (now common package). +rm -f \ + /opt/pakfire/db/*/meta-sqlite \ + /opt/pakfire/db/rootfiles/sqlite + +mkdir -p /var/run/openvpn +touch /var/run/ovpnserver.log +chown nobody.nobody \ + /var/run/openvpn \ + /var/run/ovpnserver.log + +# Update OpenVPN/collectd configuration +for i in /var/ipfire/ovpn/n2nconf/*/*.conf; do + name="${i##*/}" + name="${name%*.conf}" + + if ! grep -qE "^status-version" ${i}; then + echo "# Logfile" >> ${i} + echo "status-version 1" >> ${i} + fi + + if ! grep -qE "^status " ${i}; then + echo "status /var/run/openvpn/${name}-n2n 10" >> ${i} + fi +done + +/usr/sbin/ovpn-collectd-convert +chown nobody.nobody /var/ipfire/ovpn/collectd.vpn + +# Fix permissions +chown nobody.nobody /var/ipfire/dns + +# Fix #10625 +mkdir -p /etc/logrotate.d + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/90/exclude b/config/rootfiles/oldcore/90/exclude new file mode 100644 index 0000000..73b7b73 --- /dev/null +++ b/config/rootfiles/oldcore/90/exclude @@ -0,0 +1,27 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/rc.d/rcsysinit.d/S19checkfstab +etc/rc.d/rcsysinit.d/S70console +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/modules +etc/sysconfig/rc.local +srv/web/ipfire/html/proxy.pac +var/ipfire/firewall/geoipblock +var/ipfire/fwhosts/custmgeoipgrp +var/ipfire/ovpn/ccd.conf +var/ipfire/ovpn/ccdroute +var/ipfire/ovpn/ccdroute2 +var/ipfire/time +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/90/filelists/Locale-Country b/config/rootfiles/oldcore/90/filelists/Locale-Country new file mode 120000 index 0000000..025c278 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/Locale-Country @@ -0,0 +1 @@ +../../../common/Locale-Country \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/apache2 b/config/rootfiles/oldcore/90/filelists/apache2 new file mode 120000 index 0000000..eef95ef --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/armv5tel/glibc b/config/rootfiles/oldcore/90/filelists/armv5tel/glibc new file mode 120000 index 0000000..4c70d72 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/90/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/90/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/90/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/curl b/config/rootfiles/oldcore/90/filelists/curl new file mode 120000 index 0000000..4b84bef --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/cyrus-sasl b/config/rootfiles/oldcore/90/filelists/cyrus-sasl new file mode 120000 index 0000000..bb51b4c --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/cyrus-sasl @@ -0,0 +1 @@ +../../../common/cyrus-sasl \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/ddns b/config/rootfiles/oldcore/90/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/dhcp b/config/rootfiles/oldcore/90/filelists/dhcp new file mode 120000 index 0000000..32d8da4 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/dhcpcd b/config/rootfiles/oldcore/90/filelists/dhcpcd new file mode 120000 index 0000000..1e799da --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/dhcpcd @@ -0,0 +1 @@ +../../../common/dhcpcd \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/dnsmasq b/config/rootfiles/oldcore/90/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/dracut b/config/rootfiles/oldcore/90/filelists/dracut new file mode 120000 index 0000000..1608699 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/dracut @@ -0,0 +1 @@ +../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/expat b/config/rootfiles/oldcore/90/filelists/expat new file mode 120000 index 0000000..e1923cf --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/expat @@ -0,0 +1 @@ +../../../common/expat \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/files b/config/rootfiles/oldcore/90/filelists/files new file mode 100644 index 0000000..ee596a0 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/files @@ -0,0 +1,38 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/firewall +etc/rc.d/init.d/network-trigger +etc/rc.d/init.d/networking/functions.network +etc/rc.d/init.d/networking/red.up/99-geoip-database +etc/rc.d/rcsysinit.d/S90network-trigger +opt/pakfire/pakfire +opt/pakfire/lib/functions.pl +srv/web/ipfire/cgi-bin/country.cgi +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/geoip-block.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat +srv/web/ipfire/cgi-bin/netovpnsrv.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/html/themes/darkdos/include/style.css +srv/web/ipfire/html/themes/ipfire-legacy/include/style.css +srv/web/ipfire/html/themes/ipfire/include/css/style.css +srv/web/ipfire/html/themes/maniac/include/style.css +usr/lib/firewall/firewall-lib.pl +usr/lib/firewall/rules.pl +usr/local/bin/backupiso +usr/local/bin/ddnsctrl +usr/local/bin/ipsecctrl +usr/local/bin/xt_geoip_build +usr/local/bin/xt_geoip_update +var/ipfire/general-functions.pl +var/ipfire/geoip-functions.pl +var/ipfire/header.pl +var/ipfire/backup/include +var/ipfire/langs +var/ipfire/menu.d/50-firewall.menu diff --git a/config/rootfiles/oldcore/90/filelists/fireinfo b/config/rootfiles/oldcore/90/filelists/fireinfo new file mode 120000 index 0000000..c461155 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/flag-icons b/config/rootfiles/oldcore/90/filelists/flag-icons new file mode 120000 index 0000000..8776b6b --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/flag-icons @@ -0,0 +1 @@ +../../../common/flag-icons \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/groff b/config/rootfiles/oldcore/90/filelists/groff new file mode 120000 index 0000000..232291e --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/groff @@ -0,0 +1 @@ +../../../common/groff \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/i586/acpid b/config/rootfiles/oldcore/90/filelists/i586/acpid new file mode 120000 index 0000000..21d36ee --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/i586/acpid @@ -0,0 +1 @@ +../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/i586/glibc b/config/rootfiles/oldcore/90/filelists/i586/glibc new file mode 120000 index 0000000..943021f --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/i586/linux b/config/rootfiles/oldcore/90/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/i586/linux-initrd b/config/rootfiles/oldcore/90/filelists/i586/linux-initrd new file mode 120000 index 0000000..32a03e6 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/90/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/iptables b/config/rootfiles/oldcore/90/filelists/iptables new file mode 120000 index 0000000..8caf12b --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/iptables @@ -0,0 +1 @@ +../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/iputils b/config/rootfiles/oldcore/90/filelists/iputils new file mode 120000 index 0000000..361c28f --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/iputils @@ -0,0 +1 @@ +../../../common/iputils \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/libjpeg b/config/rootfiles/oldcore/90/filelists/libjpeg new file mode 120000 index 0000000..3b1a782 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/libjpeg @@ -0,0 +1 @@ +../../../common/libjpeg \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/logrotate b/config/rootfiles/oldcore/90/filelists/logrotate new file mode 120000 index 0000000..bc192c0 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/logrotate @@ -0,0 +1 @@ +../../../common/logrotate \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/logwatch b/config/rootfiles/oldcore/90/filelists/logwatch new file mode 120000 index 0000000..f14eabd --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/logwatch @@ -0,0 +1 @@ +../../../common/logwatch \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/openldap b/config/rootfiles/oldcore/90/filelists/openldap new file mode 120000 index 0000000..80c324f --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/openldap @@ -0,0 +1 @@ +../../../common/openldap \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/openssl b/config/rootfiles/oldcore/90/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/openssl-0.9.8-files b/config/rootfiles/oldcore/90/filelists/openssl-0.9.8-files new file mode 100644 index 0000000..e80a57d --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/openssl-0.9.8-files @@ -0,0 +1,19 @@ +lib/security/pam_mysql.so +usr/lib/gnupg/gpgkeys_ldap +usr/lib/gnupg/gpgkeys_hkp +usr/lib/gnupg/gpgkeys_curl +usr/lib/apache/libphp5.so +usr/lib/squid/digest_ldap_auth +usr/lib/squid/basic_ldap_auth +usr/lib/squid/ext_kerberos_ldap_group_acl +usr/lib/squid/ext_edirectory_userip_acl +usr/lib/squid/ext_ldap_group_acl +usr/lib/python2.7/lib-dynload/_ssl.so +usr/lib/python2.7/lib-dynload/_hashlib.so +usr/lib/collectd/write_http.so +usr/lib/collectd/ascent.so +usr/lib/collectd/curl_xml.so +usr/lib/collectd/apache.so +usr/lib/collectd/bind.so +usr/lib/collectd/curl.so +usr/bin/php diff --git a/config/rootfiles/oldcore/90/filelists/perl-Text-CSV_XS b/config/rootfiles/oldcore/90/filelists/perl-Text-CSV_XS new file mode 120000 index 0000000..ec1202f --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/perl-Text-CSV_XS @@ -0,0 +1 @@ +../../../common/perl-Text-CSV_XS \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/squid b/config/rootfiles/oldcore/90/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/strongswan b/config/rootfiles/oldcore/90/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/tzdata b/config/rootfiles/oldcore/90/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/udev b/config/rootfiles/oldcore/90/filelists/udev new file mode 120000 index 0000000..e967a1c --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/udev @@ -0,0 +1 @@ +../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/wpa_supplicant b/config/rootfiles/oldcore/90/filelists/wpa_supplicant new file mode 120000 index 0000000..1d04c03 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/xtables-addons b/config/rootfiles/oldcore/90/filelists/xtables-addons new file mode 120000 index 0000000..2e24c42 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/xtables-addons @@ -0,0 +1 @@ +../../../common/xtables-addons \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/filelists/xz b/config/rootfiles/oldcore/90/filelists/xz new file mode 120000 index 0000000..734e926 --- /dev/null +++ b/config/rootfiles/oldcore/90/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/oldcore/90/meta b/config/rootfiles/oldcore/90/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/90/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/90/update.sh b/config/rootfiles/oldcore/90/update.sh new file mode 100644 index 0000000..34dacf1 --- /dev/null +++ b/config/rootfiles/oldcore/90/update.sh @@ -0,0 +1,297 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + + +function find_device() { + local mountpoint="${1}" + + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + + # Get the actual device from the partition that holds / + while [ -n "${root}" ]; do + if [ -e "/sys/block/${root}" ]; then + echo "${root}" + return 0 + fi + + # Remove last character + root="${root::-1}" + done + + return 1 +} + + +# +# Remove old core updates from pakfire cache to save space... +core=90 +for (( i=1; i<=${core}; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Do some sanity checks. +case $(uname -r) in + *-ipfire-versatile ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. versatile support is dropped." + # Report no error to pakfire. So it does not try to install it again. + exit 0 + ;; + *-ipfire* ) + # Ok. + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. No IPFire Kernel." + exit 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update because not enough free space on root." + exit 2 +fi + + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules, dtb's ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +case "$(uname -m)" in + armv*) + # Backup uEnv.txt if exist + if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org + fi + + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + mkdir -pv /boot/dtb-$KVER-ipfire-multi + ;; +esac + +# +#Stop services +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop +/etc/init.d/apache stop + +# Drop old flag icons, before extracting the new ones. +rm /srv/web/ipfire/html/images/flags/* + +# +#Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# +# restart init because glibc was updated. +telinit u + +# Remove old openssl libraries +rm -vf /usr/lib/libcrypto.so.0.9.8 /usr/lib/libssl.so.0.9.8 + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." + /etc/init.d/apache start + exit 4 + ;; + esac +fi + +# Create GeoIP related files if they do not exist yet. +if [ ! -e "/var/ipfire/firewall/geoipblock" ]; then + touch /var/ipfire/firewall/geoipblock + chown nobody:nobody /var/ipfire/firewall/geoipblock + + # Insert default value into file. + echo "GEOIPBLOCK_ENABLED=off" >> /var/ipfire/firewall/geoipblock +fi +if [ ! -e "/var/ipfire/fwhosts/customgeoipgrp" ]; then + touch /var/ipfire/fwhosts/customgeoipgrp + chown nobody:nobody /var/ipfire/fwhosts/customgeoipgrp +fi + +#Fix BUG10812 (openvpn server.conf has wrong collectd logfile path) +if grep -q "status /var/log/ovpnserver.log 30" /var/ipfire/ovpn/server.conf; then + sed -i "s/\/var\/log\/ovpnserver.log 30/\/var\/run\/ovpnserver.log 30/" /var/ipfire/ovpn/server.conf +fi + +# Download/Update GeoIP databases. +/usr/local/bin/xt_geoip_update + +# Update crontab +grep -q /usr/local/bin/xt_geoip_update /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig + +# Update GeoIP database once a month. +%monthly,random * * * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/xt_geoip_update >/dev/null 2>&1 +EOF + +fcrontab -z &>/dev/null + +# Generate ddns configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi + +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Remove old udev configuration +rm -vf /etc/udev/rules.d/30-persistent-network.rules + +# Remove pids from dhcp client because it hang at normal shutdown +# so let the sysvinit kill it +rm -f /run/dhcpcd-*.pid + +# +# Start services +# +/etc/init.d/apache start +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig > /boot/grub/grub.cfg +fi + +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + + +# Force (re)install pae kernel if pae is supported +rm -rf /opt/pakfire/db/installed/meta-linux-pae +if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae +# rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null + fi +fi + +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# +#Finish +( + /etc/init.d/fireinfo start + sendprofile +) >/dev/null 2>&1 & + +echo +echo Please wait until pakfire has ended... +echo + +# Don't report the exitcode last command +exit 0 + diff --git a/config/rootfiles/oldcore/91/exclude b/config/rootfiles/oldcore/91/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/oldcore/91/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/91/filelists/files b/config/rootfiles/oldcore/91/filelists/files new file mode 100644 index 0000000..7cc5aa2 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/files @@ -0,0 +1,7 @@ +etc/system-release +etc/issue +opt/pakfire/lib/functions.pl +srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +var/ipfire/langs diff --git a/config/rootfiles/oldcore/91/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/91/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/91/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/libnet b/config/rootfiles/oldcore/91/filelists/libnet new file mode 120000 index 0000000..26e5f79 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/libnet @@ -0,0 +1 @@ +../../../common/libnet \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/libtool b/config/rootfiles/oldcore/91/filelists/libtool new file mode 120000 index 0000000..54f5666 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/libtool @@ -0,0 +1 @@ +../../../common/libtool \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/libxml2 b/config/rootfiles/oldcore/91/filelists/libxml2 new file mode 120000 index 0000000..242e69f --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/libxml2 @@ -0,0 +1 @@ +../../../common/libxml2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/libxslt b/config/rootfiles/oldcore/91/filelists/libxslt new file mode 120000 index 0000000..bf9d766 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/libxslt @@ -0,0 +1 @@ +../../../common/libxslt \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/newt b/config/rootfiles/oldcore/91/filelists/newt new file mode 120000 index 0000000..fb3eb20 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/newt @@ -0,0 +1 @@ +../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/openssh b/config/rootfiles/oldcore/91/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/openssl b/config/rootfiles/oldcore/91/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/pcre b/config/rootfiles/oldcore/91/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/slang b/config/rootfiles/oldcore/91/filelists/slang new file mode 120000 index 0000000..228e45e --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/slang @@ -0,0 +1 @@ +../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/filelists/strongswan b/config/rootfiles/oldcore/91/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/91/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/91/meta b/config/rootfiles/oldcore/91/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/91/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/91/update.sh b/config/rootfiles/oldcore/91/update.sh new file mode 100644 index 0000000..1e55e8b --- /dev/null +++ b/config/rootfiles/oldcore/91/update.sh @@ -0,0 +1,65 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2015 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=91 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +/etc/init.d/ipsec stop + +# Extract files +extract_files + +# Create some missing graphs folders (core90) +mkdir -p /srv/web/ipfire/html/{accounting,graphs} +chmod 777 /srv/web/ipfire/html/{accounting,graphs} + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi + +sync + +# Start services +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index 29245bc..bcbeffb 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.17" # Version number -CORE="91" # Core Level (Filename) +CORE="92" # Core Level (Filename) PAKFIRE_CORE="91" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e353470a8c8d64543960bdf4d20eb86725c939d5
by git＠ipfire.org 17 Jun '15

17 Jun '15

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 e353470a8c8d64543960bdf4d20eb86725c939d5 (commit) via a1468f66f0c5f52428ed17bd809a18c10b260cee (commit) from 5428eeeeaac1ecacbec2aecb9279cccd29e9c47d (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 e353470a8c8d64543960bdf4d20eb86725c939d5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 17 14:02:05 2015 +0200 dhcp.cgi: Count up key when skippingh search entries This caused a bug that when the user wanted to edit one of the static leases and clicked on the edit icon that an other entry opened up for editing. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a1468f66f0c5f52428ed17bd809a18c10b260cee Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 17 14:01:40 2015 +0200 dhcp.cgi: Never save the search query Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/dhcp.cgi | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) Difference in files: diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index dd48d58..971c51e 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -244,7 +244,7 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) { } # enabled }#loop interface verify - map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2'); # Must not be saved + map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2','q'); # Must not be saved &General::writehash($setting, \%dhcpsettings); # Save good settings $dhcpsettings{'ACTION'} = $Lang::tr{'save'}; # create an 'ACTION' map ($dhcpsettings{$_} = '',@nosaved,'KEY1','KEY2'); # and reinit vars to empty @@ -267,7 +267,7 @@ if ($ENV{'QUERY_STRING'} =~ /^FETHER|^FIPADDR/ ) { $newsort.=$Rev; } $dhcpsettings{'SORT_FLEASELIST'}=$newsort; - map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2'); # Must never be saved + map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2', 'q'); # Must never be saved &General::writehash($setting, \%dhcpsettings); &sortcurrent2; $dhcpsettings{'ACTION'} = 'SORT'; # create an 'ACTION' @@ -942,7 +942,10 @@ foreach my $line (@current2) { # Skip all entries that do not match the search query if ($search_query ne "") { - next if (!grep(/$search_query/, @temp)); + if (!grep(/$search_query/, @temp)) { + $key++; + next; + } } if ($dhcpsettings{'KEY2'} eq $key) { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5428eeeeaac1ecacbec2aecb9279cccd29e9c47d
by git＠ipfire.org 16 Jun '15

16 Jun '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ee299e2ecf6e9fbc6dbf7fdc18c5a8980e122b12
by git＠ipfire.org 16 Jun '15

16 Jun '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4b02b4045b619b207235b34882a000ef088f0df1
by git＠ipfire.org 15 Jun '15

15 Jun '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1f15cc0993aebc53870c685836db2eaeafdc767a
by git＠ipfire.org 13 Jun '15

13 Jun '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core91, updated. 1f99566dd268515c18a8d8ae2e8ab526c490b99b
by git＠ipfire.org 12 Jun '15

12 Jun '15

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, core91 has been updated via 1f99566dd268515c18a8d8ae2e8ab526c490b99b (commit) via 5cba4356690f1282b506844505d81bc8b050d32e (commit) via c3e195433152f91a3f14d59d6ea10e8963e6308d (commit) from 6646be5a53c2fa4846f6403d887a2975469800f6 (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 1f99566dd268515c18a8d8ae2e8ab526c490b99b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 12 17:54:38 2015 +0200 openssl: update to 1.0.2c fix ABI problems. commit 5cba4356690f1282b506844505d81bc8b050d32e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 12 17:54:03 2015 +0200 core91: rebuild grub.cfg to display new core version. commit c3e195433152f91a3f14d59d6ea10e8963e6308d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 12 17:15:51 2015 +0200 strongswan: Update to 5.3.2 This release fixes a security issue filed under CVE-2015-4171. https://www.strongswan.org/blog/2015/06/08/strongswan-vulnerability-(cve-20… Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/91/update.sh | 5 +++++ lfs/openssl | 4 ++-- lfs/strongswan | 6 ++---- src/patches/strongswan-5.3.1-build-timeattack.patch | 11 ----------- 4 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 src/patches/strongswan-5.3.1-build-timeattack.patch Difference in files: diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/core/91/update.sh index 1e55e8b..1104c9f 100644 --- a/config/rootfiles/core/91/update.sh +++ b/config/rootfiles/core/91/update.sh @@ -54,6 +54,11 @@ if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then /etc/init.d/ipsec start fi +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig > /boot/grub/grub.cfg +fi + # This update need a reboot... touch /var/run/need_reboot diff --git a/lfs/openssl b/lfs/openssl index 3b9f3e1..1abc92c 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 1.0.2b +VER = 1.0.2c THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -82,7 +82,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7729b259e2dea7d60b32fc3934d6984b +$(DL_FILE)_MD5 = 8c8d81a9ae7005276e486702edbcd4b6 install : $(TARGET) diff --git a/lfs/strongswan b/lfs/strongswan index d1a5b8c..b4438dd 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 5.3.1 +VER = 5.3.2 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 66f258901a3d6c271da1a0c7fb3e5013 +$(DL_FILE)_MD5 = fab014be1477ef4ebf9a765e10f8802c install : $(TARGET) @@ -78,10 +78,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.3.1-build-timeattack.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-ipfire.patch - cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP) && ./configure \ --prefix="/usr" \ --sysconfdir="/etc" \ diff --git a/src/patches/strongswan-5.3.1-build-timeattack.patch b/src/patches/strongswan-5.3.1-build-timeattack.patch deleted file mode 100644 index 948c4fc..0000000 --- a/src/patches/strongswan-5.3.1-build-timeattack.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- strongswan-5.3.1/scripts/Makefile.am.old 2015-06-04 17:20:43.539244145 +0000 -+++ strongswan-5.3.1/scripts/Makefile.am 2015-06-04 17:20:51.760510631 +0000 -@@ -42,7 +42,7 @@ - dnssec_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la - aes_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la - settings_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la --timeattack_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -+timeattack_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(RTLIB) - - key2keyid.o : $(top_builddir)/config.status - 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 June 2015